resolved conflicts for merge of b61d93a4 to stage-aosp-master
Change-Id: I25ce1463879e29398c0bf4b44c270c16a0bc1d03
diff --git a/Makefile.in b/Makefile.in
index 0f4b3e2..617657e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
#******************************************************************************
#
-# Copyright (C) 1998-2012, International Business Machines
+# Copyright (C) 1998-2013, International Business Machines
# Corporation and others. All Rights Reserved.
#
#******************************************************************************
@@ -52,7 +52,7 @@
INSTALLED_BUILT_FILES = $(top_builddir)/config/Makefile.inc $(top_builddir)/config/pkgdata.inc $(top_builddir)/config/icu-config @platform_make_fragment@ $(EXTRA_DATA:%=$(DESTDIR)$(pkglibdir)/%) $(ALL_PKGCONFIG_FILES)
## Files built (autoconfed) but not installed
-LOCAL_BUILT_FILES = icudefs.mk config/icucross.mk
+LOCAL_BUILT_FILES = icudefs.mk config/icucross.mk config/icucross.inc
DOCDIRS = common i18n
SUBDIRS = stubdata common i18n $(LAYOUT) tools data $(ICUIO) $(EXTRA) $(SAMPLE) $(TEST)
@@ -206,7 +206,7 @@
distclean-local: clean-local
$(RMV) $(top_builddir)/config/Makefile.inc $(top_builddir)/config/pkgdata.inc $(top_builddir)/config/icu-config $(top_builddir)/config/icu.pc $(ALL_PKGCONFIG_FILES)
- $(RMV) config.cache config.log config.status $(top_builddir)/config/icucross.mk autom4te.cache uconfig.h.prepend
+ $(RMV) config.cache config.log config.status $(top_builddir)/config/icucross.mk $(top_builddir)/config/icucross.inc autom4te.cache uconfig.h.prepend
$(RMV) Makefile config/Makefile icudefs.mk $(LIBDIR) $(BINDIR)
-$(RMV) dist
@@ -238,6 +238,11 @@
echo "PKGDATA_INVOKE=$(LDLIBRARYPATH_ENVVAR)=$(LIBRARY_PATH_PREFIX)"'$$(cross_buildroot)/stubdata:$$(cross_buildroot)/tools/ctestfw:$$(TOOLLIBDIR):$$$$'"$(LDLIBRARYPATH_ENVVAR) " ;\
echo ) >> $@
+config/icucross.inc: $(top_builddir)/icudefs.mk $(top_builddir)/Makefile @platform_make_fragment@
+ @echo rebuilding $@
+ @(grep '^CURR_FULL_DIR' $(top_builddir)/icudefs.mk ; \
+ grep '^CURR_FULL_DIR' @platform_make_fragment@ || echo ""; \
+ ) > $@
config/icu.pc: $(srcdir)/config/icu.pc.in
cd $(top_builddir) \
diff --git a/aclocal.m4 b/aclocal.m4
index a67979c..7991322 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -31,12 +31,15 @@
icu_cv_host_frag=mh-linux-va
fi ;;
*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;;
-*-*-cygwin|*-*-mingw32)
+*-*-cygwin|*-*-mingw32|*-*-mingw64)
if test "$GCC" = yes; then
AC_TRY_COMPILE([
#ifndef __MINGW32__
#error This is not MinGW
-#endif], [], icu_cv_host_frag=mh-mingw, icu_cv_host_frag=mh-cygwin)
+#endif], [], AC_TRY_COMPILE([
+#ifndef __MINGW64__
+#error This is not MinGW64
+#endif], [], icu_cv_host_frag=mh-mingw64, icu_cv_host_frag=mh-mingw), icu_cv_host_frag=mh-cygwin)
else
icu_cv_host_frag=mh-cygwin-msvc
fi ;;
diff --git a/allinone/allinone.sln b/allinone/allinone.sln
index 0101cae..d1360db 100644
--- a/allinone/allinone.sln
+++ b/allinone/allinone.sln
@@ -52,7 +52,7 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icupkg", "..\tools\icupkg\icupkg.vcxproj", "{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}"
EndProject
-Project("{9D4211F7-2C77-439C-82F0-30A4E43BA569}") = "gendict", "..\tools\gendict\gendict.vcxproj", "{9D4211F7-2C77-439C-82F0-30A4E43BA569}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gendict", "..\tools\gendict\gendict.vcxproj", "{9D4211F7-2C77-439C-82F0-30A4E43BA569}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "letest", "..\test\letest\letest.vcxproj", "{67351485-4D18-4245-BE39-A7EF0675ACD2}"
EndProject
diff --git a/common/Android.mk b/common/Android.mk
index e9a4e14..396b706 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -49,6 +49,7 @@
unorm_it.c uresbund.cpp \
ures_cnv.c uresdata.c \
usc_impl.c uscript.c \
+ uscript_props.cpp \
ushape.cpp ustrcase.cpp \
ustr_cnv.c ustrfmt.c \
ustring.cpp ustrtrns.cpp \
diff --git a/common/Makefile.in b/common/Makefile.in
index f8efcf9..be6a233 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -1,6 +1,6 @@
#******************************************************************************
#
-# Copyright (C) 1999-2012, International Business Machines
+# Copyright (C) 1999-2013, International Business Machines
# Corporation and others. All Rights Reserved.
#
#******************************************************************************
@@ -97,7 +97,7 @@
normalizer2impl.o normalizer2.o filterednormalizer2.o normlzr.o unorm.o unormcmp.o unorm_it.o \
chariter.o schriter.o uchriter.o uiter.o \
patternprops.o uchar.o uprops.o ucase.o propname.o ubidi_props.o ubidi.o ubidiwrt.o ubidiln.o ushape.o \
-uscript.o usc_impl.o unames.o \
+uscript.o uscript_props.o usc_impl.o unames.o \
utrie.o utrie2.o utrie2_builder.o bmpset.o unisetspan.o uset_props.o uniset_props.o uniset_closure.o uset.o uniset.o usetiter.o ruleiter.o caniter.o unifilt.o unifunct.o \
uarrsort.o brkiter.o ubrk.o brkeng.o dictbe.o \
rbbi.o rbbidata.o rbbinode.o rbbirb.o rbbiscan.o rbbisetb.o rbbistbl.o rbbitblb.o \
diff --git a/common/appendable.cpp b/common/appendable.cpp
index 4d672fc..e46d079 100644
--- a/common/appendable.cpp
+++ b/common/appendable.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2011, International Business Machines
+* Copyright (C) 2011-2012, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
* file name: appendable.cpp
@@ -67,8 +67,6 @@
return scratch;
}
-UOBJECT_DEFINE_NO_RTTI_IMPLEMENTATION(Appendable)
-
// UnicodeStringAppendable is implemented in unistr.cpp.
U_NAMESPACE_END
diff --git a/common/bmpset.cpp b/common/bmpset.cpp
index b874436..7cd32eb 100644
--- a/common/bmpset.cpp
+++ b/common/bmpset.cpp
@@ -690,16 +690,9 @@
int32_t prev=length;
UChar32 c;
- if(b<0xc0) {
- // trail byte: collect a multi-byte character
- c=utf8_prevCharSafeBody(s, 0, &length, b, -1);
- if(c<0) {
- c=0xfffd;
- }
- } else {
- // lead byte in last-trail position
- c=0xfffd;
- }
+ // trail byte: collect a multi-byte character
+ // (or lead byte in last-trail position)
+ c=utf8_prevCharSafeBody(s, 0, &length, b, -3);
// c is a valid code point, not ASCII, not a surrogate
if(c<=0x7ff) {
if((USetSpanCondition)((table7FF[c&0x3f]&((uint32_t)1<<(c>>6)))!=0) != spanCondition) {
diff --git a/common/common.vcxproj b/common/common.vcxproj
index bbe213d..05696e0 100644
--- a/common/common.vcxproj
+++ b/common/common.vcxproj
@@ -104,7 +104,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin\icuuc50.dll</OutputFile>
+ <OutputFile>..\..\bin\icuuc51.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib\icuuc.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -145,7 +145,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin\icuuc50d.dll</OutputFile>
+ <OutputFile>..\..\bin\icuuc51d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib\icuucd.pdb</ProgramDatabaseFile>
@@ -183,7 +183,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin64\icuuc50.dll</OutputFile>
+ <OutputFile>..\..\bin64\icuuc51.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib64\icuuc.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -222,7 +222,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin64\icuuc50d.dll</OutputFile>
+ <OutputFile>..\..\bin64\icuuc51d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib64\icuucd.pdb</ProgramDatabaseFile>
@@ -389,6 +389,7 @@
<ClCompile Include="uprops.cpp" />
<ClCompile Include="usc_impl.c" />
<ClCompile Include="uscript.c" />
+ <ClCompile Include="uscript_props.cpp" />
<ClCompile Include="uset.cpp" />
<ClCompile Include="uset_props.cpp" />
<ClCompile Include="usetiter.cpp" />
diff --git a/common/common.vcxproj.filters b/common/common.vcxproj.filters
index 492b053..ff941aa 100644
--- a/common/common.vcxproj.filters
+++ b/common/common.vcxproj.filters
@@ -406,6 +406,9 @@
<ClCompile Include="uscript.c">
<Filter>properties & sets</Filter>
</ClCompile>
+ <ClCompile Include="uscript_props.cpp">
+ <Filter>properties & sets</Filter>
+ </ClCompile>
<ClCompile Include="uset.cpp">
<Filter>properties & sets</Filter>
</ClCompile>
diff --git a/common/listformatter.cpp b/common/listformatter.cpp
index 6a6e986..3097143 100644
--- a/common/listformatter.cpp
+++ b/common/listformatter.cpp
@@ -21,6 +21,7 @@
#include "ulocimp.h"
#include "charstr.h"
#include "ucln_cmn.h"
+#include "uresimp.h"
U_NAMESPACE_BEGIN
@@ -43,6 +44,9 @@
U_CDECL_END
+static ListFormatData* loadListFormatData(const Locale& locale, UErrorCode& errorCode);
+static void getStringByKey(const UResourceBundle* rb, const char* key, UnicodeString& result, UErrorCode& errorCode);
+
void ListFormatter::initializeHash(UErrorCode& errorCode) {
if (U_FAILURE(errorCode)) {
return;
@@ -57,106 +61,6 @@
listPatternHash->setValueDeleter(uprv_deleteListFormatData);
ucln_common_registerCleanup(UCLN_COMMON_LIST_FORMATTER, uprv_listformatter_cleanup);
- addDataToHash("af", "{0} en {1}", "{0}, {1}", "{0}, {1}", "{0} en {1}", errorCode);
- addDataToHash("am", "{0} \\u12a5\\u1293 {1}", "{0}, {1}", "{0}, {1}", "{0}, \\u12a5\\u1293 {1}", errorCode);
- addDataToHash("ar", "{0} \\u0648 {1}", "{0}\\u060c {1}", "{0}\\u060c {1}", "{0}\\u060c \\u0648 {1}", errorCode);
- addDataToHash("bg", "{0} \\u0438 {1}", "{0}, {1}", "{0}, {1}", "{0} \\u0438 {1}", errorCode);
- addDataToHash("bn", "{0} \\u098f\\u09ac\\u0982 {1}", "{0}, {1}", "{0}, {1}", "{0}, \\u098f\\u09ac\\u0982 {1}", errorCode);
- addDataToHash("bs", "{0} i {1}", "{0}, {1}", "{0}, {1}", "{0} i {1}", errorCode);
- addDataToHash("ca", "{0} i {1}", "{0}, {1}", "{0}, {1}", "{0} i {1}", errorCode);
- addDataToHash("cs", "{0} a {1}", "{0}, {1}", "{0}, {1}", "{0} a {1}", errorCode);
- addDataToHash("da", "{0} og {1}", "{0}, {1}", "{0}, {1}", "{0} og {1}", errorCode);
- addDataToHash("de", "{0} und {1}", "{0}, {1}", "{0}, {1}", "{0} und {1}", errorCode);
- addDataToHash("ee", "{0} kple {1}", "{0}, {1}", "{0}, {1}", "{0}, kple {1}", errorCode);
- addDataToHash("el", "{0} \\u03ba\\u03b1\\u03b9 {1}", "{0}, {1}", "{0}, {1}", "{0} \\u03ba\\u03b1\\u03b9 {1}", errorCode);
- addDataToHash("en", "{0} and {1}", "{0}, {1}", "{0}, {1}", "{0}, and {1}", errorCode);
- addDataToHash("es", "{0} y {1}", "{0}, {1}", "{0}, {1}", "{0} y {1}", errorCode);
- addDataToHash("et", "{0} ja {1}", "{0}, {1}", "{0}, {1}", "{0} ja {1}", errorCode);
- addDataToHash("eu", "{0} eta {1}", "{0}, {1}", "{0}, {1}", "{0} eta {1}", errorCode);
- addDataToHash("fa", "{0} \\u0648 {1}", "{0}\\u060c\\u200f {1}", "{0}\\u060c\\u200f {1}", "{0}\\u060c \\u0648 {1}", errorCode);
- addDataToHash("fi", "{0} ja {1}", "{0}, {1}", "{0}, {1}", "{0} ja {1}", errorCode);
- addDataToHash("fil", "{0} at {1}", "{0}, {1}", "{0}, {1}", "{0} at {1}", errorCode);
- addDataToHash("fo", "{0} og {1}", "{0}, {1}", "{0}, {1}", "{0} og {1}", errorCode);
- addDataToHash("fr", "{0} et {1}", "{0}, {1}", "{0}, {1}", "{0} et {1}", errorCode);
- addDataToHash("fur", "{0} e {1}", "{0}, {1}", "{0}, {1}", "{0} e {1}", errorCode);
- addDataToHash("gd", "{0} agus {1}", "{0}, {1}", "{0}, {1}", "{0}, agus {1}", errorCode);
- addDataToHash("gl", "{0} e {1}", "{0}, {1}", "{0}, {1}", "{0} e {1}", errorCode);
- addDataToHash("gsw", "{0} und {1}", "{0}, {1}", "{0}, {1}", "{0} und {1}", errorCode);
- addDataToHash("gu", "{0} \\u0a85\\u0aa8\\u0ac7 {1}", "{0}, {1}", "{0}, {1}", "{0} \\u0a85\\u0aa8\\u0ac7 {1}", errorCode);
- addDataToHash("he", "{0} \\u05d5-{1}", "{0}, {1}", "{0}, {1}", "{0} \\u05d5-{1}", errorCode);
- addDataToHash("hi", "{0} \\u0914\\u0930 {1}", "{0}, {1}", "{0}, {1}", "{0}, \\u0914\\u0930 {1}", errorCode);
- addDataToHash("hr", "{0} i {1}", "{0}, {1}", "{0}, {1}", "{0} i {1}", errorCode);
- addDataToHash("hu", "{0} \\u00e9s {1}", "{0}, {1}", "{0}, {1}", "{0} \\u00e9s {1}", errorCode);
- addDataToHash("id", "{0} dan {1}", "{0}, {1}", "{0}, {1}", "{0}, dan {1}", errorCode);
- addDataToHash("is", "{0} og {1}", "{0}, {1}", "{0}, {1}", "{0} og {1}", errorCode);
- addDataToHash("it", "{0} e {1}", "{0}, {1}", "{0}, {1}", "{0}, e {1}", errorCode);
- addDataToHash("ja", "{0}\\u3001{1}", "{0}\\u3001{1}", "{0}\\u3001{1}", "{0}\\u3001{1}", errorCode);
- addDataToHash("ka", "{0} \\u10d3\\u10d0 {1}", "{0}, {1}", "{0}, {1}", "{0} \\u10d3\\u10d0 {1}", errorCode);
- addDataToHash("kea", "{0} y {1}", "{0}, {1}", "{0}, {1}", "{0} y {1}", errorCode);
- addDataToHash("kl", "{0} aamma {1}", "{0} aamma {1}", "{0}, {1}", "{0}, {1}", errorCode);
- addDataToHash("kn", "{0} \\u0cae\\u0ca4\\u0ccd\\u0ca4\\u0cc1 {1}", "{0}, {1}", "{0}, {1}",
- "{0}, \\u0cae\\u0ca4\\u0ccd\\u0ca4\\u0cc1 {1}", errorCode);
- addDataToHash("ko", "{0} \\ubc0f {1}", "{0}, {1}", "{0}, {1}", "{0} \\ubc0f {1}", errorCode);
- addDataToHash("ksh", "{0} un {1}", "{0}, {1}", "{0}, {1}", "{0} un {1}", errorCode);
- addDataToHash("lt", "{0} ir {1}", "{0}, {1}", "{0}, {1}", "{0} ir {1}", errorCode);
- addDataToHash("lv", "{0} un {1}", "{0}, {1}", "{0}, {1}", "{0} un {1}", errorCode);
- addDataToHash("ml", "{0} \\u0d15\\u0d42\\u0d1f\\u0d3e\\u0d24\\u0d46 {1}", "{0}, {1}", "{0}, {1}",
- "{0}, {1} \\u0d0e\\u0d28\\u0d4d\\u0d28\\u0d3f\\u0d35", errorCode);
- addDataToHash("mr", "{0} \\u0906\\u0923\\u093f {1}", "{0}, {1}", "{0}, {1}", "{0} \\u0906\\u0923\\u093f {1}", errorCode);
- addDataToHash("ms", "{0} dan {1}", "{0}, {1}", "{0}, {1}", "{0}, dan {1}", errorCode);
- addDataToHash("nb", "{0} og {1}", "{0}, {1}", "{0}, {1}", "{0} og {1}", errorCode);
- addDataToHash("nl", "{0} en {1}", "{0}, {1}", "{0}, {1}", "{0} en {1}", errorCode);
- addDataToHash("nn", "{0} og {1}", "{0}, {1}", "{0}, {1}", "{0} og {1}", errorCode);
- addDataToHash("pl", "{0} i {1}", "{0}; {1}", "{0}; {1}", "{0} i {1}", errorCode);
- addDataToHash("pt", "{0} e {1}", "{0}, {1}", "{0}, {1}", "{0} e {1}", errorCode);
- addDataToHash("ro", "{0} \\u015fi {1}", "{0}, {1}", "{0}, {1}", "{0} \\u015fi {1}", errorCode);
- addDataToHash("", "{0}, {1}", "{0}, {1}", "{0}, {1}", "{0}, {1}", errorCode); // root
- addDataToHash("ru", "{0} \\u0438 {1}", "{0}, {1}", "{0}, {1}", "{0} \\u0438 {1}", errorCode);
- addDataToHash("se", "{0} ja {1}", "{0}, {1}", "{0}, {1}", "{0} ja {1}", errorCode);
- addDataToHash("sk", "{0} a {1}", "{0}, {1}", "{0}, {1}", "{0} a {1}", errorCode);
- addDataToHash("sl", "{0} in {1}", "{0}, {1}", "{0}, {1}", "{0} in {1}", errorCode);
- addDataToHash("sr", "{0} \\u0438 {1}", "{0}, {1}", "{0}, {1}", "{0} \\u0438 {1}", errorCode);
- addDataToHash("sr_Cyrl", "{0} \\u0438 {1}", "{0}, {1}", "{0}, {1}", "{0} \\u0438 {1}", errorCode);
- addDataToHash("sr_Latn", "{0} i {1}", "{0}, {1}", "{0}, {1}", "{0} i {1}", errorCode);
- addDataToHash("sv", "{0} och {1}", "{0}, {1}", "{0}, {1}", "{0} och {1}", errorCode);
- addDataToHash("sw", "{0} na {1}", "{0}, {1}", "{0}, {1}", "{0}, na {1}", errorCode);
- addDataToHash("ta", "{0} \\u0bae\\u0bb1\\u0bcd\\u0bb1\\u0bc1\\u0bae\\u0bcd {1}", "{0}, {1}", "{0}, {1}",
- "{0} \\u0bae\\u0bb1\\u0bcd\\u0bb1\\u0bc1\\u0bae\\u0bcd {1}", errorCode);
- addDataToHash("te", "{0} \\u0c2e\\u0c30\\u0c3f\\u0c2f\\u0c41 {1}", "{0}, {1}", "{0}, {1}",
- "{0} \\u0c2e\\u0c30\\u0c3f\\u0c2f\\u0c41 {1}", errorCode);
- addDataToHash("th", "{0}\\u0e41\\u0e25\\u0e30{1}", "{0} {1}", "{0} {1}", "{0} \\u0e41\\u0e25\\u0e30{1}", errorCode);
- addDataToHash("tr", "{0} ve {1}", "{0}, {1}", "{0}, {1}", "{0} ve {1}", errorCode);
- addDataToHash("uk", "{0} \\u0442\\u0430 {1}", "{0}, {1}", "{0}, {1}", "{0} \\u0442\\u0430 {1}", errorCode);
- addDataToHash("ur", "{0} \\u0627\\u0648\\u0631 {1}", "{0}\\u060c {1}", "{0}\\u060c {1}",
- "{0}\\u060c \\u0627\\u0648\\u0631 {1}", errorCode);
- addDataToHash("vi", "{0} v\\u00e0 {1}", "{0}, {1}", "{0}, {1}", "{0} v\\u00e0 {1}", errorCode);
- addDataToHash("wae", "{0} und {1}", "{0}, {1}", "{0}, {1}", "{0} und {1}", errorCode);
- addDataToHash("zh", "{0}\\u548c{1}", "{0}\\u3001{1}", "{0}\\u3001{1}", "{0}\\u548c{1}", errorCode);
- addDataToHash("zu", "I-{0} ne-{1}", "{0}, {1}", "{0}, {1}", "{0}, no-{1}", errorCode);
-}
-
-void ListFormatter::addDataToHash(
- const char* locale,
- const char* two,
- const char* start,
- const char* middle,
- const char* end,
- UErrorCode& errorCode) {
- if (U_FAILURE(errorCode)) {
- return;
- }
- UnicodeString key(locale, -1, US_INV);
- ListFormatData* value = new ListFormatData(
- UnicodeString(two, -1, US_INV).unescape(),
- UnicodeString(start, -1, US_INV).unescape(),
- UnicodeString(middle, -1, US_INV).unescape(),
- UnicodeString(end, -1, US_INV).unescape());
-
- if (value == NULL) {
- errorCode = U_MEMORY_ALLOCATION_ERROR;
- return;
- }
- listPatternHash->put(key, value, errorCode);
}
const ListFormatData* ListFormatter::getListFormatData(
@@ -164,6 +68,8 @@
if (U_FAILURE(errorCode)) {
return NULL;
}
+ UnicodeString key(locale.getName(), -1, US_INV);
+ ListFormatData* result = NULL;
{
Mutex m(&listFormatterMutex);
if (listPatternHash == NULL) {
@@ -172,10 +78,68 @@
return NULL;
}
}
+ result = static_cast<ListFormatData*>(listPatternHash->get(key));
+ }
+ if (result != NULL) {
+ return result;
+ }
+ result = loadListFormatData(locale, errorCode);
+ if (U_FAILURE(errorCode)) {
+ return NULL;
}
- UnicodeString key(locale.getName(), -1, US_INV);
- return static_cast<const ListFormatData*>(listPatternHash->get(key));
+ {
+ Mutex m(&listFormatterMutex);
+ ListFormatData* temp = static_cast<ListFormatData*>(listPatternHash->get(key));
+ if (temp != NULL) {
+ delete result;
+ result = temp;
+ } else {
+ listPatternHash->put(key, result, errorCode);
+ if (U_FAILURE(errorCode)) {
+ return NULL;
+ }
+ }
+ }
+ return result;
+}
+
+static ListFormatData* loadListFormatData(const Locale& locale, UErrorCode& errorCode) {
+ UResourceBundle* rb = ures_open(NULL, locale.getName(), &errorCode);
+ if (U_FAILURE(errorCode)) {
+ ures_close(rb);
+ return NULL;
+ }
+ rb = ures_getByKeyWithFallback(rb, "listPattern", rb, &errorCode);
+ rb = ures_getByKeyWithFallback(rb, "standard", rb, &errorCode);
+ if (U_FAILURE(errorCode)) {
+ ures_close(rb);
+ return NULL;
+ }
+ UnicodeString two, start, middle, end;
+ getStringByKey(rb, "2", two, errorCode);
+ getStringByKey(rb, "start", start, errorCode);
+ getStringByKey(rb, "middle", middle, errorCode);
+ getStringByKey(rb, "end", end, errorCode);
+ ures_close(rb);
+ if (U_FAILURE(errorCode)) {
+ return NULL;
+ }
+ ListFormatData* result = new ListFormatData(two, start, middle, end);
+ if (result == NULL) {
+ errorCode = U_MEMORY_ALLOCATION_ERROR;
+ return NULL;
+ }
+ return result;
+}
+
+static void getStringByKey(const UResourceBundle* rb, const char* key, UnicodeString& result, UErrorCode& errorCode) {
+ int32_t len;
+ const UChar* ustr = ures_getStringByKeyWithFallback(rb, key, &len, &errorCode);
+ if (U_FAILURE(errorCode)) {
+ return;
+ }
+ result.setTo(ustr, len);
}
ListFormatter* ListFormatter::createInstance(UErrorCode& errorCode) {
@@ -185,30 +149,16 @@
ListFormatter* ListFormatter::createInstance(const Locale& locale, UErrorCode& errorCode) {
Locale tempLocale = locale;
- for (;;) {
- const ListFormatData* listFormatData = getListFormatData(tempLocale, errorCode);
- if (U_FAILURE(errorCode)) {
- return NULL;
- }
- if (listFormatData != NULL) {
- ListFormatter* p = new ListFormatter(*listFormatData);
- if (p == NULL) {
- errorCode = U_MEMORY_ALLOCATION_ERROR;
- return NULL;
- }
- return p;
- }
- errorCode = U_ZERO_ERROR;
- Locale correctLocale;
- getFallbackLocale(tempLocale, correctLocale, errorCode);
- if (U_FAILURE(errorCode)) {
- return NULL;
- }
- if (correctLocale.isBogus()) {
- return createInstance(Locale::getRoot(), errorCode);
- }
- tempLocale = correctLocale;
+ const ListFormatData* listFormatData = getListFormatData(tempLocale, errorCode);
+ if (U_FAILURE(errorCode)) {
+ return NULL;
}
+ ListFormatter* p = new ListFormatter(*listFormatData);
+ if (p == NULL) {
+ errorCode = U_MEMORY_ALLOCATION_ERROR;
+ return NULL;
+ }
+ return p;
}
ListFormatter::ListFormatter(const ListFormatData& listFormatterData) : data(listFormatterData) {
@@ -216,41 +166,6 @@
ListFormatter::~ListFormatter() {}
-void ListFormatter::getFallbackLocale(const Locale& in, Locale& out, UErrorCode& errorCode) {
- if (uprv_strcmp(in.getName(), "zh_TW") == 0) {
- out = Locale::getTraditionalChinese();
- } else {
- const char* localeString = in.getName();
- const char* extStart = locale_getKeywordsStart(localeString);
- if (extStart == NULL) {
- extStart = uprv_strchr(localeString, 0);
- }
- const char* last = extStart;
-
- // TODO: Check whether uloc_getParent() will work here.
- while (last > localeString && *(last - 1) != '_') {
- --last;
- }
-
- // Truncate empty segment.
- while (last > localeString) {
- if (*(last-1) != '_') {
- break;
- }
- --last;
- }
-
- size_t localePortionLen = last - localeString;
- CharString fullLocale;
- fullLocale.append(localeString, localePortionLen, errorCode).append(extStart, errorCode);
-
- if (U_FAILURE(errorCode)) {
- return;
- }
- out = Locale(fullLocale.data());
- }
-}
-
UnicodeString& ListFormatter::format(const UnicodeString items[], int32_t nItems,
UnicodeString& appendTo, UErrorCode& errorCode) const {
if (U_FAILURE(errorCode)) {
@@ -263,7 +178,7 @@
addNewString(data.twoPattern, newString, items[1], errorCode);
} else if (nItems > 2) {
addNewString(data.startPattern, newString, items[1], errorCode);
- int i;
+ int32_t i;
for (i = 2; i < nItems - 1; ++i) {
addNewString(data.middlePattern, newString, items[i], errorCode);
}
@@ -320,6 +235,4 @@
originalString = result;
}
-UOBJECT_DEFINE_NO_RTTI_IMPLEMENTATION(ListFormatter)
-
U_NAMESPACE_END
diff --git a/common/locmap.c b/common/locmap.c
index 9ebc702..bf4498b 100644
--- a/common/locmap.c
+++ b/common/locmap.c
@@ -1,6 +1,6 @@
/*
**********************************************************************
- * Copyright (C) 1996-2012, International Business Machines
+ * Copyright (C) 1996-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*
@@ -196,10 +196,25 @@
};
ILCID_POSIX_ELEMENT_ARRAY(0x047e, br, br_FR)
-ILCID_POSIX_ELEMENT_ARRAY(0x0403, ca, ca_ES)
+
+ILCID_POSIX_SUBTABLE(ca) {
+ {0x03, "ca"},
+ {0x0403, "ca_ES"},
+ {0x0803, "ca_ES_VALENCIA"}
+};
+
ILCID_POSIX_ELEMENT_ARRAY(0x0483, co, co_FR)
ILCID_POSIX_ELEMENT_ARRAY(0x045c, chr,chr_US)
+ILCID_POSIX_SUBTABLE(ckb) {
+ {0x92, "ckb"},
+ {0x92, "ku"},
+ {0x7c92, "ckb_Arab"},
+ {0x7c92, "ku_Arab"},
+ {0x0492, "ckb_Arab_IQ"},
+ {0x0492, "ku_Arab_IQ"}
+};
+
/* Declared as cs_CZ to get around compiler errors on z/OS, which defines cs as a function */
ILCID_POSIX_ELEMENT_ARRAY(0x0405, cs, cs_CZ)
@@ -296,6 +311,12 @@
{0x048c, "fa_AF"} /* Persian/Dari (Afghanistan) */
};
+ILCID_POSIX_SUBTABLE(ff) {
+ {0x67, "ff"},
+ {0x7c67, "ff_Latn"},
+ {0x0867, "ff_Latn_SN"}
+};
+
ILCID_POSIX_ELEMENT_ARRAY(0x040b, fi, fi_FI)
ILCID_POSIX_ELEMENT_ARRAY(0x0464, fil,fil_PH)
ILCID_POSIX_ELEMENT_ARRAY(0x0438, fo, fo_FO)
@@ -495,7 +516,8 @@
ILCID_POSIX_SUBTABLE(pa) {
{0x46, "pa"},
{0x0446, "pa_IN"},
- {0x0846, "pa_PK"}
+ {0x0846, "pa_PK"},
+ {0x0846, "pa_Arab_PK"}
};
ILCID_POSIX_ELEMENT_ARRAY(0x0479, pap, pap_AN)
@@ -585,7 +607,13 @@
ILCID_POSIX_ELEMENT_ARRAY(0x0441, sw, sw_KE)
ILCID_POSIX_ELEMENT_ARRAY(0x045A, syr, syr_SY)
-ILCID_POSIX_ELEMENT_ARRAY(0x0449, ta, ta_IN)
+
+ILCID_POSIX_SUBTABLE(ta) {
+ {0x49, "ta"},
+ {0x0449, "ta_IN"},
+ {0x0849, "ta_LK"}
+};
+
ILCID_POSIX_ELEMENT_ARRAY(0x044a, te, te_IN)
/* Cyrillic based by default */
@@ -599,9 +627,7 @@
ILCID_POSIX_SUBTABLE(ti) {
{0x73, "ti"},
- {0x0473, "ti_ER"},
{0x0873, "ti_ER"},
- {0x0873, "ti_ET"},
{0x0473, "ti_ET"}
};
@@ -609,7 +635,7 @@
ILCID_POSIX_SUBTABLE(tn) {
{0x32, "tn"},
- {0x0432, "tn_BW"},
+ {0x0832, "tn_BW"},
{0x0432, "tn_ZA"}
};
@@ -621,6 +647,7 @@
{0x5f, "tzm"},
{0x7c5f, "tzm_Latn"},
{0x085f, "tzm_Latn_DZ"},
+ {0x105f, "tzm_Tfng_MA"},
{0x045f, "tmz"}
};
@@ -714,6 +741,7 @@
ILCID_POSIX_MAP(br), /* br Breton 0x7e */
ILCID_POSIX_MAP(ca), /* ca Catalan 0x03 */
ILCID_POSIX_MAP(chr), /* chr Cherokee 0x5c */
+ ILCID_POSIX_MAP(ckb), /* ckb Sorani (Central Kurdish) 0x92 */
ILCID_POSIX_MAP(co), /* co Corsican 0x83 */
ILCID_POSIX_MAP(cs), /* cs Czech 0x05 */
ILCID_POSIX_MAP(cy), /* cy Welsh 0x52 */
@@ -728,6 +756,7 @@
ILCID_POSIX_MAP(eu), /* eu Basque 0x2d */
ILCID_POSIX_MAP(fa), /* fa Persian/Farsi 0x29 */
ILCID_POSIX_MAP(fa_AF), /* fa Persian/Dari 0x8c */
+ ILCID_POSIX_MAP(ff), /* ff Fula 0x67 */
ILCID_POSIX_MAP(fi), /* fi Finnish 0x0b */
ILCID_POSIX_MAP(fil), /* fil Filipino 0x64 */
ILCID_POSIX_MAP(fo), /* fo Faroese 0x38 */
diff --git a/common/messagepattern.cpp b/common/messagepattern.cpp
index 18d8a34..de0410b 100644
--- a/common/messagepattern.cpp
+++ b/common/messagepattern.cpp
@@ -1174,8 +1174,6 @@
parseError->postContext[length]=0;
}
-UOBJECT_DEFINE_NO_RTTI_IMPLEMENTATION(MessagePattern)
-
// MessageImpl ------------------------------------------------------------- ***
void
diff --git a/common/normalizer2.cpp b/common/normalizer2.cpp
index c78d0a7..a2c27dd 100644
--- a/common/normalizer2.cpp
+++ b/common/normalizer2.cpp
@@ -50,8 +50,6 @@
return 0;
}
-UOBJECT_DEFINE_NO_RTTI_IMPLEMENTATION(Normalizer2)
-
// Normalizer2 implementation for the old UNORM_NONE.
class NoopNormalizer2 : public Normalizer2 {
virtual ~NoopNormalizer2();
diff --git a/common/putil.cpp b/common/putil.cpp
index 4694aa9..01b0683 100644
--- a/common/putil.cpp
+++ b/common/putil.cpp
@@ -1,7 +1,7 @@
/*
******************************************************************************
*
-* Copyright (C) 1997-2012, International Business Machines
+* Copyright (C) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@@ -97,15 +97,16 @@
# define ICU_NO_USER_DATA_OVERRIDE 1
#elif U_PLATFORM == U_PF_OS390
# include "unicode/ucnv.h" /* Needed for UCNV_SWAP_LFNL_OPTION_STRING */
-#elif U_PLATFORM_IS_DARWIN_BASED || U_PLATFORM_IS_LINUX_BASED || U_PLATFORM == U_PF_BSD
+#elif U_PLATFORM_IS_DARWIN_BASED || U_PLATFORM_IS_LINUX_BASED || U_PLATFORM == U_PF_BSD || U_PLATFORM == U_PF_SOLARIS
# include <limits.h>
# include <unistd.h>
+# if U_PLATFORM == U_PF_SOLARIS
+# ifndef _XPG4_2
+# define _XPG4_2
+# endif
+# endif
#elif U_PLATFORM == U_PF_QNX
# include <sys/neutrino.h>
-#elif U_PLATFORM == U_PF_SOLARIS
-# ifndef _XPG4_2
-# define _XPG4_2
-# endif
#endif
#if (U_PF_MINGW <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__)
@@ -671,12 +672,16 @@
extern U_IMPORT char *U_TZNAME[];
#endif
-#if !UCONFIG_NO_FILE_IO && (U_PLATFORM_IS_DARWIN_BASED || U_PLATFORM_IS_LINUX_BASED || U_PLATFORM == U_PF_BSD)
+#if !UCONFIG_NO_FILE_IO && (U_PLATFORM_IS_DARWIN_BASED || U_PLATFORM_IS_LINUX_BASED || U_PLATFORM == U_PF_BSD || U_PLATFORM == U_PF_SOLARIS)
/* These platforms are likely to use Olson timezone IDs. */
#define CHECK_LOCALTIME_LINK 1
#if U_PLATFORM_IS_DARWIN_BASED
#include <tzfile.h>
#define TZZONEINFO (TZDIR "/")
+#elif U_PLATFORM == U_PF_SOLARIS
+#define TZDEFAULT "/etc/localtime"
+#define TZZONEINFO "/usr/share/lib/zoneinfo/"
+#define TZ_ENV_CHECK "localtime"
#else
#define TZDEFAULT "/etc/localtime"
#define TZZONEINFO "/usr/share/zoneinfo/"
@@ -1006,8 +1011,12 @@
/* This code can be temporarily disabled to test tzname resolution later on. */
#ifndef DEBUG_TZNAME
tzid = getenv("TZ");
- if (tzid != NULL && isValidOlsonID(tzid))
- {
+ if (tzid != NULL && isValidOlsonID(tzid)
+#if U_PLATFORM == U_PF_SOLARIS
+ /* When TZ equals localtime on Solaris, check the /etc/localtime file. */
+ && uprv_strcmp(tzid, TZ_ENV_CHECK) != 0
+#endif
+ ) {
/* This might be a good Olson ID. */
skipZoneIDPrefix(&tzid);
return tzid;
diff --git a/common/putilimp.h b/common/putilimp.h
index 3229242..a63f223 100644
--- a/common/putilimp.h
+++ b/common/putilimp.h
@@ -116,7 +116,10 @@
#elif U_PLATFORM == U_PF_ANDROID
# define U_TIMEZONE timezone
#elif U_PLATFORM_IS_LINUX_BASED
-# define U_TIMEZONE __timezone
+# if !defined(__UCLIBC__)
+ /* __timezone is only available in glibc */
+# define U_TIMEZONE __timezone
+# endif
#elif U_PLATFORM_USES_ONLY_WIN32_API
# define U_TIMEZONE _timezone
#elif U_PLATFORM == U_PF_BSD && !defined(__NetBSD__)
diff --git a/common/stringtriebuilder.cpp b/common/stringtriebuilder.cpp
index 32a9311..109fcdc 100644
--- a/common/stringtriebuilder.cpp
+++ b/common/stringtriebuilder.cpp
@@ -381,8 +381,6 @@
return *(const Node *)left==*(const Node *)right;
}
-UOBJECT_DEFINE_NO_RTTI_IMPLEMENTATION(StringTrieBuilder)
-
UBool
StringTrieBuilder::Node::operator==(const Node &other) const {
return this==&other || (typeid(*this)==typeid(other) && hash==other.hash);
@@ -396,8 +394,6 @@
return edgeNumber;
}
-UOBJECT_DEFINE_NO_RTTI_IMPLEMENTATION(StringTrieBuilder::Node)
-
UBool
StringTrieBuilder::FinalValueNode::operator==(const Node &other) const {
if(this==&other) {
diff --git a/common/ucnv.c b/common/ucnv.c
index f7bf548..52d4f6d 100644
--- a/common/ucnv.c
+++ b/common/ucnv.c
@@ -680,7 +680,7 @@
ccsid = converter->sharedData->staticData->codepage;
if (ccsid == 0) {
/* Rare case. This is for cases like gb18030,
- which doesn't have an IBM cannonical name, but does have an IBM alias. */
+ which doesn't have an IBM canonical name, but does have an IBM alias. */
const char *standardName = ucnv_getStandardName(ucnv_getName(converter, err), "IBM", err);
if (U_SUCCESS(*err) && standardName) {
const char *ccsidStr = uprv_strchr(standardName, '-');
diff --git a/common/ucnv2022.cpp b/common/ucnv2022.cpp
index 2ebb643..c09c584 100644
--- a/common/ucnv2022.cpp
+++ b/common/ucnv2022.cpp
@@ -476,8 +476,7 @@
}
version = pArgs->options & UCNV_OPTIONS_VERSION_MASK;
myConverterData->version = version;
-
- /* BEGIN android-changed */
+ /* Begin Google-specific change. */
/* The "jk" locale ID was made up for KDDI ISO-2022-JP. */
/* The "js" locale ID was made up for SoftBank ISO-2022-JP. */
if((myLocale[0]=='j' &&
@@ -502,9 +501,18 @@
myConverterData->myConverterArray[JISX208] =
ucnv_loadSharedData("softbank-jisx-208-2007", &stackPieces, &stackArgs, errorCode);
} else {
- myConverterData->myConverterArray[JISX208] =
- ucnv_loadSharedData("Shift-JIS", &stackPieces, &stackArgs, errorCode);
+ /*
+ * Change for http://b/issue?id=937017 :
+ * Restore JIS X 0208 ISO-2022-JP mappings from before
+ * sharing the table with the Shift-JIS converter
+ * (CL 5963009 and http://bugs.icu-project.org/trac/ticket/5797).
+ * TODO(mscherer): Create and use a new, unified Google Shift-JIS
+ * table for both Shift-JIS and ISO-2022-JP.
+ */
+ myConverterData->myConverterArray[JISX208] =
+ ucnv_loadSharedData("jisx-208", &stackPieces, &stackArgs, errorCode);
}
+ /* End Google-specific change. */
/* END android-changed */
if(jpCharsetMasks[version]&CSM(JISX212)) {
diff --git a/common/ucnv_bld.cpp b/common/ucnv_bld.cpp
index 9532620..45c56c1 100644
--- a/common/ucnv_bld.cpp
+++ b/common/ucnv_bld.cpp
@@ -793,6 +793,8 @@
* without updating the alias table, or when there is no alias table
*/
pArgs->name = pPieces->cnvName;
+ } else if (internalErrorCode == U_AMBIGUOUS_ALIAS_WARNING) {
+ *err = U_AMBIGUOUS_ALIAS_WARNING;
}
}
diff --git a/common/ucnv_ext.cpp b/common/ucnv_ext.cpp
index 51d1ba0..5cd1ab6 100644
--- a/common/ucnv_ext.cpp
+++ b/common/ucnv_ext.cpp
@@ -1,7 +1,7 @@
/*
******************************************************************************
*
-* Copyright (C) 2003-2011, International Business Machines
+* Copyright (C) 2003-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@@ -446,6 +446,15 @@
/* from Unicode ------------------------------------------------------------- */
+// Use roundtrips, "good one-way" mappings, and some normal fallbacks.
+static inline UBool
+extFromUUseMapping(UBool useFallback, uint32_t value, UChar32 firstCP) {
+ return
+ ((value&UCNV_EXT_FROM_U_STATUS_MASK)!=0 ||
+ FROM_U_USE_FALLBACK(useFallback, firstCP)) &&
+ (value&UCNV_EXT_FROM_U_RESERVED_MASK)==0;
+}
+
/*
* @return index of the UChar, if found; else <0
*/
@@ -580,11 +589,7 @@
/* read first pair of the section */
length=*fromUSectionUChars++;
value=*fromUSectionValues++;
- if( value!=0 &&
- (UCNV_EXT_FROM_U_IS_ROUNDTRIP(value) ||
- FROM_U_USE_FALLBACK(useFallback, firstCP)) &&
- (value&UCNV_EXT_FROM_U_RESERVED_MASK)==0
- ) {
+ if(value!=0 && extFromUUseMapping(useFallback, value, firstCP)) {
/* remember longest match so far */
matchValue=value;
matchLength=2+i+j;
@@ -621,10 +626,7 @@
/* partial match, continue */
idx=(int32_t)UCNV_EXT_FROM_U_GET_PARTIAL_INDEX(value);
} else {
- if( (UCNV_EXT_FROM_U_IS_ROUNDTRIP(value) ||
- FROM_U_USE_FALLBACK(useFallback, firstCP)) &&
- (value&UCNV_EXT_FROM_U_RESERVED_MASK)==0
- ) {
+ if(extFromUUseMapping(useFallback, value, firstCP)) {
/* full match, stop with result */
matchValue=value;
matchLength=2+i+j;
@@ -641,10 +643,7 @@
return 0;
}
} else /* result from firstCP trie lookup */ {
- if( (UCNV_EXT_FROM_U_IS_ROUNDTRIP(value) ||
- FROM_U_USE_FALLBACK(useFallback, firstCP)) &&
- (value&UCNV_EXT_FROM_U_RESERVED_MASK)==0
- ) {
+ if(extFromUUseMapping(useFallback, value, firstCP)) {
/* full match, stop with result */
matchValue=value;
matchLength=2;
@@ -944,13 +943,38 @@
}
}
+static UBool
+extSetUseMapping(UConverterUnicodeSet which, int32_t minLength, uint32_t value) {
+ if(which==UCNV_ROUNDTRIP_SET) {
+ // Add only code points for which the roundtrip flag is set.
+ // Do not add any fallbacks, even if ucnv_fromUnicode() would use them
+ // (fallbacks from PUA). See the API docs for ucnv_getUnicodeSet().
+ //
+ // By analogy, also do not add "good one-way" mappings.
+ //
+ // Do not add entries with reserved bits set.
+ if(((value&(UCNV_EXT_FROM_U_ROUNDTRIP_FLAG|UCNV_EXT_FROM_U_RESERVED_MASK))!=
+ UCNV_EXT_FROM_U_ROUNDTRIP_FLAG)) {
+ return FALSE;
+ }
+ } else /* UCNV_ROUNDTRIP_AND_FALLBACK_SET */ {
+ // Do not add entries with reserved bits set.
+ if((value&UCNV_EXT_FROM_U_RESERVED_MASK)!=0) {
+ return FALSE;
+ }
+ }
+ // Do not add <subchar1> entries or other (future?) pseudo-entries
+ // with an output length of 0.
+ return UCNV_EXT_FROM_U_GET_LENGTH(value)>=minLength;
+}
+
static void
ucnv_extGetUnicodeSetString(const UConverterSharedData *sharedData,
const int32_t *cx,
const USetAdder *sa,
- UBool useFallback,
+ UConverterUnicodeSet which,
int32_t minLength,
- UChar32 c,
+ UChar32 firstCP,
UChar s[UCNV_EXT_MAX_UCHARS], int32_t length,
int32_t sectionIndex,
UErrorCode *pErrorCode) {
@@ -967,13 +991,10 @@
count=*fromUSectionUChars++;
value=*fromUSectionValues++;
- if( value!=0 &&
- (UCNV_EXT_FROM_U_IS_ROUNDTRIP(value) || useFallback) &&
- UCNV_EXT_FROM_U_GET_LENGTH(value)>=minLength
- ) {
- if(c>=0) {
+ if(extSetUseMapping(which, minLength, value)) {
+ if(length==U16_LENGTH(firstCP)) {
/* add the initial code point */
- sa->add(sa->set, c);
+ sa->add(sa->set, firstCP);
} else {
/* add the string so far */
sa->addString(sa->set, s, length);
@@ -989,16 +1010,11 @@
/* no mapping, do nothing */
} else if(UCNV_EXT_FROM_U_IS_PARTIAL(value)) {
ucnv_extGetUnicodeSetString(
- sharedData, cx, sa, useFallback, minLength,
- U_SENTINEL, s, length+1,
+ sharedData, cx, sa, which, minLength,
+ firstCP, s, length+1,
(int32_t)UCNV_EXT_FROM_U_GET_PARTIAL_INDEX(value),
pErrorCode);
- } else if((useFallback ?
- (value&UCNV_EXT_FROM_U_RESERVED_MASK)==0 :
- ((value&(UCNV_EXT_FROM_U_ROUNDTRIP_FLAG|UCNV_EXT_FROM_U_RESERVED_MASK))==
- UCNV_EXT_FROM_U_ROUNDTRIP_FLAG)) &&
- UCNV_EXT_FROM_U_GET_LENGTH(value)>=minLength
- ) {
+ } else if(extSetUseMapping(which, minLength, value)) {
sa->addString(sa->set, s, length+1);
}
}
@@ -1016,7 +1032,6 @@
uint32_t value;
int32_t st1, stage1Length, st2, st3, minLength;
- UBool useFallback;
UChar s[UCNV_EXT_MAX_UCHARS];
UChar32 c;
@@ -1033,8 +1048,6 @@
stage1Length=cx[UCNV_EXT_FROM_U_STAGE_1_LENGTH];
- useFallback=(UBool)(which==UCNV_ROUNDTRIP_AND_FALLBACK_SET);
-
/* enumerate the from-Unicode trie table */
c=0; /* keep track of the current code point while enumerating */
@@ -1062,30 +1075,20 @@
/* read the stage 3 block */
ps3=stage3+st3;
- /*
- * Add code points for which the roundtrip flag is set.
- * Do not add <subchar1> entries or other (future?) pseudo-entries
- * with an output length of 0, or entries with reserved bits set.
- * Recurse for partial results.
- */
do {
value=stage3b[*ps3++];
if(value==0) {
/* no mapping, do nothing */
} else if(UCNV_EXT_FROM_U_IS_PARTIAL(value)) {
+ // Recurse for partial results.
length=0;
U16_APPEND_UNSAFE(s, length, c);
ucnv_extGetUnicodeSetString(
- sharedData, cx, sa, useFallback, minLength,
+ sharedData, cx, sa, which, minLength,
c, s, length,
(int32_t)UCNV_EXT_FROM_U_GET_PARTIAL_INDEX(value),
pErrorCode);
- } else if((useFallback ?
- (value&UCNV_EXT_FROM_U_RESERVED_MASK)==0 :
- ((value&(UCNV_EXT_FROM_U_ROUNDTRIP_FLAG|UCNV_EXT_FROM_U_RESERVED_MASK))==
- UCNV_EXT_FROM_U_ROUNDTRIP_FLAG)) &&
- UCNV_EXT_FROM_U_GET_LENGTH(value)>=minLength
- ) {
+ } else if(extSetUseMapping(which, minLength, value)) {
switch(filter) {
case UCNV_SET_FILTER_2022_CN:
if(!(UCNV_EXT_FROM_U_GET_LENGTH(value)==3 && UCNV_EXT_FROM_U_GET_DATA(value)<=0x82ffff)) {
diff --git a/common/ucnv_ext.h b/common/ucnv_ext.h
index e3e46f4..1ec4bdf 100644
--- a/common/ucnv_ext.h
+++ b/common/ucnv_ext.h
@@ -1,7 +1,7 @@
/*
******************************************************************************
*
-* Copyright (C) 2003-2007, International Business Machines
+* Copyright (C) 2003-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@@ -29,10 +29,12 @@
/*
* See icuhtml/design/conversion/conversion_extensions.html
*
- * Conversion extensions serve two purposes:
+ * Conversion extensions serve three purposes:
* 1. They support m:n mappings.
* 2. They support extension-only conversion files that are used together
* with the regular conversion data in base files.
+ * 3. They support mappings with more complicated meta data,
+ * for example "good one-way" mappings (|4).
*
* A base file may contain an extension table (explicitly requested or
* implicitly generated for m:n mappings), but its extension table is not
@@ -229,11 +231,13 @@
* return no mapping, but request for <subchar1>;
* }
* if(bit 31 set) {
- * roundtrip;
+ * roundtrip (|0);
+ * } else if(bit 30 set) {
+ * "good one-way" mapping (|4); -- new in ICU4C 51, _MBCSHeader.version 5.4/4.4
* } else {
- * fallback;
+ * normal fallback (|1);
* }
- * // bits 30..29 reserved, 0
+ * // bit 29 reserved, 0
* length=(value>>24)&0x1f; (bits 28..24)
* if(length==1..3) {
* bits 23..0 contain 1..3 bytes, padded with 00s on the left;
@@ -444,7 +448,9 @@
#define UCNV_EXT_FROM_U_LENGTH_SHIFT 24
#define UCNV_EXT_FROM_U_ROUNDTRIP_FLAG ((uint32_t)1<<31)
-#define UCNV_EXT_FROM_U_RESERVED_MASK 0x60000000
+#define UCNV_EXT_FROM_U_GOOD_ONE_WAY_FLAG 0x40000000
+#define UCNV_EXT_FROM_U_STATUS_MASK 0xc0000000
+#define UCNV_EXT_FROM_U_RESERVED_MASK 0x20000000
#define UCNV_EXT_FROM_U_DATA_MASK 0xffffff
/* special value for "no mapping" to <subchar1> (impossible roundtrip to 0 bytes, value 01) */
diff --git a/common/ucnvmbcs.c b/common/ucnvmbcs.c
index 4f2577b..eeda8f6 100644
--- a/common/ucnvmbcs.c
+++ b/common/ucnvmbcs.c
@@ -1,7 +1,7 @@
/*
******************************************************************************
*
-* Copyright (C) 2000-2012, International Business Machines
+* Copyright (C) 2000-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@@ -3919,11 +3919,6 @@
pArgs->offsets=offsets;
}
-/* Begin Android-added */
-#undef si_value
-#undef so_value
-/* End Android-added */
-
U_CFUNC void
ucnv_MBCSFromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs,
UErrorCode *pErrorCode) {
@@ -3945,9 +3940,10 @@
uint32_t stage2Entry;
uint32_t asciiRoundtrips;
uint32_t value;
- uint8_t si_value[2] = {0, 0};
- uint8_t so_value[2] = {0, 0};
- uint8_t si_value_length, so_value_length;
+ /* Shift-In and Shift-Out byte sequences differ by encoding scheme. */
+ uint8_t siBytes[2] = {0, 0};
+ uint8_t soBytes[2] = {0, 0};
+ uint8_t siLength, soLength;
int32_t length = 0, prevLength;
uint8_t unicodeMask;
@@ -4020,8 +4016,8 @@
nextSourceIndex=0;
/* Get the SI/SO character for the converter */
- si_value_length = getSISOBytes(SI, cnv->options, si_value);
- so_value_length = getSISOBytes(SO, cnv->options, so_value);
+ siLength = getSISOBytes(SI, cnv->options, siBytes);
+ soLength = getSISOBytes(SO, cnv->options, soBytes);
/* conversion loop */
/*
@@ -4112,12 +4108,12 @@
length=1;
} else {
/* change from double-byte mode to single-byte */
- if (si_value_length == 1) {
- value|=(uint32_t)si_value[0]<<8;
+ if (siLength == 1) {
+ value|=(uint32_t)siBytes[0]<<8;
length = 2;
- } else if (si_value_length == 2) {
- value|=(uint32_t)si_value[1]<<8;
- value|=(uint32_t)si_value[0]<<16;
+ } else if (siLength == 2) {
+ value|=(uint32_t)siBytes[1]<<8;
+ value|=(uint32_t)siBytes[0]<<16;
length = 3;
}
prevLength=1;
@@ -4127,12 +4123,12 @@
length=2;
} else {
/* change from single-byte mode to double-byte */
- if (so_value_length == 1) {
- value|=(uint32_t)so_value[0]<<16;
+ if (soLength == 1) {
+ value|=(uint32_t)soBytes[0]<<16;
length = 3;
- } else if (so_value_length == 2) {
- value|=(uint32_t)so_value[1]<<16;
- value|=(uint32_t)so_value[0]<<24;
+ } else if (soLength == 2) {
+ value|=(uint32_t)soBytes[1]<<16;
+ value|=(uint32_t)soBytes[0]<<24;
length = 4;
}
prevLength=2;
@@ -4344,12 +4340,12 @@
length=1;
} else {
/* change from double-byte mode to single-byte */
- if (si_value_length == 1) {
- value|=(uint32_t)si_value[0]<<8;
+ if (siLength == 1) {
+ value|=(uint32_t)siBytes[0]<<8;
length = 2;
- } else if (si_value_length == 2) {
- value|=(uint32_t)si_value[1]<<8;
- value|=(uint32_t)si_value[0]<<16;
+ } else if (siLength == 2) {
+ value|=(uint32_t)siBytes[1]<<8;
+ value|=(uint32_t)siBytes[0]<<16;
length = 3;
}
prevLength=1;
@@ -4359,12 +4355,12 @@
length=2;
} else {
/* change from single-byte mode to double-byte */
- if (so_value_length == 1) {
- value|=(uint32_t)so_value[0]<<16;
+ if (soLength == 1) {
+ value|=(uint32_t)soBytes[0]<<16;
length = 3;
- } else if (so_value_length == 2) {
- value|=(uint32_t)so_value[1]<<16;
- value|=(uint32_t)so_value[0]<<24;
+ } else if (soLength == 2) {
+ value|=(uint32_t)soBytes[1]<<16;
+ value|=(uint32_t)soBytes[0]<<24;
length = 4;
}
prevLength=2;
@@ -4619,14 +4615,14 @@
) {
/* EBCDIC_STATEFUL ending with DBCS: emit an SI to return the output stream to SBCS */
if(targetCapacity>0) {
- *target++=(uint8_t)si_value[0];
- if (si_value_length == 2) {
+ *target++=(uint8_t)siBytes[0];
+ if (siLength == 2) {
if (targetCapacity<2) {
- cnv->charErrorBuffer[0]=(uint8_t)si_value[1];
+ cnv->charErrorBuffer[0]=(uint8_t)siBytes[1];
cnv->charErrorBufferLength=1;
*pErrorCode=U_BUFFER_OVERFLOW_ERROR;
} else {
- *target++=(uint8_t)si_value[1];
+ *target++=(uint8_t)siBytes[1];
}
}
if(offsets!=NULL) {
@@ -4635,11 +4631,11 @@
}
} else {
/* target is full */
- cnv->charErrorBuffer[0]=(uint8_t)si_value[0];
- if (si_value_length == 2) {
- cnv->charErrorBuffer[1]=(uint8_t)si_value[1];
+ cnv->charErrorBuffer[0]=(uint8_t)siBytes[0];
+ if (siLength == 2) {
+ cnv->charErrorBuffer[1]=(uint8_t)siBytes[1];
}
- cnv->charErrorBufferLength=si_value_length;
+ cnv->charErrorBufferLength=siLength;
*pErrorCode=U_BUFFER_OVERFLOW_ERROR;
}
prevLength=1; /* we switched into SBCS */
diff --git a/common/ucnvmbcs.h b/common/ucnvmbcs.h
index b960f82..c248c3d 100644
--- a/common/ucnvmbcs.h
+++ b/common/ucnvmbcs.h
@@ -1,7 +1,7 @@
/*
******************************************************************************
*
-* Copyright (C) 2000-2012, International Business Machines
+* Copyright (C) 2000-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@@ -60,6 +60,9 @@
*
* When possible, makeconv continues to generate version 4.m files.
*
+ * _MBCSHeader.version 5.4/4.4 supports "good one-way" mappings (|4)
+ * in the extension tables (fromUTableValues bit 30). See ucnv_ext.h for details.
+ *
* _MBCSHeader.version 4.3 optionally modifies the fromUnicode data structures
* slightly and optionally adds a table for conversion to MBCS (non-SBCS)
* charsets.
diff --git a/common/uiter.cpp b/common/uiter.cpp
index 8c89d4b..2cc76a9 100644
--- a/common/uiter.cpp
+++ b/common/uiter.cpp
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 2002-2011, International Business Machines
+* Copyright (C) 2002-2012, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -600,12 +600,8 @@
i=index=0;
limit=iter->start; /* count up to the UTF-8 index */
while(i<limit) {
- U8_NEXT(s, i, limit, c);
- if(c<=0xffff) {
- ++index;
- } else {
- index+=2;
- }
+ U8_NEXT_OR_FFFD(s, i, limit, c);
+ index+=U16_LENGTH(c);
}
iter->start=i; /* just in case setState() did not get us to a code point boundary */
@@ -636,12 +632,8 @@
/* count from the beginning to the current index */
while(i<limit) {
- U8_NEXT(s, i, limit, c);
- if(c<=0xffff) {
- ++length;
- } else {
- length+=2;
- }
+ U8_NEXT_OR_FFFD(s, i, limit, c);
+ length+=U16_LENGTH(c);
}
/* assume i==limit==iter->start, set the UTF-16 index */
@@ -658,12 +650,8 @@
/* count from the current index to the end */
limit=iter->limit;
while(i<limit) {
- U8_NEXT(s, i, limit, c);
- if(c<=0xffff) {
- ++length;
- } else {
- length+=2;
- }
+ U8_NEXT_OR_FFFD(s, i, limit, c);
+ length+=U16_LENGTH(c);
}
iter->length=length;
}
@@ -787,8 +775,8 @@
--delta;
}
while(delta>0 && i<limit) {
- U8_NEXT(s, i, limit, c);
- if(c<0xffff) {
+ U8_NEXT_OR_FFFD(s, i, limit, c);
+ if(c<=0xffff) {
++pos;
--delta;
} else if(delta>=2) {
@@ -817,8 +805,8 @@
++delta;
}
while(delta<0 && i>0) {
- U8_PREV(s, 0, i, c);
- if(c<0xffff) {
+ U8_PREV_OR_FFFD(s, 0, i, c);
+ if(c<=0xffff) {
--pos;
++delta;
} else if(delta<=-2) {
@@ -867,10 +855,8 @@
UChar32 c;
int32_t i=iter->start;
- U8_NEXT(s, i, iter->limit, c);
- if(c<0) {
- return 0xfffd;
- } else if(c<=0xffff) {
+ U8_NEXT_OR_FFFD(s, i, iter->limit, c);
+ if(c<=0xffff) {
return c;
} else {
return U16_LEAD(c);
@@ -895,7 +881,7 @@
const uint8_t *s=(const uint8_t *)iter->context;
UChar32 c;
- U8_NEXT(s, iter->start, iter->limit, c);
+ U8_NEXT_OR_FFFD(s, iter->start, iter->limit, c);
if((index=iter->index)>=0) {
iter->index=++index;
if(iter->length<0 && iter->start==iter->limit) {
@@ -904,9 +890,7 @@
} else if(iter->start==iter->limit && iter->length>=0) {
iter->index= c<=0xffff ? iter->length : iter->length-1;
}
- if(c<0) {
- return 0xfffd;
- } else if(c<=0xffff) {
+ if(c<=0xffff) {
return c;
} else {
iter->reservedField=c;
@@ -933,15 +917,13 @@
const uint8_t *s=(const uint8_t *)iter->context;
UChar32 c;
- U8_PREV(s, 0, iter->start, c);
+ U8_PREV_OR_FFFD(s, 0, iter->start, c);
if((index=iter->index)>0) {
iter->index=index-1;
} else if(iter->start<=1) {
iter->index= c<=0xffff ? iter->start : iter->start+1;
}
- if(c<0) {
- return 0xfffd;
- } else if(c<=0xffff) {
+ if(c<=0xffff) {
return c;
} else {
iter->start+=4; /* back to behind this supplementary code point for consistent state */
@@ -991,7 +973,7 @@
} else {
/* verified index>=4 above */
UChar32 c;
- U8_PREV((const uint8_t *)iter->context, 0, index, c);
+ U8_PREV_OR_FFFD((const uint8_t *)iter->context, 0, index, c);
if(c<=0xffff) {
*pErrorCode=U_INDEX_OUTOFBOUNDS_ERROR;
} else {
diff --git a/common/uloc.cpp b/common/uloc.cpp
index e29fd7b..627b4d9 100644
--- a/common/uloc.cpp
+++ b/common/uloc.cpp
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (C) 1997-2012, International Business Machines
+* Copyright (C) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*
@@ -92,70 +92,94 @@
*
* The range qaa-qtz is reserved for local use
*/
+/* Generated using org.unicode.cldr.icu.GenerateISO639LanguageTables */
+/* ISO639 table version is 20130123 */
static const char * const LANGUAGES[] = {
- "aa", "ab", "ace", "ach", "ada", "ady", "ae", "af", "afa",
- "afh", "agq", "ain", "ak", "akk", "ale", "alg", "alt", "am", "an",
- "ang", "anp", "apa",
- "ar", "arc", "arn", "arp", "art", "arw", "as", "asa", "ast",
- "ath", "aus", "av", "awa", "ay", "az", "ba", "bad",
- "bai", "bal", "ban", "bas", "bat", "be", "bej",
- "bem", "ber", "bez", "bg", "bh", "bho", "bi", "bik", "bin",
- "bla", "bm", "bn", "bnt", "bo", "br", "bra", "brx", "bs",
- "btk", "bua", "bug", "byn", "ca", "cad", "cai", "car", "cau",
- "cch", "ce", "ceb", "cel", "cgg", "ch", "chb", "chg", "chk", "chm",
- "chn", "cho", "chp", "chr", "chy", "cmc", "co", "cop",
- "cpe", "cpf", "cpp", "cr", "crh", "crp", "cs", "csb", "cu", "cus",
- "cv", "cy", "da", "dak", "dar", "dav", "day", "de", "del", "den",
- "dgr", "din", "dje", "doi", "dra", "dsb", "dua", "dum", "dv", "dyo", "dyu",
- "dz", "ebu", "ee", "efi", "egy", "eka", "el", "elx", "en",
- "enm", "eo", "es", "et", "eu", "ewo", "fa",
- "fan", "fat", "ff", "fi", "fil", "fiu", "fj", "fo", "fon",
- "fr", "frm", "fro", "frr", "frs", "fur", "fy",
- "ga", "gaa", "gan", "gay", "gba", "gd", "gem", "gez", "gil",
+ "aa", "ab", "ace", "ach", "ada", "ady", "ae", "af",
+ "afa", "afh", "agq", "ain", "ak", "akk", "ale", "alg",
+ "alt", "am", "an", "ang", "anp", "apa", "ar", "arc",
+ "arn", "arp", "art", "arw", "as", "asa", "ast", "ath",
+ "aus", "av", "awa", "ay", "az",
+ "ba", "bad", "bai", "bal", "ban", "bas", "bat", "bax",
+ "bbj", "be", "bej", "bem", "ber", "bez", "bfd", "bg",
+ "bh", "bho", "bi", "bik", "bin", "bkm", "bla", "bm",
+ "bn", "bnt", "bo", "br", "bra", "brx", "bs", "bss",
+ "btk", "bua", "bug", "bum", "byn", "byv",
+ "ca", "cad", "cai", "car", "cau", "cay", "cch", "ce",
+ "ceb", "cel", "cgg", "ch", "chb", "chg", "chk", "chm",
+ "chn", "cho", "chp", "chr", "chy", "ckb", "cmc", "co",
+ "cop", "cpe", "cpf", "cpp", "cr", "crh", "crp", "cs",
+ "csb", "cu", "cus", "cv", "cy",
+ "da", "dak", "dar", "dav", "day", "de", "del", "den",
+ "dgr", "din", "dje", "doi", "dra", "dsb", "dua", "dum",
+ "dv", "dyo", "dyu", "dz", "dzg",
+ "ebu", "ee", "efi", "egy", "eka", "el", "elx", "en",
+ "enm", "eo", "es", "et", "eu", "ewo",
+ "fa", "fan", "fat", "ff", "fi", "fil", "fiu", "fj",
+ "fo", "fon", "fr", "frm", "fro", "frr", "frs", "fur",
+ "fy",
+ "ga", "gaa", "gay", "gba", "gd", "gem", "gez", "gil",
"gl", "gmh", "gn", "goh", "gon", "gor", "got", "grb",
- "grc", "gsw", "gu", "guz", "gv", "gwi",
- "ha", "hai", "hak", "haw", "he", "hi", "hil", "him",
- "hit", "hmn", "ho", "hr", "hsb", "hsn", "ht", "hu", "hup", "hy", "hz",
- "ia", "iba", "id", "ie", "ig", "ii", "ijo", "ik",
- "ilo", "inc", "ine", "inh", "io", "ira", "iro", "is", "it",
- "iu", "ja", "jbo", "jgo", "jmc", "jpr", "jrb", "jv", "ka", "kaa", "kab",
- "kac", "kaj", "kam", "kar", "kaw", "kbd", "kcg", "kde", "kea", "kfo", "kg", "kha", "khi",
- "kho", "khq", "ki", "kj", "kk", "kl", "kln", "km", "kmb", "kn",
- "ko", "kok", "kos", "kpe", "kr", "krc", "krl", "kro", "kru", "ks", "ksb", "ksf",
- "ku", "kum", "kut", "kv", "kw", "ky", "la", "lad", "lag",
- "lah", "lam", "lb", "lez", "lg", "li", "ln", "lo", "lol",
- "loz", "lt", "lu", "lua", "lui", "lun", "luo", "lus", "luy",
- "lv", "mad", "mag", "mai", "mak", "man", "map", "mas",
- "mdf", "mdr", "men", "mer", "mfe", "mg", "mga", "mgh", "mgo", "mh", "mi", "mic", "min",
- "mis", "mk", "mkh", "ml", "mn", "mnc", "mni", "mno",
- "mo", "moh", "mos", "mr", "ms", "mt", "mua", "mul", "mun",
- "mus", "mwl", "mwr", "my", "myn", "myv", "na", "nah", "nai", "nan", "nap", "naq",
- "nb", "nd", "nds", "ne", "new", "ng", "nia", "nic",
- "niu", "nl", "nmg", "nn", "no", "nog", "non", "nqo", "nr", "nso", "nub", "nus",
- "nv", "nwc", "ny", "nym", "nyn", "nyo", "nzi", "oc", "oj",
- "om", "or", "os", "osa", "ota", "oto", "pa", "paa",
- "pag", "pal", "pam", "pap", "pau", "peo", "phi", "phn",
- "pi", "pl", "pon", "pra", "pro", "ps", "pt", "qu",
- "raj", "rap", "rar", "rm", "rn", "ro", "roa", "rof", "rom",
- "ru", "rup", "rw", "rwk", "sa", "sad", "sah", "sai", "sal", "sam", "saq",
- "sas", "sat", "sbp", "sc", "scn", "sco", "sd", "se", "seh", "sel", "sem", "ses",
- "sg", "sga", "sgn", "shi", "shn", "si", "sid", "sio", "sit",
- "sk", "sl", "sla", "sm", "sma", "smi", "smj", "smn",
- "sms", "sn", "snk", "so", "sog", "son", "sq", "sr",
- "srn", "srr", "ss", "ssa", "st", "su", "suk", "sus", "sux",
- "sv", "sw", "swc", "syc", "syr", "ta", "tai", "te", "tem", "teo", "ter",
- "tet", "tg", "th", "ti", "tig", "tiv", "tk", "tkl",
- "tl", "tlh", "tli", "tmh", "tn", "to", "tog", "tpi", "tr", "trv",
- "ts", "tsi", "tt", "tum", "tup", "tut", "tvl", "tw", "twq",
- "ty", "tyv", "tzm", "udm", "ug", "uga", "uk", "umb", "und", "ur",
- "uz", "vai", "ve", "vi", "vo", "vot", "vun", "wa", "wak",
- "wal", "war", "was", "wen", "wo", "wuu", "xal", "xh", "xog", "yao", "yap", "yav",
- "yi", "yo", "ypk", "yue", "za", "zap", "zbl", "zen", "zh", "znd",
- "zu", "zun", "zxx", "zza",
+ "grc", "gsw", "gu", "guz", "gv", "gwi",
+ "ha", "hai", "haw", "he", "hi", "hil", "him", "hit",
+ "hmn", "ho", "hr", "hsb", "ht", "hu", "hup", "hy",
+ "hz",
+ "ia", "iba", "ibb", "id", "ie", "ig", "ii", "ijo",
+ "ik", "ilo", "inc", "ine", "inh", "io", "ira", "iro",
+ "is", "it", "iu",
+ "ja", "jbo", "jgo", "jmc", "jpr", "jrb", "jv",
+ "ka", "kaa", "kab", "kac", "kaj", "kam", "kar", "kaw",
+ "kbd", "kbl", "kcg", "kde", "kea", "kfo", "kg", "kha",
+ "khi", "kho", "khq", "ki", "kj", "kk", "kkj", "kl",
+ "kln", "km", "kmb", "kn", "ko", "kok", "kos", "kpe",
+ "kr", "krc", "krl", "kro", "kru", "ks", "ksb", "ksf",
+ "ksh", "ku", "kum", "kut", "kv", "kw", "ky",
+ "la", "lad", "lag", "lah", "lam", "lb", "lez", "lg",
+ "li", "lkt", "ln", "lo", "lol", "loz", "lt", "lu",
+ "lua", "lui", "lun", "luo", "lus", "luy", "lv",
+ "mad", "maf", "mag", "mai", "mak", "man", "map", "mas",
+ "mde", "mdf", "mdr", "men", "mer", "mfe", "mg", "mga",
+ "mgh", "mgo", "mh", "mi", "mic", "min", "mis", "mk",
+ "mkh", "ml", "mn", "mnc", "mni", "mno", "mo", "moh",
+ "mos", "mr", "ms", "mt", "mua", "mul", "mun", "mus",
+ "mwl", "mwr", "my", "mye", "myn", "myv",
+ "na", "nah", "nai", "nap", "naq", "nb", "nd", "nds",
+ "ne", "new", "ng", "nia", "nic", "niu", "nl", "nmg",
+ "nn", "nnh", "no", "nog", "non", "nqo", "nr", "nso",
+ "nub", "nus", "nv", "nwc", "ny", "nym", "nyn", "nyo",
+ "nzi",
+ "oc", "oj", "om", "or", "os", "osa", "ota", "oto",
+ "pa", "paa", "pag", "pal", "pam", "pap", "pau", "peo",
+ "phi", "phn", "pi", "pl", "pon", "pra", "pro", "ps",
+ "pt",
+ "qu",
+ "raj", "rap", "rar", "rm", "rn", "ro", "roa", "rof",
+ "rom", "ru", "rup", "rw", "rwk",
+ "sa", "sad", "sah", "sai", "sal", "sam", "saq", "sas",
+ "sat", "sba", "sbp", "sc", "scn", "sco", "sd", "se",
+ "see", "seh", "sel", "sem", "ses", "sg", "sga", "sgn",
+ "shi", "shn", "shu", "si", "sid", "sio", "sit",
+ "sk", "sl", "sla", "sm", "sma", "smi", "smj", "smn",
+ "sms", "sn", "snk", "so", "sog", "son", "sq", "sr",
+ "srn", "srr", "ss", "ssa", "ssy", "st", "su", "suk",
+ "sus", "sux", "sv", "sw", "swb", "swc", "syc", "syr",
+ "ta", "tai", "te", "tem", "teo", "ter", "tet", "tg",
+ "th", "ti", "tig", "tiv", "tk", "tkl", "tl", "tlh",
+ "tli", "tmh", "tn", "to", "tog", "tpi", "tr", "trv",
+ "ts", "tsi", "tt", "tum", "tup", "tut", "tvl", "tw",
+ "twq", "ty", "tyv", "tzm",
+ "udm", "ug", "uga", "uk", "umb", "und", "ur", "uz",
+ "vai", "ve", "vi", "vo", "vot", "vun",
+ "wa", "wae", "wak", "wal", "war", "was", "wen", "wo",
+ "xal", "xh", "xog",
+ "yao", "yap", "yav", "ybb", "yi", "yo", "ypk", "yue",
+ "za", "zap", "zbl", "zen", "zh", "znd", "zu", "zun",
+ "zxx", "zza",
NULL,
"in", "iw", "ji", "jw", "sh", /* obsolete language codes */
NULL
};
+
static const char* const DEPRECATED_LANGUAGES[]={
"in", "iw", "ji", "jw", NULL, NULL
};
@@ -179,121 +203,89 @@
* second list, and another NULL entry. The two lists correspond to
* the two lists in LANGUAGES.
*/
+/* Generated using org.unicode.cldr.icu.GenerateISO639LanguageTables */
+/* ISO639 table version is 20130123 */
static const char * const LANGUAGES_3[] = {
-/* "aa", "ab", "ace", "ach", "ada", "ady", "ae", "af", "afa", */
- "aar", "abk", "ace", "ach", "ada", "ady", "ave", "afr", "afa",
-/* "afh", "agq", "ain", "ak", "akk", "ale", "alg", "alt", "am", "an", "ang", "anp", "apa", */
- "afh", "agq", "ain", "aka", "akk", "ale", "alg", "alt", "amh", "arg", "ang", "anp", "apa",
-/* "ar", "arc", "arn", "arp", "art", "arw", "as", "asa", "ast", */
- "ara", "arc", "arn", "arp", "art", "arw", "asm", "asa", "ast",
-/* "ath", "aus", "av", "awa", "ay", "az", "ba", "bad", */
- "ath", "aus", "ava", "awa", "aym", "aze", "bak", "bad",
-/* "bai", "bal", "ban", "bas", "bat", "be", "bej", */
- "bai", "bal", "ban", "bas", "bat", "bel", "bej",
-/* "bem", "ber", "bez", "bg", "bh", "bho", "bi", "bik", "bin", */
- "bem", "ber", "bez", "bul", "bih", "bho", "bis", "bik", "bin",
-/* "bla", "bm", "bn", "bnt", "bo", "br", "bra", "brx", "bs", */
- "bla", "bam", "ben", "bnt", "bod", "bre", "bra", "brx", "bos",
-/* "btk", "bua", "bug", "byn", "ca", "cad", "cai", "car", "cau", */
- "btk", "bua", "bug", "byn", "cat", "cad", "cai", "car", "cau",
-/* "cch", "ce", "ceb", "cel", "cgg", "ch", "chb", "chg", "chk", "chm", */
- "cch", "che", "ceb", "cel", "cgg", "cha", "chb", "chg", "chk", "chm",
-/* "chn", "cho", "chp", "chr", "chy", "cmc", "co", "cop", */
- "chn", "cho", "chp", "chr", "chy", "cmc", "cos", "cop",
-/* "cpe", "cpf", "cpp", "cr", "crh", "crp", "cs", "csb", "cu", "cus", */
- "cpe", "cpf", "cpp", "cre", "crh", "crp", "ces", "csb", "chu", "cus",
-/* "cv", "cy", "da", "dak", "dar", "dav", "day", "de", "del", "den", */
- "chv", "cym", "dan", "dak", "dar", "dav", "day", "deu", "del", "den",
-/* "dgr", "din", "dje", "doi", "dra", "dsb", "dua", "dum", "dv", "dyo", "dyu", */
- "dgr", "din", "dje", "doi", "dra", "dsb", "dua", "dum", "div", "dyo", "dyu",
-/* "dz", "ebu", "ee", "efi", "egy", "eka", "el", "elx", "en", */
- "dzo", "ebu", "ewe", "efi", "egy", "eka", "ell", "elx", "eng",
-/* "enm", "eo", "es", "et", "eu", "ewo", "fa", */
- "enm", "epo", "spa", "est", "eus", "ewo", "fas",
-/* "fan", "fat", "ff", "fi", "fil", "fiu", "fj", "fo", "fon", */
- "fan", "fat", "ful", "fin", "fil", "fiu", "fij", "fao", "fon",
-/* "fr", "frm", "fro", "frr", "frs", "fur", "fy", "ga", "gaa", "gan", "gay", */
- "fra", "frm", "fro", "frr", "frs", "fur", "fry", "gle", "gaa", "gan", "gay",
-/* "gba", "gd", "gem", "gez", "gil", "gl", "gmh", "gn", */
- "gba", "gla", "gem", "gez", "gil", "glg", "gmh", "grn",
-/* "goh", "gon", "gor", "got", "grb", "grc", "gsw", "gu", "guz", "gv", */
- "goh", "gon", "gor", "got", "grb", "grc", "gsw", "guj", "guz", "glv",
-/* "gwi", "ha", "hai", "hak", "haw", "he", "hi", "hil", "him", */
- "gwi", "hau", "hai", "hak", "haw", "heb", "hin", "hil", "him",
-/* "hit", "hmn", "ho", "hr", "hsb", "hsn", "ht", "hu", "hup", "hy", "hz", */
- "hit", "hmn", "hmo", "hrv", "hsb", "hsn", "hat", "hun", "hup", "hye", "her",
-/* "ia", "iba", "id", "ie", "ig", "ii", "ijo", "ik", */
- "ina", "iba", "ind", "ile", "ibo", "iii", "ijo", "ipk",
-/* "ilo", "inc", "ine", "inh", "io", "ira", "iro", "is", "it", */
- "ilo", "inc", "ine", "inh", "ido", "ira", "iro", "isl", "ita",
-/* "iu", "ja", "jbo", "jgo", "jmc", "jpr", "jrb", "jv", "ka", "kaa", "kab", */
- "iku", "jpn", "jbo", "jgo", "jmc", "jpr", "jrb", "jav", "kat", "kaa", "kab",
-/* "kac", "kaj", "kam", "kar", "kaw", "kbd", "kcg", "kde", "kea", "kfo", "kg", "kha", "khi",*/
- "kac", "kaj", "kam", "kar", "kaw", "kbd", "kcg", "kde", "kea", "kfo", "kg", "kha", "khi",
-/* "kho", "khq", "ki", "kj", "kk", "kl", "kln", "km", "kmb", "kn", */
- "kho", "khq", "kik", "kua", "kaz", "kal", "kln", "khm", "kmb", "kan",
-/* "ko", "kok", "kos", "kpe", "kr", "krc", "krl", "kro", "kru", "ks", "ksb", "ksf", */
- "kor", "kok", "kos", "kpe", "kau", "krc", "krl", "kro", "kru", "kas", "ksb", "ksf",
-/* "ku", "kum", "kut", "kv", "kw", "ky", "la", "lad", "lag", */
- "kur", "kum", "kut", "kom", "cor", "kir", "lat", "lad", "lag",
-/* "lah", "lam", "lb", "lez", "lg", "li", "ln", "lo", "lol", */
- "lah", "lam", "ltz", "lez", "lug", "lim", "lin", "lao", "lol",
-/* "loz", "lt", "lu", "lua", "lui", "lun", "luo", "lus", "luy", */
- "loz", "lit", "lub", "lua", "lui", "lun", "luo", "lus", "luy",
-/* "lv", "mad", "mag", "mai", "mak", "man", "map", "mas", */
- "lav", "mad", "mag", "mai", "mak", "man", "map", "mas",
-/* "mdf", "mdr", "men", "mer", "mfe", "mg", "mga", "mgh", "mgo", "mh", "mi", "mic", "min", */
- "mdf", "mdr", "men", "mer", "mfe", "mlg", "mga", "mgh", "mgo", "mah", "mri", "mic", "min",
-/* "mis", "mk", "mkh", "ml", "mn", "mnc", "mni", "mno", */
- "mis", "mkd", "mkh", "mal", "mon", "mnc", "mni", "mno",
-/* "mo", "moh", "mos", "mr", "ms", "mt", "mua", "mul", "mun", */
- "mol", "moh", "mos", "mar", "msa", "mlt", "mua", "mul", "mun",
-/* "mus", "mwl", "mwr", "my", "myn", "myv", "na", "nah", "nai", "nan", "nap", "naq", */
- "mus", "mwl", "mwr", "mya", "myn", "myv", "nau", "nah", "nai", "nan", "nap", "naq",
-/* "nb", "nd", "nds", "ne", "new", "ng", "nia", "nic", */
- "nob", "nde", "nds", "nep", "new", "ndo", "nia", "nic",
-/* "niu", "nl", "nmg", "nn", "no", "nog", "non", "nqo", "nr", "nso", "nub", "nus", */
- "niu", "nld", "nmg", "nno", "nor", "nog", "non", "nqo", "nbl", "nso", "nub", "nus",
-/* "nv", "nwc", "ny", "nym", "nyn", "nyo", "nzi", "oc", "oj", */
- "nav", "nwc", "nya", "nym", "nyn", "nyo", "nzi", "oci", "oji",
-/* "om", "or", "os", "osa", "ota", "oto", "pa", "paa", */
- "orm", "ori", "oss", "osa", "ota", "oto", "pan", "paa",
-/* "pag", "pal", "pam", "pap", "pau", "peo", "phi", "phn", */
- "pag", "pal", "pam", "pap", "pau", "peo", "phi", "phn",
-/* "pi", "pl", "pon", "pra", "pro", "ps", "pt", "qu", */
- "pli", "pol", "pon", "pra", "pro", "pus", "por", "que",
-/* "raj", "rap", "rar", "rm", "rn", "ro", "roa", "rof", "rom", */
- "raj", "rap", "rar", "roh", "run", "ron", "roa", "rof", "rom",
-/* "ru", "rup", "rw", "rwk", "sa", "sad", "sah", "sai", "sal", "sam", "saq", */
- "rus", "rup", "kin", "rwk", "san", "sad", "sah", "sai", "sal", "sam", "saq",
-/* "sas", "sat", "sbp", "sc", "scn", "sco", "sd", "se", "seh", "sel", "sem", "ses", */
- "sas", "sat", "sbp", "srd", "scn", "sco", "snd", "sme", "seh", "sel", "sem", "ses",
-/* "sg", "sga", "sgn", "shi", "shn", "si", "sid", "sio", "sit", */
- "sag", "sga", "sgn", "shi", "shn", "sin", "sid", "sio", "sit",
-/* "sk", "sl", "sla", "sm", "sma", "smi", "smj", "smn", */
- "slk", "slv", "sla", "smo", "sma", "smi", "smj", "smn",
-/* "sms", "sn", "snk", "so", "sog", "son", "sq", "sr", */
- "sms", "sna", "snk", "som", "sog", "son", "sqi", "srp",
-/* "srn", "srr", "ss", "ssa", "st", "su", "suk", "sus", "sux", */
- "srn", "srr", "ssw", "ssa", "sot", "sun", "suk", "sus", "sux",
-/* "sv", "sw", "swc", "syc", "syr", "ta", "tai", "te", "tem", "teo", "ter", */
- "swe", "swa", "swc", "syc", "syr", "tam", "tai", "tel", "tem", "teo", "ter",
-/* "tet", "tg", "th", "ti", "tig", "tiv", "tk", "tkl", */
- "tet", "tgk", "tha", "tir", "tig", "tiv", "tuk", "tkl",
-/* "tl", "tlh", "tli", "tmh", "tn", "to", "tog", "tpi", "tr", "trv", */
- "tgl", "tlh", "tli", "tmh", "tsn", "ton", "tog", "tpi", "tur", "trv",
-/* "ts", "tsi", "tt", "tum", "tup", "tut", "tvl", "tw", "twq" */
- "tso", "tsi", "tat", "tum", "tup", "tut", "tvl", "twi", "twq",
-/* "ty", "tyv", "tzm", "udm", "ug", "uga", "uk", "umb", "und", "ur", */
- "tah", "tyv", "tzm", "udm", "uig", "uga", "ukr", "umb", "und", "urd",
-/* "uz", "vai", "ve", "vi", "vo", "vot", "vun", "wa", "wak", */
- "uzb", "vai", "ven", "vie", "vol", "vot", "vun", "wln", "wak",
-/* "wal", "war", "was", "wen", "wo", "wuu", "xal", "xh", "xog", "yao", "yap", "yav", */
- "wal", "war", "was", "wen", "wol", "wuu", "xal", "xho", "xog", "yao", "yap", "yav",
-/* "yi", "yo", "ypk", "yue", "za", "zap", "zbl", "zen", "zh", "znd", */
- "yid", "yor", "ypk", "yue", "zha", "zap", "zbl", "zen", "zho", "znd",
-/* "zu", "zun", "zxx", "zza", */
- "zul", "zun", "zxx", "zza",
+ "aar", "abk", "ace", "ach", "ada", "ady", "ave", "afr",
+ "afa", "afh", "agq", "ain", "aka", "akk", "ale", "alg",
+ "alt", "amh", "arg", "ang", "anp", "apa", "ara", "arc",
+ "arn", "arp", "art", "arw", "asm", "asa", "ast", "ath",
+ "aus", "ava", "awa", "aym", "aze",
+ "bak", "bad", "bai", "bal", "ban", "bas", "bat", "bax",
+ "bbj", "bel", "bej", "bem", "ber", "bez", "bfd", "bul",
+ "bih", "bho", "bis", "bik", "bin", "bkm", "bla", "bam",
+ "ben", "bnt", "bod", "bre", "bra", "brx", "bos", "bss",
+ "btk", "bua", "bug", "bum", "byn", "byv",
+ "cat", "cad", "cai", "car", "cau", "cay", "cch", "che",
+ "ceb", "cel", "cgg", "cha", "chb", "chg", "chk", "chm",
+ "chn", "cho", "chp", "chr", "chy", "ckb", "cmc", "cos",
+ "cop", "cpe", "cpf", "cpp", "cre", "crh", "crp", "ces",
+ "csb", "chu", "cus", "chv", "cym",
+ "dan", "dak", "dar", "dav", "day", "deu", "del", "den",
+ "dgr", "din", "dje", "doi", "dra", "dsb", "dua", "dum",
+ "div", "dyo", "dyu", "dzo", "dzg",
+ "ebu", "ewe", "efi", "egy", "eka", "ell", "elx", "eng",
+ "enm", "epo", "spa", "est", "eus", "ewo",
+ "fas", "fan", "fat", "ful", "fin", "fil", "fiu", "fij",
+ "fao", "fon", "fra", "frm", "fro", "frr", "frs", "fur",
+ "fry",
+ "gle", "gaa", "gay", "gba", "gla", "gem", "gez", "gil",
+ "glg", "gmh", "grn", "goh", "gon", "gor", "got", "grb",
+ "grc", "gsw", "guj", "guz", "glv", "gwi",
+ "hau", "hai", "haw", "heb", "hin", "hil", "him", "hit",
+ "hmn", "hmo", "hrv", "hsb", "hat", "hun", "hup", "hye",
+ "her",
+ "ina", "iba", "ibb", "ind", "ile", "ibo", "iii", "ijo",
+ "ipk", "ilo", "inc", "ine", "inh", "ido", "ira", "iro",
+ "isl", "ita", "iku",
+ "jpn", "jbo", "jgo", "jmc", "jpr", "jrb", "jav",
+ "kat", "kaa", "kab", "kac", "kaj", "kam", "kar", "kaw",
+ "kbd", "kbl", "kcg", "kde", "kea", "kfo", "kon", "kha",
+ "khi", "kho", "khq", "kik", "kua", "kaz", "kkj", "kal",
+ "kln", "khm", "kmb", "kan", "kor", "kok", "kos", "kpe",
+ "kau", "krc", "krl", "kro", "kru", "kas", "ksb", "ksf",
+ "ksh", "kur", "kum", "kut", "kom", "cor", "kir",
+ "lat", "lad", "lag", "lah", "lam", "ltz", "lez", "lug",
+ "lim", "lkt", "lin", "lao", "lol", "loz", "lit", "lub",
+ "lua", "lui", "lun", "luo", "lus", "luy", "lav",
+ "mad", "maf", "mag", "mai", "mak", "man", "map", "mas",
+ "mde", "mdf", "mdr", "men", "mer", "mfe", "mlg", "mga",
+ "mgh", "mgo", "mah", "mri", "mic", "min", "mis", "mkd",
+ "mkh", "mal", "mon", "mnc", "mni", "mno", "mol", "moh",
+ "mos", "mar", "msa", "mlt", "mua", "mul", "mun", "mus",
+ "mwl", "mwr", "mya", "mye", "myn", "myv",
+ "nau", "nah", "nai", "nap", "naq", "nob", "nde", "nds",
+ "nep", "new", "ndo", "nia", "nic", "niu", "nld", "nmg",
+ "nno", "nnh", "nor", "nog", "non", "nqo", "nbl", "nso",
+ "nub", "nus", "nav", "nwc", "nya", "nym", "nyn", "nyo",
+ "nzi",
+ "oci", "oji", "orm", "ori", "oss", "osa", "ota", "oto",
+ "pan", "paa", "pag", "pal", "pam", "pap", "pau", "peo",
+ "phi", "phn", "pli", "pol", "pon", "pra", "pro", "pus",
+ "por",
+ "que",
+ "raj", "rap", "rar", "roh", "run", "ron", "roa", "rof",
+ "rom", "rus", "rup", "kin", "rwk",
+ "san", "sad", "sah", "sai", "sal", "sam", "saq", "sas",
+ "sat", "sba", "sbp", "srd", "scn", "sco", "snd", "sme",
+ "see", "seh", "sel", "sem", "ses", "sag", "sga", "sgn",
+ "shi", "shn", "shu", "sin", "sid", "sio", "sit",
+ "slk", "slv", "sla", "smo", "sma", "smi", "smj", "smn",
+ "sms", "sna", "snk", "som", "sog", "son", "sqi", "srp",
+ "srn", "srr", "ssw", "ssa", "ssy", "sot", "sun", "suk",
+ "sus", "sux", "swe", "swa", "swb", "swc", "syc", "syr",
+ "tam", "tai", "tel", "tem", "teo", "ter", "tet", "tgk",
+ "tha", "tir", "tig", "tiv", "tuk", "tkl", "tgl", "tlh",
+ "tli", "tmh", "tsn", "ton", "tog", "tpi", "tur", "trv",
+ "tso", "tsi", "tat", "tum", "tup", "tut", "tvl", "twi",
+ "twq", "tah", "tyv", "tzm",
+ "udm", "uig", "uga", "ukr", "umb", "und", "urd", "uzb",
+ "vai", "ven", "vie", "vol", "vot", "vun",
+ "wln", "wae", "wak", "wal", "war", "was", "wen", "wol",
+ "xal", "xho", "xog",
+ "yao", "yap", "yav", "ybb", "yid", "yor", "ypk", "yue",
+ "zha", "zap", "zbl", "zen", "zho", "znd", "zul", "zun",
+ "zxx", "zza",
NULL,
/* "in", "iw", "ji", "jw", "sh", */
"ind", "heb", "yid", "jaw", "srp",
@@ -325,13 +317,13 @@
* http://www.iso.org/iso/en/prods-services/iso3166ma/03updates-on-iso-3166/nlv3e-rou.html
*/
static const char * const COUNTRIES[] = {
- "AD", "AE", "AF", "AG", "AI", "AL", "AM", "AN",
+ "AD", "AE", "AF", "AG", "AI", "AL", "AM",
"AO", "AQ", "AR", "AS", "AT", "AU", "AW", "AX", "AZ",
"BA", "BB", "BD", "BE", "BF", "BG", "BH", "BI",
- "BJ", "BL", "BM", "BN", "BO", "BR", "BS", "BT", "BV",
+ "BJ", "BL", "BM", "BN", "BO", "BQ", "BR", "BS", "BT", "BV",
"BW", "BY", "BZ", "CA", "CC", "CD", "CF", "CG",
"CH", "CI", "CK", "CL", "CM", "CN", "CO", "CR",
- "CU", "CV", "CX", "CY", "CZ", "DE", "DJ", "DK",
+ "CU", "CV", "CW", "CX", "CY", "CZ", "DE", "DJ", "DK",
"DM", "DO", "DZ", "EC", "EE", "EG", "EH", "ER",
"ES", "ET", "FI", "FJ", "FK", "FM", "FO", "FR",
"GA", "GB", "GD", "GE", "GF", "GG", "GH", "GI", "GL",
@@ -349,23 +341,23 @@
"PH", "PK", "PL", "PM", "PN", "PR", "PS", "PT",
"PW", "PY", "QA", "RE", "RO", "RS", "RU", "RW", "SA",
"SB", "SC", "SD", "SE", "SG", "SH", "SI", "SJ",
- "SK", "SL", "SM", "SN", "SO", "SR", "ST", "SV",
- "SY", "SZ", "TC", "TD", "TF", "TG", "TH", "TJ",
+ "SK", "SL", "SM", "SN", "SO", "SR", "SS", "ST", "SV",
+ "SX", "SY", "SZ", "TC", "TD", "TF", "TG", "TH", "TJ",
"TK", "TL", "TM", "TN", "TO", "TR", "TT", "TV",
"TW", "TZ", "UA", "UG", "UM", "US", "UY", "UZ",
"VA", "VC", "VE", "VG", "VI", "VN", "VU", "WF",
"WS", "YE", "YT", "ZA", "ZM", "ZW",
NULL,
- "FX", "CS", "RO", "TP", "YU", "ZR", /* obsolete country codes */
+ "AN", "BU", "CS", "FX", "RO", "SU", "TP", "YD", "YU", "ZR", /* obsolete country codes */
NULL
};
-static const char* const DEPRECATED_COUNTRIES[] ={
- "BU", "CS", "DY", "FX", "HV", "NH", "RH", "TP", "YU", "ZR", NULL, NULL /* deprecated country list */
+static const char* const DEPRECATED_COUNTRIES[] = {
+ "AN", "BU", "CS", "DD", "DY", "FX", "HV", "NH", "RH", "SU", "TP", "UK", "VD", "YD", "YU", "ZR", NULL, NULL /* deprecated country list */
};
static const char* const REPLACEMENT_COUNTRIES[] = {
-/* "BU", "CS", "DY", "FX", "HV", "NH", "RH", "TP", "YU", "ZR" */
- "MM", "RS", "BJ", "FR", "BF", "VU", "ZW", "TL", "RS", "CD", NULL, NULL /* replacement country codes */
+/* "AN", "BU", "CS", "DD", "DY", "FX", "HV", "NH", "RH", "SU", "TP", "UK", "VD", "YD", "YU", "ZR" */
+ "CW", "MM", "RS", "DE", "BJ", "FR", "BF", "VU", "ZW", "RU", "TL", "GB", "VN", "YE", "RS", "CD", NULL, NULL /* replacement country codes */
};
/**
@@ -382,20 +374,20 @@
* the two lists in COUNTRIES.
*/
static const char * const COUNTRIES_3[] = {
-/* "AD", "AE", "AF", "AG", "AI", "AL", "AM", "AN", */
- "AND", "ARE", "AFG", "ATG", "AIA", "ALB", "ARM", "ANT",
+/* "AD", "AE", "AF", "AG", "AI", "AL", "AM", */
+ "AND", "ARE", "AFG", "ATG", "AIA", "ALB", "ARM",
/* "AO", "AQ", "AR", "AS", "AT", "AU", "AW", "AX", "AZ", */
"AGO", "ATA", "ARG", "ASM", "AUT", "AUS", "ABW", "ALA", "AZE",
/* "BA", "BB", "BD", "BE", "BF", "BG", "BH", "BI", */
"BIH", "BRB", "BGD", "BEL", "BFA", "BGR", "BHR", "BDI",
-/* "BJ", "BL", "BM", "BN", "BO", "BR", "BS", "BT", "BV", */
- "BEN", "BLM", "BMU", "BRN", "BOL", "BRA", "BHS", "BTN", "BVT",
+/* "BJ", "BL", "BM", "BN", "BO", "BQ", "BR", "BS", "BT", "BV", */
+ "BEN", "BLM", "BMU", "BRN", "BOL", "BES", "BRA", "BHS", "BTN", "BVT",
/* "BW", "BY", "BZ", "CA", "CC", "CD", "CF", "CG", */
"BWA", "BLR", "BLZ", "CAN", "CCK", "COD", "CAF", "COG",
/* "CH", "CI", "CK", "CL", "CM", "CN", "CO", "CR", */
"CHE", "CIV", "COK", "CHL", "CMR", "CHN", "COL", "CRI",
-/* "CU", "CV", "CX", "CY", "CZ", "DE", "DJ", "DK", */
- "CUB", "CPV", "CXR", "CYP", "CZE", "DEU", "DJI", "DNK",
+/* "CU", "CV", "CW", "CX", "CY", "CZ", "DE", "DJ", "DK", */
+ "CUB", "CPV", "CUW", "CXR", "CYP", "CZE", "DEU", "DJI", "DNK",
/* "DM", "DO", "DZ", "EC", "EE", "EG", "EH", "ER", */
"DMA", "DOM", "DZA", "ECU", "EST", "EGY", "ESH", "ERI",
/* "ES", "ET", "FI", "FJ", "FK", "FM", "FO", "FR", */
@@ -430,10 +422,10 @@
"PLW", "PRY", "QAT", "REU", "ROU", "SRB", "RUS", "RWA", "SAU",
/* "SB", "SC", "SD", "SE", "SG", "SH", "SI", "SJ", */
"SLB", "SYC", "SDN", "SWE", "SGP", "SHN", "SVN", "SJM",
-/* "SK", "SL", "SM", "SN", "SO", "SR", "ST", "SV", */
- "SVK", "SLE", "SMR", "SEN", "SOM", "SUR", "STP", "SLV",
-/* "SY", "SZ", "TC", "TD", "TF", "TG", "TH", "TJ", */
- "SYR", "SWZ", "TCA", "TCD", "ATF", "TGO", "THA", "TJK",
+/* "SK", "SL", "SM", "SN", "SO", "SR", "SS", "ST", "SV", */
+ "SVK", "SLE", "SMR", "SEN", "SOM", "SUR", "SSD", "STP", "SLV",
+/* "SX", "SY", "SZ", "TC", "TD", "TF", "TG", "TH", "TJ", */
+ "SXM", "SYR", "SWZ", "TCA", "TCD", "ATF", "TGO", "THA", "TJK",
/* "TK", "TL", "TM", "TN", "TO", "TR", "TT", "TV", */
"TKL", "TLS", "TKM", "TUN", "TON", "TUR", "TTO", "TUV",
/* "TW", "TZ", "UA", "UG", "UM", "US", "UY", "UZ", */
@@ -443,8 +435,8 @@
/* "WS", "YE", "YT", "ZA", "ZM", "ZW", */
"WSM", "YEM", "MYT", "ZAF", "ZMB", "ZWE",
NULL,
-/* "FX", "CS", "RO", "TP", "YU", "ZR", */
- "FXX", "SCG", "ROM", "TMP", "YUG", "ZAR",
+/* "AN", "BU", "CS", "FX", "RO", "SU", "TP", "YD", "YU", "ZR" */
+ "ANT", "BUR", "SCG", "FXX", "ROM", "SUN", "TMP", "YMD", "YUG", "ZAR",
NULL
};
@@ -2146,7 +2138,7 @@
}
/**
- * Returns a list of all language codes defined in ISO 639. This is a pointer
+ * Returns a list of all 2-letter language codes defined in ISO 639. This is a pointer
* to an array of pointers to arrays of char. All of these pointers are owned
* by ICU-- do not delete them, and do not write through them. The array is
* terminated with a null pointer.
diff --git a/common/uloc_tag.c b/common/uloc_tag.c
index c7cf87c..d40099e 100644
--- a/common/uloc_tag.c
+++ b/common/uloc_tag.c
@@ -2082,10 +2082,9 @@
int32_t subtagLen;
int32_t extlangIdx;
ExtensionListEntry *pExtension;
- AttributeListEntry *pAttribute;
char *pExtValueSubtag, *pExtValueSubtagEnd;
int32_t i;
- UBool isLDMLExtension, privateuseVar = FALSE;
+ UBool privateuseVar = FALSE;
int32_t grandfatheredLen = 0;
if (parsedLen != NULL) {
@@ -2161,8 +2160,6 @@
pExtension = NULL;
pExtValueSubtag = NULL;
pExtValueSubtagEnd = NULL;
- pAttribute = NULL;
- isLDMLExtension = FALSE;
while (pNext) {
char *pSep;
@@ -2288,8 +2285,6 @@
}
}
- isLDMLExtension = (uprv_tolower(*pSubtag) == LDMLEXT);
-
/* create a new extension */
pExtension = (ExtensionListEntry*)uprv_malloc(sizeof(ExtensionListEntry));
if (pExtension == NULL) {
diff --git a/common/unicode/appendable.h b/common/unicode/appendable.h
index a90f37b..a6a83b1 100644
--- a/common/unicode/appendable.h
+++ b/common/unicode/appendable.h
@@ -140,10 +140,6 @@
int32_t desiredCapacityHint,
UChar *scratch, int32_t scratchCapacity,
int32_t *resultCapacity);
-
-private:
- // No ICU "poor man's RTTI" for this class nor its subclasses.
- virtual UClassID getDynamicClassID() const;
};
/**
diff --git a/common/unicode/brkiter.h b/common/unicode/brkiter.h
index 646f33f..dd9d4e2 100644
--- a/common/unicode/brkiter.h
+++ b/common/unicode/brkiter.h
@@ -1,6 +1,6 @@
/*
********************************************************************************
-* Copyright (C) 1997-2012, International Business Machines
+* Copyright (C) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@@ -182,6 +182,11 @@
* Utext that was passed as a parameter, but that the underlying text itself
* must not be altered while being referenced by the break iterator.
*
+ * All index positions returned by break iterator functions are
+ * native indices from the UText. For example, when breaking UTF-8
+ * encoded text, the break positions returned by next(), previous(), etc.
+ * will be UTF-8 string indices, not UTF-16 positions.
+ *
* @param text The UText used to change the text.
* @param status receives any error codes.
* @stable ICU 3.4
@@ -541,7 +546,7 @@
* @param status Receives errors detected by this function.
* @return *this
*
- * @draft ICU 49
+ * @stable ICU 49
*/
virtual BreakIterator &refreshInputText(UText *input, UErrorCode &status) = 0;
diff --git a/common/unicode/dbbi.h b/common/unicode/dbbi.h
index c7984ef..4b951f0 100644
--- a/common/unicode/dbbi.h
+++ b/common/unicode/dbbi.h
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (C) 1999-2006 IBM Corp. All rights reserved.
+* Copyright (C) 1999-2006,2013 IBM Corp. All rights reserved.
**********************************************************************
* Date Name Description
* 12/1/99 rgillam Complete port from Java.
@@ -22,17 +22,15 @@
U_NAMESPACE_BEGIN
+#ifndef U_HIDE_DEPRECATED_API
/**
* An obsolete subclass of RuleBasedBreakIterator. Handling of dictionary-
* based break iteration has been folded into the base class. This class
* is deprecated as of ICU 3.6.
*/
-
-#ifndef U_HIDE_DEPRECATED_API
-
typedef RuleBasedBreakIterator DictionaryBasedBreakIterator;
-#endif
+#endif /* U_HIDE_DEPRECATED_API */
U_NAMESPACE_END
diff --git a/common/unicode/enumset.h b/common/unicode/enumset.h
index ac23c09..a7a2416 100644
--- a/common/unicode/enumset.h
+++ b/common/unicode/enumset.h
@@ -1,61 +1,61 @@
-/*
-******************************************************************************
-*
-* Copyright (C) 2012, International Business Machines
-* Corporation and others. All Rights Reserved.
-*
-******************************************************************************
-*/
-
-/**
- * \file
- * \brief C++: internal template EnumSet<>
- */
-
-#ifndef ENUMSET_H
-#define ENUMSET_H
-
-#include "unicode/utypes.h"
-
-#if U_SHOW_CPLUSPLUS_API
-
-U_NAMESPACE_BEGIN
-
-/**
- * enum bitset for boolean fields. Similar to Java EnumSet<>.
- * Needs to range check.
- * @internal
- */
-template<typename T, uint32_t minValue, uint32_t limitValue>
-class EnumSet {
-public:
- inline EnumSet() : fBools(0) {}
- inline EnumSet(const EnumSet<T,minValue,limitValue>& other) : fBools(other.fBools) {}
- inline ~EnumSet() {}
- inline void clear() { fBools=0; }
- inline void add(T toAdd) { set(toAdd, 1); }
- inline void remove(T toRemove) { set(toRemove, 0); }
- 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 (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;
- return *this;
- }
-
- inline uint32_t getAll() const {
- return fBools;
- }
-
-private:
- inline uint32_t flag(T toCheck) const { return (1<<(toCheck-minValue)); }
-private:
- uint32_t fBools;
-};
-
-U_NAMESPACE_END
-
-#endif /* U_SHOW_CPLUSPLUS_API */
-#endif /* ENUMSET_H */
+/*
+******************************************************************************
+*
+* Copyright (C) 2012, International Business Machines
+* Corporation and others. All Rights Reserved.
+*
+******************************************************************************
+*/
+
+/**
+ * \file
+ * \brief C++: internal template EnumSet<>
+ */
+
+#ifndef ENUMSET_H
+#define ENUMSET_H
+
+#include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
+U_NAMESPACE_BEGIN
+
+/**
+ * enum bitset for boolean fields. Similar to Java EnumSet<>.
+ * Needs to range check.
+ * @internal
+ */
+template<typename T, uint32_t minValue, uint32_t limitValue>
+class EnumSet {
+public:
+ inline EnumSet() : fBools(0) {}
+ inline EnumSet(const EnumSet<T,minValue,limitValue>& other) : fBools(other.fBools) {}
+ inline ~EnumSet() {}
+ inline void clear() { fBools=0; }
+ inline void add(T toAdd) { set(toAdd, 1); }
+ inline void remove(T toRemove) { set(toRemove, 0); }
+ 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 (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;
+ return *this;
+ }
+
+ inline uint32_t getAll() const {
+ return fBools;
+ }
+
+private:
+ inline uint32_t flag(T toCheck) const { return (1<<(toCheck-minValue)); }
+private:
+ uint32_t fBools;
+};
+
+U_NAMESPACE_END
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+#endif /* ENUMSET_H */
diff --git a/common/unicode/icudataver.h b/common/unicode/icudataver.h
index 982a88e..609f580 100644
--- a/common/unicode/icudataver.h
+++ b/common/unicode/icudataver.h
@@ -1,7 +1,7 @@
/*
******************************************************************************
*
-* Copyright (C) 2009-2012, International Business Machines
+* Copyright (C) 2009-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@@ -18,14 +18,13 @@
#include "unicode/utypes.h"
-#ifndef U_HIDE_DRAFT_API
/**
- * @draft ICU 49
+ * @stable ICU 49
*/
#define U_ICU_VERSION_BUNDLE "icuver"
/**
- * @draft ICU 49
+ * @stable ICU 49
*/
#define U_ICU_DATA_KEY "DataVersion"
@@ -35,9 +34,8 @@
* @param dataVersionFillin icuver data version information to be filled in if not-null
* @param status stores the error code from the calls to resource bundle
*
- * @draft ICU 49
+ * @stable ICU 49
*/
-U_DRAFT void U_EXPORT2 u_getDataVersion(UVersionInfo dataVersionFillin, UErrorCode *status);
-#endif /* U_HIDE_DRAFT_API */
+U_STABLE void U_EXPORT2 u_getDataVersion(UVersionInfo dataVersionFillin, UErrorCode *status);
#endif
diff --git a/common/unicode/idna.h b/common/unicode/idna.h
index 70a8416..90194a3 100644
--- a/common/unicode/idna.h
+++ b/common/unicode/idna.h
@@ -254,10 +254,6 @@
virtual void
nameToUnicodeUTF8(const StringPiece &name, ByteSink &dest,
IDNAInfo &info, UErrorCode &errorCode) const;
-
-private:
- // No ICU "poor man's RTTI" for this class nor its subclasses.
- virtual UClassID getDynamicClassID() const;
};
class UTS46;
diff --git a/common/unicode/listformatter.h b/common/unicode/listformatter.h
index 3704237..30d99e9 100644
--- a/common/unicode/listformatter.h
+++ b/common/unicode/listformatter.h
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 2012, International Business Machines
+* Copyright (C) 2012-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -17,10 +17,13 @@
#ifndef __LISTFORMATTER_H__
#define __LISTFORMATTER_H__
+#include "unicode/utypes.h"
+
+#ifndef U_HIDE_DRAFT_API
+
#include "unicode/unistr.h"
#include "unicode/locid.h"
-
U_NAMESPACE_BEGIN
/** @internal */
@@ -52,6 +55,7 @@
* as "Alice, Bob, Charlie and Delta" in English.
*
* The ListFormatter class is not intended for public subclassing.
+ * @draft ICU 50
*/
class U_COMMON_API ListFormatter : public UObject{
@@ -100,22 +104,12 @@
UnicodeString& appendTo, UErrorCode& errorCode) const;
/**
- * Gets the fallback locale for a given locale.
- * TODO: Consider moving this to the Locale class.
- * @param in The input locale.
- * @param out The output locale after fallback.
- * @internal For testing.
- */
- static void getFallbackLocale(const Locale& in, Locale& out, UErrorCode& errorCode);
-
- /**
* @internal constructor made public for testing.
*/
ListFormatter(const ListFormatData& listFormatterData);
private:
static void initializeHash(UErrorCode& errorCode);
- static void addDataToHash(const char* locale, const char* two, const char* start, const char* middle, const char* end, UErrorCode& errorCode);
static const ListFormatData* getListFormatData(const Locale& locale, UErrorCode& errorCode);
ListFormatter();
@@ -124,11 +118,11 @@
ListFormatter& operator = (const ListFormatter&);
void addNewString(const UnicodeString& pattern, UnicodeString& originalString,
const UnicodeString& newString, UErrorCode& errorCode) const;
- virtual UClassID getDynamicClassID() const;
const ListFormatData& data;
};
U_NAMESPACE_END
+#endif /* U_HIDE_DRAFT_API */
#endif
diff --git a/common/unicode/locid.h b/common/unicode/locid.h
index aeee629..e43cae7 100644
--- a/common/unicode/locid.h
+++ b/common/unicode/locid.h
@@ -1,7 +1,7 @@
/*
******************************************************************************
*
-* Copyright (C) 1996-2012, International Business Machines
+* Copyright (C) 1996-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@@ -450,7 +450,6 @@
*/
int32_t getKeywordValue(const char* keywordName, char *buffer, int32_t bufferCapacity, UErrorCode &status) const;
-#ifndef U_HIDE_DRAFT_API
/**
* Sets the value for a keyword.
*
@@ -460,10 +459,9 @@
* that keyword does not exist.
* @param status Returns any error information while performing this operation.
*
- * @draft ICU 49
+ * @stable ICU 49
*/
void setKeywordValue(const char* keywordName, const char* keywordValue, UErrorCode &status);
-#endif /* U_HIDE_DRAFT_API */
/**
* returns the locale's three-letter language code, as specified
diff --git a/common/unicode/messagepattern.h b/common/unicode/messagepattern.h
index a5204c1..01e1629 100644
--- a/common/unicode/messagepattern.h
+++ b/common/unicode/messagepattern.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2011-2012, International Business Machines
+* Copyright (C) 2011-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
* file name: messagepattern.h
@@ -247,18 +247,21 @@
* @stable ICU 4.8
*/
UMSGPAT_ARG_TYPE_SELECT,
+#ifndef U_HIDE_DRAFT_API
/**
* The argument is an ordinal-number PluralFormat
* with the same style parts sequence and semantics as UMSGPAT_ARG_TYPE_PLURAL.
* @draft ICU 50
*/
UMSGPAT_ARG_TYPE_SELECTORDINAL
+#endif /* U_HIDE_DRAFT_API */
};
/**
* @stable ICU 4.8
*/
typedef enum UMessagePatternArgType UMessagePatternArgType;
+#ifndef U_HIDE_DRAFT_API
/**
* Returns TRUE if the argument type has a plural style part sequence and semantics,
* for example UMSGPAT_ARG_TYPE_PLURAL and UMSGPAT_ARG_TYPE_SELECTORDINAL.
@@ -266,6 +269,7 @@
*/
#define UMSGPAT_ARG_TYPE_HAS_PLURAL_STYLE(argType) \
((argType)==UMSGPAT_ARG_TYPE_PLURAL || (argType)==UMSGPAT_ARG_TYPE_SELECTORDINAL)
+#endif /* U_HIDE_DRAFT_API */
enum {
/**
@@ -917,9 +921,6 @@
void setParseError(UParseError *parseError, int32_t index);
- // No ICU "poor man's RTTI" for this class nor its subclasses.
- virtual UClassID getDynamicClassID() const;
-
UBool init(UErrorCode &errorCode);
UBool copyStorage(const MessagePattern &other, UErrorCode &errorCode);
diff --git a/common/unicode/normalizer2.h b/common/unicode/normalizer2.h
index bfca5ab..c03cba3 100644
--- a/common/unicode/normalizer2.h
+++ b/common/unicode/normalizer2.h
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 2009-2012, International Business Machines
+* Copyright (C) 2009-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -83,7 +83,6 @@
*/
~Normalizer2();
-#ifndef U_HIDE_DRAFT_API
/**
* Returns a Normalizer2 instance for Unicode NFC normalization.
* Same as getInstance(NULL, "nfc", UNORM2_COMPOSE, errorCode).
@@ -93,7 +92,7 @@
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
- * @draft ICU 49
+ * @stable ICU 49
*/
static const Normalizer2 *
getNFCInstance(UErrorCode &errorCode);
@@ -107,7 +106,7 @@
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
- * @draft ICU 49
+ * @stable ICU 49
*/
static const Normalizer2 *
getNFDInstance(UErrorCode &errorCode);
@@ -121,7 +120,7 @@
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
- * @draft ICU 49
+ * @stable ICU 49
*/
static const Normalizer2 *
getNFKCInstance(UErrorCode &errorCode);
@@ -135,7 +134,7 @@
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
- * @draft ICU 49
+ * @stable ICU 49
*/
static const Normalizer2 *
getNFKDInstance(UErrorCode &errorCode);
@@ -149,11 +148,10 @@
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
- * @draft ICU 49
+ * @stable ICU 49
*/
static const Normalizer2 *
getNFKCCasefoldInstance(UErrorCode &errorCode);
-#endif /* U_HIDE_DRAFT_API */
/**
* Returns a Normalizer2 instance which uses the specified data file
@@ -290,7 +288,7 @@
* @param decomposition String object which will be set to c's
* raw decomposition mapping, if there is one.
* @return TRUE if c has a decomposition, otherwise FALSE
- * @draft ICU 49
+ * @stable ICU 49
*/
virtual UBool
getRawDecomposition(UChar32 c, UnicodeString &decomposition) const;
@@ -308,7 +306,7 @@
* @param a A (normalization starter) code point.
* @param b Another code point.
* @return The non-negative composite code point if there is one; otherwise a negative value.
- * @draft ICU 49
+ * @stable ICU 49
*/
virtual UChar32
composePair(UChar32 a, UChar32 b) const;
@@ -319,7 +317,7 @@
* but all standard implementations return the Unicode Canonical_Combining_Class value.
* @param c code point
* @return c's combining class
- * @draft ICU 49
+ * @stable ICU 49
*/
virtual uint8_t
getCombiningClass(UChar32 c) const;
@@ -429,10 +427,6 @@
* @stable ICU 4.4
*/
virtual UBool isInert(UChar32 c) const = 0;
-
-private:
- // No ICU "poor man's RTTI" for this class nor its subclasses.
- virtual UClassID getDynamicClassID() const;
};
/**
@@ -544,7 +538,7 @@
* @param decomposition String object which will be set to c's
* raw decomposition mapping, if there is one.
* @return TRUE if c has a decomposition, otherwise FALSE
- * @draft ICU 49
+ * @stable ICU 49
*/
virtual UBool
getRawDecomposition(UChar32 c, UnicodeString &decomposition) const;
@@ -557,7 +551,7 @@
* @param a A (normalization starter) code point.
* @param b Another code point.
* @return The non-negative composite code point if there is one; otherwise a negative value.
- * @draft ICU 49
+ * @stable ICU 49
*/
virtual UChar32
composePair(UChar32 a, UChar32 b) const;
@@ -568,7 +562,7 @@
* but all standard implementations return the Unicode Canonical_Combining_Class value.
* @param c code point
* @return c's combining class
- * @draft ICU 49
+ * @stable ICU 49
*/
virtual uint8_t
getCombiningClass(UChar32 c) const;
diff --git a/common/unicode/platform.h b/common/unicode/platform.h
index 46b8d5c..26f12f4 100644
--- a/common/unicode/platform.h
+++ b/common/unicode/platform.h
@@ -272,7 +272,7 @@
#ifdef U_HAVE_STDINT_H
/* Use the predefined value. */
#elif U_PLATFORM_USES_ONLY_WIN32_API
-# if defined(__BORLANDC__) || (defined(_MSC_VER) && _MSC_VER>=1600)
+# if defined(__BORLANDC__) || U_PLATFORM == U_PF_MINGW || (defined(_MSC_VER) && _MSC_VER>=1600)
/* Windows Visual Studio 9 and below do not have stdint.h & inttypes.h, but VS 2010 adds them. */
# define U_HAVE_STDINT_H 1
# else
diff --git a/common/unicode/rbbi.h b/common/unicode/rbbi.h
index 0f68cf8..1599378 100644
--- a/common/unicode/rbbi.h
+++ b/common/unicode/rbbi.h
@@ -1,6 +1,6 @@
/*
***************************************************************************
-* Copyright (C) 1999-2012 International Business Machines Corporation *
+* Copyright (C) 1999-2013 International Business Machines Corporation *
* and others. All rights reserved. *
***************************************************************************
@@ -654,7 +654,7 @@
* @param status Receives errors detected by this function.
* @return *this
*
- * @draft ICU 49
+ * @stable ICU 49
*/
virtual RuleBasedBreakIterator &refreshInputText(UText *input, UErrorCode &status);
diff --git a/common/unicode/rep.h b/common/unicode/rep.h
index 3fab6fa..4c7eae1 100644
--- a/common/unicode/rep.h
+++ b/common/unicode/rep.h
@@ -1,6 +1,6 @@
/*
**************************************************************************
-* Copyright (C) 1999-2005, International Business Machines Corporation and
+* Copyright (C) 1999-2012, International Business Machines Corporation and
* others. All Rights Reserved.
**************************************************************************
* Date Name Description
@@ -205,7 +205,7 @@
* Default constructor.
* @stable ICU 2.4
*/
- Replaceable();
+ inline Replaceable();
/*
* Assignment operator not declared. The compiler will provide one
@@ -237,6 +237,8 @@
virtual UChar32 getChar32At(int32_t offset) const = 0;
};
+inline Replaceable::Replaceable() {}
+
inline int32_t
Replaceable::length() const {
return getLength();
diff --git a/common/unicode/stringtriebuilder.h b/common/unicode/stringtriebuilder.h
index 9cb2ae5..05fa6e7 100644
--- a/common/unicode/stringtriebuilder.h
+++ b/common/unicode/stringtriebuilder.h
@@ -239,9 +239,6 @@
protected:
int32_t hash;
int32_t offset;
- private:
- // No ICU "poor man's RTTI" for this class nor its subclasses.
- virtual UClassID getDynamicClassID() const;
};
// This class should not be overridden because
@@ -396,10 +393,6 @@
virtual int32_t writeValueAndType(UBool hasValue, int32_t value, int32_t node) = 0;
/** @internal */
virtual int32_t writeDeltaTo(int32_t jumpTarget) = 0;
-
-private:
- // No ICU "poor man's RTTI" for this class nor its subclasses.
- virtual UClassID getDynamicClassID() const;
};
U_NAMESPACE_END
diff --git a/common/unicode/ubrk.h b/common/unicode/ubrk.h
index c236b44..2506540 100644
--- a/common/unicode/ubrk.h
+++ b/common/unicode/ubrk.h
@@ -1,6 +1,6 @@
/*
******************************************************************************
-* Copyright (C) 1996-2012, International Business Machines Corporation and others.
+* Copyright (C) 1996-2013, International Business Machines Corporation and others.
* All Rights Reserved.
******************************************************************************
*/
@@ -313,7 +313,13 @@
/**
- * Sets an existing iterator to point to a new piece of text
+ * Sets an existing iterator to point to a new piece of text.
+ *
+ * All index positions returned by break iterator functions are
+ * native indices from the UText. For example, when breaking UTF-8
+ * encoded text, the break positions returned by \ref ubrk_next, \ref ubrk_previous, etc.
+ * will be UTF-8 string indices, not UTF-16 positions.
+ *
* @param bi The iterator to use
* @param text The text to be set.
* This function makes a shallow clone of the supplied UText. This means
@@ -494,7 +500,6 @@
U_STABLE const char* U_EXPORT2
ubrk_getLocaleByType(const UBreakIterator *bi, ULocDataLocaleType type, UErrorCode* status);
-#ifndef U_HIDE_DRAFT_API
/**
* Set the subject text string upon which the break iterator is operating
* without changing any other aspect of the state.
@@ -518,13 +523,12 @@
* @param text The new (moved) text string.
* @param status Receives errors detected by this function.
*
- * @draft ICU 49
+ * @stable ICU 49
*/
-U_DRAFT void U_EXPORT2
+U_STABLE void U_EXPORT2
ubrk_refreshUText(UBreakIterator *bi,
UText *text,
UErrorCode *status);
-#endif /* U_HIDE_DRAFT_API */
#endif /* #if !UCONFIG_NO_BREAK_ITERATION */
diff --git a/common/unicode/uchar.h b/common/unicode/uchar.h
index 6b6cded..e37b6a8 100644
--- a/common/unicode/uchar.h
+++ b/common/unicode/uchar.h
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (C) 1997-2012, International Business Machines
+* Copyright (C) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*
@@ -1457,14 +1457,16 @@
typedef enum UCharNameChoice {
/** Unicode character name (Name property). @stable ICU 2.0 */
U_UNICODE_CHAR_NAME,
+#ifndef U_HIDE_DEPRECATED_API
/**
* The Unicode_1_Name property value which is of little practical value.
* Beginning with ICU 49, ICU APIs return an empty string for this name choice.
* @deprecated ICU 49
*/
U_UNICODE_10_CHAR_NAME,
+#endif /* U_HIDE_DEPRECATED_API */
/** Standard or synthetic character name. @stable ICU 2.0 */
- U_EXTENDED_CHAR_NAME,
+ U_EXTENDED_CHAR_NAME = U_UNICODE_CHAR_NAME+2,
/** Corrected name from NameAliases.txt. @stable ICU 4.4 */
U_CHAR_NAME_ALIAS,
/** @stable ICU 2.0 */
@@ -2655,6 +2657,7 @@
char *buffer, int32_t bufferLength,
UErrorCode *pErrorCode);
+#ifndef U_HIDE_DEPRECATED_API
/**
* Returns an empty string.
* Used to return the ISO 10646 comment for a character.
@@ -2677,6 +2680,7 @@
u_getISOComment(UChar32 c,
char *dest, int32_t destCapacity,
UErrorCode *pErrorCode);
+#endif /* U_HIDE_DEPRECATED_API */
/**
* Find a Unicode character by its name and return its code point value.
diff --git a/common/unicode/uconfig.h b/common/unicode/uconfig.h
index 4cda06a..ef4ba94 100644
--- a/common/unicode/uconfig.h
+++ b/common/unicode/uconfig.h
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (C) 2002-2012, International Business Machines
+* Copyright (C) 2002-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* file name: uconfig.h
@@ -96,7 +96,7 @@
* utypes.h includes those headers if this macro is defined to 0.
* Otherwise, each those headers must be included explicitly when using one of their macros.
* Defaults to 0 for backward compatibility, except inside ICU.
- * @draft ICU 49
+ * @stable ICU 49
*/
#ifdef U_NO_DEFAULT_INCLUDE_UTF_HEADERS
/* Use the predefined value. */
diff --git a/common/unicode/uidna.h b/common/unicode/uidna.h
index 6db4ed4..2efb130 100644
--- a/common/unicode/uidna.h
+++ b/common/unicode/uidna.h
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
- * Copyright (C) 2003-2012, International Business Machines
+ * Copyright (C) 2003-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -96,7 +96,6 @@
* @stable ICU 4.6
*/
UIDNA_NONTRANSITIONAL_TO_UNICODE=0x20,
-#ifndef U_HIDE_DRAFT_API
/**
* IDNA option to check for whether the input conforms to the CONTEXTO rules.
* For use in static worker and factory methods.
@@ -104,10 +103,9 @@
* (The CONTEXTO check is new in IDNA2008.)
* <p>This is for use by registries for IDNA2008 conformance.
* UTS #46 does not require the CONTEXTO check.
- * @draft ICU 49
+ * @stable ICU 49
*/
UIDNA_CHECK_CONTEXTO=0x40
-#endif /* U_HIDE_DRAFT_API */
};
/**
@@ -490,21 +488,19 @@
* @stable ICU 4.6
*/
UIDNA_ERROR_CONTEXTJ=0x1000,
-#ifndef U_HIDE_DRAFT_API
/**
* A label does not meet the IDNA CONTEXTO requirements for punctuation characters.
* Some punctuation characters "Would otherwise have been DISALLOWED"
* but are allowed in certain contexts. (RFC 5892)
- * @draft ICU 49
+ * @stable ICU 49
*/
UIDNA_ERROR_CONTEXTO_PUNCTUATION=0x2000,
/**
* A label does not meet the IDNA CONTEXTO requirements for digits.
* Arabic-Indic Digits (U+066x) must not be mixed with Extended Arabic-Indic Digits (U+06Fx).
- * @draft ICU 49
+ * @stable ICU 49
*/
UIDNA_ERROR_CONTEXTO_DIGITS=0x4000
-#endif /* U_HIDE_DRAFT_API */
};
/* IDNA2003 API ------------------------------------------------------------- */
diff --git a/common/unicode/uloc.h b/common/unicode/uloc.h
index 15e8abd..a8b59fb 100644
--- a/common/unicode/uloc.h
+++ b/common/unicode/uloc.h
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (C) 1997-2012, International Business Machines
+* Copyright (C) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*
@@ -753,7 +753,9 @@
/**
*
- * Gets a list of all available language codes defined in ISO 639. This is a pointer
+ * Gets a list of all available 2-letter language codes defined in ISO 639,
+ * plus additional 3-letter codes determined to be useful for locale generation as
+ * defined by Unicode CLDR. This is a pointer
* to an array of pointers to arrays of char. All of these pointers are owned
* by ICU-- do not delete them, and do not write through them. The array is
* terminated with a null pointer.
diff --git a/common/unicode/unistr.h b/common/unicode/unistr.h
index 4ebeb51..e70af40 100644
--- a/common/unicode/unistr.h
+++ b/common/unicode/unistr.h
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (C) 1998-2012, International Business Machines
+* Copyright (C) 1998-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*
@@ -54,6 +54,7 @@
u_strlen(const UChar *s);
#endif
+#ifndef U_HIDE_INTERNAL_API
/**
* \def U_STRING_CASE_MAPPER_DEFINED
* @internal
@@ -73,6 +74,7 @@
UErrorCode *pErrorCode);
#endif
+#endif /* U_HIDE_INTERNAL_API */
U_NAMESPACE_BEGIN
@@ -142,7 +144,7 @@
* This can be defined to be empty or "explicit".
* If explicit, then the UnicodeString(UChar) and UnicodeString(UChar32)
* constructors are marked as explicit, preventing their inadvertent use.
- * @draft ICU 49
+ * @stable ICU 49
*/
#ifndef UNISTR_FROM_CHAR_EXPLICIT
# if defined(U_COMBINED_IMPLEMENTATION) || defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION)
@@ -162,7 +164,7 @@
*
* In particular, this helps prevent accidentally depending on ICU conversion code
* by passing a string literal into an API with a const UnicodeString & parameter.
- * @draft ICU 49
+ * @stable ICU 49
*/
#ifndef UNISTR_FROM_STRING_EXPLICIT
# if defined(U_COMBINED_IMPLEMENTATION) || defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION)
@@ -2852,7 +2854,7 @@
/** Construct an empty UnicodeString.
* @stable ICU 2.0
*/
- UnicodeString();
+ inline UnicodeString();
/**
* Construct a UnicodeString with capacity to hold <TT>capacity</TT> UChars
@@ -3205,7 +3207,7 @@
* character. See unescape() for a listing of the recognized escape
* sequences. The character at offset-1 is assumed (without
* checking) to be a backslash. If the escape sequence is
- * ill-formed, or the offset is out of range, (UChar32)0xFFFFFFFF is
+ * ill-formed, or the offset is out of range, U_SENTINEL=-1 is
* returned.
*
* @param offset an input output parameter. On input, it is the
@@ -3213,7 +3215,7 @@
* after the initial backslash. On output, it is advanced after the
* last character parsed. On error, it is not advanced at all.
* @return the character represented by the escape sequence at
- * offset, or (UChar32)0xFFFFFFFF on error.
+ * offset, or U_SENTINEL=-1 on error.
* @see UnicodeString#unescape()
* @see u_unescape()
* @see u_unescapeAt()
@@ -3604,6 +3606,16 @@
{ return (fFlags&kUsingStackBuffer) ? fUnion.fStackBuffer : fUnion.fFields.fArray; }
//========================================
+// Default constructor
+//========================================
+
+inline
+UnicodeString::UnicodeString()
+ : fShortLength(0),
+ fFlags(kShortString)
+{}
+
+//========================================
// Read-only implementation methods
//========================================
inline int32_t
diff --git a/common/unicode/unorm2.h b/common/unicode/unorm2.h
index f419ad1..7152fc1 100644
--- a/common/unicode/unorm2.h
+++ b/common/unicode/unorm2.h
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 2009-2012, International Business Machines
+* Copyright (C) 2009-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -118,7 +118,6 @@
#if !UCONFIG_NO_NORMALIZATION
-#ifndef U_HIDE_DRAFT_API
/**
* Returns a UNormalizer2 instance for Unicode NFC normalization.
* Same as unorm2_getInstance(NULL, "nfc", UNORM2_COMPOSE, pErrorCode).
@@ -128,9 +127,9 @@
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
- * @draft ICU 49
+ * @stable ICU 49
*/
-U_DRAFT const UNormalizer2 * U_EXPORT2
+U_STABLE const UNormalizer2 * U_EXPORT2
unorm2_getNFCInstance(UErrorCode *pErrorCode);
/**
@@ -142,9 +141,9 @@
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
- * @draft ICU 49
+ * @stable ICU 49
*/
-U_DRAFT const UNormalizer2 * U_EXPORT2
+U_STABLE const UNormalizer2 * U_EXPORT2
unorm2_getNFDInstance(UErrorCode *pErrorCode);
/**
@@ -156,9 +155,9 @@
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
- * @draft ICU 49
+ * @stable ICU 49
*/
-U_DRAFT const UNormalizer2 * U_EXPORT2
+U_STABLE const UNormalizer2 * U_EXPORT2
unorm2_getNFKCInstance(UErrorCode *pErrorCode);
/**
@@ -170,9 +169,9 @@
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
- * @draft ICU 49
+ * @stable ICU 49
*/
-U_DRAFT const UNormalizer2 * U_EXPORT2
+U_STABLE const UNormalizer2 * U_EXPORT2
unorm2_getNFKDInstance(UErrorCode *pErrorCode);
/**
@@ -184,11 +183,10 @@
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
- * @draft ICU 49
+ * @stable ICU 49
*/
-U_DRAFT const UNormalizer2 * U_EXPORT2
+U_STABLE const UNormalizer2 * U_EXPORT2
unorm2_getNFKCCasefoldInstance(UErrorCode *pErrorCode);
-#endif /* U_HIDE_DRAFT_API */
/**
* Returns a UNormalizer2 instance which uses the specified data file
@@ -355,7 +353,6 @@
UChar32 c, UChar *decomposition, int32_t capacity,
UErrorCode *pErrorCode);
-#ifndef U_HIDE_DRAFT_API
/**
* Gets the raw decomposition mapping of c.
*
@@ -383,9 +380,9 @@
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the non-negative length of c's raw decomposition, if there is one; otherwise a negative value
- * @draft ICU 49
+ * @stable ICU 49
*/
-U_DRAFT int32_t U_EXPORT2
+U_STABLE int32_t U_EXPORT2
unorm2_getRawDecomposition(const UNormalizer2 *norm2,
UChar32 c, UChar *decomposition, int32_t capacity,
UErrorCode *pErrorCode);
@@ -403,9 +400,9 @@
* @param a A (normalization starter) code point.
* @param b Another code point.
* @return The non-negative composite code point if there is one; otherwise a negative value.
- * @draft ICU 49
+ * @stable ICU 49
*/
-U_DRAFT UChar32 U_EXPORT2
+U_STABLE UChar32 U_EXPORT2
unorm2_composePair(const UNormalizer2 *norm2, UChar32 a, UChar32 b);
/**
@@ -415,11 +412,10 @@
* @param norm2 UNormalizer2 instance
* @param c code point
* @return c's combining class
- * @draft ICU 49
+ * @stable ICU 49
*/
-U_DRAFT uint8_t U_EXPORT2
+U_STABLE uint8_t U_EXPORT2
unorm2_getCombiningClass(const UNormalizer2 *norm2, UChar32 c);
-#endif /* U_HIDE_DRAFT_API */
/**
* Tests if the string is normalized.
diff --git a/common/unicode/uobject.h b/common/unicode/uobject.h
index b8ba94e..54ceace 100644
--- a/common/unicode/uobject.h
+++ b/common/unicode/uobject.h
@@ -59,15 +59,10 @@
* operator==(). Nothing else should be done with them.
*
* \par
- * getDynamicClassID() is declared in the base class of the hierarchy as
- * a pure virtual. Each concrete subclass implements it in the same way:
+ * In class hierarchies that implement "poor man's RTTI",
+ * each concrete subclass implements getDynamicClassID() in the same way:
*
* \code
- * class Base {
- * public:
- * virtual UClassID getDynamicClassID() const = 0;
- * }
- *
* class Derived {
* public:
* virtual UClassID getDynamicClassID() const
@@ -210,10 +205,7 @@
* and all other public ICU C++ classes
* are derived from UObject (starting with ICU 2.2).
*
- * UObject contains common virtual functions like for ICU's "poor man's RTTI".
- * It does not contain default implementations of virtual methods
- * like getDynamicClassID to allow derived classes such as Format
- * to declare these as pure virtual.
+ * UObject contains common virtual functions, in particular a virtual destructor.
*
* The clone() function is not available in UObject because it is not
* implemented by all ICU classes.
@@ -237,21 +229,23 @@
/**
* ICU4C "poor man's RTTI", returns a UClassID for the actual ICU class.
+ * The base class implementation returns a dummy value.
+ *
+ * Use compiler RTTI rather than ICU's "poor man's RTTI".
+ * Since ICU 4.6, new ICU C++ class hierarchies do not implement "poor man's RTTI".
*
* @stable ICU 2.2
*/
- virtual UClassID getDynamicClassID() const; // Android patch: tiny part of ICU 51's r32776
+ virtual UClassID getDynamicClassID() const;
protected:
// the following functions are protected to prevent instantiation and
// direct use of UObject itself
// default constructor
- // commented out because UObject is abstract (see getDynamicClassID)
// inline UObject() {}
// copy constructor
- // commented out because UObject is abstract (see getDynamicClassID)
// inline UObject(const UObject &other) {}
#if 0
@@ -286,19 +280,6 @@
* here would be to declare and empty-implement a protected or public one.
UObject &UObject::operator=(const UObject &);
*/
-
-// Future implementation for RTTI that support subtyping. [alan]
-//
-// public:
-// /**
-// * @internal
-// */
-// static UClassID getStaticClassID();
-//
-// /**
-// * @internal
-// */
-// UBool instanceOf(UClassID type) const;
};
#ifndef U_HIDE_INTERNAL_API
@@ -332,34 +313,6 @@
return (UClassID)&classID; \
}
-/**
- * This is a simple macro to express that a class and its subclasses do not offer
- * ICU's "poor man's RTTI".
- * Beginning with ICU 4.6, ICU requires C++ compiler RTTI.
- * This does not go into the header. This should only be used in *.cpp files.
- * Use this with a private getDynamicClassID() in an immediate subclass of UObject.
- *
- * @param myClass The name of the class that needs RTTI defined.
- * @internal
- */
-#define UOBJECT_DEFINE_NO_RTTI_IMPLEMENTATION(myClass) \
- UClassID myClass::getDynamicClassID() const { return NULL; }
-
-// /**
-// * This macro adds ICU RTTI to an ICU concrete class implementation.
-// * This macro should be invoked in *.cpp files. The corresponding
-// * header should declare getDynamicClassID and getStaticClassID.
-// *
-// * @param myClass The name of the class that needs RTTI defined.
-// * @param myParent The name of the myClass's parent.
-// * @internal
-// */
-/*#define UOBJECT_DEFINE_RTTI_IMPLEMENTATION(myClass, myParent) \
- UOBJECT_DEFINE_ABSTRACT_RTTI_IMPLEMENTATION(myClass, myParent) \
- UClassID myClass::getDynamicClassID() const { \
- return myClass::getStaticClassID(); \
- }
-*/
#endif /* U_HIDE_INTERNAL_API */
U_NAMESPACE_END
diff --git a/common/unicode/urename.h b/common/unicode/urename.h
index 4898a29..5e91904 100644
--- a/common/unicode/urename.h
+++ b/common/unicode/urename.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2002-2012, International Business Machines
+* Copyright (C) 2002-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*
@@ -103,12 +103,6 @@
#define _UTF32LEData U_ICU_ENTRY_POINT_RENAME(_UTF32LEData)
#define _UTF7Data U_ICU_ENTRY_POINT_RENAME(_UTF7Data)
#define _UTF8Data U_ICU_ENTRY_POINT_RENAME(_UTF8Data)
-#define bms_close U_ICU_ENTRY_POINT_RENAME(bms_close)
-#define bms_empty U_ICU_ENTRY_POINT_RENAME(bms_empty)
-#define bms_getData U_ICU_ENTRY_POINT_RENAME(bms_getData)
-#define bms_open U_ICU_ENTRY_POINT_RENAME(bms_open)
-#define bms_search U_ICU_ENTRY_POINT_RENAME(bms_search)
-#define bms_setTargetString U_ICU_ENTRY_POINT_RENAME(bms_setTargetString)
#define cmemory_cleanup U_ICU_ENTRY_POINT_RENAME(cmemory_cleanup)
#define cmemory_inUse U_ICU_ENTRY_POINT_RENAME(cmemory_inUse)
#define izrule_clone U_ICU_ENTRY_POINT_RENAME(izrule_clone)
@@ -231,6 +225,7 @@
#define u_feof U_ICU_ENTRY_POINT_RENAME(u_feof)
#define u_fflush U_ICU_ENTRY_POINT_RENAME(u_fflush)
#define u_fgetConverter U_ICU_ENTRY_POINT_RENAME(u_fgetConverter)
+#define u_fgetNumberFormat U_ICU_ENTRY_POINT_RENAME(u_fgetNumberFormat)
#define u_fgetc U_ICU_ENTRY_POINT_RENAME(u_fgetc)
#define u_fgetcodepage U_ICU_ENTRY_POINT_RENAME(u_fgetcodepage)
#define u_fgetcx U_ICU_ENTRY_POINT_RENAME(u_fgetcx)
@@ -518,6 +513,7 @@
#define ucal_getNow U_ICU_ENTRY_POINT_RENAME(ucal_getNow)
#define ucal_getTZDataVersion U_ICU_ENTRY_POINT_RENAME(ucal_getTZDataVersion)
#define ucal_getTimeZoneDisplayName U_ICU_ENTRY_POINT_RENAME(ucal_getTimeZoneDisplayName)
+#define ucal_getTimeZoneID U_ICU_ENTRY_POINT_RENAME(ucal_getTimeZoneID)
#define ucal_getTimeZoneTransitionDate U_ICU_ENTRY_POINT_RENAME(ucal_getTimeZoneTransitionDate)
#define ucal_getType U_ICU_ENTRY_POINT_RENAME(ucal_getType)
#define ucal_getWeekendTransition U_ICU_ENTRY_POINT_RENAME(ucal_getWeekendTransition)
@@ -570,11 +566,6 @@
#define ucasemap_utf8ToLower U_ICU_ENTRY_POINT_RENAME(ucasemap_utf8ToLower)
#define ucasemap_utf8ToTitle U_ICU_ENTRY_POINT_RENAME(ucasemap_utf8ToTitle)
#define ucasemap_utf8ToUpper U_ICU_ENTRY_POINT_RENAME(ucasemap_utf8ToUpper)
-#define ucd_close U_ICU_ENTRY_POINT_RENAME(ucd_close)
-#define ucd_flushCache U_ICU_ENTRY_POINT_RENAME(ucd_flushCache)
-#define ucd_freeCache U_ICU_ENTRY_POINT_RENAME(ucd_freeCache)
-#define ucd_getCollator U_ICU_ENTRY_POINT_RENAME(ucd_getCollator)
-#define ucd_open U_ICU_ENTRY_POINT_RENAME(ucd_open)
#define uchar_addPropertyStarts U_ICU_ENTRY_POINT_RENAME(uchar_addPropertyStarts)
#define uchar_swapNames U_ICU_ENTRY_POINT_RENAME(uchar_swapNames)
#define ucln_cleanupOne U_ICU_ENTRY_POINT_RENAME(ucln_cleanupOne)
@@ -936,11 +927,14 @@
#define uhash_compareChars U_ICU_ENTRY_POINT_RENAME(uhash_compareChars)
#define uhash_compareIChars U_ICU_ENTRY_POINT_RENAME(uhash_compareIChars)
#define uhash_compareLong U_ICU_ENTRY_POINT_RENAME(uhash_compareLong)
+#define uhash_compareScriptSet U_ICU_ENTRY_POINT_RENAME(uhash_compareScriptSet)
#define uhash_compareUChars U_ICU_ENTRY_POINT_RENAME(uhash_compareUChars)
#define uhash_compareUnicodeString U_ICU_ENTRY_POINT_RENAME(uhash_compareUnicodeString)
#define uhash_count U_ICU_ENTRY_POINT_RENAME(uhash_count)
#define uhash_deleteHashtable U_ICU_ENTRY_POINT_RENAME(uhash_deleteHashtable)
+#define uhash_deleteScriptSet U_ICU_ENTRY_POINT_RENAME(uhash_deleteScriptSet)
#define uhash_equals U_ICU_ENTRY_POINT_RENAME(uhash_equals)
+#define uhash_equalsScriptSet U_ICU_ENTRY_POINT_RENAME(uhash_equalsScriptSet)
#define uhash_find U_ICU_ENTRY_POINT_RENAME(uhash_find)
#define uhash_get U_ICU_ENTRY_POINT_RENAME(uhash_get)
#define uhash_geti U_ICU_ENTRY_POINT_RENAME(uhash_geti)
@@ -948,6 +942,7 @@
#define uhash_hashChars U_ICU_ENTRY_POINT_RENAME(uhash_hashChars)
#define uhash_hashIChars U_ICU_ENTRY_POINT_RENAME(uhash_hashIChars)
#define uhash_hashLong U_ICU_ENTRY_POINT_RENAME(uhash_hashLong)
+#define uhash_hashScriptSet U_ICU_ENTRY_POINT_RENAME(uhash_hashScriptSet)
#define uhash_hashUChars U_ICU_ENTRY_POINT_RENAME(uhash_hashUChars)
#define uhash_hashUnicodeString U_ICU_ENTRY_POINT_RENAME(uhash_hashUnicodeString)
#define uhash_iget U_ICU_ENTRY_POINT_RENAME(uhash_iget)
@@ -1486,13 +1481,19 @@
#define ures_openU U_ICU_ENTRY_POINT_RENAME(ures_openU)
#define ures_resetIterator U_ICU_ENTRY_POINT_RENAME(ures_resetIterator)
#define ures_swap U_ICU_ENTRY_POINT_RENAME(ures_swap)
+#define uscript_breaksBetweenLetters U_ICU_ENTRY_POINT_RENAME(uscript_breaksBetweenLetters)
#define uscript_closeRun U_ICU_ENTRY_POINT_RENAME(uscript_closeRun)
#define uscript_getCode U_ICU_ENTRY_POINT_RENAME(uscript_getCode)
#define uscript_getName U_ICU_ENTRY_POINT_RENAME(uscript_getName)
+#define uscript_getSampleString U_ICU_ENTRY_POINT_RENAME(uscript_getSampleString)
+#define uscript_getSampleUnicodeString U_ICU_ENTRY_POINT_RENAME(uscript_getSampleUnicodeString)
#define uscript_getScript U_ICU_ENTRY_POINT_RENAME(uscript_getScript)
#define uscript_getScriptExtensions U_ICU_ENTRY_POINT_RENAME(uscript_getScriptExtensions)
#define uscript_getShortName U_ICU_ENTRY_POINT_RENAME(uscript_getShortName)
+#define uscript_getUsage U_ICU_ENTRY_POINT_RENAME(uscript_getUsage)
#define uscript_hasScript U_ICU_ENTRY_POINT_RENAME(uscript_hasScript)
+#define uscript_isCased U_ICU_ENTRY_POINT_RENAME(uscript_isCased)
+#define uscript_isRightToLeft U_ICU_ENTRY_POINT_RENAME(uscript_isRightToLeft)
#define uscript_nextRun U_ICU_ENTRY_POINT_RENAME(uscript_nextRun)
#define uscript_openRun U_ICU_ENTRY_POINT_RENAME(uscript_openRun)
#define uscript_resetRun U_ICU_ENTRY_POINT_RENAME(uscript_resetRun)
@@ -1596,6 +1597,11 @@
#define uspoof_getAllowedLocales U_ICU_ENTRY_POINT_RENAME(uspoof_getAllowedLocales)
#define uspoof_getAllowedUnicodeSet U_ICU_ENTRY_POINT_RENAME(uspoof_getAllowedUnicodeSet)
#define uspoof_getChecks U_ICU_ENTRY_POINT_RENAME(uspoof_getChecks)
+#define uspoof_getInclusionSet U_ICU_ENTRY_POINT_RENAME(uspoof_getInclusionSet)
+#define uspoof_getInclusionUnicodeSet U_ICU_ENTRY_POINT_RENAME(uspoof_getInclusionUnicodeSet)
+#define uspoof_getRecommendedSet U_ICU_ENTRY_POINT_RENAME(uspoof_getRecommendedSet)
+#define uspoof_getRecommendedUnicodeSet U_ICU_ENTRY_POINT_RENAME(uspoof_getRecommendedUnicodeSet)
+#define uspoof_getRestrictionLevel U_ICU_ENTRY_POINT_RENAME(uspoof_getRestrictionLevel)
#define uspoof_getSkeleton U_ICU_ENTRY_POINT_RENAME(uspoof_getSkeleton)
#define uspoof_getSkeletonUTF8 U_ICU_ENTRY_POINT_RENAME(uspoof_getSkeletonUTF8)
#define uspoof_getSkeletonUnicodeString U_ICU_ENTRY_POINT_RENAME(uspoof_getSkeletonUnicodeString)
@@ -1607,6 +1613,7 @@
#define uspoof_setAllowedLocales U_ICU_ENTRY_POINT_RENAME(uspoof_setAllowedLocales)
#define uspoof_setAllowedUnicodeSet U_ICU_ENTRY_POINT_RENAME(uspoof_setAllowedUnicodeSet)
#define uspoof_setChecks U_ICU_ENTRY_POINT_RENAME(uspoof_setChecks)
+#define uspoof_setRestrictionLevel U_ICU_ENTRY_POINT_RENAME(uspoof_setRestrictionLevel)
#define uspoof_swap U_ICU_ENTRY_POINT_RENAME(uspoof_swap)
#define usprep_close U_ICU_ENTRY_POINT_RENAME(usprep_close)
#define usprep_open U_ICU_ENTRY_POINT_RENAME(usprep_open)
diff --git a/common/unicode/uscript.h b/common/unicode/uscript.h
index b8e05c5..7949974 100644
--- a/common/unicode/uscript.h
+++ b/common/unicode/uscript.h
@@ -1,6 +1,6 @@
/*
**********************************************************************
- * Copyright (C) 1997-2012, International Business Machines
+ * Copyright (C) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*
@@ -456,7 +456,6 @@
U_STABLE UScriptCode U_EXPORT2
uscript_getScript(UChar32 codepoint, UErrorCode *err);
-#ifndef U_HIDE_DRAFT_API
/**
* Do the Script_Extensions of code point c contain script sc?
* If c does not have explicit Script_Extensions, then this tests whether
@@ -470,9 +469,9 @@
* @param c code point
* @param sc script code
* @return TRUE if sc is in Script_Extensions(c)
- * @draft ICU 49
+ * @stable ICU 49
*/
-U_DRAFT UBool U_EXPORT2
+U_STABLE UBool U_EXPORT2
uscript_hasScript(UChar32 c, UScriptCode sc);
/**
@@ -504,12 +503,118 @@
* function chaining. (See User Guide for details.)
* @return number of script codes in c's Script_Extensions, or 1 for the single Script value,
* written to scripts unless U_BUFFER_OVERFLOW_ERROR indicates insufficient capacity
- * @draft ICU 49
+ * @stable ICU 49
*/
-U_DRAFT int32_t U_EXPORT2
+U_STABLE int32_t U_EXPORT2
uscript_getScriptExtensions(UChar32 c,
UScriptCode *scripts, int32_t capacity,
UErrorCode *errorCode);
+
+#ifndef U_HIDE_DRAFT_API
+
+/**
+ * Script usage constants.
+ * See UAX #31 Unicode Identifier and Pattern Syntax.
+ * http://www.unicode.org/reports/tr31/#Table_Candidate_Characters_for_Exclusion_from_Identifiers
+ *
+ * @draft ICU 51
+ */
+typedef enum UScriptUsage {
+ /** Not encoded in Unicode. @draft ICU 51 */
+ USCRIPT_USAGE_NOT_ENCODED,
+ /** Unknown script usage. @draft ICU 51 */
+ USCRIPT_USAGE_UNKNOWN,
+ /** Candidate for Exclusion from Identifiers. @draft ICU 51 */
+ USCRIPT_USAGE_EXCLUDED,
+ /** Limited Use script. @draft ICU 51 */
+ USCRIPT_USAGE_LIMITED_USE,
+ /** Aspirational Use script. @draft ICU 51 */
+ USCRIPT_USAGE_ASPIRATIONAL,
+ /** Recommended script. @draft ICU 51 */
+ USCRIPT_USAGE_RECOMMENDED
+} UScriptUsage;
+
+/**
+ * Writes the script sample character string.
+ * This string normally consists of one code point but might be longer.
+ * The string is empty if the script is not encoded.
+ *
+ * @param script script code
+ * @param dest output string array
+ * @param capacity number of UChars in the dest array
+ * @param pErrorCode standard ICU in/out error code, must pass U_SUCCESS() on input
+ * @return the string length, even if U_BUFFER_OVERFLOW_ERROR
+ * @draft ICU 51
+ */
+U_DRAFT int32_t U_EXPORT2
+uscript_getSampleString(UScriptCode script, UChar *dest, int32_t capacity, UErrorCode *pErrorCode);
+
+#if U_SHOW_CPLUSPLUS_API
+
+U_NAMESPACE_BEGIN
+class UnicodeString;
+U_NAMESPACE_END
+
+/**
+ * Returns the script sample character string.
+ * This string normally consists of one code point but might be longer.
+ * The string is empty if the script is not encoded.
+ *
+ * @param script script code
+ * @return the sample character string
+ * @draft ICU 51
+ */
+U_COMMON_API icu::UnicodeString U_EXPORT2
+uscript_getSampleUnicodeString(UScriptCode script);
+
+#endif
+
+/**
+ * Returns the script usage according to UAX #31 Unicode Identifier and Pattern Syntax.
+ * Returns USCRIPT_USAGE_NOT_ENCODED if the script is not encoded in Unicode.
+ *
+ * @param script script code
+ * @return script usage
+ * @see UScriptUsage
+ * @draft ICU 51
+ */
+U_DRAFT UScriptUsage U_EXPORT2
+uscript_getUsage(UScriptCode script);
+
+/**
+ * Returns TRUE if the script is written right-to-left.
+ * For example, Arab and Hebr.
+ *
+ * @param script script code
+ * @return TRUE if the script is right-to-left
+ * @draft ICU 51
+ */
+U_DRAFT UBool U_EXPORT2
+uscript_isRightToLeft(UScriptCode script);
+
+/**
+ * Returns TRUE if the script allows line breaks between letters (excluding hyphenation).
+ * Such a script typically requires dictionary-based line breaking.
+ * For example, Hani and Thai.
+ *
+ * @param script script code
+ * @return TRUE if the script allows line breaks between letters
+ * @draft ICU 51
+ */
+U_DRAFT UBool U_EXPORT2
+uscript_breaksBetweenLetters(UScriptCode script);
+
+/**
+ * Returns TRUE if in modern (or most recent) usage of the script case distinctions are customary.
+ * For example, Latn and Cyrl.
+ *
+ * @param script script code
+ * @return TRUE if the script is cased
+ * @draft ICU 51
+ */
+U_DRAFT UBool U_EXPORT2
+uscript_isCased(UScriptCode script);
+
#endif /* U_HIDE_DRAFT_API */
#endif
diff --git a/common/unicode/utf16.h b/common/unicode/utf16.h
index 73f784c..bdd88a8 100644
--- a/common/unicode/utf16.h
+++ b/common/unicode/utf16.h
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 1999-2011, International Business Machines
+* Copyright (C) 1999-2012, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -180,6 +180,9 @@
* The offset may point to either the lead or trail surrogate unit
* for a supplementary code point, in which case the macro will read
* the adjacent matching surrogate as well.
+ *
+ * The length can be negative for a NUL-terminated string.
+ *
* If the offset points to a single, unpaired surrogate, then that itself
* will be returned as the code point.
* Iteration through a string is more efficient with U16_NEXT_UNSAFE or U16_NEXT.
@@ -197,7 +200,7 @@
if(U16_IS_SURROGATE(c)) { \
uint16_t __c2; \
if(U16_IS_SURROGATE_LEAD(c)) { \
- if((i)+1<(length) && U16_IS_TRAIL(__c2=(s)[(i)+1])) { \
+ if((i)+1!=(length) && U16_IS_TRAIL(__c2=(s)[(i)+1])) { \
(c)=U16_GET_SUPPLEMENTARY((c), __c2); \
} \
} else { \
@@ -242,6 +245,8 @@
* (Post-incrementing forward iteration.)
* "Safe" macro, handles unpaired surrogates and checks for string boundaries.
*
+ * The length can be negative for a NUL-terminated string.
+ *
* The offset may point to the lead surrogate unit
* for a supplementary code point, in which case the macro will read
* the following trail surrogate as well.
@@ -260,7 +265,7 @@
(c)=(s)[(i)++]; \
if(U16_IS_LEAD(c)) { \
uint16_t __c2; \
- if((i)<(length) && U16_IS_TRAIL(__c2=(s)[(i)])) { \
+ if((i)!=(length) && U16_IS_TRAIL(__c2=(s)[(i)])) { \
++(i); \
(c)=U16_GET_SUPPLEMENTARY((c), __c2); \
} \
@@ -338,6 +343,8 @@
* (Post-incrementing iteration.)
* "Safe" macro, handles unpaired surrogates and checks for string boundaries.
*
+ * The length can be negative for a NUL-terminated string.
+ *
* @param s const UChar * string
* @param i string offset, must be i<length
* @param length string length
@@ -345,7 +352,7 @@
* @stable ICU 2.4
*/
#define U16_FWD_1(s, i, length) { \
- if(U16_IS_LEAD((s)[(i)++]) && (i)<(length) && U16_IS_TRAIL((s)[i])) { \
+ if(U16_IS_LEAD((s)[(i)++]) && (i)!=(length) && U16_IS_TRAIL((s)[i])) { \
++(i); \
} \
}
@@ -376,16 +383,18 @@
* (Post-incrementing iteration.)
* "Safe" macro, handles unpaired surrogates and checks for string boundaries.
*
+ * The length can be negative for a NUL-terminated string.
+ *
* @param s const UChar * string
- * @param i string offset, must be i<length
- * @param length string length
+ * @param i int32_t string offset, must be i<length
+ * @param length int32_t string length
* @param n number of code points to skip
* @see U16_FWD_N_UNSAFE
* @stable ICU 2.4
*/
#define U16_FWD_N(s, i, length, n) { \
int32_t __N=(n); \
- while(__N>0 && (i)<(length)) { \
+ while(__N>0 && ((i)<(length) || ((length)<0 && (s)[i]!=0))) { \
U16_FWD_1(s, i, length); \
--__N; \
} \
@@ -596,15 +605,17 @@
* The input offset may be the same as the string length.
* "Safe" macro, handles unpaired surrogates and checks for string boundaries.
*
+ * The length can be negative for a NUL-terminated string.
+ *
* @param s const UChar * string
- * @param start starting string offset (usually 0)
- * @param i string offset, start<=i<=length
- * @param length string length
+ * @param start int32_t starting string offset (usually 0)
+ * @param i int32_t string offset, start<=i<=length
+ * @param length int32_t string length
* @see U16_SET_CP_LIMIT_UNSAFE
* @stable ICU 2.4
*/
#define U16_SET_CP_LIMIT(s, start, i, length) { \
- if((start)<(i) && (i)<(length) && U16_IS_LEAD((s)[(i)-1]) && U16_IS_TRAIL((s)[i])) { \
+ if((start)<(i) && ((i)<(length) || (length)<0) && U16_IS_LEAD((s)[(i)-1]) && U16_IS_TRAIL((s)[i])) { \
++(i); \
} \
}
diff --git a/common/unicode/utf8.h b/common/unicode/utf8.h
index 2e2f02a..21e5f3d 100644
--- a/common/unicode/utf8.h
+++ b/common/unicode/utf8.h
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 1999-2012, International Business Machines
+* Copyright (C) 1999-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -232,24 +232,60 @@
* The offset may point to either the lead byte or one of the trail bytes
* for a code point, in which case the macro will read all of the bytes
* for the code point.
+ *
+ * The length can be negative for a NUL-terminated string.
+ *
* If the offset points to an illegal UTF-8 byte sequence, then
* c is set to a negative value.
* Iteration through a string is more efficient with U8_NEXT_UNSAFE or U8_NEXT.
*
* @param s const uint8_t * string
- * @param start starting string offset
- * @param i string offset, must be start<=i<length
- * @param length string length
+ * @param start int32_t starting string offset
+ * @param i int32_t string offset, must be start<=i<length
+ * @param length int32_t string length
* @param c output UChar32 variable, set to <0 in case of an error
* @see U8_GET_UNSAFE
* @stable ICU 2.4
*/
#define U8_GET(s, start, i, length, c) { \
- int32_t _u8_get_index=(int32_t)(i); \
+ int32_t _u8_get_index=(i); \
U8_SET_CP_START(s, start, _u8_get_index); \
U8_NEXT(s, _u8_get_index, length, c); \
}
+#ifndef U_HIDE_DRAFT_API
+/**
+ * Get a code point from a string at a random-access offset,
+ * without changing the offset.
+ * The offset may point to either the lead byte or one of the trail bytes
+ * for a code point, in which case the macro will read all of the bytes
+ * for the code point.
+ *
+ * The length can be negative for a NUL-terminated string.
+ *
+ * If the offset points to an illegal UTF-8 byte sequence, then
+ * c is set to U+FFFD.
+ * Iteration through a string is more efficient with U8_NEXT_UNSAFE or U8_NEXT_OR_FFFD.
+ *
+ * This macro does not distinguish between a real U+FFFD in the text
+ * and U+FFFD returned for an ill-formed sequence.
+ * Use U8_GET() if that distinction is important.
+ *
+ * @param s const uint8_t * string
+ * @param start int32_t starting string offset
+ * @param i int32_t string offset, must be start<=i<length
+ * @param length int32_t string length
+ * @param c output UChar32 variable, set to U+FFFD in case of an error
+ * @see U8_GET
+ * @draft ICU 51
+ */
+#define U8_GET_OR_FFFD(s, start, i, length, c) { \
+ int32_t _u8_get_index=(i); \
+ U8_SET_CP_START(s, start, _u8_get_index); \
+ U8_NEXT_OR_FFFD(s, _u8_get_index, length, c); \
+}
+#endif /* U_HIDE_DRAFT_API */
+
/* definitions with forward iteration --------------------------------------- */
/**
@@ -291,14 +327,16 @@
* (Post-incrementing forward iteration.)
* "Safe" macro, checks for illegal sequences and for string boundaries.
*
+ * The length can be negative for a NUL-terminated string.
+ *
* The offset may point to the lead byte of a multi-byte sequence,
* in which case the macro will read the whole sequence.
* If the offset points to a trail byte or an illegal UTF-8 sequence, then
* c is set to a negative value.
*
* @param s const uint8_t * string
- * @param i string offset, must be i<length
- * @param length string length
+ * @param i int32_t string offset, must be i<length
+ * @param length int32_t string length
* @param c output UChar32 variable, set to <0 in case of an error
* @see U8_NEXT_UNSAFE
* @stable ICU 2.4
@@ -309,7 +347,7 @@
uint8_t __t1, __t2; \
if( /* handle U+1000..U+CFFF inline */ \
(0xe0<(c) && (c)<=0xec) && \
- (((i)+1)<(length)) && \
+ (((i)+1)<(length) || (length)<0) && \
(__t1=(uint8_t)((s)[i]-0x80))<=0x3f && \
(__t2=(uint8_t)((s)[(i)+1]-0x80))<= 0x3f \
) { \
@@ -318,20 +356,71 @@
(i)+=2; \
} else if( /* handle U+0080..U+07FF inline */ \
((c)<0xe0 && (c)>=0xc2) && \
- ((i)<(length)) && \
+ ((i)!=(length)) && \
(__t1=(uint8_t)((s)[i]-0x80))<=0x3f \
) { \
- (c)=(UChar)((((c)&0x1f)<<6)|__t1); \
+ (c)=(((c)&0x1f)<<6)|__t1; \
++(i); \
- } else if(U8_IS_LEAD(c)) { \
- /* function call for "complicated" and error cases */ \
- (c)=utf8_nextCharSafeBody((const uint8_t *)s, &(i), (int32_t)(length), c, -1); \
} else { \
- (c)=U_SENTINEL; \
+ /* function call for "complicated" and error cases */ \
+ (c)=utf8_nextCharSafeBody((const uint8_t *)s, &(i), (length), c, -1); \
} \
} \
}
+#ifndef U_HIDE_DRAFT_API
+/**
+ * Get a code point from a string at a code point boundary offset,
+ * and advance the offset to the next code point boundary.
+ * (Post-incrementing forward iteration.)
+ * "Safe" macro, checks for illegal sequences and for string boundaries.
+ *
+ * The length can be negative for a NUL-terminated string.
+ *
+ * The offset may point to the lead byte of a multi-byte sequence,
+ * in which case the macro will read the whole sequence.
+ * If the offset points to a trail byte or an illegal UTF-8 sequence, then
+ * c is set to U+FFFD.
+ *
+ * This macro does not distinguish between a real U+FFFD in the text
+ * and U+FFFD returned for an ill-formed sequence.
+ * Use U8_NEXT() if that distinction is important.
+ *
+ * @param s const uint8_t * string
+ * @param i int32_t string offset, must be i<length
+ * @param length int32_t string length
+ * @param c output UChar32 variable, set to U+FFFD in case of an error
+ * @see U8_NEXT
+ * @draft ICU 51
+ */
+#define U8_NEXT_OR_FFFD(s, i, length, c) { \
+ (c)=(uint8_t)(s)[(i)++]; \
+ if((c)>=0x80) { \
+ uint8_t __t1, __t2; \
+ if( /* handle U+1000..U+CFFF inline */ \
+ (0xe0<(c) && (c)<=0xec) && \
+ (((i)+1)<(length) || (length)<0) && \
+ (__t1=(uint8_t)((s)[i]-0x80))<=0x3f && \
+ (__t2=(uint8_t)((s)[(i)+1]-0x80))<= 0x3f \
+ ) { \
+ /* no need for (c&0xf) because the upper bits are truncated after <<12 in the cast to (UChar) */ \
+ (c)=(UChar)(((c)<<12)|(__t1<<6)|__t2); \
+ (i)+=2; \
+ } else if( /* handle U+0080..U+07FF inline */ \
+ ((c)<0xe0 && (c)>=0xc2) && \
+ ((i)!=(length)) && \
+ (__t1=(uint8_t)((s)[i]-0x80))<=0x3f \
+ ) { \
+ (c)=(((c)&0x1f)<<6)|__t1; \
+ ++(i); \
+ } else { \
+ /* function call for "complicated" and error cases */ \
+ (c)=utf8_nextCharSafeBody((const uint8_t *)s, &(i), (length), c, -3); \
+ } \
+ } \
+}
+#endif /* U_HIDE_DRAFT_API */
+
/**
* Append a code point to a string, overwriting 1 to 4 bytes.
* The offset points to the current end of the string contents
@@ -374,9 +463,9 @@
* then isError is set to TRUE.
*
* @param s const uint8_t * string buffer
- * @param i string offset, must be i<capacity
- * @param capacity size of the string buffer
- * @param c code point to append
+ * @param i int32_t string offset, must be i<capacity
+ * @param capacity int32_t size of the string buffer
+ * @param c UChar32 code point to append
* @param isError output UBool set to TRUE if an error occurs, otherwise not modified
* @see U8_APPEND_UNSAFE
* @stable ICU 2.4
@@ -392,7 +481,7 @@
(s)[(i)++]=(uint8_t)((((c)>>6)&0x3f)|0x80); \
(s)[(i)++]=(uint8_t)(((c)&0x3f)|0x80); \
} else { \
- (i)=utf8_appendCharSafeBody(s, (int32_t)(i), (int32_t)(capacity), c, &(isError)); \
+ (i)=utf8_appendCharSafeBody(s, (i), (capacity), c, &(isError)); \
} \
}
@@ -415,9 +504,11 @@
* (Post-incrementing iteration.)
* "Safe" macro, checks for illegal sequences and for string boundaries.
*
+ * The length can be negative for a NUL-terminated string.
+ *
* @param s const uint8_t * string
- * @param i string offset, must be i<length
- * @param length string length
+ * @param i int32_t string offset, must be i<length
+ * @param length int32_t string length
* @see U8_FWD_1_UNSAFE
* @stable ICU 2.4
*/
@@ -425,7 +516,7 @@
uint8_t __b=(uint8_t)(s)[(i)++]; \
if(U8_IS_LEAD(__b)) { \
uint8_t __count=U8_COUNT_TRAIL_BYTES(__b); \
- if((i)+__count>(length)) { \
+ if((i)+__count>(length) && (length)>=0) { \
__count=(uint8_t)((length)-(i)); \
} \
while(__count>0 && U8_IS_TRAIL((s)[i])) { \
@@ -461,16 +552,18 @@
* (Post-incrementing iteration.)
* "Safe" macro, checks for illegal sequences and for string boundaries.
*
+ * The length can be negative for a NUL-terminated string.
+ *
* @param s const uint8_t * string
- * @param i string offset, must be i<length
- * @param length string length
+ * @param i int32_t string offset, must be i<length
+ * @param length int32_t string length
* @param n number of code points to skip
* @see U8_FWD_N_UNSAFE
* @stable ICU 2.4
*/
#define U8_FWD_N(s, i, length, n) { \
int32_t __N=(n); \
- while(__N>0 && (i)<(length)) { \
+ while(__N>0 && ((i)<(length) || ((length)<0 && (s)[i]!=0))) { \
U8_FWD_1(s, i, length); \
--__N; \
} \
@@ -502,14 +595,14 @@
* "Safe" macro, checks for illegal sequences and for string boundaries.
*
* @param s const uint8_t * string
- * @param start starting string offset (usually 0)
- * @param i string offset, must be start<=i
+ * @param start int32_t starting string offset (usually 0)
+ * @param i int32_t string offset, must be start<=i
* @see U8_SET_CP_START_UNSAFE
* @stable ICU 2.4
*/
#define U8_SET_CP_START(s, start, i) { \
if(U8_IS_TRAIL((s)[(i)])) { \
- (i)=utf8_back1SafeBody(s, start, (int32_t)(i)); \
+ (i)=utf8_back1SafeBody(s, start, (i)); \
} \
}
@@ -570,8 +663,8 @@
* If the offset is behind an illegal UTF-8 sequence, then c is set to a negative value.
*
* @param s const uint8_t * string
- * @param start starting string offset (usually 0)
- * @param i string offset, must be start<i
+ * @param start int32_t starting string offset (usually 0)
+ * @param i int32_t string offset, must be start<i
* @param c output UChar32 variable, set to <0 in case of an error
* @see U8_PREV_UNSAFE
* @stable ICU 2.4
@@ -579,14 +672,43 @@
#define U8_PREV(s, start, i, c) { \
(c)=(uint8_t)(s)[--(i)]; \
if((c)>=0x80) { \
- if((c)<=0xbf) { \
- (c)=utf8_prevCharSafeBody((const uint8_t *)s, start, &(i), c, -1); \
- } else { \
- (c)=U_SENTINEL; \
- } \
+ (c)=utf8_prevCharSafeBody((const uint8_t *)s, start, &(i), c, -1); \
} \
}
+#ifndef U_HIDE_DRAFT_API
+/**
+ * Move the string offset from one code point boundary to the previous one
+ * and get the code point between them.
+ * (Pre-decrementing backward iteration.)
+ * "Safe" macro, checks for illegal sequences and for string boundaries.
+ *
+ * The input offset may be the same as the string length.
+ * If the offset is behind a multi-byte sequence, then the macro will read
+ * the whole sequence.
+ * If the offset is behind a lead byte, then that itself
+ * will be returned as the code point.
+ * If the offset is behind an illegal UTF-8 sequence, then c is set to U+FFFD.
+ *
+ * This macro does not distinguish between a real U+FFFD in the text
+ * and U+FFFD returned for an ill-formed sequence.
+ * Use U8_PREV() if that distinction is important.
+ *
+ * @param s const uint8_t * string
+ * @param start int32_t starting string offset (usually 0)
+ * @param i int32_t string offset, must be start<i
+ * @param c output UChar32 variable, set to U+FFFD in case of an error
+ * @see U8_PREV
+ * @draft ICU 51
+ */
+#define U8_PREV_OR_FFFD(s, start, i, c) { \
+ (c)=(uint8_t)(s)[--(i)]; \
+ if((c)>=0x80) { \
+ (c)=utf8_prevCharSafeBody((const uint8_t *)s, start, &(i), c, -3); \
+ } \
+}
+#endif /* U_HIDE_DRAFT_API */
+
/**
* Move the string offset from one code point boundary to the previous one.
* (Pre-decrementing backward iteration.)
@@ -609,14 +731,14 @@
* "Safe" macro, checks for illegal sequences and for string boundaries.
*
* @param s const uint8_t * string
- * @param start starting string offset (usually 0)
- * @param i string offset, must be start<i
+ * @param start int32_t starting string offset (usually 0)
+ * @param i int32_t string offset, must be start<i
* @see U8_BACK_1_UNSAFE
* @stable ICU 2.4
*/
#define U8_BACK_1(s, start, i) { \
if(U8_IS_TRAIL((s)[--(i)])) { \
- (i)=utf8_back1SafeBody(s, start, (int32_t)(i)); \
+ (i)=utf8_back1SafeBody(s, start, (i)); \
} \
}
@@ -649,8 +771,8 @@
* "Safe" macro, checks for illegal sequences and for string boundaries.
*
* @param s const uint8_t * string
- * @param start index of the start of the string
- * @param i string offset, must be start<i
+ * @param start int32_t index of the start of the string
+ * @param i int32_t string offset, must be start<i
* @param n number of code points to skip
* @see U8_BACK_N_UNSAFE
* @stable ICU 2.4
@@ -689,15 +811,17 @@
* The input offset may be the same as the string length.
* "Safe" macro, checks for illegal sequences and for string boundaries.
*
+ * The length can be negative for a NUL-terminated string.
+ *
* @param s const uint8_t * string
- * @param start starting string offset (usually 0)
- * @param i string offset, must be start<=i<=length
- * @param length string length
+ * @param start int32_t starting string offset (usually 0)
+ * @param i int32_t string offset, must be start<=i<=length
+ * @param length int32_t string length
* @see U8_SET_CP_LIMIT_UNSAFE
* @stable ICU 2.4
*/
#define U8_SET_CP_LIMIT(s, start, i, length) { \
- if((start)<(i) && (i)<(length)) { \
+ if((start)<(i) && ((i)<(length) || ((length)<0 && (s)[i]!=0))) { \
U8_BACK_1(s, start, i); \
U8_FWD_1(s, i, length); \
} \
diff --git a/common/unicode/uvernum.h b/common/unicode/uvernum.h
index 045cabe..79a429f 100644
--- a/common/unicode/uvernum.h
+++ b/common/unicode/uvernum.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2000-2012, International Business Machines
+* Copyright (C) 2000-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*
@@ -57,7 +57,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
-#define U_ICU_VERSION_MAJOR_NUM 50
+#define U_ICU_VERSION_MAJOR_NUM 51
/** The current ICU minor version as an integer.
* This value will change in the subsequent releases of ICU
@@ -69,23 +69,23 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
-#define U_ICU_VERSION_PATCHLEVEL_NUM 1
+#define U_ICU_VERSION_PATCHLEVEL_NUM 0
/** The current ICU build level version as an integer.
* This value is for use by ICU clients. It defaults to 0.
* @stable ICU 4.0
- * BEGIN Android patch
*/
#ifndef U_ICU_VERSION_BUILDLEVEL_NUM
-#define U_ICU_VERSION_BUILDLEVEL_NUM 3
-#endif
+/* BEGIN Android patch - update for non-trivial change from standard ICU release */
+#define U_ICU_VERSION_BUILDLEVEL_NUM 1
/* END Android patch */
+#endif
/** Glued version suffix for renamers
* This value will change in the subsequent releases of ICU
* @stable ICU 2.6
*/
-#define U_ICU_VERSION_SUFFIX _50
+#define U_ICU_VERSION_SUFFIX _51
/**
* \def U_DEF2_ICU_ENTRY_POINT_RENAME
@@ -117,28 +117,25 @@
/** The current ICU library version as a dotted-decimal string. The patchlevel
* only appears in this string if it non-zero.
- * This value will change in the subsequent releases of ICU.
+ * This value will change in the subsequent releases of ICU
* @stable ICU 2.4
- * BEGIN Android patch: We increment the last version field when we make non-trivial changes
- * to Android ICU.
- * Update U_ICU_VERSION_BUILDLEVEL_NUM above for consistency.
*/
-#define U_ICU_STRINGIFY_1(x) #x
-#define U_ICU_STRINGIFY(x) U_ICU_STRINGIFY_1(x)
-#define U_ICU_VERSION "50.1.1." U_ICU_STRINGIFY(U_ICU_VERSION_BUILDLEVEL_NUM)
+/* TODO FIX THIS WHEN BUILD level is updated */
+/* BEGIN Android patch */
+#define U_ICU_VERSION "51.1.0.1"
/* END Android patch */
/** The current ICU library major/minor version as a string without dots, for library name suffixes.
* This value will change in the subsequent releases of ICU
* @stable ICU 2.6
*/
-#define U_ICU_VERSION_SHORT "50"
+#define U_ICU_VERSION_SHORT "51"
#ifndef U_HIDE_INTERNAL_API
/** Data version in ICU4C.
* @internal ICU 4.4 Internal Use Only
**/
-#define U_ICU_DATA_VERSION "50.1"
+#define U_ICU_DATA_VERSION "51.1"
#endif /* U_HIDE_INTERNAL_API */
/*===========================================================================
diff --git a/common/uniset.cpp b/common/uniset.cpp
index f1b3e31..676c855 100644
--- a/common/uniset.cpp
+++ b/common/uniset.cpp
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (C) 1999-2011, International Business Machines
+* Copyright (C) 1999-2012, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Date Name Description
@@ -2234,10 +2234,7 @@
UChar32 c;
int32_t start=0, prev=0;
do {
- U8_NEXT(s, start, length, c);
- if(c<0) {
- c=0xfffd;
- }
+ U8_NEXT_OR_FFFD(s, start, length, c);
if(spanCondition!=contains(c)) {
break;
}
@@ -2275,10 +2272,7 @@
UChar32 c;
int32_t prev=length;
do {
- U8_PREV(s, 0, length, c);
- if(c<0) {
- c=0xfffd;
- }
+ U8_PREV_OR_FFFD(s, 0, length, c);
if(spanCondition!=contains(c)) {
break;
}
diff --git a/common/unisetspan.cpp b/common/unisetspan.cpp
index 90a9fc4..e107abe 100644
--- a/common/unisetspan.cpp
+++ b/common/unisetspan.cpp
@@ -1,7 +1,7 @@
/*
******************************************************************************
*
-* Copyright (C) 2007-2011, International Business Machines
+* Copyright (C) 2007-2012, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@@ -503,9 +503,9 @@
if((int8_t)c>=0) {
return set.contains(c) ? 1 : -1;
}
- // Take advantage of non-ASCII fastpaths in U8_NEXT().
+ // Take advantage of non-ASCII fastpaths in U8_NEXT_OR_FFFD().
int32_t i=0;
- U8_NEXT(s, i, length, c);
+ U8_NEXT_OR_FFFD(s, i, length, c);
return set.contains(c) ? i : -i;
}
@@ -516,7 +516,7 @@
return set.contains(c) ? 1 : -1;
}
int32_t i=length-1;
- c=utf8_prevCharSafeBody(s, 0, &i, c, -1);
+ c=utf8_prevCharSafeBody(s, 0, &i, c, -3);
length-=i;
return set.contains(c) ? length : -length;
}
diff --git a/common/unistr.cpp b/common/unistr.cpp
index 5db94d3..52125ff 100644
--- a/common/unistr.cpp
+++ b/common/unistr.cpp
@@ -100,7 +100,7 @@
due to how AIX works with multiple definitions of virtual functions.
*/
Replaceable::~Replaceable() {}
-Replaceable::Replaceable() {}
+
UOBJECT_DEFINE_RTTI_IMPLEMENTATION(UnicodeString)
UnicodeString U_EXPORT2
@@ -147,10 +147,8 @@
//========================================
// Constructors
//========================================
-UnicodeString::UnicodeString()
- : fShortLength(0),
- fFlags(kShortString)
-{}
+
+// The default constructor is inline in unistr.h.
UnicodeString::UnicodeString(int32_t capacity, UChar32 c, int32_t count)
: fShortLength(0),
diff --git a/common/uobject.cpp b/common/uobject.cpp
index 57857c1..900e034 100644
--- a/common/uobject.cpp
+++ b/common/uobject.cpp
@@ -91,24 +91,6 @@
UObject::~UObject() {}
-// Future implementation for RTTI that support subtyping. [alan]
-//
-// UClassID UObject::getStaticClassID() {
-// return (UClassID) NULL;
-// }
-//
-// UBool UObject::instanceOf(UClassID type) const {
-// UClassID c = getDynamicClassID();
-// for (;;) {
-// if (c == type) {
-// return TRUE;
-// } else if (c == (UClassID) NULL) {
-// return FALSE;
-// }
-// c = * (UClassID*) c;
-// }
-// }
-// Android patch: tiny part of ICU 51's r32776 (only the one next line)
UClassID UObject::getDynamicClassID() const { return NULL; }
U_NAMESPACE_END
diff --git a/common/uresbund.cpp b/common/uresbund.cpp
index 0404e36..2219b74 100644
--- a/common/uresbund.cpp
+++ b/common/uresbund.cpp
@@ -1,7 +1,7 @@
/*
******************************************************************************
-* Copyright (C) 1997-2012, International Business Machines Corporation and *
-* others. All Rights Reserved. *
+* Copyright (C) 1997-2013, International Business Machines Corporation and
+* others. All Rights Reserved.
******************************************************************************
*
* File URESBUND.C
@@ -21,6 +21,7 @@
#include "unicode/ustring.h"
#include "unicode/ucnv.h"
+#include "charstr.h"
#include "uresimp.h"
#include "ustr_imp.h"
#include "cwchar.h"
@@ -1680,6 +1681,37 @@
return retVal;
}
+/*
+ Like res_getTableItemByKey but accepts full paths like "NumberElements/latn/patternsShort".
+*/
+static Resource getTableItemByKeyPath(const ResourceData *pResData, Resource table, const char *key) {
+ Resource resource = table; /* The current resource */
+ icu::CharString path;
+ UErrorCode errorCode = U_ZERO_ERROR;
+ path.append(key, errorCode);
+ if (U_FAILURE(errorCode)) { return RES_BOGUS; }
+ char *pathPart = path.data(); /* Path from current resource to desired resource */
+ UResType type = (UResType)RES_GET_TYPE(resource); /* the current resource type */
+ while (*pathPart && resource != RES_BOGUS && URES_IS_CONTAINER(type)) {
+ char *nextPathPart = uprv_strchr(pathPart, RES_PATH_SEPARATOR);
+ if (nextPathPart != NULL) {
+ *nextPathPart = 0; /* Terminating null for this part of path. */
+ nextPathPart++;
+ } else {
+ nextPathPart = uprv_strchr(pathPart, 0);
+ }
+ int32_t t;
+ const char *pathP = pathPart;
+ resource = res_getTableItemByKey(pResData, resource, &t, &pathP);
+ type = (UResType)RES_GET_TYPE(resource);
+ pathPart = nextPathPart;
+ }
+ if (*pathPart) {
+ return RES_BOGUS;
+ }
+ return resource;
+}
+
U_CAPI UResourceBundle* U_EXPORT2
ures_getByKeyWithFallback(const UResourceBundle *resB,
const char* inKey,
@@ -1687,7 +1719,6 @@
UErrorCode *status) {
Resource res = RES_BOGUS, rootRes = RES_BOGUS;
/*UResourceDataEntry *realData = NULL;*/
- const char *key = inKey;
UResourceBundle *helper = NULL;
if (status==NULL || U_FAILURE(*status)) {
@@ -1700,15 +1731,14 @@
int32_t type = RES_GET_TYPE(resB->fRes);
if(URES_IS_TABLE(type)) {
- int32_t t;
- res = res_getTableItemByKey(&(resB->fResData), resB->fRes, &t, &key);
+ res = getTableItemByKeyPath(&(resB->fResData), resB->fRes, inKey);
+ const char* key = inKey;
if(res == RES_BOGUS) {
UResourceDataEntry *dataEntry = resB->fData;
char path[256];
char* myPath = path;
const char* resPath = resB->fResPath;
int32_t len = resB->fResPathLen;
-
while(res == RES_BOGUS && dataEntry->fParent != NULL) { /* Otherwise, we'll look in parents */
dataEntry = dataEntry->fParent;
rootRes = dataEntry->fData.rootRes;
diff --git a/common/uscript_props.cpp b/common/uscript_props.cpp
new file mode 100644
index 0000000..e0d1ecc
--- /dev/null
+++ b/common/uscript_props.cpp
@@ -0,0 +1,267 @@
+/*
+*******************************************************************************
+* Copyright (C) 2013, International Business Machines
+* Corporation and others. All Rights Reserved.
+*******************************************************************************
+* file name: uscript_props.cpp
+* encoding: US-ASCII
+* tab size: 8 (not used)
+* indentation:4
+*
+* created on: 2013feb16
+* created by: Markus W. Scherer
+*/
+
+#include "unicode/utypes.h"
+#include "unicode/unistr.h"
+#include "unicode/uscript.h"
+#include "unicode/utf16.h"
+#include "ustr_imp.h"
+
+#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
+
+namespace {
+
+// Script metadata (script properties).
+// See http://unicode.org/cldr/trac/browser/trunk/common/properties/scriptMetadata.txt
+
+// 0 = NOT_ENCODED, no sample character, default false script properties.
+// Bits 20.. 0: sample character
+
+// Bits 23..21: usage
+const int32_t UNKNOWN = 1 << 21;
+const int32_t EXCLUSION = 2 << 21;
+const int32_t LIMITED_USE = 3 << 21;
+const int32_t ASPIRATIONAL = 4 << 21;
+const int32_t RECOMMENDED = 5 << 21;
+
+// Bits 31..24: Single-bit flags
+const int32_t RTL = 1 << 24;
+const int32_t LB_LETTERS = 1 << 25;
+const int32_t CASED = 1 << 26;
+
+const int32_t SCRIPT_PROPS[] = {
+ // Begin copy-paste output from
+ // tools/trunk/unicode/py/parsescriptmetadata.py
+ 0x0040 | UNKNOWN, // Zyyy
+ 0x0308 | UNKNOWN, // Zinh
+ 0x0628 | RECOMMENDED | RTL, // Arab
+ 0x0531 | RECOMMENDED | CASED, // Armn
+ 0x0995 | RECOMMENDED, // Beng
+ 0x3105 | RECOMMENDED | LB_LETTERS, // Bopo
+ 0x13C4 | LIMITED_USE, // Cher
+ 0x03E2 | EXCLUSION | CASED, // Copt
+ 0x042F | RECOMMENDED | CASED, // Cyrl
+ 0x10414 | EXCLUSION | CASED, // Dsrt
+ 0x0905 | RECOMMENDED, // Deva
+ 0x12A0 | RECOMMENDED, // Ethi
+ 0x10D3 | RECOMMENDED, // Geor
+ 0x10330 | EXCLUSION, // Goth
+ 0x03A9 | RECOMMENDED | CASED, // Grek
+ 0x0A95 | RECOMMENDED, // Gujr
+ 0x0A15 | RECOMMENDED, // Guru
+ 0x5B57 | RECOMMENDED | LB_LETTERS, // Hani
+ 0xAC00 | RECOMMENDED, // Hang
+ 0x05D0 | RECOMMENDED | RTL, // Hebr
+ 0x304B | RECOMMENDED | LB_LETTERS, // Hira
+ 0x0C95 | RECOMMENDED, // Knda
+ 0x30AB | RECOMMENDED | LB_LETTERS, // Kana
+ 0x1780 | RECOMMENDED | LB_LETTERS, // Khmr
+ 0x0EA5 | RECOMMENDED | LB_LETTERS, // Laoo
+ 0x004C | RECOMMENDED | CASED, // Latn
+ 0x0D15 | RECOMMENDED, // Mlym
+ 0x1826 | ASPIRATIONAL, // Mong
+ 0x1000 | RECOMMENDED | LB_LETTERS, // Mymr
+ 0x168F | EXCLUSION, // Ogam
+ 0x10300 | EXCLUSION, // Ital
+ 0x0B15 | RECOMMENDED, // Orya
+ 0x16A0 | EXCLUSION, // Runr
+ 0x0D85 | RECOMMENDED, // Sinh
+ 0x0710 | LIMITED_USE | RTL, // Syrc
+ 0x0B95 | RECOMMENDED, // Taml
+ 0x0C15 | RECOMMENDED, // Telu
+ 0x078C | RECOMMENDED | RTL, // Thaa
+ 0x0E17 | RECOMMENDED | LB_LETTERS, // Thai
+ 0x0F40 | RECOMMENDED, // Tibt
+ 0x14C0 | ASPIRATIONAL, // Cans
+ 0xA288 | ASPIRATIONAL | LB_LETTERS, // Yiii
+ 0x1703 | EXCLUSION, // Tglg
+ 0x1723 | EXCLUSION, // Hano
+ 0x1743 | EXCLUSION, // Buhd
+ 0x1763 | EXCLUSION, // Tagb
+ 0x2800 | UNKNOWN, // Brai
+ 0x10800 | EXCLUSION | RTL, // Cprt
+ 0x1900 | LIMITED_USE, // Limb
+ 0x10000 | EXCLUSION, // Linb
+ 0x10480 | EXCLUSION, // Osma
+ 0x10450 | EXCLUSION, // Shaw
+ 0x1950 | LIMITED_USE | LB_LETTERS, // Tale
+ 0x10380 | EXCLUSION, // Ugar
+ 0,
+ 0x1A00 | EXCLUSION, // Bugi
+ 0x2C00 | EXCLUSION | CASED, // Glag
+ 0x10A00 | EXCLUSION | RTL, // Khar
+ 0xA800 | LIMITED_USE, // Sylo
+ 0x1980 | LIMITED_USE | LB_LETTERS, // Talu
+ 0x2D30 | ASPIRATIONAL, // Tfng
+ 0x103A0 | EXCLUSION, // Xpeo
+ 0x1B05 | LIMITED_USE | LB_LETTERS, // Bali
+ 0x1BC0 | LIMITED_USE, // Batk
+ 0,
+ 0x11005 | EXCLUSION, // Brah
+ 0xAA00 | LIMITED_USE, // Cham
+ 0,
+ 0,
+ 0,
+ 0,
+ 0x13153 | EXCLUSION, // Egyp
+ 0,
+ 0x5B57 | RECOMMENDED | LB_LETTERS, // Hans
+ 0x5B57 | RECOMMENDED | LB_LETTERS, // Hant
+ 0,
+ 0,
+ 0,
+ 0xA984 | LIMITED_USE | LB_LETTERS, // Java
+ 0xA90A | LIMITED_USE, // Kali
+ 0,
+ 0,
+ 0x1C00 | LIMITED_USE, // Lepc
+ 0,
+ 0x0840 | LIMITED_USE | RTL, // Mand
+ 0,
+ 0x10980 | EXCLUSION | RTL, // Mero
+ 0x07CA | LIMITED_USE | RTL, // Nkoo
+ 0x10C00 | EXCLUSION | RTL, // Orkh
+ 0,
+ 0xA840 | EXCLUSION, // Phag
+ 0x10900 | EXCLUSION | RTL, // Phnx
+ 0x16F00 | ASPIRATIONAL, // Plrd
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0xA549 | LIMITED_USE, // Vaii
+ 0,
+ 0x12000 | EXCLUSION, // Xsux
+ 0,
+ 0xFDD0 | UNKNOWN, // Zzzz
+ 0x102A0 | EXCLUSION, // Cari
+ 0x304B | RECOMMENDED | LB_LETTERS, // Jpan
+ 0x1A20 | LIMITED_USE | LB_LETTERS, // Lana
+ 0x10280 | EXCLUSION, // Lyci
+ 0x10920 | EXCLUSION | RTL, // Lydi
+ 0x1C5A | LIMITED_USE, // Olck
+ 0xA930 | EXCLUSION, // Rjng
+ 0xA882 | LIMITED_USE, // Saur
+ 0,
+ 0x1B83 | LIMITED_USE, // Sund
+ 0,
+ 0xABC0 | LIMITED_USE, // Mtei
+ 0x10840 | EXCLUSION | RTL, // Armi
+ 0x10B00 | EXCLUSION | RTL, // Avst
+ 0x11103 | LIMITED_USE, // Cakm
+ 0xAC00 | RECOMMENDED, // Kore
+ 0x11083 | EXCLUSION, // Kthi
+ 0,
+ 0x10B60 | EXCLUSION | RTL, // Phli
+ 0,
+ 0,
+ 0x10B40 | EXCLUSION | RTL, // Prti
+ 0x0800 | EXCLUSION | RTL, // Samr
+ 0xAA80 | LIMITED_USE | LB_LETTERS, // Tavt
+ 0,
+ 0,
+ 0xA6A0 | LIMITED_USE, // Bamu
+ 0xA4D0 | LIMITED_USE, // Lisu
+ 0,
+ 0x10A60 | EXCLUSION | RTL, // Sarb
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0x109A0 | EXCLUSION | RTL, // Merc
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0x11183 | EXCLUSION, // Shrd
+ 0x110D0 | EXCLUSION, // Sora
+ 0x11680 | EXCLUSION, // Takr
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ // End copy-paste from parsescriptmetadata.py
+};
+
+int32_t getScriptProps(UScriptCode script) {
+ if (0 <= script && script < LENGTHOF(SCRIPT_PROPS)) {
+ return SCRIPT_PROPS[script];
+ } else {
+ return 0;
+ }
+}
+
+} // namespace
+
+U_CAPI int32_t U_EXPORT2
+uscript_getSampleString(UScriptCode script, UChar *dest, int32_t capacity, UErrorCode *pErrorCode) {
+ if(U_FAILURE(*pErrorCode)) { return 0; }
+ if(capacity < 0 || (capacity > 0 && dest == NULL)) {
+ *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR;
+ return 0;
+ }
+ int32_t sampleChar = getScriptProps(script) & 0x1fffff;
+ int32_t length;
+ if(sampleChar == 0) {
+ length = 0;
+ } else {
+ length = U16_LENGTH(sampleChar);
+ if(length <= capacity) {
+ int32_t i = 0;
+ U16_APPEND_UNSAFE(dest, i, sampleChar);
+ }
+ }
+ return u_terminateUChars(dest, capacity, length, pErrorCode);
+}
+
+U_COMMON_API icu::UnicodeString U_EXPORT2
+uscript_getSampleUnicodeString(UScriptCode script) {
+ icu::UnicodeString sample;
+ int32_t sampleChar = getScriptProps(script) & 0x1fffff;
+ if(sampleChar != 0) {
+ sample.append(sampleChar);
+ }
+ return sample;
+}
+
+U_CAPI UScriptUsage U_EXPORT2
+uscript_getUsage(UScriptCode script) {
+ return (UScriptUsage)((getScriptProps(script) >> 21) & 7);
+}
+
+U_CAPI UBool U_EXPORT2
+uscript_isRightToLeft(UScriptCode script) {
+ return (getScriptProps(script) & RTL) != 0;
+}
+
+U_CAPI UBool U_EXPORT2
+uscript_breaksBetweenLetters(UScriptCode script) {
+ return (getScriptProps(script) & LB_LETTERS) != 0;
+}
+
+U_CAPI UBool U_EXPORT2
+uscript_isCased(UScriptCode script) {
+ return (getScriptProps(script) & CASED) != 0;
+}
diff --git a/common/ushape.cpp b/common/ushape.cpp
index 86731eb..e5ae86f 100644
--- a/common/ushape.cpp
+++ b/common/ushape.cpp
@@ -1,7 +1,7 @@
/*
******************************************************************************
*
- * Copyright (C) 2000-2012, International Business Machines
+ * Copyright (C) 2000-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@@ -44,6 +44,7 @@
* as a glyph fragment of wide-glyph letters
* + IBM Unicode conversion tables map it to U+200B (ZWSP)
* + IBM Egypt has proposed to encode the tail in Unicode among Arabic Presentation Forms
+ * + Unicode 3.2 added U+FE73 ARABIC TAIL FRAGMENT
*/
/* definitions for Arabic letter shaping ------------------------------------ */
@@ -272,7 +273,7 @@
static const UChar convertFBto06[] =
{
/***********0******1******2******3******4******5******6******7******8******9******A******B******C******D******E******F***/
-/*FB5*/ 0x671, 0x671, 0, 0, 0, 0, 0x07E, 0x07E, 0x07E, 0x07E, 0, 0, 0, 0, 0, 0,
+/*FB5*/ 0x671, 0x671, 0, 0, 0, 0, 0x67E, 0x67E, 0x67E, 0x67E, 0, 0, 0, 0, 0, 0,
/*FB6*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/*FB7*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x686, 0x686, 0x686, 0x686, 0, 0,
/*FB8*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x698, 0x698, 0, 0, 0x6A9, 0x6A9,
diff --git a/common/utext.cpp b/common/utext.cpp
index fc59775..396ee07 100644
--- a/common/utext.cpp
+++ b/common/utext.cpp
@@ -1217,15 +1217,11 @@
int32_t cIx = srcIx;
int32_t dIx = destIx;
int32_t dIxSaved = destIx;
- U8_NEXT(s8, srcIx, strLen, c);
+ U8_NEXT_OR_FFFD(s8, srcIx, strLen, c);
if (c==0 && nulTerminated) {
srcIx--;
break;
}
- if (c<0) {
- // Illegal UTF-8. Replace with sub character.
- c = 0x0fffd;
- }
U16_APPEND_UNSAFE(buf, destIx, c);
do {
@@ -1334,15 +1330,11 @@
int32_t sIx = srcIx; // ix of last byte of multi-byte u8 char
// Get the full character from the UTF8 string.
- // use code derived from tbe macros in utf.8
+ // use code derived from tbe macros in utf8.h
// Leaves srcIx pointing at the first byte of the UTF-8 char.
//
- if (c<=0xbf) {
- c=utf8_prevCharSafeBody(s8, 0, &srcIx, c, -1);
- // leaves srcIx at first byte of the multi-byte char.
- } else {
- c=0x0fffd;
- }
+ c=utf8_prevCharSafeBody(s8, 0, &srcIx, c, -3);
+ // leaves srcIx at first byte of the multi-byte char.
// Store the character in UTF-16 buffer.
if (c<0x10000) {
@@ -1415,10 +1407,7 @@
if(ch <=0x7f){
*pDest++=(UChar)ch;
}else{
- ch=utf8_nextCharSafeBody(pSrc, &index, srcLength, ch, -1);
- if(ch<0){
- ch = 0xfffd;
- }
+ ch=utf8_nextCharSafeBody(pSrc, &index, srcLength, ch, -3);
if(U_IS_BMP(ch)){
*(pDest++)=(UChar)ch;
}else{
@@ -1438,10 +1427,7 @@
if(ch <= 0x7f){
reqLength++;
}else{
- ch=utf8_nextCharSafeBody(pSrc, &index, srcLength, ch, -1);
- if(ch<0){
- ch = 0xfffd;
- }
+ ch=utf8_nextCharSafeBody(pSrc, &index, srcLength, ch, -3);
reqLength+=U16_LENGTH(ch);
}
}
diff --git a/common/utf_impl.c b/common/utf_impl.c
index 67d3a15..ce65e14 100644
--- a/common/utf_impl.c
+++ b/common/utf_impl.c
@@ -86,13 +86,31 @@
0x3ffffff, 0x7fffffff
};
+static UChar32
+errorValue(int32_t count, int8_t strict) {
+ if(strict>=0) {
+ return utf8_errorValue[count];
+ } else if(strict==-3) {
+ return 0xfffd;
+ } else {
+ return U_SENTINEL;
+ }
+}
+
/*
- * Handle the non-inline part of the U8_NEXT() macro and its obsolete sibling
- * UTF8_NEXT_CHAR_SAFE().
+ * Handle the non-inline part of the U8_NEXT() and U8_NEXT_FFFD() macros
+ * and their obsolete sibling UTF8_NEXT_CHAR_SAFE().
+ *
+ * U8_NEXT() supports NUL-terminated strings indicated via length<0.
*
* The "strict" parameter controls the error behavior:
- * <0 "Safe" behavior of U8_NEXT(): All illegal byte sequences yield a negative
- * code point result.
+ * <0 "Safe" behavior of U8_NEXT():
+ * -1: All illegal byte sequences yield U_SENTINEL=-1.
+ * -2: Same as -1, except for lenient treatment of surrogate code points as legal.
+ * Some implementations use this for roundtripping of
+ * Unicode 16-bit strings that are not well-formed UTF-16, that is, they
+ * contain unpaired surrogates.
+ * -3: All illegal byte sequences yield U+FFFD.
* 0 Obsolete "safe" behavior of UTF8_NEXT_CHAR_SAFE(..., FALSE):
* All illegal byte sequences yield a positive code point such that this
* result code point would be encoded with the same number of bytes as
@@ -101,11 +119,6 @@
* Same as the obsolete "safe" behavior, but non-characters are also treated
* like illegal sequences.
*
- * The special negative (<0) value -2 is used for lenient treatment of surrogate
- * code points as legal. Some implementations use this for roundtripping of
- * Unicode 16-bit strings that are not well-formed UTF-16, that is, they
- * contain unpaired surrogates.
- *
* Note that a UBool is the same as an int8_t.
*/
U_CAPI UChar32 U_EXPORT2
@@ -113,90 +126,57 @@
int32_t i=*pi;
uint8_t count=U8_COUNT_TRAIL_BYTES(c);
U_ASSERT(count <= 5); /* U8_COUNT_TRAIL_BYTES returns value 0...5 */
- if((i)+count<=(length)) {
- uint8_t trail, illegal=0;
+ if(i+count<=length || length<0) {
+ uint8_t trail;
- U8_MASK_LEAD_BYTE((c), count);
- /* count==0 for illegally leading trail bytes and the illegal bytes 0xfe and 0xff */
+ U8_MASK_LEAD_BYTE(c, count);
+ /* support NUL-terminated strings: do not read beyond the first non-trail byte */
switch(count) {
/* each branch falls through to the next one */
+ case 0:
+ /* count==0 for illegally leading trail bytes and the illegal bytes 0xfe and 0xff */
case 5:
case 4:
/* count>=4 is always illegal: no more than 3 trail bytes in Unicode's UTF-8 */
- illegal=1;
break;
case 3:
- trail=s[(i)++];
- (c)=((c)<<6)|(trail&0x3f);
- if(c<0x110) {
- illegal|=(trail&0xc0)^0x80;
- } else {
- /* code point>0x10ffff, outside Unicode */
- illegal=1;
- break;
- }
+ trail=s[i++]-0x80;
+ c=(c<<6)|trail;
+ /* c>=0x110 would result in code point>0x10ffff, outside Unicode */
+ if(c>=0x110 || trail>0x3f) { break; }
case 2:
- trail=s[(i)++];
- (c)=((c)<<6)|(trail&0x3f);
- illegal|=(trail&0xc0)^0x80;
+ trail=s[i++]-0x80;
+ c=(c<<6)|trail;
+ /*
+ * test for a surrogate d800..dfff unless we are lenient:
+ * before the last (c<<6), a surrogate is c=360..37f
+ */
+ if(((c&0xffe0)==0x360 && strict!=-2) || trail>0x3f) { break; }
case 1:
- trail=s[(i)++];
- (c)=((c)<<6)|(trail&0x3f);
- illegal|=(trail&0xc0)^0x80;
- break;
- case 0:
- if(strict>=0) {
- return UTF8_ERROR_VALUE_1;
- } else {
- return U_SENTINEL;
+ trail=s[i++]-0x80;
+ c=(c<<6)|trail;
+ if(trail>0x3f) { break; }
+ /* correct sequence - all trail bytes have (b7..b6)==(10) */
+ if(c>=utf8_minLegal[count] &&
+ /* strict: forbid non-characters like U+fffe */
+ (strict<=0 || !U_IS_UNICODE_NONCHAR(c))) {
+ *pi=i;
+ return c;
}
/* no default branch to optimize switch() - all values are covered */
}
-
- /*
- * All the error handling should return a value
- * that needs count bytes so that UTF8_GET_CHAR_SAFE() works right.
- *
- * Starting with Unicode 3.0.1, non-shortest forms are illegal.
- * Starting with Unicode 3.2, surrogate code points must not be
- * encoded in UTF-8, and there are no irregular sequences any more.
- *
- * U8_ macros (new in ICU 2.4) return negative values for error conditions.
- */
-
- /* correct sequence - all trail bytes have (b7..b6)==(10)? */
- /* illegal is also set if count>=4 */
- if(illegal || (c)<utf8_minLegal[count] || (U_IS_SURROGATE(c) && strict!=-2)) {
- /* error handling */
- uint8_t errorCount=count;
- /* don't go beyond this sequence */
- i=*pi;
- while(count>0 && U8_IS_TRAIL(s[i])) {
- ++(i);
- --count;
- }
- if(strict>=0) {
- c=utf8_errorValue[errorCount-count];
- } else {
- c=U_SENTINEL;
- }
- } else if((strict)>0 && U_IS_UNICODE_NONCHAR(c)) {
- /* strict: forbid non-characters like U+fffe */
- c=utf8_errorValue[count];
- }
- } else /* too few bytes left */ {
- /* error handling */
- int32_t i0=i;
- /* don't just set (i)=(length) in case there is an illegal sequence */
- while((i)<(length) && U8_IS_TRAIL(s[i])) {
- ++(i);
- }
- if(strict>=0) {
- c=utf8_errorValue[i-i0];
- } else {
- c=U_SENTINEL;
- }
+ } else {
+ /* too few bytes left */
+ count=length-i;
}
+
+ /* error handling */
+ i=*pi;
+ while(count>0 && U8_IS_TRAIL(s[i])) {
+ ++i;
+ --count;
+ }
+ c=errorValue(i-*pi, strict);
*pi=i;
return c;
}
@@ -251,18 +231,15 @@
int32_t i=*pi;
uint8_t b, count=1, shift=6;
+ if(!U8_IS_TRAIL(c)) { return errorValue(0, strict); }
+
/* extract value bits from the last trail byte */
c&=0x3f;
for(;;) {
if(i<=start) {
/* no lead byte at all */
- if(strict>=0) {
- return UTF8_ERROR_VALUE_1;
- } else {
- return U_SENTINEL;
- }
- /*break;*/
+ return errorValue(0, strict);
}
/* read another previous byte */
@@ -282,11 +259,7 @@
if(count>=4) {
count=3;
}
- if(strict>=0) {
- c=utf8_errorValue[count];
- } else {
- c=U_SENTINEL;
- }
+ c=errorValue(count, strict);
} else {
/* exit with correct c */
}
@@ -296,17 +269,9 @@
include the trail byte that we started with */
if(count<shouldCount) {
*pi=i;
- if(strict>=0) {
- c=utf8_errorValue[count];
- } else {
- c=U_SENTINEL;
- }
+ c=errorValue(count, strict);
} else {
- if(strict>=0) {
- c=UTF8_ERROR_VALUE_1;
- } else {
- c=U_SENTINEL;
- }
+ c=errorValue(0, strict);
}
}
break;
@@ -317,20 +282,12 @@
shift+=6;
} else {
/* more than 5 trail bytes is illegal */
- if(strict>=0) {
- c=UTF8_ERROR_VALUE_1;
- } else {
- c=U_SENTINEL;
- }
+ c=errorValue(0, strict);
break;
}
} else {
/* single-byte character precedes trailing bytes */
- if(strict>=0) {
- c=UTF8_ERROR_VALUE_1;
- } else {
- c=U_SENTINEL;
- }
+ c=errorValue(0, strict);
break;
}
}
diff --git a/common/uts46.cpp b/common/uts46.cpp
index cddc039..8e6c8ff 100644
--- a/common/uts46.cpp
+++ b/common/uts46.cpp
@@ -109,8 +109,6 @@
}
}
-UOBJECT_DEFINE_NO_RTTI_IMPLEMENTATION(IDNA)
-
// UTS46 class declaration ------------------------------------------------- ***
class UTS46 : public IDNA {
diff --git a/config/mh-cygwin-msvc b/config/mh-cygwin-msvc
index 4589e2f..b6682c9 100644
--- a/config/mh-cygwin-msvc
+++ b/config/mh-cygwin-msvc
@@ -1,5 +1,5 @@
## Cygwin with Microsoft Visual C++ compiler specific setup
-## Copyright (c) 2001-2012, International Business Machines Corporation and
+## Copyright (c) 2001-2013, International Business Machines Corporation and
## others. All Rights Reserved.
# We install sbin tools into the same bin directory because
@@ -125,7 +125,7 @@
# The #M# is used to delete lines for icu-config
# Current full path directory.
-CURR_FULL_DIR=$(subst \,/,$(shell cygpath -da .))#M# -m isn't used because it doesn't work on Win98
+CURR_FULL_DIR?=$(subst \,/,$(shell cygpath -da .))#M# -m isn't used because it doesn't work on Win98
# Current full path directory for use in source code in a -D compiler option.
CURR_SRCCODE_FULL_DIR=$(subst \,\\,$(shell cygpath -da .))#M#
diff --git a/config/mh-mingw b/config/mh-mingw
index 7ca4248..eb25c8a 100644
--- a/config/mh-mingw
+++ b/config/mh-mingw
@@ -1,10 +1,13 @@
## -*-makefile-*-
## Cygwin/MinGW specific setup
-## Copyright (c) 2001-2012, International Business Machines Corporation and
+## Copyright (c) 2001-2013, International Business Machines Corporation and
## others. All Rights Reserved.
# TODO: Finish the rest of this port. This platform port is incomplete.
+# This file is similar to mh-mingw64
+# Any changes made here may also need to be made in mh-mingw64
+
# We install sbin tools into the same bin directory because
# pkgdata needs some of the tools in sbin, and we can't always depend on
# icu-config working on Windows.
@@ -80,7 +83,7 @@
# The #M# is used to delete lines for icu-config
# Current full path directory.
#CURR_FULL_DIR=$(shell pwd -W)#M# for MSYS
-CURR_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
+CURR_FULL_DIR?=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
# Current full path directory for use in source code in a -D compiler option.
#CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M# for MSYS
CURR_SRCCODE_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
diff --git a/config/mh-mingw64 b/config/mh-mingw64
new file mode 100644
index 0000000..1b37f29
--- /dev/null
+++ b/config/mh-mingw64
@@ -0,0 +1,146 @@
+## -*-makefile-*-
+## Cygwin64/MinGW64 specific setup
+## Copyright (c) 2012-2013, International Business Machines Corporation and
+## others. All Rights Reserved.
+
+# TODO: Finish the rest of this port. This platform port is incomplete.
+
+# This file is similar to mh-mingw
+# Any changes made here may also need to be made in mh-mingw
+
+# We install sbin tools into the same bin directory because
+# pkgdata needs some of the tools in sbin, and we can't always depend on
+# icu-config working on Windows.
+sbindir=$(bindir)
+
+## Commands to generate dependency files
+GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
+GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
+
+## Flags to create/use a static library
+ifneq ($(ENABLE_SHARED),YES)
+## Make sure that the static libraries can be built and used
+CPPFLAGS += -DU_STATIC_IMPLEMENTATION
+else
+## Make sure that the static libraries can be built
+STATICCPPFLAGS = -DU_STATIC_IMPLEMENTATION
+endif
+
+## Flags for position independent code
+SHAREDLIBCFLAGS =
+SHAREDLIBCXXFLAGS =
+SHAREDLIBCPPFLAGS = -DPIC
+
+## Additional flags when building libraries and with threads
+THREADSCFLAGS = -mthreads
+THREADSCXXFLAGS = -mthreads
+LIBCPPFLAGS =
+
+# Commands to link. Link with C++ in case static libraries are used.
+LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS)
+#LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS)
+
+## Shared library options
+LD_SOOPTIONS= -Wl,-Bsymbolic
+
+## Commands to make a shared library
+SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M#
+SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M#
+
+## Compiler switch to embed a runtime search path
+LD_RPATH=
+LD_RPATH_PRE= -Wl,-rpath,
+
+## Compiler switch to embed a library name
+LD_SONAME =
+
+## Shared object suffix
+SO = dll
+## Non-shared intermediate object suffix
+STATIC_O = ao
+
+ifeq ($(ENABLE_SHARED),YES)
+SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_VERSION_MAJOR)
+else
+SO_TARGET_VERSION_SUFFIX =
+endif
+
+# Static library prefix and file extension
+LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
+A = a
+
+## An import library is needed for z/OS and MSVC
+IMPORT_LIB_EXT = .lib
+
+LIBPREFIX=
+
+# Change the stubnames so that poorly working FAT disks and installation programs can work.
+# This is also for backwards compatibility.
+DATA_STUBNAME = dt
+I18N_STUBNAME = in
+LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
+
+# The #M# is used to delete lines for icu-config
+# Current full path directory.
+#CURR_FULL_DIR=$(shell pwd -W)#M# for MSYS
+CURR_FULL_DIR?=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
+# Current full path directory for use in source code in a -D compiler option.
+#CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M# for MSYS
+CURR_SRCCODE_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
+
+## Compilation rules
+%.$(STATIC_O): $(srcdir)/%.c
+ $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
+%.o: $(srcdir)/%.c
+ $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
+
+%.$(STATIC_O): $(srcdir)/%.cpp
+ $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $<
+%.o: $(srcdir)/%.cpp
+ $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
+
+
+## Dependency rules
+%.d: $(srcdir)/%.c
+ @echo "generating dependency information for $<"
+ @echo -n "$@ " > $@
+ @$(GEN_DEPS.c) $< >> $@ || (rm -f $@ && FALSE)
+
+%.d: $(srcdir)/%.cpp
+ @echo "generating dependency information for $<"
+ @echo -n "$@ " > $@
+ @$(GEN_DEPS.cc) $< >> $@ || (rm -f $@ && FALSE)
+
+## Versioned target for a shared library.
+## Since symbolic links don't work the same way on Windows,
+## we only use the version major number.
+#FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO)
+FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO)
+MIDDLE_SO_TARGET=$(FINAL_SO_TARGET)
+
+FINAL_IMPORT_LIB = $(dir $(SO_TARGET))$(notdir $(basename $(SO_TARGET)))$(IMPORT_LIB_EXT)#M#
+IMPORT_LIB = $(FINAL_IMPORT_LIB)#M#
+MIDDLE_IMPORT_LIB = $(FINAL_IMPORT_LIB)#M#
+
+## Special pkgdata information that is needed
+PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION_MAJOR)
+#ICUPKGDATA_INSTALL_DIR = $(shell cygpath -dma $(DESTDIR)$(ICUPKGDATA_DIR))#M#
+#ICUPKGDATA_INSTALL_LIBDIR = $(shell cygpath -dma $(DESTDIR)$(libdir))#M#
+
+## Versioned libraries rules
+#%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
+# $(RM) $@ && cp ${<F} $@
+%.$(SO): %$(SO_TARGET_VERSION_MAJOR).$(SO)
+ @echo -n
+
+# Environment variable to set a runtime search path
+LDLIBRARYPATH_ENVVAR = PATH
+
+# The type of assembly to write for generating an object file
+GENCCODE_ASSEMBLY=-a gcc-mingw64
+
+# These are needed to allow the pkgdata GNU make files to work
+PKGDATA_DEFS = -DU_MAKE=\"$(MAKE)\"
+
+## End Cygwin64/MinGW64 specific setup
+
diff --git a/configure b/configure
index 4e44789..1a20f41 100755
--- a/configure
+++ b/configure
@@ -4846,7 +4846,7 @@
icu_cv_host_frag=mh-linux-va
fi ;;
*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;;
-*-*-cygwin|*-*-mingw32)
+*-*-cygwin|*-*-mingw32|*-*-mingw64)
if test "$GCC" = yes; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -4863,7 +4863,26 @@
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#ifndef __MINGW64__
+#error This is not MinGW64
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ icu_cv_host_frag=mh-mingw64
+else
icu_cv_host_frag=mh-mingw
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
icu_cv_host_frag=mh-cygwin
fi
diff --git a/data/brkitr/brkfiles.mk b/data/brkitr/brkfiles.mk
index fbf6a4a..9e4b13d 100644
--- a/data/brkitr/brkfiles.mk
+++ b/data/brkitr/brkfiles.mk
@@ -1,6 +1,6 @@
-# * Copyright (C) 1998-2012, International Business Machines
+# * Copyright (C) 1998-2013, International Business Machines
# * Corporation and others. All Rights Reserved.
-BRK_RES_CLDR_VERSION = 22.1.1
+BRK_RES_CLDR_VERSION = 23
# A list of txt's to build
# Note:
#
diff --git a/data/brkitr/char.txt b/data/brkitr/char.txt
index c0d9731..abf71fc 100644
--- a/data/brkitr/char.txt
+++ b/data/brkitr/char.txt
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2012, International Business Machines Corporation and others.
+# Copyright (C) 2002-2013, International Business Machines Corporation and others.
# All Rights Reserved.
#
# file: char.txt
@@ -66,11 +66,15 @@
## -------------------------------------------------
+# We don't logically need safe char break rules, but if we don't provide any at all
+# the engine for preceding() and following() will fall back to the
+# old style inefficient algorithm.
!!safe_reverse;
-
+$LF $CR;
## -------------------------------------------------
!!safe_forward;
+$CR $LF;
diff --git a/data/brkitr/el.txt b/data/brkitr/el.txt
index 58791b0..22804d8 100644
--- a/data/brkitr/el.txt
+++ b/data/brkitr/el.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/xml/brkitr/el.xml
diff --git a/data/brkitr/en.txt b/data/brkitr/en.txt
index 4c68aff..6776df1 100644
--- a/data/brkitr/en.txt
+++ b/data/brkitr/en.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/xml/brkitr/en.xml
diff --git a/data/brkitr/en_US.txt b/data/brkitr/en_US.txt
index 2087d0e..0e14568 100644
--- a/data/brkitr/en_US.txt
+++ b/data/brkitr/en_US.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/xml/brkitr/en_US.xml
diff --git a/data/brkitr/en_US_POSIX.txt b/data/brkitr/en_US_POSIX.txt
index 3583de9..39ab003 100644
--- a/data/brkitr/en_US_POSIX.txt
+++ b/data/brkitr/en_US_POSIX.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/xml/brkitr/en_US_POSIX.xml
diff --git a/data/brkitr/fi.txt b/data/brkitr/fi.txt
index e182e57..b1d7440 100644
--- a/data/brkitr/fi.txt
+++ b/data/brkitr/fi.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/xml/brkitr/fi.xml
diff --git a/data/brkitr/ja.txt b/data/brkitr/ja.txt
index 161b198..d10f30d 100644
--- a/data/brkitr/ja.txt
+++ b/data/brkitr/ja.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/xml/brkitr/ja.xml
diff --git a/data/brkitr/root.txt b/data/brkitr/root.txt
index 821f1b8..f647bd7 100644
--- a/data/brkitr/root.txt
+++ b/data/brkitr/root.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/xml/brkitr/root.xml
@@ -19,9 +19,7 @@
Hani:process(dependency){"cjdict.dict"}
Hira:process(dependency){"cjdict.dict"}
Kata:process(dependency){"cjdict.dict"}
- // BEGIN android-removed
- // Khmr:process(dependency){"khmerdict.dict}
- // END android-removed
+ Khmr:process(dependency){"khmerdict.dict"}
Thai:process(dependency){"thaidict.dict"}
}
}
diff --git a/data/brkitr/word.txt b/data/brkitr/word.txt
index 7db4311..5873d99 100644
--- a/data/brkitr/word.txt
+++ b/data/brkitr/word.txt
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2012, International Business Machines Corporation
+# Copyright (C) 2002-2013, International Business Machines Corporation
# and others. All Rights Reserved.
#
# file: word.txt
@@ -89,7 +89,7 @@
# begins with a group of Format chars, or with a "word" consisting of a single
# char that is not in any of the listed word break categories followed by
# format char(s), or is not a CJK dictionary character.
-[^$CR $LF $Newline $dictionaryCJK]? ($Extend | $Format)+;
+[^$CR $LF $Newline]? ($Extend | $Format)+;
$NumericEx {100};
$ALetterEx {200};
@@ -167,7 +167,7 @@
$LF $CR;
# rule 4
-($Format | $Extend)* [^$CR $LF $Newline $dictionaryCJK]?;
+($Format | $Extend)* [^$CR $LF $Newline]?;
# rule 5
diff --git a/data/build.xml b/data/build.xml
index 6d24c65..0d8d747 100644
--- a/data/build.xml
+++ b/data/build.xml
@@ -5,7 +5,7 @@
<!--
/*
*******************************************************************************
-* Copyright (C) 2005-2012, International Business Machines Corporation and *
+* Copyright (C) 2005-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@@ -71,7 +71,8 @@
</taskdef>
</target>
<!-- target for generating ICU data -->
- <target name="all" depends="locales, resfiles, resfiles_curr, resfiles_lang, resfiles_region, resfiles_zone, collation, colfiles, rbnf, rbnffiles, supplementalData, metadata, metaZones, windowsZones, likelySubtags, plurals, numberingSystems, translit, brkitr, brkfiles, keyTypeData, genderList, postalCodeData, dayPeriods" />
+ <!-- Google Patch: exclude metaZones, windowsZones from "all" -->
+ <target name="all" depends="locales, resfiles, resfiles_curr, resfiles_lang, resfiles_region, resfiles_zone, collation, colfiles, rbnf, rbnffiles, supplementalData, metadata, likelySubtags, plurals, numberingSystems, translit, brkitr, brkfiles, keyTypeData, genderList, postalCodeData, dayPeriods" />
<!-- parallel target -->
<target name="pall" depends="init">
<parallel threadsPerProcessor ="1">
@@ -122,7 +123,8 @@
<arg name="--specialsdir" value="${env.ICU4C_DIR}/source/data/xml/main"/>
<arg name="--supplementaldir" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="--type" value="locales"/>
- <arg name="--cldrVersion" value="22.1.1"/>
+ <arg name="--filter"/> <!-- Google Patch: select short names for HK, MO. (SAR China.) -->
+ <arg name="--cldrVersion" value="23.0"/>
</args>
<remapper>
<remap sourcePath="/Keys" targetDir="lang" />
@@ -246,9 +248,6 @@
<deprecates>
<alias from="de__PHONEBOOK" to="de@collation=phonebook" xpath="//ldml/collations/default[@type='phonebook']"/>
<alias from="es__TRADITIONAL" to="es@collation=traditional" xpath="//ldml/collations/default[@type='traditional']"/>
- <alias from="hi__DIRECT" to="hi@collation=direct" xpath="//ldml/collations/default[@type='direct']"/>
- <alias from="zh__PINYIN" to="zh@collation=pinyin" xpath="//ldml/collations/default[@type='pinyin']"/>
- <alias from="zh_TW_STROKE" to="zh@collation=stroke" xpath="//ldml/collations/default[@type='stroke']"/>
<alias from="in" to="id" />
<alias from="in_ID" to="id_ID" />
<alias from="iw" to="he" />
@@ -271,8 +270,6 @@
<alias from="zh_TW" to="zh_Hant_TW" />
<emptyLocale locale="de_" />
<emptyLocale locale="es_" />
- <emptyLocale locale="hi_" />
- <emptyLocale locale="zh_" />
</deprecates>
</run>
</cldr-build>
@@ -314,7 +311,7 @@
<arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="supplementalData"/>
- <arg name="--cldrVersion" value="22.1.1"/>
+ <arg name="--cldrVersion" value="23.0"/>
</args>
<remapper>
<remap sourcePath="/CurrencyMap" targetDir="curr" />
@@ -331,33 +328,7 @@
<arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="metadata"/>
- <arg name="--cldrVersion" value="22.1.1"/>
- </args>
- </run>
- </cldr-build>
- </target>
- <target name="metaZones" depends="init,setup" description="builds metaZones.txt from metaZones.xml">
- <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="metaZones.txt" noArgs="true">
- <!-- launch the tool and generate the data after reading the config file -->
- <run>
- <args>
- <arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
- <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
- <arg name="-t" value="metaZones"/>
- <arg name="--cldrVersion" value="22.1.1"/>
- </args>
- </run>
- </cldr-build>
- </target>
- <target name="windowsZones" depends="init,setup" description="builds windowsZones.txt from windowsZones.xml">
- <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="windowsZones.txt" noArgs="true">
- <!-- launch the tool and generate the data after reading the config file -->
- <run>
- <args>
- <arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
- <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
- <arg name="-t" value="windowsZones"/>
- <arg name="--cldrVersion" value="22.1.1"/>
+ <arg name="--cldrVersion" value="23.0"/>
</args>
</run>
</cldr-build>
@@ -370,7 +341,7 @@
<arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="likelySubtags"/>
- <arg name="--cldrVersion" value="22.1.1"/>
+ <arg name="--cldrVersion" value="23.0"/>
</args>
</run>
</cldr-build>
@@ -383,7 +354,7 @@
<arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="plurals"/>
- <arg name="--cldrVersion" value="22.1.1"/>
+ <arg name="--cldrVersion" value="23.0"/>
</args>
</run>
</cldr-build>
@@ -396,7 +367,7 @@
<arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="numberingSystems"/>
- <arg name="--cldrVersion" value="22.1.1"/>
+ <arg name="--cldrVersion" value="23.0"/>
</args>
</run>
</cldr-build>
@@ -409,7 +380,7 @@
<arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="genderList"/>
- <arg name="--cldrVersion" value="22.1.1"/>
+ <arg name="--cldrVersion" value="23.0"/>
</args>
</run>
</cldr-build>
@@ -422,7 +393,7 @@
<arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="postalCodeData"/>
- <arg name="--cldrVersion" value="22.1.1"/>
+ <arg name="--cldrVersion" value="23.0"/>
</args>
</run>
</cldr-build>
@@ -435,7 +406,7 @@
<arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="dayPeriods"/>
- <arg name="--cldrVersion" value="22.1.1"/>
+ <arg name="--cldrVersion" value="23.0"/>
</args>
</run>
</cldr-build>
@@ -476,7 +447,7 @@
<arg name="-s" value="${env.CLDR_DIR}/common/bcp47" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="keyTypeData"/>
- <arg name="--cldrVersion" value="22.1.1"/>
+ <arg name="--cldrVersion" value="23.0"/>
</args>
</run>
</cldr-build>
@@ -564,12 +535,6 @@
<fileset id="metadata" dir="${env.ICU4C_DIR}/source/data/misc">
<include name="metadata.txt" />
</fileset>
- <fileset id="metaZones" dir="${env.ICU4C_DIR}/source/data/misc">
- <include name="metaZones.txt" />
- </fileset>
- <fileset id="windowsZones" dir="${env.ICU4C_DIR}/source/data/misc">
- <include name="windowsZones.txt" />
- </fileset>
<fileset id="likelySubtags" dir="${env.ICU4C_DIR}/source/data/misc">
<include name="likelySubtags.txt" />
</fileset>
diff --git a/data/coll/af.txt b/data/coll/af.txt
index 48b77d9..c523749 100644
--- a/data/coll/af.txt
+++ b/data/coll/af.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/af.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/af.xml
*/
af{
- Version{"2.0.58.16"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{"&N<<<ʼn"}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/af_NA.txt b/data/coll/af_NA.txt
index e99f734..f70c468 100644
--- a/data/coll/af_NA.txt
+++ b/data/coll/af_NA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/af_ZA.txt b/data/coll/af_ZA.txt
index 8035792..ee56884 100644
--- a/data/coll/af_ZA.txt
+++ b/data/coll/af_ZA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar.txt b/data/coll/ar.txt
index 1d67897..e1c1dca 100644
--- a/data/coll/ar.txt
+++ b/data/coll/ar.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/ar.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/ar.xml
*/
ar{
- Version{"2.0.76.11"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{" [reorder Arab]&ت<<ة<<<ﺔ<<<ﺓ&ي<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ<<<ﲐ<<<ﱝ"}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/ar_001.txt b/data/coll/ar_001.txt
index 32ec3dd..9009440 100644
--- a/data/coll/ar_001.txt
+++ b/data/coll/ar_001.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_AE.txt b/data/coll/ar_AE.txt
index 83aa19b..d949fe8 100644
--- a/data/coll/ar_AE.txt
+++ b/data/coll/ar_AE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_BH.txt b/data/coll/ar_BH.txt
index 0d2e57b..b3886ac 100644
--- a/data/coll/ar_BH.txt
+++ b/data/coll/ar_BH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_DJ.txt b/data/coll/ar_DJ.txt
index 0742617..94da077 100644
--- a/data/coll/ar_DJ.txt
+++ b/data/coll/ar_DJ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_DZ.txt b/data/coll/ar_DZ.txt
index ed44d22..5d03a17 100644
--- a/data/coll/ar_DZ.txt
+++ b/data/coll/ar_DZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_EG.txt b/data/coll/ar_EG.txt
index bfdfdf0..9628de0 100644
--- a/data/coll/ar_EG.txt
+++ b/data/coll/ar_EG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_EH.txt b/data/coll/ar_EH.txt
index fc67ba6..90e1089 100644
--- a/data/coll/ar_EH.txt
+++ b/data/coll/ar_EH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_ER.txt b/data/coll/ar_ER.txt
index d607014..9846e05 100644
--- a/data/coll/ar_ER.txt
+++ b/data/coll/ar_ER.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_IL.txt b/data/coll/ar_IL.txt
index 8ac579e..a35dbaf 100644
--- a/data/coll/ar_IL.txt
+++ b/data/coll/ar_IL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_IQ.txt b/data/coll/ar_IQ.txt
index 90a77d1..cd41d7b 100644
--- a/data/coll/ar_IQ.txt
+++ b/data/coll/ar_IQ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_JO.txt b/data/coll/ar_JO.txt
index 7a266bf..cf1455a 100644
--- a/data/coll/ar_JO.txt
+++ b/data/coll/ar_JO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_KM.txt b/data/coll/ar_KM.txt
index 211c241..fe79d61 100644
--- a/data/coll/ar_KM.txt
+++ b/data/coll/ar_KM.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_KW.txt b/data/coll/ar_KW.txt
index ad1c58b..1a06165 100644
--- a/data/coll/ar_KW.txt
+++ b/data/coll/ar_KW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_LB.txt b/data/coll/ar_LB.txt
index f72a1d8..4a65e19 100644
--- a/data/coll/ar_LB.txt
+++ b/data/coll/ar_LB.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_LY.txt b/data/coll/ar_LY.txt
index c77587f..ace7045 100644
--- a/data/coll/ar_LY.txt
+++ b/data/coll/ar_LY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_MA.txt b/data/coll/ar_MA.txt
index 757dd41..bc4ba4f 100644
--- a/data/coll/ar_MA.txt
+++ b/data/coll/ar_MA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_MR.txt b/data/coll/ar_MR.txt
index 4d7de18..343552e 100644
--- a/data/coll/ar_MR.txt
+++ b/data/coll/ar_MR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_OM.txt b/data/coll/ar_OM.txt
index 6868622..08ad360 100644
--- a/data/coll/ar_OM.txt
+++ b/data/coll/ar_OM.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_PS.txt b/data/coll/ar_PS.txt
index b42d85e..b1d86c9 100644
--- a/data/coll/ar_PS.txt
+++ b/data/coll/ar_PS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_QA.txt b/data/coll/ar_QA.txt
index 2a9fff1..daff680 100644
--- a/data/coll/ar_QA.txt
+++ b/data/coll/ar_QA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_SA.txt b/data/coll/ar_SA.txt
index 468eb6a..de0e1c0 100644
--- a/data/coll/ar_SA.txt
+++ b/data/coll/ar_SA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_SD.txt b/data/coll/ar_SD.txt
index 58d8d76..5c6de89 100644
--- a/data/coll/ar_SD.txt
+++ b/data/coll/ar_SD.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_SO.txt b/data/coll/ar_SO.txt
index 0b9d228..e931e33 100644
--- a/data/coll/ar_SO.txt
+++ b/data/coll/ar_SO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_SY.txt b/data/coll/ar_SY.txt
index c5b2690..03231e8 100644
--- a/data/coll/ar_SY.txt
+++ b/data/coll/ar_SY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_TD.txt b/data/coll/ar_TD.txt
index 4e641dc..6fc7b86 100644
--- a/data/coll/ar_TD.txt
+++ b/data/coll/ar_TD.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_TN.txt b/data/coll/ar_TN.txt
index 04b482f..7daf6e9 100644
--- a/data/coll/ar_TN.txt
+++ b/data/coll/ar_TN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ar_YE.txt b/data/coll/ar_YE.txt
index 4a79bfe..e66f897 100644
--- a/data/coll/ar_YE.txt
+++ b/data/coll/ar_YE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/as.txt b/data/coll/as.txt
index fce4a91..4890338 100644
--- a/data/coll/as.txt
+++ b/data/coll/as.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/as.xml
@@ -10,15 +10,16 @@
* ICU <specials> source: <path>/xml/collation/as.xml
*/
as{
- Version{"2.0.41.26"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
- " [normalization on ] [reorder Beng Deva Guru Gujr Orya Taml Telu Knda"
+ " [normalization on] [reorder Beng Deva Guru Gujr Orya Taml Telu Knda"
" Mlym Sinh]"
"&ঔ<ং<ঁ<ঃ"
- "&[before 1]ত<ত্'\u200D'&হ<ক্ষ"}
- Version{"22.1.1"}
+ "&[before 1]ত<ৎ=ত্'\u200D'&হ<ক্ষ"
+ }
+ Version{"23"}
}
}
}
diff --git a/data/coll/as_IN.txt b/data/coll/as_IN.txt
index e3352ff..6f8f4e1 100644
--- a/data/coll/as_IN.txt
+++ b/data/coll/as_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/az.txt b/data/coll/az.txt
index 65ffffb..540196e 100644
--- a/data/coll/az.txt
+++ b/data/coll/az.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/az.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/az.xml
*/
az{
- Version{"2.0.63.65"}
+ Version{"2.0.82.42"}
collations{
search{
Sequence{
- " [normalization on ][suppressContractions [เ-ไ ເ-ໄ] ]"
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
"&'='<'\u2260'&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
"&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
"&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
@@ -71,7 +71,7 @@
"&E<ə<<<Ə"
"&H<x<<<X"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
Sequence{
@@ -87,7 +87,7 @@
"&E<ə<<<Ə"
"&H<x<<<X"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/az_Latn.txt b/data/coll/az_Latn.txt
index 21709fb..9df21d6 100644
--- a/data/coll/az_Latn.txt
+++ b/data/coll/az_Latn.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/az_Latn_AZ.txt b/data/coll/az_Latn_AZ.txt
index 5bdfb18..432cfe8 100644
--- a/data/coll/az_Latn_AZ.txt
+++ b/data/coll/az_Latn_AZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/be.txt b/data/coll/be.txt
index d6efe86..c8b8d9e 100644
--- a/data/coll/be.txt
+++ b/data/coll/be.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/be.xml
@@ -10,14 +10,14 @@
* ICU <specials> source: <path>/xml/collation/be.xml
*/
be{
- Version{"2.0.49.75"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
" [reorder Cyrl][suppressContractions [АаӘәГгЕеЖжЗзІіОоӨөКкЧчЫыЭэѴѵ]]"
"&Е<ё<<<Ё"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/be_BY.txt b/data/coll/be_BY.txt
index a1f8417..50bd5b5 100644
--- a/data/coll/be_BY.txt
+++ b/data/coll/be_BY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/bg.txt b/data/coll/bg.txt
index 0882e1c..7e84d7e 100644
--- a/data/coll/bg.txt
+++ b/data/coll/bg.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/bg.xml
@@ -10,14 +10,14 @@
* ICU <specials> source: <path>/xml/collation/bg.xml
*/
bg{
- Version{"2.0.61.82"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
" [reorder Cyrl][suppressContractions [АаӘәГгЕеЖжЗзІіОоӨөКкУуЧчЫыЭэѴѵ"
"]]"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/bg_BG.txt b/data/coll/bg_BG.txt
index 9d1a0c2..13d4ac1 100644
--- a/data/coll/bg_BG.txt
+++ b/data/coll/bg_BG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/bn.txt b/data/coll/bn.txt
index de7a1e1..e3f90c1 100644
--- a/data/coll/bn.txt
+++ b/data/coll/bn.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/bn.xml
@@ -10,15 +10,15 @@
* ICU <specials> source: <path>/xml/collation/bn.xml
*/
bn{
- Version{"2.0.59.17"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
" [normalization on] [reorder Beng Deva Guru Gujr Orya Taml Telu Knda"
" Mlym Sinh]"
"&ঔ<ং<ঃ<ঁ"
- }
- Version{"22.1.1"}
+ }
+ Version{"23"}
}
traditional{
Sequence{
@@ -638,7 +638,7 @@
"&যৌ<<<য়ৌ"
"&য্<<<য়্"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/bn_BD.txt b/data/coll/bn_BD.txt
index 878818d..d76d1e2 100644
--- a/data/coll/bn_BD.txt
+++ b/data/coll/bn_BD.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/bn_IN.txt b/data/coll/bn_IN.txt
index 7f99d77..153ee33 100755
--- a/data/coll/bn_IN.txt
+++ b/data/coll/bn_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/bs.txt b/data/coll/bs.txt
index 1d63d41..5fbd042 100644
--- a/data/coll/bs.txt
+++ b/data/coll/bs.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/bs.xml
@@ -10,6 +10,15 @@
* ICU <specials> source: <path>/xml/collation/bs.xml
*/
bs{
- Version{"2.0.73.72"}
- collations:alias{"hr/collations"}
+ Version{"2.0.82.42"}
+ collations{
+ search{
+ Sequence{"[import hr-u-co-search]"}
+ Version{"23"}
+ }
+ standard{
+ Sequence{"[import hr]"}
+ Version{"23"}
+ }
+ }
}
diff --git a/data/coll/bs_Cyrl.txt b/data/coll/bs_Cyrl.txt
index b5993e0..0f28e13 100644
--- a/data/coll/bs_Cyrl.txt
+++ b/data/coll/bs_Cyrl.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/bs_Cyrl.xml
@@ -10,6 +10,11 @@
* ICU <specials> source: <path>/xml/collation/bs_Cyrl.xml
*/
bs_Cyrl{
- Version{"2.0.73.72"}
- collations:alias{"sr/collations"}
+ Version{"2.0.82.68"}
+ collations{
+ standard{
+ Sequence{"[import sr]"}
+ Version{"23"}
+ }
+ }
}
diff --git a/data/coll/bs_Cyrl_BA.txt b/data/coll/bs_Cyrl_BA.txt
index 8cec8a4..fe26049 100644
--- a/data/coll/bs_Cyrl_BA.txt
+++ b/data/coll/bs_Cyrl_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/bs_Latn.txt b/data/coll/bs_Latn.txt
index 791bccb..7267104 100644
--- a/data/coll/bs_Latn.txt
+++ b/data/coll/bs_Latn.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/bs_Latn_BA.txt b/data/coll/bs_Latn_BA.txt
index 9a32a10..bf8120a 100644
--- a/data/coll/bs_Latn_BA.txt
+++ b/data/coll/bs_Latn_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ca.txt b/data/coll/ca.txt
index f9aa718..f81ccbb 100644
--- a/data/coll/ca.txt
+++ b/data/coll/ca.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/ca.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/ca.xml
*/
ca{
- Version{"2.0.76.11"}
+ Version{"2.0.82.42"}
collations{
search{
Sequence{
- " [normalization on ][suppressContractions [เ-ไ ເ-ໄ] ]"
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
"&'='<'\u2260'&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
"&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
"&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
@@ -62,11 +62,11 @@
"&ᅮᅵ=ᅱ"
"&L<ŀ=l·<<<Ŀ=L·"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
- Sequence{" [backwards 2]&L<<ŀ=l·<<<Ŀ=L·"}
- Version{"22.1.1"}
+ Sequence{"&L<<ŀ=l·<<<Ŀ=L·"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/ca_AD.txt b/data/coll/ca_AD.txt
index e40432c..aa7ee12 100644
--- a/data/coll/ca_AD.txt
+++ b/data/coll/ca_AD.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ca_ES.txt b/data/coll/ca_ES.txt
index bb6bdfa..a5ed131 100644
--- a/data/coll/ca_ES.txt
+++ b/data/coll/ca_ES.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/chr.txt b/data/coll/chr.txt
index 7a9273d..b244634 100644
--- a/data/coll/chr.txt
+++ b/data/coll/chr.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/chr_US.txt b/data/coll/chr_US.txt
index e1a8b95..122e80d 100644
--- a/data/coll/chr_US.txt
+++ b/data/coll/chr_US.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/colfiles.mk b/data/coll/colfiles.mk
index 5280841..fbea7ad 100644
--- a/data/coll/colfiles.mk
+++ b/data/coll/colfiles.mk
@@ -1,6 +1,6 @@
-# * Copyright (C) 1998-2012, International Business Machines
+# * Copyright (C) 1998-2013, International Business Machines
# * Corporation and others. All Rights Reserved.
-COLLATION_CLDR_VERSION = 22.1.1
+COLLATION_CLDR_VERSION = 23
# A list of txt's to build
# Note:
#
@@ -27,11 +27,10 @@
# Aliases without a corresponding xx.xml file (see icu-config.xml & build.xml)
COLLATION_SYNTHETIC_ALIAS = de_.txt de__PHONEBOOK.txt es_.txt es__TRADITIONAL.txt\
- hi_.txt hi__DIRECT.txt in.txt in_ID.txt iw.txt\
- iw_IL.txt mo.txt no.txt no_NO.txt pa_IN.txt\
- sh.txt sh_BA.txt sh_YU.txt sr_BA.txt sr_ME.txt\
- sr_RS.txt zh_.txt zh_CN.txt zh_HK.txt zh_MO.txt\
- zh_SG.txt zh_TW.txt zh_TW_STROKE.txt zh__PINYIN.txt
+ in.txt in_ID.txt iw.txt iw_IL.txt mo.txt\
+ no.txt no_NO.txt pa_IN.txt sh.txt sh_BA.txt\
+ sh_YU.txt sr_BA.txt sr_ME.txt sr_RS.txt zh_CN.txt\
+ zh_HK.txt zh_MO.txt zh_SG.txt zh_TW.txt
# All aliases (to not be included under 'installed'), but not including root.
@@ -86,23 +85,24 @@
ka_GE.txt kk_KZ.txt kl_GL.txt km_KH.txt kn_IN.txt\
ko_KP.txt ko_KR.txt kok_IN.txt ln_AO.txt ln_CD.txt\
ln_CF.txt ln_CG.txt lt_LT.txt lv_LV.txt mk_MK.txt\
- ml_IN.txt mr_IN.txt ms.txt ms_BN.txt ms_MY.txt\
- ms_SG.txt mt_MT.txt my_MM.txt nb_NO.txt nl.txt\
- nl_AW.txt nl_BE.txt nl_CW.txt nl_NL.txt nl_SR.txt\
- nl_SX.txt nn_NO.txt om_ET.txt om_KE.txt or_IN.txt\
- pa_Arab.txt pa_Arab_PK.txt pa_Guru.txt pa_Guru_IN.txt pl_PL.txt\
- ps_AF.txt pt.txt pt_AO.txt pt_BR.txt pt_CV.txt\
- pt_GW.txt pt_MO.txt pt_MZ.txt pt_PT.txt pt_ST.txt\
- pt_TL.txt ro_MD.txt ro_RO.txt ru_BY.txt ru_KG.txt\
- ru_KZ.txt ru_MD.txt ru_RU.txt ru_UA.txt si_LK.txt\
- sk_SK.txt sl_SI.txt sq_AL.txt sq_MK.txt sr_Cyrl.txt\
- sr_Cyrl_BA.txt sr_Cyrl_ME.txt sr_Cyrl_RS.txt sr_Latn_BA.txt sr_Latn_ME.txt\
- sr_Latn_RS.txt sv_AX.txt sv_FI.txt sv_SE.txt sw.txt\
- sw_KE.txt sw_TZ.txt sw_UG.txt ta_IN.txt ta_LK.txt\
- ta_MY.txt ta_SG.txt te_IN.txt th_TH.txt to_TO.txt\
- tr_CY.txt tr_TR.txt uk_UA.txt ur_IN.txt ur_PK.txt\
- vi_VN.txt yo_NG.txt zh_Hans.txt zh_Hans_CN.txt zh_Hans_SG.txt\
- zh_Hant_HK.txt zh_Hant_MO.txt zh_Hant_TW.txt zu.txt zu_ZA.txt
+ ml_IN.txt mr_IN.txt ms.txt ms_Latn.txt ms_Latn_BN.txt\
+ ms_Latn_MY.txt ms_Latn_SG.txt mt_MT.txt my_MM.txt nb_NO.txt\
+ nl.txt nl_AW.txt nl_BE.txt nl_CW.txt nl_NL.txt\
+ nl_SR.txt nl_SX.txt nn_NO.txt om_ET.txt om_KE.txt\
+ or_IN.txt pa_Arab.txt pa_Arab_PK.txt pa_Guru.txt pa_Guru_IN.txt\
+ pl_PL.txt ps_AF.txt pt.txt pt_AO.txt pt_BR.txt\
+ pt_CV.txt pt_GW.txt pt_MO.txt pt_MZ.txt pt_PT.txt\
+ pt_ST.txt pt_TL.txt ro_MD.txt ro_RO.txt ru_BY.txt\
+ ru_KG.txt ru_KZ.txt ru_MD.txt ru_RU.txt ru_UA.txt\
+ si_LK.txt sk_SK.txt sl_SI.txt sq_AL.txt sq_MK.txt\
+ sr_Cyrl.txt sr_Cyrl_BA.txt sr_Cyrl_ME.txt sr_Cyrl_RS.txt sr_Latn_BA.txt\
+ sr_Latn_ME.txt sr_Latn_RS.txt sv_AX.txt sv_FI.txt sv_SE.txt\
+ sw.txt sw_KE.txt sw_TZ.txt sw_UG.txt ta_IN.txt\
+ ta_LK.txt ta_MY.txt ta_SG.txt te_IN.txt th_TH.txt\
+ to_TO.txt tr_CY.txt tr_TR.txt uk_UA.txt ur_IN.txt\
+ ur_PK.txt vi_VN.txt yo_NG.txt zh_Hans.txt zh_Hans_CN.txt\
+ zh_Hans_SG.txt zh_Hant_HK.txt zh_Hant_MO.txt zh_Hant_TW.txt zu.txt\
+ zu_ZA.txt
# Ordinary resources
diff --git a/data/coll/cs.txt b/data/coll/cs.txt
index 620a4e0..580a6ba 100644
--- a/data/coll/cs.txt
+++ b/data/coll/cs.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/cs.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/cs.xml
*/
cs{
- Version{"2.0.63.65"}
+ Version{"2.0.82.42"}
collations{
search{
Sequence{
- " [normalization on ][suppressContractions [เ-ไ ເ-ໄ] ]"
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
"&'='<'\u2260'&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
"&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
"&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
@@ -74,11 +74,11 @@
"&Y<ý<<<Ý"
"&Z<ž<<<Ž"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
Sequence{"&C<č<<<Č&H<ch<<<cH<<<Ch<<<CH&R<ř<<<Ř&S<š<<<Š&Z<ž<<<Ž"}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/cs_CZ.txt b/data/coll/cs_CZ.txt
index 61f870e..71e7b56 100644
--- a/data/coll/cs_CZ.txt
+++ b/data/coll/cs_CZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/cy.txt b/data/coll/cy.txt
index 3323fa8..79434fb 100644
--- a/data/coll/cy.txt
+++ b/data/coll/cy.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/cy.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/cy.xml
*/
cy{
- Version{"2.0.61.82"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -23,7 +23,7 @@
"&R<rh<<<Rh<<<RH"
"&T<th<<<Th<<<TH"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/cy_GB.txt b/data/coll/cy_GB.txt
index 801f4f3..2b7d9dd 100644
--- a/data/coll/cy_GB.txt
+++ b/data/coll/cy_GB.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/da.txt b/data/coll/da.txt
index 8edef8b..4d4ebd4 100644
--- a/data/coll/da.txt
+++ b/data/coll/da.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/da.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/da.xml
*/
da{
- Version{"2.0.63.65"}
+ Version{"2.0.82.42"}
collations{
search{
Sequence{
- " [normalization on ][suppressContractions [เ-ไ ເ-ໄ] ]"
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
"&'='<'\u2260'&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
"&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
"&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
@@ -67,11 +67,11 @@
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<"
"<<aa<<<Aa<<<AA"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
Sequence{
- " [caseFirst upper ]"
+ " [caseFirst upper]"
"&D<<đ<<<Đ<<ð<<<Ð"
"&t<<<þ/h"
"&T<<<Þ/H"
@@ -79,7 +79,7 @@
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<"
"<<aa<<<Aa<<<AA"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/da_DK.txt b/data/coll/da_DK.txt
index 6ce9689..f3eacb9 100644
--- a/data/coll/da_DK.txt
+++ b/data/coll/da_DK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/de.txt b/data/coll/de.txt
index 2bd8250..b92e38c 100644
--- a/data/coll/de.txt
+++ b/data/coll/de.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/de.xml
@@ -10,15 +10,15 @@
* ICU <specials> source: <path>/xml/collation/de.xml
*/
de{
- Version{"2.0.63.65"}
+ Version{"2.0.82.42"}
collations{
phonebook{
Sequence{"&AE<<ä<<<Ä&OE<<ö<<<Ö&UE<<ü<<<Ü"}
- Version{"22.1.1"}
+ Version{"23"}
}
search{
Sequence{
- " [normalization on ][suppressContractions [เ-ไ ເ-ໄ] ]"
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
"&'='<'\u2260'&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
"&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
"&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
@@ -68,11 +68,11 @@
"&OE<<ö<<<Ö"
"&UE<<ü<<<Ü"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
Sequence{""}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/de_.txt b/data/coll/de_.txt
index d3fb318..87314df 100644
--- a/data/coll/de_.txt
+++ b/data/coll/de_.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/de_AT.txt b/data/coll/de_AT.txt
index 55e9f59..16d6505 100644
--- a/data/coll/de_AT.txt
+++ b/data/coll/de_AT.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/de_BE.txt b/data/coll/de_BE.txt
index e8bb66e..4a1bfb6 100644
--- a/data/coll/de_BE.txt
+++ b/data/coll/de_BE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/de_CH.txt b/data/coll/de_CH.txt
index 46efe38..fbbca6e 100644
--- a/data/coll/de_CH.txt
+++ b/data/coll/de_CH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/de_DE.txt b/data/coll/de_DE.txt
index 61cc5bb..5c7b443 100644
--- a/data/coll/de_DE.txt
+++ b/data/coll/de_DE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/de_LI.txt b/data/coll/de_LI.txt
index 53c9239..54dce5f 100644
--- a/data/coll/de_LI.txt
+++ b/data/coll/de_LI.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/de_LU.txt b/data/coll/de_LU.txt
index cad0910..6000a92 100644
--- a/data/coll/de_LU.txt
+++ b/data/coll/de_LU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/de__PHONEBOOK.txt b/data/coll/de__PHONEBOOK.txt
index 542ab20..1a752c4 100644
--- a/data/coll/de__PHONEBOOK.txt
+++ b/data/coll/de__PHONEBOOK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/dz.txt b/data/coll/dz.txt
index c8bed65..8e7ffef 100644
--- a/data/coll/dz.txt
+++ b/data/coll/dz.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/dz.xml
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/collation/dz.xml
*/
dz{
- Version{"2.0.76.11"}
+ Version{"2.0.82.42"}
}
diff --git a/data/coll/ee.txt b/data/coll/ee.txt
index 4962ce3..8111721 100755
--- a/data/coll/ee.txt
+++ b/data/coll/ee.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/ee.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/ee.xml
*/
ee{
- Version{"2.0.63.75"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -26,7 +26,7 @@
"&T<ts<<<Ts<<<TS"
"&V<ʋ<<<Ʋ"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/ee_GH.txt b/data/coll/ee_GH.txt
index be1fa27..00432d3 100755
--- a/data/coll/ee_GH.txt
+++ b/data/coll/ee_GH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ee_TG.txt b/data/coll/ee_TG.txt
index 936bcde..9a1a757 100755
--- a/data/coll/ee_TG.txt
+++ b/data/coll/ee_TG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/el.txt b/data/coll/el.txt
index c7577fe..ad0983e 100644
--- a/data/coll/el.txt
+++ b/data/coll/el.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/el.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/el.xml
*/
el{
- Version{"2.0.50.60"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{" [normalization on] [reorder Grek]"}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/el_CY.txt b/data/coll/el_CY.txt
index a4b1842..16726cf 100644
--- a/data/coll/el_CY.txt
+++ b/data/coll/el_CY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/el_GR.txt b/data/coll/el_GR.txt
index 668f1ed..2cdbffa 100644
--- a/data/coll/el_GR.txt
+++ b/data/coll/el_GR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en.txt b/data/coll/en.txt
index fa655f3..249598a 100644
--- a/data/coll/en.txt
+++ b/data/coll/en.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/en.xml
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/collation/en.xml
*/
en{
- Version{"2.0.76.11"}
+ Version{"2.0.82.42"}
}
diff --git a/data/coll/en_150.txt b/data/coll/en_150.txt
index 623bb4f..927b20c 100755
--- a/data/coll/en_150.txt
+++ b/data/coll/en_150.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_AG.txt b/data/coll/en_AG.txt
index 6780ef5..d5b417e 100755
--- a/data/coll/en_AG.txt
+++ b/data/coll/en_AG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_AS.txt b/data/coll/en_AS.txt
index 0fef755..a9c6132 100644
--- a/data/coll/en_AS.txt
+++ b/data/coll/en_AS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_AU.txt b/data/coll/en_AU.txt
index a3d3b81..bfc7ce2 100644
--- a/data/coll/en_AU.txt
+++ b/data/coll/en_AU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_BB.txt b/data/coll/en_BB.txt
index c6d36cd..79af011 100755
--- a/data/coll/en_BB.txt
+++ b/data/coll/en_BB.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_BE.txt b/data/coll/en_BE.txt
index 4ffb565..6441ca2 100644
--- a/data/coll/en_BE.txt
+++ b/data/coll/en_BE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_BM.txt b/data/coll/en_BM.txt
index 0a76867..dffed6c 100755
--- a/data/coll/en_BM.txt
+++ b/data/coll/en_BM.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_BS.txt b/data/coll/en_BS.txt
index 317e9a6..a16a23c 100755
--- a/data/coll/en_BS.txt
+++ b/data/coll/en_BS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_BW.txt b/data/coll/en_BW.txt
index 056c384..940790d 100644
--- a/data/coll/en_BW.txt
+++ b/data/coll/en_BW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_BZ.txt b/data/coll/en_BZ.txt
index 51c7905..de36512 100644
--- a/data/coll/en_BZ.txt
+++ b/data/coll/en_BZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_CA.txt b/data/coll/en_CA.txt
index 0248206..2ef7b0e 100644
--- a/data/coll/en_CA.txt
+++ b/data/coll/en_CA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_CM.txt b/data/coll/en_CM.txt
index eaa36cb..7fb8007 100755
--- a/data/coll/en_CM.txt
+++ b/data/coll/en_CM.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_DM.txt b/data/coll/en_DM.txt
index 8cf898c..c523b8e 100755
--- a/data/coll/en_DM.txt
+++ b/data/coll/en_DM.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_FJ.txt b/data/coll/en_FJ.txt
index 658e7b1..2594d0c 100755
--- a/data/coll/en_FJ.txt
+++ b/data/coll/en_FJ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_FM.txt b/data/coll/en_FM.txt
index 73e5371..660276f 100755
--- a/data/coll/en_FM.txt
+++ b/data/coll/en_FM.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_GB.txt b/data/coll/en_GB.txt
index cc87d02..3f0ddef 100644
--- a/data/coll/en_GB.txt
+++ b/data/coll/en_GB.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_GD.txt b/data/coll/en_GD.txt
index 5262214..bc625e7 100755
--- a/data/coll/en_GD.txt
+++ b/data/coll/en_GD.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_GG.txt b/data/coll/en_GG.txt
index 5b9ea69..61355eb 100755
--- a/data/coll/en_GG.txt
+++ b/data/coll/en_GG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_GH.txt b/data/coll/en_GH.txt
index 5ed99d2..a9bdfd8 100755
--- a/data/coll/en_GH.txt
+++ b/data/coll/en_GH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_GI.txt b/data/coll/en_GI.txt
index 73448ed..739f553 100755
--- a/data/coll/en_GI.txt
+++ b/data/coll/en_GI.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_GM.txt b/data/coll/en_GM.txt
index 1bce536..520ab65 100755
--- a/data/coll/en_GM.txt
+++ b/data/coll/en_GM.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_GU.txt b/data/coll/en_GU.txt
index 34a0ea7..26b163a 100644
--- a/data/coll/en_GU.txt
+++ b/data/coll/en_GU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_HK.txt b/data/coll/en_HK.txt
index c0acba2..f1d7eb6 100644
--- a/data/coll/en_HK.txt
+++ b/data/coll/en_HK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_IE.txt b/data/coll/en_IE.txt
index 507adb0..1fd578b 100644
--- a/data/coll/en_IE.txt
+++ b/data/coll/en_IE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_IM.txt b/data/coll/en_IM.txt
index ee04975..562bc7b 100755
--- a/data/coll/en_IM.txt
+++ b/data/coll/en_IM.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_IN.txt b/data/coll/en_IN.txt
index 34bfa5d..3f8b7cd 100644
--- a/data/coll/en_IN.txt
+++ b/data/coll/en_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_JE.txt b/data/coll/en_JE.txt
index 98dcf06..9704111 100755
--- a/data/coll/en_JE.txt
+++ b/data/coll/en_JE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_JM.txt b/data/coll/en_JM.txt
index cb5b316..bfd8657 100644
--- a/data/coll/en_JM.txt
+++ b/data/coll/en_JM.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_KE.txt b/data/coll/en_KE.txt
index 667af75..32eb827 100755
--- a/data/coll/en_KE.txt
+++ b/data/coll/en_KE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_KI.txt b/data/coll/en_KI.txt
index 613c0fe..8d83d40 100755
--- a/data/coll/en_KI.txt
+++ b/data/coll/en_KI.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_KN.txt b/data/coll/en_KN.txt
index dfc2ec8..b7a6f5d 100755
--- a/data/coll/en_KN.txt
+++ b/data/coll/en_KN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_KY.txt b/data/coll/en_KY.txt
index 5d5cd77..2b61965 100755
--- a/data/coll/en_KY.txt
+++ b/data/coll/en_KY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_LC.txt b/data/coll/en_LC.txt
index 02ac9d2..62ac043 100755
--- a/data/coll/en_LC.txt
+++ b/data/coll/en_LC.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_LR.txt b/data/coll/en_LR.txt
index 2cb1bef..c5cc823 100755
--- a/data/coll/en_LR.txt
+++ b/data/coll/en_LR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_LS.txt b/data/coll/en_LS.txt
index 69b1393..e38edd2 100755
--- a/data/coll/en_LS.txt
+++ b/data/coll/en_LS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_MG.txt b/data/coll/en_MG.txt
index 17dc6e8..17cb036 100755
--- a/data/coll/en_MG.txt
+++ b/data/coll/en_MG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_MH.txt b/data/coll/en_MH.txt
index 091b990..988daea 100644
--- a/data/coll/en_MH.txt
+++ b/data/coll/en_MH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_MP.txt b/data/coll/en_MP.txt
index a489e62..ffeb66f 100644
--- a/data/coll/en_MP.txt
+++ b/data/coll/en_MP.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_MT.txt b/data/coll/en_MT.txt
index 8e6f01c..201b6cb 100644
--- a/data/coll/en_MT.txt
+++ b/data/coll/en_MT.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_MU.txt b/data/coll/en_MU.txt
index cbf3977..89c9615 100644
--- a/data/coll/en_MU.txt
+++ b/data/coll/en_MU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_MW.txt b/data/coll/en_MW.txt
index f6e602e..370b222 100755
--- a/data/coll/en_MW.txt
+++ b/data/coll/en_MW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_NA.txt b/data/coll/en_NA.txt
index e2a0bd7..4ef182e 100644
--- a/data/coll/en_NA.txt
+++ b/data/coll/en_NA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_NG.txt b/data/coll/en_NG.txt
index d9d8ad8..92b21b4 100755
--- a/data/coll/en_NG.txt
+++ b/data/coll/en_NG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_NZ.txt b/data/coll/en_NZ.txt
index 2112d48..b34b43a 100644
--- a/data/coll/en_NZ.txt
+++ b/data/coll/en_NZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_PG.txt b/data/coll/en_PG.txt
index 72484ab..77bf0d2 100755
--- a/data/coll/en_PG.txt
+++ b/data/coll/en_PG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_PH.txt b/data/coll/en_PH.txt
index 943c95d..93907c8 100644
--- a/data/coll/en_PH.txt
+++ b/data/coll/en_PH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_PK.txt b/data/coll/en_PK.txt
index f1b2621..4781c9f 100644
--- a/data/coll/en_PK.txt
+++ b/data/coll/en_PK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_PR.txt b/data/coll/en_PR.txt
index e4c7f55..aa08e9e 100755
--- a/data/coll/en_PR.txt
+++ b/data/coll/en_PR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_PW.txt b/data/coll/en_PW.txt
index fb7f0c9..915e5e3 100755
--- a/data/coll/en_PW.txt
+++ b/data/coll/en_PW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_SB.txt b/data/coll/en_SB.txt
index e4d6c48..8cabb1d 100755
--- a/data/coll/en_SB.txt
+++ b/data/coll/en_SB.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_SC.txt b/data/coll/en_SC.txt
index 5f9e5fc..b72dbed 100755
--- a/data/coll/en_SC.txt
+++ b/data/coll/en_SC.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_SG.txt b/data/coll/en_SG.txt
index f0e05d6..ccfa931 100644
--- a/data/coll/en_SG.txt
+++ b/data/coll/en_SG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_SL.txt b/data/coll/en_SL.txt
index 69f9502..2e6a0eb 100755
--- a/data/coll/en_SL.txt
+++ b/data/coll/en_SL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_SS.txt b/data/coll/en_SS.txt
index 9b582e1..5d967e9 100755
--- a/data/coll/en_SS.txt
+++ b/data/coll/en_SS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_TC.txt b/data/coll/en_TC.txt
index ebb3038..0775679 100755
--- a/data/coll/en_TC.txt
+++ b/data/coll/en_TC.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_TO.txt b/data/coll/en_TO.txt
index c43e9db..050acd4 100755
--- a/data/coll/en_TO.txt
+++ b/data/coll/en_TO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_TT.txt b/data/coll/en_TT.txt
index cf54d92..3e63ea4 100644
--- a/data/coll/en_TT.txt
+++ b/data/coll/en_TT.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_TZ.txt b/data/coll/en_TZ.txt
index 4e95709..bf88bc9 100755
--- a/data/coll/en_TZ.txt
+++ b/data/coll/en_TZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_UG.txt b/data/coll/en_UG.txt
index eb831cf..e3e2ad0 100755
--- a/data/coll/en_UG.txt
+++ b/data/coll/en_UG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_UM.txt b/data/coll/en_UM.txt
index c536888..9207c43 100644
--- a/data/coll/en_UM.txt
+++ b/data/coll/en_UM.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_US.txt b/data/coll/en_US.txt
index 0378c90..a54ef7a 100644
--- a/data/coll/en_US.txt
+++ b/data/coll/en_US.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/en_US.xml
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/collation/en_US.xml
*/
en_US{
- Version{"2.0.58.51"}
+ Version{"2.0.82.42"}
}
diff --git a/data/coll/en_US_POSIX.txt b/data/coll/en_US_POSIX.txt
index 021214d..7faf12f 100644
--- a/data/coll/en_US_POSIX.txt
+++ b/data/coll/en_US_POSIX.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/en_US_POSIX.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/en_US_POSIX.xml
*/
en_US_POSIX{
- Version{"2.0.58.51"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{"&A<*'\u0020'-'/'0-'@'A-Z'['-'`'a-z'{'-'\u007F'"}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/en_VC.txt b/data/coll/en_VC.txt
index f4740fe..9b13eff 100755
--- a/data/coll/en_VC.txt
+++ b/data/coll/en_VC.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_VG.txt b/data/coll/en_VG.txt
index 7cfd137..f762ff9 100755
--- a/data/coll/en_VG.txt
+++ b/data/coll/en_VG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_VI.txt b/data/coll/en_VI.txt
index af483d6..7b302f6 100644
--- a/data/coll/en_VI.txt
+++ b/data/coll/en_VI.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_VU.txt b/data/coll/en_VU.txt
index 97915b7..aa59d1b 100755
--- a/data/coll/en_VU.txt
+++ b/data/coll/en_VU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_WS.txt b/data/coll/en_WS.txt
index 084f503..c3d6522 100755
--- a/data/coll/en_WS.txt
+++ b/data/coll/en_WS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_ZA.txt b/data/coll/en_ZA.txt
index 4845270..f393373 100644
--- a/data/coll/en_ZA.txt
+++ b/data/coll/en_ZA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_ZM.txt b/data/coll/en_ZM.txt
index 9e219dc..2c2c723 100755
--- a/data/coll/en_ZM.txt
+++ b/data/coll/en_ZM.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/en_ZW.txt b/data/coll/en_ZW.txt
index aca5678..2aadbd0 100644
--- a/data/coll/en_ZW.txt
+++ b/data/coll/en_ZW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/eo.txt b/data/coll/eo.txt
index e52552e..3316864 100644
--- a/data/coll/eo.txt
+++ b/data/coll/eo.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/eo.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/eo.xml
*/
eo{
- Version{"2.0.41.26"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{"&C<ĉ<<<Ĉ&G<ĝ<<<Ĝ&H<ĥ<<<Ĥ&J<ĵ<<<Ĵ&S<ŝ<<<Ŝ&U<ŭ<<<Ŭ"}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/es.txt b/data/coll/es.txt
index fcff085..6b2c4b2 100644
--- a/data/coll/es.txt
+++ b/data/coll/es.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/es.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/es.xml
*/
es{
- Version{"2.0.76.11"}
+ Version{"2.0.82.42"}
collations{
search{
Sequence{
- " [normalization on ][suppressContractions [เ-ไ ເ-ໄ] ]"
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
"&'='<'\u2260'&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
"&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
"&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
@@ -62,15 +62,15 @@
"&ᅮᅵ=ᅱ"
"&N<ñ<<<Ñ"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
Sequence{"&N<ñ<<<Ñ"}
- Version{"22.1.1"}
+ Version{"23"}
}
traditional{
Sequence{"&N<ñ<<<Ñ&C<ch<<<Ch<<<CH&l<ll<<<Ll<<<LL"}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/es_.txt b/data/coll/es_.txt
index d966403..563559e 100644
--- a/data/coll/es_.txt
+++ b/data/coll/es_.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_419.txt b/data/coll/es_419.txt
index f3633e8..514daa7 100644
--- a/data/coll/es_419.txt
+++ b/data/coll/es_419.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_AR.txt b/data/coll/es_AR.txt
index d1ecddc..f366db5 100644
--- a/data/coll/es_AR.txt
+++ b/data/coll/es_AR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_BO.txt b/data/coll/es_BO.txt
index 51368f4..21f143e 100644
--- a/data/coll/es_BO.txt
+++ b/data/coll/es_BO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_CL.txt b/data/coll/es_CL.txt
index d6b737a..9b2e7a7 100644
--- a/data/coll/es_CL.txt
+++ b/data/coll/es_CL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_CO.txt b/data/coll/es_CO.txt
index 70539f4..8302f1f 100644
--- a/data/coll/es_CO.txt
+++ b/data/coll/es_CO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_CR.txt b/data/coll/es_CR.txt
index 6b3c68b..0493fc5 100644
--- a/data/coll/es_CR.txt
+++ b/data/coll/es_CR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_CU.txt b/data/coll/es_CU.txt
index 6a1985e..8b8d55c 100755
--- a/data/coll/es_CU.txt
+++ b/data/coll/es_CU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_DO.txt b/data/coll/es_DO.txt
index bc21847..5d47de9 100644
--- a/data/coll/es_DO.txt
+++ b/data/coll/es_DO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_EA.txt b/data/coll/es_EA.txt
index 0bcc32b..a764172 100755
--- a/data/coll/es_EA.txt
+++ b/data/coll/es_EA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_EC.txt b/data/coll/es_EC.txt
index 97dee66..0d88efe 100644
--- a/data/coll/es_EC.txt
+++ b/data/coll/es_EC.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_ES.txt b/data/coll/es_ES.txt
index 982584f..eaef78f 100644
--- a/data/coll/es_ES.txt
+++ b/data/coll/es_ES.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_GQ.txt b/data/coll/es_GQ.txt
index dc2185e..af3b7aa 100644
--- a/data/coll/es_GQ.txt
+++ b/data/coll/es_GQ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_GT.txt b/data/coll/es_GT.txt
index 4881fef..1221f04 100644
--- a/data/coll/es_GT.txt
+++ b/data/coll/es_GT.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_HN.txt b/data/coll/es_HN.txt
index 4152540..5b6cde9 100644
--- a/data/coll/es_HN.txt
+++ b/data/coll/es_HN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_IC.txt b/data/coll/es_IC.txt
index f9bb410..cafd4c4 100755
--- a/data/coll/es_IC.txt
+++ b/data/coll/es_IC.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_MX.txt b/data/coll/es_MX.txt
index 9e868f6..3602668 100644
--- a/data/coll/es_MX.txt
+++ b/data/coll/es_MX.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_NI.txt b/data/coll/es_NI.txt
index 843f271..022c182 100644
--- a/data/coll/es_NI.txt
+++ b/data/coll/es_NI.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_PA.txt b/data/coll/es_PA.txt
index 01a4686..0d25c3d 100644
--- a/data/coll/es_PA.txt
+++ b/data/coll/es_PA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_PE.txt b/data/coll/es_PE.txt
index 04c1199..f0ef887 100644
--- a/data/coll/es_PE.txt
+++ b/data/coll/es_PE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_PH.txt b/data/coll/es_PH.txt
index b609809..dd30fd7 100755
--- a/data/coll/es_PH.txt
+++ b/data/coll/es_PH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_PR.txt b/data/coll/es_PR.txt
index dd600ed..51610b0 100644
--- a/data/coll/es_PR.txt
+++ b/data/coll/es_PR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_PY.txt b/data/coll/es_PY.txt
index 5627ac5..0dd79d4 100644
--- a/data/coll/es_PY.txt
+++ b/data/coll/es_PY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_SV.txt b/data/coll/es_SV.txt
index ef92a4c..0353aa8 100644
--- a/data/coll/es_SV.txt
+++ b/data/coll/es_SV.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_US.txt b/data/coll/es_US.txt
index 15290a1..591bd2d 100644
--- a/data/coll/es_US.txt
+++ b/data/coll/es_US.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_UY.txt b/data/coll/es_UY.txt
index f552615..33216e5 100644
--- a/data/coll/es_UY.txt
+++ b/data/coll/es_UY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es_VE.txt b/data/coll/es_VE.txt
index 3e9693a..7658703 100644
--- a/data/coll/es_VE.txt
+++ b/data/coll/es_VE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/es__TRADITIONAL.txt b/data/coll/es__TRADITIONAL.txt
index f6b323e..6895fa5 100644
--- a/data/coll/es__TRADITIONAL.txt
+++ b/data/coll/es__TRADITIONAL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/et.txt b/data/coll/et.txt
index 7db667b..a148fc5 100644
--- a/data/coll/et.txt
+++ b/data/coll/et.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/et.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/et.xml
*/
et{
- Version{"2.0.61.82"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -18,7 +18,7 @@
"&v<<w<<<W"
"&[before 1]X<õ<<<Õ<ä<<<Ä<ö<<<Ö<ü<<<Ü"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/et_EE.txt b/data/coll/et_EE.txt
index e630316..64077ab 100644
--- a/data/coll/et_EE.txt
+++ b/data/coll/et_EE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fa.txt b/data/coll/fa.txt
index 393eaff..bce0c5f 100644
--- a/data/coll/fa.txt
+++ b/data/coll/fa.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/fa.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/fa.xml
*/
fa{
- Version{"2.0.41.26"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -22,7 +22,7 @@
"&ۏ<ه<<*ەہةۃ<<ۀ<<*ھ"
"&ی<<*ىےيېۑۍێ"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/fa_AF.txt b/data/coll/fa_AF.txt
index b4f3a1d..2ee6546 100644
--- a/data/coll/fa_AF.txt
+++ b/data/coll/fa_AF.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/fa_AF.xml
@@ -10,6 +10,11 @@
* ICU <specials> source: <path>/xml/collation/fa_AF.xml
*/
fa_AF{
- Version{"2.0.41.26"}
- collations:alias{"ps/collations"}
+ Version{"2.0.82.42"}
+ collations{
+ standard{
+ Sequence{"[import ps]"}
+ Version{"23"}
+ }
+ }
}
diff --git a/data/coll/fa_IR.txt b/data/coll/fa_IR.txt
index 2008116..05b0e87 100644
--- a/data/coll/fa_IR.txt
+++ b/data/coll/fa_IR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fi.txt b/data/coll/fi.txt
index 130f2dc..ea3ca6d 100644
--- a/data/coll/fi.txt
+++ b/data/coll/fi.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/fi.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/fi.xml
*/
fi{
- Version{"2.0.63.65"}
+ Version{"2.0.82.42"}
collations{
default{"phonebook"}
phonebook{
@@ -23,11 +23,11 @@
"&Z'\u0020'̵<<ʒ<<<Ʒ"
"&[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<ö<<<Ö<<ø<<<Ø"
}
- Version{"22.1.1"}
+ Version{"23"}
}
search{
Sequence{
- " [normalization on ][suppressContractions [เ-ไ ເ-ໄ] ]"
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
"&'='<'\u2260'&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
"&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
"&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
@@ -80,7 +80,7 @@
"&Y<<ü<<<Ü<<ű<<<Ű"
"&[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<õ<<<Õ<<œ<<<Œ"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
Sequence{
@@ -91,7 +91,7 @@
"&Y<<ü<<<Ü<<ű<<<Ű"
"&[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<õ<<<Õ<<œ<<<Œ"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/fi_FI.txt b/data/coll/fi_FI.txt
index 4b6d548..fd6890d 100644
--- a/data/coll/fi_FI.txt
+++ b/data/coll/fi_FI.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fil.txt b/data/coll/fil.txt
index 048187c..761698e 100755
--- a/data/coll/fil.txt
+++ b/data/coll/fil.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/fil.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/fil.xml
*/
fil{
- Version{"2.0.50.60"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{"&N<ñ<<<Ñ<ng<<<Ng<<<NG"}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/fil_PH.txt b/data/coll/fil_PH.txt
index 05b68ba..f955a6d 100644
--- a/data/coll/fil_PH.txt
+++ b/data/coll/fil_PH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fo.txt b/data/coll/fo.txt
index 50171d2..6f17bf0 100644
--- a/data/coll/fo.txt
+++ b/data/coll/fo.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/fo.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/fo.xml
*/
fo{
- Version{"2.0.63.65"}
+ Version{"2.0.82.42"}
collations{
search{
Sequence{
- " [normalization on ][suppressContractions [เ-ไ ເ-ໄ] ]"
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
"&'='<'\u2260'&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
"&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
"&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
@@ -67,7 +67,7 @@
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<"
"<<aa<<<Aa<<<AA"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
Sequence{
@@ -78,7 +78,7 @@
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<"
"<<aa<<<Aa<<<AA"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/fo_FO.txt b/data/coll/fo_FO.txt
index 138511b..61091b2 100644
--- a/data/coll/fo_FO.txt
+++ b/data/coll/fo_FO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr.txt b/data/coll/fr.txt
index bdf49cc..e10fe83 100644
--- a/data/coll/fr.txt
+++ b/data/coll/fr.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/fr.xml
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/collation/fr.xml
*/
fr{
- Version{"2.0.76.11"}
+ Version{"2.0.82.42"}
}
diff --git a/data/coll/fr_BE.txt b/data/coll/fr_BE.txt
index f576bfe..30cb709 100644
--- a/data/coll/fr_BE.txt
+++ b/data/coll/fr_BE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_BF.txt b/data/coll/fr_BF.txt
index 63f6898..34e54b5 100644
--- a/data/coll/fr_BF.txt
+++ b/data/coll/fr_BF.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_BI.txt b/data/coll/fr_BI.txt
index 0d4f147..920cc59 100644
--- a/data/coll/fr_BI.txt
+++ b/data/coll/fr_BI.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_BJ.txt b/data/coll/fr_BJ.txt
index 0bb2498..d7afedb 100644
--- a/data/coll/fr_BJ.txt
+++ b/data/coll/fr_BJ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_BL.txt b/data/coll/fr_BL.txt
index acf368e..4b86083 100644
--- a/data/coll/fr_BL.txt
+++ b/data/coll/fr_BL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_CA.txt b/data/coll/fr_CA.txt
index 599ed60..7ed4782 100644
--- a/data/coll/fr_CA.txt
+++ b/data/coll/fr_CA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/fr_CA.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/fr_CA.xml
*/
fr_CA{
- Version{"2.0.58.51"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{" [backwards 2]"}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/fr_CD.txt b/data/coll/fr_CD.txt
index 13573c6..e819c9e 100644
--- a/data/coll/fr_CD.txt
+++ b/data/coll/fr_CD.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_CF.txt b/data/coll/fr_CF.txt
index 22aa95a..3bcbfdc 100644
--- a/data/coll/fr_CF.txt
+++ b/data/coll/fr_CF.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_CG.txt b/data/coll/fr_CG.txt
index c6412f6..759fc48 100644
--- a/data/coll/fr_CG.txt
+++ b/data/coll/fr_CG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_CH.txt b/data/coll/fr_CH.txt
index fbeb094..b6ba768 100644
--- a/data/coll/fr_CH.txt
+++ b/data/coll/fr_CH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_CI.txt b/data/coll/fr_CI.txt
index b530ede..9a2b8fa 100644
--- a/data/coll/fr_CI.txt
+++ b/data/coll/fr_CI.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_CM.txt b/data/coll/fr_CM.txt
index 54ab2ea..7a88479 100644
--- a/data/coll/fr_CM.txt
+++ b/data/coll/fr_CM.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_DJ.txt b/data/coll/fr_DJ.txt
index 220f700..6d8f58b 100644
--- a/data/coll/fr_DJ.txt
+++ b/data/coll/fr_DJ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_DZ.txt b/data/coll/fr_DZ.txt
index 44f5ef1..da830c1 100755
--- a/data/coll/fr_DZ.txt
+++ b/data/coll/fr_DZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_FR.txt b/data/coll/fr_FR.txt
index cced34d..16527c7 100644
--- a/data/coll/fr_FR.txt
+++ b/data/coll/fr_FR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_GA.txt b/data/coll/fr_GA.txt
index aa126f8..b6d1b32 100644
--- a/data/coll/fr_GA.txt
+++ b/data/coll/fr_GA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_GN.txt b/data/coll/fr_GN.txt
index 8c9287d..609510b 100644
--- a/data/coll/fr_GN.txt
+++ b/data/coll/fr_GN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_GP.txt b/data/coll/fr_GP.txt
index c317fcd..40b106b 100644
--- a/data/coll/fr_GP.txt
+++ b/data/coll/fr_GP.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_GQ.txt b/data/coll/fr_GQ.txt
index 8355feb..dc9556f 100644
--- a/data/coll/fr_GQ.txt
+++ b/data/coll/fr_GQ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_HT.txt b/data/coll/fr_HT.txt
index 0b40c9c..a9b69ac 100755
--- a/data/coll/fr_HT.txt
+++ b/data/coll/fr_HT.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_KM.txt b/data/coll/fr_KM.txt
index 784a127..cb5d5cd 100644
--- a/data/coll/fr_KM.txt
+++ b/data/coll/fr_KM.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_LU.txt b/data/coll/fr_LU.txt
index ac1da4c..2b4e3d0 100644
--- a/data/coll/fr_LU.txt
+++ b/data/coll/fr_LU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_MA.txt b/data/coll/fr_MA.txt
index 6c8243f..f651dfb 100755
--- a/data/coll/fr_MA.txt
+++ b/data/coll/fr_MA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_MC.txt b/data/coll/fr_MC.txt
index 0efcc75..8d51e8c 100644
--- a/data/coll/fr_MC.txt
+++ b/data/coll/fr_MC.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_MF.txt b/data/coll/fr_MF.txt
index 3d1c49e..5dfab20 100644
--- a/data/coll/fr_MF.txt
+++ b/data/coll/fr_MF.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_MG.txt b/data/coll/fr_MG.txt
index eb0134d..1028146 100644
--- a/data/coll/fr_MG.txt
+++ b/data/coll/fr_MG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_ML.txt b/data/coll/fr_ML.txt
index 897af6c..0009cdf 100644
--- a/data/coll/fr_ML.txt
+++ b/data/coll/fr_ML.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_MQ.txt b/data/coll/fr_MQ.txt
index 39ca2df..ddd391e 100644
--- a/data/coll/fr_MQ.txt
+++ b/data/coll/fr_MQ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_MR.txt b/data/coll/fr_MR.txt
index c59271b..1a5a995 100755
--- a/data/coll/fr_MR.txt
+++ b/data/coll/fr_MR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_MU.txt b/data/coll/fr_MU.txt
index d85aaf2..5e07288 100755
--- a/data/coll/fr_MU.txt
+++ b/data/coll/fr_MU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_NC.txt b/data/coll/fr_NC.txt
index aec347f..8827dcc 100755
--- a/data/coll/fr_NC.txt
+++ b/data/coll/fr_NC.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_NE.txt b/data/coll/fr_NE.txt
index 4bfa40f..0a0ff40 100644
--- a/data/coll/fr_NE.txt
+++ b/data/coll/fr_NE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_PF.txt b/data/coll/fr_PF.txt
index 4f62b9c..7f45aed 100755
--- a/data/coll/fr_PF.txt
+++ b/data/coll/fr_PF.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_RE.txt b/data/coll/fr_RE.txt
index bad3751..077f0ce 100644
--- a/data/coll/fr_RE.txt
+++ b/data/coll/fr_RE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_RW.txt b/data/coll/fr_RW.txt
index a2215ca..1b66924 100644
--- a/data/coll/fr_RW.txt
+++ b/data/coll/fr_RW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_SC.txt b/data/coll/fr_SC.txt
index fd841c0..96aeab0 100755
--- a/data/coll/fr_SC.txt
+++ b/data/coll/fr_SC.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_SN.txt b/data/coll/fr_SN.txt
index 2859edd..b63a28f 100644
--- a/data/coll/fr_SN.txt
+++ b/data/coll/fr_SN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_SY.txt b/data/coll/fr_SY.txt
index b3e3a23..a25ff0f 100755
--- a/data/coll/fr_SY.txt
+++ b/data/coll/fr_SY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_TD.txt b/data/coll/fr_TD.txt
index 12af0b6..a6ef38a 100644
--- a/data/coll/fr_TD.txt
+++ b/data/coll/fr_TD.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_TG.txt b/data/coll/fr_TG.txt
index 8032d0b..3be8a18 100644
--- a/data/coll/fr_TG.txt
+++ b/data/coll/fr_TG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_TN.txt b/data/coll/fr_TN.txt
index 3279841..0fe6c52 100755
--- a/data/coll/fr_TN.txt
+++ b/data/coll/fr_TN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/fr_VU.txt b/data/coll/fr_VU.txt
index 26358c5..8319662 100755
--- a/data/coll/fr_VU.txt
+++ b/data/coll/fr_VU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ga.txt b/data/coll/ga.txt
index 927ede6..8203476 100644
--- a/data/coll/ga.txt
+++ b/data/coll/ga.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ga_IE.txt b/data/coll/ga_IE.txt
index 8318044..d98e286 100644
--- a/data/coll/ga_IE.txt
+++ b/data/coll/ga_IE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/gu.txt b/data/coll/gu.txt
index d859ff4..357e10a 100644
--- a/data/coll/gu.txt
+++ b/data/coll/gu.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/gu.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/gu.xml
*/
gu{
- Version{"2.0.50.24"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -18,7 +18,7 @@
" Mlym Sinh]"
"&ૐ<ં<<ઁ<ઃ"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/gu_IN.txt b/data/coll/gu_IN.txt
index 4381f4e..a8a735e 100644
--- a/data/coll/gu_IN.txt
+++ b/data/coll/gu_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ha.txt b/data/coll/ha.txt
index 7117a44..d713d33 100644
--- a/data/coll/ha.txt
+++ b/data/coll/ha.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/ha.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/ha.xml
*/
ha{
- Version{"2.0.50.79"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -21,7 +21,7 @@
"&T<ts<<<Ts<<<TS"
"&Y<ƴ<<<ʼy<<<''y<<<Ƴ<<<ʼY<<<''Y"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/ha_Latn.txt b/data/coll/ha_Latn.txt
index ad8b61b..86f0902 100644
--- a/data/coll/ha_Latn.txt
+++ b/data/coll/ha_Latn.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ha_Latn_GH.txt b/data/coll/ha_Latn_GH.txt
index 940afee..c4b2c75 100644
--- a/data/coll/ha_Latn_GH.txt
+++ b/data/coll/ha_Latn_GH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ha_Latn_NE.txt b/data/coll/ha_Latn_NE.txt
index a5fe06a..388f3e3 100644
--- a/data/coll/ha_Latn_NE.txt
+++ b/data/coll/ha_Latn_NE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ha_Latn_NG.txt b/data/coll/ha_Latn_NG.txt
index e7442e8..895bc91 100644
--- a/data/coll/ha_Latn_NG.txt
+++ b/data/coll/ha_Latn_NG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/haw.txt b/data/coll/haw.txt
index be7918f..2afa620 100644
--- a/data/coll/haw.txt
+++ b/data/coll/haw.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/haw.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/haw.xml
*/
haw{
- Version{"2.0.50.60"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -28,7 +28,7 @@
"&p<<<P"
"&w<<<W"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/he.txt b/data/coll/he.txt
index 6c9e64f..3098556 100644
--- a/data/coll/he.txt
+++ b/data/coll/he.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/he.xml
@@ -10,11 +10,62 @@
* ICU <specials> source: <path>/xml/collation/he.xml
*/
he{
- Version{"2.0.41.26"}
+ Version{"2.0.82.42"}
collations{
+ search{
+ Sequence{
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
+ "&'='<'\u2260'&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
+ "&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
+ "&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
+ "&ه<<<ﻫ<<<ﻬ<<<ﻪ<<<ﻩ<<ة<<<ﺔ<<<ﺓ"
+ "&[last primary ignorable ]<<׳<<''<<״<<'\"'<<ـ<<ฺ"
+ "&ᄀ=ᆨ"
+ "&ᄀᄀ=ᄁ=ᆩ"
+ "&ᄀᄉ=ᆪ"
+ "&ᄂ=ᆫ"
+ "&ᄂᄌ=ᆬ"
+ "&ᄂᄒ=ᆭ"
+ "&ᄃ=ᆮ"
+ "&ᄃᄃ=ᄄ"
+ "&ᄅ=ᆯ"
+ "&ᄅᄀ=ᆰ"
+ "&ᄅᄆ=ᆱ"
+ "&ᄅᄇ=ᆲ"
+ "&ᄅᄉ=ᆳ"
+ "&ᄅᄐ=ᆴ"
+ "&ᄅᄑ=ᆵ"
+ "&ᄅᄒ=ᆶ"
+ "&ᄆ=ᆷ"
+ "&ᄇ=ᆸ"
+ "&ᄇᄇ=ᄈ"
+ "&ᄇᄉ=ᆹ"
+ "&ᄉ=ᆺ"
+ "&ᄉᄉ=ᄊ=ᆻ"
+ "&ᄋ=ᆼ"
+ "&ᄌ=ᆽ"
+ "&ᄌᄌ=ᄍ"
+ "&ᄎ=ᆾ"
+ "&ᄏ=ᆿ"
+ "&ᄐ=ᇀ"
+ "&ᄑ=ᇁ"
+ "&ᄒ=ᇂ"
+ "&ᅡᅵ=ᅢ"
+ "&ᅣᅵ=ᅤ"
+ "&ᅥᅵ=ᅦ"
+ "&ᅧᅵ=ᅨ"
+ "&ᅩᅡ=ᅪ"
+ "&ᅩᅡᅵ=ᅫ"
+ "&ᅩᅵ=ᅬ"
+ "&ᅮᅴ=ᅯ"
+ "&ᅮᅴᅵ=ᅰ"
+ "&ᅮᅵ=ᅱ"
+ }
+ Version{"23"}
+ }
standard{
- Sequence{" [normalization on] [reorder Hebr]"}
- Version{"22.1.1"}
+ Sequence{" [normalization on] [reorder Hebr]&[before 2]''<<׳&[before 2]'\"'<<״"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/he_IL.txt b/data/coll/he_IL.txt
index 596cc02..ecddcd7 100644
--- a/data/coll/he_IL.txt
+++ b/data/coll/he_IL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/hi.txt b/data/coll/hi.txt
index a8f77b8..bb4e793 100644
--- a/data/coll/hi.txt
+++ b/data/coll/hi.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/hi.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/hi.xml
*/
hi{
- Version{"2.0.63.59"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -18,7 +18,7 @@
" Mlym Sinh]"
"&ॐ<ं<<ँ<ः"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/hi_.txt b/data/coll/hi_.txt
deleted file mode 100644
index d353d9f..0000000
--- a/data/coll/hi_.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/icu-config.xml & build.xml
-// *
-// ***************************************************************************
-/**
- * empty locale file for dependency checking
- */
-hi_{
- /**
- * so genrb doesn't issue warnings
- */
- ___{""}
-}
diff --git a/data/coll/hi_IN.txt b/data/coll/hi_IN.txt
index 833503f..0bbfedd 100644
--- a/data/coll/hi_IN.txt
+++ b/data/coll/hi_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/hr.txt b/data/coll/hr.txt
index 8f23cd7..9951919 100644
--- a/data/coll/hr.txt
+++ b/data/coll/hr.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/hr.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/hr.xml
*/
hr{
- Version{"2.0.76.11"}
+ Version{"2.0.82.42"}
collations{
search{
Sequence{
@@ -67,7 +67,7 @@
"&S<š<<<Š"
"&Z<ž<<<Ž"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
Sequence{
@@ -79,7 +79,7 @@
"&S<š<<<Š"
"&Z<ž<<<Ž"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/hr_BA.txt b/data/coll/hr_BA.txt
index fb0aae4..f35fd18 100755
--- a/data/coll/hr_BA.txt
+++ b/data/coll/hr_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/hr_HR.txt b/data/coll/hr_HR.txt
index f7979c2..37b75fa 100644
--- a/data/coll/hr_HR.txt
+++ b/data/coll/hr_HR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/hu.txt b/data/coll/hu.txt
index b665b03..083f44a 100644
--- a/data/coll/hu.txt
+++ b/data/coll/hu.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/hu.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/hu.xml
*/
hu{
- Version{"2.0.61.82"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -53,7 +53,7 @@
"&Zs<<<Zzs/zs"
"&ZS<<<ZZS/ZS"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/hu_HU.txt b/data/coll/hu_HU.txt
index d73591c..9ad5958 100644
--- a/data/coll/hu_HU.txt
+++ b/data/coll/hu_HU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/hy.txt b/data/coll/hy.txt
index d9420de..5ce21e5 100644
--- a/data/coll/hy.txt
+++ b/data/coll/hy.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/hy.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/hy.xml
*/
hy{
- Version{"2.0.48.6"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{" [reorder Armn]&ք<և<<<Եւ"}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/hy_AM.txt b/data/coll/hy_AM.txt
index 17dd51c..0bc84b2 100644
--- a/data/coll/hy_AM.txt
+++ b/data/coll/hy_AM.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/id.txt b/data/coll/id.txt
index 7186b8f..a59260c 100644
--- a/data/coll/id.txt
+++ b/data/coll/id.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/id_ID.txt b/data/coll/id_ID.txt
index 5c82742..8a5cbf6 100644
--- a/data/coll/id_ID.txt
+++ b/data/coll/id_ID.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ig.txt b/data/coll/ig.txt
index e64511c..0d38008 100755
--- a/data/coll/ig.txt
+++ b/data/coll/ig.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/ig.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/ig.xml
*/
ig{
- Version{"2.0.42.8"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
- " [normalization on ]"
+ " [normalization on]"
"&B<ch<<<Ch<<<CH"
"&G<gb<<<Gb<<<GB<gh<<<Gh<<<GH<gw<<<Gw<<<GW"
"&I<ị<<<Ị"
@@ -24,7 +24,7 @@
"&S<sh<<<Sh<<<SH"
"&U<ụ<<<Ụ"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/ig_NG.txt b/data/coll/ig_NG.txt
index 6acffc9..d712bd4 100755
--- a/data/coll/ig_NG.txt
+++ b/data/coll/ig_NG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/in.txt b/data/coll/in.txt
index cb3e2e0..2a3360a 100644
--- a/data/coll/in.txt
+++ b/data/coll/in.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/in_ID.txt b/data/coll/in_ID.txt
index d22885f..bc2b4af 100644
--- a/data/coll/in_ID.txt
+++ b/data/coll/in_ID.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/is.txt b/data/coll/is.txt
index a040897..35566eb 100644
--- a/data/coll/is.txt
+++ b/data/coll/is.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/is.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/is.xml
*/
is{
- Version{"2.0.63.65"}
+ Version{"2.0.82.42"}
collations{
search{
Sequence{
- " [normalization on ][suppressContractions [เ-ไ ເ-ໄ] ]"
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
"&'='<'\u2260'&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
"&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
"&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
@@ -69,7 +69,7 @@
"&[before 1]z<ý<<<Ý"
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<ö<<<Ö<<ø<<<Ø<å<<<Å"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
Sequence{
@@ -82,7 +82,7 @@
"&[before 1]z<ý<<<Ý"
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<ö<<<Ö<<ø<<<Ø<å<<<Å"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/is_IS.txt b/data/coll/is_IS.txt
index 2bc96d2..0e5ee46 100644
--- a/data/coll/is_IS.txt
+++ b/data/coll/is_IS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/it.txt b/data/coll/it.txt
index cf54c91..e4cda07 100644
--- a/data/coll/it.txt
+++ b/data/coll/it.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/it_CH.txt b/data/coll/it_CH.txt
index 747bea6..fc0670f 100644
--- a/data/coll/it_CH.txt
+++ b/data/coll/it_CH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/it_IT.txt b/data/coll/it_IT.txt
index e58af04..8b9d9dd 100644
--- a/data/coll/it_IT.txt
+++ b/data/coll/it_IT.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/it_SM.txt b/data/coll/it_SM.txt
index cfcf3e5..abeb1e5 100755
--- a/data/coll/it_SM.txt
+++ b/data/coll/it_SM.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/iw.txt b/data/coll/iw.txt
index c10c184..8352a34 100644
--- a/data/coll/iw.txt
+++ b/data/coll/iw.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/iw_IL.txt b/data/coll/iw_IL.txt
index 6963f2d..5a4954b 100644
--- a/data/coll/iw_IL.txt
+++ b/data/coll/iw_IL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ja.txt b/data/coll/ja.txt
index a354a5e..ab736b7 100644
--- a/data/coll/ja.txt
+++ b/data/coll/ja.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/ja.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/ja.xml
*/
ja{
- Version{"2.0.61.48"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -417,7 +417,7 @@
"鴃鴆鴪鴦鶯鴣鴟鵄鴕鴒鵁鴿鴾鵆鵈鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈麋麌麒麕麑麝麥麩麸麪麭靡黌黎"
"-黐黔黜點黝黠黥黨黯黴黶黷黹黻-黽鼇鼈皷鼕鼡鼬鼾齊齒齔齣齟-齡齦齧齬齪齷齲齶龕龜龠堯槇遙瑤凜熙"
}
- Version{"22.1.1"}
+ Version{"23"}
}
// BEGIN android-remove
// Omitting unihan collation
@@ -691,7 +691,7 @@
"<q<<<Q<r<<<R<s<<<S<t<<<T<u<<<U<v<<<V<w<<<W<x<<<X"
"<y<<<Y<z<<<Z"
}
- Version{"22.1.1"}
+ Version{"23"}
}
// END android-add
}
diff --git a/data/coll/ja_JP.txt b/data/coll/ja_JP.txt
index 40dec88..c759c89 100644
--- a/data/coll/ja_JP.txt
+++ b/data/coll/ja_JP.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ka.txt b/data/coll/ka.txt
index 6c7d325..35170db 100644
--- a/data/coll/ka.txt
+++ b/data/coll/ka.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ka_GE.txt b/data/coll/ka_GE.txt
index 4fd79bb..43c17d9 100644
--- a/data/coll/ka_GE.txt
+++ b/data/coll/ka_GE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/kk.txt b/data/coll/kk.txt
index 6357363..283cd7e 100644
--- a/data/coll/kk.txt
+++ b/data/coll/kk.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/kk.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/kk.xml
*/
kk{
- Version{"2.0.49.75"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -20,7 +20,7 @@
"&Ұ<ү<<<Ү"
"&[before 1]ь<і<<<І"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/kk_KZ.txt b/data/coll/kk_KZ.txt
index ba9a807..4ce688d 100644
--- a/data/coll/kk_KZ.txt
+++ b/data/coll/kk_KZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/kl.txt b/data/coll/kl.txt
index f59c68c..66dc11f 100644
--- a/data/coll/kl.txt
+++ b/data/coll/kl.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/kl.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/kl.xml
*/
kl{
- Version{"2.0.63.65"}
+ Version{"2.0.82.42"}
collations{
search{
Sequence{
- " [normalization on ][suppressContractions [เ-ไ ເ-ໄ] ]"
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
"&'='<'\u2260'&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
"&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
"&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
@@ -66,7 +66,7 @@
"&Y<<ü<<<Ü<<ű<<<Ű"
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
Sequence{
@@ -76,7 +76,7 @@
"&Y<<ü<<<Ü<<ű<<<Ű"
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/kl_GL.txt b/data/coll/kl_GL.txt
index ebd1c94..71dc0ce 100644
--- a/data/coll/kl_GL.txt
+++ b/data/coll/kl_GL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/km.txt b/data/coll/km.txt
index e409f25..7d511ae 100644
--- a/data/coll/km.txt
+++ b/data/coll/km.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/km.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/km.xml
*/
km{
- Version{"2.0.59.19"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
- " [normalization on ] [reorder Khmr]"
+ " [normalization on] [reorder Khmr]"
"&[last tertiary ignorable ]=឴=឵"
"&។ល។<<<៘"
"&ៈ<<៎<<៏<<៑<<័<<ៈ<<៝<<់<<៉<<៊<<៍"
@@ -74,7 +74,7 @@
"&ឱ<<<ឲ"
"&ៅ<ុំ<ំ<ាំ<ះ<ិះ<ុះ<េះ<ោះ"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/km_KH.txt b/data/coll/km_KH.txt
index dbf1573..cf16d79 100755
--- a/data/coll/km_KH.txt
+++ b/data/coll/km_KH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/kn.txt b/data/coll/kn.txt
index a318085..51257fc 100644
--- a/data/coll/kn.txt
+++ b/data/coll/kn.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/kn.xml
@@ -10,14 +10,15 @@
* ICU <specials> source: <path>/xml/collation/kn.xml
*/
kn{
- Version{"2.0.49.81"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
" [normalization on] [reorder Knda Deva Beng Guru Gujr Orya Taml Telu"
" Mlym Sinh]"
- "&ಔ<ಂ<ಃ<ೱ<ೲ"}
- Version{"22.1.1"}
+ "&ಔ<ಂ<ಃ<ೱ<ೲ"
+ }
+ Version{"23"}
}
traditional{
Sequence{
@@ -659,7 +660,7 @@
"&ಫೋ<<<ಫ಼ೋ"
"&ಫೌ<<<ಫ಼ೌ"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/kn_IN.txt b/data/coll/kn_IN.txt
index 9aae72b..f09cb9f 100644
--- a/data/coll/kn_IN.txt
+++ b/data/coll/kn_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ko.txt b/data/coll/ko.txt
index 8064bd5..7f1dd79 100644
--- a/data/coll/ko.txt
+++ b/data/coll/ko.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/ko.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/ko.xml
*/
ko{
- Version{"2.0.76.11"}
+ Version{"2.0.82.42"}
collations{
search{
Sequence{
- " [normalization on ][suppressContractions [เ-ไ ເ-ໄ] ]"
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
"&'='<'\u2260'&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
"&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
"&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
@@ -199,11 +199,11 @@
"&ᅩᅣ=ᆦ"
"&ᅩᅣᅵ=ᆧ"
}
- Version{"22.1.1"}
+ Version{"23"}
}
searchjl{
Sequence{
- " [normalization on ][suppressContractions [เ-ไ ເ-ໄ] ]"
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
"&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
"&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
"&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
@@ -217,54 +217,51 @@
"&ᄉ<<ᄊ=ᄉᄉ<<<ㅆ"
"&ᄌ<<ᄍ=ᄌᄌ<<<ㅉ"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
Sequence{
- // BEGIN android-added
- " [reorder Hang Hani]"
- // END android-added
- "[optimize [가-각간갇-갊감-갗같-객갠갤갬-갭갯-갱갸-갹갼걀걋걍걔걘걜거-걱건걷-걸걺검-겁것-겆겉-게겐겔겜-겝겟-겡겨"
- "-겪견겯-결겸-겹겻-경곁계곈곌곕곗고-곡곤곧-골곪곬곯-곱곳공-곶과-곽관괄괆괌-괍괏광괘괜괠괩괬-괭괴-괵괸괼굄-굅굇굉교굔굘굡굣구"
- "-국군굳-굶굻-굽굿궁-궂궈-궉권궐궜-궝궤궷귀-귁귄귈귐-귑귓규균귤그-극근귿-긁금-급긋긍긔기-긱긴긷-길긺김-깁깃깅-깆깊까-깎깐"
- "깔깖깜-깝깟-깡깥깨-깩깬깰깸-깹깻-깽꺄-꺅꺌꺼-꺾껀껄껌-껍껏-껑께-껙껜껨껫껭껴껸껼꼇-꼈꼍꼐꼬-꼭꼰꼲꼴꼼-꼽꼿꽁-꽃꽈-꽉꽐꽜"
- "-꽝꽤-꽥꽹꾀꾄꾈꾐-꾑꾕꾜꾸-꾹꾼꿀꿇-꿉꿋꿍-꿎꿔꿜꿨-꿩꿰-꿱꿴꿸뀀-뀁뀄뀌뀐뀔뀜-뀝뀨끄-끅끈끊끌끎끓-끕끗끙끝끼-끽낀낄낌-낍"
- "낏낑나-낚난낟-낢남-납낫-낯낱낳-낵낸낼냄-냅냇-냉냐-냑냔냘냠냥너-넉넋-넌널넒-넓넘-넙넛-넝넣-넥넨넬넴-넵넷-넹녀-녁년녈념-"
- "녑녔-녕녘녜녠노-녹논놀놂놈-놉놋농높-놔놘놜놨뇌뇐뇔뇜-뇝뇟뇨-뇩뇬뇰뇹뇻뇽누-눅눈눋-눌눔-눕눗눙눠눴눼뉘뉜뉠뉨-뉩뉴-뉵뉼늄-늅늉"
- "느-늑는늘-늚늠-늡늣능-늦늪늬늰늴니-닉닌닐닖님-닙닛닝닢다-닦단닫-닯닳-답닷-닻닿-댁댄댈댐-댑댓-댕댜더-덖던덛-덜덞-덟덤-덥"
- "덧덩덫덮데-덱덴델뎀-뎁뎃-뎅뎌뎐뎔뎠-뎡뎨뎬도-독돈돋-돌돎돐돔-돕돗동돛돝돠돤돨돼됐되된될됨-됩됫됴두-둑둔둘둠-둡둣둥둬뒀뒈뒝뒤뒨"
- "뒬뒵뒷뒹듀듄듈듐듕드-득든듣-들듦듬-듭듯등듸디-딕딘딛-딜딤-딥딧-딪따-딱딴딸땀-땁땃-땅땋-땍땐땔땜-땝땟-땡떠-떡떤떨떪-떫떰-"
- "떱떳-떵떻-떽뗀뗄뗌-뗍뗏-뗑뗘뗬또-똑똔똘똥똬똴뙈뙤뙨뚜-뚝뚠뚤뚫-뚬뚱뛔뛰뛴뛸뜀-뜁뜅뜨-뜩뜬뜯-뜰뜸-뜹뜻띄띈띌띔-띕띠띤띨띰-띱"
- "띳띵라-락란랄람-랍랏-랒랖-랙랜랠램-랩랫-랭랴-략랸럇량러-럭런럴럼-럽럿-렁렇-렉렌렐렘-렙렛렝려-력련렬렴-렵렷-령례롄롑롓로-"
- "록론롤롬-롭롯롱롸롼뢍뢨뢰뢴뢸룀-룁룃룅료룐룔룝룟룡루-룩룬룰룸-룹룻룽뤄뤘뤠뤼-뤽륀륄륌륏륑류-륙륜률륨-륩륫륭르-륵른를름-릅릇릉-"
- "릊릍-릎리-릭린릴림-립릿링마-막만많-맒맘-맙맛망-맞맡맣-맥맨맬맴-맵맷-맺먀-먁먈먕머-먹먼멀멂멈-멉멋멍-멎멓-멕멘멜멤-멥멧-"
- "멩며-멱면멸몃-명몇몌모-목몫-몬몰몲몸-몹못몽뫄뫈뫘-뫙뫼묀묄묍묏묑묘묜묠묩묫무-묶문묻-묾뭄-뭅뭇뭉뭍뭏-뭐뭔뭘뭡뭣뭬뮈뮌뮐뮤뮨뮬뮴"
- "뮷므믄믈믐믓미-믹민믿-밀밂밈-밉밋-밍및밑바-반받-밟밤-밥밧방밭배-백밴밸뱀-뱁뱃-뱅뱉뱌-뱍뱐뱝버-벅번벋-벌벎범-법벗벙-벚베-"
- "벡벤벧-벨벰-벱벳-벵벼-벽변별볍볏-병볕볘볜보-볶본볼봄-봅봇봉봐봔봤봬뵀뵈-뵉뵌뵐뵘-뵙뵤뵨부-북분붇-붊붐-붑붓붕붙-붚붜붤붰붸뷔"
- "-뷕뷘뷜뷩뷰뷴뷸븀븃븅브-븍븐블븜-븝븟비-빅빈빌빎빔-빕빗빙-빛빠-빡빤빨빪빰-빱빳-빵빻-빽뺀뺄뺌-뺍뺏-뺑뺘-뺙뺨뻐-뻑뻔뻗-뻘뻠"
- "뻣-뻥뻬뼁뼈-뼉뼘-뼙뼛-뼝뽀-뽁뽄뽈뽐-뽑뽕뾔뾰뿅뿌-뿍뿐뿔뿜뿟뿡쀼쁑쁘쁜쁠쁨-쁩삐-삑삔삘삠-삡삣삥사-삭삯-산삳-삶삼-삽삿-상샅"
- "새-색샌샐샘-샙샛-생샤-샥샨샬샴-샵샷샹섀섄섈섐섕서-선섣-설섦-섧섬-섭섯-성섶세-섹센셀셈-셉셋-셍셔-셕션셜셤-셥셧-셩셰셴셸솅"
- "소-솎손솔솖솜-솝솟송솥솨-솩솬솰솽쇄쇈쇌쇔쇗-쇘쇠쇤쇨쇰-쇱쇳쇼-쇽숀숄숌-숍숏숑수-숙순숟-술숨-숩숫숭숯숱-숲숴쉈쉐-쉑쉔쉘쉠쉥쉬"
- "-쉭쉰쉴쉼-쉽쉿슁슈-슉슐슘슛슝스-슥슨슬-슭슴-습슷승시-식신싣-실싫-십싯싱싶싸-싹싻-싼쌀쌈-쌉쌌-쌍쌓-쌕쌘쌜쌤-쌥쌨-쌩썅써-"
- "썩썬썰썲썸-썹썼-썽쎄쎈쎌쏀쏘-쏙쏜쏟-쏠쏢쏨-쏩쏭쏴-쏵쏸쐈쐐쐤쐬쐰쐴쐼-쐽쑈쑤-쑥쑨쑬쑴-쑵쑹쒀쒔쒜쒸쒼쓩쓰-쓱쓴쓸쓺쓿-씁씌씐씔씜"
- "씨-씩씬씰씸-씹씻씽아-악안-않알-앎앓-압앗-앙앝-앞애-액앤앨앰-앱앳-앵야-약얀얄얇얌-얍얏양얕얗-얘얜얠얩어-억언-얹얻-얾엄-"
- "엊엌엎에-엑엔엘엠-엡엣엥여-엮연열엶-엷염-영옅-예옌옐옘-옙옛-옜오-옥온올-옮옰옳-옵옷옹옻와-왁완왈왐-왑왓-왕왜-왝왠왬왯왱외"
- "-왹왼욀욈-욉욋욍요-욕욘욜욤-욥욧용우-욱운울-욺움-웁웃웅워-웍원월웜-웝웠-웡웨-웩웬웰웸-웹웽위-윅윈윌윔-윕윗윙유-육윤율윰-"
- "윱윳융윷으-윽은을읊음-읍읏응-의읜읠읨읫이-익인일-읾잃-입잇-잊잎자-작잔잖-잘잚잠-잡잣-잦재-잭잰잴잼-잽잿-쟁쟈-쟉쟌쟎쟐쟘쟝"
- "쟤쟨쟬저-적전절젊점-접젓정-젖제-젝젠젤젬-젭젯젱져젼졀졈-졉졌-졍졔조-족존졸졺좀-좁좃종-좇좋-좍좔좝좟좡좨좼-좽죄죈죌죔-죕죗죙"
- "죠-죡죤죵주-죽준줄-줆줌-줍줏중줘줬줴쥐-쥑쥔쥘쥠-쥡쥣쥬쥰쥴쥼즈-즉즌즐즘-즙즛증지-직진짇-질짊짐-집짓징-짖짙-짚짜-짝짠짢짤짧"
- "짬-짭짯-짱째-짹짼쨀쨈-쨉쨋-쨍쨔쨘쨩쩌-쩍쩐쩔쩜-쩝쩟-쩡쩨쩽쪄쪘쪼-쪽쫀쫄쫌-쫍쫏쫑쫓쫘-쫙쫠쫬쫴쬈쬐쬔쬘쬠-쬡쭁쭈-쭉쭌쭐쭘-쭙"
- "쭝쭤쭸-쭹쮜쮸쯔쯤쯧쯩찌-찍찐찔찜-찝찡-찢찧-착찬찮찰참-찹찻-찾채-책챈챌챔-챕챗-챙챠챤챦챨챰챵처-척천철첨-첩첫-청체-첵첸첼쳄"
- "-쳅쳇쳉쳐쳔쳤쳬쳰촁초-촉촌촐촘-촙촛총촤촨촬촹최쵠쵤쵬-쵭쵯쵱쵸춈추-축춘출춤-춥춧충춰췄췌췐취췬췰췸-췹췻췽츄츈츌츔츙츠-측츤츨츰-"
- "츱츳층치-칙친칟-칡침-칩칫칭카-칵칸칼캄-캅캇캉캐-캑캔캘캠-캡캣-캥캬-캭컁커-컥컨컫-컬컴-컵컷-컹케-켁켄켈켐-켑켓켕켜켠켤켬-"
- "켭켯-켱켸코-콕콘콜콤-콥콧콩콰-콱콴콸쾀쾅쾌쾡쾨쾰쿄쿠-쿡쿤쿨쿰-쿱쿳쿵쿼퀀퀄퀑퀘퀭퀴-퀵퀸퀼큄-큅큇큉큐큔큘큠크-큭큰클큼-큽킁키-"
- "킥킨킬킴-킵킷킹타-탁탄탈-탉탐-탑탓-탕태-택탠탤탬-탭탯-탱탸턍터-턱턴털턺텀-텁텃-텅테-텍텐텔템-텝텟텡텨텬텼톄톈토-톡톤톨톰-"
- "톱톳통톺톼퇀퇘퇴퇸툇툉툐투-툭툰툴툼-툽툿퉁퉈퉜퉤튀-튁튄튈튐-튑튕튜튠튤튬튱트-특튼튿-틀틂틈-틉틋틔틘틜틤-틥티-틱틴틸팀-팁팃팅파"
- "-팎판팔팖팜-팝팟-팡팥패-팩팬팰팸-팹팻-팽퍄-퍅퍼-퍽펀펄펌-펍펏-펑페-펙펜펠펨-펩펫펭펴편펼폄-폅폈-평폐폘폡폣포-폭폰폴폼-폽"
- "폿퐁퐈퐝푀푄표푠푤푭푯푸-푹푼푿-풀풂품-풉풋풍풔풩퓌퓐퓔퓜퓟퓨퓬퓰퓸퓻퓽프픈플픔-픕픗피-픽핀필핌-핍핏핑하-학한할핥함-합핫항해-핵"
- "핸핼햄-햅햇-행햐향허-헉헌헐헒험-헙헛헝헤-헥헨헬헴-헵헷헹혀-혁현혈혐-협혓-형혜혠혤혭호-혹혼홀홅홈-홉홋홍홑화-확환활홧황홰-홱"
- "홴횃횅회-획횐횔횝횟횡효횬횰횹횻후-훅훈훌훑훔훗훙훠훤훨훰훵훼-훽휀휄휑휘-휙휜휠휨-휩휫휭휴-휵휸휼흄흇흉흐-흑흔흖-흙흠-흡흣흥흩희"
- "흰흴흼-흽힁히-힉힌힐힘-힙힛힝] ]"
+ " [reorder Hang Hani][optimize [가-각간갇-갊감-갗같-객갠갤갬-갭갯-갱갸-갹갼걀걋걍걔걘걜거-걱건걷-"
+ "걸걺검-겁것-겆겉-게겐겔겜-겝겟-겡겨-겪견겯-결겸-겹겻-경곁계곈곌곕곗고-곡곤곧-골곪곬곯-곱곳공-곶과-곽관괄괆괌-괍괏광괘괜괠"
+ "괩괬-괭괴-괵괸괼굄-굅굇굉교굔굘굡굣구-국군굳-굶굻-굽굿궁-궂궈-궉권궐궜-궝궤궷귀-귁귄귈귐-귑귓규균귤그-극근귿-긁금-급긋긍긔"
+ "기-긱긴긷-길긺김-깁깃깅-깆깊까-깎깐깔깖깜-깝깟-깡깥깨-깩깬깰깸-깹깻-깽꺄-꺅꺌꺼-꺾껀껄껌-껍껏-껑께-껙껜껨껫껭껴껸껼꼇-꼈"
+ "꼍꼐꼬-꼭꼰꼲꼴꼼-꼽꼿꽁-꽃꽈-꽉꽐꽜-꽝꽤-꽥꽹꾀꾄꾈꾐-꾑꾕꾜꾸-꾹꾼꿀꿇-꿉꿋꿍-꿎꿔꿜꿨-꿩꿰-꿱꿴꿸뀀-뀁뀄뀌뀐뀔뀜-뀝뀨끄"
+ "-끅끈끊끌끎끓-끕끗끙끝끼-끽낀낄낌-낍낏낑나-낚난낟-낢남-납낫-낯낱낳-낵낸낼냄-냅냇-냉냐-냑냔냘냠냥너-넉넋-넌널넒-넓넘-넙넛"
+ "-넝넣-넥넨넬넴-넵넷-넹녀-녁년녈념-녑녔-녕녘녜녠노-녹논놀놂놈-놉놋농높-놔놘놜놨뇌뇐뇔뇜-뇝뇟뇨-뇩뇬뇰뇹뇻뇽누-눅눈눋-눌눔-"
+ "눕눗눙눠눴눼뉘뉜뉠뉨-뉩뉴-뉵뉼늄-늅늉느-늑는늘-늚늠-늡늣능-늦늪늬늰늴니-닉닌닐닖님-닙닛닝닢다-닦단닫-닯닳-답닷-닻닿-댁댄댈"
+ "댐-댑댓-댕댜더-덖던덛-덜덞-덟덤-덥덧덩덫덮데-덱덴델뎀-뎁뎃-뎅뎌뎐뎔뎠-뎡뎨뎬도-독돈돋-돌돎돐돔-돕돗동돛돝돠돤돨돼됐되된될됨"
+ "-됩됫됴두-둑둔둘둠-둡둣둥둬뒀뒈뒝뒤뒨뒬뒵뒷뒹듀듄듈듐듕드-득든듣-들듦듬-듭듯등듸디-딕딘딛-딜딤-딥딧-딪따-딱딴딸땀-땁땃-땅땋"
+ "-땍땐땔땜-땝땟-땡떠-떡떤떨떪-떫떰-떱떳-떵떻-떽뗀뗄뗌-뗍뗏-뗑뗘뗬또-똑똔똘똥똬똴뙈뙤뙨뚜-뚝뚠뚤뚫-뚬뚱뛔뛰뛴뛸뜀-뜁뜅뜨-뜩"
+ "뜬뜯-뜰뜸-뜹뜻띄띈띌띔-띕띠띤띨띰-띱띳띵라-락란랄람-랍랏-랒랖-랙랜랠램-랩랫-랭랴-략랸럇량러-럭런럴럼-럽럿-렁렇-렉렌렐렘-"
+ "렙렛렝려-력련렬렴-렵렷-령례롄롑롓로-록론롤롬-롭롯롱롸롼뢍뢨뢰뢴뢸룀-룁룃룅료룐룔룝룟룡루-룩룬룰룸-룹룻룽뤄뤘뤠뤼-뤽륀륄륌륏륑류"
+ "-륙륜률륨-륩륫륭르-륵른를름-릅릇릉-릊릍-릎리-릭린릴림-립릿링마-막만많-맒맘-맙맛망-맞맡맣-맥맨맬맴-맵맷-맺먀-먁먈먕머-먹"
+ "먼멀멂멈-멉멋멍-멎멓-멕멘멜멤-멥멧-멩며-멱면멸몃-명몇몌모-목몫-몬몰몲몸-몹못몽뫄뫈뫘-뫙뫼묀묄묍묏묑묘묜묠묩묫무-묶문묻-묾뭄"
+ "-뭅뭇뭉뭍뭏-뭐뭔뭘뭡뭣뭬뮈뮌뮐뮤뮨뮬뮴뮷므믄믈믐믓미-믹민믿-밀밂밈-밉밋-밍및밑바-반받-밟밤-밥밧방밭배-백밴밸뱀-뱁뱃-뱅뱉뱌-"
+ "뱍뱐뱝버-벅번벋-벌벎범-법벗벙-벚베-벡벤벧-벨벰-벱벳-벵벼-벽변별볍볏-병볕볘볜보-볶본볼봄-봅봇봉봐봔봤봬뵀뵈-뵉뵌뵐뵘-뵙뵤뵨"
+ "부-북분붇-붊붐-붑붓붕붙-붚붜붤붰붸뷔-뷕뷘뷜뷩뷰뷴뷸븀븃븅브-븍븐블븜-븝븟비-빅빈빌빎빔-빕빗빙-빛빠-빡빤빨빪빰-빱빳-빵빻-빽"
+ "뺀뺄뺌-뺍뺏-뺑뺘-뺙뺨뻐-뻑뻔뻗-뻘뻠뻣-뻥뻬뼁뼈-뼉뼘-뼙뼛-뼝뽀-뽁뽄뽈뽐-뽑뽕뾔뾰뿅뿌-뿍뿐뿔뿜뿟뿡쀼쁑쁘쁜쁠쁨-쁩삐-삑삔삘삠"
+ "-삡삣삥사-삭삯-산삳-삶삼-삽삿-상샅새-색샌샐샘-샙샛-생샤-샥샨샬샴-샵샷샹섀섄섈섐섕서-선섣-설섦-섧섬-섭섯-성섶세-섹센셀셈"
+ "-셉셋-셍셔-셕션셜셤-셥셧-셩셰셴셸솅소-솎손솔솖솜-솝솟송솥솨-솩솬솰솽쇄쇈쇌쇔쇗-쇘쇠쇤쇨쇰-쇱쇳쇼-쇽숀숄숌-숍숏숑수-숙순숟-"
+ "술숨-숩숫숭숯숱-숲숴쉈쉐-쉑쉔쉘쉠쉥쉬-쉭쉰쉴쉼-쉽쉿슁슈-슉슐슘슛슝스-슥슨슬-슭슴-습슷승시-식신싣-실싫-십싯싱싶싸-싹싻-싼쌀"
+ "쌈-쌉쌌-쌍쌓-쌕쌘쌜쌤-쌥쌨-쌩썅써-썩썬썰썲썸-썹썼-썽쎄쎈쎌쏀쏘-쏙쏜쏟-쏠쏢쏨-쏩쏭쏴-쏵쏸쐈쐐쐤쐬쐰쐴쐼-쐽쑈쑤-쑥쑨쑬쑴-쑵"
+ "쑹쒀쒔쒜쒸쒼쓩쓰-쓱쓴쓸쓺쓿-씁씌씐씔씜씨-씩씬씰씸-씹씻씽아-악안-않알-앎앓-압앗-앙앝-앞애-액앤앨앰-앱앳-앵야-약얀얄얇얌-얍"
+ "얏양얕얗-얘얜얠얩어-억언-얹얻-얾엄-엊엌엎에-엑엔엘엠-엡엣엥여-엮연열엶-엷염-영옅-예옌옐옘-옙옛-옜오-옥온올-옮옰옳-옵옷옹"
+ "옻와-왁완왈왐-왑왓-왕왜-왝왠왬왯왱외-왹왼욀욈-욉욋욍요-욕욘욜욤-욥욧용우-욱운울-욺움-웁웃웅워-웍원월웜-웝웠-웡웨-웩웬웰웸"
+ "-웹웽위-윅윈윌윔-윕윗윙유-육윤율윰-윱윳융윷으-윽은을읊음-읍읏응-의읜읠읨읫이-익인일-읾잃-입잇-잊잎자-작잔잖-잘잚잠-잡잣-"
+ "잦재-잭잰잴잼-잽잿-쟁쟈-쟉쟌쟎쟐쟘쟝쟤쟨쟬저-적전절젊점-접젓정-젖제-젝젠젤젬-젭젯젱져젼졀졈-졉졌-졍졔조-족존졸졺좀-좁좃종-"
+ "좇좋-좍좔좝좟좡좨좼-좽죄죈죌죔-죕죗죙죠-죡죤죵주-죽준줄-줆줌-줍줏중줘줬줴쥐-쥑쥔쥘쥠-쥡쥣쥬쥰쥴쥼즈-즉즌즐즘-즙즛증지-직진짇"
+ "-질짊짐-집짓징-짖짙-짚짜-짝짠짢짤짧짬-짭짯-짱째-짹짼쨀쨈-쨉쨋-쨍쨔쨘쨩쩌-쩍쩐쩔쩜-쩝쩟-쩡쩨쩽쪄쪘쪼-쪽쫀쫄쫌-쫍쫏쫑쫓쫘-"
+ "쫙쫠쫬쫴쬈쬐쬔쬘쬠-쬡쭁쭈-쭉쭌쭐쭘-쭙쭝쭤쭸-쭹쮜쮸쯔쯤쯧쯩찌-찍찐찔찜-찝찡-찢찧-착찬찮찰참-찹찻-찾채-책챈챌챔-챕챗-챙챠챤챦"
+ "챨챰챵처-척천철첨-첩첫-청체-첵첸첼쳄-쳅쳇쳉쳐쳔쳤쳬쳰촁초-촉촌촐촘-촙촛총촤촨촬촹최쵠쵤쵬-쵭쵯쵱쵸춈추-축춘출춤-춥춧충춰췄췌췐"
+ "취췬췰췸-췹췻췽츄츈츌츔츙츠-측츤츨츰-츱츳층치-칙친칟-칡침-칩칫칭카-칵칸칼캄-캅캇캉캐-캑캔캘캠-캡캣-캥캬-캭컁커-컥컨컫-컬컴"
+ "-컵컷-컹케-켁켄켈켐-켑켓켕켜켠켤켬-켭켯-켱켸코-콕콘콜콤-콥콧콩콰-콱콴콸쾀쾅쾌쾡쾨쾰쿄쿠-쿡쿤쿨쿰-쿱쿳쿵쿼퀀퀄퀑퀘퀭퀴-퀵퀸퀼"
+ "큄-큅큇큉큐큔큘큠크-큭큰클큼-큽킁키-킥킨킬킴-킵킷킹타-탁탄탈-탉탐-탑탓-탕태-택탠탤탬-탭탯-탱탸턍터-턱턴털턺텀-텁텃-텅테-"
+ "텍텐텔템-텝텟텡텨텬텼톄톈토-톡톤톨톰-톱톳통톺톼퇀퇘퇴퇸툇툉툐투-툭툰툴툼-툽툿퉁퉈퉜퉤튀-튁튄튈튐-튑튕튜튠튤튬튱트-특튼튿-틀틂틈"
+ "-틉틋틔틘틜틤-틥티-틱틴틸팀-팁팃팅파-팎판팔팖팜-팝팟-팡팥패-팩팬팰팸-팹팻-팽퍄-퍅퍼-퍽펀펄펌-펍펏-펑페-펙펜펠펨-펩펫펭펴"
+ "편펼폄-폅폈-평폐폘폡폣포-폭폰폴폼-폽폿퐁퐈퐝푀푄표푠푤푭푯푸-푹푼푿-풀풂품-풉풋풍풔풩퓌퓐퓔퓜퓟퓨퓬퓰퓸퓻퓽프픈플픔-픕픗피-픽핀"
+ "필핌-핍핏핑하-학한할핥함-합핫항해-핵핸핼햄-햅햇-행햐향허-헉헌헐헒험-헙헛헝헤-헥헨헬헴-헵헷헹혀-혁현혈혐-협혓-형혜혠혤혭호-"
+ "혹혼홀홅홈-홉홋홍홑화-확환활홧황홰-홱홴횃횅회-획횐횔횝횟횡효횬횰횹횻후-훅훈훌훑훔훗훙훠훤훨훰훵훼-훽휀휄휑휘-휙휜휠휨-휩휫휭휴-"
+ "휵휸휼흄흇흉흐-흑흔흖-흙흠-흡흣흥흩희흰흴흼-흽힁히-힉힌힐힘-힙힛힝]]"
"&가<<*伽佳假價加可呵哥嘉嫁家暇架枷柯歌珂痂稼苛茄街袈訶賈跏軻迦駕仮傢咖哿坷宊斝榎檟珈笳耞舸葭謌"
"&각<<*刻却各恪慤殼珏脚覺角閣卻咯埆搉擱桷"
"&간<<*侃刊墾奸姦干幹懇揀杆柬桿澗癎看磵稈竿簡肝艮艱諫間偘慳栞榦玕秆茛衎赶迀齦"
@@ -755,7 +752,7 @@
"&희<<*僖凞喜噫囍姬嬉希憙憘戱晞曦熙熹熺犧禧稀羲咥唏嘻悕戲暿欷燹爔豨餼"
"&힐<<*詰犵纈襭頡黠"
}
- Version{"22.1.1"}
+ Version{"23"}
// BEGIN android-remove
// To save space, Android does not include the unihan collation sequence.
// END android-remove
diff --git a/data/coll/ko_KP.txt b/data/coll/ko_KP.txt
index 2737cc9..f8ebdcf 100755
--- a/data/coll/ko_KP.txt
+++ b/data/coll/ko_KP.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ko_KR.txt b/data/coll/ko_KR.txt
index fd5c062..4d209b0 100644
--- a/data/coll/ko_KR.txt
+++ b/data/coll/ko_KR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/kok.txt b/data/coll/kok.txt
index a6a710b..f041079 100644
--- a/data/coll/kok.txt
+++ b/data/coll/kok.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/kok.xml
@@ -10,15 +10,16 @@
* ICU <specials> source: <path>/xml/collation/kok.xml
*/
kok{
- Version{"2.0.42.63"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
" [normalization on] [reorder Deva Beng Guru Gujr Orya Taml Telu Knda"
" Mlym Sinh]"
- "&ॐ<ं<<ँ<ः&ह<ळ<क्ष"
+ "&ॐ<ं<<ँ<ः"
+ "&ह<ळ<क्ष"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/kok_IN.txt b/data/coll/kok_IN.txt
index ed66237..04f1cfd 100644
--- a/data/coll/kok_IN.txt
+++ b/data/coll/kok_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ln.txt b/data/coll/ln.txt
index 16fcb15..df61ca1 100755
--- a/data/coll/ln.txt
+++ b/data/coll/ln.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/ln.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/ln.xml
*/
ln{
- Version{"2.0.76.11"}
+ Version{"2.0.82.42"}
collations{
phonetic{
Sequence{
@@ -26,11 +26,11 @@
"&S<sh<<<sH<<<Sh<<<SH"
"&T<ts<<<tS<<<Ts<<<TS"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
Sequence{"&E<ɛ<<<Ɛ&O<<ɔ<<<Ɔ"}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/ln_AO.txt b/data/coll/ln_AO.txt
index 7d5d1ba..a112c83 100755
--- a/data/coll/ln_AO.txt
+++ b/data/coll/ln_AO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ln_CD.txt b/data/coll/ln_CD.txt
index 7c7db77..a5a669c 100755
--- a/data/coll/ln_CD.txt
+++ b/data/coll/ln_CD.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ln_CF.txt b/data/coll/ln_CF.txt
index 744065c..0ebd199 100755
--- a/data/coll/ln_CF.txt
+++ b/data/coll/ln_CF.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ln_CG.txt b/data/coll/ln_CG.txt
index f2f6930..b62cb82 100755
--- a/data/coll/ln_CG.txt
+++ b/data/coll/ln_CG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/lt.txt b/data/coll/lt.txt
index c92bdf7..71e21b0 100644
--- a/data/coll/lt.txt
+++ b/data/coll/lt.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/lt.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/lt.xml
*/
lt{
- Version{"2.0.61.82"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -25,7 +25,7 @@
"&U<<ų<<<Ų<<ū<<<Ū"
"&Z<ž<<<Ž"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/lt_LT.txt b/data/coll/lt_LT.txt
index 8bc8713..2946514 100644
--- a/data/coll/lt_LT.txt
+++ b/data/coll/lt_LT.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/lv.txt b/data/coll/lv.txt
index 61d1f63..deaf61e 100644
--- a/data/coll/lv.txt
+++ b/data/coll/lv.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/lv.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/lv.xml
*/
lv{
- Version{"2.0.49.36"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -23,7 +23,7 @@
"&[before 1]T<š<<<Š"
"&[before 1]Ʒ<ž<<<Ž"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/lv_LV.txt b/data/coll/lv_LV.txt
index 76cc6b8..dd7120d 100644
--- a/data/coll/lv_LV.txt
+++ b/data/coll/lv_LV.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/mk.txt b/data/coll/mk.txt
index 91c3f90..5441688 100644
--- a/data/coll/mk.txt
+++ b/data/coll/mk.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/mk.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/mk.xml
*/
mk{
- Version{"2.0.49.75"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{" [reorder Cyrl][suppressContractions [АаӘәЕеЖжЗзИиІіОоӨөУуЧчЫыЭэѴѵ]]"}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/mk_MK.txt b/data/coll/mk_MK.txt
index 885eeea..ff7e7b4 100644
--- a/data/coll/mk_MK.txt
+++ b/data/coll/mk_MK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ml.txt b/data/coll/ml.txt
index 994f85a..623fc5e 100644
--- a/data/coll/ml.txt
+++ b/data/coll/ml.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/ml.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/ml.xml
*/
ml{
- Version{"2.0.50.37"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -28,7 +28,7 @@
"&മ്<<ം"
"&ന്<<<ൻ്"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/ml_IN.txt b/data/coll/ml_IN.txt
index a0be1f4..ca19ff5 100644
--- a/data/coll/ml_IN.txt
+++ b/data/coll/ml_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/mo.txt b/data/coll/mo.txt
index ef3bdd7..55f72d2 100644
--- a/data/coll/mo.txt
+++ b/data/coll/mo.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/mr.txt b/data/coll/mr.txt
index 2a386b5..0ceda9d 100644
--- a/data/coll/mr.txt
+++ b/data/coll/mr.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/mr.xml
@@ -10,15 +10,16 @@
* ICU <specials> source: <path>/xml/collation/mr.xml
*/
mr{
- Version{"2.0.42.63"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
" [normalization on] [reorder Deva Beng Guru Gujr Orya Taml Telu Knda"
" Mlym Sinh]"
- "&ॐ<ं<<ँ<ः&ह<ळ<क्ष<ज्ञ"
+ "&ॐ<ं<<ँ<ः"
+ "&ह<ळ<क्ष<ज्ञ"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/mr_IN.txt b/data/coll/mr_IN.txt
index a5f0325..8f24295 100644
--- a/data/coll/mr_IN.txt
+++ b/data/coll/mr_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ms.txt b/data/coll/ms.txt
index a9238b4..3ba9363 100644
--- a/data/coll/ms.txt
+++ b/data/coll/ms.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ms_BN.txt b/data/coll/ms_BN.txt
deleted file mode 100644
index 1a349be..0000000
--- a/data/coll/ms_BN.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/icu-config.xml & build.xml
-// *
-// ***************************************************************************
-/**
- * validSubLocale of "root"
- */
-ms_BN{
- /**
- * so genrb doesn't issue warnings
- */
- ___{""}
-}
diff --git a/data/coll/ms_MY.txt b/data/coll/ms_Latn.txt
similarity index 86%
copy from data/coll/ms_MY.txt
copy to data/coll/ms_Latn.txt
index de0b3ec..4e8a2da 100644
--- a/data/coll/ms_MY.txt
+++ b/data/coll/ms_Latn.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* validSubLocale of "root"
*/
-ms_MY{
+ms_Latn{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/coll/ms_MY.txt b/data/coll/ms_Latn_BN.txt
similarity index 86%
copy from data/coll/ms_MY.txt
copy to data/coll/ms_Latn_BN.txt
index de0b3ec..92cc2a6 100644
--- a/data/coll/ms_MY.txt
+++ b/data/coll/ms_Latn_BN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* validSubLocale of "root"
*/
-ms_MY{
+ms_Latn_BN{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/coll/ms_MY.txt b/data/coll/ms_Latn_MY.txt
similarity index 86%
rename from data/coll/ms_MY.txt
rename to data/coll/ms_Latn_MY.txt
index de0b3ec..4217bb0 100644
--- a/data/coll/ms_MY.txt
+++ b/data/coll/ms_Latn_MY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* validSubLocale of "root"
*/
-ms_MY{
+ms_Latn_MY{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/coll/ms_MY.txt b/data/coll/ms_Latn_SG.txt
similarity index 86%
copy from data/coll/ms_MY.txt
copy to data/coll/ms_Latn_SG.txt
index de0b3ec..cd3a38f 100644
--- a/data/coll/ms_MY.txt
+++ b/data/coll/ms_Latn_SG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* validSubLocale of "root"
*/
-ms_MY{
+ms_Latn_SG{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/coll/ms_SG.txt b/data/coll/ms_SG.txt
deleted file mode 100755
index 7f1c6b5..0000000
--- a/data/coll/ms_SG.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/icu-config.xml & build.xml
-// *
-// ***************************************************************************
-/**
- * validSubLocale of "root"
- */
-ms_SG{
- /**
- * so genrb doesn't issue warnings
- */
- ___{""}
-}
diff --git a/data/coll/mt.txt b/data/coll/mt.txt
index 31b1c83..f1c137c 100644
--- a/data/coll/mt.txt
+++ b/data/coll/mt.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/mt.xml
@@ -10,18 +10,18 @@
* ICU <specials> source: <path>/xml/collation/mt.xml
*/
mt{
- Version{"2.0.61.82"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
- " [caseFirst upper ]"
+ " [caseFirst upper]"
"&[before 1]c<Ċ<<<ċ"
"&[before 1]g<Ġ<<<ġ"
"&[before 1]h<GĦ<<<Għ<<<gĦ<<<għ"
"&[before 1]i<Ħ<<<ħ"
"&[before 1]z<Ż<<<ż"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/mt_MT.txt b/data/coll/mt_MT.txt
index c2aacd5..ec83b8c 100644
--- a/data/coll/mt_MT.txt
+++ b/data/coll/mt_MT.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/my.txt b/data/coll/my.txt
index 53987dc..4517799 100644
--- a/data/coll/my.txt
+++ b/data/coll/my.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/my.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/my.xml
*/
my{
- Version{"2.0.51.23"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -387,7 +387,7 @@
"&ထမင်း=ထ္မင်း"
"&လက်ဘက်=လ္ဘက်"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/my_MM.txt b/data/coll/my_MM.txt
index 568c5b1..905f789 100644
--- a/data/coll/my_MM.txt
+++ b/data/coll/my_MM.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/nb.txt b/data/coll/nb.txt
index ce3cf91..298bd51 100644
--- a/data/coll/nb.txt
+++ b/data/coll/nb.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/nb.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/nb.xml
*/
nb{
- Version{"2.0.63.65"}
+ Version{"2.0.82.42"}
collations{
search{
Sequence{
- " [normalization on ][suppressContractions [เ-ไ ເ-ໄ] ]"
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
"&'='<'\u2260'&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
"&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
"&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
@@ -67,7 +67,7 @@
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<"
"<aa<<<Aa<<<AA"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
Sequence{
@@ -78,7 +78,7 @@
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<"
"<aa<<<Aa<<<AA"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/nb_NO.txt b/data/coll/nb_NO.txt
index 821b617..fb274c8 100644
--- a/data/coll/nb_NO.txt
+++ b/data/coll/nb_NO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/nl.txt b/data/coll/nl.txt
index a5b04bb..08607f2 100644
--- a/data/coll/nl.txt
+++ b/data/coll/nl.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/nl_AW.txt b/data/coll/nl_AW.txt
index 9f24c9b..f080e5b 100755
--- a/data/coll/nl_AW.txt
+++ b/data/coll/nl_AW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/nl_BE.txt b/data/coll/nl_BE.txt
index 4cb215d..f0966a9 100644
--- a/data/coll/nl_BE.txt
+++ b/data/coll/nl_BE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/nl_CW.txt b/data/coll/nl_CW.txt
index 858f82a..ed39ab3 100644
--- a/data/coll/nl_CW.txt
+++ b/data/coll/nl_CW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/nl_NL.txt b/data/coll/nl_NL.txt
index 7183385..3a19f79 100644
--- a/data/coll/nl_NL.txt
+++ b/data/coll/nl_NL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/nl_SR.txt b/data/coll/nl_SR.txt
index 00c71ba..839b445 100755
--- a/data/coll/nl_SR.txt
+++ b/data/coll/nl_SR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/nl_SX.txt b/data/coll/nl_SX.txt
index 186cac7..41d9d70 100644
--- a/data/coll/nl_SX.txt
+++ b/data/coll/nl_SX.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/nn.txt b/data/coll/nn.txt
index 7f75a6a..083fcfb 100644
--- a/data/coll/nn.txt
+++ b/data/coll/nn.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/nn.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/nn.xml
*/
nn{
- Version{"2.0.63.65"}
+ Version{"2.0.82.42"}
collations{
search{
Sequence{
- " [normalization on ][suppressContractions [เ-ไ ເ-ໄ] ]"
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
"&'='<'\u2260'&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
"&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
"&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
@@ -67,7 +67,7 @@
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<"
"<aa<<<Aa<<<AA"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
Sequence{
@@ -78,7 +78,7 @@
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<"
"<aa<<<Aa<<<AA"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/nn_NO.txt b/data/coll/nn_NO.txt
index 7f358ec..64ebb56 100644
--- a/data/coll/nn_NO.txt
+++ b/data/coll/nn_NO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/no.txt b/data/coll/no.txt
index 49a17b2..6dc26b5 100644
--- a/data/coll/no.txt
+++ b/data/coll/no.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/no_NO.txt b/data/coll/no_NO.txt
index 4b958f6..408deef 100644
--- a/data/coll/no_NO.txt
+++ b/data/coll/no_NO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/om.txt b/data/coll/om.txt
index 6648986..c88ac67 100644
--- a/data/coll/om.txt
+++ b/data/coll/om.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/om.xml
@@ -10,14 +10,14 @@
* ICU <specials> source: <path>/xml/collation/om.xml
*/
om{
- Version{"2.0.41.26"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
"&Z<ch<<<Ch<<<CH<dh<<<Dh<<<DH<kh<<<Kh<<<KH<ny<<<Ny<<<NY<ph<<<Ph<<<PH<"
"sh<<<Sh"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/om_ET.txt b/data/coll/om_ET.txt
index 23aa740..58ec263 100644
--- a/data/coll/om_ET.txt
+++ b/data/coll/om_ET.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/om_KE.txt b/data/coll/om_KE.txt
index 8218c32..e3000f7 100644
--- a/data/coll/om_KE.txt
+++ b/data/coll/om_KE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/or.txt b/data/coll/or.txt
index a25b106..a80ccaa 100644
--- a/data/coll/or.txt
+++ b/data/coll/or.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/or.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/or.xml
*/
or{
- Version{"2.0.50.38"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -20,7 +20,7 @@
"&ହ<କ୍ଷ"
"&ଯ<<ୟ"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/or_IN.txt b/data/coll/or_IN.txt
index e34ce52..0912f64 100644
--- a/data/coll/or_IN.txt
+++ b/data/coll/or_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/pa.txt b/data/coll/pa.txt
index cb3f3e7..8a625a5 100644
--- a/data/coll/pa.txt
+++ b/data/coll/pa.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/pa.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/pa.xml
*/
pa{
- Version{"2.0.42.63"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -19,7 +19,7 @@
"&ੱ<<ੰ<<ਂ<<ਁ<<਼"
"&ੜ<੍"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/pa_Arab.txt b/data/coll/pa_Arab.txt
index 4a7cd6a..21a2b16 100755
--- a/data/coll/pa_Arab.txt
+++ b/data/coll/pa_Arab.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/pa_Arab_PK.txt b/data/coll/pa_Arab_PK.txt
index 6f34209..a94337c 100755
--- a/data/coll/pa_Arab_PK.txt
+++ b/data/coll/pa_Arab_PK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/pa_Guru.txt b/data/coll/pa_Guru.txt
index 721b2e3..1c8f8ed 100755
--- a/data/coll/pa_Guru.txt
+++ b/data/coll/pa_Guru.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/pa_Guru_IN.txt b/data/coll/pa_Guru_IN.txt
index ff3a07f..c51e3c7 100755
--- a/data/coll/pa_Guru_IN.txt
+++ b/data/coll/pa_Guru_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/pa_IN.txt b/data/coll/pa_IN.txt
index f8f230a..8a52933 100644
--- a/data/coll/pa_IN.txt
+++ b/data/coll/pa_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/pl.txt b/data/coll/pl.txt
index 9458215..1893eee 100644
--- a/data/coll/pl.txt
+++ b/data/coll/pl.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/pl.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/pl.xml
*/
pl{
- Version{"2.0.58.52"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -23,7 +23,7 @@
"&S<ś<<<Ś"
"&Z<ź<<<Ź<ż<<<Ż"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/pl_PL.txt b/data/coll/pl_PL.txt
index 703908f..cd87887 100644
--- a/data/coll/pl_PL.txt
+++ b/data/coll/pl_PL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ps.txt b/data/coll/ps.txt
index cba72cc..99efe9a 100644
--- a/data/coll/ps.txt
+++ b/data/coll/ps.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/ps.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/ps.xml
*/
ps{
- Version{"2.0.52.7"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
- " [normalization on ] [reorder Arab]"
+ " [normalization on] [reorder Arab]"
"&َ<<ِ<<ُ<<ً<<ٍ<<ٌ"
"&[before 1]ا<آ"
"&ا<<أ<<*ٲٱ<<إ<<*ٳ<ء"
@@ -32,7 +32,7 @@
"&ی<<*ىےيېۍ<<یٔ<<<ىٔ<<<ئ"
"&'\u00A0'<<'\u200C'<<'\u200D'"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/ps_AF.txt b/data/coll/ps_AF.txt
index a1eb9fd..ad3254e 100644
--- a/data/coll/ps_AF.txt
+++ b/data/coll/ps_AF.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/pt.txt b/data/coll/pt.txt
index 1cfb9ef..1b41f96 100644
--- a/data/coll/pt.txt
+++ b/data/coll/pt.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/pt_AO.txt b/data/coll/pt_AO.txt
index c36e671..946f75c 100755
--- a/data/coll/pt_AO.txt
+++ b/data/coll/pt_AO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/pt_BR.txt b/data/coll/pt_BR.txt
index 51b8144..b32cd35 100644
--- a/data/coll/pt_BR.txt
+++ b/data/coll/pt_BR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/pt_CV.txt b/data/coll/pt_CV.txt
index acb8265..4e09859 100755
--- a/data/coll/pt_CV.txt
+++ b/data/coll/pt_CV.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/pt_GW.txt b/data/coll/pt_GW.txt
index 083497d..fd85fe8 100755
--- a/data/coll/pt_GW.txt
+++ b/data/coll/pt_GW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/pt_MO.txt b/data/coll/pt_MO.txt
index f9174f7..f1913d5 100755
--- a/data/coll/pt_MO.txt
+++ b/data/coll/pt_MO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/pt_MZ.txt b/data/coll/pt_MZ.txt
index e0877fd..7392be2 100755
--- a/data/coll/pt_MZ.txt
+++ b/data/coll/pt_MZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/pt_PT.txt b/data/coll/pt_PT.txt
index f51408c..f97c9d9 100644
--- a/data/coll/pt_PT.txt
+++ b/data/coll/pt_PT.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/pt_ST.txt b/data/coll/pt_ST.txt
index 93d5e27..9b55c8c 100755
--- a/data/coll/pt_ST.txt
+++ b/data/coll/pt_ST.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/pt_TL.txt b/data/coll/pt_TL.txt
index f184758..3708b55 100755
--- a/data/coll/pt_TL.txt
+++ b/data/coll/pt_TL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ro.txt b/data/coll/ro.txt
index 99aca2b..d4d7af6 100644
--- a/data/coll/ro.txt
+++ b/data/coll/ro.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/ro.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/ro.xml
*/
ro{
- Version{"2.0.61.82"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{"&A<ă<<<Ă<â<<<Â&I<î<<<Î&S<ş=ș<<<Ş=Ș&T<ţ=ț<<<Ţ=Ț"}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/ro_MD.txt b/data/coll/ro_MD.txt
index 810e300..2749ac5 100644
--- a/data/coll/ro_MD.txt
+++ b/data/coll/ro_MD.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ro_RO.txt b/data/coll/ro_RO.txt
index 8dd3b1a..d533c72 100644
--- a/data/coll/ro_RO.txt
+++ b/data/coll/ro_RO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/root.txt b/data/coll/root.txt
index b81c3b4..66e8e02 100644
--- a/data/coll/root.txt
+++ b/data/coll/root.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/root.xml
@@ -11,16 +11,12 @@
*/
root{
UCARules:process(uca_rules){"../unidata/UCARules.txt"}
- Version{"2.0.76.11"}
+ Version{"2.0.82.42"}
collations{
default{"standard"}
- ducet{
- Sequence{" [normalization on ]"}
- Version{"22.1.1"}
- }
search{
Sequence{
- " [normalization on ][suppressContractions [เ-ไ ເ-ໄ] ]"
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
"&'='<'\u2260'&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
"&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
"&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
@@ -67,11 +63,11 @@
"&ᅮᅴᅵ=ᅰ"
"&ᅮᅵ=ᅱ"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
Sequence{""}
- Version{"22.1.1"}
+ Version{"23"}
}
}
depends:process(dependency){"ucadata.icu"}
diff --git a/data/coll/ru.txt b/data/coll/ru.txt
index 7ab62d1..cff4025 100644
--- a/data/coll/ru.txt
+++ b/data/coll/ru.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/ru.xml
@@ -10,14 +10,14 @@
* ICU <specials> source: <path>/xml/collation/ru.xml
*/
ru{
- Version{"2.0.76.11"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
" [reorder Cyrl][suppressContractions [АаӘәГгЕеЖжЗзІіОоӨөКкУуЧчЫыЭэѴѵ"
"]]"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/ru_BY.txt b/data/coll/ru_BY.txt
index 77bd410..a642958 100755
--- a/data/coll/ru_BY.txt
+++ b/data/coll/ru_BY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ru_KG.txt b/data/coll/ru_KG.txt
index 93bb11b..c947a8e 100755
--- a/data/coll/ru_KG.txt
+++ b/data/coll/ru_KG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ru_KZ.txt b/data/coll/ru_KZ.txt
index 43c92d9..95f6507 100755
--- a/data/coll/ru_KZ.txt
+++ b/data/coll/ru_KZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ru_MD.txt b/data/coll/ru_MD.txt
index 432a84b..68d1993 100644
--- a/data/coll/ru_MD.txt
+++ b/data/coll/ru_MD.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ru_RU.txt b/data/coll/ru_RU.txt
index e45ab23..f03f2f5 100644
--- a/data/coll/ru_RU.txt
+++ b/data/coll/ru_RU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ru_UA.txt b/data/coll/ru_UA.txt
index a96c082..2941dfc 100644
--- a/data/coll/ru_UA.txt
+++ b/data/coll/ru_UA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sh.txt b/data/coll/sh.txt
index 3f0a236..1433f43 100644
--- a/data/coll/sh.txt
+++ b/data/coll/sh.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sh_BA.txt b/data/coll/sh_BA.txt
index af5634f..82a1a16 100644
--- a/data/coll/sh_BA.txt
+++ b/data/coll/sh_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sh_YU.txt b/data/coll/sh_YU.txt
index 516cdf3..85f7ad6 100644
--- a/data/coll/sh_YU.txt
+++ b/data/coll/sh_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/si.txt b/data/coll/si.txt
index 297f4ed..eaed23b 100644
--- a/data/coll/si.txt
+++ b/data/coll/si.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/si.xml
@@ -10,23 +10,25 @@
* ICU <specials> source: <path>/xml/collation/si.xml
*/
si{
- Version{"2.0.50.23"}
+ Version{"2.0.82.42"}
collations{
dictionary{
Sequence{
" [normalization on] [reorder Sinh Deva Beng Guru Gujr Orya Taml Telu"
" Knda Mlym]"
- "&ඖ<ං<ඃ&ජ්ඤ<<ඥ"
+ "&ඖ<ං<ඃ"
+ "&ජ්ඤ<<ඥ"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
Sequence{
" [normalization on] [reorder Sinh Deva Beng Guru Gujr Orya Taml Telu"
" Knda Mlym]"
- "&ඖ<ං<ඃ&ඥ<ඤ"
+ "&ඖ<ං<ඃ"
+ "&ඥ<ඤ"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/si_LK.txt b/data/coll/si_LK.txt
index 1cdcb5a..3e37e78 100644
--- a/data/coll/si_LK.txt
+++ b/data/coll/si_LK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sk.txt b/data/coll/sk.txt
index c86edb4..bd9edcd 100644
--- a/data/coll/sk.txt
+++ b/data/coll/sk.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/sk.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/sk.xml
*/
sk{
- Version{"2.0.63.65"}
+ Version{"2.0.82.42"}
collations{
search{
Sequence{
- " [normalization on ][suppressContractions [เ-ไ ເ-ໄ] ]"
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
"&'='<'\u2260'&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
"&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
"&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
@@ -75,7 +75,7 @@
"&Y<ý<<<Ý"
"&Z<ž<<<Ž"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
Sequence{
@@ -87,7 +87,7 @@
"&S<š<<<Š"
"&Z<ž<<<Ž"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/sk_SK.txt b/data/coll/sk_SK.txt
index 2f325ef..867617e 100644
--- a/data/coll/sk_SK.txt
+++ b/data/coll/sk_SK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sl.txt b/data/coll/sl.txt
index f251c4e..17ff24b 100644
--- a/data/coll/sl.txt
+++ b/data/coll/sl.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/sl.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/sl.xml
*/
sl{
- Version{"2.0.50.22"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{"&C<č<<<Č<ć<<<Ć&D<đ<<<Đ&S<š<<<Š&Z<ž<<<Ž"}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/sl_SI.txt b/data/coll/sl_SI.txt
index 338cc2c..c85fab6 100644
--- a/data/coll/sl_SI.txt
+++ b/data/coll/sl_SI.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sq.txt b/data/coll/sq.txt
index 7e3f878..7d27a3e 100644
--- a/data/coll/sq.txt
+++ b/data/coll/sq.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/sq.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/sq.xml
*/
sq{
- Version{"2.0.76.11"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -26,7 +26,7 @@
"&[before 1]Y<xh<<<Xh<<<XH"
"&[before 1]Ʒ<zh<<<Zh<<<ZH"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/sq_AL.txt b/data/coll/sq_AL.txt
index c86bf27..ef4df44 100644
--- a/data/coll/sq_AL.txt
+++ b/data/coll/sq_AL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sq_MK.txt b/data/coll/sq_MK.txt
index 790a04f..9ff1ae2 100755
--- a/data/coll/sq_MK.txt
+++ b/data/coll/sq_MK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sr.txt b/data/coll/sr.txt
index db996aa..ce563ec 100644
--- a/data/coll/sr.txt
+++ b/data/coll/sr.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/sr.xml
@@ -10,14 +10,14 @@
* ICU <specials> source: <path>/xml/collation/sr.xml
*/
sr{
- Version{"2.0.49.75"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
" [reorder Cyrl][suppressContractions [АаӘәГгЕеЖжЗзИиІіОоӨөКкУуЧчЫыЭэ"
"Ѵѵ]]"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/sr_BA.txt b/data/coll/sr_BA.txt
index bad5005..9754916 100644
--- a/data/coll/sr_BA.txt
+++ b/data/coll/sr_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sr_Cyrl.txt b/data/coll/sr_Cyrl.txt
index cf73b65..3bcb104 100644
--- a/data/coll/sr_Cyrl.txt
+++ b/data/coll/sr_Cyrl.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sr_Cyrl_BA.txt b/data/coll/sr_Cyrl_BA.txt
index 4f51b35..8088740 100644
--- a/data/coll/sr_Cyrl_BA.txt
+++ b/data/coll/sr_Cyrl_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sr_Cyrl_ME.txt b/data/coll/sr_Cyrl_ME.txt
index ad49a75..9da31c3 100644
--- a/data/coll/sr_Cyrl_ME.txt
+++ b/data/coll/sr_Cyrl_ME.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sr_Cyrl_RS.txt b/data/coll/sr_Cyrl_RS.txt
index 87a9130..5fb345e 100644
--- a/data/coll/sr_Cyrl_RS.txt
+++ b/data/coll/sr_Cyrl_RS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sr_Latn.txt b/data/coll/sr_Latn.txt
index 66ca594..aed426f 100644
--- a/data/coll/sr_Latn.txt
+++ b/data/coll/sr_Latn.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/sr_Latn.xml
@@ -10,6 +10,15 @@
* ICU <specials> source: <path>/xml/collation/sr_Latn.xml
*/
sr_Latn{
- Version{"2.0.41.26"}
- collations:alias{"hr/collations"}
+ Version{"2.0.82.42"}
+ collations{
+ search{
+ Sequence{"[import hr-u-co-search]"}
+ Version{"23"}
+ }
+ standard{
+ Sequence{"[import hr]"}
+ Version{"23"}
+ }
+ }
}
diff --git a/data/coll/sr_Latn_BA.txt b/data/coll/sr_Latn_BA.txt
index e5a58d0..923b6a7 100644
--- a/data/coll/sr_Latn_BA.txt
+++ b/data/coll/sr_Latn_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sr_Latn_ME.txt b/data/coll/sr_Latn_ME.txt
index 9105114..2a33681 100644
--- a/data/coll/sr_Latn_ME.txt
+++ b/data/coll/sr_Latn_ME.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sr_Latn_RS.txt b/data/coll/sr_Latn_RS.txt
index 3ec8797..9474a52 100644
--- a/data/coll/sr_Latn_RS.txt
+++ b/data/coll/sr_Latn_RS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sr_ME.txt b/data/coll/sr_ME.txt
index 3f994be..8d1ee98 100644
--- a/data/coll/sr_ME.txt
+++ b/data/coll/sr_ME.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sr_RS.txt b/data/coll/sr_RS.txt
index d9c7dc2..2fba029 100644
--- a/data/coll/sr_RS.txt
+++ b/data/coll/sr_RS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sv.txt b/data/coll/sv.txt
index 870feeb..2591a50 100644
--- a/data/coll/sv.txt
+++ b/data/coll/sv.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/sv.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/sv.xml
*/
sv{
- Version{"2.0.76.11"}
+ Version{"2.0.82.42"}
collations{
default{"reformed"}
reformed{
@@ -22,11 +22,11 @@
"&[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<<ę<<<Ę<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<œ<<<Œ<"
"<ô<<<Ô"
}
- Version{"22.1.1"}
+ Version{"23"}
}
search{
Sequence{
- " [normalization on ][suppressContractions [เ-ไ ເ-ໄ] ]"
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
"&'='<'\u2260'&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
"&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
"&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
@@ -80,7 +80,7 @@
"&[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<<ę<<<Ę<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<œ<<<Œ<"
"<ô<<<Ô"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
Sequence{
@@ -92,7 +92,7 @@
"&[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<<ę<<<Ę<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<œ<<<Œ<"
"<ô<<<Ô"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/sv_AX.txt b/data/coll/sv_AX.txt
index dad2220..ea16df6 100755
--- a/data/coll/sv_AX.txt
+++ b/data/coll/sv_AX.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sv_FI.txt b/data/coll/sv_FI.txt
index ea5e8be..4d0435a 100644
--- a/data/coll/sv_FI.txt
+++ b/data/coll/sv_FI.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sv_SE.txt b/data/coll/sv_SE.txt
index 6ae2b56..36b1164 100644
--- a/data/coll/sv_SE.txt
+++ b/data/coll/sv_SE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sw.txt b/data/coll/sw.txt
index 9dfe703..c140b44 100644
--- a/data/coll/sw.txt
+++ b/data/coll/sw.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sw_KE.txt b/data/coll/sw_KE.txt
index 3dc38f8..76b147e 100644
--- a/data/coll/sw_KE.txt
+++ b/data/coll/sw_KE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sw_TZ.txt b/data/coll/sw_TZ.txt
index 774adf7..1f4cb20 100644
--- a/data/coll/sw_TZ.txt
+++ b/data/coll/sw_TZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/sw_UG.txt b/data/coll/sw_UG.txt
index a1b4a4c..f9dcf82 100755
--- a/data/coll/sw_UG.txt
+++ b/data/coll/sw_UG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ta.txt b/data/coll/ta.txt
index b0c30f3..2bbbda6 100644
--- a/data/coll/ta.txt
+++ b/data/coll/ta.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/ta.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/ta.xml
*/
ta{
- Version{"2.0.76.11"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -43,7 +43,7 @@
"&[before 1]ஹ<ஹ்"
"&[before 1]க்ஷ<க்ஷ்"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/ta_IN.txt b/data/coll/ta_IN.txt
index f311996..a748c2f 100644
--- a/data/coll/ta_IN.txt
+++ b/data/coll/ta_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ta_LK.txt b/data/coll/ta_LK.txt
index fa00936..ce12992 100644
--- a/data/coll/ta_LK.txt
+++ b/data/coll/ta_LK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ta_MY.txt b/data/coll/ta_MY.txt
index e61c1ff..f1c2db0 100755
--- a/data/coll/ta_MY.txt
+++ b/data/coll/ta_MY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ta_SG.txt b/data/coll/ta_SG.txt
index 0d1b236..4ced075 100755
--- a/data/coll/ta_SG.txt
+++ b/data/coll/ta_SG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/te.txt b/data/coll/te.txt
index fe1e965..7f3dba4 100644
--- a/data/coll/te.txt
+++ b/data/coll/te.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/te.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/te.xml
*/
te{
- Version{"2.0.50.32"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -18,7 +18,7 @@
" Mlym Sinh]"
"&ఔ<ఁ<ం<ః"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/te_IN.txt b/data/coll/te_IN.txt
index 7aaf2dd..003d129 100644
--- a/data/coll/te_IN.txt
+++ b/data/coll/te_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/th.txt b/data/coll/th.txt
index 4efd7ad..e55ae63 100644
--- a/data/coll/th.txt
+++ b/data/coll/th.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/th.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/th.xml
*/
th{
- Version{"2.0.71.89"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -24,7 +24,7 @@
"&ๅํ<<<ํๅ"
"&ไ<ฺ"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/th_TH.txt b/data/coll/th_TH.txt
index 9a86246..946d409 100644
--- a/data/coll/th_TH.txt
+++ b/data/coll/th_TH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/to.txt b/data/coll/to.txt
index 983c335..3cb8ed7 100755
--- a/data/coll/to.txt
+++ b/data/coll/to.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/to.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/to.xml
*/
to{
- Version{"2.0.75.44"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -22,7 +22,7 @@
"&o<<ó<<<Ó<<ō<<<Ō"
"&u<<ú<<<Ú<<ū<<<Ū"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/to_TO.txt b/data/coll/to_TO.txt
index e85a0fa..823c89e 100755
--- a/data/coll/to_TO.txt
+++ b/data/coll/to_TO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/tr.txt b/data/coll/tr.txt
index 4effc9f..15282e1 100644
--- a/data/coll/tr.txt
+++ b/data/coll/tr.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/tr.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/tr.xml
*/
tr{
- Version{"2.0.76.11"}
+ Version{"2.0.82.42"}
collations{
search{
Sequence{
- " [normalization on ][suppressContractions [เ-ไ ເ-ໄ] ]"
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
"&'='<'\u2260'&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
"&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
"&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
@@ -68,7 +68,7 @@
"&S<ş<<<Ş"
"&U<ü<<<Ü"
}
- Version{"22.1.1"}
+ Version{"23"}
}
standard{
Sequence{
@@ -80,7 +80,7 @@
"&S<ş<<<Ş"
"&U<ü<<<Ü"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/tr_CY.txt b/data/coll/tr_CY.txt
index f5f71c5..a8fbc08 100755
--- a/data/coll/tr_CY.txt
+++ b/data/coll/tr_CY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/tr_TR.txt b/data/coll/tr_TR.txt
index 558c416..4d7ed18 100644
--- a/data/coll/tr_TR.txt
+++ b/data/coll/tr_TR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/uk.txt b/data/coll/uk.txt
index d361a8e..b0ba1ba 100644
--- a/data/coll/uk.txt
+++ b/data/coll/uk.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/uk.xml
@@ -10,14 +10,14 @@
* ICU <specials> source: <path>/xml/collation/uk.xml
*/
uk{
- Version{"2.0.62.15"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
" [reorder Cyrl][suppressContractions [АаӘәГгЕеЖжЗзОоӨөКкУуЧчЫыЭэѴѵ]]"
"&Г<ґ<<<Ґ"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/uk_UA.txt b/data/coll/uk_UA.txt
index 07f6d8f..d02c5ca 100644
--- a/data/coll/uk_UA.txt
+++ b/data/coll/uk_UA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ur.txt b/data/coll/ur.txt
index c3f4532..bf3937c 100755
--- a/data/coll/ur.txt
+++ b/data/coll/ur.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/ur.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/ur.xml
*/
ur{
- Version{"2.0.51.50"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
@@ -21,7 +21,7 @@
"&ْ<<َ<<ِ<<ُ<<ٰ<<ٖ<<ٗ<<ً<<ٍ<<ٌ<<ٔ<<ّ<<٘<<ٓ"
"&[last tertiary ignorable ]<<<ؐ<<<ؑ<<<ؓ<<<ؒ<<<ؔ"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/ur_IN.txt b/data/coll/ur_IN.txt
index f1f2e73..c59da0f 100755
--- a/data/coll/ur_IN.txt
+++ b/data/coll/ur_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/ur_PK.txt b/data/coll/ur_PK.txt
index e7906aa..a875fd4 100755
--- a/data/coll/ur_PK.txt
+++ b/data/coll/ur_PK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/vi.txt b/data/coll/vi.txt
index 76ea5a2..7c97466 100644
--- a/data/coll/vi.txt
+++ b/data/coll/vi.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/vi.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/vi.xml
*/
vi{
- Version{"2.0.41.26"}
+ Version{"2.0.82.42"}
collations{
standard{
Sequence{
- " [normalization on ]"
+ " [normalization on]"
"&̀<<̉<<̃<<́<<̣"
"&a<ă<<<Ă<â<<<Â"
"&d<đ<<<Đ"
@@ -22,7 +22,7 @@
"&o<ô<<<Ô<ơ<<<Ơ"
"&u<ư<<<Ư"
}
- Version{"22.1.1"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/vi_VN.txt b/data/coll/vi_VN.txt
index 9970479..aea9b26 100644
--- a/data/coll/vi_VN.txt
+++ b/data/coll/vi_VN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/yo.txt b/data/coll/yo.txt
index bda644f..b1427b1 100755
--- a/data/coll/yo.txt
+++ b/data/coll/yo.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/yo.xml
@@ -10,11 +10,11 @@
* ICU <specials> source: <path>/xml/collation/yo.xml
*/
yo{
- Version{"2.0.49.41"}
+ Version{"2.0.82.42"}
collations{
standard{
- Sequence{" [normalization on ]&E<ẹ<<<Ẹ&G<gb<<<Gb<<<GB&O<ọ<<<Ọ&S<ṣ<<<Ṣ"}
- Version{"22.1.1"}
+ Sequence{" [normalization on]&E<ẹ<<<Ẹ&G<gb<<<Gb<<<GB&O<ọ<<<Ọ&S<ṣ<<<Ṣ"}
+ Version{"23"}
}
}
}
diff --git a/data/coll/yo_NG.txt b/data/coll/yo_NG.txt
index f4a22b8..8d6dac2 100755
--- a/data/coll/yo_NG.txt
+++ b/data/coll/yo_NG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/zh.txt b/data/coll/zh.txt
index 7bb17f8..4991b47 100644
--- a/data/coll/zh.txt
+++ b/data/coll/zh.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/zh.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/zh.xml
*/
zh{
- Version{"2.0.75.85"}
+ Version{"2.0.82.42"}
collations{
// BEGIN android-remove
// Omitted big5han
@@ -792,21 +792,7 @@
"&龟<<<⻳"
"&龠<<<⿕"
}
- Version{"22.1.1"}
- }
- standard{
- Sequence{
- "&[before 2]a<<ā<<<Ā<<á<<<Á<<ǎ<<<Ǎ<<à<<<À"
- "&[before 2]e<<ē<<<Ē<<é<<<É<<ě<<<Ě<<è<<<È"
- "&e<<ê̄<<<Ê̄<<ế<<<Ế<<ê̌<<<Ê̌<<ề<<<Ề"
- "&[before 2]i<<ī<<<Ī<<í<<<Í<<ǐ<<<Ǐ<<ì<<<Ì"
- "&[before 2]m<<m̄<<<M̄<<ḿ<<<Ḿ<<m̌<<<M̌<<m̀<<<M̀"
- "&[before 2]n<<n̄<<<N̄<<ń<<<Ń<<ň<<<Ň<<ǹ<<<Ǹ"
- "&[before 2]o<<ō<<<Ō<<ó<<<Ó<<ǒ<<<Ǒ<<ò<<<Ò"
- "&[before 2]u<<ū<<<Ū<<ú<<<Ú<<ǔ<<<Ǔ<<ù<<<Ù"
- "&U<<ǖ<<<Ǖ<<ǘ<<<Ǘ<<ǚ<<<Ǚ<<ǜ<<<Ǜ<<ü<<<Ü"
- }
- Version{"22.1.1"}
+ Version{"23"}
}
stroke{
Sequence{
@@ -1460,7 +1446,7 @@
"&龟<<<⻳"
"&龠<<<⿕"
}
- Version{"22.1.1"}
+ Version{"23"}
}
// BEGIN android-remove
// Omitted unihan
diff --git a/data/coll/zh_.txt b/data/coll/zh_.txt
deleted file mode 100644
index b9bc494..0000000
--- a/data/coll/zh_.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/icu-config.xml & build.xml
-// *
-// ***************************************************************************
-/**
- * empty locale file for dependency checking
- */
-zh_{
- /**
- * so genrb doesn't issue warnings
- */
- ___{""}
-}
diff --git a/data/coll/zh_CN.txt b/data/coll/zh_CN.txt
index 348f06e..28103b9 100644
--- a/data/coll/zh_CN.txt
+++ b/data/coll/zh_CN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/zh_HK.txt b/data/coll/zh_HK.txt
index 8e03c71..67efd92 100644
--- a/data/coll/zh_HK.txt
+++ b/data/coll/zh_HK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/zh_Hans.txt b/data/coll/zh_Hans.txt
index 40e76cf..dc00f88 100644
--- a/data/coll/zh_Hans.txt
+++ b/data/coll/zh_Hans.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/zh_Hans_CN.txt b/data/coll/zh_Hans_CN.txt
index 60bdb49..e01d1da 100644
--- a/data/coll/zh_Hans_CN.txt
+++ b/data/coll/zh_Hans_CN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/zh_Hans_SG.txt b/data/coll/zh_Hans_SG.txt
index 8f577ad..45c9ba5 100644
--- a/data/coll/zh_Hans_SG.txt
+++ b/data/coll/zh_Hans_SG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/zh_Hant.txt b/data/coll/zh_Hant.txt
index a169452..4d17b87 100644
--- a/data/coll/zh_Hant.txt
+++ b/data/coll/zh_Hant.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/collation/zh_Hant.xml
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/collation/zh_Hant.xml
*/
zh_Hant{
- Version{"2.0.41.26"}
+ Version{"2.0.82.42"}
collations{
default{"stroke"}
}
diff --git a/data/coll/zh_Hant_HK.txt b/data/coll/zh_Hant_HK.txt
index 975eefa..f27917a 100644
--- a/data/coll/zh_Hant_HK.txt
+++ b/data/coll/zh_Hant_HK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/zh_Hant_MO.txt b/data/coll/zh_Hant_MO.txt
index ef5c526..1c10b35 100644
--- a/data/coll/zh_Hant_MO.txt
+++ b/data/coll/zh_Hant_MO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/zh_Hant_TW.txt b/data/coll/zh_Hant_TW.txt
index 2e016ab..697dd0f 100644
--- a/data/coll/zh_Hant_TW.txt
+++ b/data/coll/zh_Hant_TW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/zh_MO.txt b/data/coll/zh_MO.txt
index 7a340a7..0492740 100644
--- a/data/coll/zh_MO.txt
+++ b/data/coll/zh_MO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/zh_SG.txt b/data/coll/zh_SG.txt
index e5b7c41..4ebb462 100644
--- a/data/coll/zh_SG.txt
+++ b/data/coll/zh_SG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/zh_TW.txt b/data/coll/zh_TW.txt
index 5957fe3..dc597d3 100644
--- a/data/coll/zh_TW.txt
+++ b/data/coll/zh_TW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/zh_TW_STROKE.txt b/data/coll/zh_TW_STROKE.txt
deleted file mode 100644
index ced067e..0000000
--- a/data/coll/zh_TW_STROKE.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/icu-config.xml & build.xml
-// *
-// ***************************************************************************
-zh_TW_STROKE{
- collations{
- default{"stroke"}
- }
-}
diff --git a/data/coll/zh__PINYIN.txt b/data/coll/zh__PINYIN.txt
deleted file mode 100644
index 9998b04..0000000
--- a/data/coll/zh__PINYIN.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/icu-config.xml & build.xml
-// *
-// ***************************************************************************
-zh__PINYIN{
- collations{
- default{"pinyin"}
- }
-}
diff --git a/data/coll/zu.txt b/data/coll/zu.txt
index d3edc71..dd5d417 100644
--- a/data/coll/zu.txt
+++ b/data/coll/zu.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/coll/zu_ZA.txt b/data/coll/zu_ZA.txt
index 44944d5..9ed6c90 100644
--- a/data/coll/zu_ZA.txt
+++ b/data/coll/zu_ZA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/af.txt b/data/curr/af.txt
index d3cdce2..783fcf3 100644
--- a/data/curr/af.txt
+++ b/data/curr/af.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/af.xml
// *
@@ -264,7 +264,7 @@
"Israeliese nuwe sikkel",
}
INR{
- "₹",
+ "Rs.",
"Indiese rupee",
}
IQD{
@@ -665,6 +665,10 @@
}
ZMK{
"ZMK",
+ "Zambiese kwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambiese kwacha",
}
ZWD{
@@ -690,5 +694,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/af_NA.txt b/data/curr/af_NA.txt
index 1e7d6de..4703879 100755
--- a/data/curr/af_NA.txt
+++ b/data/curr/af_NA.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/af_NA.xml
// *
@@ -13,5 +13,5 @@
"Namibiese dollar",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/agq.txt b/data/curr/agq.txt
index 4be0af5..29c981f 100755
--- a/data/curr/agq.txt
+++ b/data/curr/agq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/agq.xml
// *
@@ -96,7 +96,7 @@
"Fàlâŋ è Ginè",
}
INR{
- "₹",
+ "Rs.",
"Lukpì è Endìa",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Kwachà è Zambìa (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwachà è Zambìa",
}
ZWD{
@@ -228,5 +232,5 @@
"Dɔlà è Zìmbagbɛ̀",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ak.txt b/data/curr/ak.txt
index cd18817..3c6cca3 100755
--- a/data/curr/ak.txt
+++ b/data/curr/ak.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ak.xml
// *
@@ -85,6 +85,10 @@
}
GHC{
"GHC",
+ "Ghana Sidi (1979-2007)",
+ }
+ GHS{
+ "GH₵",
"Ghana Sidi",
}
GMD{
@@ -96,7 +100,7 @@
"Gini Frank",
}
INR{
- "₹",
+ "Rs.",
"India Rupi",
}
JPY{
@@ -221,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Zambia Kwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambia Kwacha",
}
ZWD{
@@ -228,5 +236,5 @@
"Zimbabwe Dɔla",
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/am.txt b/data/curr/am.txt
index a7674ca..c432142 100644
--- a/data/curr/am.txt
+++ b/data/curr/am.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/am.xml
// *
@@ -260,7 +260,7 @@
"የእስራኤል አዲስ ሽቅል",
}
INR{
- "₹",
+ "Rs.",
"የሕንድ ሩፒ",
}
IQD{
@@ -649,6 +649,10 @@
}
ZMK{
"ZMK",
+ "የዛምቢያ ክዋቻ (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"የዛምቢያ ክዋቻ",
}
ZWD{
@@ -1266,6 +1270,10 @@
other{"የደቡብ አፍሪካ ራንድ"}
}
ZMK{
+ one{"የዛምቢያ ክዋቻ (1968-2012)"}
+ other{"የዛምቢያ ክዋቻ (1968-2012)"}
+ }
+ ZMW{
one{"የዛምቢያ ክዋቻ"}
other{"የዛምቢያ ክዋቻ"}
}
@@ -1274,5 +1282,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.52"}
}
diff --git a/data/curr/ar.txt b/data/curr/ar.txt
index c5cd269..4093268 100644
--- a/data/curr/ar.txt
+++ b/data/curr/ar.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar.xml
// *
@@ -1005,6 +1005,10 @@
}
ZMK{
"ZMK",
+ "كواشا زامبي - 1968-2012",
+ }
+ ZMW{
+ "ZMW",
"كواشا زامبي",
}
ZRN{
@@ -2170,6 +2174,14 @@
zero{"راند جنوب أفريقيا"}
}
ZMK{
+ few{"كواشا زامبي - 1968-2012"}
+ many{"كواشا زامبي - 1968-2012"}
+ one{"كواشا زامبي - 1968-2012"}
+ other{"كواشا زامبي - 1968-2012"}
+ two{"كواشا زامبي - 1968-2012"}
+ zero{"كواشا زامبي - 1968-2012"}
+ }
+ ZMW{
few{"كواشا زامبي"}
many{"كواشا زامبي"}
one{"كواشا زامبي"}
@@ -2186,5 +2198,5 @@
two{"{0} {1}"}
zero{"{0} {1}"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ar_DJ.txt b/data/curr/ar_DJ.txt
new file mode 100755
index 0000000..dbe6225
--- /dev/null
+++ b/data/curr/ar_DJ.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/ar_DJ.xml
+// *
+// ***************************************************************************
+ar_DJ{
+ Currencies{
+ DJF{
+ "Fdj",
+ "فرنك جيبوتي",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/ar_ER.txt b/data/curr/ar_ER.txt
new file mode 100755
index 0000000..0c5065e
--- /dev/null
+++ b/data/curr/ar_ER.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/ar_ER.xml
+// *
+// ***************************************************************************
+ar_ER{
+ Currencies{
+ ERN{
+ "Nfk",
+ "ناكفا أريتري",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/ar_SO.txt b/data/curr/ar_SO.txt
new file mode 100755
index 0000000..1e42c70
--- /dev/null
+++ b/data/curr/ar_SO.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/ar_SO.xml
+// *
+// ***************************************************************************
+ar_SO{
+ Currencies{
+ SOS{
+ "S",
+ "شلن صومالي",
+ }
+ }
+ Version{"2.0.82.68"}
+}
diff --git a/data/curr/as.txt b/data/curr/as.txt
index a4d836b..20c3776 100644
--- a/data/curr/as.txt
+++ b/data/curr/as.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/as.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/as.xml
*/
as{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/asa.txt b/data/curr/asa.txt
index 7cbd1f3..24ad703 100755
--- a/data/curr/asa.txt
+++ b/data/curr/asa.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/asa.xml
// *
@@ -96,7 +96,7 @@
"faranga ya Gine",
}
INR{
- "₹",
+ "Rs.",
"rupia ya India",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "kwacha ya Dhambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"kwacha ya Dhambia",
}
ZWD{
@@ -232,5 +236,5 @@
"dola ya Dhimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/az.txt b/data/curr/az.txt
index d883230..016a56f 100644
--- a/data/curr/az.txt
+++ b/data/curr/az.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/az.xml
// *
@@ -440,7 +440,7 @@
"İzrail yeni şekeli",
}
INR{
- "₹",
+ "Rs.",
"Hindistan rupisi",
}
IQD{
@@ -981,6 +981,10 @@
}
ZMK{
"ZMK",
+ "Zambiya kvaçı (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambiya kvaçı",
}
ZRN{
@@ -1724,6 +1728,9 @@
other{"Cənub Afrika randı"}
}
ZMK{
+ other{"Zambiya kvaçı (1968-2012)"}
+ }
+ ZMW{
other{"Zambiya kvaçı"}
}
ZRN{
@@ -1736,5 +1743,5 @@
other{"Zimbabve dolları (1980-2008)"}
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/az_AZ.txt b/data/curr/az_AZ.txt
index 881b97c..f76eaaa 100644
--- a/data/curr/az_AZ.txt
+++ b/data/curr/az_AZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/az_Cyrl.txt b/data/curr/az_Cyrl.txt
index 3e4a60c..adaf96a 100644
--- a/data/curr/az_Cyrl.txt
+++ b/data/curr/az_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/az_Cyrl.xml
// *
@@ -16,5 +16,5 @@
"AZN",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/az_Latn.txt b/data/curr/az_Latn.txt
index 72a33fc..fb302c0 100644
--- a/data/curr/az_Latn.txt
+++ b/data/curr/az_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/az_Latn.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/az_Latn.xml
*/
az_Latn{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/az_Latn_AZ.txt b/data/curr/az_Latn_AZ.txt
index 45b7660..f907674 100644
--- a/data/curr/az_Latn_AZ.txt
+++ b/data/curr/az_Latn_AZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/bas.txt b/data/curr/bas.txt
index 687e376..5ff72cf 100755
--- a/data/curr/bas.txt
+++ b/data/curr/bas.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bas.xml
// *
@@ -96,7 +96,7 @@
"Frǎŋ gìnê",
}
INR{
- "₹",
+ "Rs.",
"Rùpi īndìà",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Kwàca sàmbià (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwàca sàmbià",
}
ZWD{
@@ -232,5 +236,5 @@
"Dɔ̀lâr sìmbàbwê",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/be.txt b/data/curr/be.txt
index eb4c288..0321fc0 100644
--- a/data/curr/be.txt
+++ b/data/curr/be.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/be.xml
// *
@@ -19,12 +19,8 @@
"R$",
"бразільскі рэал",
}
- BYB{
- "Руб",
- "BYB",
- }
BYR{
- "BYR",
+ "р.",
"беларускі рубель",
}
CNY{
@@ -44,7 +40,7 @@
"англійскі фунт",
}
INR{
- "₹",
+ "Rs.",
"індыйская рупія",
}
JPY{
@@ -68,5 +64,5 @@
"невядомая або недапушчальная валюта",
}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.49"}
}
diff --git a/data/curr/bem.txt b/data/curr/bem.txt
index cedddfa..833e7f1 100755
--- a/data/curr/bem.txt
+++ b/data/curr/bem.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bem.xml
// *
@@ -12,9 +12,13 @@
bem{
Currencies{
ZMK{
- "ZK",
+ "K",
"ZMK",
}
+ ZMW{
+ "KR",
+ "ZMW",
+ }
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/bez.txt b/data/curr/bez.txt
index d96a953..b384dbf 100755
--- a/data/curr/bez.txt
+++ b/data/curr/bez.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bez.xml
// *
@@ -96,7 +96,7 @@
"Lupila lwa Hujine",
}
INR{
- "₹",
+ "Rs.",
"Lupila lwa Huindia",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Lupila lwa Huzambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Lupila lwa Huzambia",
}
ZWD{
@@ -228,5 +232,5 @@
"Lupila lwa Huzimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/bg.txt b/data/curr/bg.txt
index 0445c10..35026b2 100644
--- a/data/curr/bg.txt
+++ b/data/curr/bg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bg.xml
// *
@@ -448,7 +448,7 @@
"Израелски нов шекел",
}
INR{
- "₹",
+ "Rs.",
"Индийска рупия",
}
IQD{
@@ -1045,6 +1045,10 @@
}
ZMK{
"ZMK",
+ "Замбийска квача (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Замбийска квача",
}
ZRN{
@@ -1930,6 +1934,10 @@
other{"южноафрикански ранда"}
}
ZMK{
+ one{"замбийска квача (1968-2012)"}
+ other{"замбийски квачи (1968-2012)"}
+ }
+ ZMW{
one{"замбийска квача"}
other{"замбийски квачи"}
}
@@ -1954,5 +1962,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/bm.txt b/data/curr/bm.txt
index f4e44db..c136c54 100755
--- a/data/curr/bm.txt
+++ b/data/curr/bm.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bm.xml
// *
@@ -96,7 +96,7 @@
"gine Fraŋ",
}
INR{
- "₹",
+ "Rs.",
"Ɛndu Rupi",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "zambi Kwaca (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"zambi Kwaca",
}
ZWD{
@@ -232,5 +236,5 @@
"zimbabuwe Dolar",
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/bn.txt b/data/curr/bn.txt
index 669033a..e7202bf 100644
--- a/data/curr/bn.txt
+++ b/data/curr/bn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bn.xml
// *
@@ -456,7 +456,7 @@
"ইস্রাইলি নতুন শেকেল",
}
INR{
- "₹",
+ "Rs.",
"ভারতীয় রুপি",
}
IQD{
@@ -1061,6 +1061,10 @@
}
ZMK{
"ZMK",
+ "জাম্বিয়ান কওয়াচা (১৯৬৮-২০১২)",
+ }
+ ZMW{
+ "ZMW",
"জাম্বিয়ান কওয়াচা",
}
ZRN{
@@ -1098,5 +1102,5 @@
other{"সুদানি পাউন্ড"}
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.47"}
}
diff --git a/data/curr/bn_IN.txt b/data/curr/bn_IN.txt
index bf9134b..48fce22 100755
--- a/data/curr/bn_IN.txt
+++ b/data/curr/bn_IN.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bn_IN.xml
// *
@@ -123,5 +123,5 @@
other{"মার্কিন ডলার"}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/bo.txt b/data/curr/bo.txt
index fe2d721..3bafa24 100644
--- a/data/curr/bo.txt
+++ b/data/curr/bo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bo.xml
// *
@@ -12,11 +12,11 @@
bo{
Currencies{
CNY{
- "CN¥",
+ "¥",
"ཡུ་ཨན་",
}
INR{
- "₹",
+ "Rs.",
"རྒྱ་གར་སྒོར་མོ་",
}
XXX{
@@ -24,5 +24,5 @@
"མ་རྟོགས་པའི་ནུས་མེད་དངུལ་ལོར",
}
}
- Version{"2.0.74.85"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/bo_IN.txt b/data/curr/bo_IN.txt
new file mode 100755
index 0000000..1e32aa2
--- /dev/null
+++ b/data/curr/bo_IN.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/bo_IN.xml
+// *
+// ***************************************************************************
+bo_IN{
+ Currencies{
+ CNY{
+ "CN¥",
+ "ཡུ་ཨན་",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/br.txt b/data/curr/br.txt
index a03f10d..a27c66c 100755
--- a/data/curr/br.txt
+++ b/data/curr/br.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/br.xml
// *
@@ -268,7 +268,7 @@
"shekel nevez Israel",
}
INR{
- "₹",
+ "Rs.",
"roupi India",
}
IQD{
@@ -749,6 +749,10 @@
}
ZMK{
"ZMK",
+ "kwacha Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"kwacha Zambia",
}
ZWD{
@@ -1332,6 +1336,12 @@
two{"zinar Yemen"}
}
ZMK{
+ few{"kwacha Zambia (1968-2012)"}
+ one{"c'hwacha Zambia (1968-2012)"}
+ other{"kwacha Zambia (1968-2012)"}
+ two{"gwacha Zambia (1968-2012)"}
+ }
+ ZMW{
few{"kwacha Zambia"}
one{"c'hwacha Zambia"}
other{"kwacha Zambia"}
@@ -1350,5 +1360,5 @@
two{"zollar Zimbabwe (2009)"}
}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.57"}
}
diff --git a/data/curr/brx.txt b/data/curr/brx.txt
index c4daf91..ccb3f3d 100755
--- a/data/curr/brx.txt
+++ b/data/curr/brx.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/brx.xml
// *
@@ -452,7 +452,7 @@
"इस्राइली शेकेल",
}
INR{
- "₹",
+ "Rs.",
"रां",
}
IQD{
@@ -1061,6 +1061,10 @@
}
ZMK{
"ZMK",
+ "ज़ाम्बियाई क्वाचा (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"ज़ाम्बियाई क्वाचा",
}
ZRN{
@@ -1076,5 +1080,5 @@
"ज़ीम्बाबवेई डॉलर",
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/bs.txt b/data/curr/bs.txt
index 0631ad8..e42b292 100644
--- a/data/curr/bs.txt
+++ b/data/curr/bs.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bs.xml
// *
@@ -468,7 +468,7 @@
"Izraelski šekel",
}
INR{
- "₹",
+ "Rs.",
"Indijski rupi",
}
IQD{
@@ -1113,6 +1113,10 @@
}
ZMK{
"ZMK",
+ "Zambijska kvača (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambijska kvača",
}
ZRN{
@@ -2788,6 +2792,12 @@
other{"južnoafričkih randa"}
}
ZMK{
+ few{"zambijske kvače (1968-2012)"}
+ many{"zambijskih kvača (1968-2012)"}
+ one{"zambijska kvača (1968-2012)"}
+ other{"zambijske kvače (1968-2012)"}
+ }
+ ZMW{
few{"zambijske kvače"}
many{"zambijskih kvača"}
one{"zambijska kvača"}
@@ -2824,5 +2834,5 @@
other{"zimbabvejskih dolara (2008)"}
}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/bs_BA.txt b/data/curr/bs_BA.txt
index 3fb951c..a5158e5 100755
--- a/data/curr/bs_BA.txt
+++ b/data/curr/bs_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/bs_Cyrl.txt b/data/curr/bs_Cyrl.txt
index 3d7aa77..a8c0109 100755
--- a/data/curr/bs_Cyrl.txt
+++ b/data/curr/bs_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bs_Cyrl.xml
// *
@@ -460,7 +460,7 @@
"Израелски нови шекел",
}
INR{
- "₹",
+ "Rs.",
"Индијски Рупи",
}
IQD{
@@ -1089,6 +1089,10 @@
}
ZMK{
"ZMK",
+ "Замбијска квача (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Замбијска квача",
}
ZRN{
@@ -2728,6 +2732,12 @@
other{"јужно-афричких ранда"}
}
ZMK{
+ few{"замбијске кваче (1968-2012)"}
+ many{"замбијских квача (1968-2012)"}
+ one{"замбијска квача (1968-2012)"}
+ other{"замбијске кваче (1968-2012)"}
+ }
+ ZMW{
few{"замбијске кваче"}
many{"замбијских квача"}
one{"замбијска квача"}
@@ -2758,5 +2768,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.47"}
}
diff --git a/data/curr/bs_Latn.txt b/data/curr/bs_Latn.txt
index 3ea3b65..940f036 100755
--- a/data/curr/bs_Latn.txt
+++ b/data/curr/bs_Latn.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bs_Latn.xml
// *
// ***************************************************************************
bs_Latn{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/bs_Latn_BA.txt b/data/curr/bs_Latn_BA.txt
index 3906520..f6c37c6 100755
--- a/data/curr/bs_Latn_BA.txt
+++ b/data/curr/bs_Latn_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/ca.txt b/data/curr/ca.txt
index fa5ccb7..d594b54 100644
--- a/data/curr/ca.txt
+++ b/data/curr/ca.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ca.xml
// *
@@ -501,7 +501,7 @@
"nou xéquel israelià",
}
INR{
- "₹",
+ "Rs.",
"rupia índia",
}
IQD{
@@ -1158,6 +1158,10 @@
}
ZMK{
"ZMK",
+ "kwacha zambià (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"kwacha zambià",
}
ZRN{
@@ -2331,6 +2335,10 @@
other{"rands sud-africans"}
}
ZMK{
+ one{"kwacha zambià (1968-2012)"}
+ other{"kwacha zambians (1968-2012)"}
+ }
+ ZMW{
one{"kwacha zambià"}
other{"kwacha zambians"}
}
@@ -2359,5 +2367,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.57"}
}
diff --git a/data/curr/cgg.txt b/data/curr/cgg.txt
index c968efb..9ecde63 100755
--- a/data/curr/cgg.txt
+++ b/data/curr/cgg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/cgg.xml
// *
@@ -96,7 +96,7 @@
"Faranga ya Guinea",
}
INR{
- "₹",
+ "Rs.",
"Rupiya ya India",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Kwacha ya Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha ya Zambia",
}
ZWD{
@@ -228,5 +232,5 @@
"Doora ya Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/chr.txt b/data/curr/chr.txt
index 4756231..a97af7a 100755
--- a/data/curr/chr.txt
+++ b/data/curr/chr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/chr.xml
// *
@@ -32,7 +32,7 @@
"ᎩᎵᏏᏲ ᎠᏕᎳ",
}
INR{
- "₹",
+ "Rs.",
"ᎢᏅᏗᎾ ᎠᏕᎳ",
}
JPY{
@@ -62,5 +62,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/cs.txt b/data/curr/cs.txt
index cf34a87..797f93c 100644
--- a/data/curr/cs.txt
+++ b/data/curr/cs.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/cs.xml
// *
@@ -412,7 +412,7 @@
"izraelský nový šekel",
}
INR{
- "₹",
+ "Rs.",
"indická rupie",
}
IQD{
@@ -1037,6 +1037,10 @@
}
ZMK{
"ZMK",
+ "zambijská kwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"zambijská kwacha",
}
ZRN{
@@ -2307,6 +2311,11 @@
other{"jihoafrických randů"}
}
ZMK{
+ few{"zambijské kwachy (1968-2012)"}
+ one{"zambijská kwacha (1968-2012)"}
+ other{"zambijských kwach (1968-2012)"}
+ }
+ ZMW{
few{"zambijské kwachy"}
one{"zambijská kwacha"}
other{"zambijských kwach"}
@@ -2342,5 +2351,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/cy.txt b/data/curr/cy.txt
index f376546..5469505 100644
--- a/data/curr/cy.txt
+++ b/data/curr/cy.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/cy.xml
// *
@@ -11,38 +11,1908 @@
*/
cy{
Currencies{
+ AED{
+ "AED",
+ "Dirham Yr Emiradau Arabaidd Unedig",
+ }
+ AFN{
+ "AFN",
+ "Afghani Afghanistan",
+ }
+ ALL{
+ "ALL",
+ "Lek Albania",
+ }
+ AMD{
+ "AMD",
+ "Dram Armenia",
+ }
+ ANG{
+ "ANG",
+ "Guilder Antilles yr Iseldiroedd",
+ }
+ AOA{
+ "AOA",
+ "Kwanza Angola",
+ }
+ AUD{
+ "A$",
+ "Doler Awstralia",
+ }
+ AWG{
+ "AWG",
+ "Fflorin Aruba",
+ }
+ AZN{
+ "AZN",
+ "Manat Azerbaijan",
+ }
+ BAM{
+ "BAM",
+ "Marc Trosadwy Bosnia a Hercegovina",
+ }
+ BBD{
+ "BBD",
+ "Doler Barbados",
+ }
+ BDT{
+ "BDT",
+ "Taka Bangladesh",
+ }
+ BGN{
+ "BGN",
+ "Lev Bwlgaria",
+ }
+ BHD{
+ "BHD",
+ "Dinar Bahrain",
+ }
+ BIF{
+ "BIF",
+ "Ffranc Burundi",
+ }
+ BMD{
+ "BMD",
+ "Doler Bermuda",
+ }
+ BND{
+ "BND",
+ "Doler Brunei",
+ }
+ BOB{
+ "BOB",
+ "Boliviano Bolifia",
+ }
BRL{
"R$",
"Real Brasil",
}
+ BSD{
+ "BSD",
+ "Doler y Bahamas",
+ }
+ BTN{
+ "BTN",
+ "Ngultrum Bhutan",
+ }
+ BWP{
+ "BWP",
+ "Pula Botswana",
+ }
+ BYR{
+ "BYR",
+ "Rwbl Belarws",
+ }
+ BZD{
+ "BZD",
+ "Doler Belize",
+ }
+ CAD{
+ "CA$",
+ "Doler Canada",
+ }
+ CDF{
+ "CDF",
+ "Ffranc Congo",
+ }
+ CHF{
+ "CHF",
+ "Ffranc y Swistir",
+ }
+ CLP{
+ "CLP",
+ "Peso Chile",
+ }
CNY{
"CN¥",
- "Yuan Renminbi Tseina",
+ "Yuan Tsieina",
+ }
+ COP{
+ "COP",
+ "Peso Colombia",
+ }
+ CRC{
+ "CRC",
+ "Colón Costa Rica",
+ }
+ CUC{
+ "CUC",
+ "Peso Trosadwy Cuba",
+ }
+ CUP{
+ "CUP",
+ "Peso Cuba",
+ }
+ CVE{
+ "CVE",
+ "Esgwdo Cabo Verde",
+ }
+ CZK{
+ "CZK",
+ "Koruna Tsiec",
+ }
+ DJF{
+ "DJF",
+ "Ffranc Djibouti",
+ }
+ DKK{
+ "DKK",
+ "Krone Denmarc",
+ }
+ DOP{
+ "DOP",
+ "Peso Gweriniaeth Dominica",
+ }
+ DZD{
+ "DZD",
+ "Dinar Algeria",
+ }
+ EGP{
+ "EGP",
+ "Punt Yr Aifft",
+ }
+ ERN{
+ "ERN",
+ "Nakfa Eritrea",
+ }
+ ETB{
+ "ETB",
+ "Birr Ethiopia",
}
EUR{
"€",
"Ewro",
}
+ FJD{
+ "FJD",
+ "Doler Ffiji",
+ }
+ FKP{
+ "FKP",
+ "Punt Ynysoedd Falkland/Malvinas",
+ }
GBP{
"£",
"Punt Sterling Prydain",
}
+ GEL{
+ "GEL",
+ "Lari Georgia",
+ }
+ GHS{
+ "GHS",
+ "Cedi Ghana",
+ }
+ GIP{
+ "GIP",
+ "Punt Gibraltar",
+ }
+ GMD{
+ "GMD",
+ "Dalasi Gambia",
+ }
+ GNF{
+ "GNF",
+ "Ffranc Guinée",
+ }
+ GTQ{
+ "GTQ",
+ "Quetzal Guatemala",
+ }
+ GYD{
+ "GYD",
+ "Doler Guyana",
+ }
+ HKD{
+ "HK$",
+ "Doler Hong Kong",
+ }
+ HNL{
+ "HNL",
+ "Lempira Honduras",
+ }
+ HRK{
+ "HRK",
+ "Kuna Croatia",
+ }
+ HTG{
+ "HTG",
+ "Gourde Haiti",
+ }
+ HUF{
+ "HUF",
+ "Fforint Hwngari",
+ }
+ IDR{
+ "IDR",
+ "Rupiah Indonesia",
+ }
+ ILS{
+ "₪",
+ "Shegel Newydd Israel",
+ }
INR{
- "₹",
+ "Rs.",
"Rwpî India",
}
+ IQD{
+ "IQD",
+ "Dinar Irac",
+ }
+ IRR{
+ "IRR",
+ "Rial Iran",
+ }
+ ISK{
+ "ISK",
+ "Króna Gwlad yr Iâ",
+ }
+ JMD{
+ "JMD",
+ "Doler Jamaica",
+ }
+ JOD{
+ "JOD",
+ "Dinar Gwlad yr Iorddonen",
+ }
JPY{
"JP¥",
- "Yen Siapan",
+ "Yen Japan",
+ }
+ KES{
+ "KES",
+ "Swllt Kenya",
+ }
+ KGS{
+ "KGS",
+ "Som Kyrgyzstan",
+ }
+ KHR{
+ "KHR",
+ "Riel Cambodia",
+ }
+ KMF{
+ "KMF",
+ "Ffranc Comoros",
+ }
+ KPW{
+ "KPW",
+ "Won Gogledd Corea",
+ }
+ KRW{
+ "₩",
+ "Won De Corea",
+ }
+ KWD{
+ "KWD",
+ "Dinar Kuwait",
+ }
+ KYD{
+ "KYD",
+ "Doler Ynysoedd Cayman",
+ }
+ KZT{
+ "KZT",
+ "Tenge Kazakstan",
+ }
+ LAK{
+ "LAK",
+ "Kip Laos",
+ }
+ LBP{
+ "LBP",
+ "Punt Libanus",
+ }
+ LKR{
+ "LKR",
+ "Rwpî Sri Lanka",
+ }
+ LRD{
+ "LRD",
+ "Doler Liberia",
+ }
+ LTL{
+ "LTL",
+ "Litas Lithwania",
+ }
+ LVL{
+ "LVL",
+ "Lats Latfia",
+ }
+ LYD{
+ "LYD",
+ "Dinar Libya",
+ }
+ MAD{
+ "MAD",
+ "Dirham Moroco",
+ }
+ MDL{
+ "MDL",
+ "Leu Moldofa",
+ }
+ MGA{
+ "MGA",
+ "Ariary Madagascar",
+ }
+ MKD{
+ "MKD",
+ "Denar Macedonia",
+ }
+ MMK{
+ "MMK",
+ "Kyat Myanmar",
+ }
+ MNT{
+ "MNT",
+ "Tugrik Mongolia",
+ }
+ MOP{
+ "MOP",
+ "Pataca Macau",
+ }
+ MRO{
+ "MRO",
+ "Ouguiya Mauritania",
+ }
+ MUR{
+ "MUR",
+ "Rwpî Mauritius",
+ }
+ MVR{
+ "MVR",
+ "Rufiyaa'r Maldives",
+ }
+ MWK{
+ "MWK",
+ "Kwacha Malawi",
+ }
+ MXN{
+ "MX$",
+ "Peso Mecsico",
+ }
+ MYR{
+ "MYR",
+ "Ringgit Malaysia",
+ }
+ MZN{
+ "MZN",
+ "Metical Mozambique",
+ }
+ NAD{
+ "NAD",
+ "Doler Namibia",
+ }
+ NGN{
+ "NGN",
+ "Naira Nigeria",
+ }
+ NIO{
+ "NIO",
+ "Córdoba Nicaragua",
+ }
+ NOK{
+ "NOK",
+ "Krone Norwy",
+ }
+ NPR{
+ "NPR",
+ "Rwpî Nepal",
+ }
+ NZD{
+ "NZ$",
+ "Doler Seland Newydd",
+ }
+ OMR{
+ "OMR",
+ "Rial Oman",
+ }
+ PAB{
+ "PAB",
+ "Balboa Panama",
+ }
+ PEN{
+ "PEN",
+ "Nuevo Sol Periw",
+ }
+ PGK{
+ "PGK",
+ "Kina Papua Guinea Newydd",
+ }
+ PHP{
+ "PHP",
+ "Peso Pilipinas",
+ }
+ PKR{
+ "PKR",
+ "Rwpî Pacistan",
+ }
+ PLN{
+ "PLN",
+ "Zloty Gwlad Pwyl",
+ }
+ PYG{
+ "PYG",
+ "Guarani Paraguay",
+ }
+ QAR{
+ "QAR",
+ "Rial Qatar",
+ }
+ RON{
+ "RON",
+ "Leu Rwmania",
+ }
+ RSD{
+ "RSD",
+ "Dinar Serbia",
}
RUB{
"RUB",
"Rwbl Rwsia",
}
+ RWF{
+ "RWF",
+ "Ffranc Rwanda",
+ }
+ SAR{
+ "SAR",
+ "Riyal Saudi Arabia",
+ }
+ SBD{
+ "SBD",
+ "Doler Ynysoedd Solomon",
+ }
+ SCR{
+ "SCR",
+ "Rwpî Seychelles",
+ }
+ SDG{
+ "SDG",
+ "Punt Sudan",
+ }
+ SEK{
+ "SEK",
+ "Krona Sweden",
+ }
+ SGD{
+ "SGD",
+ "Doler Singapore",
+ }
+ SHP{
+ "SHP",
+ "Punt Saint Helena",
+ }
+ SLL{
+ "SLL",
+ "Leone Sierra Leone",
+ }
+ SOS{
+ "SOS",
+ "Swllt Somalia",
+ }
+ SRD{
+ "SRD",
+ "Doler Surinam",
+ }
+ SSP{
+ "SSP",
+ "Punt De Sudan",
+ }
+ STD{
+ "STD",
+ "Dobra São Tomé a Príncipe",
+ }
+ SYP{
+ "SYP",
+ "Punt Syria",
+ }
+ SZL{
+ "SZL",
+ "Lilangeni Gwlad Swazi",
+ }
+ THB{
+ "฿",
+ "Baht Gwlad Thai",
+ }
+ TJS{
+ "TJS",
+ "Somoni Tajikistan",
+ }
+ TMT{
+ "TMT",
+ "Manat Turkmenistan",
+ }
+ TND{
+ "TND",
+ "Dinar Tunisia",
+ }
+ TOP{
+ "TOP",
+ "Paʻanga Tonga",
+ }
+ TRY{
+ "TRY",
+ "Lira Twrci",
+ }
+ TTD{
+ "TTD",
+ "Doler Trinidad a Tobago",
+ }
+ TWD{
+ "NT$",
+ "Doler Newydd Taiwan",
+ }
+ TZS{
+ "TZS",
+ "Swllt Tanzania",
+ }
+ UAH{
+ "UAH",
+ "Hryvnia Wcráin",
+ }
+ UGX{
+ "UGX",
+ "Swllt Uganda",
+ }
USD{
"US$",
- "Doler yr UDA",
+ "Doler UDA",
+ }
+ UYU{
+ "UYU",
+ "Peso Uruguay",
+ }
+ UZS{
+ "UZS",
+ "Som Uzbekistan",
+ }
+ VEF{
+ "VEF",
+ "Bolívar Venezuela",
+ }
+ VND{
+ "₫",
+ "Dong Fietnam",
+ }
+ VUV{
+ "VUV",
+ "Vatu Vanuatu",
+ }
+ WST{
+ "WST",
+ "Tala Samoa",
+ }
+ XAF{
+ "FCFA",
+ "Ffranc CFA y BEAC",
+ }
+ XCD{
+ "EC$",
+ "Doler Dwyrain y Caribî",
+ }
+ XOF{
+ "CFA",
+ "Ffranc CFA y BCEAO",
+ }
+ XPF{
+ "CFPF",
+ "Ffranc CPF",
+ }
+ XXX{
+ "XXX",
+ "Arian Cyfredol Anhysbys",
+ }
+ YER{
+ "YER",
+ "Rial Yemen",
+ }
+ ZAR{
+ "ZAR",
+ "Rand De Affrica",
+ }
+ ZMK{
+ "ZMK",
+ "Kwacha Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
+ "Kwacha Zambia",
}
}
- Version{"2.0.78.38"}
+ CurrencyPlurals{
+ AED{
+ few{"Dirham Yr Emiradau Arabaidd Unedig"}
+ many{"Dirham Yr Emiradau Arabaidd Unedig"}
+ one{"Dirham Yr Emiradau Arabaidd Unedig"}
+ other{"Dirham Yr Emiradau Arabaidd Unedig"}
+ two{"Dirham Yr Emiradau Arabaidd Unedig"}
+ zero{"Dirham Yr Emiradau Arabaidd Unedig"}
+ }
+ AFN{
+ few{"Afghani Afghanistan"}
+ many{"Afghani Afghanistan"}
+ one{"Afghani Afghanistan"}
+ other{"Afghani Afghanistan"}
+ two{"Afghani Afghanistan"}
+ zero{"Afghani Afghanistan"}
+ }
+ ALL{
+ few{"Lek Albania"}
+ many{"Lek Albania"}
+ one{"Lek Albania"}
+ other{"Lek Albania"}
+ two{"Lek Albania"}
+ zero{"Lek Albania"}
+ }
+ AMD{
+ few{"Dram Armenia"}
+ many{"Dram Armenia"}
+ one{"Dram Armenia"}
+ other{"Dram Armenia"}
+ two{"Dram Armenia"}
+ zero{"Dram Armenia"}
+ }
+ ANG{
+ few{"Guilder Antilles yr Iseldiroedd"}
+ many{"Guilder Antilles yr Iseldiroedd"}
+ one{"Guilder Antilles yr Iseldiroedd"}
+ other{"Guilder Antilles yr Iseldiroedd"}
+ two{"Guilder Antilles yr Iseldiroedd"}
+ zero{"Guilder Antilles yr Iseldiroedd"}
+ }
+ AOA{
+ few{"Kwanza Angola"}
+ many{"Kwanza Angola"}
+ one{"Kwanza Angola"}
+ other{"Kwanza Angola"}
+ two{"Kwanza Angola"}
+ zero{"Kwanza Angola"}
+ }
+ ARS{
+ few{"Peso yr Ariannin"}
+ many{"Peso yr Ariannin"}
+ one{"Peso yr Ariannin"}
+ other{"Peso yr Ariannin"}
+ two{"Peso yr Ariannin"}
+ zero{"Peso yr Ariannin"}
+ }
+ AUD{
+ few{"Doler Awstralia"}
+ many{"Doler Awstralia"}
+ one{"Doler Awstralia"}
+ other{"Doler Awstralia"}
+ two{"Doler Awstralia"}
+ zero{"Doler Awstralia"}
+ }
+ AWG{
+ few{"Fflorin Aruba"}
+ many{"Fflorin Aruba"}
+ one{"Fflorin Aruba"}
+ other{"Fflorin Aruba"}
+ two{"Fflorin Aruba"}
+ zero{"Fflorin Aruba"}
+ }
+ AZN{
+ few{"Manat Azerbaijan"}
+ many{"Manat Azerbaijan"}
+ one{"Manat Azerbaijan"}
+ other{"Manat Azerbaijan"}
+ two{"Manat Azerbaijan"}
+ zero{"Manat Azerbaijan"}
+ }
+ BAM{
+ few{"Marc Trosadwy Bosnia a Hercegovina"}
+ many{"Marc Trosadwy Bosnia a Hercegovina"}
+ one{"Marc Trosadwy Bosnia a Hercegovina"}
+ other{"Marc Trosadwy Bosnia a Hercegovina"}
+ two{"Marc Trosadwy Bosnia a Hercegovina"}
+ zero{"Marc Trosadwy Bosnia a Hercegovina"}
+ }
+ BBD{
+ few{"Doler Barbados"}
+ many{"Doler Barbados"}
+ one{"Doler Barbados"}
+ other{"Doler Barbados"}
+ two{"Doler Barbados"}
+ zero{"Doler Barbados"}
+ }
+ BDT{
+ few{"Taka Bangladesh"}
+ many{"Taka Bangladesh"}
+ one{"Taka Bangladesh"}
+ other{"Taka Bangladesh"}
+ two{"Taka Bangladesh"}
+ zero{"Taka Bangladesh"}
+ }
+ BGN{
+ few{"Lev Bwlgaria"}
+ many{"Lev Bwlgaria"}
+ one{"Lev Bwlgaria"}
+ other{"Lev Bwlgaria"}
+ two{"Lev Bwlgaria"}
+ zero{"Lev Bwlgaria"}
+ }
+ BHD{
+ few{"Dinar Bahrain"}
+ many{"Dinar Bahrain"}
+ one{"Dinar Bahrain"}
+ other{"Dinar Bahrain"}
+ two{"Dinar Bahrain"}
+ zero{"Dinar Bahrain"}
+ }
+ BIF{
+ few{"Ffranc Burundi"}
+ many{"Ffranc Burundi"}
+ one{"Ffranc Burundi"}
+ other{"Ffranc Burundi"}
+ two{"Ffranc Burundi"}
+ zero{"Ffranc Burundi"}
+ }
+ BMD{
+ few{"Doler Bermuda"}
+ many{"Doler Bermuda"}
+ one{"Doler Bermuda"}
+ other{"Doler Bermuda"}
+ two{"Doler Bermuda"}
+ zero{"Doler Bermuda"}
+ }
+ BND{
+ few{"Doler Brunei"}
+ many{"Doler Brunei"}
+ one{"Doler Brunei"}
+ other{"Doler Brunei"}
+ two{"Doler Brunei"}
+ zero{"Doler Brunei"}
+ }
+ BOB{
+ few{"Boliviano Bolifia"}
+ many{"Boliviano Bolifia"}
+ one{"Boliviano Bolifia"}
+ other{"Boliviano Bolifia"}
+ two{"Boliviano Bolifia"}
+ zero{"Boliviano Bolifia"}
+ }
+ BRL{
+ few{"Real Brasil"}
+ many{"Real Brasil"}
+ one{"Real Brasil"}
+ other{"Real Brasil"}
+ two{"Real Brasil"}
+ zero{"Real Brasil"}
+ }
+ BSD{
+ few{"Doler y Bahamas"}
+ many{"Doler y Bahamas"}
+ one{"Doler y Bahamas"}
+ other{"Doler y Bahamas"}
+ two{"Doler y Bahamas"}
+ zero{"Doler y Bahamas"}
+ }
+ BTN{
+ few{"Ngultrum Bhutan"}
+ many{"Ngultrum Bhutan"}
+ one{"Ngultrum Bhutan"}
+ other{"Ngultrum Bhutan"}
+ two{"Ngultrum Bhutan"}
+ zero{"Ngultrum Bhutan"}
+ }
+ BWP{
+ few{"Pula Botswana"}
+ many{"Pula Botswana"}
+ one{"Pula Botswana"}
+ other{"Pula Botswana"}
+ two{"Pula Botswana"}
+ zero{"Pula Botswana"}
+ }
+ BYR{
+ few{"Rwbl Belarws"}
+ many{"Rwbl Belarws"}
+ one{"Rwbl Belarws"}
+ other{"Rwbl Belarws"}
+ two{"Rwbl Belarws"}
+ zero{"Rwbl Belarws"}
+ }
+ BZD{
+ few{"Doler Belize"}
+ many{"Doler Belize"}
+ one{"Doler Belize"}
+ other{"Doler Belize"}
+ two{"Doler Belize"}
+ zero{"Doler Belize"}
+ }
+ CAD{
+ few{"Doler Canada"}
+ many{"Doler Canada"}
+ one{"Doler Canada"}
+ other{"Doler Canada"}
+ two{"Doler Canada"}
+ zero{"Doler Canada"}
+ }
+ CDF{
+ few{"Ffranc Congo"}
+ many{"Ffranc Congo"}
+ one{"Ffranc Congo"}
+ other{"Ffranc Congo"}
+ two{"Ffranc Congo"}
+ zero{"Ffranc Congo"}
+ }
+ CHF{
+ few{"Ffranc y Swistir"}
+ many{"Ffranc y Swistir"}
+ one{"Ffranc y Swistir"}
+ other{"Ffranc y Swistir"}
+ two{"Ffranc y Swistir"}
+ zero{"Ffranc y Swistir"}
+ }
+ CLP{
+ few{"Peso Chile"}
+ many{"Peso Chile"}
+ one{"Peso Chile"}
+ other{"Peso Chile"}
+ two{"Peso Chile"}
+ zero{"Peso Chile"}
+ }
+ CNY{
+ few{"Yuan Tsieina"}
+ many{"Yuan Tsieina"}
+ one{"Yuan Tsieina"}
+ other{"Yuan Tsieina"}
+ two{"Yuan Tsieina"}
+ zero{"Yuan Tsieina"}
+ }
+ COP{
+ few{"Peso Colombia"}
+ many{"Peso Colombia"}
+ one{"Peso Colombia"}
+ other{"Peso Colombia"}
+ two{"Peso Colombia"}
+ zero{"Peso Colombia"}
+ }
+ CRC{
+ few{"Colón Costa Rica"}
+ many{"Colón Costa Rica"}
+ one{"Colón Costa Rica"}
+ other{"Colón Costa Rica"}
+ two{"Colón Costa Rica"}
+ zero{"Colón Costa Rica"}
+ }
+ CUC{
+ few{"Peso Trosadwy Cuba"}
+ many{"Peso Trosadwy Cuba"}
+ one{"Peso Trosadwy Cuba"}
+ other{"Peso Trosadwy Cuba"}
+ two{"Peso Trosadwy Cuba"}
+ zero{"Peso Trosadwy Cuba"}
+ }
+ CUP{
+ few{"Peso Cuba"}
+ many{"Peso Cuba"}
+ one{"Peso Cuba"}
+ other{"Peso Cuba"}
+ two{"Peso Cuba"}
+ zero{"Peso Cuba"}
+ }
+ CVE{
+ few{"Esgwdo Cabo Verde"}
+ many{"Esgwdo Cabo Verde"}
+ one{"Esgwdo Cabo Verde"}
+ other{"Esgwdo Cabo Verde"}
+ two{"Esgwdo Cabo Verde"}
+ zero{"Esgwdo Cabo Verde"}
+ }
+ CZK{
+ few{"Koruna Tsiec"}
+ many{"Koruna Tsiec"}
+ one{"Koruna Tsiec"}
+ other{"Koruna Tsiec"}
+ two{"Koruna Tsiec"}
+ zero{"Koruna Tsiec"}
+ }
+ DJF{
+ few{"Ffranc Djibouti"}
+ many{"Ffranc Djibouti"}
+ one{"Ffranc Djibouti"}
+ other{"Ffranc Djibouti"}
+ two{"Ffranc Djibouti"}
+ zero{"Ffranc Djibouti"}
+ }
+ DKK{
+ few{"Krone Denmarc"}
+ many{"Krone Denmarc"}
+ one{"Krone Denmarc"}
+ other{"Krone Denmarc"}
+ two{"Krone Denmarc"}
+ zero{"Krone Denmarc"}
+ }
+ DOP{
+ few{"Peso Gweriniaeth Dominica"}
+ many{"Peso Gweriniaeth Dominica"}
+ one{"Peso Gweriniaeth Dominica"}
+ other{"Peso Gweriniaeth Dominica"}
+ two{"Peso Gweriniaeth Dominica"}
+ zero{"Peso Gweriniaeth Dominica"}
+ }
+ DZD{
+ few{"Dinar Algeria"}
+ many{"Dinar Algeria"}
+ one{"Dinar Algeria"}
+ other{"Dinar Algeria"}
+ two{"Dinar Algeria"}
+ zero{"Dinar Algeria"}
+ }
+ EGP{
+ few{"Punt Yr Aifft"}
+ many{"Punt Yr Aifft"}
+ one{"Punt Yr Aifft"}
+ other{"Punt Yr Aifft"}
+ two{"Punt Yr Aifft"}
+ zero{"Punt Yr Aifft"}
+ }
+ ERN{
+ few{"Nakfa Eritrea"}
+ many{"Nakfa Eritrea"}
+ one{"Nakfa Eritrea"}
+ other{"Nakfa Eritrea"}
+ two{"Nakfa Eritrea"}
+ zero{"Nakfa Eritrea"}
+ }
+ ETB{
+ few{"Birr Ethiopia"}
+ many{"Birr Ethiopia"}
+ one{"Birr Ethiopia"}
+ other{"Birr Ethiopia"}
+ two{"Birr Ethiopia"}
+ zero{"Birr Ethiopia"}
+ }
+ EUR{
+ few{"Ewro"}
+ many{"Ewro"}
+ one{"Ewro"}
+ other{"Ewro"}
+ two{"Ewro"}
+ zero{"Ewro"}
+ }
+ FJD{
+ few{"Doler Ffiji"}
+ many{"Doler Ffiji"}
+ one{"Doler Ffiji"}
+ other{"Doler Ffiji"}
+ two{"Doler Ffiji"}
+ zero{"Doler Ffiji"}
+ }
+ FKP{
+ few{"Punt Ynysoedd Falkland/Malvinas"}
+ many{"Punt Ynysoedd Falkland/Malvinas"}
+ one{"Punt Ynysoedd Falkland/Malvinas"}
+ other{"Punt Ynysoedd Falkland/Malvinas"}
+ two{"Punt Ynysoedd Falkland/Malvinas"}
+ zero{"Punt Ynysoedd Falkland/Malvinas"}
+ }
+ GBP{
+ few{"Punt Sterling Prydain"}
+ many{"Punt Sterling Prydain"}
+ one{"Punt Sterling Prydain"}
+ other{"Punt Sterling Prydain"}
+ two{"Punt Sterling Prydain"}
+ zero{"Punt Sterling Prydain"}
+ }
+ GEL{
+ few{"Lari Georgia"}
+ many{"Lari Georgia"}
+ one{"Lari Georgia"}
+ other{"Lari Georgia"}
+ two{"Lari Georgia"}
+ zero{"Lari Georgia"}
+ }
+ GHS{
+ few{"Cedi Ghana"}
+ many{"Cedi Ghana"}
+ one{"Cedi Ghana"}
+ other{"Cedi Ghana"}
+ two{"Cedi Ghana"}
+ zero{"Cedi Ghana"}
+ }
+ GIP{
+ few{"Punt Gibraltar"}
+ many{"Punt Gibraltar"}
+ one{"Punt Gibraltar"}
+ other{"Punt Gibraltar"}
+ two{"Punt Gibraltar"}
+ zero{"Punt Gibraltar"}
+ }
+ GMD{
+ few{"Dalasi Gambia"}
+ many{"Dalasi Gambia"}
+ one{"Dalasi Gambia"}
+ other{"Dalasi Gambia"}
+ two{"Dalasi Gambia"}
+ zero{"Dalasi Gambia"}
+ }
+ GNF{
+ few{"Ffranc Guinée"}
+ many{"Ffranc Guinée"}
+ one{"Ffranc Guinée"}
+ other{"Ffranc Guinée"}
+ two{"Ffranc Guinée"}
+ zero{"Ffranc Guinée"}
+ }
+ GTQ{
+ few{"Quetzal Guatemala"}
+ many{"Quetzal Guatemala"}
+ one{"Quetzal Guatemala"}
+ other{"Quetzal Guatemala"}
+ two{"Quetzal Guatemala"}
+ zero{"Quetzal Guatemala"}
+ }
+ GYD{
+ few{"Doler Guyana"}
+ many{"Doler Guyana"}
+ one{"Doler Guyana"}
+ other{"Doler Guyana"}
+ two{"Doler Guyana"}
+ zero{"Doler Guyana"}
+ }
+ HKD{
+ few{"Doler Hong Kong"}
+ many{"Doler Hong Kong"}
+ one{"Doler Hong Kong"}
+ other{"Doler Hong Kong"}
+ two{"Doler Hong Kong"}
+ zero{"Doler Hong Kong"}
+ }
+ HNL{
+ few{"Lempira Honduras"}
+ many{"Lempira Honduras"}
+ one{"Lempira Honduras"}
+ other{"Lempira Honduras"}
+ two{"Lempira Honduras"}
+ zero{"Lempira Honduras"}
+ }
+ HRK{
+ few{"Kuna Croatia"}
+ many{"Kuna Croatia"}
+ one{"Kuna Croatia"}
+ other{"Kuna Croatia"}
+ two{"Kuna Croatia"}
+ zero{"Kuna Croatia"}
+ }
+ HTG{
+ few{"Gourde Haiti"}
+ many{"Gourde Haiti"}
+ one{"Gourde Haiti"}
+ other{"Gourde Haiti"}
+ two{"Gourde Haiti"}
+ zero{"Gourde Haiti"}
+ }
+ HUF{
+ few{"Fforint Hwngari"}
+ many{"Fforint Hwngari"}
+ one{"Fforint Hwngari"}
+ other{"Fforint Hwngari"}
+ two{"Fforint Hwngari"}
+ zero{"Fforint Hwngari"}
+ }
+ IDR{
+ few{"Rupiah Indonesia"}
+ many{"Rupiah Indonesia"}
+ one{"Rupiah Indonesia"}
+ other{"Rupiah Indonesia"}
+ two{"Rupiah Indonesia"}
+ zero{"Rupiah Indonesia"}
+ }
+ ILS{
+ few{"Shegel Newydd Israel"}
+ many{"Shegel Newydd Israel"}
+ one{"Shegel Newydd Israel"}
+ other{"Shegel Newydd Israel"}
+ two{"Shegel Newydd Israel"}
+ zero{"Shegel Newydd Israel"}
+ }
+ INR{
+ few{"Rwpî India"}
+ many{"Rwpî India"}
+ one{"Rwpî India"}
+ other{"Rwpî India"}
+ two{"Rwpî India"}
+ zero{"Rwpî India"}
+ }
+ IQD{
+ few{"Dinar Irac"}
+ many{"Dinar Irac"}
+ one{"Dinar Irac"}
+ other{"Dinar Irac"}
+ two{"Dinar Irac"}
+ zero{"Dinar Irac"}
+ }
+ IRR{
+ few{"Rial Iran"}
+ many{"Rial Iran"}
+ one{"Rial Iran"}
+ other{"Rial Iran"}
+ two{"Rial Iran"}
+ zero{"Rial Iran"}
+ }
+ ISK{
+ few{"Króna Gwlad yr Iâ"}
+ many{"Króna Gwlad yr Iâ"}
+ one{"Króna Gwlad yr Iâ"}
+ other{"Króna Gwlad yr Iâ"}
+ two{"Króna Gwlad yr Iâ"}
+ zero{"Króna Gwlad yr Iâ"}
+ }
+ JMD{
+ few{"Doler Jamaica"}
+ many{"Doler Jamaica"}
+ one{"Doler Jamaica"}
+ other{"Doler Jamaica"}
+ two{"Doler Jamaica"}
+ zero{"Doler Jamaica"}
+ }
+ JOD{
+ few{"Dinar Gwlad yr Iorddonen"}
+ many{"Dinar Gwlad yr Iorddonen"}
+ one{"Dinar Gwlad yr Iorddonen"}
+ other{"Dinar Gwlad yr Iorddonen"}
+ two{"Dinar Gwlad yr Iorddonen"}
+ zero{"Dinar Gwlad yr Iorddonen"}
+ }
+ JPY{
+ few{"Yen Japan"}
+ many{"Yen Japan"}
+ one{"Yen Japan"}
+ other{"Yen Japan"}
+ two{"Yen Japan"}
+ zero{"Yen Japan"}
+ }
+ KES{
+ few{"Swllt Kenya"}
+ many{"Swllt Kenya"}
+ one{"Swllt Kenya"}
+ other{"Swllt Kenya"}
+ two{"Swllt Kenya"}
+ zero{"Swllt Kenya"}
+ }
+ KGS{
+ few{"Som Kyrgyzstan"}
+ many{"Som Kyrgyzstan"}
+ one{"Som Kyrgyzstan"}
+ other{"Som Kyrgyzstan"}
+ two{"Som Kyrgyzstan"}
+ zero{"Som Kyrgyzstan"}
+ }
+ KHR{
+ few{"Riel Cambodia"}
+ many{"Riel Cambodia"}
+ one{"Riel Cambodia"}
+ other{"Riel Cambodia"}
+ two{"Riel Cambodia"}
+ zero{"Riel Cambodia"}
+ }
+ KMF{
+ few{"Ffranc Comoros"}
+ many{"Ffranc Comoros"}
+ one{"Ffranc Comoros"}
+ other{"Ffranc Comoros"}
+ two{"Ffranc Comoros"}
+ zero{"Ffranc Comoros"}
+ }
+ KPW{
+ few{"Won Gogledd Corea"}
+ many{"Won Gogledd Corea"}
+ one{"Won Gogledd Corea"}
+ other{"Won Gogledd Corea"}
+ two{"Won Gogledd Corea"}
+ zero{"Won Gogledd Corea"}
+ }
+ KRW{
+ few{"Won De Corea"}
+ many{"Won De Corea"}
+ one{"Won De Corea"}
+ other{"Won De Corea"}
+ two{"Won De Corea"}
+ zero{"Won De Corea"}
+ }
+ KWD{
+ few{"Dinar Kuwait"}
+ many{"Dinar Kuwait"}
+ one{"Dinar Kuwait"}
+ other{"Dinar Kuwait"}
+ two{"Dinar Kuwait"}
+ zero{"Dinar Kuwait"}
+ }
+ KYD{
+ few{"Doler Ynysoedd Cayman"}
+ many{"Doler Ynysoedd Cayman"}
+ one{"Doler Ynysoedd Cayman"}
+ other{"Doler Ynysoedd Cayman"}
+ two{"Doler Ynysoedd Cayman"}
+ zero{"Doler Ynysoedd Cayman"}
+ }
+ KZT{
+ few{"Tenge Kazakstan"}
+ many{"Tenge Kazakstan"}
+ one{"Tenge Kazakstan"}
+ other{"Tenge Kazakstan"}
+ two{"Tenge Kazakstan"}
+ zero{"Tenge Kazakstan"}
+ }
+ LAK{
+ few{"Kip Laos"}
+ many{"Kip Laos"}
+ one{"Kip Laos"}
+ other{"Kip Laos"}
+ two{"Kip Laos"}
+ zero{"Kip Laos"}
+ }
+ LBP{
+ few{"Punt Libanus"}
+ many{"Punt Libanus"}
+ one{"Punt Libanus"}
+ other{"Punt Libanus"}
+ two{"Punt Libanus"}
+ zero{"Punt Libanus"}
+ }
+ LKR{
+ few{"Rwpî Sri Lanka"}
+ many{"Rwpî Sri Lanka"}
+ one{"Rwpî Sri Lanka"}
+ other{"Rwpî Sri Lanka"}
+ two{"Rwpî Sri Lanka"}
+ zero{"Rwpî Sri Lanka"}
+ }
+ LRD{
+ few{"Doler Liberia"}
+ many{"Doler Liberia"}
+ one{"Doler Liberia"}
+ other{"Doler Liberia"}
+ two{"Doler Liberia"}
+ zero{"Doler Liberia"}
+ }
+ LTL{
+ few{"Litas Lithwania"}
+ many{"Litas Lithwania"}
+ one{"Litas Lithwania"}
+ other{"Litas Lithwania"}
+ two{"Litas Lithwania"}
+ zero{"Litas Lithwania"}
+ }
+ LVL{
+ few{"Lats Latfia"}
+ many{"Lats Latfia"}
+ one{"Lats Latfia"}
+ other{"Lats Latfia"}
+ two{"Lats Latfia"}
+ zero{"Lats Latfia"}
+ }
+ LYD{
+ few{"Dinar Libya"}
+ many{"Dinar Libya"}
+ one{"Dinar Libya"}
+ other{"Dinar Libya"}
+ two{"Dinar Libya"}
+ zero{"Dinar Libya"}
+ }
+ MAD{
+ few{"Dirham Moroco"}
+ many{"Dirham Moroco"}
+ one{"Dirham Moroco"}
+ other{"Dirham Moroco"}
+ two{"Dirham Moroco"}
+ zero{"Dirham Moroco"}
+ }
+ MDL{
+ few{"Leu Moldofa"}
+ many{"Leu Moldofa"}
+ one{"Leu Moldofa"}
+ other{"Leu Moldofa"}
+ two{"Leu Moldofa"}
+ zero{"Leu Moldofa"}
+ }
+ MGA{
+ few{"Ariary Madagascar"}
+ many{"Ariary Madagascar"}
+ one{"Ariary Madagascar"}
+ other{"Ariary Madagascar"}
+ two{"Ariary Madagascar"}
+ zero{"Ariary Madagascar"}
+ }
+ MKD{
+ few{"Denar Macedonia"}
+ many{"Denar Macedonia"}
+ one{"Denar Macedonia"}
+ other{"Denar Macedonia"}
+ two{"Denar Macedonia"}
+ zero{"Denar Macedonia"}
+ }
+ MMK{
+ few{"Kyat Myanmar"}
+ many{"Kyat Myanmar"}
+ one{"Kyat Myanmar"}
+ other{"Kyat Myanmar"}
+ two{"Kyat Myanmar"}
+ zero{"Kyat Myanmar"}
+ }
+ MNT{
+ few{"Tugrik Mongolia"}
+ many{"Tugrik Mongolia"}
+ one{"Tugrik Mongolia"}
+ other{"Tugrik Mongolia"}
+ two{"Tugrik Mongolia"}
+ zero{"Tugrik Mongolia"}
+ }
+ MOP{
+ few{"Pataca Macau"}
+ many{"Pataca Macau"}
+ one{"Pataca Macau"}
+ other{"Pataca Macau"}
+ two{"Pataca Macau"}
+ zero{"Pataca Macau"}
+ }
+ MRO{
+ few{"Ouguiya Mauritania"}
+ many{"Ouguiya Mauritania"}
+ one{"Ouguiya Mauritania"}
+ other{"Ouguiya Mauritania"}
+ two{"Ouguiya Mauritania"}
+ zero{"Ouguiya Mauritania"}
+ }
+ MUR{
+ few{"Rwpî Mauritius"}
+ many{"Rwpî Mauritius"}
+ one{"Rwpî Mauritius"}
+ other{"Rwpî Mauritius"}
+ two{"Rwpî Mauritius"}
+ zero{"Rwpî Mauritius"}
+ }
+ MVR{
+ few{"Rufiyaa'r Maldives"}
+ many{"Rufiyaa'r Maldives"}
+ one{"Rufiyaa'r Maldives"}
+ other{"Rufiyaa'r Maldives"}
+ two{"Rufiyaa'r Maldives"}
+ zero{"Rufiyaa'r Maldives"}
+ }
+ MWK{
+ few{"Kwacha Malawi"}
+ many{"Kwacha Malawi"}
+ one{"Kwacha Malawi"}
+ other{"Kwacha Malawi"}
+ two{"Kwacha Malawi"}
+ zero{"Kwacha Malawi"}
+ }
+ MXN{
+ few{"Peso Mecsico"}
+ many{"Peso Mecsico"}
+ one{"Peso Mecsico"}
+ other{"Peso Mecsico"}
+ two{"Peso Mecsico"}
+ zero{"Peso Mecsico"}
+ }
+ MYR{
+ few{"Ringgit Malaysia"}
+ many{"Ringgit Malaysia"}
+ one{"Ringgit Malaysia"}
+ other{"Ringgit Malaysia"}
+ two{"Ringgit Malaysia"}
+ zero{"Ringgit Malaysia"}
+ }
+ MZN{
+ few{"Metical Mozambique"}
+ many{"Metical Mozambique"}
+ one{"Metical Mozambique"}
+ other{"Metical Mozambique"}
+ two{"Metical Mozambique"}
+ zero{"Metical Mozambique"}
+ }
+ NAD{
+ few{"Doler Namibia"}
+ many{"Doler Namibia"}
+ one{"Doler Namibia"}
+ other{"Doler Namibia"}
+ two{"Doler Namibia"}
+ zero{"Doler Namibia"}
+ }
+ NGN{
+ few{"Naira Nigeria"}
+ many{"Naira Nigeria"}
+ one{"Naira Nigeria"}
+ other{"Naira Nigeria"}
+ two{"Naira Nigeria"}
+ zero{"Naira Nigeria"}
+ }
+ NIO{
+ few{"Córdoba Nicaragua"}
+ many{"Córdoba Nicaragua"}
+ one{"Córdoba Nicaragua"}
+ other{"Córdoba Nicaragua"}
+ two{"Córdoba Nicaragua"}
+ zero{"Córdoba Nicaragua"}
+ }
+ NOK{
+ few{"Krone Norwy"}
+ many{"Krone Norwy"}
+ one{"Krone Norwy"}
+ other{"Krone Norwy"}
+ two{"Krone Norwy"}
+ zero{"Krone Norwy"}
+ }
+ NPR{
+ few{"Rwpî Nepal"}
+ many{"Rwpî Nepal"}
+ one{"Rwpî Nepal"}
+ other{"Rwpî Nepal"}
+ two{"Rwpî Nepal"}
+ zero{"Rwpî Nepal"}
+ }
+ NZD{
+ few{"Doler Seland Newydd"}
+ many{"Doler Seland Newydd"}
+ one{"Doler Seland Newydd"}
+ other{"Doler Seland Newydd"}
+ two{"Doler Seland Newydd"}
+ zero{"Doler Seland Newydd"}
+ }
+ OMR{
+ few{"Rial Oman"}
+ many{"Rial Oman"}
+ one{"Rial Oman"}
+ other{"Rial Oman"}
+ two{"Rial Oman"}
+ zero{"Rial Oman"}
+ }
+ PAB{
+ few{"Balboa Panama"}
+ many{"Balboa Panama"}
+ one{"Balboa Panama"}
+ other{"Balboa Panama"}
+ two{"Balboa Panama"}
+ zero{"Balboa Panama"}
+ }
+ PEN{
+ few{"Nuevo Sol Periw"}
+ many{"Nuevo Sol Periw"}
+ one{"Nuevo Sol Periw"}
+ other{"Nuevo Sol Periw"}
+ two{"Nuevo Sol Periw"}
+ zero{"Nuevo Sol Periw"}
+ }
+ PGK{
+ few{"Kina Papua Guinea Newydd"}
+ many{"Kina Papua Guinea Newydd"}
+ one{"Kina Papua Guinea Newydd"}
+ other{"Kina Papua Guinea Newydd"}
+ two{"Kina Papua Guinea Newydd"}
+ zero{"Kina Papua Guinea Newydd"}
+ }
+ PHP{
+ few{"Peso Pilipinas"}
+ many{"Peso Pilipinas"}
+ one{"Peso Pilipinas"}
+ other{"Peso Pilipinas"}
+ two{"Peso Pilipinas"}
+ zero{"Peso Pilipinas"}
+ }
+ PKR{
+ few{"Rwpî Pacistan"}
+ many{"Rwpî Pacistan"}
+ one{"Rwpî Pacistan"}
+ other{"Rwpî Pacistan"}
+ two{"Rwpî Pacistan"}
+ zero{"Rwpî Pacistan"}
+ }
+ PLN{
+ few{"Zloty Gwlad Pwyl"}
+ many{"Zloty Gwlad Pwyl"}
+ one{"Zloty Gwlad Pwyl"}
+ other{"Zloty Gwlad Pwyl"}
+ two{"Zloty Gwlad Pwyl"}
+ zero{"Zloty Gwlad Pwyl"}
+ }
+ PYG{
+ few{"Guarani Paraguay"}
+ many{"Guarani Paraguay"}
+ one{"Guarani Paraguay"}
+ other{"Guarani Paraguay"}
+ two{"Guarani Paraguay"}
+ zero{"Guarani Paraguay"}
+ }
+ QAR{
+ few{"Rial Qatar"}
+ many{"Rial Qatar"}
+ one{"Rial Qatar"}
+ other{"Rial Qatar"}
+ two{"Rial Qatar"}
+ zero{"Rial Qatar"}
+ }
+ RON{
+ few{"Leu Rwmania"}
+ many{"Leu Rwmania"}
+ one{"Leu Rwmania"}
+ other{"Leu Rwmania"}
+ two{"Leu Rwmania"}
+ zero{"Leu Rwmania"}
+ }
+ RSD{
+ few{"Dinar Serbia"}
+ many{"Dinar Serbia"}
+ one{"Dinar Serbia"}
+ other{"Dinar Serbia"}
+ two{"Dinar Serbia"}
+ zero{"Dinar Serbia"}
+ }
+ RUB{
+ few{"Rwbl Rwsia"}
+ many{"Rwbl Rwsia"}
+ one{"Rwbl Rwsia"}
+ other{"Rwbl Rwsia"}
+ two{"Rwbl Rwsia"}
+ zero{"Rwbl Rwsia"}
+ }
+ RWF{
+ few{"Ffranc Rwanda"}
+ many{"Ffranc Rwanda"}
+ one{"Ffranc Rwanda"}
+ other{"Ffranc Rwanda"}
+ two{"Ffranc Rwanda"}
+ zero{"Ffranc Rwanda"}
+ }
+ SAR{
+ few{"Riyal Saudi Arabia"}
+ many{"Riyal Saudi Arabia"}
+ one{"Riyal Saudi Arabia"}
+ other{"Riyal Saudi Arabia"}
+ two{"Riyal Saudi Arabia"}
+ zero{"Riyal Saudi Arabia"}
+ }
+ SBD{
+ few{"Doler Ynysoedd Solomon"}
+ many{"Doler Ynysoedd Solomon"}
+ one{"Doler Ynysoedd Solomon"}
+ other{"Doler Ynysoedd Solomon"}
+ two{"Doler Ynysoedd Solomon"}
+ zero{"Doler Ynysoedd Solomon"}
+ }
+ SCR{
+ few{"Rwpî Seychelles"}
+ many{"Rwpî Seychelles"}
+ one{"Rwpî Seychelles"}
+ other{"Rwpî Seychelles"}
+ two{"Rwpî Seychelles"}
+ zero{"Rwpî Seychelles"}
+ }
+ SDG{
+ few{"Punt Sudan"}
+ many{"Punt Sudan"}
+ one{"Punt Sudan"}
+ other{"Punt Sudan"}
+ two{"Punt Sudan"}
+ zero{"Punt Sudan"}
+ }
+ SEK{
+ few{"Krona Sweden"}
+ many{"Krona Sweden"}
+ one{"Krona Sweden"}
+ other{"Krona Sweden"}
+ two{"Krona Sweden"}
+ zero{"Krona Sweden"}
+ }
+ SGD{
+ few{"Doler Singapore"}
+ many{"Doler Singapore"}
+ one{"Doler Singapore"}
+ other{"Doler Singapore"}
+ two{"Doler Singapore"}
+ zero{"Doler Singapore"}
+ }
+ SHP{
+ few{"Punt Saint Helena"}
+ many{"Punt Saint Helena"}
+ one{"Punt Saint Helena"}
+ other{"Punt Saint Helena"}
+ two{"Punt Saint Helena"}
+ zero{"Punt Saint Helena"}
+ }
+ SLL{
+ few{"Leone Sierra Leone"}
+ many{"Leone Sierra Leone"}
+ one{"Leone Sierra Leone"}
+ other{"Leone Sierra Leone"}
+ two{"Leone Sierra Leone"}
+ zero{"Leone Sierra Leone"}
+ }
+ SOS{
+ few{"Swllt Somalia"}
+ many{"Swllt Somalia"}
+ one{"Swllt Somalia"}
+ other{"Swllt Somalia"}
+ two{"Swllt Somalia"}
+ zero{"Swllt Somalia"}
+ }
+ SRD{
+ few{"Doler Surinam"}
+ many{"Doler Surinam"}
+ one{"Doler Surinam"}
+ other{"Doler Surinam"}
+ two{"Doler Surinam"}
+ zero{"Doler Surinam"}
+ }
+ SSP{
+ few{"Punt De Sudan"}
+ many{"Punt De Sudan"}
+ one{"Punt De Sudan"}
+ other{"Punt De Sudan"}
+ two{"Punt De Sudan"}
+ zero{"Punt De Sudan"}
+ }
+ STD{
+ few{"Dobra São Tomé a Príncipe"}
+ many{"Dobra São Tomé a Príncipe"}
+ one{"Dobra São Tomé a Príncipe"}
+ other{"Dobra São Tomé a Príncipe"}
+ two{"Dobra São Tomé a Príncipe"}
+ zero{"Dobra São Tomé a Príncipe"}
+ }
+ SYP{
+ few{"Punt Syria"}
+ many{"Punt Syria"}
+ one{"Punt Syria"}
+ other{"Punt Syria"}
+ two{"Punt Syria"}
+ zero{"Punt Syria"}
+ }
+ SZL{
+ few{"Lilangeni Gwlad Swazi"}
+ many{"Lilangeni Gwlad Swazi"}
+ one{"Lilangeni Gwlad Swazi"}
+ other{"Lilangeni Gwlad Swazi"}
+ two{"Lilangeni Gwlad Swazi"}
+ zero{"Lilangeni Gwlad Swazi"}
+ }
+ THB{
+ few{"Baht Gwlad Thai"}
+ many{"Baht Gwlad Thai"}
+ one{"Baht Gwlad Thai"}
+ other{"Baht Gwlad Thai"}
+ two{"Baht Gwlad Thai"}
+ zero{"Baht Gwlad Thai"}
+ }
+ TJS{
+ few{"Somoni Tajikistan"}
+ many{"Somoni Tajikistan"}
+ one{"Somoni Tajikistan"}
+ other{"Somoni Tajikistan"}
+ two{"Somoni Tajikistan"}
+ zero{"Somoni Tajikistan"}
+ }
+ TMT{
+ few{"Manat Turkmenistan"}
+ many{"Manat Turkmenistan"}
+ one{"Manat Turkmenistan"}
+ other{"Manat Turkmenistan"}
+ two{"Manat Turkmenistan"}
+ zero{"Manat Turkmenistan"}
+ }
+ TND{
+ few{"Dinar Tunisia"}
+ many{"Dinar Tunisia"}
+ one{"Dinar Tunisia"}
+ other{"Dinar Tunisia"}
+ two{"Dinar Tunisia"}
+ zero{"Dinar Tunisia"}
+ }
+ TOP{
+ few{"Paʻanga Tonga"}
+ many{"Paʻanga Tonga"}
+ one{"Paʻanga Tonga"}
+ other{"Paʻanga Tonga"}
+ two{"Paʻanga Tonga"}
+ zero{"Paʻanga Tonga"}
+ }
+ TRY{
+ few{"Lira Twrci"}
+ many{"Lira Twrci"}
+ one{"Lira Twrci"}
+ other{"Lira Twrci"}
+ two{"Lira Twrci"}
+ zero{"Lira Twrci"}
+ }
+ TTD{
+ few{"Doler Trinidad a Tobago"}
+ many{"Doler Trinidad a Tobago"}
+ one{"Doler Trinidad a Tobago"}
+ other{"Doler Trinidad a Tobago"}
+ two{"Doler Trinidad a Tobago"}
+ zero{"Doler Trinidad a Tobago"}
+ }
+ TWD{
+ few{"Doler Newydd Taiwan"}
+ many{"Doler Newydd Taiwan"}
+ one{"Doler Newydd Taiwan"}
+ other{"Doler Newydd Taiwan"}
+ two{"Doler Newydd Taiwan"}
+ zero{"Doler Newydd Taiwan"}
+ }
+ TZS{
+ few{"Swllt Tanzania"}
+ many{"Swllt Tanzania"}
+ one{"Swllt Tanzania"}
+ other{"Swllt Tanzania"}
+ two{"Swllt Tanzania"}
+ zero{"Swllt Tanzania"}
+ }
+ UAH{
+ few{"Hryvnia Wcráin"}
+ many{"Hryvnia Wcráin"}
+ one{"Hryvnia Wcráin"}
+ other{"Hryvnia Wcráin"}
+ two{"Hryvnia Wcráin"}
+ zero{"Hryvnia Wcráin"}
+ }
+ UGX{
+ few{"Swllt Uganda"}
+ many{"Swllt Uganda"}
+ one{"Swllt Uganda"}
+ other{"Swllt Uganda"}
+ two{"Swllt Uganda"}
+ zero{"Swllt Uganda"}
+ }
+ USD{
+ few{"Doler UDA"}
+ many{"Doler UDA"}
+ one{"Doler UDA"}
+ other{"Doler UDA"}
+ two{"Doler UDA"}
+ zero{"Doler UDA"}
+ }
+ UYU{
+ few{"Peso Uruguay"}
+ many{"Peso Uruguay"}
+ one{"Peso Uruguay"}
+ other{"Peso Uruguay"}
+ two{"Peso Uruguay"}
+ zero{"Peso Uruguay"}
+ }
+ UZS{
+ few{"Som Uzbekistan"}
+ many{"Som Uzbekistan"}
+ one{"Som Uzbekistan"}
+ other{"Som Uzbekistan"}
+ two{"Som Uzbekistan"}
+ zero{"Som Uzbekistan"}
+ }
+ VEF{
+ few{"Bolívar Venezuela"}
+ many{"Bolívar Venezuela"}
+ one{"Bolívar Venezuela"}
+ other{"Bolívar Venezuela"}
+ two{"Bolívar Venezuela"}
+ zero{"Bolívar Venezuela"}
+ }
+ VND{
+ few{"Dong Fietnam"}
+ many{"Dong Fietnam"}
+ one{"Dong Fietnam"}
+ other{"Dong Fietnam"}
+ two{"Dong Fietnam"}
+ zero{"Dong Fietnam"}
+ }
+ VUV{
+ few{"Vatu Vanuatu"}
+ many{"Vatu Vanuatu"}
+ one{"Vatu Vanuatu"}
+ other{"Vatu Vanuatu"}
+ two{"Vatu Vanuatu"}
+ zero{"Vatu Vanuatu"}
+ }
+ WST{
+ few{"Tala Samoa"}
+ many{"Tala Samoa"}
+ one{"Tala Samoa"}
+ other{"Tala Samoa"}
+ two{"Tala Samoa"}
+ zero{"Tala Samoa"}
+ }
+ XAF{
+ few{"Ffranc CFA y BEAC"}
+ many{"Ffranc CFA y BEAC"}
+ one{"Ffranc CFA y BEAC"}
+ other{"Ffranc CFA y BEAC"}
+ two{"Ffranc CFA y BEAC"}
+ zero{"Ffranc CFA y BEAC"}
+ }
+ XCD{
+ few{"Doler Dwyrain y Caribî"}
+ many{"Doler Dwyrain y Caribî"}
+ one{"Doler Dwyrain y Caribî"}
+ other{"Doler Dwyrain y Caribî"}
+ two{"Doler Dwyrain y Caribî"}
+ zero{"Doler Dwyrain y Caribî"}
+ }
+ XOF{
+ few{"Ffranc CFA y BCEAO"}
+ many{"Ffranc CFA y BCEAO"}
+ one{"Ffranc CFA y BCEAO"}
+ other{"Ffranc CFA y BCEAO"}
+ two{"Ffranc CFA y BCEAO"}
+ zero{"Ffranc CFA y BCEAO"}
+ }
+ XPF{
+ few{"Ffranc CPF"}
+ many{"Ffranc CPF"}
+ one{"Ffranc CPF"}
+ other{"Ffranc CPF"}
+ two{"Ffranc CPF"}
+ zero{"Ffranc CPF"}
+ }
+ XXX{
+ few{"Arian Cyfredol Anhysbys"}
+ many{"Arian Cyfredol Anhysbys"}
+ one{"Arian Cyfredol Anhysbys"}
+ other{"Arian Cyfredol Anhysbys"}
+ two{"Arian Cyfredol Anhysbys"}
+ zero{"Arian Cyfredol Anhysbys"}
+ }
+ YER{
+ few{"Rial Yemen"}
+ many{"Rial Yemen"}
+ one{"Rial Yemen"}
+ other{"Rial Yemen"}
+ two{"Rial Yemen"}
+ zero{"Rial Yemen"}
+ }
+ ZAR{
+ few{"Rand De Affrica"}
+ many{"Rand De Affrica"}
+ one{"Rand De Affrica"}
+ other{"Rand De Affrica"}
+ two{"Rand De Affrica"}
+ zero{"Rand De Affrica"}
+ }
+ ZMK{
+ few{"Kwacha Zambia (1968-2012)"}
+ many{"Kwacha Zambia (1968-2012)"}
+ one{"Kwacha Zambia (1968-2012)"}
+ other{"Kwacha Zambia (1968-2012)"}
+ two{"Kwacha Zambia (1968-2012)"}
+ zero{"Kwacha Zambia (1968-2012)"}
+ }
+ ZMW{
+ few{"Kwacha Zambia"}
+ many{"Kwacha Zambia"}
+ one{"Kwacha Zambia"}
+ other{"Kwacha Zambia"}
+ two{"Kwacha Zambia"}
+ zero{"Kwacha Zambia"}
+ }
+ }
+ CurrencyUnitPatterns{
+ few{"{0} {1}"}
+ many{"{0} {1}"}
+ one{"{0} {1}"}
+ other{"{0} {1}"}
+ two{"{0} {1}"}
+ zero{"{0} {1}"}
+ }
+ Version{"2.0.82.51"}
}
diff --git a/data/curr/da.txt b/data/curr/da.txt
index 85d4932..e25bdd5 100644
--- a/data/curr/da.txt
+++ b/data/curr/da.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/da.xml
// *
@@ -444,7 +444,7 @@
"Ny israelsk shekel",
}
INR{
- "₹",
+ "Rs.",
"Indisk rupee",
}
IQD{
@@ -1053,6 +1053,10 @@
}
ZMK{
"ZMK",
+ "Zambisk kwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambisk kwacha",
}
ZRN{
@@ -2082,6 +2086,10 @@
other{"Sydafrikanske rand"}
}
ZMK{
+ one{"Zambisk kwacha (1968-2012)"}
+ other{"Zambiske kwacha (1968-2012)"}
+ }
+ ZMW{
one{"Zambisk kwacha"}
other{"Zambiske kwacha"}
}
@@ -2110,5 +2118,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/dav.txt b/data/curr/dav.txt
index 22afe43..86efd7a 100755
--- a/data/curr/dav.txt
+++ b/data/curr/dav.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dav.xml
// *
@@ -96,7 +96,7 @@
"Faranga ya Gine",
}
INR{
- "₹",
+ "Rs.",
"Rupia ya India",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Kwacha ya Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha ya Zambia",
}
ZWD{
@@ -228,5 +232,5 @@
"Dola ya Zimbabwe",
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/de.txt b/data/curr/de.txt
index d2b384b..d17a5bb 100644
--- a/data/curr/de.txt
+++ b/data/curr/de.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/de.xml
// *
@@ -456,7 +456,7 @@
"Israelische Neuer Schekel",
}
INR{
- "₹",
+ "Rs.",
"Indische Rupie",
}
IQD{
@@ -1081,6 +1081,10 @@
}
ZMK{
"ZMK",
+ "Kwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha",
}
ZRN{
@@ -2170,6 +2174,10 @@
other{"Südafrikanische Rand"}
}
ZMK{
+ one{"Kwacha (1968-2012)"}
+ other{"Kwacha (1968-2012)"}
+ }
+ ZMW{
one{"Kwacha"}
other{"Kwacha"}
}
@@ -2198,5 +2206,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/de_CH.txt b/data/curr/de_CH.txt
new file mode 100755
index 0000000..3fcdb9d
--- /dev/null
+++ b/data/curr/de_CH.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/de_CH.xml
+// *
+// ***************************************************************************
+de_CH{
+ Currencies{
+ CHF{
+ "CHF",
+ "Schweizer Franken",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/de_LU.txt b/data/curr/de_LU.txt
index 83895ea..0561db0 100644
--- a/data/curr/de_LU.txt
+++ b/data/curr/de_LU.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/de_LU.xml
// *
@@ -18,5 +18,5 @@
}
}
}
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/dje.txt b/data/curr/dje.txt
index e617a75..6c3eb93 100755
--- a/data/curr/dje.txt
+++ b/data/curr/dje.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dje.xml
// *
@@ -96,7 +96,7 @@
"Ginee Fraŋ",
}
INR{
- "₹",
+ "Rs.",
"Indu Rupii",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Zambi Kwaca (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambi Kwaca",
}
ZWD{
@@ -232,5 +236,5 @@
"Zimbabwe Dollar",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/dua.txt b/data/curr/dua.txt
index e3d8ebe..a78dea0 100755
--- a/data/curr/dua.txt
+++ b/data/curr/dua.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dua.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/dua.xml
*/
dua{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/dyo.txt b/data/curr/dyo.txt
index 4c12a0e..c232dd3 100755
--- a/data/curr/dyo.txt
+++ b/data/curr/dyo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dyo.xml
// *
@@ -84,7 +84,7 @@
"sili yati Giné",
}
INR{
- "₹",
+ "Rs.",
"rupii yati End",
}
JPY{
@@ -128,5 +128,5 @@
"seefa yati BCEAO",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/dz.txt b/data/curr/dz.txt
index 53366e4..1ddbcaf 100755
--- a/data/curr/dz.txt
+++ b/data/curr/dz.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dz.xml
// *
@@ -96,7 +96,7 @@
"ཨིས་རེལ་གྱི་དངུལ་གསརཔ་ ཤེ་ཀེལ",
}
INR{
- "₹",
+ "Rs.",
"རྒྱ་གར་གྱི་དངུལ་ རུ་པི",
}
IQD{
@@ -312,5 +312,5 @@
"སཱའུཐ་ ཨཕ་རི་ཀ་གི་དངུལ་ རཱནད",
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ebu.txt b/data/curr/ebu.txt
index 0b1891e..b770d57 100755
--- a/data/curr/ebu.txt
+++ b/data/curr/ebu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ebu.xml
// *
@@ -96,7 +96,7 @@
"Faranga ya Gine",
}
INR{
- "₹",
+ "Rs.",
"Rupia ya India",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Kwacha ya Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha ya Zambia",
}
ZWD{
@@ -228,5 +232,5 @@
"Dola ya Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ee.txt b/data/curr/ee.txt
index 41866f5..d9e9c54 100755
--- a/data/curr/ee.txt
+++ b/data/curr/ee.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ee.xml
// *
@@ -500,7 +500,7 @@
"israelga yeyetɔ sheqel",
}
INR{
- "₹",
+ "Rs.",
"indiaga rupee",
}
IQD{
@@ -1129,6 +1129,10 @@
}
ZMK{
"ZMK",
+ "zambiaga kwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"zambiaga kwacha",
}
ZRN{
@@ -1263,23 +1267,23 @@
}
BEC{
one{"beldziumga franc (convertible)"}
- other{"beldziumga francwo (convertible)"}
+ other{"beldziumga franc (convertible)"}
}
BEF{
one{"beldziumga franc"}
- other{"beldziumga francwo"}
+ other{"beldziumga franc"}
}
BEL{
one{"beldziumga franc (financial)"}
- other{"beldziumga francwo (financial)"}
+ other{"beldziumga franc (financial)"}
}
BGL{
one{"bɔlgariaga hard lev"}
- other{"bɔlgariaga hard levwo"}
+ other{"bɔlgariaga hard lev"}
}
BGM{
one{"bɔlgariaga socialist lev"}
- other{"bɔlgariaga socialist levwo"}
+ other{"bɔlgariaga socialist lev"}
}
BGN{
one{"bulgariaga lev"}
@@ -1295,7 +1299,7 @@
}
BIF{
one{"burundiga franc"}
- other{"burundiga francwo"}
+ other{"burundiga franc"}
}
BMD{
one{"bermudaga dollar"}
@@ -1315,19 +1319,19 @@
}
BOP{
one{"boliviaga peso"}
- other{"boliviaga pesowo"}
+ other{"boliviaga peso"}
}
BOV{
one{"boliviaga mvdol"}
- other{"boliviaga mvdolwo"}
+ other{"boliviaga mvdol"}
}
BRB{
one{"braziliaga cruzeiro xoxotɔ (1967-1986)"}
- other{"braziliaga cruzeiro xoxotɔwo (1967-1986)"}
+ other{"braziliaga cruzeiro xoxotɔ (1967-1986)"}
}
BRC{
one{"brazilia cruzado (1986-1989)"}
- other{"brazilia cruzadowo (1986-1989)"}
+ other{"brazilia cruzado (1986-1989)"}
}
BRE{
one{"braziliaga cruzeiro xoxotɔ gbãtɔ (1990-1993)"}
@@ -1335,11 +1339,11 @@
}
BRL{
one{"braziliaga real"}
- other{"braziliaga realwo"}
+ other{"braziliaga real"}
}
BRN{
one{"brazilia cruzado xoxotɔ (1989-1990)"}
- other{"brazilia cruzado xoxotɔwo (1989-1990)"}
+ other{"brazilia cruzado xoxotɔ (1989-1990)"}
}
BRR{
one{"braziliaga cruzeiro (1993-1994)"}
@@ -1347,27 +1351,27 @@
}
BRZ{
one{"braziliaga cruzeiro (1942-1967)"}
- other{"braziliaga cruzeiros (1942-1967)"}
+ other{"braziliaga cruzeiro (1942-1967)"}
}
BSD{
one{"bahamiaga dollar"}
- other{"bahamiaga dollarwo"}
+ other{"bahamiaga dollar"}
}
BTN{
one{"bhutanga ngultrum"}
- other{"bhutanga ngultrumwo"}
+ other{"bhutanga ngultrum"}
}
BUK{
one{"burmaga kyat"}
- other{"burmaga kyatwo"}
+ other{"burmaga kyat"}
}
BWP{
one{"botswanaga pula"}
- other{"botswanaga pulawo"}
+ other{"botswanaga pula"}
}
BYB{
one{"belarusiaga ruble yeytɔ (1994-1999)"}
- other{"belarusiaga ruble yeyetɔwo (1994-1999)"}
+ other{"belarusiaga ruble yeyetɔ (1994-1999)"}
}
BYR{
one{"belarusiaga ruble"}
@@ -1375,15 +1379,15 @@
}
BZD{
one{"belizega dollar"}
- other{"belizega dollarwo"}
+ other{"belizega dollar"}
}
CAD{
one{"kanadaga dollar"}
- other{"kanadaga dollarwo"}
+ other{"kanadaga dollar"}
}
CDF{
one{"kongoga franc"}
- other{"kongoga francwo"}
+ other{"kongoga franc"}
}
CHE{
one{"WIR euro CHE"}
@@ -1391,7 +1395,7 @@
}
CHF{
one{"swissga franc"}
- other{"swissga francwo"}
+ other{"swissga franc"}
}
CHW{
one{"WIR euro CHW"}
@@ -1403,7 +1407,7 @@
}
CLF{
one{"tsilegakɔnta dzidzenu UF"}
- other{"tsilegakɔnta dzidzenuwo UF"}
+ other{"tsilegakɔnta dzidzenu UF"}
}
CLP{
one{"tsilega peso"}
@@ -1415,51 +1419,51 @@
}
CNY{
one{"tsainaga yuan"}
- other{"tsainaga yuanwo"}
+ other{"tsainaga yuan"}
}
COP{
one{"kolombiaga peso"}
- other{"kolombiaga pesowo"}
+ other{"kolombiaga peso"}
}
COU{
one{"kolombiaga vavãtɔ"}
- other{"kolombiaga vavãtɔwo"}
+ other{"kolombiaga vavãtɔ"}
}
CRC{
one{"kosta rikaga kolón"}
- other{"kosta rikaga kolónwo"}
+ other{"kosta rikaga kolón"}
}
CSD{
one{"serbiaga dinar (2002-2006)"}
- other{"serbiaga dinarwo (2002-2006)"}
+ other{"serbiaga dinar (2002-2006)"}
}
CSK{
one{"tsɛkoslovakiaga hard koruna"}
- other{"tsɛkoslovakiaga hard korunawo"}
+ other{"tsɛkoslovakiaga hard koruna"}
}
CUC{
one{"kubaga convertible peso"}
- other{"kubaga convertible pesowo"}
+ other{"kubaga convertible peso"}
}
CUP{
one{"kubaga peso"}
- other{"kubaga pesowo"}
+ other{"kubaga peso"}
}
CVE{
one{"kape verdega escudo"}
- other{"kape verdega escudowo"}
+ other{"kape verdega escudo"}
}
CYP{
one{"saipriɔtga pound"}
- other{"saipriɔtga poundwo"}
+ other{"saipriɔtga pound"}
}
CZK{
one{"tsɛk repɔblikga koruna"}
- other{"tsɛk repɔblikga korunawo"}
+ other{"tsɛk repɔblikga koruna"}
}
DDM{
one{"ɣedzeƒe germaniaga mark"}
- other{"ɣedzeƒe germaniaga markwo"}
+ other{"ɣedzeƒe germaniaga mark"}
}
DEM{
one{"germaniaga mark"}
@@ -1751,7 +1755,7 @@
}
LUC{
one{"lazembɔgga convertible franc"}
- other{"lazembɔgga convertible francs"}
+ other{"lazembɔgga convertible franc"}
}
LUF{
one{"lazembɔgga franc"}
@@ -1867,7 +1871,7 @@
}
NLG{
one{"hollandga guilder"}
- other{"hollandga guilderwo"}
+ other{"hollandga guilder"}
}
NOK{
one{"nɔweiga krone"}
@@ -2270,6 +2274,10 @@
other{"anyiehe afrikaga rand"}
}
ZMK{
+ one{"zambiaga kwacha (1968-2012)"}
+ other{"zambiaga kwacha (1968-2012)"}
+ }
+ ZMW{
one{"zambiaga kwacha"}
other{"zambiaga kwacha"}
}
@@ -2295,7 +2303,8 @@
}
}
CurrencyUnitPatterns{
+ one{"{1} {0}"}
other{"{1} {0}"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
}
diff --git a/data/curr/el.txt b/data/curr/el.txt
index 346ed72..fc447be 100644
--- a/data/curr/el.txt
+++ b/data/curr/el.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/el.xml
// *
@@ -453,7 +453,7 @@
"Νέο Σέκελ Ισραήλ",
}
INR{
- "₹",
+ "Rs.",
"Ρούπια Ινδίας",
}
IQD{
@@ -1054,6 +1054,10 @@
}
ZMK{
"ZMK",
+ "Κουάνζα Ζαΐρ (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Κουάνζα Ζαΐρ",
}
ZRN{
@@ -2103,6 +2107,10 @@
other{"ραντ Νότιας Αφρικής"}
}
ZMK{
+ one{"κουάτσα Ζάμπιας (1968-2012)"}
+ other{"κουάτσα Ζάμπιας (1968-2012)"}
+ }
+ ZMW{
one{"κουάτσα Ζάμπιας"}
other{"κουάτσα Ζάμπιας"}
}
@@ -2124,7 +2132,8 @@
}
}
CurrencyUnitPatterns{
+ one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/en.txt b/data/curr/en.txt
index b05a02d..74ac30f 100644
--- a/data/curr/en.txt
+++ b/data/curr/en.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en.xml
// *
@@ -500,7 +500,7 @@
"Israeli New Sheqel",
}
INR{
- "₹",
+ "Rs.",
"Indian Rupee",
}
IQD{
@@ -796,7 +796,7 @@
"Papua New Guinean Kina",
}
PHP{
- "PHP",
+ "Php",
"Philippine Peso",
}
PKR{
@@ -1173,6 +1173,10 @@
}
ZMK{
"ZMK",
+ "Zambian Kwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambian Kwacha",
}
ZRN{
@@ -2358,6 +2362,10 @@
other{"South African rand"}
}
ZMK{
+ one{"Zambian kwacha (1968-2012)"}
+ other{"Zambian kwachas (1968-2012)"}
+ }
+ ZMW{
one{"Zambian kwacha"}
other{"Zambian kwachas"}
}
@@ -2386,5 +2394,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.36"}
+ Version{"2.0.82.76"}
}
diff --git a/data/curr/en_AG.txt b/data/curr/en_AG.txt
new file mode 100755
index 0000000..f28f209
--- /dev/null
+++ b/data/curr/en_AG.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_AG.xml
+// *
+// ***************************************************************************
+en_AG{
+ Currencies{
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_AU.txt b/data/curr/en_AU.txt
index 7bfc4ee..e4434f7 100644
--- a/data/curr/en_AU.txt
+++ b/data/curr/en_AU.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_AU.xml
// *
@@ -17,5 +17,5 @@
"US Dollar",
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/en_BB.txt b/data/curr/en_BB.txt
index c1d8728..5b4c40f 100755
--- a/data/curr/en_BB.txt
+++ b/data/curr/en_BB.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_BB.xml
// *
@@ -17,5 +17,5 @@
"US Dollar",
}
}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/en_BE.txt b/data/curr/en_BE.txt
new file mode 100755
index 0000000..8505d51
--- /dev/null
+++ b/data/curr/en_BE.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_BE.xml
+// *
+// ***************************************************************************
+en_BE{
+ Currencies{
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_BM.txt b/data/curr/en_BM.txt
index 1d2ccfb..a248791 100755
--- a/data/curr/en_BM.txt
+++ b/data/curr/en_BM.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_BM.xml
// *
@@ -17,5 +17,5 @@
"US Dollar",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/en_BS.txt b/data/curr/en_BS.txt
new file mode 100755
index 0000000..b368142
--- /dev/null
+++ b/data/curr/en_BS.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_BS.xml
+// *
+// ***************************************************************************
+en_BS{
+ Currencies{
+ BSD{
+ "$",
+ "Bahamian Dollar",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_BW.txt b/data/curr/en_BW.txt
index 1795182..a610bf6 100644
--- a/data/curr/en_BW.txt
+++ b/data/curr/en_BW.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_BW.xml
// *
@@ -12,6 +12,10 @@
"P",
"Botswanan Pula",
}
+ USD{
+ "US$",
+ "US Dollar",
+ }
}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/en_BZ.txt b/data/curr/en_BZ.txt
index 7c4520c..b234099 100644
--- a/data/curr/en_BZ.txt
+++ b/data/curr/en_BZ.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_BZ.xml
// *
@@ -17,5 +17,5 @@
"US Dollar",
}
}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/en_CA.txt b/data/curr/en_CA.txt
index 7185dd8..3835356 100644
--- a/data/curr/en_CA.txt
+++ b/data/curr/en_CA.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_CA.xml
// *
@@ -17,5 +17,5 @@
"US Dollar",
}
}
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/en_CM.txt b/data/curr/en_CM.txt
new file mode 100755
index 0000000..4bfdcfc
--- /dev/null
+++ b/data/curr/en_CM.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_CM.xml
+// *
+// ***************************************************************************
+en_CM{
+ Currencies{
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_DM.txt b/data/curr/en_DM.txt
new file mode 100755
index 0000000..0c178bb
--- /dev/null
+++ b/data/curr/en_DM.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_DM.xml
+// *
+// ***************************************************************************
+en_DM{
+ Currencies{
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_FJ.txt b/data/curr/en_FJ.txt
new file mode 100755
index 0000000..62bfe77
--- /dev/null
+++ b/data/curr/en_FJ.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_FJ.xml
+// *
+// ***************************************************************************
+en_FJ{
+ Currencies{
+ FJD{
+ "$",
+ "Fijian Dollar",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_GB.txt b/data/curr/en_GB.txt
index a574ed8..460ce5d 100755
--- a/data/curr/en_GB.txt
+++ b/data/curr/en_GB.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GB.xml
// *
@@ -45,7 +45,7 @@
"Israeli New Shekel",
}
INR{
- "₹",
+ "Rs.",
"Indian Rupee",
}
KRW{
@@ -163,5 +163,5 @@
other{"(unknown currency)"}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/en_GD.txt b/data/curr/en_GD.txt
new file mode 100755
index 0000000..e4e5174
--- /dev/null
+++ b/data/curr/en_GD.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_GD.xml
+// *
+// ***************************************************************************
+en_GD{
+ Currencies{
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_GH.txt b/data/curr/en_GH.txt
new file mode 100755
index 0000000..5143ec3
--- /dev/null
+++ b/data/curr/en_GH.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_GH.xml
+// *
+// ***************************************************************************
+en_GH{
+ Currencies{
+ GHS{
+ "GH₵",
+ "Ghanaian Cedi",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_GI.txt b/data/curr/en_GI.txt
new file mode 100755
index 0000000..6cb5f4b
--- /dev/null
+++ b/data/curr/en_GI.txt
@@ -0,0 +1,25 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_GI.xml
+// *
+// ***************************************************************************
+en_GI{
+ Currencies{
+ GBP{
+ "GB£",
+ "British Pound",
+ }
+ GIP{
+ "£",
+ "Gibraltar Pound",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_GM.txt b/data/curr/en_GM.txt
new file mode 100755
index 0000000..15c5f39
--- /dev/null
+++ b/data/curr/en_GM.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_GM.xml
+// *
+// ***************************************************************************
+en_GM{
+ Currencies{
+ GMD{
+ "D",
+ "Gambian Dalasi",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_GY.txt b/data/curr/en_GY.txt
new file mode 100755
index 0000000..3dbbf7c
--- /dev/null
+++ b/data/curr/en_GY.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_GY.xml
+// *
+// ***************************************************************************
+en_GY{
+ Currencies{
+ GYD{
+ "$",
+ "Guyanaese Dollar",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_HK.txt b/data/curr/en_HK.txt
index 9ce4a44..83371ef 100644
--- a/data/curr/en_HK.txt
+++ b/data/curr/en_HK.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_HK.xml
// *
@@ -17,5 +17,5 @@
"US Dollar",
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/en_IN.txt b/data/curr/en_IN.txt
new file mode 100755
index 0000000..5fd44cc
--- /dev/null
+++ b/data/curr/en_IN.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_IN.xml
+// *
+// ***************************************************************************
+en_IN{
+ Currencies{
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_JM.txt b/data/curr/en_JM.txt
index eee0a3b..351ba90 100644
--- a/data/curr/en_JM.txt
+++ b/data/curr/en_JM.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_JM.xml
// *
@@ -17,5 +17,5 @@
"US Dollar",
}
}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/en_KE.txt b/data/curr/en_KE.txt
new file mode 100755
index 0000000..8d543b3
--- /dev/null
+++ b/data/curr/en_KE.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_KE.xml
+// *
+// ***************************************************************************
+en_KE{
+ Currencies{
+ KES{
+ "Ksh",
+ "Kenyan Shilling",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_KI.txt b/data/curr/en_KI.txt
new file mode 100755
index 0000000..ba0de22
--- /dev/null
+++ b/data/curr/en_KI.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_KI.xml
+// *
+// ***************************************************************************
+en_KI{
+ Currencies{
+ AUD{
+ "$",
+ "Australian Dollar",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_KN.txt b/data/curr/en_KN.txt
new file mode 100755
index 0000000..54dc8dd
--- /dev/null
+++ b/data/curr/en_KN.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_KN.xml
+// *
+// ***************************************************************************
+en_KN{
+ Currencies{
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_KY.txt b/data/curr/en_KY.txt
new file mode 100755
index 0000000..41ca4d5
--- /dev/null
+++ b/data/curr/en_KY.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_KY.xml
+// *
+// ***************************************************************************
+en_KY{
+ Currencies{
+ KYD{
+ "$",
+ "Cayman Islands Dollar",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_LC.txt b/data/curr/en_LC.txt
new file mode 100755
index 0000000..118dd76
--- /dev/null
+++ b/data/curr/en_LC.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_LC.xml
+// *
+// ***************************************************************************
+en_LC{
+ Currencies{
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_LR.txt b/data/curr/en_LR.txt
new file mode 100755
index 0000000..b4c3fe1
--- /dev/null
+++ b/data/curr/en_LR.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_LR.xml
+// *
+// ***************************************************************************
+en_LR{
+ Currencies{
+ LRD{
+ "$",
+ "Liberian Dollar",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_LS.txt b/data/curr/en_LS.txt
new file mode 100755
index 0000000..78ee1bd
--- /dev/null
+++ b/data/curr/en_LS.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_LS.xml
+// *
+// ***************************************************************************
+en_LS{
+ Currencies{
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ ZAR{
+ "R",
+ "South African Rand",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_MG.txt b/data/curr/en_MG.txt
new file mode 100755
index 0000000..2d3f7c3
--- /dev/null
+++ b/data/curr/en_MG.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_MG.xml
+// *
+// ***************************************************************************
+en_MG{
+ Currencies{
+ MGA{
+ "Ar",
+ "Malagasy Ariary",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_MT.txt b/data/curr/en_MT.txt
index 10c4470..0f3c798 100644
--- a/data/curr/en_MT.txt
+++ b/data/curr/en_MT.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_MT.xml
// *
@@ -12,6 +12,10 @@
"GB£",
"British Pound",
}
+ USD{
+ "US$",
+ "US Dollar",
+ }
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/en_MU.txt b/data/curr/en_MU.txt
new file mode 100755
index 0000000..0b6e265
--- /dev/null
+++ b/data/curr/en_MU.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_MU.xml
+// *
+// ***************************************************************************
+en_MU{
+ Currencies{
+ MUR{
+ "Rs",
+ "Mauritian Rupee",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_MW.txt b/data/curr/en_MW.txt
new file mode 100755
index 0000000..d080113
--- /dev/null
+++ b/data/curr/en_MW.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_MW.xml
+// *
+// ***************************************************************************
+en_MW{
+ Currencies{
+ MWK{
+ "MK",
+ "Malawian Kwacha",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_NA.txt b/data/curr/en_NA.txt
index 29d4f6b..72cb34a 100644
--- a/data/curr/en_NA.txt
+++ b/data/curr/en_NA.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_NA.xml
// *
@@ -17,5 +17,5 @@
"US Dollar",
}
}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/en_NG.txt b/data/curr/en_NG.txt
new file mode 100755
index 0000000..f5be7a1
--- /dev/null
+++ b/data/curr/en_NG.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_NG.xml
+// *
+// ***************************************************************************
+en_NG{
+ Currencies{
+ NGN{
+ "₦",
+ "Nigerian Naira",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_NH.txt b/data/curr/en_NH.txt
index 92d7383..0b45233 100755
--- a/data/curr/en_NH.txt
+++ b/data/curr/en_NH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/en_NZ.txt b/data/curr/en_NZ.txt
index 6e6ac9e..242a39f 100644
--- a/data/curr/en_NZ.txt
+++ b/data/curr/en_NZ.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_NZ.xml
// *
@@ -17,5 +17,5 @@
"US Dollar",
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/en_PG.txt b/data/curr/en_PG.txt
new file mode 100755
index 0000000..623786b
--- /dev/null
+++ b/data/curr/en_PG.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_PG.xml
+// *
+// ***************************************************************************
+en_PG{
+ Currencies{
+ PGK{
+ "K",
+ "Papua New Guinean Kina",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_PH.txt b/data/curr/en_PH.txt
index d6ecd33..00d64d0 100644
--- a/data/curr/en_PH.txt
+++ b/data/curr/en_PH.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_PH.xml
// *
@@ -17,5 +17,5 @@
"US Dollar",
}
}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/en_PK.txt b/data/curr/en_PK.txt
index 4f25cb4..fea6268 100644
--- a/data/curr/en_PK.txt
+++ b/data/curr/en_PK.txt
@@ -1,21 +1,21 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_PK.xml
// *
// ***************************************************************************
en_PK{
Currencies{
- INR{
- "INRs",
- "Indian Rupee",
- }
PKR{
- "₨",
+ "Rs",
"Pakistani Rupee",
}
+ USD{
+ "US$",
+ "US Dollar",
+ }
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/en_RH.txt b/data/curr/en_RH.txt
index 928f668..bc71849 100644
--- a/data/curr/en_RH.txt
+++ b/data/curr/en_RH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/en_SB.txt b/data/curr/en_SB.txt
new file mode 100755
index 0000000..bc58662
--- /dev/null
+++ b/data/curr/en_SB.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_SB.xml
+// *
+// ***************************************************************************
+en_SB{
+ Currencies{
+ SBD{
+ "$",
+ "Solomon Islands Dollar",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_SC.txt b/data/curr/en_SC.txt
new file mode 100755
index 0000000..46c36cf
--- /dev/null
+++ b/data/curr/en_SC.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_SC.xml
+// *
+// ***************************************************************************
+en_SC{
+ Currencies{
+ SCR{
+ "SR",
+ "Seychellois Rupee",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_SG.txt b/data/curr/en_SG.txt
index 68f1086..f27b1ac 100644
--- a/data/curr/en_SG.txt
+++ b/data/curr/en_SG.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_SG.xml
// *
@@ -17,5 +17,5 @@
"US Dollar",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/en_SL.txt b/data/curr/en_SL.txt
new file mode 100755
index 0000000..f9362e4
--- /dev/null
+++ b/data/curr/en_SL.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_SL.xml
+// *
+// ***************************************************************************
+en_SL{
+ Currencies{
+ SLL{
+ "Le",
+ "Sierra Leonean Leone",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_SS.txt b/data/curr/en_SS.txt
new file mode 100755
index 0000000..a6729ff
--- /dev/null
+++ b/data/curr/en_SS.txt
@@ -0,0 +1,25 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_SS.xml
+// *
+// ***************************************************************************
+en_SS{
+ Currencies{
+ GBP{
+ "GB£",
+ "British Pound Sterling",
+ }
+ SSP{
+ "£",
+ "South Sudanese Pound",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_SZ.txt b/data/curr/en_SZ.txt
new file mode 100755
index 0000000..ef606e3
--- /dev/null
+++ b/data/curr/en_SZ.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_SZ.xml
+// *
+// ***************************************************************************
+en_SZ{
+ Currencies{
+ SZL{
+ "E",
+ "Swazi Lilangeni",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_TO.txt b/data/curr/en_TO.txt
new file mode 100755
index 0000000..a653ec8
--- /dev/null
+++ b/data/curr/en_TO.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_TO.xml
+// *
+// ***************************************************************************
+en_TO{
+ Currencies{
+ TOP{
+ "T$",
+ "Tongan Paʻanga",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_TT.txt b/data/curr/en_TT.txt
index 11bd3b3..fe5dc1c 100644
--- a/data/curr/en_TT.txt
+++ b/data/curr/en_TT.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_TT.xml
// *
@@ -17,5 +17,5 @@
"US Dollar",
}
}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/en_TZ.txt b/data/curr/en_TZ.txt
new file mode 100755
index 0000000..55bed54
--- /dev/null
+++ b/data/curr/en_TZ.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_TZ.xml
+// *
+// ***************************************************************************
+en_TZ{
+ Currencies{
+ TZS{
+ "TSh",
+ "Tanzanian Shilling",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_UG.txt b/data/curr/en_UG.txt
new file mode 100755
index 0000000..797d599
--- /dev/null
+++ b/data/curr/en_UG.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_UG.xml
+// *
+// ***************************************************************************
+en_UG{
+ Currencies{
+ UGX{
+ "USh",
+ "Ugandan Shilling",
+ }
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_US.txt b/data/curr/en_US.txt
new file mode 100644
index 0000000..fa4638b
--- /dev/null
+++ b/data/curr/en_US.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2012 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_US.xml
+// *
+// ***************************************************************************
+en_US{
+ Currencies{
+ AUD{
+ "A$",
+ "Australian Dollar",
+ }
+ }
+ Version{"2.0.41.23"}
+}
diff --git a/data/curr/en_VC.txt b/data/curr/en_VC.txt
new file mode 100755
index 0000000..80a7e2f
--- /dev/null
+++ b/data/curr/en_VC.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_VC.xml
+// *
+// ***************************************************************************
+en_VC{
+ Currencies{
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_VU.txt b/data/curr/en_VU.txt
index a5076d7..9c7965e 100755
--- a/data/curr/en_VU.txt
+++ b/data/curr/en_VU.txt
@@ -1,17 +1,21 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/icu-config.xml & build.xml
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_VU.xml
// *
// ***************************************************************************
-/**
- * generated alias target
- */
en_VU{
- /**
- * so genrb doesn't issue warnings
- */
- ___{""}
+ Currencies{
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ VUV{
+ "VT",
+ "Vanuatu Vatu",
+ }
+ }
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/en_WS.txt b/data/curr/en_WS.txt
new file mode 100755
index 0000000..fa32966
--- /dev/null
+++ b/data/curr/en_WS.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_WS.xml
+// *
+// ***************************************************************************
+en_WS{
+ Currencies{
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ WST{
+ "WS$",
+ "Samoan Tala",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_ZA.txt b/data/curr/en_ZA.txt
index ce8edf4..5f124d6 100755
--- a/data/curr/en_ZA.txt
+++ b/data/curr/en_ZA.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_ZA.xml
// *
@@ -17,5 +17,5 @@
"South African Rand",
}
}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/en_ZM.txt b/data/curr/en_ZM.txt
new file mode 100644
index 0000000..f5ef84e
--- /dev/null
+++ b/data/curr/en_ZM.txt
@@ -0,0 +1,25 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_ZM.xml
+// *
+// ***************************************************************************
+en_ZM{
+ Currencies{
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ ZMK{
+ "K",
+ "Zambian Kwacha (1968-2012)",
+ }
+ ZMW{
+ "KR",
+ "Zambian Kwacha",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/en_ZW.txt b/data/curr/en_ZW.txt
index 6d0f9be..dbd3570 100644
--- a/data/curr/en_ZW.txt
+++ b/data/curr/en_ZW.txt
@@ -1,17 +1,17 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/icu-config.xml & build.xml
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/en_ZW.xml
// *
// ***************************************************************************
-/**
- * generated alias target
- */
en_ZW{
- /**
- * so genrb doesn't issue warnings
- */
- ___{""}
+ Currencies{
+ USD{
+ "US$",
+ "US Dollar",
+ }
+ }
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/eo.txt b/data/curr/eo.txt
index eb4358b..66a8192 100644
--- a/data/curr/eo.txt
+++ b/data/curr/eo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/eo.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/eo.xml
*/
eo{
- Version{"2.0.74.74"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/es.txt b/data/curr/es.txt
index b072350..5d18cad 100644
--- a/data/curr/es.txt
+++ b/data/curr/es.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es.xml
// *
@@ -456,7 +456,7 @@
"nuevo sheqel israelí",
}
INR{
- "₹",
+ "Rs.",
"rupia india",
}
IQD{
@@ -1085,6 +1085,10 @@
}
ZMK{
"ZMK",
+ "kwacha zambiano (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"kwacha zambiano",
}
ZRN{
@@ -2074,6 +2078,10 @@
other{"rands sudafricanos"}
}
ZMK{
+ one{"kwacha zambiano (1968-2012)"}
+ other{"kwachas zambianos (1968-2012)"}
+ }
+ ZMW{
one{"kwacha zambiano"}
other{"kwachas zambianos"}
}
@@ -2082,5 +2090,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.47"}
}
diff --git a/data/curr/es_AR.txt b/data/curr/es_AR.txt
index e264358..0f979ee 100644
--- a/data/curr/es_AR.txt
+++ b/data/curr/es_AR.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_AR.xml
// *
@@ -13,5 +13,5 @@
"peso argentino",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/es_BO.txt b/data/curr/es_BO.txt
index 2943fa4..76eb3d1 100755
--- a/data/curr/es_BO.txt
+++ b/data/curr/es_BO.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_BO.xml
// *
@@ -13,5 +13,5 @@
"boliviano",
}
}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/es_CL.txt b/data/curr/es_CL.txt
index b319e3b..913a824 100644
--- a/data/curr/es_CL.txt
+++ b/data/curr/es_CL.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_CL.xml
// *
@@ -13,5 +13,5 @@
"peso chileno",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/es_CO.txt b/data/curr/es_CO.txt
index 30cb925..5915f6a 100644
--- a/data/curr/es_CO.txt
+++ b/data/curr/es_CO.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_CO.xml
// *
@@ -13,5 +13,5 @@
"peso colombiano",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/es_CR.txt b/data/curr/es_CR.txt
index a55557b..8b7aa4b 100755
--- a/data/curr/es_CR.txt
+++ b/data/curr/es_CR.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_CR.xml
// *
@@ -13,5 +13,5 @@
"colón costarricense",
}
}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/es_CU.txt b/data/curr/es_CU.txt
new file mode 100755
index 0000000..66f07f9
--- /dev/null
+++ b/data/curr/es_CU.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/es_CU.xml
+// *
+// ***************************************************************************
+es_CU{
+ Currencies{
+ CUP{
+ "$",
+ "peso cubano",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/es_DO.txt b/data/curr/es_DO.txt
index d1ac2bd..c85f6fc 100755
--- a/data/curr/es_DO.txt
+++ b/data/curr/es_DO.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_DO.xml
// *
@@ -13,5 +13,5 @@
"peso dominicano",
}
}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/es_EC.txt b/data/curr/es_EC.txt
index 617aa13..a0a644e 100644
--- a/data/curr/es_EC.txt
+++ b/data/curr/es_EC.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_EC.xml
// *
@@ -13,5 +13,5 @@
"dólar estadounidense",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/es_GT.txt b/data/curr/es_GT.txt
index 8c2385c..40d1160 100644
--- a/data/curr/es_GT.txt
+++ b/data/curr/es_GT.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_GT.xml
// *
@@ -13,5 +13,5 @@
"quetzal guatemalteco",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/es_HN.txt b/data/curr/es_HN.txt
index 29a792f..ffcfcda 100644
--- a/data/curr/es_HN.txt
+++ b/data/curr/es_HN.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_HN.xml
// *
@@ -13,5 +13,5 @@
"lempira hondureño",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/es_MX.txt b/data/curr/es_MX.txt
index 443e79a..b6ab7b9 100644
--- a/data/curr/es_MX.txt
+++ b/data/curr/es_MX.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_MX.xml
// *
@@ -13,5 +13,5 @@
"peso mexicano",
}
}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/es_NI.txt b/data/curr/es_NI.txt
index fd8c2d4..af5c2da 100755
--- a/data/curr/es_NI.txt
+++ b/data/curr/es_NI.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_NI.xml
// *
@@ -13,5 +13,5 @@
"córdoba nicaragüense",
}
}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/es_PA.txt b/data/curr/es_PA.txt
index 97b4b7c..7da7d90 100755
--- a/data/curr/es_PA.txt
+++ b/data/curr/es_PA.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_PA.xml
// *
@@ -13,5 +13,5 @@
"balboa panameño",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/es_PE.txt b/data/curr/es_PE.txt
index 412b091..fff63f5 100755
--- a/data/curr/es_PE.txt
+++ b/data/curr/es_PE.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_PE.xml
// *
@@ -13,5 +13,5 @@
"nuevo sol peruano",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/es_PH.txt b/data/curr/es_PH.txt
new file mode 100755
index 0000000..fc3d393
--- /dev/null
+++ b/data/curr/es_PH.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/es_PH.xml
+// *
+// ***************************************************************************
+es_PH{
+ Currencies{
+ PHP{
+ "₱",
+ "peso filipino",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/es_PR.txt b/data/curr/es_PR.txt
index 0ea3e11..a55eb69 100644
--- a/data/curr/es_PR.txt
+++ b/data/curr/es_PR.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_PR.xml
// *
@@ -13,5 +13,5 @@
"dólar estadounidense",
}
}
- Version{"2.0.74.74"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/es_PY.txt b/data/curr/es_PY.txt
index 8bb1e87..24675f4 100755
--- a/data/curr/es_PY.txt
+++ b/data/curr/es_PY.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_PY.xml
// *
@@ -13,5 +13,5 @@
"guaraní paraguayo",
}
}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/es_US.txt b/data/curr/es_US.txt
index a0f17ca..b6f7e73 100644
--- a/data/curr/es_US.txt
+++ b/data/curr/es_US.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_US.xml
// *
@@ -17,5 +17,5 @@
"dólar estadounidense",
}
}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/es_UY.txt b/data/curr/es_UY.txt
index 8ce5019..88bad9e 100644
--- a/data/curr/es_UY.txt
+++ b/data/curr/es_UY.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_UY.xml
// *
@@ -13,5 +13,5 @@
"peso uruguayo",
}
}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/es_VE.txt b/data/curr/es_VE.txt
index 6fe53d5..8cf178a 100755
--- a/data/curr/es_VE.txt
+++ b/data/curr/es_VE.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_VE.xml
// *
@@ -13,5 +13,5 @@
"bolívar venezolano",
}
}
- Version{"2.0.77.27"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/et.txt b/data/curr/et.txt
index b910a27..b69d4fa 100644
--- a/data/curr/et.txt
+++ b/data/curr/et.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/et.xml
// *
@@ -263,7 +263,7 @@
"kr",
"Eesti kroon",
{
- "#0.00¤;(#0.00¤)",
+ "#,##0.00 ¤;(#,##0.00 ¤)",
".",
" ",
}
@@ -389,7 +389,7 @@
"Iisraeli uus seekel",
}
INR{
- "₹",
+ "Rs.",
"India ruupia",
}
IQD{
@@ -938,6 +938,10 @@
}
ZMK{
"ZMK",
+ "Sambia kvatša (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Sambia kvatša",
}
ZRZ{
@@ -1603,6 +1607,10 @@
other{"LAVi randi"}
}
ZMK{
+ one{"Sambia kvatša (1968-2012)"}
+ other{"Sambia kvatšat (1968-2012)"}
+ }
+ ZMW{
one{"Sambia kvatša"}
other{"Sambia kvatšat"}
}
@@ -1611,5 +1619,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.47"}
}
diff --git a/data/curr/eu.txt b/data/curr/eu.txt
index 4e0522d..675cc38 100644
--- a/data/curr/eu.txt
+++ b/data/curr/eu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/eu.xml
// *
@@ -265,7 +265,7 @@
"Israeleko sheqel berria",
}
INR{
- "₹",
+ "Rs.",
"Indiako errupia",
}
IQD{
@@ -650,6 +650,10 @@
}
ZMK{
"ZMK",
+ "Zambiako kwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambiako kwacha",
}
}
@@ -803,5 +807,5 @@
one{"{0}{1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ewo.txt b/data/curr/ewo.txt
index 84af81c..07bc5ab 100755
--- a/data/curr/ewo.txt
+++ b/data/curr/ewo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ewo.xml
// *
@@ -96,7 +96,7 @@
"Síli yá Giné",
}
INR{
- "₹",
+ "Rs.",
"Rupí yá ɛ́ndía",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Kwatsa yá Zambí (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwatsa yá Zambí",
}
ZWD{
@@ -232,5 +236,5 @@
"Dolár yá Zimbabwé",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/fa.txt b/data/curr/fa.txt
index 392005c..ba45df8 100644
--- a/data/curr/fa.txt
+++ b/data/curr/fa.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fa.xml
// *
@@ -332,7 +332,7 @@
"شقل جدید اسرائیل",
}
INR{
- "₹",
+ "Rs.",
"روپیهٔ هند",
}
IQD{
@@ -845,6 +845,10 @@
}
ZMK{
"ZMK",
+ "کواچای زامبیا (۱۹۶۸ تا ۲۰۱۲)",
+ }
+ ZMW{
+ "ZMW",
"کواچای زامبیا",
}
ZWD{
@@ -860,5 +864,5 @@
"دلار زیمبابوه (۲۰۰۸)",
}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/fa_AF.txt b/data/curr/fa_AF.txt
index 24acc58..d0c5ffd 100644
--- a/data/curr/fa_AF.txt
+++ b/data/curr/fa_AF.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fa_AF.xml
// *
@@ -69,5 +69,5 @@
"دالر امریکا",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ff.txt b/data/curr/ff.txt
index b26eb14..4a89d49 100755
--- a/data/curr/ff.txt
+++ b/data/curr/ff.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ff.xml
// *
@@ -96,7 +96,7 @@
"Faraa Gine",
}
INR{
- "₹",
+ "Rs.",
"Rupii Enndo",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Kuwacca Sammbi (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kuwacca Sammbi",
}
ZWD{
@@ -228,5 +232,5 @@
"Dolaar Simbaabuwe",
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/fi.txt b/data/curr/fi.txt
index c83db54..db69b94 100644
--- a/data/curr/fi.txt
+++ b/data/curr/fi.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fi.xml
// *
@@ -1161,6 +1161,10 @@
}
ZMK{
"ZMK",
+ "Sambian kwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Sambian kwacha",
}
ZRN{
@@ -2334,6 +2338,10 @@
other{"Etelä-Afrikan randia"}
}
ZMK{
+ one{"Sambian kwacha (1968-2012)"}
+ other{"Sambian kwachaa (1968-2012)"}
+ }
+ ZMW{
one{"Sambian kwacha"}
other{"Sambian kwachaa"}
}
@@ -2362,5 +2370,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
}
diff --git a/data/curr/fil.txt b/data/curr/fil.txt
index 9ba8418..51478e3 100755
--- a/data/curr/fil.txt
+++ b/data/curr/fil.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fil.xml
// *
@@ -268,7 +268,7 @@
"Israeli Shekel",
}
INR{
- "₹",
+ "Rs.",
"Indian Rupee",
}
IQD{
@@ -665,6 +665,10 @@
}
ZMK{
"ZMK",
+ "Zambian Kwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambian Kwacha",
}
}
@@ -690,5 +694,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/fil_PH.txt b/data/curr/fil_PH.txt
index 42baeba..3a691b4 100755
--- a/data/curr/fil_PH.txt
+++ b/data/curr/fil_PH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/fo.txt b/data/curr/fo.txt
index c7843e6..6e8ef67 100644
--- a/data/curr/fo.txt
+++ b/data/curr/fo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fo.xml
// *
@@ -16,5 +16,5 @@
"DKK",
}
}
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/fr.txt b/data/curr/fr.txt
index 5889ee4..b13ae03 100644
--- a/data/curr/fr.txt
+++ b/data/curr/fr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr.xml
// *
@@ -460,7 +460,7 @@
"nouveau shekel israélien",
}
INR{
- "₹",
+ "Rs.",
"roupie indienne",
}
IQD{
@@ -856,7 +856,7 @@
"rouble soviétique",
}
SVC{
- "₡SV",
+ "SVC",
"colón salvadorien",
}
SYP{
@@ -1089,6 +1089,10 @@
}
ZMK{
"ZMK",
+ "kwacha zambien (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"kwacha zambien",
}
ZRN{
@@ -2186,6 +2190,10 @@
other{"rands sud-africains"}
}
ZMK{
+ one{"kwacha zambien (1968-2012)"}
+ other{"kwachas zambiens (1968-2012)"}
+ }
+ ZMW{
one{"kwacha zambien"}
other{"kwachas zambiens"}
}
@@ -2214,5 +2222,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
}
diff --git a/data/curr/fr_BI.txt b/data/curr/fr_BI.txt
index 9ab5ea2..f7932fd 100755
--- a/data/curr/fr_BI.txt
+++ b/data/curr/fr_BI.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_BI.xml
// *
@@ -13,5 +13,5 @@
"franc burundais",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/fr_CA.txt b/data/curr/fr_CA.txt
index d1e29af..056dfee 100644
--- a/data/curr/fr_CA.txt
+++ b/data/curr/fr_CA.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_CA.xml
// *
@@ -79,5 +79,5 @@
other{"dollars guyaniens"}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/fr_CD.txt b/data/curr/fr_CD.txt
new file mode 100755
index 0000000..1768926
--- /dev/null
+++ b/data/curr/fr_CD.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/fr_CD.xml
+// *
+// ***************************************************************************
+fr_CD{
+ Currencies{
+ CDF{
+ "FC",
+ "franc congolais",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/fr_CH.txt b/data/curr/fr_CH.txt
new file mode 100755
index 0000000..1fd038a
--- /dev/null
+++ b/data/curr/fr_CH.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/fr_CH.xml
+// *
+// ***************************************************************************
+fr_CH{
+ Currencies{
+ CHF{
+ "CHF",
+ "franc suisse",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/fr_DJ.txt b/data/curr/fr_DJ.txt
index 9efdf93..37daa70 100755
--- a/data/curr/fr_DJ.txt
+++ b/data/curr/fr_DJ.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_DJ.xml
// *
@@ -13,5 +13,5 @@
"franc djiboutien",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/fr_DZ.txt b/data/curr/fr_DZ.txt
new file mode 100755
index 0000000..2cb7d1d
--- /dev/null
+++ b/data/curr/fr_DZ.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/fr_DZ.xml
+// *
+// ***************************************************************************
+fr_DZ{
+ Currencies{
+ DZD{
+ "DA",
+ "dinar algérien",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/fr_GN.txt b/data/curr/fr_GN.txt
index 62a4fa9..b73953d 100755
--- a/data/curr/fr_GN.txt
+++ b/data/curr/fr_GN.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_GN.xml
// *
@@ -13,5 +13,5 @@
"franc guinéen",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/fr_HT.txt b/data/curr/fr_HT.txt
new file mode 100755
index 0000000..4f7b0e9
--- /dev/null
+++ b/data/curr/fr_HT.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/fr_HT.xml
+// *
+// ***************************************************************************
+fr_HT{
+ Currencies{
+ HTG{
+ "G",
+ "gourde haïtienne",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/fr_KM.txt b/data/curr/fr_KM.txt
index 10e3e14..f020214 100755
--- a/data/curr/fr_KM.txt
+++ b/data/curr/fr_KM.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_KM.xml
// *
@@ -13,5 +13,5 @@
"franc comorien",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/fr_LU.txt b/data/curr/fr_LU.txt
index 0ac8caa..8bb966c 100644
--- a/data/curr/fr_LU.txt
+++ b/data/curr/fr_LU.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_LU.xml
// *
@@ -17,5 +17,5 @@
"franc luxembourgeois",
}
}
- Version{"2.0.57.19"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/fr_MG.txt b/data/curr/fr_MG.txt
new file mode 100755
index 0000000..b16ecb4
--- /dev/null
+++ b/data/curr/fr_MG.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/fr_MG.xml
+// *
+// ***************************************************************************
+fr_MG{
+ Currencies{
+ MGA{
+ "Ar",
+ "ariary malgache",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/fr_MR.txt b/data/curr/fr_MR.txt
new file mode 100755
index 0000000..6c7854a
--- /dev/null
+++ b/data/curr/fr_MR.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/fr_MR.xml
+// *
+// ***************************************************************************
+fr_MR{
+ Currencies{
+ MRO{
+ "UM",
+ "ouguiya mauritanien",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/fr_MU.txt b/data/curr/fr_MU.txt
new file mode 100755
index 0000000..4c8e944
--- /dev/null
+++ b/data/curr/fr_MU.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/fr_MU.xml
+// *
+// ***************************************************************************
+fr_MU{
+ Currencies{
+ MUR{
+ "Rs",
+ "roupie mauricienne",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/fr_RW.txt b/data/curr/fr_RW.txt
new file mode 100755
index 0000000..df0237a
--- /dev/null
+++ b/data/curr/fr_RW.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/fr_RW.xml
+// *
+// ***************************************************************************
+fr_RW{
+ Currencies{
+ RWF{
+ "RF",
+ "franc rwandais",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/fr_SC.txt b/data/curr/fr_SC.txt
new file mode 100755
index 0000000..3560d28
--- /dev/null
+++ b/data/curr/fr_SC.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/fr_SC.xml
+// *
+// ***************************************************************************
+fr_SC{
+ Currencies{
+ SCR{
+ "SR",
+ "roupie des Seychelles",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/fr_SY.txt b/data/curr/fr_SY.txt
new file mode 100755
index 0000000..3ee58c2
--- /dev/null
+++ b/data/curr/fr_SY.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/fr_SY.xml
+// *
+// ***************************************************************************
+fr_SY{
+ Currencies{
+ SYP{
+ "LS",
+ "livre syrienne",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/fr_TN.txt b/data/curr/fr_TN.txt
new file mode 100755
index 0000000..3106fac
--- /dev/null
+++ b/data/curr/fr_TN.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/fr_TN.xml
+// *
+// ***************************************************************************
+fr_TN{
+ Currencies{
+ TND{
+ "DT",
+ "dinar tunisien",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/ga.txt b/data/curr/ga.txt
index 26ae11a..e6565cc 100644
--- a/data/curr/ga.txt
+++ b/data/curr/ga.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ga.xml
// *
@@ -416,7 +416,7 @@
"Sheqel Nua Iosraelach",
}
INR{
- "₹",
+ "Rs.",
"Rúipí India",
}
IQD{
@@ -973,6 +973,10 @@
}
ZMK{
"ZMK",
+ "Kwacha Saimbiach (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha Saimbiach",
}
ZRN{
@@ -988,5 +992,5 @@
"Dollar Siombábach",
}
}
- Version{"2.0.77.27"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/gl.txt b/data/curr/gl.txt
index cbe85cb..c14740c 100644
--- a/data/curr/gl.txt
+++ b/data/curr/gl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gl.xml
// *
@@ -357,7 +357,7 @@
"Novo shequel israelí",
}
INR{
- "₹",
+ "Rs.",
"Rupia india",
}
IQD{
@@ -830,6 +830,10 @@
}
ZMK{
"ZMK",
+ "Kwacha zambiano (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha zambiano",
}
}
@@ -1011,5 +1015,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/gsw.txt b/data/curr/gsw.txt
index 32d0737..3662757 100644
--- a/data/curr/gsw.txt
+++ b/data/curr/gsw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gsw.xml
// *
@@ -452,7 +452,7 @@
"Schekel",
}
INR{
- "₹",
+ "Rs.",
"Indischi Rupie",
}
IQD{
@@ -1069,6 +1069,10 @@
}
ZMK{
"ZMK",
+ "Kwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha",
}
ZRN{
@@ -2110,6 +2114,10 @@
other{"Rand"}
}
ZMK{
+ one{"Kwacha (1968-2012)"}
+ other{"Kwacha (1968-2012)"}
+ }
+ ZMW{
one{"Kwacha"}
other{"Kwacha"}
}
@@ -2130,5 +2138,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/gu.txt b/data/curr/gu.txt
index 0d9a171..8689204 100644
--- a/data/curr/gu.txt
+++ b/data/curr/gu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gu.xml
// *
@@ -256,7 +256,7 @@
"ઇઝરેઇલ ન્યુ શેકેલ",
}
INR{
- "₹",
+ "Rs.",
"ભારતીય રૂપીયા",
}
IQD{
@@ -641,6 +641,10 @@
}
ZMK{
"ZMK",
+ "ઝામ્બિયન ક્વાચા (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"ઝામ્બિયન ક્વાચા",
}
}
@@ -648,5 +652,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
}
diff --git a/data/curr/guz.txt b/data/curr/guz.txt
index c498e37..f170df6 100755
--- a/data/curr/guz.txt
+++ b/data/curr/guz.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/guz.xml
// *
@@ -96,7 +96,7 @@
"Faranga ya Gine",
}
INR{
- "₹",
+ "Rs.",
"Rupia ya India",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Kwacha ya Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha ya Zambia",
}
ZWD{
@@ -228,5 +232,5 @@
"Dola ya Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/gv.txt b/data/curr/gv.txt
index fc39c1c..08375a5 100644
--- a/data/curr/gv.txt
+++ b/data/curr/gv.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gv.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/gv.xml
*/
gv{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ha.txt b/data/curr/ha.txt
index 6f9ab39..117c384 100644
--- a/data/curr/ha.txt
+++ b/data/curr/ha.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ha.xml
// *
@@ -96,7 +96,7 @@
"Kuɗin Gini",
}
INR{
- "₹",
+ "Rs.",
"Kuɗin Indiya",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Kuɗin Zambiya (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kuɗin Zambiya",
}
ZWD{
@@ -228,5 +232,5 @@
"Dalar zimbabuwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ha_GH.txt b/data/curr/ha_GH.txt
index a414604..5a59b2e 100644
--- a/data/curr/ha_GH.txt
+++ b/data/curr/ha_GH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/ha_Latn.txt b/data/curr/ha_Latn.txt
index 649d47f..bdcc668 100644
--- a/data/curr/ha_Latn.txt
+++ b/data/curr/ha_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ha_Latn.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/ha_Latn.xml
*/
ha_Latn{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ha_Latn_GH.txt b/data/curr/ha_Latn_GH.txt
index 4a7717b..97155e3 100644
--- a/data/curr/ha_Latn_GH.txt
+++ b/data/curr/ha_Latn_GH.txt
@@ -1,17 +1,17 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/icu-config.xml & build.xml
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/ha_Latn_GH.xml
// *
// ***************************************************************************
-/**
- * generated alias target
- */
ha_Latn_GH{
- /**
- * so genrb doesn't issue warnings
- */
- ___{""}
+ Currencies{
+ GHS{
+ "GH₵",
+ "GHS",
+ }
+ }
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ha_Latn_NE.txt b/data/curr/ha_Latn_NE.txt
index b383c7c..e80f6f7 100644
--- a/data/curr/ha_Latn_NE.txt
+++ b/data/curr/ha_Latn_NE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/ha_Latn_NG.txt b/data/curr/ha_Latn_NG.txt
index 1b09876..bb60f3c 100644
--- a/data/curr/ha_Latn_NG.txt
+++ b/data/curr/ha_Latn_NG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/ha_NE.txt b/data/curr/ha_NE.txt
index 5c06d78..f28adee 100644
--- a/data/curr/ha_NE.txt
+++ b/data/curr/ha_NE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/ha_NG.txt b/data/curr/ha_NG.txt
index 66e2170..1a5e209 100644
--- a/data/curr/ha_NG.txt
+++ b/data/curr/ha_NG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/haw.txt b/data/curr/haw.txt
index f93ded0..3247c59 100644
--- a/data/curr/haw.txt
+++ b/data/curr/haw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/haw.xml
// *
@@ -10,5 +10,11 @@
* ICU <specials> source: <path>/xml/main/haw.xml
*/
haw{
- Version{"2.0.74.85"}
+ Currencies{
+ USD{
+ "$",
+ "USD",
+ }
+ }
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/he.txt b/data/curr/he.txt
index 623b17c..7a77717 100644
--- a/data/curr/he.txt
+++ b/data/curr/he.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/he.xml
// *
@@ -360,7 +360,7 @@
"ש״ח",
}
INR{
- "₹",
+ "Rs.",
"רופי הודית",
}
IQD{
@@ -877,6 +877,10 @@
}
ZMK{
"ZMK",
+ "קוואצ׳ה זמבית (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"קוואצ׳ה זמבית",
}
ZRN{
@@ -944,5 +948,5 @@
other{"{0} {1}"}
two{"{0} {1}"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.47"}
}
diff --git a/data/curr/he_IL.txt b/data/curr/he_IL.txt
index 9925868..2324002 100644
--- a/data/curr/he_IL.txt
+++ b/data/curr/he_IL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/hi.txt b/data/curr/hi.txt
index 34fcf30..b5bba93 100644
--- a/data/curr/hi.txt
+++ b/data/curr/hi.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hi.xml
// *
@@ -284,7 +284,7 @@
"इस्राइली शेकेल",
}
INR{
- "₹",
+ "Rs.",
"भारतीय रूपया",
}
IQD{
@@ -725,6 +725,10 @@
}
ZMK{
"ZMK",
+ "ज़ाम्बियन क्वाचा (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"ज़ाम्बियन क्वाचा",
}
}
@@ -758,5 +762,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/hr.txt b/data/curr/hr.txt
index b4a3fe8..f2dba3a 100644
--- a/data/curr/hr.txt
+++ b/data/curr/hr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hr.xml
// *
@@ -1101,6 +1101,10 @@
}
ZMK{
"ZMK",
+ "zambijska kvača (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"zambijska kvača",
}
ZRN{
@@ -2752,6 +2756,12 @@
other{"južnoafričkih randa"}
}
ZMK{
+ few{"zambijske kvače (1968-2012)"}
+ many{"zambijskih kvača (1968-2012)"}
+ one{"zambijska kvača (1968-2012)"}
+ other{"zambijskih kvača (1968-2012)"}
+ }
+ ZMW{
few{"zambijske kvače"}
many{"zambijskih kvača"}
one{"zambijska kvača"}
@@ -2794,5 +2804,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/hr_BA.txt b/data/curr/hr_BA.txt
new file mode 100755
index 0000000..2674027
--- /dev/null
+++ b/data/curr/hr_BA.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/hr_BA.xml
+// *
+// ***************************************************************************
+hr_BA{
+ Currencies{
+ BAM{
+ "KM",
+ "konvertibilna marka",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/hu.txt b/data/curr/hu.txt
index 2ce063a..bbfc67d 100644
--- a/data/curr/hu.txt
+++ b/data/curr/hu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hu.xml
// *
@@ -1085,6 +1085,10 @@
}
ZMK{
"ZMK",
+ "Zambiai kwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambiai kwacha",
}
ZRN{
@@ -1316,5 +1320,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.47"}
}
diff --git a/data/curr/hy.txt b/data/curr/hy.txt
index 84b7989..22f6674 100644
--- a/data/curr/hy.txt
+++ b/data/curr/hy.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hy.xml
// *
@@ -11,10 +11,1276 @@
*/
hy{
Currencies{
+ AED{
+ "AED",
+ "Արաբական Միացյալ Էմիրությունների դիրհամ",
+ }
+ AFN{
+ "AFN",
+ "Աֆղանական աֆղանի",
+ }
+ ALL{
+ "ALL",
+ "Ալբանական լեկ",
+ }
AMD{
"դր.",
- "AMD",
+ "Հայկական դրամ",
+ }
+ ANG{
+ "ANG",
+ "Նիդերլանդական Անտիլների գուլդեն",
+ }
+ AOA{
+ "AOA",
+ "Անգոլական կվանզա",
+ }
+ ARS{
+ "ARS",
+ "Արգենտինական պեսո",
+ }
+ AUD{
+ "A$",
+ "Ավստրալական դոլար",
+ }
+ AWG{
+ "AWG",
+ "Արուբական ֆլորին",
+ }
+ AZN{
+ "AZN",
+ "Ադրբեջանական մանաթ",
+ }
+ BAM{
+ "BAM",
+ "Բոսնիա և Հերցեգովինայի փոխարկելի մարկա",
+ }
+ BBD{
+ "BBD",
+ "Բարբադոսյան դոլար",
+ }
+ BDT{
+ "BDT",
+ "Բանգլադեշի տակա",
+ }
+ BGN{
+ "BGN",
+ "Բուլղարական լև",
+ }
+ BHD{
+ "BHD",
+ "Բահրեյնական դինար",
+ }
+ BIF{
+ "BIF",
+ "Բուրունդիի ֆրանկ",
+ }
+ BMD{
+ "BMD",
+ "Բերմուդյան դոլար",
+ }
+ BND{
+ "BND",
+ "Բրունեյական դոլար",
+ }
+ BOB{
+ "BOB",
+ "Բոլիվիական բոլիվիանո",
+ }
+ BRL{
+ "R$",
+ "Բրազիլական ռեալ",
+ }
+ BSD{
+ "BSD",
+ "Բահամական դոլար",
+ }
+ BTN{
+ "BTN",
+ "Բութանական նգուլտրում",
+ }
+ BWP{
+ "BWP",
+ "Բոթսվանական պուլա",
+ }
+ BYR{
+ "BYR",
+ "Բելառուսական ռուբլի",
+ }
+ BZD{
+ "BZD",
+ "Բելիզի դոլար",
+ }
+ CAD{
+ "CA$",
+ "Կանադական դոլար",
+ }
+ CDF{
+ "CDF",
+ "Կոնգոյի ֆրանկ",
+ }
+ CHF{
+ "CHF",
+ "Շվեյցարական ֆրանկ",
+ }
+ CLP{
+ "CLP",
+ "Չիլիական պեսո",
+ }
+ CNY{
+ "CN¥",
+ "Չինական յուան",
+ }
+ COP{
+ "COP",
+ "Կոլումբիական պեսո",
+ }
+ CRC{
+ "CRC",
+ "Կոստա Ռիկայի կոլոն",
+ }
+ CUC{
+ "CUC",
+ "Կուբական փոխարկելի պեսո",
+ }
+ CUP{
+ "CUP",
+ "Կուբական պեսո",
+ }
+ CVE{
+ "CVE",
+ "Կաբո Վերդեի էսկուդո",
+ }
+ CZK{
+ "CZK",
+ "Չեխական կրոնա",
+ }
+ DJF{
+ "DJF",
+ "Ջիբութիի ֆրանկ",
+ }
+ DKK{
+ "DKK",
+ "Դանիական կրոնա",
+ }
+ DOP{
+ "DOP",
+ "Դոմինիկական պեսո",
+ }
+ DZD{
+ "DZD",
+ "Ալժիրական դինար",
+ }
+ EGP{
+ "EGP",
+ "Եգիպտական ֆունտ",
+ }
+ ERN{
+ "ERN",
+ "Էրիթրեական նակֆա",
+ }
+ ETB{
+ "ETB",
+ "Եթովպական բիր",
+ }
+ EUR{
+ "€",
+ "Եվրո",
+ }
+ FJD{
+ "FJD",
+ "Ֆիջիական դոլար",
+ }
+ FKP{
+ "FKP",
+ "Ֆոլկլենդյան կղզիներ ֆունտ",
+ }
+ GBP{
+ "£",
+ "Բրիտանական ֆունտ ստեռլինգ",
+ }
+ GEL{
+ "GEL",
+ "Վրացական լարի",
+ }
+ GHS{
+ "GHS",
+ "Գանական սեդի",
+ }
+ GIP{
+ "GIP",
+ "Ջիբրալթարի ֆունտ",
+ }
+ GMD{
+ "GMD",
+ "Գամբիական դալասի",
+ }
+ GNF{
+ "GNF",
+ "Գվինեական ֆրանկ",
+ }
+ GTQ{
+ "GTQ",
+ "Գվատեմալական կետսալ",
+ }
+ GYD{
+ "GYD",
+ "Գայանական դոլար",
+ }
+ HKD{
+ "HK$",
+ "Հոնկոնգի դոլար",
+ }
+ HNL{
+ "HNL",
+ "Հոնդուրասական լեմպրիա",
+ }
+ HRK{
+ "HRK",
+ "Խորվաթական կունա",
+ }
+ HTG{
+ "HTG",
+ "Հաիթյան գուրդ",
+ }
+ HUF{
+ "HUF",
+ "Հունգարական ֆորինտ",
+ }
+ IDR{
+ "IDR",
+ "Ինդոնեզական ռուփի",
+ }
+ ILS{
+ "₪",
+ "Իսրայելի նոր շեկել",
+ }
+ INR{
+ "Rs.",
+ "Հնդկական ռուփի",
+ }
+ IQD{
+ "IQD",
+ "Իրաքյան դինար",
+ }
+ IRR{
+ "IRR",
+ "Իրանական ռիալ",
+ }
+ ISK{
+ "ISK",
+ "Իսլանդական կրոնա",
+ }
+ JMD{
+ "JMD",
+ "Ջամայկական դոլար",
+ }
+ JOD{
+ "JOD",
+ "Հորդանանական դինար",
+ }
+ JPY{
+ "JP¥",
+ "Ճապոնական իեն",
+ }
+ KES{
+ "KES",
+ "Քենիական շիլինգ",
+ }
+ KGS{
+ "KGS",
+ "Ղրղզական սոմ",
+ }
+ KHR{
+ "KHR",
+ "Կամբոջական ռիել",
+ }
+ KMF{
+ "KMF",
+ "Կոմորյան կղզիների ֆրանկ",
+ }
+ KPW{
+ "KPW",
+ "ԿԺԴՀ-ի վոնա",
+ }
+ KRW{
+ "₩",
+ "Հարավկորեական վոնա",
+ }
+ KWD{
+ "KWD",
+ "Քուվեյթական դինար",
+ }
+ KYD{
+ "KYD",
+ "Կայմանյան կղզիների դոլար",
+ }
+ KZT{
+ "KZT",
+ "Ղազախական տենգե",
+ }
+ LAK{
+ "LAK",
+ "Լաոսական կիպ",
+ }
+ LBP{
+ "LBP",
+ "Լիբանանական ֆունտ",
+ }
+ LKR{
+ "LKR",
+ "Լանկիական ռուփի",
+ }
+ LRD{
+ "LRD",
+ "Լիբերիական դոլար",
+ }
+ LTL{
+ "LTL",
+ "Լիտվական լիտ",
+ }
+ LVL{
+ "LVL",
+ "Լատվիական լատ",
+ }
+ LYD{
+ "LYD",
+ "Լիբիական դինար",
+ }
+ MAD{
+ "MAD",
+ "Մարոկական դիրհամ",
+ }
+ MDL{
+ "MDL",
+ "Մոլդովական լեյ",
+ }
+ MGA{
+ "MGA",
+ "Մադագասկարի արիարի",
+ }
+ MKD{
+ "MKD",
+ "Մակեդոնական դենար",
+ }
+ MMK{
+ "MMK",
+ "Մյանմական կյատ",
+ }
+ MNT{
+ "MNT",
+ "Մոնղոլական տուգրիկ",
+ }
+ MOP{
+ "MOP",
+ "Մակաոյի պատակա",
+ }
+ MRO{
+ "MRO",
+ "Մավրիտանական ուգիյա",
+ }
+ MUR{
+ "MUR",
+ "Մավրիկական ռուփի",
+ }
+ MVR{
+ "MVR",
+ "Մալդիվյան ռուֆիա",
+ }
+ MWK{
+ "MWK",
+ "Մալավիական կվաչա",
+ }
+ MXN{
+ "MX$",
+ "Մեքսիկական պեսո",
+ }
+ MYR{
+ "MYR",
+ "Մալայզիական ռինգիտ",
+ }
+ MZN{
+ "MZN",
+ "Մոզամբիկյան մետիկալ",
+ }
+ NAD{
+ "NAD",
+ "Նամիբիական դոլար",
+ }
+ NGN{
+ "NGN",
+ "Նիգերիական նայրա",
+ }
+ NIO{
+ "NIO",
+ "Նիկարագուական կորդոբա",
+ }
+ NOK{
+ "NOK",
+ "Նորվեգական կրոնա",
+ }
+ NPR{
+ "NPR",
+ "Նեպալական ռուփի",
+ }
+ NZD{
+ "NZ$",
+ "Նորզելանդական դոլար",
+ }
+ OMR{
+ "OMR",
+ "Օմանական ռիալ",
+ }
+ PAB{
+ "PAB",
+ "Պանամական բալբոա",
+ }
+ PEN{
+ "PEN",
+ "Պերուի նոր սոլ",
+ }
+ PGK{
+ "PGK",
+ "Պապուա-Նոր Գվինեայի կինա",
+ }
+ PHP{
+ "PHP",
+ "Ֆիլիպինական պեսո",
+ }
+ PKR{
+ "PKR",
+ "Պակիստանական ռուփի",
+ }
+ PLN{
+ "PLN",
+ "Լեհական զլոտի",
+ }
+ PYG{
+ "PYG",
+ "Պարագվայական գուարանի",
+ }
+ QAR{
+ "QAR",
+ "Քաթարական ռիալ",
+ }
+ RON{
+ "RON",
+ "Ռումինական լեյ",
+ }
+ RSD{
+ "RSD",
+ "Սերբական դինար",
+ }
+ RUB{
+ "RUB",
+ "Ռուսական ռուբլի",
+ }
+ RWF{
+ "RWF",
+ "Ռուանդական ֆրանկ",
+ }
+ SAR{
+ "SAR",
+ "Սաուդյան Արաբիայի ռիալ",
+ }
+ SBD{
+ "SBD",
+ "Սողոմոնյան կղզիների դոլար",
+ }
+ SCR{
+ "SCR",
+ "Սեյշելյան կղզիների ռուփի",
+ }
+ SDG{
+ "SDG",
+ "Սուդանական ֆունտ",
+ }
+ SEK{
+ "SEK",
+ "Շվեդական կրոնա",
+ }
+ SGD{
+ "SGD",
+ "Սինգապուրյան դոլար",
+ }
+ SHP{
+ "SHP",
+ "Սուրբ Հեղինեի կղզու ֆունտ",
+ }
+ SLL{
+ "SLL",
+ "Սիերա-Լեոնեի լեոնե",
+ }
+ SOS{
+ "SOS",
+ "Սոմալիական շիլինգ",
+ }
+ SRD{
+ "SRD",
+ "Սուրինամական դոլար",
+ }
+ SSP{
+ "SSP",
+ "Հարավսուդանական ֆունտ",
+ }
+ STD{
+ "STD",
+ "Սան Տոմե և Պրինսիպիի դոբրա",
+ }
+ SYP{
+ "SYP",
+ "Սիրիական ֆունտ",
+ }
+ SZL{
+ "SZL",
+ "Սվազիլենդական լիլանգենի",
+ }
+ THB{
+ "฿",
+ "Թաիլանդական բատ",
+ }
+ TJS{
+ "TJS",
+ "Տաջիկական սոմոնի",
+ }
+ TMT{
+ "TMT",
+ "Թուրքմենական մանաթ",
+ }
+ TND{
+ "TND",
+ "Թունիսական դինար",
+ }
+ TOP{
+ "TOP",
+ "Տոնգայի պաանգա",
+ }
+ TRY{
+ "TRY",
+ "Թուրքական լիրա",
+ }
+ TTD{
+ "TTD",
+ "Տրինիդադ և Տոբագոյի դոլար",
+ }
+ TWD{
+ "NT$",
+ "Թայվանական նոր դոլար",
+ }
+ TZS{
+ "TZS",
+ "Տանզանիական շիլինգ",
+ }
+ UAH{
+ "UAH",
+ "Ուկրաինական գրիվնա",
+ }
+ UGX{
+ "UGX",
+ "Ուգանդական շիլինգ",
+ }
+ USD{
+ "$",
+ "ԱՄՆ դոլար",
+ }
+ UYU{
+ "UYU",
+ "Ուրուգվայական պեսո",
+ }
+ UZS{
+ "UZS",
+ "Ուզբեկական սում",
+ }
+ VEF{
+ "VEF",
+ "Վենեսուելական բոլիվար",
+ }
+ VND{
+ "₫",
+ "Վիետնամական դոնգ",
+ }
+ VUV{
+ "VUV",
+ "Վանուատուի վատու",
+ }
+ WST{
+ "WST",
+ "Սամոական տալա",
+ }
+ XAF{
+ "FCFA",
+ "Աֆրիկական ֆինանսական համայնքի ֆրանկ BEAC",
+ }
+ XCD{
+ "EC$",
+ "Արևելակարիբյան դոլար",
+ }
+ XOF{
+ "CFA",
+ "Աֆրիկական ֆինանսական համայնքի ֆրանկ BCEAO",
+ }
+ XPF{
+ "CFPF",
+ "ԿՊՖ ֆրանկ",
+ }
+ XXX{
+ "XXX",
+ "Անհայտ արժույթ",
+ }
+ YER{
+ "YER",
+ "Եմենական ռիալ",
+ }
+ ZAR{
+ "ZAR",
+ "Հարավաֆրիկական ռենդ",
+ }
+ ZMK{
+ "ZMK",
+ "Զամբիական կվաչա (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
+ "Զամբիական կվաչա",
}
}
- Version{"2.0.78.38"}
+ CurrencyPlurals{
+ AED{
+ one{"Արաբական Միացյալ Էմիրությունների դիրհամ"}
+ other{"Արաբական Միացյալ Էմիրությունների դիրհամ"}
+ }
+ AFN{
+ one{"Աֆղանական աֆղանի"}
+ other{"Աֆղանական աֆղանի"}
+ }
+ ALL{
+ one{"Ալբանական լեկ"}
+ other{"Ալբանական լեկ"}
+ }
+ AMD{
+ one{"Հայկական դրամ"}
+ other{"Հայկական դրամ"}
+ }
+ ANG{
+ one{"Նիդերլանդական Անտիլների գուլդեն"}
+ other{"Նիդերլանդական Անտիլների գուլդեն"}
+ }
+ AOA{
+ one{"Անգոլական կվանզա"}
+ other{"Անգոլական կվանզա"}
+ }
+ ARS{
+ one{"Արգենտինական պեսո"}
+ other{"Արգենտինական պեսո"}
+ }
+ AUD{
+ one{"Ավստրալական դոլար"}
+ other{"Ավստրալական դոլար"}
+ }
+ AWG{
+ one{"Արուբական ֆլորին"}
+ other{"Արուբական ֆլորին"}
+ }
+ AZN{
+ one{"Ադրբեջանական մանաթ"}
+ other{"Ադրբեջանական մանաթ"}
+ }
+ BAM{
+ one{"Բոսնիա և Հերցեգովինայի փոխարկելի մարկա"}
+ other{"Բոսնիա և Հերցեգովինայի փոխարկելի մարկա"}
+ }
+ BBD{
+ one{"Բարբադոսյան դոլար"}
+ other{"Բարբադոսյան դոլար"}
+ }
+ BDT{
+ one{"Բանգլադեշի տակա"}
+ other{"Բանգլադեշի տակա"}
+ }
+ BGN{
+ one{"Բուլղարական լև"}
+ other{"Բուլղարական լև"}
+ }
+ BHD{
+ one{"Բահրեյնական դինար"}
+ other{"Բահրեյնական դինար"}
+ }
+ BIF{
+ one{"Բուրունդիի ֆրանկ"}
+ other{"Բուրունդիի ֆրանկ"}
+ }
+ BMD{
+ one{"Բերմուդյան դոլար"}
+ other{"Բերմուդյան դոլար"}
+ }
+ BND{
+ one{"Բրունեյական դոլար"}
+ other{"Բրունեյական դոլար"}
+ }
+ BOB{
+ one{"Բոլիվիական բոլիվիանո"}
+ other{"Բոլիվիական բոլիվիանո"}
+ }
+ BRL{
+ one{"Բրազիլական ռեալ"}
+ other{"Բրազիլական ռեալ"}
+ }
+ BSD{
+ one{"Բահամական դոլար"}
+ other{"Բահամական դոլար"}
+ }
+ BTN{
+ one{"Բութանական նգուլտրում"}
+ other{"Բութանական նգուլտրում"}
+ }
+ BWP{
+ one{"Բոթսվանական պուլա"}
+ other{"Բոթսվանական պուլա"}
+ }
+ BYR{
+ one{"Բելառուսական ռուբլի"}
+ other{"Բելառուսական ռուբլի"}
+ }
+ BZD{
+ one{"Բելիզի դոլար"}
+ other{"Բելիզի դոլար"}
+ }
+ CAD{
+ one{"Կանադական դոլար"}
+ other{"Կանադական դոլար"}
+ }
+ CDF{
+ one{"Կոնգոյի ֆրանկ"}
+ other{"Կոնգոյի ֆրանկ"}
+ }
+ CHF{
+ one{"Շվեյցարական ֆրանկ"}
+ other{"Շվեյցարական ֆրանկ"}
+ }
+ CLP{
+ one{"Չիլիական պեսո"}
+ other{"Չիլիական պեսո"}
+ }
+ CNY{
+ one{"Չինական յուան"}
+ other{"Չինական յուան"}
+ }
+ COP{
+ one{"Կոլումբիական պեսո"}
+ other{"Կոլումբիական պեսո"}
+ }
+ CRC{
+ one{"Կոստա Ռիկայի կոլոն"}
+ other{"Կոստա Ռիկայի կոլոն"}
+ }
+ CUC{
+ one{"Կուբական փոխարկելի պեսո"}
+ other{"Կուբական փոխարկելի պեսո"}
+ }
+ CUP{
+ one{"Կուբական պեսո"}
+ other{"Կուբական պեսո"}
+ }
+ CVE{
+ one{"Կաբո Վերդեի էսկուդո"}
+ other{"Կաբո Վերդեի էսկուդո"}
+ }
+ CZK{
+ one{"Չեխական կրոնա"}
+ other{"Չեխական կրոնա"}
+ }
+ DJF{
+ one{"Ջիբութիի ֆրանկ"}
+ other{"Ջիբութիի ֆրանկ"}
+ }
+ DKK{
+ one{"Դանիական կրոնա"}
+ other{"Դանիական կրոնա"}
+ }
+ DOP{
+ one{"Դոմինիկական պեսո"}
+ other{"Դոմինիկական պեսո"}
+ }
+ DZD{
+ one{"Ալժիրական դինար"}
+ other{"Ալժիրական դինար"}
+ }
+ EGP{
+ one{"Եգիպտական ֆունտ"}
+ other{"Եգիպտական ֆունտ"}
+ }
+ ERN{
+ one{"Էրիթրեական նակֆա"}
+ other{"Էրիթրեական նակֆա"}
+ }
+ ETB{
+ one{"Եթովպական բիր"}
+ other{"Եթովպական բիր"}
+ }
+ EUR{
+ one{"Եվրո"}
+ other{"Եվրո"}
+ }
+ FJD{
+ one{"Ֆիջիական դոլար"}
+ other{"Ֆիջիական դոլար"}
+ }
+ FKP{
+ one{"Ֆոլկլենդյան կղզիներ ֆունտ"}
+ other{"Ֆոլկլենդյան կղզիներ ֆունտ"}
+ }
+ GBP{
+ one{"Բրիտանական ֆունտ ստեռլինգ"}
+ other{"Բրիտանական ֆունտ ստեռլինգ"}
+ }
+ GEL{
+ one{"Վրացական լարի"}
+ other{"Վրացական լարի"}
+ }
+ GHS{
+ one{"Գանական սեդի"}
+ other{"Գանական սեդի"}
+ }
+ GIP{
+ one{"Ջիբրալթարի ֆունտ"}
+ other{"Ջիբրալթարի ֆունտ"}
+ }
+ GMD{
+ one{"Գամբիական դալասի"}
+ other{"Գամբիական դալասի"}
+ }
+ GNF{
+ one{"Գվինեական ֆրանկ"}
+ other{"Գվինեական ֆրանկ"}
+ }
+ GTQ{
+ one{"Գվատեմալական կետսալ"}
+ other{"Գվատեմալական կետսալ"}
+ }
+ GYD{
+ one{"Գայանական դոլար"}
+ other{"Գայանական դոլար"}
+ }
+ HKD{
+ one{"Հոնկոնգի դոլար"}
+ other{"Հոնկոնգի դոլար"}
+ }
+ HNL{
+ one{"Հոնդուրասական լեմպրիա"}
+ other{"Հոնդուրասական լեմպրիա"}
+ }
+ HRK{
+ one{"Խորվաթական կունա"}
+ other{"Խորվաթական կունա"}
+ }
+ HTG{
+ one{"Հաիթյան գուրդ"}
+ other{"Հաիթյան գուրդ"}
+ }
+ HUF{
+ one{"Հունգարական ֆորինտ"}
+ other{"Հունգարական ֆորինտ"}
+ }
+ IDR{
+ one{"Ինդոնեզական ռուփի"}
+ other{"Ինդոնեզական ռուփի"}
+ }
+ ILS{
+ one{"Իսրայելի նոր շեկել"}
+ other{"Իսրայելի նոր շեկել"}
+ }
+ INR{
+ one{"Հնդկական ռուփի"}
+ other{"Հնդկական ռուփի"}
+ }
+ IQD{
+ one{"Իրաքյան դինար"}
+ other{"Իրաքյան դինար"}
+ }
+ IRR{
+ one{"Իրանական ռիալ"}
+ other{"Իրանական ռիալ"}
+ }
+ ISK{
+ one{"Իսլանդական կրոնա"}
+ other{"Իսլանդական կրոնա"}
+ }
+ JMD{
+ one{"Ջամայկական դոլար"}
+ other{"Ջամայկական դոլար"}
+ }
+ JOD{
+ one{"Հորդանանական դինար"}
+ other{"Հորդանանական դինար"}
+ }
+ JPY{
+ one{"Ճապոնական իեն"}
+ other{"Ճապոնական իեն"}
+ }
+ KES{
+ one{"Քենիական շիլինգ"}
+ other{"Քենիական շիլինգ"}
+ }
+ KGS{
+ one{"Ղրղզական սոմ"}
+ other{"Ղրղզական սոմ"}
+ }
+ KHR{
+ one{"Կամբոջական ռիել"}
+ other{"Կամբոջական ռիել"}
+ }
+ KMF{
+ one{"Կոմորյան կղզիների ֆրանկ"}
+ other{"Կոմորյան կղզիների ֆրանկ"}
+ }
+ KPW{
+ one{"ԿԺԴՀ-ի վոնա"}
+ other{"ԿԺԴՀ-ի վոնա"}
+ }
+ KRW{
+ one{"Հարավկորեական վոնա"}
+ other{"Հարավկորեական վոնա"}
+ }
+ KWD{
+ one{"Քուվեյթական դինար"}
+ other{"Քուվեյթական դինար"}
+ }
+ KYD{
+ one{"Կայմանյան կղզիների դոլար"}
+ other{"Կայմանյան կղզիների դոլար"}
+ }
+ KZT{
+ one{"Ղազախական տենգե"}
+ other{"Ղազախական տենգե"}
+ }
+ LAK{
+ one{"Լաոսական կիպ"}
+ other{"Լաոսական կիպ"}
+ }
+ LBP{
+ one{"Լիբանանական ֆունտ"}
+ other{"Լիբանանական ֆունտ"}
+ }
+ LKR{
+ one{"Լանկիական ռուփի"}
+ other{"Լանկիական ռուփի"}
+ }
+ LRD{
+ one{"Լիբերիական դոլար"}
+ other{"Լիբերիական դոլար"}
+ }
+ LTL{
+ one{"Լիտվական լիտ"}
+ other{"Լիտվական լիտ"}
+ }
+ LVL{
+ one{"Լատվիական լատ"}
+ other{"Լատվիական լատ"}
+ }
+ LYD{
+ one{"Լիբիական դինար"}
+ other{"Լիբիական դինար"}
+ }
+ MAD{
+ one{"Մարոկական դիրհամ"}
+ other{"Մարոկական դիրհամ"}
+ }
+ MDL{
+ one{"Մոլդովական լեյ"}
+ other{"Մոլդովական լեյ"}
+ }
+ MGA{
+ one{"Մադագասկարի արիարի"}
+ other{"Մադագասկարի արիարի"}
+ }
+ MKD{
+ one{"Մակեդոնական դենար"}
+ other{"Մակեդոնական դենար"}
+ }
+ MMK{
+ one{"Մյանմական կյատ"}
+ other{"Մյանմական կյատ"}
+ }
+ MNT{
+ one{"Մոնղոլական տուգրիկ"}
+ other{"Մոնղոլական տուգրիկ"}
+ }
+ MOP{
+ one{"Մակաոյի պատակա"}
+ other{"Մակաոյի պատակա"}
+ }
+ MRO{
+ one{"Մավրիտանական ուգիյա"}
+ other{"Մավրիտանական ուգիյա"}
+ }
+ MUR{
+ one{"Մավրիկական ռուփի"}
+ other{"Մավրիկական ռուփի"}
+ }
+ MVR{
+ one{"Մալդիվյան ռուֆիա"}
+ other{"Մալդիվյան ռուֆիա"}
+ }
+ MWK{
+ one{"Մալավիական կվաչա"}
+ other{"Մալավիական կվաչա"}
+ }
+ MXN{
+ one{"Մեքսիկական պեսո"}
+ other{"Մեքսիկական պեսո"}
+ }
+ MYR{
+ one{"Մալայզիական ռինգիտ"}
+ other{"Մալայզիական ռինգիտ"}
+ }
+ MZN{
+ one{"Մոզամբիկյան մետիկալ"}
+ other{"Մոզամբիկյան մետիկալ"}
+ }
+ NAD{
+ one{"Նամիբիական դոլար"}
+ other{"Նամիբիական դոլար"}
+ }
+ NGN{
+ one{"Նիգերիական նայրա"}
+ other{"Նիգերիական նայրա"}
+ }
+ NIO{
+ one{"Նիկարագուական կորդոբա"}
+ other{"Նիկարագուական կորդոբա"}
+ }
+ NOK{
+ one{"Նորվեգական կրոնա"}
+ other{"Նորվեգական կրոնա"}
+ }
+ NPR{
+ one{"Նեպալական ռուփի"}
+ other{"Նեպալական ռուփի"}
+ }
+ NZD{
+ one{"Նորզելանդական դոլար"}
+ other{"Նորզելանդական դոլար"}
+ }
+ OMR{
+ one{"Օմանական ռիալ"}
+ other{"Օմանական ռիալ"}
+ }
+ PAB{
+ one{"Պանամական բալբոա"}
+ other{"Պանամական բալբոա"}
+ }
+ PEN{
+ one{"Պերուի նոր սոլ"}
+ other{"Պերուի նոր սոլ"}
+ }
+ PGK{
+ one{"Պապուա-Նոր Գվինեայի կինա"}
+ other{"Պապուա-Նոր Գվինեայի կինա"}
+ }
+ PHP{
+ one{"Ֆիլիպինական պեսո"}
+ other{"Ֆիլիպինական պեսո"}
+ }
+ PKR{
+ one{"Պակիստանական ռուփի"}
+ other{"Պակիստանական ռուփի"}
+ }
+ PLN{
+ one{"Լեհական զլոտի"}
+ other{"Լեհական զլոտի"}
+ }
+ PYG{
+ one{"Պարագվայական գուարանի"}
+ other{"Պարագվայական գուարանի"}
+ }
+ QAR{
+ one{"Քաթարական ռիալ"}
+ other{"Քաթարական ռիալ"}
+ }
+ RON{
+ one{"Ռումինական լեյ"}
+ other{"Ռումինական լեյ"}
+ }
+ RSD{
+ one{"Սերբական դինար"}
+ other{"Սերբական դինար"}
+ }
+ RUB{
+ one{"Ռուսական ռուբլի"}
+ other{"Ռուսական ռուբլի"}
+ }
+ RWF{
+ one{"Ռուանդական ֆրանկ"}
+ other{"Ռուանդական ֆրանկ"}
+ }
+ SAR{
+ one{"Սաուդյան Արաբիայի ռիալ"}
+ other{"Սաուդյան Արաբիայի ռիալ"}
+ }
+ SBD{
+ one{"Սողոմոնյան կղզիների դոլար"}
+ other{"Սողոմոնյան կղզիների դոլար"}
+ }
+ SCR{
+ one{"Սեյշելյան կղզիների ռուփի"}
+ other{"Սեյշելյան կղզիների ռուփի"}
+ }
+ SDG{
+ one{"Սուդանական ֆունտ"}
+ other{"Սուդանական ֆունտ"}
+ }
+ SEK{
+ one{"Շվեդական կրոնա"}
+ other{"Շվեդական կրոնա"}
+ }
+ SGD{
+ one{"Սինգապուրյան դոլար"}
+ other{"Սինգապուրյան դոլար"}
+ }
+ SHP{
+ one{"Սուրբ Հեղինեի կղզու ֆունտ"}
+ other{"Սուրբ Հեղինեի կղզու ֆունտ"}
+ }
+ SLL{
+ one{"Սիերա-Լեոնեի լեոնե"}
+ other{"Սիերա-Լեոնեի լեոնե"}
+ }
+ SOS{
+ one{"Սոմալիական շիլինգ"}
+ other{"Սոմալիական շիլինգ"}
+ }
+ SRD{
+ one{"Սուրինամական դոլար"}
+ other{"Սուրինամական դոլար"}
+ }
+ SSP{
+ one{"Հարավսուդանական ֆունտ"}
+ other{"Հարավսուդանական ֆունտ"}
+ }
+ STD{
+ one{"Սան Տոմե և Պրինսիպիի դոբրա"}
+ other{"Սան Տոմե և Պրինսիպիի դոբրա"}
+ }
+ SYP{
+ one{"Սիրիական ֆունտ"}
+ other{"Սիրիական ֆունտ"}
+ }
+ SZL{
+ one{"Սվազիլենդական լիլանգենի"}
+ other{"Սվազիլենդական լիլանգենի"}
+ }
+ THB{
+ one{"Թաիլանդական բատ"}
+ other{"Թաիլանդական բատ"}
+ }
+ TJS{
+ one{"Տաջիկական սոմոնի"}
+ other{"Տաջիկական սոմոնի"}
+ }
+ TMT{
+ one{"Թուրքմենական մանաթ"}
+ other{"Թուրքմենական մանաթ"}
+ }
+ TND{
+ one{"Թունիսական դինար"}
+ other{"Թունիսական դինար"}
+ }
+ TOP{
+ one{"Տոնգայի պաանգա"}
+ other{"Տոնգայի պաանգա"}
+ }
+ TRY{
+ one{"Թուրքական լիրա"}
+ other{"Թուրքական լիրա"}
+ }
+ TTD{
+ one{"Տրինիդադ և Տոբագոյի դոլար"}
+ other{"Տրինիդադ և Տոբագոյի դոլար"}
+ }
+ TWD{
+ one{"Թայվանական նոր դոլար"}
+ other{"Թայվանական նոր դոլար"}
+ }
+ TZS{
+ one{"Տանզանիական շիլինգ"}
+ other{"Տանզանիական շիլինգ"}
+ }
+ UAH{
+ one{"Ուկրաինական գրիվնա"}
+ other{"Ուկրաինական գրիվնա"}
+ }
+ UGX{
+ one{"Ուգանդական շիլինգ"}
+ other{"Ուգանդական շիլինգ"}
+ }
+ USD{
+ one{"ԱՄՆ դոլար"}
+ other{"ԱՄՆ դոլար"}
+ }
+ UYU{
+ one{"Ուրուգվայական պեսո"}
+ other{"Ուրուգվայական պեսո"}
+ }
+ UZS{
+ one{"Ուզբեկական սում"}
+ other{"Ուզբեկական սում"}
+ }
+ VEF{
+ one{"Վենեսուելական բոլիվար"}
+ other{"Վենեսուելական բոլիվար"}
+ }
+ VND{
+ one{"Վիետնամական դոնգ"}
+ other{"Վիետնամական դոնգ"}
+ }
+ VUV{
+ one{"Վանուատուի վատու"}
+ other{"Վանուատուի վատու"}
+ }
+ WST{
+ one{"Սամոական տալա"}
+ other{"Սամոական տալա"}
+ }
+ XAF{
+ one{"Աֆրիկական ֆինանսական համայնքի ֆրանկ BEAC"}
+ other{"Աֆրիկական ֆինանսական համայնքի ֆրանկ BEAC"}
+ }
+ XCD{
+ one{"Արևելակարիբյան դոլար"}
+ other{"Արևելակարիբյան դոլար"}
+ }
+ XOF{
+ one{"Աֆրիկական ֆինանսական համայնքի ֆրանկ BCEAO"}
+ other{"Աֆրիկական ֆինանսական համայնքի ֆրանկ BCEAO"}
+ }
+ XPF{
+ one{"ԿՊՖ ֆրանկ"}
+ other{"ԿՊՖ ֆրանկ"}
+ }
+ XXX{
+ one{"(անհայտ արժույթ)"}
+ other{"(անհայտ արժույթ)"}
+ }
+ YER{
+ one{"Եմենական ռիալ"}
+ other{"Եմենական ռիալ"}
+ }
+ ZAR{
+ one{"Հարավաֆրիկական ռենդ"}
+ other{"Հարավաֆրիկական ռենդ"}
+ }
+ ZMK{
+ one{"Զամբիական կվաչա (1968-2012)"}
+ other{"Զամբիական կվաչա (1968-2012)"}
+ }
+ ZMW{
+ one{"Զամբիական կվաչա"}
+ other{"Զամբիական կվաչա"}
+ }
+ }
+ CurrencyUnitPatterns{
+ one{"{0} {1}"}
+ other{"{0} {1}"}
+ }
+ Version{"2.0.82.51"}
}
diff --git a/data/curr/id.txt b/data/curr/id.txt
index 0095111..39ac749 100644
--- a/data/curr/id.txt
+++ b/data/curr/id.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/id.xml
// *
@@ -1145,6 +1145,10 @@
}
ZMK{
"ZMK",
+ "Kwacha Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha Zambia",
}
ZRN{
@@ -1171,5 +1175,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
}
diff --git a/data/curr/id_ID.txt b/data/curr/id_ID.txt
index 6593209..85fc819 100644
--- a/data/curr/id_ID.txt
+++ b/data/curr/id_ID.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/ig.txt b/data/curr/ig.txt
index 2e9c6f7..a8713f1 100755
--- a/data/curr/ig.txt
+++ b/data/curr/ig.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ig.xml
// *
@@ -20,5 +20,5 @@
"Naịra",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ii.txt b/data/curr/ii.txt
index 29566db..7413e92 100644
--- a/data/curr/ii.txt
+++ b/data/curr/ii.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ii.xml
// *
@@ -11,10 +11,14 @@
*/
ii{
Currencies{
+ CNY{
+ "¥",
+ "CNY",
+ }
XXX{
"XXX",
"ꅉꀋꐚꌠꌋꆀꎆꃀꀋꈁꀐꌠ",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/in.txt b/data/curr/in.txt
index cb3e2e0..2a3360a 100644
--- a/data/curr/in.txt
+++ b/data/curr/in.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/in_ID.txt b/data/curr/in_ID.txt
index d22885f..bc2b4af 100644
--- a/data/curr/in_ID.txt
+++ b/data/curr/in_ID.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/is.txt b/data/curr/is.txt
index 43a71fe..42769f2 100644
--- a/data/curr/is.txt
+++ b/data/curr/is.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/is.xml
// *
@@ -348,7 +348,7 @@
"Nýr ísraelskur sikill",
}
INR{
- "₹",
+ "Rs.",
"Indversk rúpía",
}
IQD{
@@ -885,6 +885,10 @@
}
ZMK{
"ZMK",
+ "Zambian Kwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambian Kwacha",
}
ZWD{
@@ -950,5 +954,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/it.txt b/data/curr/it.txt
index 1248203..574b239 100644
--- a/data/curr/it.txt
+++ b/data/curr/it.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/it.xml
// *
@@ -444,7 +444,7 @@
"Nuovo Shequel Israeliano",
}
INR{
- "₹",
+ "Rs.",
"Rupia Indiana",
}
IQD{
@@ -1066,6 +1066,10 @@
}
ZMK{
"ZMK",
+ "Kwacha dello Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha dello Zambia",
}
ZRN{
@@ -1719,6 +1723,10 @@
other{"rand sudafricani"}
}
ZMK{
+ one{"kwacha zambiano (1968-2012)"}
+ other{"kwacha zambiani (1968-2012)"}
+ }
+ ZMW{
one{"kwacha zambiano"}
other{"kwacha zambiani"}
}
@@ -1727,5 +1735,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/it_CH.txt b/data/curr/it_CH.txt
new file mode 100755
index 0000000..951158e
--- /dev/null
+++ b/data/curr/it_CH.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/it_CH.xml
+// *
+// ***************************************************************************
+it_CH{
+ Currencies{
+ CHF{
+ "CHF",
+ "Franco Svizzero",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/iw.txt b/data/curr/iw.txt
index c10c184..8352a34 100644
--- a/data/curr/iw.txt
+++ b/data/curr/iw.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/iw_IL.txt b/data/curr/iw_IL.txt
index 6963f2d..5a4954b 100644
--- a/data/curr/iw_IL.txt
+++ b/data/curr/iw_IL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/ja.txt b/data/curr/ja.txt
index 458bd76..2572f98 100644
--- a/data/curr/ja.txt
+++ b/data/curr/ja.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ja.xml
// *
@@ -488,7 +488,7 @@
"イスラエル新シェケル",
}
INR{
- "₹",
+ "Rs.",
"インド ルピー",
}
IQD{
@@ -1145,6 +1145,10 @@
}
ZMK{
"ZMK",
+ "ザンビア クワチャ (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"ザンビア クワチャ",
}
ZRN{
@@ -1171,5 +1175,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
}
diff --git a/data/curr/ja_JP.txt b/data/curr/ja_JP.txt
index c049867..c0ce246 100644
--- a/data/curr/ja_JP.txt
+++ b/data/curr/ja_JP.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/ja_JP_TRADITIONAL.txt b/data/curr/ja_JP_TRADITIONAL.txt
index ca942f1..e95c34a 100644
--- a/data/curr/ja_JP_TRADITIONAL.txt
+++ b/data/curr/ja_JP_TRADITIONAL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/jgo.txt b/data/curr/jgo.txt
index d865436..1cc992b 100755
--- a/data/curr/jgo.txt
+++ b/data/curr/jgo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/jgo.xml
// *
@@ -32,5 +32,5 @@
"ntɛ-ŋkɑ́p yi pɛ́ kɑ́ kɛ́ jínɛ",
}
}
- Version{"2.0.77.53"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/jmc.txt b/data/curr/jmc.txt
index 9bf4859..ac79655 100755
--- a/data/curr/jmc.txt
+++ b/data/curr/jmc.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/jmc.xml
// *
@@ -96,7 +96,7 @@
"Faranga ya Gine",
}
INR{
- "₹",
+ "Rs.",
"Rupia ya India",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Kwacha ya Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha ya Zambia",
}
ZWD{
@@ -232,5 +236,5 @@
"Dola ya Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ka.txt b/data/curr/ka.txt
index 6b2e4cc..a963738 100644
--- a/data/curr/ka.txt
+++ b/data/curr/ka.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ka.xml
// *
@@ -17,7 +17,7 @@
}
AED{
"AED",
- "გაერთიანებული არაბული საემიროების დირჰემი",
+ "არაბთა გაერთიანებული საამიროების დირჰამი",
}
AFA{
"AFA",
@@ -25,7 +25,7 @@
}
AFN{
"AFN",
- "ავღანი",
+ "ავღანური ავღანი",
}
ALL{
"ALL",
@@ -37,7 +37,7 @@
}
ANG{
"ANG",
- "ნიდრელანდების ანტილიის გულდენი",
+ "ნიდერლანდების ანტილების გულდენი",
}
AOA{
"AOA",
@@ -72,7 +72,7 @@
"ავსტრიული შილინგი",
}
AUD{
- "A$",
+ "AUD",
"ავსტრალიური დოლარი",
}
AWG{
@@ -93,7 +93,7 @@
}
BAM{
"BAM",
- "ბოსნია-ჰერცოგოვინას კონვერტირებადი მარკა",
+ "ბოსნია-ჰერზეგოვინას კონვერტირებადი მარკა",
}
BBD{
"BBD",
@@ -121,7 +121,7 @@
}
BGN{
"BGN",
- "ბულგარული ახალი ლევი",
+ "ბულგარული ლევი",
}
BHD{
"BHD",
@@ -133,7 +133,7 @@
}
BMD{
"BMD",
- "ბერმუდული დინარი",
+ "ბერმუდული დოლარი",
}
BND{
"BND",
@@ -141,7 +141,7 @@
}
BOB{
"BOB",
- "ბოლივიანო",
+ "ბოლივიური ბოლივიანო",
}
BOP{
"BOP",
@@ -175,6 +175,10 @@
"BSD",
"ბაჰამური დოლარი",
}
+ BTN{
+ "BTN",
+ "ბუტანური ნგულტრუმი",
+ }
BWP{
"BWP",
"ბოტსვანიური პულა",
@@ -185,23 +189,39 @@
}
BYR{
"BYR",
- "ბელარუსიული რუბლი",
+ "ბელორუსული რუბლი",
+ }
+ BZD{
+ "BZD",
+ "ბელიზის დოლარი",
}
CAD{
"CA$",
"კანადური დოლარი",
}
+ CDF{
+ "CDF",
+ "კონგოს ფრანკი",
+ }
CHF{
"CHF",
"შვეიცარიული ფრანკი",
}
+ CLP{
+ "CLP",
+ "ჩილეს პესო",
+ }
CNY{
- "CN¥",
- "ჩინური უანი",
+ "CNY",
+ "ჩინური იუანი",
+ }
+ COP{
+ "COP",
+ "კოლუმბიური პესო",
}
CRC{
"CRC",
- "კოსტა რიკული კოლონი",
+ "კოსტა-რიკული კოლონი",
}
CSD{
"CSD",
@@ -211,13 +231,17 @@
"CSK",
"ჩეხოსლოვაკიის მყარი კრონა",
}
+ CUC{
+ "CUC",
+ "კუბური კონვერტირებადი პესო",
+ }
CUP{
"CUP",
"კუბური პესო",
}
CVE{
"CVE",
- "კაბო ვერდეს ესკუდო",
+ "კაბო-ვერდეს ესკუდო",
}
CYP{
"CYP",
@@ -249,7 +273,7 @@
}
DZD{
"DZD",
- "ალჟირიული დინარი",
+ "ალჟირული დინარი",
}
EEK{
"EEK",
@@ -259,10 +283,18 @@
"EGP",
"ეგვიპტური გირვანქა",
}
+ ERN{
+ "ERN",
+ "ერიტრეის ნაკფა",
+ }
ESP{
"ESP",
"ესპანური პესეტა",
}
+ ETB{
+ "ETB",
+ "ეთიოპიური ბირი",
+ }
EUR{
"€",
"ევრო",
@@ -273,7 +305,11 @@
}
FJD{
"FJD",
- "ფიჯი დოლარი",
+ "ფიჯის დოლარი",
+ }
+ FKP{
+ "FKP",
+ "ფოლკლენდის კუნძულების ფუნტი",
}
FRF{
"FRF",
@@ -291,21 +327,45 @@
"GEL",
"ქართული ლარი",
}
+ GHS{
+ "GHS",
+ "განური სედი",
+ }
+ GIP{
+ "GIP",
+ "გიბრალტარული ფუნტი",
+ }
+ GMD{
+ "GMD",
+ "გამბიური დალასი",
+ }
+ GNF{
+ "GNF",
+ "გვინეური ფრანკი",
+ }
GRD{
"GRD",
"ბერძნული დრაჰმა",
}
+ GTQ{
+ "GTQ",
+ "გვატემალური კეტსალი",
+ }
GWE{
"GWE",
"პორტუგალიური გინეა ესკუდო",
}
+ GYD{
+ "GYD",
+ "გაიანური დოლარი",
+ }
HKD{
- "HK$",
- "ჰონგ კონგის დოლარი",
+ "HKD",
+ "ჰონკონგის დოლარი",
}
HNL{
"HNL",
- "ჰონდურასის ლემპირა",
+ "ჰონდურასული ლემპირა",
}
HRD{
"HRD",
@@ -313,7 +373,11 @@
}
HRK{
"HRK",
- "ხორვატიული კუნა",
+ "ხორვატული კუნა",
+ }
+ HTG{
+ "HTG",
+ "ჰაიტური გურდი",
}
HUF{
"HUF",
@@ -327,10 +391,22 @@
"IEP",
"ირლანდიური გირვანქა",
}
+ ILS{
+ "ILS",
+ "ისრაელის ახალი შეკელი",
+ }
INR{
- "₹",
+ "INR",
"ინდური რუპია",
}
+ IQD{
+ "IQD",
+ "ერაყული დინარი",
+ }
+ IRR{
+ "IRR",
+ "ირანული რიალი",
+ }
ISK{
"ISK",
"ისლანდიური კრონა",
@@ -348,7 +424,7 @@
"იორდანიული დოლარი",
}
JPY{
- "JP¥",
+ "JPY",
"იაპონური იენი",
}
KES{
@@ -359,17 +435,25 @@
"KGS",
"ყირღიზული სომი",
}
+ KHR{
+ "KHR",
+ "კამბოჯური რიელი",
+ }
+ KMF{
+ "KMF",
+ "კომორული ფრანკი",
+ }
KPW{
"KPW",
"ჩრდილოეთ კორეული ვონი",
}
KRW{
- "₩",
+ "KRW",
"სამხრეთ კორეული ვონი",
}
KWD{
"KWD",
- "კუვეიტური დინარი",
+ "ქუვეითური დინარი",
}
KYD{
"KYD",
@@ -379,9 +463,17 @@
"KZT",
"ყაზახური ტენგე",
}
+ LAK{
+ "LAK",
+ "ლაოსური კიპი",
+ }
+ LBP{
+ "LBP",
+ "ლიბანური ფუნტი",
+ }
LKR{
"LKR",
- "შრი ლანკის რუპია",
+ "შრი-ლანკური რუპია",
}
LRD{
"LRD",
@@ -441,7 +533,7 @@
}
MKD{
"MKD",
- "მაკედონიური დენარი",
+ "მაკედონიური დინარი",
}
MLF{
"MLF",
@@ -455,6 +547,14 @@
"MNT",
"მონღოლური ტუგრიკი",
}
+ MOP{
+ "MOP",
+ "მაკაუს პატაკა",
+ }
+ MRO{
+ "MRO",
+ "მავრიტანული უგია",
+ }
MTL{
"MTL",
"მალტის ლირა",
@@ -473,7 +573,7 @@
}
MWK{
"MWK",
- "მალავის კვანჩა",
+ "მალავიური კვაჩა",
}
MXN{
"MX$",
@@ -513,7 +613,7 @@
}
NIO{
"NIO",
- "ნიკარაგუას ოქროს კორდობა",
+ "ნიკარაგუული კორდობა",
}
NLG{
"NLG",
@@ -528,12 +628,16 @@
"ნეპალური რუპია",
}
NZD{
- "NZ$",
+ "NZD",
"ახალი ზელანდიის დოლარი",
}
OMR{
"OMR",
- "ომანის რეალი",
+ "ომანის რიალი",
+ }
+ PAB{
+ "PAB",
+ "პანამური ბალბოა",
}
PEI{
"PEI",
@@ -547,6 +651,10 @@
"PES",
"პერუს სოლი",
}
+ PGK{
+ "PGK",
+ "პაპუა-ახალი გვინეის კინა",
+ }
PHP{
"PHP",
"ფილიპინური პესო",
@@ -567,6 +675,10 @@
"PTE",
"პორტუგალიური ესკუდო",
}
+ PYG{
+ "PYG",
+ "პარაგვაული გუარანი",
+ }
QAR{
"QAR",
"კატარის რიალი",
@@ -583,6 +695,10 @@
"RON",
"რუმინული ლეუ",
}
+ RSD{
+ "RSD",
+ "სერბული დინარი",
+ }
RUB{
"RUB",
"რუსული რუბლი",
@@ -595,14 +711,26 @@
"RWF",
"რუანდული ფრანკი",
}
+ SAR{
+ "SAR",
+ "საუდის არაბეთის რიალი",
+ }
+ SBD{
+ "SBD",
+ "სოლომონის კუნძულების დოლარი",
+ }
SCR{
"SCR",
- "სეიშელის რუპია",
+ "სეიშელური რუპია",
}
SDD{
"SDD",
"სუდანის დინარი",
}
+ SDG{
+ "SDG",
+ "სუდანური ფუნტი",
+ }
SDP{
"SDP",
"სუდანის გირვანქა",
@@ -615,25 +743,45 @@
"SGD",
"სინგაპურის დოლარი",
}
+ SHP{
+ "SHP",
+ "წმ. ელენეს კუნძულის ფუნტი",
+ }
SLL{
"SLL",
- "სიერა ლეონეს ლეონე",
+ "სიერა-ლეონეს ლეონე",
}
SRD{
"SRD",
- "სურინამის დოლარი",
+ "სურინამული დოლარი",
}
SRG{
"SRG",
"სურინამის გულდენი",
}
+ SSP{
+ "SSP",
+ "სამხრეთ სუდანური ფუნტი",
+ }
+ STD{
+ "STD",
+ "სან-ტომე და პრინსიპის დობრა",
+ }
SUR{
"SUR",
"საბჭოთა რუბლი",
}
SYP{
"SYP",
- "სირიული გირვანქა",
+ "სირიული ფუნტი",
+ }
+ SZL{
+ "SZL",
+ "სვაზილენდის ლილანგენი",
+ }
+ THB{
+ "THB",
+ "ტაილანდური ბატი",
}
TJR{
"TJR",
@@ -647,9 +795,17 @@
"TMM",
"თურქმენული მანათი",
}
+ TMT{
+ "TMT",
+ "თურქმენეთის მანათი",
+ }
TND{
"TND",
- "ტუნისიური დინარი",
+ "ტუნისური დინარი",
+ }
+ TOP{
+ "TOP",
+ "ტონგანური პაანგა",
}
TRL{
"TRL",
@@ -664,7 +820,7 @@
"ტრინიდად და ტობაგოს დოლარი",
}
TWD{
- "NT$",
+ "TWD",
"ტაივანური ახალი დოლარი",
}
TZS{
@@ -705,7 +861,7 @@
}
UYU{
"UYU",
- "ურუგვაის პესო ურუგვაიო",
+ "ურუგვაის პესო",
}
UZS{
"UZS",
@@ -720,16 +876,20 @@
"ვენესუელის ბოლივარი",
}
VND{
- "₫",
+ "VND",
"ვიეტნამური დონგი",
}
VUV{
"VUV",
- "ვანატუს ვატუ",
+ "ვანუატუს ვატუ",
}
WST{
"WST",
- "დასავლეთ სამოას ტალა",
+ "სამოური ტალა",
+ }
+ XAF{
+ "FCFA",
+ "CFA ფრანკი (BEAC)",
}
XAG{
"XAG",
@@ -755,9 +915,17 @@
"XFO",
"ფრანგული ოქროს ფრანკი",
}
+ XOF{
+ "CFA",
+ "(CFA) ფრანკი (BCEAO)",
+ }
+ XPF{
+ "CFPF",
+ "CFP ფრანკი",
+ }
XXX{
"XXX",
- "უცნობი ან არასწორი ვალუტა",
+ "უცნობი ვალუტა",
}
YDD{
"YDD",
@@ -779,9 +947,17 @@
"YUN",
"იუგოსლავიური კონვერტირებადი დინარი",
}
+ ZAR{
+ "ZAR",
+ "სამხრეთ აფრიკული რანდი",
+ }
ZMK{
"ZMK",
- "ზამბიური კვანჩა",
+ "ზამბიური კვაჩა (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
+ "ზამბიური კვაჩა",
}
ZRN{
"ZRN",
@@ -796,8 +972,358 @@
"ზიმბაბვეს დოლარი",
}
}
+ CurrencyPlurals{
+ AFN{
+ other{"ავღანი"}
+ }
+ ANG{
+ other{"ნიდრელანდების ანტილიის გულდენი"}
+ }
+ AOA{
+ other{"ანგოლური კვანზა"}
+ }
+ ARS{
+ other{"არგენტინული პესო"}
+ }
+ AUD{
+ other{"ავსტრალიური დოლარი"}
+ }
+ BBD{
+ other{"ბარბადოსული დოლარი"}
+ }
+ BDT{
+ other{"ბანგლადეშური ტაკა"}
+ }
+ BMD{
+ other{"ბერმუდული დოლარი"}
+ }
+ BND{
+ other{"ბრუნეული დოლარი"}
+ }
+ BOB{
+ other{"ბოლივიური ბოლივიანო"}
+ }
+ BRL{
+ other{"ბრაზილიური რეალი"}
+ }
+ BTN{
+ other{"ბუტანური ნგულტრუმი"}
+ }
+ BWP{
+ other{"ბოცვანური პულა"}
+ }
+ BZD{
+ other{"ბელიზის დოლარი"}
+ }
+ CAD{
+ other{"კანადური დოლარი"}
+ }
+ CDF{
+ other{"კონგოს ფრანკი"}
+ }
+ CLP{
+ other{"ჩილიური პესო"}
+ }
+ CNY{
+ other{"ჩინური უანი"}
+ }
+ COP{
+ other{"კოლუმბიური პესო"}
+ }
+ CRC{
+ other{"კოსტა რიკული კოლონი"}
+ }
+ CUC{
+ other{"კუბური კონვერტირებადი პესო"}
+ }
+ CUP{
+ other{"კუბური პესო"}
+ }
+ CVE{
+ other{"კაბო-ვერდეს ესკუდო"}
+ }
+ DKK{
+ other{"დანიური კრონა"}
+ }
+ DOP{
+ other{"დომინიკური პესო"}
+ }
+ DZD{
+ other{"ალჟირული დინარი"}
+ }
+ EGP{
+ other{"ეგვიპტური გირვანქა"}
+ }
+ ERN{
+ other{"ერიტრეის ნაკფა"}
+ }
+ ETB{
+ other{"ეთიოპიური ბირი"}
+ }
+ FJD{
+ other{"ფიჯის დოლარი"}
+ }
+ FKP{
+ other{"ფოლკლენდის კუნძულების ფუნტი"}
+ }
+ GBP{
+ other{"ინგლისური გირვანქა სტერლინგი"}
+ }
+ GHS{
+ other{"განური სედი"}
+ }
+ GIP{
+ other{"გიბრალტარული ფუნტი"}
+ }
+ GMD{
+ other{"გამბიური დალასი"}
+ }
+ GNF{
+ other{"გვინეური ფრანკი"}
+ }
+ GTQ{
+ other{"გვატემალური კეტსალი"}
+ }
+ GYD{
+ other{"გაიანური დოლარი"}
+ }
+ HKD{
+ other{"ჰონგ კონგის დოლარი"}
+ }
+ HNL{
+ other{"ჰონდურასული ლემპირა"}
+ }
+ HTG{
+ other{"ჰაიტური გურდი"}
+ }
+ IDR{
+ other{"ინდონეზიური რუპია"}
+ }
+ ILS{
+ other{"ისრაელის ახალი შეკელი"}
+ }
+ INR{
+ other{"ინდური რუპია"}
+ }
+ IQD{
+ other{"ერაყული დინარი"}
+ }
+ IRR{
+ other{"ირანული რიალი"}
+ }
+ JMD{
+ other{"იამაიკური დოლარი"}
+ }
+ JPY{
+ other{"იაპონური იენი"}
+ }
+ KHR{
+ other{"კამბოჯური რიელი"}
+ }
+ KMF{
+ other{"კომორული ფრანკი"}
+ }
+ KPW{
+ other{"ჩრდილოეთ კორეული ვონი"}
+ }
+ KRW{
+ other{"სამხრეთ კორეული ვონი"}
+ }
+ KWD{
+ other{"ქუვეითური დინარი"}
+ }
+ KYD{
+ other{"კაიმანის კუნძულების დოლარი"}
+ }
+ KZT{
+ other{"ყაზახური ტენგე"}
+ }
+ LAK{
+ other{"ლაოსური კიპი"}
+ }
+ LBP{
+ other{"ლიბანური ფუნტი"}
+ }
+ LKR{
+ other{"შრი ლანკას რუპია"}
+ }
+ LYD{
+ other{"ლიბიური დინარი"}
+ }
+ MAD{
+ other{"მაროკოს დირჰამი"}
+ }
+ MMK{
+ other{"მიანმარის კიატი"}
+ }
+ MNT{
+ other{"მონღოლური ტუგრიკი"}
+ }
+ MOP{
+ other{"მაკაუს პატაკა"}
+ }
+ MRO{
+ other{"მავრიტანული უგია"}
+ }
+ MVR{
+ other{"მალდივური რუფია"}
+ }
+ MXN{
+ other{"მექსიკური პესო"}
+ }
+ MYR{
+ other{"მალაიზიური რინგიტი"}
+ }
+ NAD{
+ other{"ნამიბიური დოლარი"}
+ }
+ NIO{
+ other{"ნიკარაგუას ოქროს კორდობა"}
+ }
+ NPR{
+ other{"ნეპალური რუპია"}
+ }
+ NZD{
+ other{"ახალი ზელანდიის დოლარი"}
+ }
+ OMR{
+ other{"ომანის რიალი"}
+ }
+ PAB{
+ other{"პანამური ბალბოა"}
+ }
+ PEN{
+ other{"პერუს ახალი სოლი"}
+ }
+ PGK{
+ other{"პაპუა-ახალი გვინეის კინა"}
+ }
+ PHP{
+ other{"ფილიპინური პესო"}
+ }
+ PKR{
+ other{"პაკისტანური რუპია"}
+ }
+ PYG{
+ other{"პარაგვაული გუარანი"}
+ }
+ QAR{
+ other{"კატარის რიალი"}
+ }
+ RSD{
+ other{"სერბული დინარი"}
+ }
+ SAR{
+ other{"საუდის არაბეთის რიალი"}
+ }
+ SBD{
+ other{"სოლომონის კუნძულების დოლარი"}
+ }
+ SDG{
+ other{"სუდანური ფუნტი"}
+ }
+ SGD{
+ other{"სინგაპურის დოლარი"}
+ }
+ SHP{
+ other{"წმ. ელენეს კუნძულის ფუნტი"}
+ }
+ SLL{
+ other{"სიერა-ლეონეს ლეონე"}
+ }
+ SRD{
+ other{"სურინამული დოლარი"}
+ }
+ SSP{
+ other{"სამხრეთ სუდანური ფუნტი"}
+ }
+ STD{
+ other{"სან-ტომე და პრინსიპის დობრა"}
+ }
+ SYP{
+ other{"სირიული გირვანქა"}
+ }
+ SZL{
+ other{"სვაზილენდის ლილანგენი"}
+ }
+ THB{
+ other{"ტაილანდური ბატი"}
+ }
+ TJS{
+ other{"ტაჯიკური სომონი"}
+ }
+ TMT{
+ other{"თურქმენეთის მანათი"}
+ }
+ TND{
+ other{"ტუნისის დინარი"}
+ }
+ TRY{
+ other{"ახალი თურქული ლირა"}
+ }
+ TTD{
+ other{"ტრინიდად და ტობაგოს დოლარი"}
+ }
+ TWD{
+ other{"ტაივანური ახალი დოლარი"}
+ }
+ TZS{
+ other{"ტანზანიური შილინგი"}
+ }
+ UGX{
+ other{"უგანდური შილინგი"}
+ }
+ USD{
+ other{"აშშ დოლარი"}
+ }
+ UYU{
+ other{"ურუგვაის პესო"}
+ }
+ UZS{
+ other{"უზბეკური სუმი"}
+ }
+ VEF{
+ other{"ვენესუელის ბოლივარი"}
+ }
+ VND{
+ other{"ვიეტნამური დონგი"}
+ }
+ VUV{
+ other{"ვანატუს ვატუ"}
+ }
+ WST{
+ other{"დასავლეთ სამოას ტალა"}
+ }
+ XAF{
+ other{"CFA ფრანკი (BEAC)"}
+ }
+ XCD{
+ other{"აღმოსავლეთ კარიბიული დოლარი"}
+ }
+ XOF{
+ other{"CFA ფრანკი (BCEAO)"}
+ }
+ XPF{
+ other{"CFP ფრანკი"}
+ }
+ XXX{
+ other{"უცნობი ვალუტა"}
+ }
+ YER{
+ other{"იემენის რეალი"}
+ }
+ ZAR{
+ other{"სამხრეთ აფრიკული რანდი"}
+ }
+ ZMK{
+ other{"ზამბიური კვაჭა (1968-2012)"}
+ }
+ ZMW{
+ other{"ზამბიური კვაჭა"}
+ }
+ }
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.61"}
}
diff --git a/data/curr/kab.txt b/data/curr/kab.txt
index e00889d..aab783d 100755
--- a/data/curr/kab.txt
+++ b/data/curr/kab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kab.xml
// *
@@ -96,7 +96,7 @@
"Afrank Aɣini",
}
INR{
- "₹",
+ "Rs.",
"Arupi Ahendi",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Akwaca Azambi (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Akwaca Azambi",
}
ZWD{
@@ -228,5 +232,5 @@
"Adular Azimbabwi",
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/kam.txt b/data/curr/kam.txt
index c54eeeb..88640be 100755
--- a/data/curr/kam.txt
+++ b/data/curr/kam.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kam.xml
// *
@@ -96,7 +96,7 @@
"Faranga ya Gine",
}
INR{
- "₹",
+ "Rs.",
"Rupia ya India",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Kwacha ya Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha ya Zambia",
}
ZWD{
@@ -228,5 +232,5 @@
"Ndola ya Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/kde.txt b/data/curr/kde.txt
index 07deb46..c2822a6 100755
--- a/data/curr/kde.txt
+++ b/data/curr/kde.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kde.xml
// *
@@ -96,7 +96,7 @@
"Faranga ya Gine",
}
INR{
- "₹",
+ "Rs.",
"Rupia ya India",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Kwacha ya Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha ya Zambia",
}
ZWD{
@@ -232,5 +236,5 @@
"Dola ya Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/kea.txt b/data/curr/kea.txt
index d8dc778..40aa883 100755
--- a/data/curr/kea.txt
+++ b/data/curr/kea.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kea.xml
// *
@@ -58,6 +58,11 @@
CVE{
"CVE",
"Skudu Kabuverdianu",
+ {
+ "#,##0.00 ¤",
+ "$",
+ ",",
+ }
}
DJF{
"DJF",
@@ -116,7 +121,7 @@
"ILS",
}
INR{
- "₹",
+ "Rs.",
"Rupia indianu",
}
JPY{
@@ -301,6 +306,10 @@
}
ZMK{
"ZMK",
+ "Kuaxa zambianu (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kuaxa zambianu",
}
ZWD{
@@ -311,5 +320,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/khq.txt b/data/curr/khq.txt
index 0fa7d3a..7c7effb 100755
--- a/data/curr/khq.txt
+++ b/data/curr/khq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/khq.xml
// *
@@ -96,7 +96,7 @@
"Ginee Fraŋ",
}
INR{
- "₹",
+ "Rs.",
"Indu Rupii",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Zambi Kwaca (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambi Kwaca",
}
ZWD{
@@ -232,5 +236,5 @@
"Zimbabwe Dollar",
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ki.txt b/data/curr/ki.txt
index a8a23b8..daafd09 100755
--- a/data/curr/ki.txt
+++ b/data/curr/ki.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ki.xml
// *
@@ -96,7 +96,7 @@
"Faranga ya Gine",
}
INR{
- "₹",
+ "Rs.",
"Rubia rwa India",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Kwacha ya Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha ya Zambia",
}
ZWD{
@@ -228,5 +232,5 @@
"Dola ya Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/kk.txt b/data/curr/kk.txt
index 4a79b02..049f318 100644
--- a/data/curr/kk.txt
+++ b/data/curr/kk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kk.xml
// *
@@ -28,7 +28,7 @@
"Британия фунты",
}
INR{
- "₹",
+ "Rs.",
"Үнді рупия",
}
JPY{
@@ -52,5 +52,5 @@
"Белгісіз валюта",
}
}
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/kk_Cyrl.txt b/data/curr/kk_Cyrl.txt
index 6e5a261..a368107 100644
--- a/data/curr/kk_Cyrl.txt
+++ b/data/curr/kk_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kk_Cyrl.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/kk_Cyrl.xml
*/
kk_Cyrl{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/kk_Cyrl_KZ.txt b/data/curr/kk_Cyrl_KZ.txt
index ec163a4..6917b0e 100644
--- a/data/curr/kk_Cyrl_KZ.txt
+++ b/data/curr/kk_Cyrl_KZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/kk_KZ.txt b/data/curr/kk_KZ.txt
index 6702eea..f94bda6 100644
--- a/data/curr/kk_KZ.txt
+++ b/data/curr/kk_KZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/kl.txt b/data/curr/kl.txt
index aa9bb69..aceff92 100644
--- a/data/curr/kl.txt
+++ b/data/curr/kl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kl.xml
// *
@@ -26,5 +26,5 @@
other{"euro"}
}
}
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/kln.txt b/data/curr/kln.txt
index 9e66ad1..a01dcef 100755
--- a/data/curr/kln.txt
+++ b/data/curr/kln.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kln.xml
// *
@@ -96,7 +96,7 @@
"Rabisiekab Guinea",
}
INR{
- "₹",
+ "Rs.",
"Rabisiekab India",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Kwachaitab Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwachaitab Zambia",
}
ZWD{
@@ -228,5 +232,5 @@
"Dolaitab ya Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/km.txt b/data/curr/km.txt
index c51ab23..1968ce6 100644
--- a/data/curr/km.txt
+++ b/data/curr/km.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/km.xml
// *
@@ -256,7 +256,7 @@
"ស្ស៊ីហ្គែល អ៊ីស្រាអែល",
}
INR{
- "₹",
+ "Rs.",
"រ៉ូពី ឥណ្ឌា",
}
IQD{
@@ -637,11 +637,15 @@
}
ZMK{
"ZMK",
+ "ក្វាចា សំប៊ី (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"ក្វាចា សំប៊ី",
}
}
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/kn.txt b/data/curr/kn.txt
index 4386e61..4085b0a 100644
--- a/data/curr/kn.txt
+++ b/data/curr/kn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kn.xml
// *
@@ -256,7 +256,7 @@
"ಇಸ್ರೇಲಿ ನ್ಯೂ ಶೇಖಲ್",
}
INR{
- "₹",
+ "Rs.",
"ಭಾರತೀಯ ರುಪಾಯಿ",
}
IQD{
@@ -641,11 +641,15 @@
}
ZMK{
"ZMK",
+ "ಜಾಂಬಿಯಾ ಕ್ವಾಚ (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"ಜಾಂಬಿಯಾ ಕ್ವಾಚ",
}
}
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.78.40"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ko.txt b/data/curr/ko.txt
index 751e9e4..d9c5d67 100644
--- a/data/curr/ko.txt
+++ b/data/curr/ko.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ko.xml
// *
@@ -488,7 +488,7 @@
"이스라엘 신권 세켈",
}
INR{
- "₹",
+ "Rs.",
"인도 루피",
}
IQD{
@@ -1133,6 +1133,10 @@
}
ZMK{
"ZMK",
+ "쟘비아 콰쳐 (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"쟘비아 콰쳐",
}
ZRN{
@@ -1159,5 +1163,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
}
diff --git a/data/curr/kok.txt b/data/curr/kok.txt
index 49ac109..189cdb0 100644
--- a/data/curr/kok.txt
+++ b/data/curr/kok.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kok.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/kok.xml
*/
kok{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ks.txt b/data/curr/ks.txt
index bca67b2..f3d549d 100755
--- a/data/curr/ks.txt
+++ b/data/curr/ks.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ks.xml
// *
@@ -396,7 +396,7 @@
"اِزرٲیِلی نٔوۍ شٮ۪قٕل",
}
INR{
- "₹",
+ "Rs.",
"ہِندُستٲنۍ رۄپَے",
}
IQD{
@@ -997,6 +997,10 @@
}
ZMK{
"ZMK",
+ "زِمبابیُک کواچا (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"زِمبابیُک کواچا",
}
ZRN{
@@ -1012,5 +1016,5 @@
"زِمبابِیُک ڈالَر",
}
}
- Version{"2.0.78.55"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ks_Arab.txt b/data/curr/ks_Arab.txt
index cbef02c..903481b 100755
--- a/data/curr/ks_Arab.txt
+++ b/data/curr/ks_Arab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ks_Arab.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/ks_Arab.xml
*/
ks_Arab{
- Version{"2.0.75.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ks_Arab_IN.txt b/data/curr/ks_Arab_IN.txt
index 47b5e54..9eac4af 100755
--- a/data/curr/ks_Arab_IN.txt
+++ b/data/curr/ks_Arab_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/ks_IN.txt b/data/curr/ks_IN.txt
index 558e1ea..fa6550f 100755
--- a/data/curr/ks_IN.txt
+++ b/data/curr/ks_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/ksb.txt b/data/curr/ksb.txt
index 1affc55..ed749d5 100755
--- a/data/curr/ksb.txt
+++ b/data/curr/ksb.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ksb.xml
// *
@@ -96,7 +96,7 @@
"falanga ya Gine",
}
INR{
- "₹",
+ "Rs.",
"lupia ya India",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "kwacha ya Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"kwacha ya Zambia",
}
ZWD{
@@ -232,5 +236,5 @@
"dola ya Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ksf.txt b/data/curr/ksf.txt
index 3e0f6d4..3967bdf 100755
--- a/data/curr/ksf.txt
+++ b/data/curr/ksf.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ksf.xml
// *
@@ -96,7 +96,7 @@
"mɔni mǝ á ginɛ́",
}
INR{
- "₹",
+ "Rs.",
"mɔni mǝ á indí",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "mɔni mǝ á zambí (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"mɔni mǝ á zambí",
}
ZWD{
@@ -228,5 +232,5 @@
"mɔni mǝ á zimbabwɛ́",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/kw.txt b/data/curr/kw.txt
index 687e864..4416e85 100644
--- a/data/curr/kw.txt
+++ b/data/curr/kw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kw.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/kw.xml
*/
kw{
- Version{"2.0.74.74"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/lag.txt b/data/curr/lag.txt
index 73e051e..ac5c7b4 100755
--- a/data/curr/lag.txt
+++ b/data/curr/lag.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lag.xml
// *
@@ -96,7 +96,7 @@
"Faráanga ya Gíine",
}
INR{
- "₹",
+ "Rs.",
"Rupía ya Índia",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Kwácha ya Sámbia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwácha ya Sámbia",
}
ZWD{
@@ -228,5 +232,5 @@
"Dóola ya Simbáabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/lg.txt b/data/curr/lg.txt
index 612162e..1add8d2 100755
--- a/data/curr/lg.txt
+++ b/data/curr/lg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lg.xml
// *
@@ -96,7 +96,7 @@
"Faranga ey'eGini",
}
INR{
- "₹",
+ "Rs.",
"Rupiya ey'eBuyindi",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Kwaca ey'eZambya (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwaca ey'eZambya",
}
ZWD{
@@ -232,5 +236,5 @@
"Doola ey'eZimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ln.txt b/data/curr/ln.txt
index be44bf3..95d8986 100755
--- a/data/curr/ln.txt
+++ b/data/curr/ln.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ln.xml
// *
@@ -40,7 +40,7 @@
"Dolarɛ ya Kanadá",
}
CDF{
- "CDF",
+ "FC",
"Falánga ya Kongó",
}
CHF{
@@ -96,7 +96,7 @@
"Falánga ya Ginɛ",
}
INR{
- "₹",
+ "Rs.",
"Rupi ya Índɛ",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Kwasha ya Zambi (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwasha ya Zambi",
}
ZWD{
@@ -232,5 +236,5 @@
"Dolarɛ ya Zimbabwɛ",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ln_AO.txt b/data/curr/ln_AO.txt
new file mode 100755
index 0000000..18de150
--- /dev/null
+++ b/data/curr/ln_AO.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/ln_AO.xml
+// *
+// ***************************************************************************
+ln_AO{
+ Currencies{
+ AOA{
+ "Kz",
+ "Kwanza ya Angóla",
+ }
+ }
+ Version{"2.0.82.68"}
+}
diff --git a/data/curr/lo.txt b/data/curr/lo.txt
index f72df21..d3345fd 100755
--- a/data/curr/lo.txt
+++ b/data/curr/lo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lo.xml
// *
@@ -480,7 +480,7 @@
"ນິວເຊເກນ ອີສະລາແອນ",
}
INR{
- "₹",
+ "Rs.",
"ຣູປີ ອິນເດຍ",
}
IQD{
@@ -1137,6 +1137,10 @@
}
ZMK{
"ZMK",
+ "ຄວາຊາ ຊັມເບຍ (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"ຄວາຊາ ຊັມເບຍ",
}
ZRN{
@@ -1163,5 +1167,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
}
diff --git a/data/curr/lt.txt b/data/curr/lt.txt
index 7b4e160..184c99a 100644
--- a/data/curr/lt.txt
+++ b/data/curr/lt.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lt.xml
// *
@@ -269,7 +269,7 @@
}
CNX{
"CNX",
- "Kinijos \"People\" banko doleriai",
+ "Kinijos \u0022People\u0022 banko doleriai",
}
CNY{
"CN¥",
@@ -500,7 +500,7 @@
"Izraelio šekelis",
}
INR{
- "₹",
+ "Rs.",
"Indijos rupija",
}
IQD{
@@ -1161,6 +1161,10 @@
}
ZMK{
"ZMK",
+ "Zambijos kvača (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambijos kvača",
}
ZRN{
@@ -1506,9 +1510,9 @@
other{"Čilės pesai"}
}
CNX{
- few{"Kinijos \"People\" banko doleriai"}
- one{"Kinijos \"People\" banko doleris"}
- other{"Kinijos \"People\" banko doleriai"}
+ few{"Kinijos \u0022People\u0022 banko doleriai"}
+ one{"Kinijos \u0022People\u0022 banko doleris"}
+ other{"Kinijos \u0022People\u0022 banko doleriai"}
}
CNY{
few{"Kinijos juaniai"}
@@ -2616,6 +2620,11 @@
other{"Pietų Afrikos randas"}
}
ZMK{
+ few{"Zambijos kvačos (1968-2012)"}
+ one{"Zambijos kvača (1968-2012)"}
+ other{"Zambijos kvačos (1968-2012)"}
+ }
+ ZMW{
few{"Zambijos kvačos"}
one{"Zambijos kvača"}
other{"Zambijos kvačos"}
@@ -2651,5 +2660,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.57"}
}
diff --git a/data/curr/lu.txt b/data/curr/lu.txt
index 9bf40b3..1ce3eb2 100755
--- a/data/curr/lu.txt
+++ b/data/curr/lu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lu.xml
// *
@@ -40,7 +40,7 @@
"Ndola wa Kanada",
}
CDF{
- "CDF",
+ "FC",
"Nfalanga wa Kongu",
}
CHF{
@@ -96,7 +96,7 @@
"Nfalanga wa Ngina",
}
INR{
- "₹",
+ "Rs.",
"Rupi wa Inde",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Kwasha wa Zambi (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwasha wa Zambi",
}
ZWD{
@@ -232,5 +236,5 @@
"Ndola wa Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/luo.txt b/data/curr/luo.txt
index e709613..ca0c4fd 100755
--- a/data/curr/luo.txt
+++ b/data/curr/luo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/luo.xml
// *
@@ -96,7 +96,7 @@
"Faranga ya Gine",
}
INR{
- "₹",
+ "Rs.",
"Rupia ya India",
}
JPY{
@@ -104,7 +104,7 @@
"Yen mar Japan",
}
KES{
- "KES",
+ "Ksh",
"Siling mar Kenya",
}
KMF{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Kwacha ya Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha ya Zambia",
}
ZWD{
@@ -228,5 +232,5 @@
"Dola ya Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/luy.txt b/data/curr/luy.txt
index 003fdb7..cc70e92 100755
--- a/data/curr/luy.txt
+++ b/data/curr/luy.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/luy.xml
// *
@@ -96,7 +96,7 @@
"Faranga ya Gine",
}
INR{
- "₹",
+ "Rs.",
"Rupia ya India",
}
JPY{
@@ -104,7 +104,7 @@
"Sarafu ya Kijapani",
}
KES{
- "KES",
+ "Ksh",
"Sirinji ya Kenya",
}
KMF{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Kwacha ya Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha ya Zambia",
}
ZWD{
@@ -228,5 +232,5 @@
"Dola ya Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/lv.txt b/data/curr/lv.txt
index 51d78de..b60df2d 100644
--- a/data/curr/lv.txt
+++ b/data/curr/lv.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lv.xml
// *
@@ -304,7 +304,7 @@
"Izraēlas šekelis",
}
INR{
- "₹",
+ "Rs.",
"Indijas rūpija",
}
IQD{
@@ -813,6 +813,10 @@
}
ZMK{
"ZMK",
+ "Zambijas kvača (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambijas kvača",
}
ZWD{
@@ -1651,6 +1655,11 @@
zero{"Dienvidāfrikas randi"}
}
ZMK{
+ one{"Zambijas kvača (1968-2012)"}
+ other{"Zambijas kvačas (1968-2012)"}
+ zero{"Zambijas kvačas (1968-2012)"}
+ }
+ ZMW{
one{"Zambijas kvača"}
other{"Zambijas kvačas"}
zero{"Zambijas kvačas"}
@@ -1666,5 +1675,5 @@
other{"{0} {1}"}
zero{"{0} {1}"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/mas.txt b/data/curr/mas.txt
index 18c646c..b2355a5 100755
--- a/data/curr/mas.txt
+++ b/data/curr/mas.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mas.xml
// *
@@ -96,7 +96,7 @@
"Iropiyianí e Gine",
}
INR{
- "₹",
+ "Rs.",
"Iropiyianí e India",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Iropiyianí e Sambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Iropiyianí e Sambia",
}
ZWD{
@@ -228,5 +232,5 @@
"Iropiyianí e Simbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/mas_TZ.txt b/data/curr/mas_TZ.txt
index cad1335..d6f4695 100755
--- a/data/curr/mas_TZ.txt
+++ b/data/curr/mas_TZ.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mas_TZ.xml
// *
@@ -13,5 +13,5 @@
"Iropiyianí e Tanzania",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/mer.txt b/data/curr/mer.txt
index fbece88..c7899d5 100755
--- a/data/curr/mer.txt
+++ b/data/curr/mer.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mer.xml
// *
@@ -96,7 +96,7 @@
"Faranga ya Gine",
}
INR{
- "₹",
+ "Rs.",
"Rupia ya India",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Kwacha ya Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha ya Zambia",
}
ZWD{
@@ -228,5 +232,5 @@
"Dola ya Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/mfe.txt b/data/curr/mfe.txt
index f56453e..e5913c5 100755
--- a/data/curr/mfe.txt
+++ b/data/curr/mfe.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mfe.xml
// *
@@ -96,7 +96,7 @@
"fran gineen",
}
INR{
- "₹",
+ "Rs.",
"roupi",
}
JPY{
@@ -136,7 +136,7 @@
"ouguiya moritanien",
}
MUR{
- "MUR",
+ "Rs",
"roupi morisien",
}
MWK{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "kwacha zanbien (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"kwacha zanbien",
}
ZWD{
@@ -232,5 +236,5 @@
"dolar zimbawe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/mg.txt b/data/curr/mg.txt
index bacac32..53f36d5 100755
--- a/data/curr/mg.txt
+++ b/data/curr/mg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mg.xml
// *
@@ -96,7 +96,7 @@
"Farantsa Gineanina",
}
INR{
- "₹",
+ "Rs.",
"Ropia Indianina",
}
JPY{
@@ -128,7 +128,7 @@
"Dirham marokianina",
}
MGA{
- "MGA",
+ "Ar",
"Ariary",
}
MRO{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Kwacha zambianina (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha zambianina",
}
ZWD{
@@ -232,5 +236,5 @@
"Dôlara Zimbaboeanina",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/mgh.txt b/data/curr/mgh.txt
index 4199629..bce9772 100755
--- a/data/curr/mgh.txt
+++ b/data/curr/mgh.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mgh.xml
// *
@@ -16,5 +16,5 @@
"MZN",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/mgo.txt b/data/curr/mgo.txt
index 4a7d01c..8beb9d6 100755
--- a/data/curr/mgo.txt
+++ b/data/curr/mgo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mgo.xml
// *
@@ -21,7 +21,8 @@
}
}
CurrencyUnitPatterns{
+ one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.77.53"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/mk.txt b/data/curr/mk.txt
index a644152..396579c 100644
--- a/data/curr/mk.txt
+++ b/data/curr/mk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mk.xml
// *
@@ -348,7 +348,7 @@
"Израелски нов шекел",
}
INR{
- "₹",
+ "Rs.",
"Индијска рупија",
}
IQD{
@@ -476,7 +476,7 @@
"Малагасиски ариари",
}
MKD{
- "MKD",
+ "ден",
"Македонски денар",
}
MLF{
@@ -877,6 +877,10 @@
}
ZMK{
"ZMK",
+ "Замбијска квача (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Замбијска квача",
}
ZRN{
@@ -1067,7 +1071,8 @@
}
}
CurrencyUnitPatterns{
+ one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ml.txt b/data/curr/ml.txt
index 5a89c3a..70829c5 100644
--- a/data/curr/ml.txt
+++ b/data/curr/ml.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ml.xml
// *
@@ -456,7 +456,7 @@
"ഇസ്രായേലി ഷക്കേൽ",
}
INR{
- "₹",
+ "Rs.",
"ഇന്ത്യൻ രൂപ",
}
IQD{
@@ -1085,6 +1085,10 @@
}
ZMK{
"ZMK",
+ "സാംബിയൻ ക്വാച (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"സാംബിയൻ ക്വാച",
}
ZRN{
@@ -1922,6 +1926,10 @@
other{"ദക്ഷിണാഫ്രിക്കൻ റാൻഡ്സ്"}
}
ZMK{
+ one{"സാംബിയൻ ക്വാച (1968-2012)"}
+ other{"സാംബിയൻ ക്വാചാസ് (1968-2012)"}
+ }
+ ZMW{
one{"സാംബിയൻ ക്വാച"}
other{"സാംബിയൻ ക്വാചാസ്"}
}
@@ -1942,5 +1950,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/mn.txt b/data/curr/mn.txt
new file mode 100755
index 0000000..e787973
--- /dev/null
+++ b/data/curr/mn.txt
@@ -0,0 +1,1286 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/mn.xml
+// *
+// ***************************************************************************
+/**
+ * ICU <specials> source: <path>/xml/main/mn.xml
+ */
+mn{
+ Currencies{
+ AED{
+ "AED",
+ "Арабын Нэгдсэн Эмиратын дирхам",
+ }
+ AFN{
+ "AFN",
+ "Афганистаний афгани",
+ }
+ ALL{
+ "ALL",
+ "Албани лек",
+ }
+ AMD{
+ "AMD",
+ "Армени драм",
+ }
+ ANG{
+ "ANG",
+ "Нидерланд Антиллъя гулден",
+ }
+ AOA{
+ "AOA",
+ "Ангол кванза",
+ }
+ ARS{
+ "ARS",
+ "Аргентин песо",
+ }
+ AUD{
+ "A$",
+ "Австралийн доллар",
+ }
+ AWG{
+ "AWG",
+ "Аруба флорин",
+ }
+ AZN{
+ "AZN",
+ "Азербайжан манат",
+ }
+ BAM{
+ "BAM",
+ "Босни-Герцеговин хөрвөгч марк",
+ }
+ BBD{
+ "BBD",
+ "Барбадос доллар",
+ }
+ BDT{
+ "BDT",
+ "Бангладеш така",
+ }
+ BGN{
+ "BGN",
+ "Болгар лев",
+ }
+ BHD{
+ "BHD",
+ "Бахрейн динар",
+ }
+ BIF{
+ "BIF",
+ "Бурунд франк",
+ }
+ BMD{
+ "BMD",
+ "Бермудын доллар",
+ }
+ BND{
+ "BND",
+ "Бруней доллар",
+ }
+ BOB{
+ "BOB",
+ "Боливи боливиано",
+ }
+ BRL{
+ "R$",
+ "Бразилийн рил",
+ }
+ BSD{
+ "BSD",
+ "Багам доллар",
+ }
+ BTN{
+ "BTN",
+ "Бутан нгултрум",
+ }
+ BWP{
+ "BWP",
+ "Ботсвани пула",
+ }
+ BYR{
+ "BYR",
+ "Беларус рубль",
+ }
+ BZD{
+ "BZD",
+ "Белиз доллар",
+ }
+ CAD{
+ "CA$",
+ "Канад доллар",
+ }
+ CDF{
+ "CDF",
+ "Конго франк",
+ }
+ CHF{
+ "CHF",
+ "Швейцар франк",
+ }
+ CLP{
+ "CLP",
+ "Чили песо",
+ }
+ CNY{
+ "CN¥",
+ "Хятад юань",
+ }
+ COP{
+ "COP",
+ "Колумбын песо",
+ }
+ CRC{
+ "CRC",
+ "Коста Рика колон",
+ }
+ CUC{
+ "CUC",
+ "Куба хөрвөгч песо",
+ }
+ CUP{
+ "CUP",
+ "Куба песо",
+ }
+ CVE{
+ "CVE",
+ "Кабо-Верде эскудо",
+ }
+ CZK{
+ "CZK",
+ "Чех коруна",
+ }
+ DJF{
+ "DJF",
+ "Жибоути франк",
+ }
+ DKK{
+ "DKK",
+ "Данийн крон",
+ }
+ DOP{
+ "DOP",
+ "Доминикан песо",
+ }
+ DZD{
+ "DZD",
+ "Алжир доллар",
+ }
+ EGP{
+ "EGP",
+ "Египет паунд",
+ }
+ ERN{
+ "ERN",
+ "Эритрей накфа",
+ }
+ ETB{
+ "ETB",
+ "Этиоп бирр",
+ }
+ EUR{
+ "€",
+ "Евро",
+ }
+ FJD{
+ "FJD",
+ "Фижи доллар",
+ }
+ FKP{
+ "FKP",
+ "Фолклэнд Арлууд паунд",
+ }
+ GBP{
+ "£",
+ "Англи фунт стерлинг",
+ }
+ GEL{
+ "GEL",
+ "Гүрж лари",
+ }
+ GHS{
+ "GHS",
+ "Гана седи",
+ }
+ GIP{
+ "GIP",
+ "Гибралтар паунд",
+ }
+ GMD{
+ "GMD",
+ "Гамби даласи",
+ }
+ GNF{
+ "GNF",
+ "Гвиней франк",
+ }
+ GTQ{
+ "GTQ",
+ "Гватемал кецал",
+ }
+ GYD{
+ "GYD",
+ "Гайана доллар",
+ }
+ HKD{
+ "HK$",
+ "Хонгконг доллар",
+ }
+ HNL{
+ "HNL",
+ "Гондурас лемпира",
+ }
+ HRK{
+ "HRK",
+ "Хорватын куна",
+ }
+ HTG{
+ "HTG",
+ "Гайти гоурде",
+ }
+ HUF{
+ "HUF",
+ "Унгар форинт",
+ }
+ IDR{
+ "IDR",
+ "Индонези рупи",
+ }
+ ILS{
+ "₪",
+ "Израиль шинэ шекел",
+ }
+ INR{
+ "Rs.",
+ "Энэтхэг рупи",
+ }
+ IQD{
+ "IQD",
+ "Ирак динар",
+ }
+ IRR{
+ "IRR",
+ "Иран риал",
+ }
+ ISK{
+ "ISK",
+ "Исланд крона",
+ }
+ JMD{
+ "JMD",
+ "Ямайк доллар",
+ }
+ JOD{
+ "JOD",
+ "Йордан динар",
+ }
+ JPY{
+ "JP¥",
+ "Япон иен",
+ }
+ KES{
+ "KES",
+ "Кени шиллинг",
+ }
+ KGS{
+ "KGS",
+ "Кыргыз сом",
+ }
+ KHR{
+ "KHR",
+ "Камбож риел",
+ }
+ KMF{
+ "KMF",
+ "Комор франк",
+ }
+ KPW{
+ "KPW",
+ "Хойд Солонгос вон",
+ }
+ KRW{
+ "₩",
+ "Өмнөд Солонгос вон",
+ }
+ KWD{
+ "KWD",
+ "Кувейт динар",
+ }
+ KYD{
+ "KYD",
+ "Кайманы Арлууд доллар",
+ }
+ KZT{
+ "KZT",
+ "Казах тэнгэ",
+ }
+ LAK{
+ "LAK",
+ "Лао кип",
+ }
+ LBP{
+ "LBP",
+ "Ливан паунд",
+ }
+ LKR{
+ "LKR",
+ "Шри-Ланк рупи",
+ }
+ LRD{
+ "LRD",
+ "Либери доллар",
+ }
+ LTL{
+ "LTL",
+ "Литва литас",
+ }
+ LVL{
+ "LVL",
+ "Латви лац",
+ }
+ LYD{
+ "LYD",
+ "Ливи доллар",
+ }
+ MAD{
+ "MAD",
+ "Марокко дирхам",
+ }
+ MDL{
+ "MDL",
+ "Молдав леу",
+ }
+ MGA{
+ "MGA",
+ "Малайн ариари",
+ }
+ MKD{
+ "MKD",
+ "Македони денар",
+ }
+ MMK{
+ "MMK",
+ "Мьянмар киат",
+ }
+ MNT{
+ "₮",
+ "Төгрөг",
+ }
+ MOP{
+ "MOP",
+ "Макао патака",
+ }
+ MRO{
+ "MRO",
+ "Мавритан угия",
+ }
+ MUR{
+ "MUR",
+ "Мавритын рупи",
+ }
+ MVR{
+ "MVR",
+ "Мальдив руфия",
+ }
+ MWK{
+ "MWK",
+ "Малави квача",
+ }
+ MXN{
+ "MX$",
+ "Мексик песо",
+ }
+ MYR{
+ "MYR",
+ "Малайз ринггит",
+ }
+ MZN{
+ "MZN",
+ "Мозамбик метикал",
+ }
+ NAD{
+ "NAD",
+ "Намиби доллар",
+ }
+ NGN{
+ "NGN",
+ "Нигери найра",
+ }
+ NIO{
+ "NIO",
+ "Никарагуа кордоба",
+ }
+ NOK{
+ "NOK",
+ "Норвеги кроне",
+ }
+ NPR{
+ "NPR",
+ "Балба рупи",
+ }
+ NZD{
+ "NZ$",
+ "Шинэ Зеланд доллар",
+ }
+ OMR{
+ "OMR",
+ "Омани риал",
+ }
+ PAB{
+ "PAB",
+ "Панам бальбоа",
+ }
+ PEN{
+ "PEN",
+ "Перу шинэ соль",
+ }
+ PGK{
+ "PGK",
+ "Папуа-Шинэ Гвиней кина",
+ }
+ PHP{
+ "PHP",
+ "Филиппин песо",
+ }
+ PKR{
+ "PKR",
+ "Пакистан рупи",
+ }
+ PLN{
+ "PLN",
+ "Польш злот",
+ }
+ PYG{
+ "PYG",
+ "Парагвай гуарани",
+ }
+ QAR{
+ "QAR",
+ "Катар риал",
+ }
+ RON{
+ "RON",
+ "Румын леу",
+ }
+ RSD{
+ "RSD",
+ "Серб динар",
+ }
+ RUB{
+ "RUB",
+ "Орос рубль",
+ }
+ RWF{
+ "RWF",
+ "Руанд франк",
+ }
+ SAR{
+ "SAR",
+ "Саудын риял",
+ }
+ SBD{
+ "SBD",
+ "Соломоны арлуудын доллар",
+ }
+ SCR{
+ "SCR",
+ "Сейшел рупи",
+ }
+ SDG{
+ "SDG",
+ "Судан паунд",
+ }
+ SEK{
+ "SEK",
+ "Швед крона",
+ }
+ SGD{
+ "SGD",
+ "Сингапур доллар",
+ }
+ SHP{
+ "SHP",
+ "Сент Хелена паунд",
+ }
+ SLL{
+ "SLL",
+ "Сьерра Леоне леоне",
+ }
+ SOS{
+ "SOS",
+ "Сомали шиллинг",
+ }
+ SRD{
+ "SRD",
+ "Суринам доллар",
+ }
+ SSP{
+ "SSP",
+ "Өмнөд Судан паунд",
+ }
+ STD{
+ "STD",
+ "Сан-Томе ба Принсипи добра",
+ }
+ SYP{
+ "SYP",
+ "Сири паунд",
+ }
+ SZL{
+ "SZL",
+ "Свазиланд лилангени",
+ }
+ THB{
+ "฿",
+ "Тай бат",
+ }
+ TJS{
+ "TJS",
+ "Тажик сом",
+ }
+ TMT{
+ "TMT",
+ "Туркмен манат",
+ }
+ TND{
+ "TND",
+ "Тунис доллар",
+ }
+ TOP{
+ "TOP",
+ "Тонга панга",
+ }
+ TRY{
+ "TRY",
+ "Туркийн лира",
+ }
+ TTD{
+ "TTD",
+ "Тринидад ба Тобаго доллар",
+ }
+ TWD{
+ "TWD",
+ "Шинэ Тайван доллар",
+ }
+ TZS{
+ "TZS",
+ "Танзани шиллинг",
+ }
+ UAH{
+ "UAH",
+ "Украйн гривня",
+ }
+ UGX{
+ "UGX",
+ "Уганд шиллинг",
+ }
+ USD{
+ "$",
+ "Америк доллар",
+ }
+ UYU{
+ "UYU",
+ "Уругвай песо",
+ }
+ UZS{
+ "UZS",
+ "Узбек сом",
+ }
+ VEF{
+ "VEF",
+ "Венесуэл боливар",
+ }
+ VND{
+ "₫",
+ "Вьетнам донг",
+ }
+ VUV{
+ "VUV",
+ "Вануату вату",
+ }
+ WST{
+ "WST",
+ "Самоа тала",
+ }
+ XAF{
+ "FCFA",
+ "Франк КФА BEAC",
+ }
+ XCD{
+ "EC$",
+ "Зүүн Карибийн доллар",
+ }
+ XOF{
+ "CFA",
+ "Франк КФА BCЕАО",
+ }
+ XPF{
+ "CFPF",
+ "Франц Номхон далайн франк",
+ }
+ XXX{
+ "XXX",
+ "Тодорхойгүй мөнгөн тэмдэгт",
+ }
+ YER{
+ "YER",
+ "Йемен риал",
+ }
+ ZAR{
+ "ZAR",
+ "Өмнөд Африкийн ранд",
+ }
+ ZMK{
+ "ZMK",
+ "Замби квача (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
+ "Замби квача",
+ }
+ }
+ CurrencyPlurals{
+ AED{
+ one{"Арабын Нэгдсэн Эмиратын дирхам"}
+ other{"Арабын Нэгдсэн Эмиратын дирхам"}
+ }
+ AFN{
+ one{"афганистаний афгани"}
+ other{"афганистаний афгани"}
+ }
+ ALL{
+ one{"албани лек"}
+ other{"албани лек"}
+ }
+ AMD{
+ one{"армени драм"}
+ other{"армени драм"}
+ }
+ ANG{
+ one{"Нидерланд Антиллъя гулден"}
+ other{"Нидерланд Антиллъя гулден"}
+ }
+ AOA{
+ one{"ангол кванза"}
+ other{"ангол кванза"}
+ }
+ ARS{
+ one{"аргентин песо"}
+ other{"аргентин песо"}
+ }
+ AUD{
+ one{"австралийн доллар"}
+ other{"австралийн доллар"}
+ }
+ AWG{
+ one{"аруба флорин"}
+ other{"аруба флорин"}
+ }
+ AZN{
+ one{"азербайжан манат"}
+ other{"азербайжан манат"}
+ }
+ BAM{
+ one{"Босни-Герцеговин хөрвөгч марк"}
+ other{"Босни-Герцеговин хөрвөгч марк"}
+ }
+ BBD{
+ one{"барбадос доллар"}
+ other{"барбадос доллар"}
+ }
+ BDT{
+ one{"бангладеш така"}
+ other{"бангладеш така"}
+ }
+ BGN{
+ one{"болгар лев"}
+ other{"болгар лев"}
+ }
+ BHD{
+ one{"бахрейн динар"}
+ other{"бахрейн динар"}
+ }
+ BIF{
+ one{"бурунд франк"}
+ other{"бурунд франк"}
+ }
+ BMD{
+ one{"бермудын доллар"}
+ other{"бермудын доллар"}
+ }
+ BND{
+ one{"бруней доллар"}
+ other{"бруней доллар"}
+ }
+ BOB{
+ one{"боливи боливиано"}
+ other{"боливи боливиано"}
+ }
+ BRL{
+ one{"бразилийн рил"}
+ other{"бразилийн рил"}
+ }
+ BSD{
+ one{"багам доллар"}
+ other{"багам доллар"}
+ }
+ BTN{
+ one{"бутан нгултрум"}
+ other{"бутан нгултрум"}
+ }
+ BWP{
+ one{"Ботсвани пула"}
+ other{"Ботсвани пула"}
+ }
+ BYR{
+ one{"беларус рубль"}
+ other{"беларус рубль"}
+ }
+ BZD{
+ one{"белиз доллар"}
+ other{"белиз доллар"}
+ }
+ CAD{
+ one{"канад доллар"}
+ other{"канад доллар"}
+ }
+ CDF{
+ one{"конго франк"}
+ other{"конго франк"}
+ }
+ CHF{
+ one{"Швейцар франк"}
+ other{"Швейцар франк"}
+ }
+ CLP{
+ one{"чили песо"}
+ other{"чили песо"}
+ }
+ CNY{
+ one{"хятад юань"}
+ other{"хятад юань"}
+ }
+ COP{
+ one{"колумбын песо"}
+ other{"колумбын песо"}
+ }
+ CRC{
+ one{"коста рика колон"}
+ other{"коста рика колон"}
+ }
+ CUC{
+ one{"куба хөрвөгч песо"}
+ other{"куба хөрвөгч песо"}
+ }
+ CUP{
+ one{"куба песо"}
+ other{"куба песо"}
+ }
+ CVE{
+ one{"кабо-верде эскудо"}
+ other{"кабо-верде эскудо"}
+ }
+ CZK{
+ one{"чех коруна"}
+ other{"чех коруна"}
+ }
+ DJF{
+ one{"жибоути франк"}
+ other{"жибоути франк"}
+ }
+ DKK{
+ one{"Данийн крон"}
+ other{"Данийн крон"}
+ }
+ DOP{
+ one{"доминикан песо"}
+ other{"доминикан песо"}
+ }
+ DZD{
+ one{"алжир доллар"}
+ other{"алжир доллар"}
+ }
+ EGP{
+ one{"египет паунд"}
+ other{"египет паунд"}
+ }
+ ERN{
+ one{"эритрей накфа"}
+ other{"эритрей накфа"}
+ }
+ ETB{
+ one{"этиоп бирр"}
+ other{"этиоп бирр"}
+ }
+ EUR{
+ one{"евро"}
+ other{"евро"}
+ }
+ FJD{
+ one{"Фижи доллар"}
+ other{"Фижи доллар"}
+ }
+ FKP{
+ one{"фолклэнд арлууд паунд"}
+ other{"фолклэнд арлууд паунд"}
+ }
+ GBP{
+ one{"англи фунт стерлинг"}
+ other{"англи фунт стерлинг"}
+ }
+ GEL{
+ one{"гүрж лари"}
+ other{"гүрж лари"}
+ }
+ GHS{
+ one{"гана седи"}
+ other{"гана седи"}
+ }
+ GIP{
+ one{"гибралтар паунд"}
+ other{"гибралтар паунд"}
+ }
+ GMD{
+ one{"гамби даласи"}
+ other{"гамби даласи"}
+ }
+ GNF{
+ one{"гвиней франк"}
+ other{"гвиней франк"}
+ }
+ GTQ{
+ one{"гватемал кецал"}
+ other{"гватемал кецал"}
+ }
+ GYD{
+ one{"гайана доллар"}
+ other{"гайана доллар"}
+ }
+ HKD{
+ one{"Хонгконг доллар"}
+ other{"Хонгконг доллар"}
+ }
+ HNL{
+ one{"гондурас лемпира"}
+ other{"гондурас лемпира"}
+ }
+ HRK{
+ one{"Хорватын куна"}
+ other{"Хорватын куна"}
+ }
+ HTG{
+ one{"гайти гоурде"}
+ other{"гайти гоурде"}
+ }
+ HUF{
+ one{"унгар форинт"}
+ other{"унгар форинт"}
+ }
+ IDR{
+ one{"индонези рупи"}
+ other{"индонези рупи"}
+ }
+ ILS{
+ one{"израиль шинэ шекел"}
+ other{"израиль шинэ шекел"}
+ }
+ INR{
+ one{"энэтхэг рупи"}
+ other{"энэтхэг рупи"}
+ }
+ IQD{
+ one{"ирак динар"}
+ other{"ирак динар"}
+ }
+ IRR{
+ one{"иран риал"}
+ other{"иран риал"}
+ }
+ ISK{
+ one{"Исланд крона"}
+ other{"Исланд крона"}
+ }
+ JMD{
+ one{"ямайк доллар"}
+ other{"Ямайк доллар"}
+ }
+ JOD{
+ one{"йордан динар"}
+ other{"йордан динар"}
+ }
+ JPY{
+ one{"япон иен"}
+ other{"япон иен"}
+ }
+ KES{
+ one{"кени шиллинг"}
+ other{"Кени шиллинг"}
+ }
+ KGS{
+ one{"кыргыз сом"}
+ other{"кыргыз сом"}
+ }
+ KHR{
+ one{"камбож риел"}
+ other{"камбож риел"}
+ }
+ KMF{
+ one{"комор франк"}
+ other{"комор франк"}
+ }
+ KPW{
+ one{"хойд солонгос вон"}
+ other{"хойд солонгос вон"}
+ }
+ KRW{
+ one{"өмнөд солонгос вон"}
+ other{"өмнөд солонгос вон"}
+ }
+ KWD{
+ one{"кувейт динар"}
+ other{"кувейт динар"}
+ }
+ KYD{
+ one{"кайманы арлууд доллар"}
+ other{"кайманы арлууд доллар"}
+ }
+ KZT{
+ one{"казах тэнгэ"}
+ other{"казах тэнгэ"}
+ }
+ LAK{
+ one{"лао кип"}
+ other{"лао кип"}
+ }
+ LBP{
+ one{"ливан паунд"}
+ other{"ливан паунд"}
+ }
+ LKR{
+ one{"шри-ланк рупи"}
+ other{"шри-ланк рупи"}
+ }
+ LRD{
+ one{"либери доллар"}
+ other{"либери доллар"}
+ }
+ LTL{
+ one{"Литва литас"}
+ other{"Литва литас"}
+ }
+ LVL{
+ one{"Латви лац"}
+ other{"Латви лац"}
+ }
+ LYD{
+ one{"ливи доллар"}
+ other{"ливи доллар"}
+ }
+ MAD{
+ one{"марокко дирхам"}
+ other{"марокко дирхам"}
+ }
+ MDL{
+ one{"молдав леу"}
+ other{"молдав леу"}
+ }
+ MGA{
+ one{"малайн ариари"}
+ other{"малайн ариари"}
+ }
+ MKD{
+ one{"македони денар"}
+ other{"македони денар"}
+ }
+ MMK{
+ one{"мьянмар киат"}
+ other{"мьянмар киат"}
+ }
+ MNT{
+ one{"төгрөг"}
+ other{"төгрөг"}
+ }
+ MOP{
+ one{"макао патака"}
+ other{"макао патака"}
+ }
+ MRO{
+ one{"мавритан угия"}
+ other{"мавритан угия"}
+ }
+ MUR{
+ one{"мавритын рупи"}
+ other{"мавритын рупи"}
+ }
+ MVR{
+ one{"мальдив руфия"}
+ other{"мальдив руфия"}
+ }
+ MWK{
+ one{"малави квача"}
+ other{"Малави квача"}
+ }
+ MXN{
+ one{"мексик песо"}
+ other{"мексик песо"}
+ }
+ MYR{
+ one{"малайз ринггит"}
+ other{"малайз ринггит"}
+ }
+ MZN{
+ one{"мозамбик метикал"}
+ other{"мозамбик метикал"}
+ }
+ NAD{
+ one{"Намиби доллар"}
+ other{"Намиби доллар"}
+ }
+ NGN{
+ one{"нигери найра"}
+ other{"нигери найра"}
+ }
+ NIO{
+ one{"никарагуа кордоба"}
+ other{"никарагуа кордоба"}
+ }
+ NOK{
+ one{"норвеги кроне"}
+ other{"норвеги кроне"}
+ }
+ NPR{
+ one{"балба рупи"}
+ other{"балба рупи"}
+ }
+ NZD{
+ one{"Шинэ Зеланд доллар"}
+ other{"Шинэ Зеланд доллар"}
+ }
+ OMR{
+ one{"омани риал"}
+ other{"омани риал"}
+ }
+ PAB{
+ one{"панам бальбоа"}
+ other{"панам бальбоа"}
+ }
+ PEN{
+ one{"перу шинэ соль"}
+ other{"перу шинэ соль"}
+ }
+ PGK{
+ one{"Папуа-Шинэ Гвиней кина"}
+ other{"Папуа-Шинэ Гвиней кина"}
+ }
+ PHP{
+ one{"филиппин песо"}
+ other{"филиппин песо"}
+ }
+ PKR{
+ one{"пакистан рупи"}
+ other{"пакистан рупи"}
+ }
+ PLN{
+ one{"польш злот"}
+ other{"польш злот"}
+ }
+ PYG{
+ one{"парагвай гуарани"}
+ other{"парагвай гуарани"}
+ }
+ QAR{
+ one{"катар риал"}
+ other{"катар риал"}
+ }
+ RON{
+ one{"румын леу"}
+ other{"румын леу"}
+ }
+ RSD{
+ one{"серб динар"}
+ other{"серб динар"}
+ }
+ RUB{
+ one{"орос рубль"}
+ other{"орос рубль"}
+ }
+ RWF{
+ one{"руанд франк"}
+ other{"руанд франк"}
+ }
+ SAR{
+ one{"саудын риял"}
+ other{"саудын риял"}
+ }
+ SBD{
+ one{"соломоны арлуудын доллар"}
+ other{"соломоны арлуудын доллар"}
+ }
+ SCR{
+ one{"сейшел рупи"}
+ other{"сейшел рупи"}
+ }
+ SDG{
+ one{"судан паунд"}
+ other{"судан паунд"}
+ }
+ SEK{
+ one{"швед крона"}
+ other{"швед крона"}
+ }
+ SGD{
+ one{"сингапур доллар"}
+ other{"сингапур доллар"}
+ }
+ SHP{
+ one{"сент хелена паунд"}
+ other{"сент хелена паунд"}
+ }
+ SLL{
+ one{"сьерра леоне леоне"}
+ other{"сьерра леоне леоне"}
+ }
+ SOS{
+ one{"сомали шиллинг"}
+ other{"сомали шиллинг"}
+ }
+ SRD{
+ one{"суринам доллар"}
+ other{"суринам доллар"}
+ }
+ SSP{
+ one{"өмнөд судан паунд"}
+ other{"өмнөд судан паунд"}
+ }
+ STD{
+ one{"сан-томе ба принсипи добра"}
+ other{"сан-томе ба принсипи добра"}
+ }
+ SYP{
+ one{"сири паунд"}
+ other{"сири паунд"}
+ }
+ SZL{
+ one{"Свазиланд лилангени"}
+ other{"Свазиланд лилангени"}
+ }
+ THB{
+ one{"тай бат"}
+ other{"тай бат"}
+ }
+ TJS{
+ one{"тажик сом"}
+ other{"тажик сом"}
+ }
+ TMT{
+ one{"туркмен манат"}
+ other{"туркмен манат"}
+ }
+ TND{
+ one{"тунис доллар"}
+ other{"тунис доллар"}
+ }
+ TOP{
+ one{"тонга панга"}
+ other{"тонга панга"}
+ }
+ TRY{
+ one{"Туркийн лира"}
+ other{"Туркийн лира"}
+ }
+ TTD{
+ one{"тринидад ба тобаго доллар"}
+ other{"тринидад ба тобаго доллар"}
+ }
+ TWD{
+ one{"Шинэ Тайван доллар"}
+ other{"Шинэ Тайван доллар"}
+ }
+ TZS{
+ one{"танзани шиллинг"}
+ other{"танзани шиллинг"}
+ }
+ UAH{
+ one{"украйн гривня"}
+ other{"украйн гривня"}
+ }
+ UGX{
+ one{"Уганд шиллинг"}
+ other{"Уганд шиллинг"}
+ }
+ USD{
+ one{"америк доллар"}
+ other{"америк доллар"}
+ }
+ UYU{
+ one{"уругвай песо"}
+ other{"уругвай песо"}
+ }
+ UZS{
+ one{"узбек сом"}
+ other{"узбек сом"}
+ }
+ VEF{
+ one{"венесуэл боливар"}
+ other{"венесуэл боливар"}
+ }
+ VND{
+ one{"вьетнам донг"}
+ other{"вьетнам донг"}
+ }
+ VUV{
+ one{"вануату вату"}
+ other{"вануату вату"}
+ }
+ WST{
+ one{"самоа тала"}
+ other{"самоа тала"}
+ }
+ XAF{
+ one{"франк КФА BEAC"}
+ other{"франк КФА BEAC"}
+ }
+ XCD{
+ one{"зүүн карибийн доллар"}
+ other{"зүүн карибийн доллар"}
+ }
+ XOF{
+ one{"франк КФА BCЕАО"}
+ other{"франк КФА BCЕАО"}
+ }
+ XPF{
+ one{"Франц Номхон далайн франк"}
+ other{"Франц Номхон далайн франк"}
+ }
+ XXX{
+ one{"(тодорхойгүй мөнгөн тэмдэгтийн нэгж)"}
+ other{"(тодорхойгүй мөнгөн тэмдэгт)"}
+ }
+ YER{
+ one{"йемен риал"}
+ other{"йемен риал"}
+ }
+ ZAR{
+ one{"Өмнөд Африкийн ранд"}
+ other{"Өмнөд Африкийн ранд"}
+ }
+ ZMK{
+ one{"Замби квача (1968-2012)"}
+ other{"Замби квача (1968-2012)"}
+ }
+ ZMW{
+ one{"Замби квача"}
+ other{"Замби квача"}
+ }
+ }
+ CurrencyUnitPatterns{
+ one{"{0} {1}"}
+ other{"{0} {1}"}
+ }
+ Version{"2.0.82.51"}
+}
diff --git a/data/curr/mn_Cyrl.txt b/data/curr/mn_Cyrl.txt
new file mode 100755
index 0000000..55d4dd3
--- /dev/null
+++ b/data/curr/mn_Cyrl.txt
@@ -0,0 +1,14 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/mn_Cyrl.xml
+// *
+// ***************************************************************************
+/**
+ * ICU <specials> source: <path>/xml/main/mn_Cyrl.xml
+ */
+mn_Cyrl{
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/shi_Latn_MA.txt b/data/curr/mn_Cyrl_MN.txt
similarity index 86%
rename from data/curr/shi_Latn_MA.txt
rename to data/curr/mn_Cyrl_MN.txt
index cd7fd64..5d61306 100755
--- a/data/curr/shi_Latn_MA.txt
+++ b/data/curr/mn_Cyrl_MN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* generated alias target
*/
-shi_Latn_MA{
+mn_Cyrl_MN{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/coll/hi__DIRECT.txt b/data/curr/mn_MN.txt
old mode 100644
new mode 100755
similarity index 73%
rename from data/coll/hi__DIRECT.txt
rename to data/curr/mn_MN.txt
index fd5973f..cf689b7
--- a/data/coll/hi__DIRECT.txt
+++ b/data/curr/mn_MN.txt
@@ -1,13 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
-hi__DIRECT{
- collations{
- default{"direct"}
- }
+mn_MN{
+ "%%ALIAS"{"mn_Cyrl_MN"}
}
diff --git a/data/curr/mo.txt b/data/curr/mo.txt
index ef3bdd7..55f72d2 100755
--- a/data/curr/mo.txt
+++ b/data/curr/mo.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/mr.txt b/data/curr/mr.txt
index ee3e801..cf012a7 100644
--- a/data/curr/mr.txt
+++ b/data/curr/mr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mr.xml
// *
@@ -256,7 +256,7 @@
"ईस्त्रायली न्यू शेकेल",
}
INR{
- "₹",
+ "Rs.",
"भारतीय रुपया",
}
IQD{
@@ -641,12 +641,12 @@
}
ZMK{
"ZMK",
+ "झांबियन क्वाचा (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"झांबियन क्वाचा",
}
}
- CurrencyUnitPatterns{
- one{"{0} {1}"}
- other{"{0} {1}"}
- }
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ms.txt b/data/curr/ms.txt
index e83179f..6048918 100644
--- a/data/curr/ms.txt
+++ b/data/curr/ms.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ms.xml
// *
@@ -256,7 +256,7 @@
"Sheqel Baru Israel",
}
INR{
- "₹",
+ "Rs.",
"Rupee India",
}
IQD{
@@ -641,11 +641,15 @@
}
ZMK{
"ZMK",
+ "Kwacha Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha Zambia",
}
}
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.78.20"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ms_BN.txt b/data/curr/ms_BN.txt
index abe1838..3f5c08a 100644
--- a/data/curr/ms_BN.txt
+++ b/data/curr/ms_BN.txt
@@ -1,17 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
-// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/common/main/ms_BN.xml
+// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
+// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
ms_BN{
- Currencies{
- BND{
- "$",
- "Dolar Brunei",
- }
- }
- Version{"2.0.74.65"}
+ "%%ALIAS"{"ms_Latn_BN"}
}
diff --git a/data/curr/ms_Latn.txt b/data/curr/ms_Latn.txt
new file mode 100644
index 0000000..62fa3e2
--- /dev/null
+++ b/data/curr/ms_Latn.txt
@@ -0,0 +1,14 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/ms_Latn.xml
+// *
+// ***************************************************************************
+/**
+ * ICU <specials> source: <path>/xml/main/ms_Latn.xml
+ */
+ms_Latn{
+ Version{"2.0.82.68"}
+}
diff --git a/data/curr/ms_Latn_BN.txt b/data/curr/ms_Latn_BN.txt
new file mode 100644
index 0000000..b0cce91
--- /dev/null
+++ b/data/curr/ms_Latn_BN.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/ms_Latn_BN.xml
+// *
+// ***************************************************************************
+ms_Latn_BN{
+ Currencies{
+ BND{
+ "$",
+ "Dolar Brunei",
+ }
+ }
+ Version{"2.0.82.68"}
+}
diff --git a/data/curr/shi_Latn_MA.txt b/data/curr/ms_Latn_MY.txt
old mode 100755
new mode 100644
similarity index 86%
copy from data/curr/shi_Latn_MA.txt
copy to data/curr/ms_Latn_MY.txt
index cd7fd64..dc26b90
--- a/data/curr/shi_Latn_MA.txt
+++ b/data/curr/ms_Latn_MY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* generated alias target
*/
-shi_Latn_MA{
+ms_Latn_MY{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/curr/ms_Latn_SG.txt b/data/curr/ms_Latn_SG.txt
new file mode 100644
index 0000000..fcb6f13
--- /dev/null
+++ b/data/curr/ms_Latn_SG.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/ms_Latn_SG.xml
+// *
+// ***************************************************************************
+ms_Latn_SG{
+ Currencies{
+ SGD{
+ "$",
+ "Dolar Singapura",
+ }
+ }
+ Version{"2.0.82.68"}
+}
diff --git a/data/coll/hi__DIRECT.txt b/data/curr/ms_MY.txt
similarity index 73%
copy from data/coll/hi__DIRECT.txt
copy to data/curr/ms_MY.txt
index fd5973f..c926ea92 100644
--- a/data/coll/hi__DIRECT.txt
+++ b/data/curr/ms_MY.txt
@@ -1,13 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
-hi__DIRECT{
- collations{
- default{"direct"}
- }
+ms_MY{
+ "%%ALIAS"{"ms_Latn_MY"}
}
diff --git a/data/coll/hi__DIRECT.txt b/data/curr/ms_SG.txt
similarity index 73%
copy from data/coll/hi__DIRECT.txt
copy to data/curr/ms_SG.txt
index fd5973f..841c737 100644
--- a/data/coll/hi__DIRECT.txt
+++ b/data/curr/ms_SG.txt
@@ -1,13 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
-hi__DIRECT{
- collations{
- default{"direct"}
- }
+ms_SG{
+ "%%ALIAS"{"ms_Latn_SG"}
}
diff --git a/data/curr/mt.txt b/data/curr/mt.txt
index 9da1920..d053039 100644
--- a/data/curr/mt.txt
+++ b/data/curr/mt.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mt.xml
// *
@@ -32,5 +32,5 @@
other{"Munita Mhux Magħruf jew Mhux Validu"}
}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/mua.txt b/data/curr/mua.txt
index ddcc505..87f0a99 100755
--- a/data/curr/mua.txt
+++ b/data/curr/mua.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mua.xml
// *
@@ -96,7 +96,7 @@
"solai Guine",
}
INR{
- "₹",
+ "Rs.",
"solai India",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Solai Zambiya (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Solai Zambiya",
}
ZWD{
@@ -232,5 +236,5 @@
"Solai Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/my.txt b/data/curr/my.txt
index a563c01..5ac983b 100644
--- a/data/curr/my.txt
+++ b/data/curr/my.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/my.xml
// *
@@ -152,7 +152,7 @@
"အစ္စရေး ပေါင်",
}
INR{
- "₹",
+ "Rs.",
"အိန္ဒြိယ ရူပီး",
}
JMD{
@@ -328,5 +328,5 @@
"ဇင်ဘာဘွေ ဒေါ်လာ",
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/naq.txt b/data/curr/naq.txt
index 83c02d9..eea0a31 100755
--- a/data/curr/naq.txt
+++ b/data/curr/naq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/naq.xml
// *
@@ -96,7 +96,7 @@
"Guinea Franc",
}
INR{
- "₹",
+ "Rs.",
"Indian Rupee",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Zambian Kwachab (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambian Kwachab",
}
ZWD{
@@ -232,5 +236,5 @@
"Zimbabwe Dollari",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/nb.txt b/data/curr/nb.txt
index a8bab56..a9667a8 100644
--- a/data/curr/nb.txt
+++ b/data/curr/nb.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nb.xml
// *
@@ -460,7 +460,7 @@
"israelske nye shekler",
}
INR{
- "₹",
+ "Rs.",
"indiske rupier",
}
IQD{
@@ -1089,6 +1089,10 @@
}
ZMK{
"ZMK",
+ "zambiske kwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"zambiske kwacha",
}
ZRN{
@@ -2174,6 +2178,10 @@
other{"sørafrikanske rand"}
}
ZMK{
+ one{"zambisk kwacha (1968-2012)"}
+ other{"zambiske kwacha (1968-2012)"}
+ }
+ ZMW{
one{"zambisk kwacha"}
other{"zambiske kwacha"}
}
@@ -2202,5 +2210,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
}
diff --git a/data/curr/nb_NO.txt b/data/curr/nb_NO.txt
index a1437d3..db840a9 100644
--- a/data/curr/nb_NO.txt
+++ b/data/curr/nb_NO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/nd.txt b/data/curr/nd.txt
index e5cc008..0fa3610 100755
--- a/data/curr/nd.txt
+++ b/data/curr/nd.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nd.xml
// *
@@ -96,7 +96,7 @@
"Fulenki yase Gine",
}
INR{
- "₹",
+ "Rs.",
"Rupi yase Indiya",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Kwacha yase Zambiya (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha yase Zambiya",
}
ZWD{
@@ -232,5 +236,5 @@
"Dola yase Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ne.txt b/data/curr/ne.txt
index baa0de4..303aa4f 100644
--- a/data/curr/ne.txt
+++ b/data/curr/ne.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ne.xml
// *
@@ -256,7 +256,7 @@
"इजरायली नयाँ शेकेल",
}
INR{
- "₹",
+ "Rs.",
"भारती रूपिँया",
}
IQD{
@@ -633,6 +633,10 @@
}
ZMK{
"ZMK",
+ "जाम्बियाली क्वाचा (१९६८-२०१२)",
+ }
+ ZMW{
+ "ZMW",
"जाम्बियाली क्वाचा",
}
}
@@ -1210,9 +1214,13 @@
other{"दक्षिण अफ्रिकी र्यान्ड"}
}
ZMK{
+ one{"जाम्बियाली क्वाचा (१९६८-२०१२)"}
+ other{"जाम्बियाली क्वाचाहरू (१९६८-२०१२)"}
+ }
+ ZMW{
one{"जाम्बियाली क्वाचा"}
other{"जाम्बियाली क्वाचाहरू"}
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ne_IN.txt b/data/curr/ne_IN.txt
index 8e6cc0d..a33fb5d 100755
--- a/data/curr/ne_IN.txt
+++ b/data/curr/ne_IN.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ne_IN.xml
// *
@@ -9,7 +9,7 @@
ne_IN{
Currencies{
INR{
- "₹",
+ "Rs.",
"भारतीय रूपिँया",
}
}
@@ -19,5 +19,5 @@
other{"भारतीय रूपिँया"}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/nl.txt b/data/curr/nl.txt
index 9f51cc7..382284a 100644
--- a/data/curr/nl.txt
+++ b/data/curr/nl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nl.xml
// *
@@ -456,7 +456,7 @@
"Israëlische nieuwe shekel",
}
INR{
- "₹",
+ "Rs.",
"Indiase rupee",
}
IQD{
@@ -1085,6 +1085,10 @@
}
ZMK{
"ZMK",
+ "Zambiaanse kwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambiaanse kwacha",
}
ZRN{
@@ -1370,6 +1374,10 @@
other{"onbekende munteenheid"}
}
ZMK{
+ one{"Zambiaanse kwacha (1968-2012)"}
+ other{"Zambiaanse kwacha (1968-2012)"}
+ }
+ ZMW{
one{"Zambiaanse kwacha"}
other{"Zambiaanse kwacha"}
}
@@ -1382,5 +1390,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/nl_AW.txt b/data/curr/nl_AW.txt
index b2934fd..7597a39 100755
--- a/data/curr/nl_AW.txt
+++ b/data/curr/nl_AW.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nl_AW.xml
// *
@@ -13,5 +13,5 @@
"Arubaanse florin",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/nl_CW.txt b/data/curr/nl_CW.txt
index ae40b47..1f65274 100644
--- a/data/curr/nl_CW.txt
+++ b/data/curr/nl_CW.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nl_CW.xml
// *
@@ -13,5 +13,5 @@
"Nederlands-Antilliaanse gulden",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/nl_SR.txt b/data/curr/nl_SR.txt
new file mode 100755
index 0000000..dd925a7
--- /dev/null
+++ b/data/curr/nl_SR.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/nl_SR.xml
+// *
+// ***************************************************************************
+nl_SR{
+ Currencies{
+ SRD{
+ "$",
+ "Surinaamse dollar",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/nl_SX.txt b/data/curr/nl_SX.txt
index 0d93622..6480305 100644
--- a/data/curr/nl_SX.txt
+++ b/data/curr/nl_SX.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nl_SX.xml
// *
@@ -13,5 +13,5 @@
"Nederlands-Antilliaanse gulden",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/nmg.txt b/data/curr/nmg.txt
index 9e55d7b..a0b11e6 100755
--- a/data/curr/nmg.txt
+++ b/data/curr/nmg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nmg.xml
// *
@@ -96,7 +96,7 @@
"Fraŋ Guiné",
}
INR{
- "₹",
+ "Rs.",
"Mɔn India",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Mɔn Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Mɔn Zambia",
}
ZWD{
@@ -232,5 +236,5 @@
"Dɔ́llɔ Zimbabwǝ (1980-2008)",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/nn.txt b/data/curr/nn.txt
index 7f55197..db7a3a3 100644
--- a/data/curr/nn.txt
+++ b/data/curr/nn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nn.xml
// *
@@ -452,7 +452,7 @@
"israelsk ny shekel",
}
INR{
- "₹",
+ "Rs.",
"indisk rupi",
}
IQD{
@@ -1073,6 +1073,10 @@
}
ZMK{
"ZMK",
+ "zambisk kwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"zambisk kwacha",
}
ZRN{
@@ -1918,5 +1922,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
}
diff --git a/data/curr/nn_NO.txt b/data/curr/nn_NO.txt
index e8050a8..e297007 100644
--- a/data/curr/nn_NO.txt
+++ b/data/curr/nn_NO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/no.txt b/data/curr/no.txt
index 49a17b2..6dc26b5 100644
--- a/data/curr/no.txt
+++ b/data/curr/no.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/no_NO.txt b/data/curr/no_NO.txt
index 4b958f6..408deef 100644
--- a/data/curr/no_NO.txt
+++ b/data/curr/no_NO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/no_NO_NY.txt b/data/curr/no_NO_NY.txt
index 61d8107..38940c7c 100644
--- a/data/curr/no_NO_NY.txt
+++ b/data/curr/no_NO_NY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/nus.txt b/data/curr/nus.txt
index 638a1d0..887ddc2 100755
--- a/data/curr/nus.txt
+++ b/data/curr/nus.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nus.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/nus.xml
*/
nus{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/nyn.txt b/data/curr/nyn.txt
index d7fd6c5..d040b64 100755
--- a/data/curr/nyn.txt
+++ b/data/curr/nyn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nyn.xml
// *
@@ -96,7 +96,7 @@
"Faranga ya Guinea",
}
INR{
- "₹",
+ "Rs.",
"Rupiya ya India",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Kwacha ya Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha ya Zambia",
}
ZWD{
@@ -232,5 +236,5 @@
"Doora ya Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/om.txt b/data/curr/om.txt
index 28d1874..d3303b6 100644
--- a/data/curr/om.txt
+++ b/data/curr/om.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/om.xml
// *
@@ -32,7 +32,7 @@
"British Pound Sterling",
}
INR{
- "₹",
+ "Rs.",
"Indian Rupee",
}
JPY{
@@ -48,5 +48,5 @@
"US Dollar",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/om_KE.txt b/data/curr/om_KE.txt
index e056797..5b95789 100755
--- a/data/curr/om_KE.txt
+++ b/data/curr/om_KE.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/om_KE.xml
// *
@@ -13,5 +13,5 @@
"KES",
}
}
- Version{"2.0.57.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/or.txt b/data/curr/or.txt
index 7c7d24f..4963964 100644
--- a/data/curr/or.txt
+++ b/data/curr/or.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/or.xml
// *
@@ -12,9 +12,9 @@
or{
Currencies{
INR{
- "₹",
+ "Rs.",
"ଟଙକା",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/pa.txt b/data/curr/pa.txt
index 2b933af..f9c8047 100644
--- a/data/curr/pa.txt
+++ b/data/curr/pa.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pa.xml
// *
@@ -12,9 +12,9 @@
pa{
Currencies{
INR{
- "₹",
+ "Rs.",
"ਰੁਪਿਯ",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/pa_Arab.txt b/data/curr/pa_Arab.txt
index bf27263..a3b2495 100644
--- a/data/curr/pa_Arab.txt
+++ b/data/curr/pa_Arab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pa_Arab.xml
// *
@@ -16,7 +16,7 @@
"يورو",
}
INR{
- "ر [INR]",
+ "Rs.",
"روپئیہ [INR]",
}
PKR{
@@ -24,5 +24,5 @@
"روپئیہ",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/pa_Arab_PK.txt b/data/curr/pa_Arab_PK.txt
index a535601..d07b5c6 100644
--- a/data/curr/pa_Arab_PK.txt
+++ b/data/curr/pa_Arab_PK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/pa_Guru.txt b/data/curr/pa_Guru.txt
index e2feb97..0562443 100644
--- a/data/curr/pa_Guru.txt
+++ b/data/curr/pa_Guru.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pa_Guru.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/pa_Guru.xml
*/
pa_Guru{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/pa_Guru_IN.txt b/data/curr/pa_Guru_IN.txt
index 69fdff4..7f5e984 100644
--- a/data/curr/pa_Guru_IN.txt
+++ b/data/curr/pa_Guru_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/pa_IN.txt b/data/curr/pa_IN.txt
index f8f230a..8a52933 100644
--- a/data/curr/pa_IN.txt
+++ b/data/curr/pa_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/pa_PK.txt b/data/curr/pa_PK.txt
index 22fb56e..8478504 100644
--- a/data/curr/pa_PK.txt
+++ b/data/curr/pa_PK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/pl.txt b/data/curr/pl.txt
index 5c7e84e..c90224c 100644
--- a/data/curr/pl.txt
+++ b/data/curr/pl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pl.xml
// *
@@ -444,7 +444,7 @@
"nowy szekel izraelski",
}
INR{
- "₹",
+ "Rs.",
"rupia indyjska",
}
IQD{
@@ -1033,6 +1033,10 @@
}
ZMK{
"ZMK",
+ "kwacha zambijska (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"kwacha zambijska",
}
ZRN{
@@ -2150,6 +2154,12 @@
other{"randa południowoafrykańskiego"}
}
ZMK{
+ few{"kwacha zambijskie (1968-2012)"}
+ many{"kwacha zambijskich (1968-2012)"}
+ one{"kwacha zambijska (1968-2012)"}
+ other{"kwacha zambijskiej (1968-2012)"}
+ }
+ ZMW{
few{"kwacha zambijskie"}
many{"kwacha zambijskich"}
one{"kwacha zambijska"}
@@ -2162,5 +2172,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/pool.res b/data/curr/pool.res
index 42f44d2..bf2ce0f 100644
--- a/data/curr/pool.res
+++ b/data/curr/pool.res
Binary files differ
diff --git a/data/curr/ps.txt b/data/curr/ps.txt
index 99f552c..e93bf74 100644
--- a/data/curr/ps.txt
+++ b/data/curr/ps.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ps.xml
// *
@@ -16,5 +16,5 @@
"افغانۍ",
}
}
- Version{"2.0.75.94"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/pt.txt b/data/curr/pt.txt
index 4e14acb..4572e52 100644
--- a/data/curr/pt.txt
+++ b/data/curr/pt.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt.xml
// *
@@ -500,7 +500,7 @@
"Sheqel Novo israelita",
}
INR{
- "₹",
+ "Rs.",
"Rúpia indiana",
}
IQD{
@@ -1161,6 +1161,10 @@
}
ZMK{
"ZMK",
+ "Cuacha zambiano (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Cuacha zambiano",
}
ZRN{
@@ -2334,6 +2338,10 @@
other{"Rands sul-africanos"}
}
ZMK{
+ one{"Kwacha da Zâmbia (1968-2012)"}
+ other{"Kwachas da Zâmbia (1968-2012)"}
+ }
+ ZMW{
one{"Kwacha da Zâmbia"}
other{"Kwachas da Zâmbia"}
}
@@ -2362,5 +2370,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
}
diff --git a/data/curr/pt_AO.txt b/data/curr/pt_AO.txt
index 76a2120..487ed8d 100755
--- a/data/curr/pt_AO.txt
+++ b/data/curr/pt_AO.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_AO.xml
// *
@@ -13,5 +13,5 @@
"Kwanza angolano",
}
}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/pt_CV.txt b/data/curr/pt_CV.txt
new file mode 100755
index 0000000..27e03d7
--- /dev/null
+++ b/data/curr/pt_CV.txt
@@ -0,0 +1,31 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/pt_CV.xml
+// *
+// ***************************************************************************
+pt_CV{
+ Currencies{
+ CVE{
+ "CVE",
+ "Escudo cabo-verdiano",
+ {
+ "#,##0.00 ¤",
+ "$",
+ " ",
+ }
+ }
+ PTE{
+ "Esc.",
+ "Escudo português",
+ {
+ "#,##0.00 ¤",
+ ",",
+ " ",
+ }
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/pt_MO.txt b/data/curr/pt_MO.txt
new file mode 100755
index 0000000..5c70a4c
--- /dev/null
+++ b/data/curr/pt_MO.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/pt_MO.xml
+// *
+// ***************************************************************************
+pt_MO{
+ Currencies{
+ MOP{
+ "MOP$",
+ "Pataca macaense",
+ }
+ }
+ Version{"2.0.82.68"}
+}
diff --git a/data/curr/pt_MZ.txt b/data/curr/pt_MZ.txt
index 4d17aba..d0f85be 100755
--- a/data/curr/pt_MZ.txt
+++ b/data/curr/pt_MZ.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_MZ.xml
// *
@@ -13,5 +13,5 @@
"Metical de Moçambique",
}
}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/pt_PT.txt b/data/curr/pt_PT.txt
index cb764c2..0d43d21 100644
--- a/data/curr/pt_PT.txt
+++ b/data/curr/pt_PT.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_PT.xml
// *
@@ -161,7 +161,7 @@
"Sheqel novo israelita",
}
INR{
- "₹",
+ "Rs.",
"Rupia indiana",
}
IRR{
@@ -419,6 +419,10 @@
}
ZMK{
"ZMK",
+ "Kwacha zambiano (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha zambiano",
}
}
@@ -792,9 +796,13 @@
other{"Rands da África do Sul"}
}
ZMK{
+ one{"Kwacha zambiano (1968-2012)"}
+ other{"Kwachas zambianos (1968-2012)"}
+ }
+ ZMW{
one{"Kwacha zambiano"}
other{"Kwachas zambianos"}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.51"}
}
diff --git a/data/curr/pt_ST.txt b/data/curr/pt_ST.txt
index c7a4cd9..539964d 100755
--- a/data/curr/pt_ST.txt
+++ b/data/curr/pt_ST.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_ST.xml
// *
@@ -13,5 +13,5 @@
"Dobra de São Tomé e Príncipe",
}
}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/resfiles.mk b/data/curr/resfiles.mk
index 42795a9..071723b 100644
--- a/data/curr/resfiles.mk
+++ b/data/curr/resfiles.mk
@@ -1,6 +1,6 @@
-# * Copyright (C) 1998-2012, International Business Machines
+# * Copyright (C) 1998-2013, International Business Machines
# * Corporation and others. All Rights Reserved.
-CURR_CLDR_VERSION = 22.1.1
+CURR_CLDR_VERSION = 23
# A list of txt's to build
# Note:
#
@@ -27,21 +27,21 @@
# Aliases without a corresponding xx.xml file (see icu-config.xml & build.xml)
CURR_SYNTHETIC_ALIAS = az_AZ.txt az_Latn_AZ.txt bs_BA.txt bs_Latn_BA.txt\
- en_NH.txt en_RH.txt en_VU.txt en_ZW.txt fil_PH.txt\
- ha_GH.txt ha_Latn_GH.txt ha_Latn_NE.txt ha_Latn_NG.txt ha_NE.txt\
- ha_NG.txt he_IL.txt id_ID.txt in.txt in_ID.txt\
- iw.txt iw_IL.txt ja_JP.txt ja_JP_TRADITIONAL.txt kk_Cyrl_KZ.txt\
- kk_KZ.txt ks_Arab_IN.txt ks_IN.txt mo.txt nb_NO.txt\
- nn_NO.txt no.txt no_NO.txt no_NO_NY.txt pa_Arab_PK.txt\
- pa_Guru_IN.txt pa_IN.txt pa_PK.txt ro_MD.txt sh.txt\
- sh_BA.txt sh_CS.txt sh_YU.txt shi_Latn_MA.txt shi_MA.txt\
- sr_BA.txt sr_CS.txt sr_Cyrl_CS.txt sr_Cyrl_RS.txt sr_Cyrl_YU.txt\
- sr_Latn_BA.txt sr_Latn_CS.txt sr_Latn_ME.txt sr_Latn_RS.txt sr_Latn_YU.txt\
- sr_ME.txt sr_RS.txt sr_YU.txt th_TH.txt th_TH_TRADITIONAL.txt\
- tl.txt tl_PH.txt tzm_Latn_MA.txt tzm_MA.txt uz_AF.txt\
- uz_Arab_AF.txt uz_Cyrl_UZ.txt uz_UZ.txt vai_LR.txt vai_Vaii_LR.txt\
- zh_CN.txt zh_HK.txt zh_Hans_CN.txt zh_Hant_MO.txt zh_Hant_TW.txt\
- zh_MO.txt zh_SG.txt zh_TW.txt
+ en_NH.txt en_RH.txt fil_PH.txt ha_GH.txt ha_Latn_NE.txt\
+ ha_Latn_NG.txt ha_NE.txt ha_NG.txt he_IL.txt id_ID.txt\
+ in.txt in_ID.txt iw.txt iw_IL.txt ja_JP.txt\
+ ja_JP_TRADITIONAL.txt kk_Cyrl_KZ.txt kk_KZ.txt ks_Arab_IN.txt ks_IN.txt\
+ mn_Cyrl_MN.txt mn_MN.txt mo.txt ms_BN.txt ms_Latn_MY.txt\
+ ms_MY.txt ms_SG.txt nb_NO.txt nn_NO.txt no.txt\
+ no_NO.txt no_NO_NY.txt pa_Arab_PK.txt pa_Guru_IN.txt pa_IN.txt\
+ pa_PK.txt ro_MD.txt sh.txt sh_BA.txt sh_CS.txt\
+ sh_YU.txt shi_MA.txt shi_Tfng_MA.txt sr_BA.txt sr_CS.txt\
+ sr_Cyrl_CS.txt sr_Cyrl_RS.txt sr_Cyrl_YU.txt sr_Latn_BA.txt sr_Latn_CS.txt\
+ sr_Latn_ME.txt sr_Latn_RS.txt sr_Latn_YU.txt sr_ME.txt sr_RS.txt\
+ sr_YU.txt th_TH.txt th_TH_TRADITIONAL.txt tl.txt tl_PH.txt\
+ tzm_Latn_MA.txt tzm_MA.txt uz_AF.txt uz_Arab_AF.txt uz_Cyrl_UZ.txt\
+ uz_UZ.txt vai_LR.txt vai_Vaii_LR.txt zh_CN.txt zh_HK.txt\
+ zh_Hans_CN.txt zh_Hant_TW.txt zh_MO.txt zh_SG.txt zh_TW.txt
# All aliases (to not be included under 'installed'), but not including root.
@@ -49,56 +49,73 @@
# Ordinary resources
+# BEGIN Android-add. Including en_US.txt
+# END Android-add
CURR_SOURCE = af.txt af_NA.txt agq.txt ak.txt\
- am.txt ar.txt as.txt asa.txt az.txt\
- az_Cyrl.txt az_Latn.txt bas.txt be.txt bem.txt\
- bez.txt bg.txt bm.txt bn.txt bn_IN.txt\
- bo.txt br.txt brx.txt bs.txt bs_Cyrl.txt\
- bs_Latn.txt ca.txt cgg.txt chr.txt cs.txt\
- cy.txt da.txt dav.txt de.txt de_LU.txt\
+ am.txt ar.txt ar_DJ.txt ar_ER.txt ar_SO.txt\
+ as.txt asa.txt az.txt az_Cyrl.txt az_Latn.txt\
+ bas.txt be.txt bem.txt bez.txt bg.txt\
+ bm.txt bn.txt bn_IN.txt bo.txt bo_IN.txt\
+ br.txt brx.txt bs.txt bs_Cyrl.txt bs_Latn.txt\
+ ca.txt cgg.txt chr.txt cs.txt cy.txt\
+ da.txt dav.txt de.txt de_CH.txt de_LU.txt\
dje.txt dua.txt dyo.txt dz.txt ebu.txt\
- ee.txt el.txt en.txt en_AU.txt en_BB.txt\
- en_BM.txt en_BW.txt en_BZ.txt en_CA.txt en_GB.txt\
- en_HK.txt en_JM.txt en_MT.txt en_NA.txt en_NZ.txt\
- en_PH.txt en_PK.txt en_SG.txt en_TT.txt en_ZA.txt\
- eo.txt es.txt es_AR.txt es_BO.txt es_CL.txt\
- es_CO.txt es_CR.txt es_DO.txt es_EC.txt es_GT.txt\
- es_HN.txt es_MX.txt es_NI.txt es_PA.txt es_PE.txt\
- es_PR.txt es_PY.txt es_US.txt es_UY.txt es_VE.txt\
- et.txt eu.txt ewo.txt fa.txt fa_AF.txt\
- ff.txt fi.txt fil.txt fo.txt fr.txt\
- fr_BI.txt fr_CA.txt fr_DJ.txt fr_GN.txt fr_KM.txt\
- fr_LU.txt ga.txt gl.txt gsw.txt gu.txt\
- guz.txt gv.txt ha.txt ha_Latn.txt haw.txt\
- he.txt hi.txt hr.txt hu.txt hy.txt\
- id.txt ig.txt ii.txt is.txt it.txt\
- ja.txt jgo.txt jmc.txt ka.txt kab.txt\
- kam.txt kde.txt kea.txt khq.txt ki.txt\
- kk.txt kk_Cyrl.txt kl.txt kln.txt km.txt\
- kn.txt ko.txt kok.txt ks.txt ks_Arab.txt\
- ksb.txt ksf.txt kw.txt lag.txt lg.txt\
- ln.txt lo.txt lt.txt lu.txt luo.txt\
- luy.txt lv.txt mas.txt mas_TZ.txt mer.txt\
- mfe.txt mg.txt mgh.txt mgo.txt mk.txt\
- ml.txt mr.txt ms.txt ms_BN.txt mt.txt\
- mua.txt my.txt naq.txt nb.txt nd.txt\
- ne.txt ne_IN.txt nl.txt nl_AW.txt nl_CW.txt\
- nl_SX.txt nmg.txt nn.txt nus.txt nyn.txt\
- om.txt om_KE.txt or.txt pa.txt pa_Arab.txt\
- pa_Guru.txt pl.txt ps.txt pt.txt pt_AO.txt\
- pt_MZ.txt pt_PT.txt pt_ST.txt rm.txt rn.txt\
- ro.txt rof.txt ru.txt rw.txt rwk.txt\
- saq.txt sbp.txt seh.txt ses.txt sg.txt\
- shi.txt shi_Latn.txt shi_Tfng.txt si.txt sk.txt\
- sl.txt sn.txt so.txt so_DJ.txt so_ET.txt\
- so_KE.txt sq.txt sr.txt sr_Cyrl.txt sr_Cyrl_BA.txt\
- sr_Latn.txt sv.txt sw.txt swc.txt ta.txt\
- ta_LK.txt ta_MY.txt ta_SG.txt te.txt teo.txt\
- teo_KE.txt th.txt ti.txt ti_ER.txt to.txt\
- tr.txt twq.txt tzm.txt tzm_Latn.txt uk.txt\
- ur.txt uz.txt uz_Arab.txt uz_Cyrl.txt uz_Latn.txt\
- vai.txt vai_Latn.txt vai_Vaii.txt vi.txt vun.txt\
- xog.txt yav.txt yo.txt zh.txt zh_Hans.txt\
- zh_Hans_HK.txt zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt zh_Hant_HK.txt\
- zu.txt
+ ee.txt el.txt en.txt en_AG.txt en_AU.txt\
+ en_BB.txt en_BE.txt en_BM.txt en_BS.txt en_BW.txt\
+ en_BZ.txt en_CA.txt en_CM.txt en_DM.txt en_FJ.txt\
+ en_GB.txt en_GD.txt en_GH.txt en_GI.txt en_GM.txt\
+ en_GY.txt en_HK.txt en_IN.txt en_JM.txt en_KE.txt\
+ en_KI.txt en_KN.txt en_KY.txt en_LC.txt en_LR.txt\
+ en_LS.txt en_MG.txt en_MT.txt en_MU.txt en_MW.txt\
+ en_NA.txt en_NG.txt en_NZ.txt en_PG.txt en_PH.txt\
+ en_PK.txt en_SB.txt en_SC.txt en_SG.txt en_SL.txt\
+ en_SS.txt en_SZ.txt en_TO.txt en_TT.txt en_TZ.txt\
+ en_US.txt\
+ en_UG.txt en_VC.txt en_VU.txt en_WS.txt en_ZA.txt\
+ en_ZM.txt en_ZW.txt eo.txt es.txt es_AR.txt\
+ es_BO.txt es_CL.txt es_CO.txt es_CR.txt es_CU.txt\
+ es_DO.txt es_EC.txt es_GT.txt es_HN.txt es_MX.txt\
+ es_NI.txt es_PA.txt es_PE.txt es_PH.txt es_PR.txt\
+ es_PY.txt es_US.txt es_UY.txt es_VE.txt et.txt\
+ eu.txt ewo.txt fa.txt fa_AF.txt ff.txt\
+ fi.txt fil.txt fo.txt fr.txt fr_BI.txt\
+ fr_CA.txt fr_CD.txt fr_CH.txt fr_DJ.txt fr_DZ.txt\
+ fr_GN.txt fr_HT.txt fr_KM.txt fr_LU.txt fr_MG.txt\
+ fr_MR.txt fr_MU.txt fr_RW.txt fr_SC.txt fr_SY.txt\
+ fr_TN.txt ga.txt gl.txt gsw.txt gu.txt\
+ guz.txt gv.txt ha.txt ha_Latn.txt ha_Latn_GH.txt\
+ haw.txt he.txt hi.txt hr.txt hr_BA.txt\
+ hu.txt hy.txt id.txt ig.txt ii.txt\
+ is.txt it.txt it_CH.txt ja.txt jgo.txt\
+ jmc.txt ka.txt kab.txt kam.txt kde.txt\
+ kea.txt khq.txt ki.txt kk.txt kk_Cyrl.txt\
+ kl.txt kln.txt km.txt kn.txt ko.txt\
+ kok.txt ks.txt ks_Arab.txt ksb.txt ksf.txt\
+ kw.txt lag.txt lg.txt ln.txt ln_AO.txt\
+ lo.txt lt.txt lu.txt luo.txt luy.txt\
+ lv.txt mas.txt mas_TZ.txt mer.txt mfe.txt\
+ mg.txt mgh.txt mgo.txt mk.txt ml.txt\
+ mn.txt mn_Cyrl.txt mr.txt ms.txt ms_Latn.txt\
+ ms_Latn_BN.txt ms_Latn_SG.txt mt.txt mua.txt my.txt\
+ naq.txt nb.txt nd.txt ne.txt ne_IN.txt\
+ nl.txt nl_AW.txt nl_CW.txt nl_SR.txt nl_SX.txt\
+ nmg.txt nn.txt nus.txt nyn.txt om.txt\
+ om_KE.txt or.txt pa.txt pa_Arab.txt pa_Guru.txt\
+ pl.txt ps.txt pt.txt pt_AO.txt pt_CV.txt\
+ pt_MO.txt pt_MZ.txt pt_PT.txt pt_ST.txt rm.txt\
+ rn.txt ro.txt rof.txt ru.txt ru_BY.txt\
+ ru_KG.txt ru_KZ.txt rw.txt rwk.txt saq.txt\
+ sbp.txt seh.txt ses.txt sg.txt shi.txt\
+ shi_Latn.txt shi_Tfng.txt si.txt sk.txt sl.txt\
+ sn.txt so.txt so_DJ.txt so_ET.txt so_KE.txt\
+ sq.txt sq_MK.txt sr.txt sr_Cyrl.txt sr_Cyrl_BA.txt\
+ sr_Latn.txt sv.txt sw.txt sw_UG.txt swc.txt\
+ ta.txt ta_LK.txt ta_MY.txt ta_SG.txt te.txt\
+ teo.txt teo_KE.txt th.txt ti.txt ti_ER.txt\
+ to.txt tr.txt twq.txt tzm.txt tzm_Latn.txt\
+ uk.txt ur.txt uz.txt uz_Arab.txt uz_Cyrl.txt\
+ uz_Latn.txt vai.txt vai_Latn.txt vai_Vaii.txt vi.txt\
+ vun.txt xog.txt yav.txt yo.txt zh.txt\
+ zh_Hans.txt zh_Hans_HK.txt zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt\
+ zh_Hant_HK.txt zh_Hant_MO.txt zu.txt
diff --git a/data/curr/rm.txt b/data/curr/rm.txt
index 0243afd..6d0887a 100755
--- a/data/curr/rm.txt
+++ b/data/curr/rm.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rm.xml
// *
@@ -492,7 +492,7 @@
"sheqel",
}
INR{
- "₹",
+ "Rs.",
"rupia indica",
}
IQD{
@@ -1141,6 +1141,10 @@
}
ZMK{
"ZMK",
+ "kwacha da la sambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"kwacha da la sambia",
}
ZRN{
@@ -1160,5 +1164,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/rn.txt b/data/curr/rn.txt
index 5993e78..11a9a12 100755
--- a/data/curr/rn.txt
+++ b/data/curr/rn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rn.xml
// *
@@ -96,7 +96,7 @@
"Ifaranga ryo muri Gineya",
}
INR{
- "₹",
+ "Rs.",
"Irupiya ryo mu Buhindi",
}
JPY{
@@ -213,6 +213,10 @@
}
ZMK{
"ZMK",
+ "Ikwaca ryo muri Zambiya (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Ikwaca ryo muri Zambiya",
}
ZWD{
@@ -220,5 +224,5 @@
"Idolari ryo muri Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ro.txt b/data/curr/ro.txt
index a656423..1a92624 100644
--- a/data/curr/ro.txt
+++ b/data/curr/ro.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ro.xml
// *
@@ -376,7 +376,7 @@
"șechel israelian nou",
}
INR{
- "₹",
+ "Rs.",
"rupie indiană",
}
IQD{
@@ -973,6 +973,10 @@
}
ZMK{
"ZMK",
+ "kwacha zambian (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"kwacha zambian",
}
ZRN{
@@ -2059,6 +2063,11 @@
other{"rand sud-african"}
}
ZMK{
+ few{"kwache zambiene (1968-2012)"}
+ one{"kwacha zambiană (1968-2012)"}
+ other{"kwache zambiene (1968-2012)"}
+ }
+ ZMW{
few{"kwache zambiene"}
one{"kwacha zambiană"}
other{"kwache zambiene"}
@@ -2079,5 +2088,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ro_MD.txt b/data/curr/ro_MD.txt
index eed93a7..cb90da0 100755
--- a/data/curr/ro_MD.txt
+++ b/data/curr/ro_MD.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/rof.txt b/data/curr/rof.txt
index 76f07ab..f567a5a 100755
--- a/data/curr/rof.txt
+++ b/data/curr/rof.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rof.xml
// *
@@ -96,7 +96,7 @@
"heleri sa Gine",
}
INR{
- "₹",
+ "Rs.",
"heleri sa India",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "heleri sa Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"heleri sa Zambia",
}
ZWD{
@@ -228,5 +232,5 @@
"heleri sa Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/root.txt b/data/curr/root.txt
index add4429..73f14c3 100644
--- a/data/curr/root.txt
+++ b/data/curr/root.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/root.xml
// *
@@ -44,7 +44,7 @@
"ILS",
}
INR{
- "₹",
+ "Rs.",
"INR",
}
JPY{
@@ -99,15 +99,15 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
currencySpacing{
afterCurrency{
- currencyMatch{"[:letter:]"}
+ currencyMatch{"[:^S:]"}
insertBetween{" "}
surroundingMatch{"[:digit:]"}
}
beforeCurrency{
- currencyMatch{"[:letter:]"}
+ currencyMatch{"[:^S:]"}
insertBetween{" "}
surroundingMatch{"[:digit:]"}
}
diff --git a/data/curr/ru.txt b/data/curr/ru.txt
index b597792..1d4a2d3 100644
--- a/data/curr/ru.txt
+++ b/data/curr/ru.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ru.xml
// *
@@ -456,7 +456,7 @@
"Новый израильский шекель",
}
INR{
- "₹",
+ "Rs.",
"Индийская рупия",
}
IQD{
@@ -1085,6 +1085,10 @@
}
ZMK{
"ZMK",
+ "Квача (замбийская) (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Квача (замбийская)",
}
ZRN{
@@ -2066,6 +2070,12 @@
other{"южноафриканского рэнда"}
}
ZMK{
+ few{"замбийские квачи (1968-2012)"}
+ many{"замбийских квач (1968-2012)"}
+ one{"замбийская квача (1968-2012)"}
+ other{"замбийской квачи (1968-2012)"}
+ }
+ ZMW{
few{"замбийские квачи"}
many{"замбийских квач"}
one{"замбийская квача"}
@@ -2078,5 +2088,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ru_BY.txt b/data/curr/ru_BY.txt
new file mode 100755
index 0000000..4522894
--- /dev/null
+++ b/data/curr/ru_BY.txt
@@ -0,0 +1,21 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/ru_BY.xml
+// *
+// ***************************************************************************
+ru_BY{
+ Currencies{
+ BYR{
+ "р.",
+ "Белорусский рубль",
+ }
+ RUR{
+ "RUR",
+ "Российский рубль (1991-1998)",
+ }
+ }
+ Version{"2.0.82.50"}
+}
diff --git a/data/curr/ru_KG.txt b/data/curr/ru_KG.txt
new file mode 100755
index 0000000..c0dafa6
--- /dev/null
+++ b/data/curr/ru_KG.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/ru_KG.xml
+// *
+// ***************************************************************************
+ru_KG{
+ Currencies{
+ KGS{
+ "сом",
+ "Киргизский сом",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/ru_KZ.txt b/data/curr/ru_KZ.txt
new file mode 100755
index 0000000..08ffced
--- /dev/null
+++ b/data/curr/ru_KZ.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/ru_KZ.xml
+// *
+// ***************************************************************************
+ru_KZ{
+ Currencies{
+ KZT{
+ "₸",
+ "Казахский тенге",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/rw.txt b/data/curr/rw.txt
index ddd7bd8..86a3da8 100755
--- a/data/curr/rw.txt
+++ b/data/curr/rw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rw.xml
// *
@@ -16,5 +16,5 @@
"RWF",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/rwk.txt b/data/curr/rwk.txt
index f0a1e04..eec00cc 100755
--- a/data/curr/rwk.txt
+++ b/data/curr/rwk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rwk.xml
// *
@@ -96,7 +96,7 @@
"Faranga ya Gine",
}
INR{
- "₹",
+ "Rs.",
"Rupia ya India",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Kwacha ya Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha ya Zambia",
}
ZWD{
@@ -232,5 +236,5 @@
"Dola ya Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/saq.txt b/data/curr/saq.txt
index 2438972..abf0267 100755
--- a/data/curr/saq.txt
+++ b/data/curr/saq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/saq.xml
// *
@@ -96,7 +96,7 @@
"Njilingi eel Gine",
}
INR{
- "₹",
+ "Rs.",
"Njilingi eel India",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Njilingi eel Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Njilingi eel Zambia",
}
ZWD{
@@ -228,5 +232,5 @@
"Dola eel Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/sbp.txt b/data/curr/sbp.txt
index 9271951..1e9aa44 100755
--- a/data/curr/sbp.txt
+++ b/data/curr/sbp.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sbp.xml
// *
@@ -96,7 +96,7 @@
"Ihela ya Gine",
}
INR{
- "₹",
+ "Rs.",
"Ihela ya Indiya",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Ihela ya Sambiya (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Ihela ya Sambiya",
}
ZWD{
@@ -228,5 +232,5 @@
"Ihela ya Simbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/seh.txt b/data/curr/seh.txt
index 41d7890..4959189 100755
--- a/data/curr/seh.txt
+++ b/data/curr/seh.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/seh.xml
// *
@@ -96,7 +96,7 @@
"Syli da Guiné",
}
INR{
- "₹",
+ "Rs.",
"Rúpia indiana",
}
JPY{
@@ -229,6 +229,10 @@
}
ZMK{
"ZMK",
+ "Cuacha zambiano (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Cuacha zambiano",
}
ZWD{
@@ -236,5 +240,5 @@
"Dólar do Zimbábue",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ses.txt b/data/curr/ses.txt
index f54d600..9b6f063 100755
--- a/data/curr/ses.txt
+++ b/data/curr/ses.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ses.xml
// *
@@ -96,7 +96,7 @@
"Ginee Fraŋ",
}
INR{
- "₹",
+ "Rs.",
"Indu Rupii",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Zambi Kwaca (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambi Kwaca",
}
ZWD{
@@ -232,5 +236,5 @@
"Zimbabwe Dollar",
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/sg.txt b/data/curr/sg.txt
index 58d65f7..c31a107 100755
--- a/data/curr/sg.txt
+++ b/data/curr/sg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sg.xml
// *
@@ -96,7 +96,7 @@
"sili tî Ginëe",
}
INR{
- "₹",
+ "Rs.",
"rupïi tî Ênnde",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "kwâtia tî Zambïi (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"kwâtia tî Zambïi",
}
ZWD{
@@ -228,5 +232,5 @@
"dolära tî Zimbäbwe",
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/sh.txt b/data/curr/sh.txt
index 3f0a236..1433f43 100644
--- a/data/curr/sh.txt
+++ b/data/curr/sh.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/sh_BA.txt b/data/curr/sh_BA.txt
index af5634f..82a1a16 100644
--- a/data/curr/sh_BA.txt
+++ b/data/curr/sh_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/sh_CS.txt b/data/curr/sh_CS.txt
index 2adfb4a..8967fc8 100644
--- a/data/curr/sh_CS.txt
+++ b/data/curr/sh_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/sh_YU.txt b/data/curr/sh_YU.txt
index 516cdf3..85f7ad6 100644
--- a/data/curr/sh_YU.txt
+++ b/data/curr/sh_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/shi.txt b/data/curr/shi.txt
index 453ba57..d0048d0 100755
--- a/data/curr/shi.txt
+++ b/data/curr/shi.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/shi.xml
// *
@@ -96,7 +96,7 @@
"ⴼⵔⴰⵏⴽ ⵏ ⵖⵉⵏⵢⴰ",
}
INR{
- "₹",
+ "Rs.",
"ⴰⵔⵓⴱⵉ ⵏ ⵍⵀⵉⵏⴷ",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "ⴰⴽⵡⴰⵛⴰ ⵏ ⵣⴰⵎⴱⵢⴰ (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"ⴰⴽⵡⴰⵛⴰ ⵏ ⵣⴰⵎⴱⵢⴰ",
}
ZWD{
@@ -232,5 +236,5 @@
"ⴰⴷⵓⵍⴰⵔ ⵏ ⵣⵉⵎⴱⴰⴱⵡⵉ",
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/shi_Latn.txt b/data/curr/shi_Latn.txt
index e596861..9c47b3d 100755
--- a/data/curr/shi_Latn.txt
+++ b/data/curr/shi_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/shi_Latn.xml
// *
@@ -96,7 +96,7 @@
"frank n ɣinya",
}
INR{
- "₹",
+ "Rs.",
"arubi n lhind",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "akwaca n zambya (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"akwaca n zambya",
}
ZWD{
@@ -232,5 +236,5 @@
"adular n zimbabwi",
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/shi_MA.txt b/data/curr/shi_MA.txt
index 91d13a9..084cfbe 100755
--- a/data/curr/shi_MA.txt
+++ b/data/curr/shi_MA.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
shi_MA{
- "%%ALIAS"{"shi_Latn_MA"}
+ "%%ALIAS"{"shi_Tfng_MA"}
}
diff --git a/data/curr/shi_Tfng.txt b/data/curr/shi_Tfng.txt
index 12bcee9..49f4299 100755
--- a/data/curr/shi_Tfng.txt
+++ b/data/curr/shi_Tfng.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/shi_Tfng.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/shi_Tfng.xml
*/
shi_Tfng{
- Version{"2.0.75.56"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/shi_Latn_MA.txt b/data/curr/shi_Tfng_MA.txt
similarity index 86%
copy from data/curr/shi_Latn_MA.txt
copy to data/curr/shi_Tfng_MA.txt
index cd7fd64..0573400 100755
--- a/data/curr/shi_Latn_MA.txt
+++ b/data/curr/shi_Tfng_MA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* generated alias target
*/
-shi_Latn_MA{
+shi_Tfng_MA{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/curr/si.txt b/data/curr/si.txt
index 60c6c87..19019cc 100644
--- a/data/curr/si.txt
+++ b/data/curr/si.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/si.xml
// *
@@ -224,7 +224,7 @@
"ඊශ්රායල නව ශෙකල්",
}
INR{
- "₹",
+ "Rs.",
"ඉන්දියානු රුපියල්",
}
IQD{
@@ -537,8 +537,12 @@
}
ZMK{
"ZMK",
+ "සැම්බියානු ක්වාචා (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"සැම්බියානු ක්වාචා",
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/sk.txt b/data/curr/sk.txt
index 5eb6f95..351785e 100644
--- a/data/curr/sk.txt
+++ b/data/curr/sk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sk.xml
// *
@@ -308,7 +308,7 @@
"Ethiopský birr",
}
EUR{
- "EUR",
+ "€",
"Euro",
}
FIM{
@@ -993,6 +993,10 @@
}
ZMK{
"ZMK",
+ "Zambská kwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambská kwacha",
}
ZRN{
@@ -1453,6 +1457,11 @@
other{"juhoafrických randov, juhoafrického randu"}
}
ZMK{
+ few{"Zambská kwacha (1968-2012)"}
+ one{"Zambská kwacha (1968-2012)"}
+ other{"Zambská kwacha (1968-2012)"}
+ }
+ ZMW{
few{"Zambská kwacha"}
one{"Zambská kwacha"}
other{"Zambská kwacha"}
@@ -1478,5 +1487,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/sl.txt b/data/curr/sl.txt
index 99b006f..17453a4 100644
--- a/data/curr/sl.txt
+++ b/data/curr/sl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sl.xml
// *
@@ -456,7 +456,7 @@
"izraelski šekel",
}
INR{
- "₹",
+ "Rs.",
"indijska rupija",
}
IQD{
@@ -1077,6 +1077,10 @@
}
ZMK{
"ZMK",
+ "zambijska kvača (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"zambijska kvača",
}
ZRN{
@@ -1146,5 +1150,5 @@
other{"{0} {1}"}
two{"{0} {1}"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/sn.txt b/data/curr/sn.txt
index 5342dd9..c1f20fb 100755
--- a/data/curr/sn.txt
+++ b/data/curr/sn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sn.xml
// *
@@ -96,7 +96,7 @@
"Furenki re Gine",
}
INR{
- "₹",
+ "Rs.",
"Rupe re India",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Kwacha ye Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha ye Zambia",
}
ZWD{
@@ -232,5 +236,5 @@
"Dora re Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/so.txt b/data/curr/so.txt
index 011a0c7..3fdcaf9 100644
--- a/data/curr/so.txt
+++ b/data/curr/so.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/so.xml
// *
@@ -28,7 +28,7 @@
"Riyaalka Sacuudiga",
}
SOS{
- "SOS",
+ "S",
"Shilin soomaali",
}
TZS{
@@ -40,5 +40,5 @@
"Doollar maraykan",
}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/so_DJ.txt b/data/curr/so_DJ.txt
index 793ba69..7a28c06 100755
--- a/data/curr/so_DJ.txt
+++ b/data/curr/so_DJ.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/so_DJ.xml
// *
@@ -13,5 +13,5 @@
"Faran Jabbuuti",
}
}
- Version{"2.0.57.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/so_ET.txt b/data/curr/so_ET.txt
index 2e06902..05f877e 100755
--- a/data/curr/so_ET.txt
+++ b/data/curr/so_ET.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/so_ET.xml
// *
@@ -13,5 +13,5 @@
"Birta Itoobbiya",
}
}
- Version{"2.0.57.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/so_KE.txt b/data/curr/so_KE.txt
index 24489b7..a951f6b 100755
--- a/data/curr/so_KE.txt
+++ b/data/curr/so_KE.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/so_KE.xml
// *
@@ -13,5 +13,5 @@
"KES",
}
}
- Version{"2.0.57.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/sq.txt b/data/curr/sq.txt
index 633ea29..9522a45 100644
--- a/data/curr/sq.txt
+++ b/data/curr/sq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sq.xml
// *
@@ -32,7 +32,7 @@
"Paund Sterlina Britanike",
}
INR{
- "₹",
+ "Rs.",
"Rupee indiane",
}
JPY{
@@ -48,5 +48,5 @@
"Dollar amerikan",
}
}
- Version{"2.0.77.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/sq_MK.txt b/data/curr/sq_MK.txt
new file mode 100755
index 0000000..bf640bf
--- /dev/null
+++ b/data/curr/sq_MK.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/sq_MK.xml
+// *
+// ***************************************************************************
+sq_MK{
+ Currencies{
+ MKD{
+ "den",
+ "MKD",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/sr.txt b/data/curr/sr.txt
index eb84137..05a33ff 100644
--- a/data/curr/sr.txt
+++ b/data/curr/sr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr.xml
// *
@@ -460,7 +460,7 @@
"Израелски нови шекел",
}
INR{
- "₹",
+ "Rs.",
"Индијска рупија",
}
IQD{
@@ -1097,6 +1097,10 @@
}
ZMK{
"ZMK",
+ "Замбијска квача (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Замбијска квача",
}
ZRN{
@@ -2748,6 +2752,12 @@
other{"јужно-афричких ранда"}
}
ZMK{
+ few{"замбијске кваче (1968-2012)"}
+ many{"замбијских квача (1968-2012)"}
+ one{"замбијска квача (1968-2012)"}
+ other{"замбијских квача (1968-2012)"}
+ }
+ ZMW{
few{"замбијске кваче"}
many{"замбијских квача"}
one{"замбијска квача"}
@@ -2790,5 +2800,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.47"}
}
diff --git a/data/curr/sr_BA.txt b/data/curr/sr_BA.txt
index bad5005..9754916 100644
--- a/data/curr/sr_BA.txt
+++ b/data/curr/sr_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/sr_CS.txt b/data/curr/sr_CS.txt
index b6ee46c..23bc131 100644
--- a/data/curr/sr_CS.txt
+++ b/data/curr/sr_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/sr_Cyrl.txt b/data/curr/sr_Cyrl.txt
index 426675a..4d109a8 100644
--- a/data/curr/sr_Cyrl.txt
+++ b/data/curr/sr_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr_Cyrl.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/sr_Cyrl.xml
*/
sr_Cyrl{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/sr_Cyrl_BA.txt b/data/curr/sr_Cyrl_BA.txt
index 9ef6adc..0de28cd 100644
--- a/data/curr/sr_Cyrl_BA.txt
+++ b/data/curr/sr_Cyrl_BA.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr_Cyrl_BA.xml
// *
@@ -9,9 +9,9 @@
sr_Cyrl_BA{
Currencies{
BAM{
- "КМ.",
+ "КМ",
"Конвертибилна Марка",
}
}
- Version{"2.0.45.82"}
+ Version{"2.0.82.51"}
}
diff --git a/data/curr/sr_Cyrl_CS.txt b/data/curr/sr_Cyrl_CS.txt
index 99b0d57..54c3633 100644
--- a/data/curr/sr_Cyrl_CS.txt
+++ b/data/curr/sr_Cyrl_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/sr_Cyrl_RS.txt b/data/curr/sr_Cyrl_RS.txt
index 5475cea..dfb1855 100644
--- a/data/curr/sr_Cyrl_RS.txt
+++ b/data/curr/sr_Cyrl_RS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/sr_Cyrl_YU.txt b/data/curr/sr_Cyrl_YU.txt
index 088b496..608f5f9 100644
--- a/data/curr/sr_Cyrl_YU.txt
+++ b/data/curr/sr_Cyrl_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/sr_Latn.txt b/data/curr/sr_Latn.txt
index 582d0d2..0dfdcd6 100644
--- a/data/curr/sr_Latn.txt
+++ b/data/curr/sr_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr_Latn.xml
// *
@@ -13,7 +13,7 @@
Currencies{
ADP{
"ADP",
- "Andorska pezeta (ADP)",
+ "Andorska pezeta",
}
AED{
"AED",
@@ -21,11 +21,11 @@
}
AFA{
"AFA",
- "Avganistanski avgani (1927-2002) AFA",
+ "Avganistanski avgani (1927-2002)",
}
AFN{
"AFN",
- "Avganistanski avgani (AFN)",
+ "Avganistanski avgani",
}
ALL{
"ALL",
@@ -37,31 +37,31 @@
}
ANG{
"ANG",
- "Holandski Antili gilder (ANG)",
+ "Holandski antili gilder",
}
AOA{
"AOA",
- "Angolijska kvanza (AOA)",
+ "Angolijska kvanza",
}
AOK{
"AOK",
- "Angolijska kvanza (1977-1990) (AOK)",
+ "Angolijska kvanza (1977-1990)",
}
AON{
"AON",
- "Angolijska nova kvanza (1990-2000) (AON)",
+ "Angolijska nova kvanza (1990-2000)",
}
AOR{
"AOR",
- "Angolijska kvanza reajustado (1995-1999) (AOR)",
+ "Angolijska kvanza reađustado (1995-1999)",
}
ARA{
"ARA",
- "Argentinski austral (ARA)",
+ "Argentinski austral",
}
ARP{
"ARP",
- "Argentinski pezo (1983-1985) (ARP)",
+ "Argentinski pezo (1983-1985)",
}
ARS{
"ARS",
@@ -77,15 +77,15 @@
}
AWG{
"AWG",
- "Arubijski florin (AWG)",
+ "Arubanski florin",
}
AZM{
"AZM",
- "Azerbejdžanski manat (AZM)",
+ "Azerbejdžanski manat (1993-2006)",
}
AZN{
"AZN",
- "Azerbejdžanski manat (AZN)",
+ "Azerbejdžanski manat",
}
BAD{
"BAD",
@@ -93,19 +93,19 @@
}
BAM{
"KM",
- "Bosansko-Hercegovačka konvertibilna marka",
+ "Konvertibilna marka",
}
BBD{
"BBD",
- "Barbadoski dolar (BBD)",
+ "Barbadoški dolar",
}
BDT{
"BDT",
- "Bangladeška taka (BDT)",
+ "Bangladeška taka",
}
BEC{
"BEC",
- "Belgijski frank (konvertibilni) (BEC)",
+ "Belgijski franak (konvertibilni)",
}
BEF{
"BEF",
@@ -113,11 +113,11 @@
}
BEL{
"BEL",
- "Belgijski frank (finansijski) (BEL)",
+ "Belgijski franak (finansijski)",
}
BGL{
"BGL",
- "Bugarski tvrdi lev (BGL)",
+ "Bugarski tvrdi lev",
}
BGN{
"BGN",
@@ -125,15 +125,15 @@
}
BHD{
"BHD",
- "Bahreinski dinar (BHD)",
+ "Bahreinski dinar",
}
BIF{
"BIF",
- "Burundski franak (BIF)",
+ "Burundski franak",
}
BMD{
"BMD",
- "Bermudski dolar (BMD)",
+ "Bermudski dolar",
}
BND{
"BND",
@@ -141,67 +141,67 @@
}
BOB{
"BOB",
- "Bolivijski boliviano",
+ "Bolivijski Boliviano",
}
BOP{
"BOP",
- "Bolivijski pezo (BOP)",
+ "Bolivijski pezo",
}
BOV{
"BOV",
- "Bolivijski mvdol (BOV)",
+ "Bolivijski mvdol",
}
BRB{
"BRB",
- "Brazilski kruzeiro novo (1967-1986) (BRB)",
+ "Brazilski novi kruzeiro (1967-1986)",
}
BRC{
"BRC",
- "Brazilski kruzado (BRC)",
+ "Brazilijski kruzado",
}
BRE{
"BRE",
- "Brazilski kruzeiro (1990-1993) (BRE)",
+ "Brazilski kruzeiro (1990-1993)",
}
BRL{
"R$",
- "Brazilski real",
+ "Brazilski Real",
}
BRN{
"BRN",
- "Brazilski kruzado novo (BRN)",
+ "Brazilijski novi kruzado",
}
BRR{
"BRR",
- "Brazilski kruzeiro (BRR)",
+ "Brazilski kruzeiro",
}
BSD{
"BSD",
- "Bahamski dolar (BSD)",
+ "Bahamski dolar",
}
BTN{
"BTN",
- "Butanski ngultrum (BTN)",
+ "Butanski ngultrum",
}
BUK{
"BUK",
- "Burmanski kjat (BUK)",
+ "Burmanski kjat",
}
BWP{
"BWP",
- "Botsvanska pula (BWP)",
+ "Bocvanska pula",
}
BYB{
"BYB",
- "Beloruska nova rublja (1994-1999) (BYB)",
+ "Beloruska nova rublja (1994-1999)",
}
BYR{
"BYR",
- "Beloruska rublja (BYR)",
+ "Beloruska rublja",
}
BZD{
"BZD",
- "Belize dolar (BZD)",
+ "Belize dolar",
}
CAD{
"CA$",
@@ -209,11 +209,11 @@
}
CDF{
"CDF",
- "Kongolski franak (CDF)",
+ "Kongolski franak",
}
CHE{
"CHE",
- "WIR Evro (CHE)",
+ "WIR evro",
}
CHF{
"CHF",
@@ -221,11 +221,11 @@
}
CHW{
"CHW",
- "WIR franak (CHW)",
+ "WIR franak",
}
CLF{
"CLF",
- "Čileanski unidades de fomento (CLF)",
+ "Čileovski unidades se fomento",
}
CLP{
"CLP",
@@ -233,7 +233,7 @@
}
CNY{
"CN¥",
- "Kineski Juan Renminbi",
+ "Kineski juan renminbi",
}
COP{
"COP",
@@ -241,11 +241,11 @@
}
COU{
"COU",
- "Unidad de Valor real (COU)",
+ "Unidad de valorški real",
}
CRC{
"CRC",
- "Kostarikanski kolon (CRC)",
+ "Kostarikanski kolon",
}
CSD{
"CSD",
@@ -253,27 +253,31 @@
}
CSK{
"CSK",
- "Čehoslovačka tvrda koruna (CSK)",
+ "Čehoslovačka tvrda kruna",
+ }
+ CUC{
+ "CUC",
+ "Kubanski konvertibilni peso",
}
CUP{
"CUP",
- "Kubanski pezo (CUP)",
+ "Kubanski pezo",
}
CVE{
"CVE",
- "Kejp verdanški eskudo (CVE)",
+ "Zelenortski eskudo",
}
CYP{
"CYP",
- "Kipratska funta (CYP)",
+ "Kiparska funta",
}
CZK{
- "CZK",
+ "Kč",
"Češka kruna",
}
DDM{
"DDM",
- "Istočnoevropska marka (DDM)",
+ "Istočno-nemačka marka",
}
DEM{
"DEM",
@@ -281,7 +285,7 @@
}
DJF{
"DJF",
- "Džibutanski franak (DJF)",
+ "Džibutanski franak",
}
DKK{
"DKK",
@@ -289,23 +293,23 @@
}
DOP{
"DOP",
- "DOminikanski pezo (DOP)",
+ "Dominikanski pezo",
}
DZD{
"DZD",
- "Alžirski dinar (DZD)",
+ "Alžirski dinar",
}
ECS{
"ECS",
- "Ekvadorijski sukr (ECS)",
+ "Ekvadorski sakr",
}
ECV{
"ECV",
- "Ekvadorski unidad de valor konstantin (UVC)",
+ "Ekvadorski unidad de valor konstante",
}
EEK{
"EEK",
- "Estonska kruna",
+ "Estonska kroon",
}
EGP{
"EGP",
@@ -313,15 +317,15 @@
}
ERN{
"ERN",
- "Eritreanska nakfa (ERN)",
+ "Eritrejska nakfa",
}
ESA{
"ESA",
- "Španska pezeta (račun) ESA",
+ "Španska pezeta (račun)",
}
ESB{
"ESB",
- "Španska pezeta (konvertibilni račun) (ESB)",
+ "Španska pezeta (konvertibilniračun)",
}
ESP{
"ESP",
@@ -329,7 +333,7 @@
}
ETB{
"ETB",
- "Etopijski bir (ETB)",
+ "Etiopijski bir",
}
EUR{
"€",
@@ -345,7 +349,7 @@
}
FKP{
"FKP",
- "Foklandska ostrva funta (FKP)",
+ "Foklandska ostrva funta",
}
FRF{
"FRF",
@@ -357,67 +361,67 @@
}
GEK{
"GEK",
- "Gruzijski kupon larit (GEK)",
+ "Gruzijski kupon larit",
}
GEL{
"GEL",
- "Džordžijski lari (GEL)",
+ "Gruzijski lari",
}
GHC{
"GHC",
- "Ganijski cedi (1979-2007) (GHC)",
+ "Ganski cedi (1979-2007)",
}
GHS{
"GHS",
- "Ganijski cedi (GHS)",
+ "Ganski cedi",
}
GIP{
"GIP",
- "Gibraltarska funta (GIP)",
+ "Gibraltarska funta",
}
GMD{
"GMD",
- "Gambijski dalasi (GMD)",
+ "Gambijski dalasi",
}
GNF{
"GNF",
- "Gvinejski franak (GNF)",
+ "Gvinejski franak",
}
GNS{
"GNS",
- "Gvinejski sili (GNS)",
+ "Gvinejski sili",
}
GQE{
"GQE",
- "Evatorijalna gvineja ekvele (GQE)",
+ "Ekvatorijalno-gvinejski ekvele",
}
GRD{
"GRD",
- "Drahma",
+ "Grčka drahma",
}
GTQ{
"GTQ",
- "Gvatemalski kvetzal (GTQ)",
+ "Gvatemalski kvecal",
}
GWE{
"GWE",
- "Portugalska Gvineja eskudo (GWE)",
+ "Portugalska gvineja eskudo",
}
GWP{
"GWP",
- "Gvineja bisao pezo (GWP)",
+ "Gvineja Bisao Pezo",
}
GYD{
"GYD",
- "Guajanski dolar (GYD)",
+ "Gujanski dolar",
}
HKD{
"HK$",
- "Honkonški dolar",
+ "Hongkonški dolar",
}
HNL{
"HNL",
- "Honduranska lempira (HNL)",
+ "Honduraška lempira",
}
HRD{
"HRD",
@@ -429,7 +433,7 @@
}
HTG{
"HTG",
- "Haitski gurd (HTG)",
+ "Haićanski gurd",
}
HUF{
"HUF",
@@ -437,7 +441,7 @@
}
IDR{
"IDR",
- "Indonezijska rupiah",
+ "Indonežanska rupija",
}
IEP{
"IEP",
@@ -445,35 +449,35 @@
}
ILP{
"ILP",
- "Izraelska funta (ILP)",
+ "Izraelska funta",
}
ILR{
"ILR",
- "stari izraelski šekeli",
+ "Stari izraelski šekeli",
}
ILS{
"₪",
- "Izraelski šekel",
+ "Izraelski novi šekel",
}
INR{
- "₹",
- "Indijski rupi",
+ "Rs.",
+ "Indijska rupija",
}
IQD{
"IQD",
- "Irački dinar (IQD)",
+ "Irački dinar",
}
IRR{
"IRR",
- "Iranijski rial (IRR)",
+ "Iranski rijal",
}
ISJ{
"ISJ",
- "stara islandska kruna",
+ "Stara islandska kruna",
}
ISK{
"ISK",
- "Islandska kruna (ISK)",
+ "Islandska kruna",
}
ITL{
"ITL",
@@ -481,14 +485,14 @@
}
JMD{
"JMD",
- "Jamajski dolar (JMD)",
+ "Jamajkanski dolar",
}
JOD{
"JOD",
- "Jordanski dinar (JOD)",
+ "Jordanski dinar",
}
JPY{
- "JP¥",
+ "¥",
"Japanski jen",
}
KES{
@@ -497,23 +501,23 @@
}
KGS{
"KGS",
- "Kirgistanski som (KGS)",
+ "Kirgistanski som",
}
KHR{
"KHR",
- "Kambodžijski riel (KHR)",
+ "Kambodžanski rijel",
}
KMF{
"KMF",
- "Komoranski franak (KMF)",
+ "Komorski franak",
}
KPW{
"KPW",
- "Severnokorejski von (KPW)",
+ "Severnokorejski von",
}
KRW{
"₩",
- "Južno-korejski Von",
+ "Južnokorejski Von",
}
KWD{
"KWD",
@@ -521,31 +525,31 @@
}
KYD{
"KYD",
- "Kajmanska ostrva dolar (KYD)",
+ "Kajmanska ostrva dolar",
}
KZT{
"KZT",
- "Kazahstanski tendž (JZT)",
+ "Kazahstanski tendž",
}
LAK{
"LAK",
- "Laoški kip (LAK)",
+ "Laoški kip",
}
LBP{
"LBP",
- "Lebanska funta (LBR)",
+ "Libanska funta",
}
LKR{
"LKR",
- "Šrilankanski rupi (LKR)",
+ "Šrilankanska rupija",
}
LRD{
"LRD",
- "Liberijski dolar (LRD)",
+ "Liberijski dolar",
}
LSL{
"LSL",
- "Lesotski loti (LSL)",
+ "Lesoto loti",
}
LTL{
"LTL",
@@ -553,11 +557,11 @@
}
LTT{
"LTT",
- "Litvanski talonas (LTT)",
+ "Litvanski talonas",
}
LUC{
"LUC",
- "Luksemburški konvertibilni franak (LUC)",
+ "Luksemburški konvertibilni franak",
}
LUF{
"LUF",
@@ -565,15 +569,15 @@
}
LUL{
"LUL",
- "Luksemburški finansijski franak (LUL)",
+ "Luksemburški finansijski franak",
}
LVL{
"LVL",
- "Latvijski lats (LVL)",
+ "Latvijski lati",
}
LVR{
"LVR",
- "Latvijska rublja (LVR)",
+ "Latvijska rublja",
}
LYD{
"LYD",
@@ -585,19 +589,19 @@
}
MAF{
"MAF",
- "Marokanski franak (MAF)",
+ "Marokanski franak",
}
MDL{
"MDL",
- "Moldovski lju (MDL)",
+ "Moldavski lej",
}
MGA{
"MGA",
- "Malagasijski ariari (MGA)",
+ "Malagasijski ariari",
}
MGF{
"MGF",
- "Malagasijski franak (MGF)",
+ "Malagasijski franak",
}
MKD{
"MKD",
@@ -605,23 +609,23 @@
}
MLF{
"MLF",
- "Malijanski franak (MLF)",
+ "Malijanski franak",
}
MMK{
"MMK",
- "Mjanmaški kjat (MMK)",
+ "Mjanmarski kjat",
}
MNT{
"MNT",
- "Mongolski tugrik (MNT)",
+ "Mongolski tugrik",
}
MOP{
"MOP",
- "Makaniška pataka (MOP)",
+ "Makaniška pataka",
}
MRO{
"MRO",
- "Mauritanijska ugvija",
+ "Mauritanijska ogija",
}
MTL{
"MTL",
@@ -629,63 +633,63 @@
}
MTP{
"MTP",
- "Malteška funta (MTP)",
+ "Malteška funta",
}
MUR{
"MUR",
- "Mauricijska ruplja (MUR)",
+ "Mauricijska rupija",
}
MVR{
"MVR",
- "Maldivijska rufija (MVR)",
+ "Maldivska rufija",
}
MWK{
"MWK",
- "Malavijska kvača (MWK)",
+ "Malavijska kvača",
}
MXN{
"MX$",
- "Meksički peso",
+ "Meksički pezo",
}
MXP{
"MXP",
- "Meksijski srebrno pezo (1861-1992) (MXP)",
+ "Meksički srebrni pezo (1861-1992)",
}
MXV{
"MXV",
- "Meksijski unidad de inverzion (MXV)",
+ "Meksički unidad de inversion (UDI)",
}
MYR{
"MYR",
- "Malezijski ringit",
+ "Malezijski ringgit",
}
MZE{
"MZE",
- "Mozambijski eskudo (MZE)",
+ "Mozambijski eskudo",
}
MZM{
"MZM",
- "Stari mozambijski metikal (MZM)",
+ "Stari mozambijski metikal",
}
MZN{
"MZN",
- "Mozambijski metikal (MZN)",
+ "Mozambijski metikal",
}
NAD{
"NAD",
- "Nambijski dolar (NAD)",
+ "Namibijski dolar",
}
NGN{
"NGN",
- "Nigerijska naira (NGN)",
+ "Nigerijska naira",
}
NIC{
"NIC",
- "Nikaragvanška kordoba (NIC)",
+ "Nikaragvanska kordoba",
}
NIO{
"NIO",
- "Nikaragvanška kordoba oro",
+ "Nikaragvanska zlatna kordoba",
}
NLG{
"NLG",
@@ -697,7 +701,7 @@
}
NPR{
"NPR",
- "Nepalska ruplja (NPR)",
+ "Nepalska rupija",
}
NZD{
"NZ$",
@@ -705,15 +709,15 @@
}
OMR{
"OMR",
- "Omanski rial (OMR)",
+ "Omanski rijal",
}
PAB{
"PAB",
- "Panamanska balboa (PAB)",
+ "Panamska balboa",
}
PEI{
"PEI",
- "Peruvijski inti (PEI)",
+ "Peruanski inti",
}
PEN{
"PEN",
@@ -721,27 +725,27 @@
}
PES{
"PES",
- "Peruvijski sol (PES)",
+ "Peruanski sol",
}
PGK{
"PGK",
- "Papua Nova Gvineja kina (PGK)",
+ "Papuanska kina",
}
PHP{
"PHP",
- "Filipinski peso",
+ "Filipinski pezo",
}
PKR{
"PKR",
- "Pakistanski rupi",
+ "Pakistanska rupija",
}
PLN{
- "PLN",
- "Poljski zlot (PLN)",
+ "zl",
+ "Poljski zlot",
}
PLZ{
"PLZ",
- "Poljski zloti (1950-1995) (PLZ)",
+ "Poljski zloti (1950-1995)",
}
PTE{
"PTE",
@@ -749,23 +753,23 @@
}
PYG{
"PYG",
- "Paragvajski guarni (PYG)",
+ "Paragvajski guarni",
}
QAR{
"QAR",
- "Katarski rial (QAR)",
+ "Katarški rijal",
}
RHD{
"RHD",
- "Rodizijski dolar (RHD)",
+ "Rodejskidolar",
}
ROL{
"ROL",
- "Stari romanski lju (ROL)",
+ "Rumunski lej",
}
RON{
"RON",
- "Rumunski leu",
+ "Rumunski lej (1952-2006)",
}
RSD{
"din.",
@@ -781,31 +785,31 @@
}
RWF{
"RWF",
- "Ruandski franak (RWF)",
+ "Ruandski franak",
}
SAR{
"SAR",
- "Saudijski rijal (SAR)",
+ "Saudijski rijal",
}
SBD{
"SBD",
- "Solomonska ostrva dolar (SBD)",
+ "Solomonsko-ostrvski dolar",
}
SCR{
"SCR",
- "Sejšelski rupi (SCR)",
+ "Sejšelska rupija",
}
SDD{
"SDD",
- "STari sudanski dinar (SDD)",
+ "Stari sudanski dinar",
}
SDG{
"SDG",
- "Sudanska funta (SDG)",
+ "Sudanska funta",
}
SDP{
"SDP",
- "Stara sudanska funta (SDP)",
+ "Stara sudanska funta",
}
SEK{
"SEK",
@@ -817,11 +821,11 @@
}
SHP{
"SHP",
- "Sv. Helenska funta (SHP)",
+ "Sv. jelenska funta",
}
SIT{
"SIT",
- "Slovenski tolar",
+ "Slovenački tolar",
}
SKK{
"SKK",
@@ -829,79 +833,87 @@
}
SLL{
"SLL",
- "Sijeraleonski leone (SLL)",
+ "Sijera-leonški leone",
}
SOS{
"SOS",
- "Somalijski šiling (SOS)",
+ "Somalijski šiling",
}
SRD{
"SRD",
- "Surinamski dolar (SRD)",
+ "Surinamski dolar",
}
SRG{
"SRG",
- "Surinamski gilder (SRG)",
+ "Surinamski gilder",
+ }
+ SSP{
+ "SSP",
+ "Južnosudanska funta",
}
STD{
"STD",
- "Sao Tome i Principe dobra (STD)",
+ "Sao Tome i Principe dobra",
}
SUR{
"SUR",
- "Sovjetska rublja (SUR)",
+ "Sovjetska rublja",
}
SVC{
"SVC",
- "Salvadorski kolon (SVC)",
+ "Salvadorski kolon",
}
SYP{
"SYP",
- "Sirijska funta (SYP)",
+ "Sirijska funta",
}
SZL{
"SZL",
- "Švazi lilangeni (SZL)",
+ "Svazi lilangeni",
}
THB{
"฿",
- "Tai baht (THB)",
+ "Tai baht",
}
TJR{
"TJR",
- "Tadžakistanska rublja (SYR)",
+ "Tadžihistanska rublja",
}
TJS{
"TJS",
- "Tadžikistanski somoni (TJS)",
+ "Tadžihistanski somon",
}
TMM{
"TMM",
- "Turkmenistanski manat (TMM)",
+ "Turkmenistanski manat (1993-2009)",
+ }
+ TMT{
+ "TMT",
+ "Turkmenistanski manat",
}
TND{
"TND",
- "Tunizijski dinar (TND)",
+ "Tunežanski dinar",
}
TOP{
"TOP",
- "Tongška Paʻanga (TOP)",
+ "Tongonška Panga",
}
TPE{
"TPE",
- "Timorški eskudo (TPE)",
+ "Timorški eskudo",
}
TRL{
"TRL",
- "Stara turska lira (TRL)",
+ "Turska lira (1922-2005)",
}
TRY{
- "TRY",
+ "Tl",
"Turska lira",
}
TTD{
"TTD",
- "Trinidad i Tobago dolar (TTD)",
+ "Trinidad tobagoški dolar",
}
TWD{
"NT$",
@@ -909,7 +921,7 @@
}
TZS{
"TZS",
- "Tanzijski šiling (TZS)",
+ "Tanzanijski šiling",
}
UAH{
"UAH",
@@ -917,15 +929,15 @@
}
UAK{
"UAK",
- "Ukrajinski karbovaneti (UAK)",
+ "Ukrajinski karbovaneti",
}
UGS{
"UGS",
- "Ugandijski šiling (1966-1987) (UGS)",
+ "Ugandski šiling (1966-1987)",
}
UGX{
"UGX",
- "Ugandijski šiling (UGX)",
+ "Ugandski šiling",
}
USD{
"US$",
@@ -933,27 +945,27 @@
}
USN{
"USN",
- "SAD dolar (sledeći dan) (USN)",
+ "SAD dolar (sledeći dan)",
}
USS{
"USS",
- "SAD dolar (isti dan) (USS)",
+ "SAD dolar (isti dan)",
}
UYI{
"UYI",
- "Urugvajski pezo en unidades indeksades (UYI)",
+ "Urugvajski pezo en unidades indeksadas",
}
UYP{
"UYP",
- "Urugvajski pezo (1975-1993) (UYP)",
+ "Urugvajski pezo (1975-1993)",
}
UYU{
"UYU",
- "Urugvajski pezo (UYU)",
+ "Urugvajski pezo",
}
UZS{
"UZS",
- "Uzbekistanski som (UZS)",
+ "Uzbekistanski som",
}
VEB{
"VEB",
@@ -967,33 +979,37 @@
"₫",
"Vijetnamski dong",
}
+ VNN{
+ "VNN",
+ "Vijetnamski dong (1978-1985)",
+ }
VUV{
"VUV",
- "Vanatuški vatu (VUV)",
+ "Vanuatski vatu",
}
WST{
"WST",
- "Samoanska tala (WST)",
+ "Samoanska tala",
}
XAF{
"FCFA",
- "CFA franak BEAC (XAF)",
+ "CFA franak BEAC",
}
XAG{
"XAG",
- "Srebro (CAG)",
+ "Srebro",
}
XAU{
"XAU",
- "Zlato (XAU)",
+ "Zlato",
}
XBA{
"XBA",
- "Evropska kompozitna jedinica (XBA)",
+ "Evropska kompozitna jedinica",
}
XBB{
"XBB",
- "Evropska novčana jedinica (XBB)",
+ "Evropska novčana jedinica",
}
XBC{
"XBC",
@@ -1005,47 +1021,47 @@
}
XCD{
"EC$",
- "Istočnokaribijski dolar (XCD)",
+ "Istočno-karipski dolar",
}
XDR{
"XDR",
- "Posebna prava (XDR)",
+ "Posebna crtaća prava",
}
XEU{
"XEU",
- "Evropska valutna jedinica (XEU)",
+ "Evropska valutna jedinica",
}
XFO{
"XFO",
- "Francuski zlatni frank (XFO)",
+ "Francuski zlatni franak",
}
XFU{
"XFU",
- "Francuski UIC-frank (XFU)",
+ "Francuski UIC-franak",
}
XOF{
"CFA",
- "CFA franak BCEAO (XOF)",
+ "CFA franak BCEAO",
}
XPD{
"XPD",
- "Paladijum (XPD)",
+ "Paladijum",
}
XPF{
"CFPF",
- "CFP franak (XPF)",
+ "CFP franak",
}
XPT{
"XPT",
- "Platina (XPT)",
+ "Platina",
}
XRE{
"XRE",
- "RINET fondovi (XRE)",
+ "RINET fond",
}
XTS{
"XTS",
- "Kod testirane valute (XTS)",
+ "Kod testirane valute",
}
XXX{
"XXX",
@@ -1053,55 +1069,67 @@
}
YDD{
"YDD",
- "Jemenski dinar (YDD)",
+ "Jemenski dinar",
}
YER{
"YER",
- "Jemenski rial (YER)",
+ "Jemenski rijal",
}
YUD{
"YUD",
- "Jugoslovenski tvrdi dinar (YUD)",
+ "Jugoslovenski tvrdi dinar",
}
YUM{
"YUM",
- "Jugoslovenski novi dinar (YUM)",
+ "Jugoslovenski novi dinar",
}
YUN{
"YUN",
- "Jugoslovenski konvertibilni dinar (YUN)",
+ "Jugoslovenski konvertibilni dinar",
}
ZAL{
"ZAL",
- "Južnoafrički rand (finansijski) ZAL",
+ "Južno-afrički rand (finansijski)",
}
ZAR{
"ZAR",
- "Južna Afrika Rand",
+ "Južno-afrički rand",
}
ZMK{
"ZMK",
- "Zambijska kvača (ZMK)",
+ "Zambijska kvača (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
+ "Zambijska kvača",
}
ZRN{
"ZRN",
- "Zairski novi zair (ZRN)",
+ "Zairski novi zair",
}
ZRZ{
"ZRZ",
- "Zairski zair (ZRZ)",
+ "Zairski zair",
}
ZWD{
"ZWD",
- "Zimbabvejski dolar (ZWD)",
+ "Zimbabveanski dolar (1980-2008)",
+ }
+ ZWL{
+ "ZWL",
+ "Zimbabveanski dolar (2009)",
+ }
+ ZWR{
+ "ZWR",
+ "Zimbabveanski dolar (2008)",
}
}
CurrencyPlurals{
ADP{
- few{"Andorijske pezete"}
- many{"Andorijskih pezeta"}
- one{"Andorijska pezeta"}
- other{"Andorijske pezete"}
+ few{"andorske pezete"}
+ many{"andorskih pezeta"}
+ one{"andorska pezeta"}
+ other{"andorske pezete"}
}
AED{
few{"UAE dirama"}
@@ -1110,70 +1138,70 @@
other{"UAE dirama"}
}
AFA{
- few{"Avganistanska avgana (AFA)"}
- many{"Avganistanskih avgana (AFA)"}
- one{"Avganistanski avgan (AFA)"}
- other{"Avganistanski avgan (AFA)"}
+ few{"avganistanska avgana (1927-2002)"}
+ many{"avganistanskih avgana (1927-2002)"}
+ one{"avganistanski avgani (1927-2002)"}
+ other{"avganistanskih avgana (1927-2002)"}
}
AFN{
few{"avganistanska avgana"}
many{"avganistanskih avgana"}
- one{"avganistanski avgan"}
- other{"avganistanski avgan"}
+ one{"avganistanski avgani"}
+ other{"avganistanskih avgana"}
}
ALL{
- few{"Albanska leka"}
- many{"Albanskih leka"}
+ few{"albanske leke"}
+ many{"albanskih leka"}
one{"albanski lek"}
- other{"albanski lek"}
+ other{"albanskih leka"}
}
AMD{
- few{"Jermenske drame"}
- many{"Jermenskih drama"}
+ few{"jermenska drama"}
+ many{"jermenskih drama"}
one{"jermenski dram"}
- other{"jermenski drami"}
+ other{"jermenska drama"}
}
ANG{
- few{"Holandskoantilska gildera"}
- many{"Holandskoantilskih gildera"}
- one{"Holandskoantilski gilder"}
- other{"Holandskoantilski gildera"}
+ few{"holandska antila"}
+ many{"holandsko-antilskih gildera"}
+ one{"holandsko-antilski gilder"}
+ other{"holandsko-antilskih gildera"}
}
AOA{
- few{"Angolijske kvanze (AOA)"}
- many{"Angolijskih kvanzi"}
- one{"Angolijska kvanza"}
- other{"Angolijskih kvanzi"}
+ few{"angolijske kvanze"}
+ many{"angolijskih kvanzi"}
+ one{"angolijska kvanza"}
+ other{"angolijskih kvanzi"}
}
AOK{
- few{"Angolijske kvanze (AOK)"}
- many{"Angolijskih kvanzi (AOK)"}
- one{"Angolijska kvanza (AOK)"}
- other{"Angolijskih kvanzi (AOK)"}
+ few{"angolijske kvanze (1977-1990)"}
+ many{"angolijskih kvanzi (1977-1990)"}
+ one{"angolijska kvanza (1977-1990)"}
+ other{"angolijskih kvanzi (1977-1990)"}
}
AON{
- few{"angolijske nove kvanze (AON)"}
- many{"angolijskih novih kvanzi (AON)"}
- one{"angolijska nova kvanza (AON)"}
- other{"angolski novi kvanze (AON)"}
+ few{"angolijske nove kvanze"}
+ many{"angolijskih novih kvanzi"}
+ one{"angolijska nova kvanza"}
+ other{"angolijskih novih kvanzi"}
}
AOR{
- few{"angalske kvanze reađustado (AOR)"}
- many{"angolijskih kvanzi reađustado"}
- one{"angolijska kvanza reađustado"}
- other{"angolijskih kvanzi reađustado"}
+ few{"angolijske kvanze reađustado (1995-1999)"}
+ many{"angolijskih kvanzi reađustado (1995-1999)"}
+ one{"angolijska kvanza reađustado (1995-1999)"}
+ other{"angolijskih kvanzi reađustado (1995-1999)"}
}
ARA{
- few{"argentinska australa (ARA)"}
- many{"argentinskih australa (ARA)"}
- one{"argentinski austral (ARA)"}
- other{"argentinski australs (ARA)"}
+ few{"argentinska australa"}
+ many{"argentinskih australa"}
+ one{"argentinski austral"}
+ other{"argentinskih australa"}
}
ARP{
- few{"argentinska pezosa (ARP)"}
- many{"argentinskih pezosa (ARP)"}
- one{"argentinski pezo (ARP)"}
- other{"argentinskih pezosa (ARP)"}
+ few{"argentinska pezosa (1983-1985)"}
+ many{"argentinskih pezosa (1983-1985)"}
+ one{"argentinski pezo (1983-1985)"}
+ other{"argentinskih pezosa (1983-1985)"}
}
ARS{
few{"argentinska pezosa"}
@@ -1200,10 +1228,10 @@
other{"arubanskih florina"}
}
AZM{
- few{"azerbejdžanska manata(AZM)"}
- many{"azerbejdžanskih manata (AZM)"}
- one{"azerbejdžanski manat (AZM)"}
- other{"azerbejdžanskih manata (AZM)"}
+ few{"azerbejdžanska manata (1993-2006)"}
+ many{"azerbejdžanskih manata (1993-2006)"}
+ one{"azerbejdžanski manat (1993-2006)"}
+ other{"azerbejdžanskih manata (1993-2006)"}
}
AZN{
few{"azerbejdžanska manata"}
@@ -1212,14 +1240,14 @@
other{"azerbejdžanskih manata"}
}
BAD{
- few{"Bosansko-Hercegovačka dinara"}
- many{"Bosansko-Hercegovačkih dinara"}
+ few{"bosansko-hercegovačka dinara"}
+ many{"bosansko-hercegovačkih dinara"}
one{"bosansko-hercegovački dinar"}
other{"bosansko-hercegovačkih dinara"}
}
BAM{
- few{"Bosansko-Hercegovačke konvertibilne marke"}
- many{"Bosansko-Hercegovačkih konvertibilnih maraka"}
+ few{"bosansko-hercegovačke konvertibilne marke"}
+ many{"bosansko-hercegovačkih konvertabilnih maraka"}
one{"bosansko-hercegovačka konvertibilna marka"}
other{"bosansko-hercegovačkih konvertibilnih maraka"}
}
@@ -1237,9 +1265,9 @@
}
BEC{
few{"belgijska franka (konvertibilna)"}
- many{"belgijskih franaka (BEC) (konvertibilnih)"}
+ many{"belgijskih franaka (konvertibilnih)"}
one{"belgijski franak (konvertibilni)"}
- other{"belgijskih franaka BEC (konvertibilnih)"}
+ other{"belgijskih franaka (konvertibilnih)"}
}
BEF{
few{"belgijska franka"}
@@ -1248,10 +1276,10 @@
other{"belgijskih franaka"}
}
BEL{
- few{"belgijska franka (BEL) (finansijska)"}
- many{"belgijskih franaka (BEL) (finansijskih)"}
+ few{"belgijska franka (finansijska)"}
+ many{"belgijskih franaka (finansijskih)"}
one{"belgijski franak (finansijski)"}
- other{"belgijskih franaka BEL (finansijskih)"}
+ other{"belgijskih franaka (finansijskih)"}
}
BGL{
few{"bugarska tvrda leva"}
@@ -1260,15 +1288,15 @@
other{"bugarskih tvrdih leva"}
}
BGN{
- few{"Bugarska leva"}
- many{"Bugarskih leva"}
+ few{"bugarska leva"}
+ many{"bugarskih leva"}
one{"bugarski lev"}
- other{"Bugarskih leva"}
+ other{"bugarskih leva"}
}
BHD{
- few{"bahreinskih dinara"}
+ few{"bahreinska dinara"}
many{"bahreinskih dinara"}
- one{"bahreinskih dinara"}
+ one{"bahreinski dinar"}
other{"bahreinskih dinara"}
}
BIF{
@@ -1296,7 +1324,7 @@
other{"bolivijskih boliviana"}
}
BOP{
- few{"Bolivijska pezosa"}
+ few{"bolivijska pezosa"}
many{"bolivijskih pezosa"}
one{"bolivijski pezo"}
other{"bolivijskih pezosa"}
@@ -1308,22 +1336,22 @@
other{"bolivijskih mvdola"}
}
BRB{
- few{"brazilska nova kruzeira (BRB)"}
- many{"brazilskih novih kruzeira (BRB)"}
- one{"brazilski novi kruzeiro (BRB)"}
- other{"brazilskih novih kruzeira (BRB)"}
+ few{"brazilska nova kruzeira (1967-1986)"}
+ many{"brazilskih novih kruzeira (1967-1986)"}
+ one{"brazilski novi kruzeiro (1967-1986)"}
+ other{"brazilskih novih kruzeira (1967-1986)"}
}
BRC{
few{"brazilska kruzadosa"}
many{"brazilskih kruzadosa"}
- one{"brazilskih kruzado"}
+ one{"brazilski kruzados"}
other{"brazilskih kruzadosa"}
}
BRE{
- few{"brazilska kruzeira (BRE"}
- many{"brazilskih kruzeira (BRE)"}
- one{"brazilski kruzeiro (BRE)"}
- other{"brazilskih kruzeira (BRE)"}
+ few{"brazilska kruzeira (1990-1993)"}
+ many{"brazilskih kruzeira (1990-1993)"}
+ one{"brazilski kruzeiro (1990-1993)"}
+ other{"brazilskih kruzeira (1990-1993)"}
}
BRL{
few{"brazilska reala"}
@@ -1338,7 +1366,7 @@
other{"brazilskih novih kruzada"}
}
BRR{
- few{"brazilijska kruzeira"}
+ few{"brazilska kruzeira"}
many{"brazilskih kruzeira"}
one{"brazilski kruzeiro"}
other{"brazilskih kruzeira"}
@@ -1353,7 +1381,7 @@
few{"butanska ngultruma"}
many{"butanskih ngultruma"}
one{"butanski ngultrum"}
- other{"butanski ngultruma"}
+ other{"butanskih ngultruma"}
}
BUK{
few{"burmanska kjata"}
@@ -1368,16 +1396,16 @@
other{"bocvanskih pula"}
}
BYB{
- few{"beloruske nove rublje (BYB)"}
- many{"beloruskih novih rublji (BYB)"}
- one{"beloruska nova rublja (BYB)"}
- other{"beloruskih novih rublji (BYB)"}
+ few{"beloruske nove rublja (1994-1999)"}
+ many{"beloruskih novih rublji (1994-1999)"}
+ one{"beloruska nova rublja (1994-1999)"}
+ other{"beloruskih novih rublji (1994-1999)"}
}
BYR{
few{"beloruske rublje"}
many{"beloruskih rublji"}
one{"beloruska rublja"}
- other{"bjeloruske rublje"}
+ other{"beloruskih rublji"}
}
BZD{
few{"belizeanska dolara"}
@@ -1386,14 +1414,14 @@
other{"belizeanskih dolara"}
}
CAD{
- few{"Kanadska dolara"}
+ few{"kanadska dolara"}
many{"Kanadskih dolara"}
one{"kanadski dolar"}
other{"kanadskih dolara"}
}
CDF{
few{"kongolska franka"}
- many{"kongoanskih franaka"}
+ many{"kongolskih franaka"}
one{"kongolski franak"}
other{"kongolskih franaka"}
}
@@ -1404,8 +1432,8 @@
other{"WIR evra"}
}
CHF{
- few{"Švajcarska franka"}
- many{"Švajcarskih franaka"}
+ few{"švajcarska franka"}
+ many{"švajcarskih franaka"}
one{"švajcarski franak"}
other{"švajcarskih franaka"}
}
@@ -1413,22 +1441,22 @@
few{"WIR franka"}
many{"WIR franaka"}
one{"WIR franak"}
- other{"WIR franak"}
+ other{"WIR franaka"}
}
CLF{
- few{"čileanska unidades de fomentos"}
- many{"čileanskih unidades de fomentos"}
- one{"čileanski unidades de fomentos"}
- other{"čileanski unidades de fomentos"}
+ few{"čileanska unidades de fomenta"}
+ many{"čileanskih unidades de fomenta"}
+ one{"čileanski unidades de fomento"}
+ other{"čileanski unidadesi de fomento"}
}
CLP{
few{"čileanska pezosa"}
many{"čileanskih pezosa"}
- one{"čileanski pezos"}
- other{"čileanski pezos"}
+ one{"čileanski pezo"}
+ other{"čileanski pezosi"}
}
CNY{
- few{"kineska juana"}
+ few{"kineska juan"}
many{"kineskih juana"}
one{"kineski juan"}
other{"kineskih juana"}
@@ -1437,19 +1465,19 @@
few{"kolumbijska pezosa"}
many{"kolumbijskih pezosa"}
one{"kolumbijski pezo"}
- other{"kolumbijski pezosi"}
+ other{"kolumbijskih pezosa"}
}
COU{
- few{"unidad de valor reala"}
- many{"unidad de valor reala"}
- one{"unidad de valor real"}
- other{"unidad de valor real"}
+ few{"nidad de valor reala"}
+ many{"unidad de valorških reala"}
+ one{"unidad de valorški real"}
+ other{"unidad de valorških reala"}
}
CRC{
few{"kostarikanska kolona"}
many{"kostarikanskih kolona"}
one{"kostarikanski kolon"}
- other{"kostarikanskih kolona"}
+ other{"kostarikanski koloni"}
}
CSD{
few{"stara srpska dinara"}
@@ -1461,7 +1489,13 @@
few{"čehoslovačke tvrde krune"}
many{"čehoslovačkih tvrdih kruna"}
one{"čehoslovačka tvrda kruna"}
- other{"čehoslovačka tvrda kruna"}
+ other{"čehoslovačkih tvrdih kruna"}
+ }
+ CUC{
+ few{"kubanska konvertibilna pezosa"}
+ many{"kubanskih konvertibilnih pezosa"}
+ one{"kubanski konvertibilni peso"}
+ other{"kubanski konvertibilni pezos"}
}
CUP{
few{"kubanska pezosa"}
@@ -1479,7 +1513,7 @@
few{"kiparske funte"}
many{"kiparskih funti"}
one{"kiparska funta"}
- other{"kiparska funta"}
+ other{"kiparskih funti"}
}
CZK{
few{"češke krune"}
@@ -1488,22 +1522,22 @@
other{"čeških kruna"}
}
DDM{
- few{"istočnonemačke marke"}
- many{"istočnonemačkih maraka"}
- one{"istočnonemačka marka"}
- other{"istočnonemačkih maraka"}
+ few{"istočno-nemačke marke"}
+ many{"istočno-nemačkih maraka"}
+ one{"istočno-nemačka marka"}
+ other{"istočno-nemačkih maraka"}
}
DEM{
- few{"Nemačke marke"}
- many{"Nemačkih maraka"}
+ few{"nemačke marke"}
+ many{"nemačkih maraka"}
one{"nemačka marka"}
other{"nemačkih maraka"}
}
DJF{
- few{"džibutska franka"}
- many{"džibutskih franaka"}
- one{"džibutski franak"}
- other{"džibutski franak"}
+ few{"džibutanska franka"}
+ many{"džibutanskih franaka"}
+ one{"džibutanski franak"}
+ other{"džibutanskih franaka"}
}
DKK{
few{"danske krune"}
@@ -1526,14 +1560,14 @@
ECS{
few{"ekvadorska sakra"}
many{"ekvadorskih sakra"}
- one{"ekvadorska sakra"}
+ one{"ekvadorski sakr"}
other{"ekvadorskih sakra"}
}
ECV{
- few{"ekvadorska unidad de valor constante (UVC)"}
- many{"ekvadorskih unidad de valor constante (UVC)"}
- one{"ekvadorski unidad de valor constante (UVC)"}
- other{"ekvadorski unidad de valor constante (UVC)"}
+ few{"ekvadorska unidad de valor konstanta"}
+ many{"ekvadorskih unidad de valor konstanta"}
+ one{"ekvadorski unidad de valor konstante"}
+ other{"ekvadorskih unidad de valor konstanta"}
}
EEK{
few{"estonske krune"}
@@ -1551,25 +1585,25 @@
few{"eritrejske nakfe"}
many{"eritrejskih nakfi"}
one{"eritrejska nakfa"}
- other{"eritrejska nakfa"}
+ other{"eritrejskih nakfi"}
}
ESA{
few{"španske pezete (A račun)"}
many{"španskih pezeta (A račun)"}
one{"španska pezeta (A račun)"}
- other{"španska pezeta (A račun)"}
+ other{"španskih pezeta (A račun)"}
}
ESB{
few{"španske pezete (konvertibilan račun)"}
many{"španskih pezeta (konvertibilan račun)"}
one{"španska pezeta (konvertibilan račun)"}
- other{"španska pezeta (konvertibilan račun)"}
+ other{"španskih pezeta (konvertibilan račun)"}
}
ESP{
few{"španska pezeta"}
many{"španskih pezeta"}
- one{"španskа pezetа"}
- other{"španskе pezetе"}
+ one{"španska pezeta"}
+ other{"španske pezete"}
}
ETB{
few{"etiopijska bira"}
@@ -1584,8 +1618,8 @@
other{"evra"}
}
FIM{
- few{"Finske marke"}
- many{"Finskih maraka"}
+ few{"finske marke"}
+ many{"finskih maraka"}
one{"finska marka"}
other{"finskih maraka"}
}
@@ -1599,11 +1633,11 @@
few{"folklandske funte"}
many{"folklandskih funti"}
one{"folklandska funta"}
- other{"folklandska funta"}
+ other{"folklandskih funti"}
}
FRF{
- few{"Francuska franka"}
- many{"Francuskih franaka"}
+ few{"francuska franka"}
+ many{"francuskih franaka"}
one{"francuski franak"}
other{"francuskih franaka"}
}
@@ -1626,22 +1660,22 @@
other{"gruzijskih larisa"}
}
GHC{
- few{"ganska ceda (GHC)"}
- many{"ganskih ceda (GHC)"}
- one{"ganski ced (GHC)"}
- other{"ganskih ceda (GHC)"}
+ few{"ganska ceda (1979-2007)"}
+ many{"ganskih ceda (1979-2007)"}
+ one{"ganski ced (1979-2007)"}
+ other{"ganskih ceda (1979-2007)"}
}
GHS{
few{"ganska ceda"}
many{"ganskih ceda"}
- one{"ganski cedi"}
- other{"ganski cedi"}
+ one{"ganski ced"}
+ other{"ganskih ceda"}
}
GIP{
few{"gibraltarske funte"}
many{"gibraltarskih funti"}
one{"gibraltarska funta"}
- other{"gibraltarska funta"}
+ other{"gibraltarskih funti"}
}
GMD{
few{"gambijska dalasa"}
@@ -1653,23 +1687,23 @@
few{"gvinejska franka"}
many{"gvinejskih franaka"}
one{"gvinejski franak"}
- other{"gvinejski franak"}
+ other{"gvinejskih franaka"}
}
GNS{
- few{"gvinejska silija"}
- many{"gvinejskih silija"}
+ few{"gvinejska sila"}
+ many{"gvinejskih sila"}
one{"gvinejski sili"}
- other{"gvinejski silij"}
+ other{"gvinejskih sila"}
}
GQE{
- few{"evatorijаlno-gvinejska ekvelа"}
- many{"evatorijаlno-gvinejskih ekvelа"}
- one{"evatorijаlno-gvinejski ekvele"}
- other{"evatorijаlno-gvinejskih ekvelа"}
+ few{"ekvatorijalno-gvinejska ekvela"}
+ many{"ekvatorijalno-gvinejskih ekvela"}
+ one{"ekvatorijalno-gvinejski ekvele"}
+ other{"ekvatorijalno-gvinejskih ekvela"}
}
GRD{
few{"grčke drahme"}
- many{"grčkih drahmi"}
+ many{"drahmi"}
one{"grčka drahma"}
other{"grčkih drahmi"}
}
@@ -1681,21 +1715,21 @@
}
GWE{
few{"portugalsko-gvinejska eskuda"}
- many{"portugalsko-gvinejskih eskuda"}
+ many{"portugalskih gvineja eskudo"}
one{"portugalsko-gvinejski eskudo"}
- other{"portugalsko-gvinejski eskudo"}
+ other{"portugalsko-gvinejskih eskuda"}
}
GWP{
- few{"gvinejа-bisaoška pezosa"}
- many{"gvinejа-bisaoških pezosa"}
- one{"gvinejа-bisaoški pezo"}
- other{"gvinejsko-bisaoski pezos"}
+ few{"gvineja-bisaoška pezosa"}
+ many{"gvineja-bisaoških pezosa"}
+ one{"gvineja-bisaoški pezo"}
+ other{"gvineja-bisaoških pezosa"}
}
GYD{
few{"gvajanska dolara"}
many{"gvajanskih dolara"}
one{"gvajanski dolar"}
- other{"gvajanski dolari"}
+ other{"gvajanskih dolara"}
}
HKD{
few{"hongkonška dolara"}
@@ -1704,40 +1738,40 @@
other{"hongkonških dolara"}
}
HNL{
- few{"honduraškа lempirа"}
- many{"honduraških lempirа"}
+ few{"honduraška lempira"}
+ many{"honduraških lempira"}
one{"honduraški lempir"}
- other{"honduraških lempirа"}
+ other{"honduraških lempira"}
}
HRD{
- few{"Hrvatska dinara"}
- many{"Hrvatskih dinara"}
+ few{"hrvatska dinara"}
+ many{"hrvatskih dinara"}
one{"hrvatski dinar"}
other{"hrvatskih dinara"}
}
HRK{
- few{"Hrvatske kune"}
- many{"Hrvatskih kuna"}
+ few{"hrvatske kune"}
+ many{"hrvatskih kuna"}
one{"hrvatska kuna"}
other{"hrvatskih kuna"}
}
HTG{
- few{"haićanska gourda"}
- many{"haićanskih gourda"}
- one{"haićanski gourd"}
- other{"haićanski gourd"}
+ few{"haićanska gurda"}
+ many{"haićanskih gurda"}
+ one{"haićanski gurd"}
+ other{"haićanskih gurda"}
}
HUF{
few{"mađarske forinte"}
many{"mađarskih forinti"}
one{"mađarska forinta"}
- other{"mađarske forinte"}
+ other{"mađarskih forinti"}
}
IDR{
few{"indonežanske rupije"}
many{"indonežanskih rupija"}
one{"indonežanska rupija"}
- other{"indonežanske rupije"}
+ other{"indonežanskih rupija"}
}
IEP{
few{"irske funte"}
@@ -1749,7 +1783,7 @@
few{"izraelske funte"}
many{"izraelskih funti"}
one{"izraelska funta"}
- other{"izraelska funta"}
+ other{"izraelskih funti"}
}
ILR{
few{"stari izraelski šekeli"}
@@ -1758,10 +1792,10 @@
other{"stari izraelski šekeli"}
}
ILS{
- few{"nova izraelska šekela"}
- many{"novih izraelskih šekela"}
- one{"novi izraelski šekel"}
- other{"novih izraelskih šekela"}
+ few{"izraelska nova šekela"}
+ many{"izraelskih novih šekela"}
+ one{"izraelski novi šekel"}
+ other{"izraelskih novih šekela"}
}
INR{
few{"indijske rupije"}
@@ -1773,13 +1807,13 @@
few{"iračka dinara"}
many{"iračkih dinara"}
one{"irački dinar"}
- other{"irački dinari"}
+ other{"iračkih dinara"}
}
IRR{
few{"iranska rijala"}
many{"iranskih rijala"}
one{"iranski rijal"}
- other{"iranski rijali"}
+ other{"iranskih rijala"}
}
ISJ{
few{"stara islandska kruna"}
@@ -1791,31 +1825,31 @@
few{"islandske krune"}
many{"islandskih kruna"}
one{"islandska kruna"}
- other{"islandska kruna"}
+ other{"islandskih kruna"}
}
ITL{
- few{"Italijanske lire"}
- many{"Italijanskih lira"}
+ few{"italijanske lire"}
+ many{"italijanskih lira"}
one{"italijanska lira"}
other{"italijanske lire"}
}
JMD{
- few{"jamajska dolara"}
- many{"jamajskih dolara"}
- one{"jamajski dolar"}
- other{"jamajskih dolara"}
+ few{"jamajkanska dolara"}
+ many{"jamajkanskix dolara"}
+ one{"jamajkanski dolar"}
+ other{"jamajkanskix dolara"}
}
JOD{
- few{"jordanskih dinara"}
+ few{"jordanska dinara"}
many{"jordanskih dinara"}
- one{"ordanskih dinara"}
- other{"ordanskih dinara"}
+ one{"jordanski dinar"}
+ other{"jordanskih dinara"}
}
JPY{
- few{"Japanska jena"}
- many{"Japanskih jena"}
+ few{"japanska jena"}
+ many{"japanskih jena"}
one{"japanski jen"}
- other{"japanski jen"}
+ other{"japanskih jena"}
}
KES{
few{"kenijska šilinga"}
@@ -1827,43 +1861,43 @@
few{"kirgistanska soma"}
many{"kirgistanskih soma"}
one{"kirgistanski som"}
- other{"kirgijski som"}
+ other{"kirgistanskih soma"}
}
KHR{
few{"kambodžanska rijela"}
many{"kambodžanskih rijela"}
- one{"kambodžanski rijal"}
+ one{"kambodžanski rijel"}
other{"kambodžanskih rijela"}
}
KMF{
- few{"komoranska franka"}
- many{"komoranskih franaka"}
- one{"komoranski franak"}
- other{"komoranski franci"}
+ few{"komorska franka"}
+ many{"komorskih franaka"}
+ one{"komorski franak"}
+ other{"komorskih franaka"}
}
KPW{
few{"severnokorejska vona"}
many{"severnokorejskih vona"}
one{"severnokorejski von"}
- other{"severnokorejski von"}
+ other{"severnokorejskih vona"}
}
KRW{
- few{"južno-korejska vona"}
- many{"južno-korejskih vona"}
- one{"južno-korejski von"}
- other{"južno-korejski von"}
+ few{"južnokorejska vona"}
+ many{"južnokorejskih vona"}
+ one{"južnokorejski von"}
+ other{"južnokorejskih vona"}
}
KWD{
- few{"kuvajtskih dinara"}
+ few{"kuvajtska dinara"}
many{"kuvajtskih dinara"}
- one{"kuvajtskih dinara"}
+ one{"kuvajtski dinar"}
other{"kuvajtskih dinara"}
}
KYD{
few{"kajmanska dolara"}
many{"kajmanskih dolara"}
one{"kajmanski dolar"}
- other{"kajmanski dolar"}
+ other{"kajmanskih dolara"}
}
KZT{
few{"kazahstanske tendže"}
@@ -1875,19 +1909,19 @@
few{"laoška kipa"}
many{"laoških kipa"}
one{"laoški kip"}
- other{"laoški kipovi"}
+ other{"laoški kipi"}
}
LBP{
- few{"lebanske funte"}
- many{"lebanskih funti"}
- one{"lebanska funta"}
- other{"lebanske funte"}
+ few{"libanske funte"}
+ many{"libanskih funti"}
+ one{"libanska funta"}
+ other{"libanskih funti"}
}
LKR{
few{"šrilankanske rupije"}
- many{"šrilankanskih ruplji"}
+ many{"šrilankanskih rupija"}
one{"šrilankanska rupija"}
- other{"šrilankanska rupija"}
+ other{"šrilankanskih rupija"}
}
LRD{
few{"liberijska dolara"}
@@ -1902,22 +1936,22 @@
other{"lesotskih lotisa"}
}
LTL{
- few{"litvanske lite"}
- many{"litvanskih lita"}
- one{"litvanska lita"}
- other{"litvanskih lita"}
+ few{"litvanska litasa"}
+ many{"litvanskih litasa"}
+ one{"litvanski litas"}
+ other{"litvanskih litasa"}
}
LTT{
- few{"litvanske talone"}
- many{"litvanskih talona"}
- one{"litvanska talona"}
- other{"litvanskih talona"}
+ few{"litvanska talonasa"}
+ many{"litvanskih talonasa"}
+ one{"litvanski talonas"}
+ other{"litvanskih talonasa"}
}
LUC{
few{"luksemburška konvertibilna franka"}
many{"luksemburških konvertibilnih franaka"}
one{"luksemburški konvertibilni franak"}
- other{"luksemburški konvertibilni franak"}
+ other{"luksemburških konvertibilnih franaka"}
}
LUF{
few{"luksemburška franka"}
@@ -1926,94 +1960,94 @@
other{"luksemburški franci"}
}
LUL{
- few{"luksemburška financijska franka"}
- many{"luksemburških financijskih franaka"}
- one{"luksemburški financijski franak"}
- other{"luksemburški financijski franak"}
+ few{"luksemburška finansijska franka"}
+ many{"luksemburških finansijskih franaka"}
+ one{"luksemburški finansijski franak"}
+ other{"luksemburških finansijskih franaka"}
}
LVL{
few{"latvijska lata"}
many{"latvijskih lata"}
one{"latvijski lat"}
- other{"latvijski lat"}
+ other{"latvijskih lata"}
}
LVR{
- few{"latvijska rublja"}
+ few{"latvijske rublje"}
many{"latvijskih rublji"}
one{"latvijska rublja"}
- other{"latvijska rublja"}
+ other{"latvijskih rublji"}
}
LYD{
few{"libijska dinara"}
- many{"Libijskih dinara"}
- one{"Libijskih dinara"}
+ many{"libijskih dinara"}
+ one{"libijski dinar"}
other{"libijskih dinara"}
}
MAD{
- few{"marokanske dirame"}
- many{"marokanskih dirama"}
- one{"marokanska dirama"}
- other{"marokanskih dirama"}
+ few{"marokanske dirhame"}
+ many{"marokanskih dirhama"}
+ one{"marokanska dirhama"}
+ other{"marokanskih dirhama"}
}
MAF{
few{"marokanska franka"}
many{"marokanskih franaka"}
one{"marokanski franak"}
- other{"marokanski franak"}
+ other{"marokanskih franaka"}
}
MDL{
few{"moldavska leja"}
many{"moldavskih leja"}
one{"moldavski lej"}
- other{"moldavski lej"}
+ other{"moldavskih leja"}
}
MGA{
- few{"madagaskarska ariarija"}
- many{"madagaskarskih ariarija"}
- one{"madagaskarski ariarij"}
- other{"madagaskarski ariariji"}
+ few{"malagasijska ariarija"}
+ many{"malagasijskih ariarija"}
+ one{"malagasijski ariari"}
+ other{"malagasijskih ariarija"}
}
MGF{
- few{"madagaskarska franka"}
- many{"madagaskarskih franaka"}
- one{"madagaskarski franak"}
- other{"madagaskarskih franaka"}
+ few{"malagašajska franka"}
+ many{"malagašajskih franaka"}
+ one{"malagašajski franak"}
+ other{"malagašajski franci"}
}
MKD{
few{"makedonska denara"}
- many{"Makedonskih denara"}
- one{"Makedonski denar"}
+ many{"makedonskih denara"}
+ one{"makedonski denar"}
other{"makedonskih dinara"}
}
MLF{
few{"malijska franka"}
many{"malijskih franaka"}
one{"malijski franak"}
- other{"malijski franak"}
+ other{"malijskih franaka"}
}
MMK{
few{"mjanmarska kjata"}
many{"mjanmarskih kjata"}
one{"mjanmarski kjat"}
- other{"mjanmarski kjati"}
+ other{"mjanmarskih kjata"}
}
MNT{
few{"mongolska tugrika"}
many{"mongolskih tugrika"}
one{"mongolski tugrik"}
- other{"mongolski tugrici"}
+ other{"mongolskih tugrika"}
}
MOP{
- few{"makaneška patka"}
+ few{"makaneške patake"}
many{"makaneških pataka"}
- one{"makaneški patak"}
- other{"makaneški patak"}
+ one{"makaneška pataka"}
+ other{"makaneških pataka"}
}
MRO{
- few{"mauritanijske ouguje"}
- many{"mauritanijskih ouguja"}
- one{"mauritanijska ouguja"}
- other{"mauritanijske ouguje"}
+ few{"mauritanijske ogije"}
+ many{"mauritanijskih ogija"}
+ one{"mauritanijska ogija"}
+ other{"mauritanijskih ogija"}
}
MTL{
few{"malteške lire"}
@@ -2025,91 +2059,91 @@
few{"malteške funte"}
many{"malteških funti"}
one{"malteška funta"}
- other{"malteška funta"}
+ other{"malteških funti"}
}
MUR{
few{"mauricijske rupije"}
many{"mauricijskih rupija"}
one{"mauricijska rupija"}
- other{"mauricijske rupije"}
+ other{"mauricijskih rupija"}
}
MVR{
- few{"maldivijske rufije"}
- many{"maldivijskih rufija"}
- one{"maldivijska rufija"}
- other{"maldivijska rufija"}
+ few{"maldivske rufije"}
+ many{"maldivskih rufija"}
+ one{"maldivska rufija"}
+ other{"maldivskih rufija"}
}
MWK{
few{"malavijske kvače"}
many{"malavijskih kvača"}
one{"malavijska kvača"}
- other{"malavijska kvača"}
+ other{"malavijskih kvača"}
}
MXN{
few{"meksička pezosa"}
many{"meksičkih pezosa"}
- one{"meksički pezos"}
+ one{"meksički pezo"}
other{"meksičkih pezosa"}
}
MXP{
- few{"meksička srebrna pezosa (MXP)"}
- many{"meksičkih srebrnih pezosa (MXP)"}
- one{"meksički srebrni pezos (MXP)"}
- other{"meksički srebrni pezos (MXP)"}
+ few{"meksička srebrna pezosa"}
+ many{"meksičkih srebrnih pezosa"}
+ one{"meksički srebrni pezo"}
+ other{"meksičkih srebrnih pezosa"}
}
MXV{
- few{"meksička unidads de inversion (UDI)"}
- many{"meksičkih unidads de inversion (UDI)"}
- one{"meksički unidads de inversion (UDI)"}
- other{"meksički unidads de inversion (UDI)"}
+ few{"meksička unidads de inverziona"}
+ many{"meksičkih unidads de inverziona"}
+ one{"meksički unidads de inverzion"}
+ other{"meksičkih unidads de inverziona"}
}
MYR{
- few{"malezijska ringita"}
- many{"malezijskih ringita"}
- one{"malezijski ringit"}
- other{"malezijskih ringita"}
+ few{"malezijska ringgita"}
+ many{"malezijskih ringgita"}
+ one{"malezijski ringgit"}
+ other{"malezijskih ringgita"}
}
MZE{
few{"mozambijska eskuda"}
many{"mozambijskih eskuda"}
one{"mozambijski eskudo"}
- other{"mozambijski eskudo"}
+ other{"mozambijskih eskuda"}
}
MZM{
few{"stara mozambijska metikala"}
many{"starih mozambijskih metikala"}
one{"stari mozambijski metikal"}
- other{"stari mozambijski metikal"}
+ other{"starih mozambijskih metikala"}
}
MZN{
few{"mozambijska metikala"}
many{"mozambijskih metikala"}
one{"mozambijski metikal"}
- other{"mozambijski metikal"}
+ other{"mozambijskih metikala"}
}
NAD{
few{"namibijska dolara"}
many{"namibijskih dolara"}
one{"namibijski dolar"}
- other{"namibijski dolar"}
+ other{"namibijskih dolara"}
}
NGN{
- few{"nigerijska naira"}
+ few{"nigerijske naire"}
many{"nigerijskih naira"}
- one{"nigerijski nair"}
- other{"nigerijski nair"}
+ one{"nigerijska naira"}
+ other{"nigerijskih naira"}
}
NIC{
few{"nikaragvanske kordobe"}
many{"nikaragvanskih kordoba"}
one{"nikaragvanska kordoba"}
- other{"nikaragvanska kordoba"}
+ other{"nikaragvanskih kordoba"}
}
NIO{
few{"nikaragvanske zlatne kordobe"}
many{"nikaragvanskih zlatnih kordoba"}
one{"nikaragvanska zlatna kordoba"}
- other{"nikaragvanska zlatna kordoba"}
+ other{"nikaragvanskih zlatnih kordoba"}
}
NLG{
few{"holandska guldena"}
@@ -2118,16 +2152,16 @@
other{"holandskih guldena"}
}
NOK{
- few{"Norveške kune"}
- many{"Norveških kuna"}
- one{"Norveška kuna"}
+ few{"norveške krune"}
+ many{"norveških kruna"}
+ one{"norveška kruna"}
other{"norveških kruna"}
}
NPR{
few{"nepalske rupije"}
many{"nepalskih rupija"}
one{"nepalska rupija"}
- other{"nepalska rupija"}
+ other{"nepalskih rupija"}
}
NZD{
few{"novozelandska dolara"}
@@ -2139,19 +2173,19 @@
few{"omanska rijala"}
many{"omanskih rijala"}
one{"omanski rijal"}
- other{"omanski rijal"}
+ other{"omanskih rijala"}
}
PAB{
few{"panamske balboe"}
many{"panamskih balboa"}
one{"panamska balboa"}
- other{"panamska balboa"}
+ other{"panamskih balboa"}
}
PEI{
- few{"peruanske inte"}
- many{"peruanskih inti"}
- one{"peruanska inta"}
- other{"peruanska inta"}
+ few{"peruvijska intija"}
+ many{"peruvijskih intija"}
+ one{"peruvijski inti"}
+ other{"peruvijskih intija"}
}
PEN{
few{"peruanska nuevo sola"}
@@ -2163,13 +2197,13 @@
few{"peruanska sola"}
many{"peruanskih sola"}
one{"peruanski sol"}
- other{"peruanski sol"}
+ other{"peruanskih sola"}
}
PGK{
- few{"kine Papue Nove Gvineje"}
- many{"kina Papue Nove Gvineje"}
- one{"kina Papue Nove Gvineje"}
- other{"kina Papue Nove Gvineje"}
+ few{"papuanske kine"}
+ many{"papuanskih kina"}
+ one{"papuanska kina"}
+ other{"papuanskih kina"}
}
PHP{
few{"filipinska pezosa"}
@@ -2181,19 +2215,19 @@
few{"pakistanske rupije"}
many{"pakistanskih rupija"}
one{"pakistanska rupija"}
- other{"pakistanske rupije"}
+ other{"pakistanskih rupija"}
}
PLN{
- few{"poljske zlote"}
+ few{"poljska zlota"}
many{"poljskih zlota"}
one{"poljski zlot"}
- other{"poljski zlot"}
+ other{"poljskih zlota"}
}
PLZ{
- few{"poljske zlote (PLZ)"}
- many{"poljskih zlota (PLZ)"}
- one{"poljski zlot (PLZ)"}
- other{"poljski zlot (PLZ)"}
+ few{"poljska zlota (1950-1995)"}
+ many{"poljskih zlota (1950-1995)"}
+ one{"poljski zlot (1950-1995)"}
+ other{"poljskih zlota (1950-1995)"}
}
PTE{
few{"portugalska eskuda"}
@@ -2204,38 +2238,38 @@
PYG{
few{"paragvajska gvaranija"}
many{"paragvajskih gvaranija"}
- one{"paragvajski gvarani"}
- other{"paragvajski gvarani"}
+ one{"paragvajski gvaranij"}
+ other{"paragvajskih gvaranija"}
}
QAR{
few{"katarska rijala"}
many{"katarskih rijala"}
one{"katarski rijal"}
- other{"katarski rijal"}
+ other{"katarskih rijala"}
}
RHD{
- few{"rodezijska dolara"}
- many{"rodezijskih dolara"}
- one{"rodezijski dolar"}
- other{"rodezijski dolar"}
+ few{"rodežanska dolara"}
+ many{"rodežanskih dolara"}
+ one{"rodežanski dolar"}
+ other{"rodežanskih dolara"}
}
ROL{
- few{"stara rumunjska leja"}
- many{"starih rumunjskih leja"}
- one{"stari rumunjski lej"}
- other{"stari rumunjski lej"}
+ few{"rumunska leja"}
+ many{"rumunskih leja"}
+ one{"rumunski lej"}
+ other{"rumunskih leja"}
}
RON{
- few{"rumunska leua"}
- many{"rumunskih leua"}
- one{"rumunski leu"}
- other{"rumunskih leua"}
+ few{"rumunska leja (1952-2006)"}
+ many{"rumunskih leja (1952-2006)"}
+ one{"rumunski lej (1952-2006)"}
+ other{"rumunskih leja (1952-2006)"}
}
RSD{
few{"srpska dinara"}
many{"srpskih dinara"}
one{"srpski dinar"}
- other{"srpski dinari"}
+ other{"srpskih dinara"}
}
RUB{
few{"ruske rublje"}
@@ -2244,52 +2278,52 @@
other{"ruskih rublji"}
}
RUR{
- few{"ruske rublje (RUR)"}
- many{"ruskih rublji (RUR)"}
- one{"ruska rublja (RUR)"}
- other{"ruskih rublji (RUR)"}
+ few{"ruske rublje (1991-1998)"}
+ many{"ruskih rublji (1991-1998)"}
+ one{"ruska rublja (1991-1998)"}
+ other{"ruskih rublji (1991-1998)"}
}
RWF{
few{"ruandska franka"}
many{"ruandskih franaka"}
one{"ruandski franak"}
- other{"ruandski franci"}
+ other{"ruandskih franaka"}
}
SAR{
few{"saudijska rijala"}
many{"saudijskih rijala"}
one{"saudijski rijal"}
- other{"saudijski rijal"}
+ other{"saudijskih rijala"}
}
SBD{
- few{"solomonskoostrvska dolara"}
- many{"solomonskoostrvskih dolara"}
- one{"solomonskoostrvski dolar"}
- other{"solomonskoostrvski dolar"}
+ few{"solomonsko-ostrvska dolara"}
+ many{"solomonsko-ostrvskih dolara"}
+ one{"solomonsko-ostrvski dolar"}
+ other{"solomonsko-ostrvskih dolara"}
}
SCR{
few{"sejšelske rupije"}
many{"sejšelskih rupija"}
one{"sejšelska rupija"}
- other{"sejšelska rupija"}
+ other{"sejšelskih rupija"}
}
SDD{
few{"stara sudanska dinara"}
many{"starih sudanskih dinara"}
one{"stari sudanski dinar"}
- other{"stari sudanski dinar"}
+ other{"starih sudanskih dinara"}
}
SDG{
few{"sudanske funte"}
many{"sudanskih funti"}
one{"sudanska funta"}
- other{"sudanska funta"}
+ other{"sudanskih funti"}
}
SDP{
few{"stare sudanske funte"}
many{"starih sudanskih funti"}
one{"stara sudanska funta"}
- other{"stara sudanska funta"}
+ other{"starih sudanskih funti"}
}
SEK{
few{"švedske krune"}
@@ -2298,16 +2332,16 @@
other{"švedskih kruna"}
}
SGD{
- few{"singapurška dolara"}
- many{"singapurških dolara"}
- one{"singapurški dolar"}
- other{"singapurških dolara"}
+ few{"singapurska dolara"}
+ many{"singapurskih dolara"}
+ one{"singapurski dolar"}
+ other{"singapurskih dolara"}
}
SHP{
few{"sv. jelenske funte"}
many{"sv. jelenskih funti"}
one{"sv. jelenska funta"}
- other{"sv. jelenska funta"}
+ other{"sv. jelenskih funti"}
}
SIT{
few{"slovenačka tolara"}
@@ -2316,136 +2350,148 @@
other{"slovenačkih tolara"}
}
SKK{
- few{"slovačke kune"}
- many{"slovačkih kuna"}
- one{"slovačka kuna"}
- other{"slovačkih kuna"}
+ few{"slovačke krune"}
+ many{"slovačkih kruna"}
+ one{"slovačka kruna"}
+ other{"slovačkih kruna"}
}
SLL{
- few{"sijeraleonske leone"}
+ few{"sijeraleonska leona"}
many{"sijeraleonskih leona"}
- one{"sijeraleonska leona"}
- other{"sijeraleonske leone"}
+ one{"sijeraleonski leone"}
+ other{"sijeraleonskih leona"}
}
SOS{
few{"somalijska šilinga"}
many{"somalijskih šilinga"}
one{"somalijski šiling"}
- other{"somalijski šilinzi"}
+ other{"somalijskih šilinga"}
}
SRD{
few{"surinamska dolara"}
many{"surinamskih dolara"}
one{"surinamski dolar"}
- other{"surinamski dolar"}
+ other{"surinamskih dolara"}
}
SRG{
- few{"surinamska guldena"}
- many{"surinamskih guldena"}
- one{"surinamski gulden"}
- other{"surinamski gulden"}
+ few{"surinamska gildera"}
+ many{"surinamskih gildera"}
+ one{"surinamski gilder"}
+ other{"surinamskih gildera"}
+ }
+ SSP{
+ few{"južnosudanske funte"}
+ many{"južnosudanskih funti"}
+ one{"južnosudanska funta"}
+ other{"južnosudanskih funti"}
}
STD{
- few{"dobra Sao Toma i Principa"}
- many{"dobra Sao Toma i Principa"}
- one{"dobra Sao Toma i Principa"}
- other{"dobra Sao Toma i Principa"}
+ few{"sao tome i principe dobra"}
+ many{"sao tome i principe dobra"}
+ one{"sao tome i principe dobar"}
+ other{"sao tome i principe dobra"}
}
SUR{
few{"sovjetske rublje"}
many{"sovjetskih rublji"}
one{"sovjetska rublja"}
- other{"sovjetske rublje"}
+ other{"sovjetskih rublji"}
}
SVC{
few{"salvadorska kolona"}
many{"salvadorskih kolona"}
one{"salvadorski kolon"}
- other{"salvadorski kolon"}
+ other{"salvadorskih kolona"}
}
SYP{
few{"sirijske funte"}
many{"sirijskih funti"}
one{"sirijska funta"}
- other{"sirijske funtie"}
+ other{"sirijskih funti"}
}
SZL{
- few{"svazi lilangena"}
- many{"svazi lilangena"}
- one{"svazi lilangena"}
- other{"svazi lilangena"}
+ few{"svazi emalangena"}
+ many{"svazi emalangena"}
+ one{"svazi emalangen"}
+ other{"svazi emalangena"}
}
THB{
- few{"tajlandske bahte"}
- many{"tajlandskih bahta"}
- one{"tajlandska bahta"}
- other{"tajlandska bahta"}
+ few{"tai bahta"}
+ many{"tai bahta"}
+ one{"tai baht"}
+ other{"tai bahta"}
}
TJR{
- few{"tadžikistanske rublje"}
- many{"tadžikistanskih rublji"}
- one{"tadžikistanska rublja"}
- other{"tadžikistanska rublja"}
+ few{"tadžihistanske rublje"}
+ many{"tadžihistanskih rublji"}
+ one{"tadžihistanska rublja"}
+ other{"tadžihistanskih rublji"}
}
TJS{
- few{"tadžikistanska somona"}
- many{"tadžikistanskih somona"}
- one{"tadžikistanski somon"}
- other{"tadžikistanski somon"}
+ few{"tadžihistanska somona"}
+ many{"tadžihistanskih somona"}
+ one{"tadžihistanski somon"}
+ other{"tadžihistanskih somona"}
}
TMM{
+ few{"turkmenistanska manata (1993-2009)"}
+ many{"turkmenistanskih manata (1993-2009)"}
+ one{"turkmenistanski manat (1993-2009)"}
+ other{"turkmenistanski manat (1993-2009)"}
+ }
+ TMT{
few{"turkmenistanska manata"}
many{"turkmenistanskih manata"}
one{"turkmenistanski manat"}
- other{"turkmenistanski manat"}
+ other{"turkmenistanskih manata"}
}
TND{
- few{"tunizijska dinara"}
- many{"tunizijskih dinara"}
- one{"tunizijski dinar"}
- other{"tunizijski dinar"}
+ few{"tunežanska dinara"}
+ many{"tunežanskih dinara"}
+ one{"tunežanski dinar"}
+ other{"tunežanskih dinara"}
}
TOP{
- few{"tongaške pa'ange"}
- many{"tongaških pa'angi"}
- one{"tongaška pa'anga"}
- other{"tongaška pa'anga"}
+ few{"tongaške pange"}
+ many{"tongaških panga"}
+ one{"tongaška panga"}
+ other{"tongaških panga"}
}
TPE{
- few{"timorska eskuda"}
- many{"timorskih eskuda"}
- one{"timorski eskudo"}
- other{"timorski eskudo"}
+ few{"timorška eskuda"}
+ many{"timorških eskuda"}
+ one{"timorški eskudo"}
+ other{"timorških eskuda"}
}
TRL{
- few{"stare turske lire"}
- many{"starih turskih lira"}
- one{"stara turska lira"}
- other{"stara turska lira"}
+ few{"turske lire (1922-2005)"}
+ many{"turskih lira (1922-2005)"}
+ one{"turska lira (1922-2005)"}
+ other{"turskih lira (1922-2005)"}
}
TRY{
few{"turske lire"}
many{"turskih lira"}
one{"turska lira"}
- other{"novih turskih lira"}
+ other{"turskih lira"}
}
TTD{
- few{"trinidadtobaška dolara"}
- many{"trinidadtobaških dolara"}
- one{"trinidadtobaški dolar"}
- other{"trinidadtobaški dolar"}
+ few{"trinidad-tobagoška dolara"}
+ many{"trinidad-tobagoških dolara"}
+ one{"trinidad-tobagoški dolar"}
+ other{"trinidad-tobagoških dolara"}
}
TWD{
few{"nova tajvanska dolara"}
many{"novih tajvanskih dolara"}
one{"novi tajvanski dolar"}
- other{"novi tajvanski dolari"}
+ other{"novih tajvanskih dolara"}
}
TZS{
few{"tanzanijska šilinga"}
many{"tanzanijskih šilinga"}
one{"tanzanijski šiling"}
- other{"tanzanijski šilinzi"}
+ other{"tanzanijskih šilinga"}
}
UAH{
few{"ukrajinske hrivnje"}
@@ -2454,22 +2500,22 @@
other{"ukrajinskih hrivnji"}
}
UAK{
- few{"ukrajinska karbovantsiva"}
- many{"ukrajinskih karbovantsiva"}
- one{"ukrajinski karbovantsiv"}
- other{"ukrajinski karbovantsiv"}
+ few{"ukrajinska karbovanciva"}
+ many{"ukrajinskih karbovanciva"}
+ one{"ukrajinski karbovanec"}
+ other{"ukrajinskih karbovanciva"}
}
UGS{
- few{"ugandska šilinga (UGS)"}
- many{"ugandskih šilinga (UGS)"}
- one{"ugandski šiling (UGS)"}
- other{"ugandski šiling (UGS)"}
+ few{"ugandijska šilinga (1966-1987)"}
+ many{"ugandijskih šilinga (1966-1987)"}
+ one{"ugandijski šiling (1966-1987)"}
+ other{"ugandijskih šilinga (1966-1987)"}
}
UGX{
few{"ugandska šilinga"}
many{"ugandskih šilinga"}
one{"ugandski šiling"}
- other{"ugandski šilinzi"}
+ other{"ugandskih šilinga"}
}
USD{
few{"američka dolara"}
@@ -2478,118 +2524,124 @@
other{"američkih dolara"}
}
USN{
- few{"američka dolara (sledeći dan)"}
- many{"američkih dolara (sledeći dan)"}
- one{"američki dolar (sledeći dan)"}
- other{"američki dolar (sledeći dan)"}
+ few{"SAD dolara (sledeći dan)"}
+ many{"SAD dolara (sledeći dan)"}
+ one{"SAD dolar (sledeći dan)"}
+ other{"SAD dolara (sledeći dan)"}
}
USS{
- few{"američka dolara (isti dan)"}
- many{"američkih dolara (isti dan)"}
- one{"američki dolar (isti dan)"}
- other{"američki dolar (isti dan)"}
+ few{"SAD dolara (isti dan)"}
+ many{"SAD dolara (isti dan)"}
+ one{"SAD dolar (isti dan)"}
+ other{"SAD dolara (isti dan)"}
}
UYI{
- few{"urugvajska pesosa en unidades indexadas"}
- many{"urugvajskih pesosa en unidades indexadas"}
- one{"urugvajski pesos en unidades indexadas"}
- other{"urugvajski pesos en unidades indexadas"}
+ few{"urugvajska pezosa en unidades indeksadesa"}
+ many{"urugvajskih pezosa en unidades indeksadesa"}
+ one{"urugvajski pezo en unidades indeksades"}
+ other{"ugvajskih pezosa en unidades indeksadesa"}
}
UYP{
- few{"urugvajska pezosa (UYP)"}
- many{"urugvajskih pezosa (UYP)"}
- one{"urugvajski pezos (UYP)"}
- other{"urugvajski pezos (UYP)"}
+ few{"urugvajska pezosa (1975-1993)"}
+ many{"urugvajskih pezosa (1975-1993)"}
+ one{"urugvajski pezo (1975-1993)"}
+ other{"urugvajskih pezosa (1975-1993)"}
}
UYU{
few{"urugvajska pezosa"}
many{"urugvajskih pezosa"}
- one{"urugvajski pezos"}
- other{"urugvajski pezos"}
+ one{"urugvajski pezo"}
+ other{"urugvajskih pezosa"}
}
UZS{
few{"uzbekistanska soma"}
many{"uzbekistanskih soma"}
one{"uzbekistanski som"}
- other{"uzbekistanski som"}
+ other{"uzbekistanskih soma"}
}
VEB{
- few{"venecuelska bolivara (1871-2008)"}
- many{"venecuelskih bolivara (1871-2008)"}
- one{"venecuelski bolivar (1871-2008)"}
- other{"venecuelskih bolivara (1871-2008)"}
+ few{"venecuelanska bolivara (1871-2008)"}
+ many{"venecuelanskih bolivara (1871-2008)"}
+ one{"venecuelanski bolivar (1871-2008)"}
+ other{"venecuelanskih bolivara (1871-2008)"}
}
VEF{
- few{"venecuelska bolivara"}
- many{"venecuelskih bolivara"}
- one{"venecuelski bolivar"}
- other{"venecuelskih bolivara"}
+ few{"venecuelanska bolivara"}
+ many{"venecuelanskih bolivara"}
+ one{"venecuelanski bolivar"}
+ other{"venecuelanskih bolivara"}
}
VND{
few{"vijetnamska donga"}
many{"vijetnamskih donga"}
one{"vijetnamski dong"}
- other{"vijetnamski dong"}
+ other{"vijetnamskih donga"}
+ }
+ VNN{
+ few{"vijetnamska donga (1978-1985)"}
+ many{"vijetnamskih donga (1978-1985)"}
+ one{"vijetnamski dong (1978-1985)"}
+ other{"vijetnamskih donga (1978-1985)"}
}
VUV{
few{"vanuatska vatua"}
many{"vanuatskih vatua"}
one{"vanuatski vatu"}
- other{"vanuatski vatui"}
+ other{"vanuatskih vatua"}
}
WST{
few{"samoanske tale"}
many{"samoanskih tala"}
one{"samoanska tala"}
- other{"samoanska tala"}
+ other{"samoanskih tala"}
}
XAF{
few{"CFA franka BEAC"}
many{"CFA franaka BEAC"}
one{"CFA franak BEAC"}
- other{"CFA franci BEAC"}
+ other{"CFA franaka BEAC"}
}
XAG{
few{"srebra"}
many{"srebra"}
one{"srebro"}
- other{"srebro"}
+ other{"srebra"}
}
XAU{
few{"zlata"}
many{"zlata"}
one{"zlato"}
- other{"zlato"}
+ other{"zlata"}
}
XBA{
- few{"evropske složene jedinice"}
- many{"evropskih složenih jedinica"}
- one{"evropska složena jedinica"}
- other{"evropska složena jedinica"}
+ few{"evropske kompozitne jedinice"}
+ many{"evropskih kompozitnih jedinica"}
+ one{"evropska kompozitna jedinica"}
+ other{"evropskih kompozitnih jedinica"}
}
XBB{
- few{"evropske monetarne jedinice"}
- many{"evropskih monetarnih jedinica"}
- one{"evropska monetarna jedinica"}
- other{"evropska monetarna jedinica"}
+ few{"evropske novčane jedinice (XBB)"}
+ many{"evropskih novčanih jedinica (XBB)"}
+ one{"evropska novčana jedinica (XBB)"}
+ other{"evropske novčane jedinice (XBB)"}
}
XBC{
- few{"evropske obračunske jedinice (XBC)"}
- many{"evropskih obračunskih jedinica (XBC)"}
- one{"evropska obračunska jedinica (XBC)"}
- other{"evropska obračunska jedinica (XBC)"}
+ few{"evropske jedinice računa (XBC)"}
+ many{"evropskih jedinica računa (XBC)"}
+ one{"evropska jedinica računa (XBC)"}
+ other{"evropskih jedinica računa (XBC)"}
}
XBD{
- few{"evropske obračunske jedinice (XBD)"}
- many{"evropskih obračunskih jedinica (XBD)"}
- one{"evropska obračunska jedinica (XBC"}
- other{"evropska obračunska jedinica (XBC"}
+ few{"evropske jedinice računa (XBD)"}
+ many{"evropskih jedinica računa (XBD)"}
+ one{"evropska jedinica računa (XBD)"}
+ other{"evropskih jedinica računa (XBD)"}
}
XCD{
- few{"istočnokaripska dolara"}
- many{"istočnokaripskih dolara"}
- one{"istočnokaripski dolar"}
- other{"istočnokaripski dolar"}
+ few{"istočno-karipska dolara"}
+ many{"istočno-karipskix dolara"}
+ one{"istočno-karipski dolar"}
+ other{"istočno-karipskix dolara"}
}
XDR{
few{"posebna crtaća prava"}
@@ -2598,10 +2650,10 @@
other{"posebnih crtaćih prava"}
}
XEU{
- few{"evropske monetarne jedinice (ECU)"}
- many{"evropskih monetarnih jedinica (ECU)"}
- one{"evropska monetarna jedinica (ECU)"}
- other{"evropskih monetarnih jedinica (ECU)"}
+ few{"evropske novčane jedinice (XEU)"}
+ many{"evropskih novčanih jedinica (XEU)"}
+ one{"evropska novčana jedinica (XEU)"}
+ other{"evropskih novčanih jedinica"}
}
XFO{
few{"francuska zlatna franka"}
@@ -2619,7 +2671,7 @@
few{"CFA franka BCEAO"}
many{"CFA franaka BCEAO"}
one{"CFA franak BCEAO"}
- other{"CFA franci BCEAO"}
+ other{"CFA franaka BCEAO"}
}
XPD{
few{"paladijuma"}
@@ -2628,10 +2680,10 @@
other{"paladijuma"}
}
XPF{
- few{"CFP franaka"}
+ few{"CFP franka"}
many{"CFP franaka"}
one{"CFP franak"}
- other{"CFP franci"}
+ other{"CFP franaka"}
}
XPT{
few{"platine"}
@@ -2646,34 +2698,34 @@
other{"RINET fondova"}
}
XTS{
- few{"ispitna koda valute"}
- many{"ispitnih kodova valute"}
- one{"ispitni kod valute"}
- other{"ispitnih kodova valute"}
+ few{"koda testirane valute"}
+ many{"kodova testirane valute"}
+ one{"kod testirane valute"}
+ other{"kodova testirane valute"}
}
XXX{
few{"nepoznate ili nevažeće valute"}
many{"nepoznatih ili nevažećih valuta"}
- one{"nepoznate ili nevažeće valute"}
+ one{"nepoznata ili nevažeća valuta"}
other{"nepoznatih ili nevažećih valuta"}
}
YDD{
- few{"jemenska dinara"}
- many{"jemenskih dinara"}
- one{"jemenski dinar"}
- other{"jemenskih dinara"}
+ few{"jemenska dolara"}
+ many{"jemenskih dolara"}
+ one{"jemenski dolar"}
+ other{"jemenskih dolara"}
}
YER{
few{"jemenska rijala"}
many{"jemenskih rijala"}
one{"jemenski rijal"}
- other{"jemenski rijali"}
+ other{"jemenskih rijala"}
}
YUD{
- few{"jugoslovenska čvrsta dinara"}
- many{"jugoslovenskih čvstih dinara"}
- one{"jugoslovenski čvrsti dinar"}
- other{"jugoslovenskih čvstih dinara"}
+ few{"jugoslovenska tvrda dinara"}
+ many{"jugoslovenskih tvrdih dinara"}
+ one{"jugoslovenski tvrdi dinar"}
+ other{"jugoslovenskih tvrdih dinara"}
}
YUM{
few{"jugoslovenska nova dinara"}
@@ -2688,22 +2740,28 @@
other{"jugoslovenskih konvertibilnih dinara"}
}
ZAL{
- few{"južnoafrička randa (financijska)"}
- many{"južnoafičkih randa (financijskih)"}
- one{"južnoafrički rand (financijski)"}
- other{"južnoafičkih randa (financijskih)"}
+ few{"južnoafrička randa (finansijska)"}
+ many{"južnoafričkih randa (finansijskih)"}
+ one{"južnoafrički rand (finansijski)"}
+ other{"južnoafričkih randa (finansijskih)"}
}
ZAR{
- few{"južnoafrička randa"}
- many{"južnoafričkih randa"}
- one{"južnoafrički rand"}
- other{"južnoafričkih randa"}
+ few{"južno-afrička randa"}
+ many{"južno-afričkih randa"}
+ one{"južno-afrički rand"}
+ other{"južno-afričkih randa"}
}
ZMK{
+ few{"zambijske kvače (1968-2012)"}
+ many{"zambijskih kvača (1968-2012)"}
+ one{"zambijska kvača (1968-2012)"}
+ other{"zambijskih kvača (1968-2012)"}
+ }
+ ZMW{
few{"zambijske kvače"}
many{"zambijskih kvača"}
one{"zambijska kvača"}
- other{"zambijske kvače"}
+ other{"zambijskih kvača"}
}
ZRN{
few{"zairska nova zaira"}
@@ -2718,11 +2776,29 @@
other{"zairskih zaira"}
}
ZWD{
- few{"zimbabvejska dolara"}
- many{"zimbabvejskih dolara"}
- one{"zimbabvejski dolar"}
- other{"zimbabvejski dolari"}
+ few{"zimbabvejska dolara (1980-2008)"}
+ many{"zimbabvejskih dolara (1980-2008)"}
+ one{"zimbabvejski dolar (1980-2008)"}
+ other{"zimbabvejskih dolara (1980-2008)"}
+ }
+ ZWL{
+ few{"zimbabvejska dolara (2009)"}
+ many{"zimbabvejskih dolara (2009)"}
+ one{"zimbabvejski dolar (2009)"}
+ other{"zimbabvejskih dolara (2009)"}
+ }
+ ZWR{
+ few{"zimbabvejska dolara (2008)"}
+ many{"zimbabvejskih dolara (2008)"}
+ one{"zimbabvejski dolar (2008)"}
+ other{"zimbabvejskih dolara (2008)"}
}
}
- Version{"2.0.78.38"}
+ CurrencyUnitPatterns{
+ few{"{0} {1}"}
+ many{"{0} {1}"}
+ one{"{0} {1}"}
+ other{"{0} {1}"}
+ }
+ Version{"2.0.82.51"}
}
diff --git a/data/curr/sr_Latn_BA.txt b/data/curr/sr_Latn_BA.txt
index cb015a6..1a5f126 100644
--- a/data/curr/sr_Latn_BA.txt
+++ b/data/curr/sr_Latn_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/sr_Latn_CS.txt b/data/curr/sr_Latn_CS.txt
index f80a8a8..9df1eb2 100644
--- a/data/curr/sr_Latn_CS.txt
+++ b/data/curr/sr_Latn_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/sr_Latn_ME.txt b/data/curr/sr_Latn_ME.txt
index fefdf54..700e1cb 100755
--- a/data/curr/sr_Latn_ME.txt
+++ b/data/curr/sr_Latn_ME.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/sr_Latn_RS.txt b/data/curr/sr_Latn_RS.txt
index 418f50c..4e4b742 100644
--- a/data/curr/sr_Latn_RS.txt
+++ b/data/curr/sr_Latn_RS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/sr_Latn_YU.txt b/data/curr/sr_Latn_YU.txt
index 56911ca..9451580 100644
--- a/data/curr/sr_Latn_YU.txt
+++ b/data/curr/sr_Latn_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/sr_ME.txt b/data/curr/sr_ME.txt
index 76ef7f7..8535ec0 100644
--- a/data/curr/sr_ME.txt
+++ b/data/curr/sr_ME.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/sr_RS.txt b/data/curr/sr_RS.txt
index d9c7dc2..2fba029 100644
--- a/data/curr/sr_RS.txt
+++ b/data/curr/sr_RS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/sr_YU.txt b/data/curr/sr_YU.txt
index 9bb7c27..e3b8f74 100644
--- a/data/curr/sr_YU.txt
+++ b/data/curr/sr_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/supplementalData.txt b/data/curr/supplementalData.txt
index 7258632..3fd639c 100644
--- a/data/curr/supplementalData.txt
+++ b/data/curr/supplementalData.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/supplementalData.xml
// *
@@ -17,6 +17,15 @@
id{"EUR"}
}
}
+ AC{
+ {
+ from:intvector{
+ 44,
+ 323838976,
+ }
+ id{"SHP"}
+ }
+ }
AD{
{
from:intvector{
@@ -157,15 +166,6 @@
}
}
}
- AN{
- {
- from:intvector{
- -218,
- 763670528,
- }
- id{"ANG"}
- }
- }
AO{
{
from:intvector{
@@ -521,10 +521,28 @@
}
}
{
+ from:intvector{
+ 0,
+ 0,
+ }
id{"BEL"}
+ tender{"false"}
+ to:intvector{
+ 148,
+ 1026440191,
+ }
}
{
+ from:intvector{
+ 0,
+ 0,
+ }
id{"BEC"}
+ tender{"false"}
+ to:intvector{
+ 148,
+ 1026440191,
+ }
}
}
BF{
@@ -686,6 +704,27 @@
}
{
id{"BOV"}
+ tender{"false"}
+ }
+ }
+ BQ{
+ {
+ from:intvector{
+ 301,
+ 1054843904,
+ }
+ id{"USD"}
+ }
+ {
+ from:intvector{
+ 299,
+ -1821388800,
+ }
+ id{"ANG"}
+ to:intvector{
+ 301,
+ 1141243903,
+ }
}
}
BR{
@@ -958,9 +997,11 @@
}
{
id{"CHE"}
+ tender{"false"}
}
{
id{"CHW"}
+ tender{"false"}
}
}
CI{
@@ -1002,6 +1043,7 @@
}
{
id{"CLF"}
+ tender{"false"}
}
}
CM{
@@ -1022,7 +1064,16 @@
id{"CNY"}
}
{
+ from:intvector{
+ 66,
+ 528958464,
+ }
id{"CNX"}
+ tender{"false"}
+ to:intvector{
+ 213,
+ 320765951,
+ }
}
}
CO{
@@ -1035,6 +1086,12 @@
}
{
id{"COU"}
+ tender{"false"}
+ }
+ }
+ CP{
+ {
+ id{"XXX"}
}
}
CR{
@@ -1084,13 +1141,6 @@
CU{
{
from:intvector{
- 176,
- 1468155904,
- }
- id{"CUC"}
- }
- {
- from:intvector{
-816,
1864513536,
}
@@ -1098,6 +1148,13 @@
}
{
from:intvector{
+ 176,
+ 1468155904,
+ }
+ id{"CUC"}
+ }
+ {
+ from:intvector{
-522,
1448128512,
}
@@ -1128,6 +1185,15 @@
}
}
}
+ CW{
+ {
+ from:intvector{
+ 299,
+ -1821388800,
+ }
+ id{"ANG"}
+ }
+ }
CX{
{
from:intvector{
@@ -1210,6 +1276,15 @@
}
}
}
+ DG{
+ {
+ from:intvector{
+ -31,
+ -2046981120,
+ }
+ id{"USD"}
+ }
+ }
DJ{
{
from:intvector{
@@ -1266,6 +1341,15 @@
id{"DZD"}
}
}
+ EA{
+ {
+ from:intvector{
+ 213,
+ 320765952,
+ }
+ id{"EUR"}
+ }
+ }
EC{
{
from:intvector{
@@ -1286,7 +1370,16 @@
}
}
{
+ from:intvector{
+ 171,
+ -619174912,
+ }
id{"ECV"}
+ tender{"false"}
+ to:intvector{
+ 220,
+ -1725372417,
+ }
}
}
EE{
@@ -1378,10 +1471,28 @@
}
}
{
+ from:intvector{
+ 58,
+ -942270464,
+ }
id{"ESA"}
+ tender{"false"}
+ to:intvector{
+ 88,
+ 734077951,
+ }
}
{
+ from:intvector{
+ 36,
+ -1147389952,
+ }
id{"ESB"}
+ tender{"false"}
+ to:intvector{
+ 183,
+ -1355582465,
+ }
}
}
ET{
@@ -1401,6 +1512,18 @@
}
id{"EUR"}
}
+ {
+ from:intvector{
+ 66,
+ 528958464,
+ }
+ id{"XEU"}
+ tender{"false"}
+ to:intvector{
+ 213,
+ 320765951,
+ }
+ }
}
FI{
{
@@ -1875,6 +1998,15 @@
id{"HUF"}
}
}
+ IC{
+ {
+ from:intvector{
+ 213,
+ 320765952,
+ }
+ id{"EUR"}
+ }
+ }
ID{
{
from:intvector{
@@ -1972,13 +2104,6 @@
}
id{"USD"}
}
- {
- from:intvector{
- -31,
- -2046981120,
- }
- id{"GBP"}
- }
}
IQ{
{
@@ -2382,10 +2507,28 @@
}
}
{
+ from:intvector{
+ 0,
+ 0,
+ }
id{"LUC"}
+ tender{"false"}
+ to:intvector{
+ 148,
+ 1026440191,
+ }
}
{
+ from:intvector{
+ 0,
+ 0,
+ }
id{"LUL"}
+ tender{"false"}
+ to:intvector{
+ 148,
+ 1026440191,
+ }
}
}
LV{
@@ -2816,6 +2959,7 @@
}
{
id{"MXV"}
+ tender{"false"}
}
}
MY{
@@ -2872,10 +3016,6 @@
-1022325760,
}
id{"ZAR"}
- to:intvector{
- 169,
- 83326975,
- }
}
}
NC{
@@ -3207,13 +3347,6 @@
PS{
{
from:intvector{
- 191,
- -550520832,
- }
- id{"JOD"}
- }
- {
- from:intvector{
115,
718760960,
}
@@ -3221,6 +3354,13 @@
}
{
from:intvector{
+ 191,
+ -550520832,
+ }
+ id{"JOD"}
+ }
+ {
+ from:intvector{
-20,
-43621376,
}
@@ -3729,6 +3869,15 @@
}
}
}
+ SX{
+ {
+ from:intvector{
+ 299,
+ -1821388800,
+ }
+ id{"ANG"}
+ }
+ }
SY{
{
from:intvector{
@@ -3747,6 +3896,15 @@
id{"SZL"}
}
}
+ TA{
+ {
+ from:intvector{
+ -235,
+ 424514560,
+ }
+ id{"GBP"}
+ }
+ }
TC{
{
from:intvector{
@@ -4095,9 +4253,11 @@
}
{
id{"USN"}
+ tender{"false"}
}
{
id{"USS"}
+ tender{"false"}
}
}
UY{
@@ -4121,6 +4281,7 @@
}
{
id{"UYI"}
+ tender{"false"}
}
}
UZ{
@@ -4257,6 +4418,37 @@
id{"WST"}
}
}
+ XK{
+ {
+ from:intvector{
+ 235,
+ 525885440,
+ }
+ id{"EUR"}
+ }
+ {
+ from:intvector{
+ 217,
+ -158870528,
+ }
+ id{"DEM"}
+ to:intvector{
+ 236,
+ 2106118143,
+ }
+ }
+ {
+ from:intvector{
+ 176,
+ -839611392,
+ }
+ id{"YUM"}
+ to:intvector{
+ 218,
+ -1861837825,
+ }
+ }
+ }
YD{
{
from:intvector{
@@ -4354,16 +4546,36 @@
id{"ZAR"}
}
{
+ from:intvector{
+ 115,
+ 459560960,
+ }
id{"ZAL"}
+ tender{"false"}
+ to:intvector{
+ 185,
+ 570250239,
+ }
}
}
ZM{
{
from:intvector{
+ 315,
+ -211265536,
+ }
+ id{"ZMW"}
+ }
+ {
+ from:intvector{
-15,
-1732857856,
}
id{"ZMK"}
+ to:intvector{
+ 315,
+ -124865537,
+ }
}
}
ZR{
@@ -4446,54 +4658,71 @@
ZZ{
{
id{"XAG"}
+ tender{"false"}
}
{
id{"XAU"}
+ tender{"false"}
}
{
id{"XBA"}
+ tender{"false"}
}
{
id{"XBB"}
+ tender{"false"}
}
{
id{"XBC"}
+ tender{"false"}
}
{
id{"XBD"}
+ tender{"false"}
}
{
id{"XDR"}
+ tender{"false"}
}
{
- id{"XEU"}
- }
- {
+ from:intvector{
+ -294,
+ 416385024,
+ }
id{"XFO"}
+ tender{"false"}
+ to:intvector{
+ 244,
+ 1269579775,
+ }
}
{
id{"XFU"}
+ tender{"false"}
}
{
id{"XPD"}
+ tender{"false"}
}
{
id{"XPT"}
- }
- {
- id{"XRE"}
+ tender{"false"}
}
{
id{"XSU"}
+ tender{"false"}
}
{
id{"XTS"}
+ tender{"false"}
}
{
id{"XUA"}
+ tender{"false"}
}
{
id{"XXX"}
+ tender{"false"}
}
}
}
@@ -4526,10 +4755,6 @@
0,
0,
}
- CHF:intvector{
- 2,
- 5,
- }
CLF:intvector{
0,
0,
diff --git a/data/curr/sv.txt b/data/curr/sv.txt
index 767ec90..89d9315 100644
--- a/data/curr/sv.txt
+++ b/data/curr/sv.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sv.xml
// *
@@ -500,7 +500,7 @@
"israelisk ny shekel",
}
INR{
- "₹",
+ "Rs.",
"indisk rupie",
}
IQD{
@@ -552,7 +552,7 @@
"komorisk franc",
}
KPW{
- "NK₩",
+ "KPW",
"nordkoreansk won",
}
KRH{
@@ -564,7 +564,7 @@
"sydkoreansk won (1945-1953)",
}
KRW{
- "SK₩",
+ "₩",
"sydkoreansk won",
}
KWD{
@@ -1161,6 +1161,10 @@
}
ZMK{
"ZMK",
+ "zambisk kwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"zambisk kwacha",
}
ZRN{
@@ -2334,6 +2338,10 @@
other{"sydafrikanska rand"}
}
ZMK{
+ one{"zambisk kwacha (1968-2012)"}
+ other{"zambiska kwacha (1968-2012)"}
+ }
+ ZMW{
one{"zambisk kwacha"}
other{"zambiska kwacha"}
}
@@ -2362,5 +2370,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
}
diff --git a/data/curr/sw.txt b/data/curr/sw.txt
index 1f4f959..a462ceb 100644
--- a/data/curr/sw.txt
+++ b/data/curr/sw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sw.xml
// *
@@ -264,7 +264,7 @@
"Sheqel Mpya ya Israeli",
}
INR{
- "₹",
+ "Rs.",
"rupia ya India",
}
IQD{
@@ -657,6 +657,10 @@
}
ZMK{
"ZMK",
+ "kwacha ya Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"kwacha ya Zambia",
}
ZWD{
@@ -668,5 +672,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/sw_UG.txt b/data/curr/sw_UG.txt
new file mode 100755
index 0000000..e61f1a4
--- /dev/null
+++ b/data/curr/sw_UG.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/sw_UG.xml
+// *
+// ***************************************************************************
+sw_UG{
+ Currencies{
+ UGX{
+ "USh",
+ "shilingi ya Uganda",
+ }
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/curr/swc.txt b/data/curr/swc.txt
index 81f613a..ffa9e29 100755
--- a/data/curr/swc.txt
+++ b/data/curr/swc.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/swc.xml
// *
@@ -40,7 +40,7 @@
"Dola ya Kanada",
}
CDF{
- "CDF",
+ "FC",
"Faranga ya Kongo",
}
CHF{
@@ -96,7 +96,7 @@
"Faranga ya Gine",
}
INR{
- "₹",
+ "Rs.",
"Rupia ya India",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Kwacha ya Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha ya Zambia",
}
ZWD{
@@ -228,5 +232,5 @@
"Dola ya Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ta.txt b/data/curr/ta.txt
index 25c12ec..8c87238 100644
--- a/data/curr/ta.txt
+++ b/data/curr/ta.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ta.xml
// *
@@ -256,7 +256,7 @@
"இஸ்ரேலி நியூ ஷிகேல்",
}
INR{
- "₹",
+ "Rs.",
"ரூபாய்",
}
IQD{
@@ -641,6 +641,10 @@
}
ZMK{
"ZMK",
+ "ஸாம்பியன் குவாசா (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"ஸாம்பியன் குவாசா",
}
}
@@ -674,5 +678,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ta_LK.txt b/data/curr/ta_LK.txt
index 286c536..93aa276 100755
--- a/data/curr/ta_LK.txt
+++ b/data/curr/ta_LK.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ta_LK.xml
// *
@@ -13,5 +13,5 @@
"இலங்கை ரூபாய்",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ta_MY.txt b/data/curr/ta_MY.txt
index 2c83272..3c88209 100755
--- a/data/curr/ta_MY.txt
+++ b/data/curr/ta_MY.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ta_MY.xml
// *
@@ -17,5 +17,5 @@
"சிங்கப்பூர் டாலர்",
}
}
- Version{"2.0.74.95"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ta_SG.txt b/data/curr/ta_SG.txt
index c04f827..b88a58c 100755
--- a/data/curr/ta_SG.txt
+++ b/data/curr/ta_SG.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ta_SG.xml
// *
@@ -13,9 +13,9 @@
"மலேசிய ரிங்கிட்",
}
SGD{
- "S$",
+ "$",
"சிங்கப்பூர் டாலர்",
}
}
- Version{"2.0.74.95"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/te.txt b/data/curr/te.txt
index 1220173..4b6edaa 100644
--- a/data/curr/te.txt
+++ b/data/curr/te.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/te.xml
// *
@@ -256,7 +256,7 @@
"ఐరాయిలి న్యూ షెక్యెల్",
}
INR{
- "₹",
+ "Rs.",
"రూపాయి",
}
IQD{
@@ -641,6 +641,10 @@
}
ZMK{
"ZMK",
+ "జాంబియన్ క్వాచా (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"జాంబియన్ క్వాచా",
}
}
@@ -674,5 +678,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/teo.txt b/data/curr/teo.txt
index d6fa5b9..697569f 100755
--- a/data/curr/teo.txt
+++ b/data/curr/teo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/teo.xml
// *
@@ -96,7 +96,7 @@
"Ango'otol lok' Gine",
}
INR{
- "₹",
+ "Rs.",
"Ango'otol lok' India",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Ango'otol lok' Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Ango'otol lok' Zambia",
}
ZWD{
@@ -228,5 +232,5 @@
"Edola lok'Zimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/teo_KE.txt b/data/curr/teo_KE.txt
index 5f3cb4c..baa41a1 100755
--- a/data/curr/teo_KE.txt
+++ b/data/curr/teo_KE.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/teo_KE.xml
// *
@@ -13,5 +13,5 @@
"Ango'otol lok' Kenya",
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/th.txt b/data/curr/th.txt
index 190a8b2..72622c8 100644
--- a/data/curr/th.txt
+++ b/data/curr/th.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/th.xml
// *
@@ -488,7 +488,7 @@
"นิวเชเกลอิสราเอล",
}
INR{
- "₹",
+ "Rs.",
"รูปีอินเดีย",
}
IQD{
@@ -1145,6 +1145,10 @@
}
ZMK{
"ZMK",
+ "ควาชาแซมเบีย (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"ควาชาแซมเบีย",
}
ZRN{
@@ -1171,5 +1175,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.79.79"}
+ Version{"2.0.82.57"}
}
diff --git a/data/curr/th_TH.txt b/data/curr/th_TH.txt
index 94c4a72..9820811 100644
--- a/data/curr/th_TH.txt
+++ b/data/curr/th_TH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/th_TH_TRADITIONAL.txt b/data/curr/th_TH_TRADITIONAL.txt
index 9a5620e..37548cf 100644
--- a/data/curr/th_TH_TRADITIONAL.txt
+++ b/data/curr/th_TH_TRADITIONAL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/ti.txt b/data/curr/ti.txt
index 94c141d..15a4168 100644
--- a/data/curr/ti.txt
+++ b/data/curr/ti.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ti.xml
// *
@@ -32,7 +32,7 @@
"የእንግሊዝ ፓውንድ ስተርሊንግ",
}
INR{
- "₹",
+ "Rs.",
"የሕንድ ሩፒ",
}
JPY{
@@ -48,5 +48,5 @@
"የአሜሪካን ዶላር",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ti_ER.txt b/data/curr/ti_ER.txt
index ad10791..7ff68da 100755
--- a/data/curr/ti_ER.txt
+++ b/data/curr/ti_ER.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ti_ER.xml
// *
@@ -13,5 +13,5 @@
"ERN",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/tl.txt b/data/curr/tl.txt
index 2a55f9a..85b090c 100755
--- a/data/curr/tl.txt
+++ b/data/curr/tl.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/tl_PH.txt b/data/curr/tl_PH.txt
index 52f1969..c788c54 100755
--- a/data/curr/tl_PH.txt
+++ b/data/curr/tl_PH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/to.txt b/data/curr/to.txt
index 1f57131..468805e 100755
--- a/data/curr/to.txt
+++ b/data/curr/to.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/to.xml
// *
@@ -16,5 +16,5 @@
"TOP",
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
}
diff --git a/data/curr/tr.txt b/data/curr/tr.txt
index f5881d3..6eeee26 100644
--- a/data/curr/tr.txt
+++ b/data/curr/tr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/tr.xml
// *
@@ -456,7 +456,7 @@
"Yeni İsrail Şekeli",
}
INR{
- "₹",
+ "Rs.",
"Hindistan Rupisi",
}
IQD{
@@ -1085,6 +1085,10 @@
}
ZMK{
"ZMK",
+ "Zambiya Kvaçası (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambiya Kvaçası",
}
ZRN{
@@ -1107,5 +1111,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.79.79"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/twq.txt b/data/curr/twq.txt
index a7542b9..b7e7349 100755
--- a/data/curr/twq.txt
+++ b/data/curr/twq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/twq.xml
// *
@@ -96,7 +96,7 @@
"Ginee Fraŋ",
}
INR{
- "₹",
+ "Rs.",
"Indu Rupii",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Zambi Kwaca (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambi Kwaca",
}
ZWD{
@@ -232,5 +236,5 @@
"Zimbabwe Dollar",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/tzm.txt b/data/curr/tzm.txt
index cf0dd9d..4b16495 100755
--- a/data/curr/tzm.txt
+++ b/data/curr/tzm.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/tzm.xml
// *
@@ -96,7 +96,7 @@
"Frank Uɣini",
}
INR{
- "₹",
+ "Rs.",
"Rupi Uḥindi",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Kwača Uzambi (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwača Uzambi",
}
ZWD{
@@ -232,5 +236,5 @@
"Ḍular Uzimbabwi",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/tzm_Latn.txt b/data/curr/tzm_Latn.txt
index 0bbb4b4..72fe963 100755
--- a/data/curr/tzm_Latn.txt
+++ b/data/curr/tzm_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/tzm_Latn.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/tzm_Latn.xml
*/
tzm_Latn{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/tzm_Latn_MA.txt b/data/curr/tzm_Latn_MA.txt
index 271f885..6465f27 100755
--- a/data/curr/tzm_Latn_MA.txt
+++ b/data/curr/tzm_Latn_MA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/tzm_MA.txt b/data/curr/tzm_MA.txt
index ebd194c..ee6f521 100755
--- a/data/curr/tzm_MA.txt
+++ b/data/curr/tzm_MA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/uk.txt b/data/curr/uk.txt
index b233294..5829e6c 100644
--- a/data/curr/uk.txt
+++ b/data/curr/uk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uk.xml
// *
@@ -321,7 +321,7 @@
}
ESA{
"ESA",
- "Іспанська песета (\"А\" рахунок)",
+ "Іспанська песета (\u0022А\u0022 рахунок)",
}
ESB{
"ESB",
@@ -456,7 +456,7 @@
"Ізраїльський новий шекель",
}
INR{
- "₹",
+ "Rs.",
"Індійська рупія",
}
IQD{
@@ -1085,6 +1085,10 @@
}
ZMK{
"ZMK",
+ "Замбійська квача (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Замбійська квача",
}
ZRN{
@@ -1514,6 +1518,12 @@
other{"південноафриканського ранда"}
}
ZMK{
+ few{"замбійські квачі (1968-2012)"}
+ many{"замбійських квач (1968-2012)"}
+ one{"замбійська квача (1968-2012)"}
+ other{"Замбійські квачі (1968-2012)"}
+ }
+ ZMW{
few{"замбійські квачі"}
many{"замбійських квач"}
one{"замбійська квача"}
@@ -1538,5 +1548,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/ur.txt b/data/curr/ur.txt
index b57176c..de0001f 100644
--- a/data/curr/ur.txt
+++ b/data/curr/ur.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ur.xml
// *
@@ -264,7 +264,7 @@
"اسرائیلی نیا شیکل",
}
INR{
- "₹",
+ "Rs.",
"انڈین روپیہ",
}
IQD{
@@ -460,7 +460,7 @@
"فلپائینی پیسہ",
}
PKR{
- "PKRs",
+ "Rs",
"پاکستانی روپیہ",
}
PLN{
@@ -661,6 +661,10 @@
}
ZMK{
"ZMK",
+ "زامبیائی کواچا (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"زامبیائی کواچا",
}
}
@@ -698,5 +702,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/uz.txt b/data/curr/uz.txt
index 26db50d..7ddf21d 100644
--- a/data/curr/uz.txt
+++ b/data/curr/uz.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/uz.xml
*/
uz{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/uz_AF.txt b/data/curr/uz_AF.txt
index 0010d89..5996fc9 100644
--- a/data/curr/uz_AF.txt
+++ b/data/curr/uz_AF.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/uz_Arab.txt b/data/curr/uz_Arab.txt
index c6474dc..fb99800 100644
--- a/data/curr/uz_Arab.txt
+++ b/data/curr/uz_Arab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz_Arab.xml
// *
@@ -16,5 +16,5 @@
"افغانی",
}
}
- Version{"2.0.76.36"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/uz_Arab_AF.txt b/data/curr/uz_Arab_AF.txt
index 972b280..9e5d31f 100644
--- a/data/curr/uz_Arab_AF.txt
+++ b/data/curr/uz_Arab_AF.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/uz_Cyrl.txt b/data/curr/uz_Cyrl.txt
index 4f1cc29..9f16779 100644
--- a/data/curr/uz_Cyrl.txt
+++ b/data/curr/uz_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz_Cyrl.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/uz_Cyrl.xml
*/
uz_Cyrl{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/uz_Cyrl_UZ.txt b/data/curr/uz_Cyrl_UZ.txt
index 0776fef..97d565c 100644
--- a/data/curr/uz_Cyrl_UZ.txt
+++ b/data/curr/uz_Cyrl_UZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/uz_Latn.txt b/data/curr/uz_Latn.txt
index 65a7f6e..5363f76 100644
--- a/data/curr/uz_Latn.txt
+++ b/data/curr/uz_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz_Latn.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/uz_Latn.xml
*/
uz_Latn{
- Version{"2.0.74.98"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/uz_UZ.txt b/data/curr/uz_UZ.txt
index a419389..35e0a7f 100644
--- a/data/curr/uz_UZ.txt
+++ b/data/curr/uz_UZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/vai.txt b/data/curr/vai.txt
index 0da4ac7..930d202 100755
--- a/data/curr/vai.txt
+++ b/data/curr/vai.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vai.xml
// *
@@ -96,7 +96,7 @@
"ꕅꔤꕇ ꖢꕟꘋꕃ",
}
INR{
- "₹",
+ "Rs.",
"ꔤꔺꕩ ꖩꔪ",
}
JPY{
@@ -213,6 +213,10 @@
}
ZMK{
"ZMK",
+ "ꕤꔭꕩ ꖴꕎꕦ (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"ꕤꔭꕩ ꖴꕎꕦ",
}
ZWD{
@@ -220,5 +224,5 @@
"ꔽꕓꖜꔃ ꕜꕞ",
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/vai_LR.txt b/data/curr/vai_LR.txt
index 9d1560d..403f4c0 100755
--- a/data/curr/vai_LR.txt
+++ b/data/curr/vai_LR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/vai_Latn.txt b/data/curr/vai_Latn.txt
index e63a32c..17f92fe 100755
--- a/data/curr/vai_Latn.txt
+++ b/data/curr/vai_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vai_Latn.xml
// *
@@ -96,7 +96,7 @@
"Gini Furaŋki",
}
INR{
- "₹",
+ "Rs.",
"Índiya Rupi",
}
JPY{
@@ -217,6 +217,10 @@
}
ZMK{
"ZMK",
+ "Zambiya Kuwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Zambiya Kuwacha",
}
ZWD{
@@ -224,5 +228,5 @@
"Zimbhabhuwe Dala",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/vai_Vaii.txt b/data/curr/vai_Vaii.txt
index a7f9e21..42c6a51 100755
--- a/data/curr/vai_Vaii.txt
+++ b/data/curr/vai_Vaii.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vai_Vaii.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/vai_Vaii.xml
*/
vai_Vaii{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/vai_Vaii_LR.txt b/data/curr/vai_Vaii_LR.txt
index edccde9..dd7fb4c 100755
--- a/data/curr/vai_Vaii_LR.txt
+++ b/data/curr/vai_Vaii_LR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/vi.txt b/data/curr/vi.txt
index 7e67c6e..fccabe8 100644
--- a/data/curr/vi.txt
+++ b/data/curr/vi.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vi.xml
// *
@@ -488,7 +488,7 @@
"Sêken Ixraen",
}
INR{
- "₹",
+ "Rs.",
"Rupi Ấn Độ",
}
IQD{
@@ -1145,6 +1145,10 @@
}
ZMK{
"ZMK",
+ "Đồng kwacha của Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Đồng kwacha của Zambia",
}
ZRN{
@@ -1171,5 +1175,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
}
diff --git a/data/curr/vun.txt b/data/curr/vun.txt
index fc7aea7..89adee8 100755
--- a/data/curr/vun.txt
+++ b/data/curr/vun.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vun.xml
// *
@@ -96,7 +96,7 @@
"Faranga ya Gine",
}
INR{
- "₹",
+ "Rs.",
"Rupia ya India",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Kwacha ya Zambia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwacha ya Zambia",
}
ZWD{
@@ -232,5 +236,5 @@
"Dola ya Zimbabwe",
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/xog.txt b/data/curr/xog.txt
index d7855a9..800d6c3 100755
--- a/data/curr/xog.txt
+++ b/data/curr/xog.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/xog.xml
// *
@@ -96,7 +96,7 @@
"Faranga ya Gini",
}
INR{
- "₹",
+ "Rs.",
"Rupiya ya Buyindi",
}
JPY{
@@ -221,6 +221,10 @@
}
ZMK{
"ZMK",
+ "Kwaca ey'eZambya (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kwaca ey'eZambya",
}
ZWD{
@@ -228,5 +232,5 @@
"Doola ey'eZimbabwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/yav.txt b/data/curr/yav.txt
index 62e1ece..c100f3d 100755
--- a/data/curr/yav.txt
+++ b/data/curr/yav.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/yav.xml
// *
@@ -88,7 +88,7 @@
"silí u kiiné",
}
INR{
- "₹",
+ "Rs.",
"ulupí",
}
JPY{
@@ -104,5 +104,5 @@
"́faláŋɛ u kɔmɔ́ɔl",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/yo.txt b/data/curr/yo.txt
index d2f1417..cd77fa0 100755
--- a/data/curr/yo.txt
+++ b/data/curr/yo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/yo.xml
// *
@@ -96,7 +96,7 @@
"Faransi ti Orílẹ́ède Gini",
}
INR{
- "₹",
+ "Rs.",
"Rupi ti Orílẹ́ède Indina",
}
JPY{
@@ -225,6 +225,10 @@
}
ZMK{
"ZMK",
+ "Kawaṣa ti Orílẹ́ède Saabia (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"Kawaṣa ti Orílẹ́ède Saabia",
}
ZWD{
@@ -232,5 +236,5 @@
"Dọla ti Orílẹ́ède Siibabuwe",
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/zh.txt b/data/curr/zh.txt
index f7b3f6d..3566ba1 100644
--- a/data/curr/zh.txt
+++ b/data/curr/zh.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh.xml
// *
@@ -488,7 +488,7 @@
"以色列新谢克尔",
}
INR{
- "₹",
+ "Rs.",
"印度卢比",
}
IQD{
@@ -1145,6 +1145,10 @@
}
ZMK{
"ZMK",
+ "赞比亚克瓦查 (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"赞比亚克瓦查",
}
ZRN{
@@ -1171,5 +1175,5 @@
CurrencyUnitPatterns{
other{"{0}{1}"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.60"}
}
diff --git a/data/curr/zh_CN.txt b/data/curr/zh_CN.txt
index 348f06e..28103b9 100644
--- a/data/curr/zh_CN.txt
+++ b/data/curr/zh_CN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/zh_HK.txt b/data/curr/zh_HK.txt
index 8e03c71..67efd92 100644
--- a/data/curr/zh_HK.txt
+++ b/data/curr/zh_HK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/zh_Hans.txt b/data/curr/zh_Hans.txt
index e8cbcd7..1542b90 100644
--- a/data/curr/zh_Hans.txt
+++ b/data/curr/zh_Hans.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/zh_Hans.xml
*/
zh_Hans{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/zh_Hans_CN.txt b/data/curr/zh_Hans_CN.txt
index c4f5185..6e6723b 100644
--- a/data/curr/zh_Hans_CN.txt
+++ b/data/curr/zh_Hans_CN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/zh_Hans_HK.txt b/data/curr/zh_Hans_HK.txt
index 3630b6c..69d6498 100644
--- a/data/curr/zh_Hans_HK.txt
+++ b/data/curr/zh_Hans_HK.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans_HK.xml
// *
@@ -56,5 +56,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/zh_Hans_MO.txt b/data/curr/zh_Hans_MO.txt
index 9628793..e63c300 100755
--- a/data/curr/zh_Hans_MO.txt
+++ b/data/curr/zh_Hans_MO.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans_MO.xml
// *
@@ -28,6 +28,10 @@
"KZT",
"哈萨克斯坦腾格",
}
+ MOP{
+ "MOP$",
+ "澳门元",
+ }
NIO{
"NIO",
"尼加拉瓜科多巴",
@@ -40,5 +44,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/zh_Hans_SG.txt b/data/curr/zh_Hans_SG.txt
index 7622bed..95cafcb 100644
--- a/data/curr/zh_Hans_SG.txt
+++ b/data/curr/zh_Hans_SG.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans_SG.xml
// *
@@ -28,6 +28,10 @@
"NIO",
"尼加拉瓜科多巴",
}
+ SGD{
+ "$",
+ "新加坡元",
+ }
XAG{
"XAG",
"白银",
@@ -36,5 +40,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/curr/zh_Hant.txt b/data/curr/zh_Hant.txt
index db4bcae..d8a5504 100644
--- a/data/curr/zh_Hant.txt
+++ b/data/curr/zh_Hant.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hant.xml
// *
@@ -488,7 +488,7 @@
"以色列新謝克爾",
}
INR{
- "₹",
+ "Rs.",
"印度盧比",
}
IQD{
@@ -984,8 +984,8 @@
"烏干達先令",
}
USD{
- "$",
- "美金",
+ "US$",
+ "美元",
}
USN{
"USN",
@@ -1145,6 +1145,10 @@
}
ZMK{
"ZMK",
+ "尚比亞克瓦查 (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"尚比亞克瓦查",
}
ZRN{
@@ -1171,5 +1175,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
}
diff --git a/data/curr/zh_Hant_HK.txt b/data/curr/zh_Hant_HK.txt
index 38b177d..7682e15 100644
--- a/data/curr/zh_Hant_HK.txt
+++ b/data/curr/zh_Hant_HK.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hant_HK.xml
// *
@@ -65,5 +65,5 @@
"太平洋法郎",
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.47"}
}
diff --git a/data/curr/zh_Hant_MO.txt b/data/curr/zh_Hant_MO.txt
index 686610b..0f4c3a1 100644
--- a/data/curr/zh_Hant_MO.txt
+++ b/data/curr/zh_Hant_MO.txt
@@ -1,17 +1,17 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/icu-config.xml & build.xml
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/zh_Hant_MO.xml
// *
// ***************************************************************************
-/**
- * generated alias target
- */
zh_Hant_MO{
- /**
- * so genrb doesn't issue warnings
- */
- ___{""}
+ Currencies{
+ MOP{
+ "MOP$",
+ "澳門元",
+ }
+ }
+ Version{"2.0.82.51"}
}
diff --git a/data/curr/zh_Hant_TW.txt b/data/curr/zh_Hant_TW.txt
index 659b708..99d5a6f 100644
--- a/data/curr/zh_Hant_TW.txt
+++ b/data/curr/zh_Hant_TW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/zh_MO.txt b/data/curr/zh_MO.txt
index 7a340a7..0492740 100644
--- a/data/curr/zh_MO.txt
+++ b/data/curr/zh_MO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/zh_SG.txt b/data/curr/zh_SG.txt
index e5b7c41..4ebb462 100644
--- a/data/curr/zh_SG.txt
+++ b/data/curr/zh_SG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/zh_TW.txt b/data/curr/zh_TW.txt
index 5957fe3..dc597d3 100644
--- a/data/curr/zh_TW.txt
+++ b/data/curr/zh_TW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/curr/zu.txt b/data/curr/zu.txt
index 36568bf..41757ef 100644
--- a/data/curr/zu.txt
+++ b/data/curr/zu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zu.xml
// *
@@ -256,7 +256,7 @@
"i-Israeli New Sheqel",
}
INR{
- "₹",
+ "Rs.",
"i-Indian Rupee",
}
IQD{
@@ -641,6 +641,10 @@
}
ZMK{
"ZMK",
+ "i-Zambian Kwacha (1968-2012)",
+ }
+ ZMW{
+ "ZMW",
"i-Zambian Kwacha",
}
}
@@ -648,5 +652,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/icu-config.xml b/data/icu-config.xml
index 0b4501f..8faffd7 100644
--- a/data/icu-config.xml
+++ b/data/icu-config.xml
@@ -1,7 +1,7 @@
<!--
/*
*******************************************************************************
-* Copyright (C) 2005-2012, International Business Machines Corporation and *
+* Copyright (C) 2005-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@@ -419,13 +419,20 @@
<include locales="mk_MK"/>
<include locales="ml"/>
<include locales="ml_IN"/>
+ <include locales="mn"/>
+ <include locales="mn_Cyrl"/>
+ <include locales="mn_Cyrl_MN"/>
<include locales="mo"/>
<include locales="mr"/>
<include locales="mr_IN"/>
<include locales="ms"/>
<include locales="ms_BN"/>
- <include locales="ms_SG"/>
+ <include locales="ms_Latn"/>
+ <include locales="ms_Latn_BN"/>
+ <include locales="ms_Latn_MY"/>
+ <include locales="ms_Latn_SG"/>
<include locales="ms_MY"/>
+ <include locales="ms_SG"/>
<include locales="mt"/>
<include locales="mt_MT"/>
<include locales="mua"/>
@@ -644,6 +651,12 @@
<include locales="zh_TW"/>
<include locales="zu"/>
<include locales="zu_ZA"/>
+
+ <!-- Google-specific addition of fil data generation regardless of draft status. -->
+ <include locales="fil" draft=".*" />
+ <include locales="fil_PH"/>
+ <include locales="tl"/>
+ <include locales="tl_PH"/>
</locales>
<paths>
<include xpath="//ldml/.*"/>
diff --git a/data/icu-locale-deprecates.xml b/data/icu-locale-deprecates.xml
index d62b394..07f5679 100644
--- a/data/icu-locale-deprecates.xml
+++ b/data/icu-locale-deprecates.xml
@@ -1,7 +1,7 @@
<!--
/*
*******************************************************************************
-* Copyright (C) 2009-2012, International Business Machines Corporation and *
+* Copyright (C) 2009-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@@ -22,6 +22,10 @@
<alias from="kk_KZ" to="kk_Cyrl_KZ" />
<alias from="ks_IN" to="ks_Arab_IN" />
<alias from="mo" to="ro_MD"/>
+ <alias from="mn_MN" to="mn_Cyrl_MN"/>
+ <alias from="ms_BN" to="ms_Latn_BN"/>
+ <alias from="ms_MY" to="ms_Latn_MY"/>
+ <alias from="ms_SG" to="ms_Latn_SG"/>
<alias from="no_NO" to="nb_NO"/>
<alias from="no_NO_NY" to="nn_NO"/>
<alias from="no" to="nb"/>
@@ -31,7 +35,7 @@
<alias from="sh_BA" to="sr_Latn_BA"/>
<alias from="sh_CS" to="sr_Latn_RS"/>
<alias from="sh_YU" to="sr_Latn_RS"/>
- <alias from="shi_MA" to="shi_Latn_MA"/>
+ <alias from="shi_MA" to="shi_Tfng_MA"/>
<alias from="sr_BA" to="sr_Cyrl_BA"/>
<alias from="sr_CS" to="sr_Cyrl_RS"/>
<alias from="sr_ME" to="sr_Latn_ME"/>
diff --git a/data/lang/af.txt b/data/lang/af.txt
index 4285a8e..6c99a36 100644
--- a/data/lang/af.txt
+++ b/data/lang/af.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/af.xml
// *
@@ -339,7 +339,7 @@
vaii{"Vai-syfers"}
}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Taal: {0}"}
script{"Skrif: {0}"}
diff --git a/data/lang/agq.txt b/data/lang/agq.txt
index 36b66f0..00f674c 100755
--- a/data/lang/agq.txt
+++ b/data/lang/agq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/agq.xml
// *
@@ -57,5 +57,5 @@
zh{"Chàenê"}
zu{"Zulù"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/ak.txt b/data/lang/ak.txt
index e30c837..2c4dce6 100755
--- a/data/lang/ak.txt
+++ b/data/lang/ak.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ak.xml
// *
@@ -56,5 +56,5 @@
zh{"Kyaena kasa"}
zu{"Zulu"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/am.txt b/data/lang/am.txt
index 84ddd27..9b0623c 100644
--- a/data/lang/am.txt
+++ b/data/lang/am.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/am.xml
// *
@@ -346,7 +346,7 @@
vaii{"የቫይ አሃዞች"}
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.52"}
codePatterns{
language{"{0}"}
script{"{0}"}
diff --git a/data/lang/ar.txt b/data/lang/ar.txt
index a076839..5ef8f13 100644
--- a/data/lang/ar.txt
+++ b/data/lang/ar.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar.xml
// *
@@ -773,7 +773,7 @@
VALENCIA{"بلنسية"}
WADEGILE{"المندرين باللاتينية - ويد–جيلز"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
codePatterns{
language{"اللغة: {0}"}
script{"نظام الكتابة: {0}"}
diff --git a/data/lang/as.txt b/data/lang/as.txt
index 37f48eb..c83ccb4 100644
--- a/data/lang/as.txt
+++ b/data/lang/as.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/as.xml
// *
@@ -42,5 +42,5 @@
traditional{"পৰম্পৰাগতভাবে শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম"}
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/asa.txt b/data/lang/asa.txt
index df996d2..19f80f1 100755
--- a/data/lang/asa.txt
+++ b/data/lang/asa.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/asa.xml
// *
@@ -57,5 +57,5 @@
zh{"Kichina"}
zu{"Kidhulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/az.txt b/data/lang/az.txt
index 05ff970..500cc51 100644
--- a/data/lang/az.txt
+++ b/data/lang/az.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/az.xml
// *
@@ -653,7 +653,7 @@
pinyin{"Pinyin təqvimi"}
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Dil: {0}"}
script{"Yazı: {0}"}
diff --git a/data/lang/az_AZ.txt b/data/lang/az_AZ.txt
index 881b97c..f76eaaa 100644
--- a/data/lang/az_AZ.txt
+++ b/data/lang/az_AZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/az_Cyrl.txt b/data/lang/az_Cyrl.txt
index 7f8cd2a..d7595e8 100644
--- a/data/lang/az_Cyrl.txt
+++ b/data/lang/az_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/az_Cyrl.xml
// *
@@ -22,5 +22,5 @@
ru{"русҹа"}
zh{"чинҹә"}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/az_Latn.txt b/data/lang/az_Latn.txt
index 72a33fc..fb302c0 100644
--- a/data/lang/az_Latn.txt
+++ b/data/lang/az_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/az_Latn.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/az_Latn.xml
*/
az_Latn{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/az_Latn_AZ.txt b/data/lang/az_Latn_AZ.txt
index 45b7660..f907674 100644
--- a/data/lang/az_Latn_AZ.txt
+++ b/data/lang/az_Latn_AZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/bas.txt b/data/lang/bas.txt
index ceffc00..488b3e2 100755
--- a/data/lang/bas.txt
+++ b/data/lang/bas.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bas.xml
// *
@@ -57,5 +57,5 @@
zh{"Hɔp u kinà"}
zu{"Hɔp u zulù"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/be.txt b/data/lang/be.txt
index 40591c1..e013914 100644
--- a/data/lang/be.txt
+++ b/data/lang/be.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/be.xml
// *
@@ -187,7 +187,7 @@
japanese{"японскі каляндар"}
}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.49"}
codePatterns{
language{"Мова: {0}"}
script{"Пісьмо: {0}"}
diff --git a/data/lang/bem.txt b/data/lang/bem.txt
index d0ece57..71c4de9 100755
--- a/data/lang/bem.txt
+++ b/data/lang/bem.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bem.xml
// *
@@ -57,5 +57,5 @@
zh{"Ichi Chainisi"}
zu{"Ichi Zulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/bez.txt b/data/lang/bez.txt
index aad89c5..2cbba5a 100755
--- a/data/lang/bez.txt
+++ b/data/lang/bez.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bez.xml
// *
@@ -57,5 +57,5 @@
zh{"Hichina"}
zu{"Hizulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/bg.txt b/data/lang/bg.txt
index 885eee7..73c7214 100644
--- a/data/lang/bg.txt
+++ b/data/lang/bg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bg.xml
// *
@@ -772,7 +772,7 @@
VALENCIA{"Валенсиански"}
WADEGILE{"Уейд-Джайлс романизация"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
codePatterns{
language{"{0}"}
script{"{0}"}
diff --git a/data/lang/bm.txt b/data/lang/bm.txt
index 58d7d3b..e270706 100755
--- a/data/lang/bm.txt
+++ b/data/lang/bm.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bm.xml
// *
@@ -57,5 +57,5 @@
zh{"siniwakan"}
zu{"zulukan"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/bn.txt b/data/lang/bn.txt
index 5ba71f7..fad33cb 100644
--- a/data/lang/bn.txt
+++ b/data/lang/bn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bn.xml
// *
@@ -751,7 +751,7 @@
vaii{"ভাই সংখ্যা"}
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.47"}
codePatterns{
language{"ভাষা: {0}"}
script{"লিপি: {0}"}
diff --git a/data/lang/bn_IN.txt b/data/lang/bn_IN.txt
index 8f8acc5..19c209d 100644
--- a/data/lang/bn_IN.txt
+++ b/data/lang/bn_IN.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bn_IN.xml
// *
@@ -37,7 +37,7 @@
taml{"তামিল সংখ্যা"}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
localeDisplayPattern{
keyTypePattern{"{0}: {1}"}
}
diff --git a/data/lang/bo.txt b/data/lang/bo.txt
index 9d7c5d3..34a3112 100644
--- a/data/lang/bo.txt
+++ b/data/lang/bo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bo.xml
// *
@@ -22,5 +22,5 @@
Scripts{
Tibt{"བོད་ཡིག་"}
}
- Version{"2.0.74.85"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/br.txt b/data/lang/br.txt
index 87b5c49..af9a46d 100755
--- a/data/lang/br.txt
+++ b/data/lang/br.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/br.xml
// *
@@ -517,7 +517,6 @@
collation{
big5han{"urzh rummañ sinaek hengounel - Big5"}
dictionary{"urzh rummañ ar geriadur"}
- direct{"eeun"}
ducet{"urzh rummañ Unicode dre ziouer"}
gb2312han{"urzh rummañ sinaek eeunaet - GB2312"}
phonebook{"urzh rummañ al levr-pellgomz"}
@@ -629,5 +628,5 @@
VALLADER{"rannyezh romañchek Vallader"}
WADEGILE{"romanekadur Wade-Giles"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.57"}
}
diff --git a/data/lang/brx.txt b/data/lang/brx.txt
index 1e4334c..e306e74 100755
--- a/data/lang/brx.txt
+++ b/data/lang/brx.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/brx.xml
// *
@@ -683,7 +683,7 @@
SOLBA{"श्टोलविज़्ज़ा या सोलबीका डायलेक्ट"}
TARASK{"तारास्कीएवीचा वर्तनी"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
codePatterns{
script{"देवनागरी: {0}"}
territory{"क्षेत्र:भारत {0}"}
diff --git a/data/lang/bs.txt b/data/lang/bs.txt
index 335a145..663ccd2 100644
--- a/data/lang/bs.txt
+++ b/data/lang/bs.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bs.xml
// *
@@ -692,7 +692,7 @@
TARASK{"Taraskijevica ortografija"}
VALENCIA{"Valencijski"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Jezik: {0}"}
script{"Skript: {0}"}
diff --git a/data/lang/bs_BA.txt b/data/lang/bs_BA.txt
index 3fb951c..a5158e5 100755
--- a/data/lang/bs_BA.txt
+++ b/data/lang/bs_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/bs_Cyrl.txt b/data/lang/bs_Cyrl.txt
index 1ffe340..6e517c9 100755
--- a/data/lang/bs_Cyrl.txt
+++ b/data/lang/bs_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bs_Cyrl.xml
// *
@@ -762,7 +762,7 @@
TARASK{"Тараскијевичка ортографија"}
VALENCIA{"Валенцијска"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.47"}
codePatterns{
language{"{0}"}
script{"{0}"}
diff --git a/data/lang/bs_Latn.txt b/data/lang/bs_Latn.txt
index 3ea3b65..940f036 100755
--- a/data/lang/bs_Latn.txt
+++ b/data/lang/bs_Latn.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bs_Latn.xml
// *
// ***************************************************************************
bs_Latn{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/bs_Latn_BA.txt b/data/lang/bs_Latn_BA.txt
index 3906520..f6c37c6 100755
--- a/data/lang/bs_Latn_BA.txt
+++ b/data/lang/bs_Latn_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/ca.txt b/data/lang/ca.txt
index 2e428bc..fca3469 100644
--- a/data/lang/ca.txt
+++ b/data/lang/ca.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ca.xml
// *
@@ -787,7 +787,6 @@
}
collation{
big5han{"ordre del xinès tradicional - Big5"}
- direct{"directe"}
ducet{"ordenació Unicode predeterminada"}
gb2312han{"ordre del xinès simplificat - GB2312"}
phonebook{"ordre de la guia telefònica"}
@@ -883,7 +882,7 @@
VALLADER{"baix engiadinès"}
WADEGILE{"romanització Wade-Giles"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.57"}
codePatterns{
language{"Idioma: {0}"}
script{"Escriptura: {0}"}
diff --git a/data/lang/cgg.txt b/data/lang/cgg.txt
index d5134e0..c58854b 100755
--- a/data/lang/cgg.txt
+++ b/data/lang/cgg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/cgg.xml
// *
@@ -57,5 +57,5 @@
zh{"Oruchaina"}
zu{"Oruzuru"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/chr.txt b/data/lang/chr.txt
index 82041d8..01a6d45 100755
--- a/data/lang/chr.txt
+++ b/data/lang/chr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/chr.xml
// *
@@ -46,5 +46,5 @@
gregorian{"ᏅᏙ ᏗᏎᏗ"}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/cs.txt b/data/lang/cs.txt
index 8f25c9b..af66a9b 100644
--- a/data/lang/cs.txt
+++ b/data/lang/cs.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/cs.xml
// *
@@ -757,7 +757,7 @@
SCOTLAND{"angličtina (Skotsko)"}
WADEGILE{"Wade-Giles"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Jazyk: {0}"}
script{"Písmo: {0}"}
diff --git a/data/lang/cy.txt b/data/lang/cy.txt
index 187d5f8..fad19ea 100644
--- a/data/lang/cy.txt
+++ b/data/lang/cy.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/cy.xml
// *
@@ -10,99 +10,283 @@
* ICU <specials> source: <path>/xml/main/cy.xml
*/
cy{
+ Keys{
+ calendar{"Calendr"}
+ collation{"Trefn"}
+ currency{"Arian Breiniol"}
+ numbers{"Rhifau"}
+ }
Languages{
- af{"Affricaneg"}
+ ab{"Abchaseg"}
+ af{"Affricâneg"}
+ afa{"Iaith Affro-Asiaidd"}
am{"Amhareg"}
+ ang{"Hen Saesneg"}
ar{"Arabeg"}
+ arc{"Aramaeg"}
+ art{"Iaith Artiffisial"}
as{"Asameg"}
- be{"Belarwsiyn"}
+ ath{"Iaith Athabasgaidd"}
+ aus{"Iaith Awstralaidd"}
+ az{"Aserbaijaneg"}
+ be{"Belarwseg"}
bg{"Bwlgareg"}
bh{"Bihari"}
- bn{"Bengali; Bangla"}
+ bn{"Bengaleg"}
+ bo{"Tibeteg"}
br{"Llydaweg"}
bs{"Bosnieg"}
ca{"Catalaneg"}
- cs{"Tsiec"}
+ cel{"Iaith Geltaidd"}
+ cs{"Tsieceg"}
cy{"Cymraeg"}
da{"Daneg"}
de{"Almaeneg"}
+ de_AT{"Almaeneg Awstria"}
+ de_CH{"Almaeneg Safonol y Swistir"}
+ dum{"Iseldireg Canol"}
+ egy{"Hen Eiffteg"}
el{"Groeg"}
en{"Saesneg"}
+ en_AU{"Saesneg Awstralia"}
+ en_CA{"Saesneg Canada"}
+ en_GB{"Saesneg Prydain"}
+ en_US{"Saesneg UDA"}
+ enm{"Saesneg Canol"}
eo{"Esperanto"}
es{"Sbaeneg"}
+ es_419{"Sbaeneg America Ladin"}
+ es_ES{"Sbaeneg Ewrop"}
et{"Estoneg"}
eu{"Basgeg"}
- fa{"Persieg"}
- fi{"Ffineg"}
- fil{"Tagalog"}
+ fa{"Perseg"}
+ fi{"Ffinneg"}
+ fil{"Ffilipineg"}
+ fiu{"Iaith Ffinno-Wgrig"}
+ fj{"Ffijïeg"}
fo{"Ffaroeg"}
fr{"Ffrangeg"}
+ fr_CA{"Ffrangeg Canada"}
+ fr_CH{"Ffrangeg y Swistir"}
+ frm{"Ffrangeg Canol"}
+ fro{"Hen Ffrangeg"}
+ fur{"Ffriwleg"}
+ fy{"Ffriseg y Gorllewin"}
ga{"Gwyddeleg"}
gd{"Gaeleg yr Alban"}
+ gem{"Iaith Germanaidd"}
gl{"Galiseg"}
+ gn{"Guaraní"}
+ got{"Gotheg"}
+ grc{"Hen Roeg"}
+ gsw{"Almaeneg y Swistir"}
+ gu{"Gwjarati"}
+ gv{"Manaweg"}
+ ha{"Hawsa"}
+ haw{"Hawäieg"}
he{"Hebraeg"}
hi{"Hindi"}
hr{"Croateg"}
+ ht{"Creol Haiti"}
hu{"Hwngareg"}
hy{"Armeneg"}
ia{"Interlingua"}
- id{"Indonesieg"}
+ id{"Indoneseg"}
ie{"Interlingue"}
+ ig{"Igbo"}
+ ine{"Iaith Indo-Ewropeaidd"}
is{"Islandeg"}
it{"Eidaleg"}
- ja{"Siapaneeg"}
+ ja{"Japaneeg"}
jv{"Jafanaeg"}
ka{"Georgeg"}
- km{"Cambodieg"}
- kn{"Kannada"}
+ kk{"Casacheg"}
+ km{"Chmereg"}
+ kn{"Canareg"}
ko{"Corëeg"}
+ ks{"Cashmireg"}
ku{"Cwrdeg"}
+ kw{"Cernyweg"}
+ ky{"Cirgiseg"}
la{"Lladin"}
+ lb{"Lwcsembwrgeg"}
ln{"Lingala"}
lo{"Laoeg"}
lt{"Lithwaneg"}
lv{"Latfieg"}
+ mg{"Malagaseg"}
+ mga{"Gwyddeleg Canol"}
+ mi{"Maori"}
+ mic{"Micmaceg"}
+ mis{"Iaith Amrywiol"}
+ mk{"Macedoneg"}
ml{"Malayalam"}
mn{"Mongoleg"}
+ mo{"Moldofeg"}
mr{"Marathi"}
- ms{"Malai"}
- mt{"Malteseg"}
- ne{"Nepali"}
+ ms{"Maleieg"}
+ mt{"Malteg"}
+ my{"Byrmaneg"}
+ nb{"Norwyeg Bokmål"}
+ ne{"Nepaleg"}
nl{"Iseldireg"}
- nn{"Norwyeg (Nynorsk)"}
+ nl_BE{"Fflemeg"}
+ nn{"Norwyeg Nynorsk"}
no{"Norwyeg"}
+ non{"Hen Norseg"}
oc{"Ocsitaneg"}
or{"Oriya"}
- pa{"Pwnjabi"}
+ pa{"Pwnjabeg"}
+ peo{"Hen Bersieg"}
pl{"Pwyleg"}
+ pro{"Hen Brofensaleg"}
ps{"Pashto"}
- pt{"Portiwgaleg"}
+ pt{"Portiwgeeg"}
+ pt_BR{"Portiwgeeg Brasil"}
+ pt_PT{"Portiwgeeg Ewrop"}
+ qu{"Quechua"}
+ rm{"Romaunsch"}
ro{"Rwmaneg"}
- ru{"Rwsieg"}
+ ru{"Rwseg"}
sa{"Sansgrit"}
+ sco{"Sgoteg"}
sd{"Sindhi"}
+ sga{"Hen Wyddeleg"}
sh{"Serbo-Croateg"}
si{"Sinhaleg"}
sk{"Slofaceg"}
sl{"Slofeneg"}
+ sla{"Iaith Slafig"}
so{"Somaleg"}
sq{"Albaneg"}
sr{"Serbeg"}
st{"Sesotheg"}
- su{"Sundaneg"}
+ su{"Swndaneg"}
sv{"Swedeg"}
sw{"Swahili"}
- ta{"Tamil"}
+ swc{"Swahili'r Congo"}
+ ta{"Tamileg"}
+ te{"Telugu"}
+ tg{"Tajiceg"}
+ th{"Thai"}
+ ti{"Tigriniaeg"}
+ tk{"Twrcmeneg"}
tlh{"Klingon"}
+ to{"Tongeg"}
+ tr{"Tyrceg"}
+ tt{"Tatareg"}
+ ug{"Uighur"}
uk{"Wcreineg"}
- und{"anh"}
+ und{"Iaith Anhysbys"}
+ ur{"Wrdw"}
uz{"Wsbeceg"}
vi{"Fietnameg"}
- zh{"Tseineeg"}
- zu{"Zwlw"}
+ wo{"Woloff"}
+ xh{"Xhosa"}
+ yo{"Iorwba"}
+ yue{"Cantoneeg"}
+ zh{"Tsieineeg"}
+ zh_Hans{"Tsieineeg Symledig"}
+ zh_Hant{"Tsieineeg Traddodiadol"}
+ zu{"Swlw"}
+ zxx{"Dim cynnwys ieithyddol"}
}
Scripts{
+ Arab{"Arabaidd"}
+ Armn{"Armenaidd"}
+ Beng{"Bengalaidd"}
+ Bopo{"Bopomofo"}
+ Brai{"Braille"}
+ Cyrl{"Cyrilig"}
+ Deva{"Defanagari"}
+ Ethi{"Ethiopig"}
+ Geor{"Georgaidd"}
+ Grek{"Groegaidd"}
+ Gujr{"Gwjarataidd"}
+ Guru{"Gwrmwci"}
+ Hang{"Hangwl"}
+ Hani{"Han"}
+ Hans{"Han symledig"}
+ Hant{"Han traddodiadol"}
+ Hebr{"Hebrëig"}
+ Hira{"Hiragana"}
+ Jpan{"Japaneaidd"}
+ Kana{"Catacana"}
+ Khmr{"Cmeraidd"}
+ Knda{"Canaraidd"}
+ Kore{"Coreaidd"}
+ Laoo{"Laoaidd"}
Latn{"Lladin"}
+ Mlym{"Malayalamaidd"}
+ Mong{"Mongolaidd"}
+ Mymr{"Myanmaraidd"}
+ Orya{"Orïaidd"}
+ Sinh{"Sinhanaidd"}
+ Taml{"Tamilaidd"}
+ Telu{"Telwgw"}
+ Thaa{"Thaa"}
+ Thai{"Thai"}
+ Tibt{"Tibetaidd"}
+ Zsym{"Symbolau"}
+ Zxxx{"Anysgrifenedig"}
+ Zyyy{"Cyffredin"}
+ Zzzz{"Ysgriflythyren anhysbys"}
}
- Version{"2.0.78.38"}
+ Types{
+ calendar{
+ gregorian{"Calendr Gregori"}
+ }
+ collation{
+ ducet{"Trefn Rhagosodedig Unicode"}
+ search{"Chwilio at Ddibenion Cyffredinol"}
+ }
+ numbers{
+ arab{"Digidau Arabig-Indig"}
+ arabext{"Digidau Arabig-Indig Estynedig"}
+ armn{"Rhifolion Armenaidd"}
+ armnlow{"Rhifolion Armenaidd mewn Llythrennau Bychain"}
+ beng{"Digidau Bengalaidd"}
+ deva{"Digidau Defangarig"}
+ ethi{"Rhifolion Ethiopig"}
+ fullwide{"Digidau Lled Llawn"}
+ geor{"Rhifolion Georgaidd"}
+ grek{"Rhifolion Groegaidd"}
+ greklow{"Rhifolion Groegaidd mewn Llythrennau Bychain"}
+ gujr{"Digidau Gujarataidd"}
+ guru{"Digidau guru"}
+ hanidec{"Rhifolion Degol Tsieinëaidd"}
+ hans{"Rhifolion Tsieinëaidd a symleiddwyd"}
+ hansfin{"Rhifolion Ariannol Tsieinëaidd a symleiddwyd"}
+ hant{"Rhifolion Tsieinëaidd Traddodiadol"}
+ hantfin{"Rhifolion Ariannol Tsieinëaidd Traddodiadol"}
+ hebr{"Rhifolion Hebrëig"}
+ jpan{"Rhifolion Japaneaidd"}
+ jpanfin{"Rhifolion Ariannol Japaneaidd"}
+ khmr{"Digidau Chmeraidd"}
+ knda{"Digidau Canaraidd"}
+ laoo{"Digidau Laosaidd"}
+ latn{"Digidau Gorllewinol"}
+ mlym{"Digidau Malayalamaidd"}
+ mymr{"Digidau Myanmar"}
+ orya{"Digidau Orïaidd"}
+ roman{"Rhifolion Rhufeinig"}
+ romanlow{"Rhifolion Rhufeinig mewn Llythrennau Bychain"}
+ taml{"Rhifolion Tamilaidd Traddodiadol"}
+ tamldec{"Digidau Tamilaidd"}
+ telu{"Digidau Telugu"}
+ thai{"Digidau Thai"}
+ tibt{"Digidau Tibetaidd"}
+ }
+ }
+ Version{"2.0.82.51"}
+ codePatterns{
+ language{"Iaith: {0}"}
+ script{"Sgript: {0}"}
+ territory{"Rhanbarth: {0}"}
+ }
+ localeDisplayPattern{
+ keyTypePattern{"{0}: {1}"}
+ pattern{"{0} ({1})"}
+ separator{", "}
+ }
}
diff --git a/data/lang/da.txt b/data/lang/da.txt
index e7163a6..6c611f4 100644
--- a/data/lang/da.txt
+++ b/data/lang/da.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/da.xml
// *
@@ -833,7 +833,7 @@
SCOTLAND{"skotsk standardengelsk"}
WADEGILE{"Wade-Giles"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Sprog: {0}"}
script{"Instruks: {0}"}
diff --git a/data/lang/dav.txt b/data/lang/dav.txt
index 943d72c..a8d2694 100755
--- a/data/lang/dav.txt
+++ b/data/lang/dav.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dav.xml
// *
@@ -57,5 +57,5 @@
zh{"Kichina"}
zu{"Kizulu"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/de.txt b/data/lang/de.txt
index 5f1a2b9..8b0ed9d 100644
--- a/data/lang/de.txt
+++ b/data/lang/de.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/de.xml
// *
@@ -681,7 +681,7 @@
chinese{"Chinesischer Kalender"}
coptic{"Koptischer Kalender"}
ethiopic{"Äthiopischer Kalender"}
- ethiopic-amete-alem{"Äthiopischer Kalender \"Amete Alem\""}
+ ethiopic-amete-alem{"Äthiopischer Kalender \u0022Amete Alem\u0022"}
gregorian{"Gregorianischer Kalender"}
hebrew{"Hebräischer Kalender"}
indian{"Indischer Nationalkalender"}
@@ -784,7 +784,7 @@
VALENCIA{"Valencianisch"}
WADEGILE{"Wade-Giles"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Sprache: {0}"}
script{"Schrift: {0}"}
diff --git a/data/lang/de_CH.txt b/data/lang/de_CH.txt
index 4df2c7f..6e2968d 100644
--- a/data/lang/de_CH.txt
+++ b/data/lang/de_CH.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/de_CH.xml
// *
@@ -10,5 +10,5 @@
Languages{
be{"Weissrussisch"}
}
- Version{"2.0.65.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/dje.txt b/data/lang/dje.txt
index 3217cb6..a41dbff 100755
--- a/data/lang/dje.txt
+++ b/data/lang/dje.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dje.xml
// *
@@ -57,5 +57,5 @@
zh{"Sinuwa senni"}
zu{"Zulu senni"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/dua.txt b/data/lang/dua.txt
index e336b80..3cccd1f 100755
--- a/data/lang/dua.txt
+++ b/data/lang/dua.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dua.xml
// *
@@ -13,5 +13,5 @@
Languages{
dua{"duálá"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/dyo.txt b/data/lang/dyo.txt
index 748ced1..03a4e8a 100755
--- a/data/lang/dyo.txt
+++ b/data/lang/dyo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dyo.xml
// *
@@ -57,5 +57,5 @@
zh{"sinua"}
zu{"sulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/dz.txt b/data/lang/dz.txt
index 74ba6a7..8d8f153 100755
--- a/data/lang/dz.txt
+++ b/data/lang/dz.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dz.xml
// *
@@ -245,7 +245,7 @@
tibt{"ང་བཅས་ཀྱི་ཨང་ཡིག"}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
codePatterns{
language{"ཁ་སྐད་: {0}"}
script{"ཡིག་གཟུགས་: {0}"}
diff --git a/data/lang/ebu.txt b/data/lang/ebu.txt
index c72696d..c64e409 100755
--- a/data/lang/ebu.txt
+++ b/data/lang/ebu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ebu.xml
// *
@@ -57,5 +57,5 @@
zh{"Kĩchina"}
zu{"Kĩzulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/ee.txt b/data/lang/ee.txt
index d7b9adc..0f55e36 100755
--- a/data/lang/ee.txt
+++ b/data/lang/ee.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ee.xml
// *
@@ -298,7 +298,7 @@
tibt{"tibet digitwo"}
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
codePatterns{
language{"gbegbɔgblɔ {0}"}
script{"gbeŋɔŋlɔ {0}"}
diff --git a/data/lang/el.txt b/data/lang/el.txt
index c8c35aa..5b76d31 100644
--- a/data/lang/el.txt
+++ b/data/lang/el.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/el.xml
// *
@@ -850,7 +850,7 @@
VALENCIA{"Βαλενθιανά"}
WADEGILE{"Εκλατινισμένα Γουάντ-Γκιλς"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Γλώσσα: {0}"}
script{"Σύστημα γραφής: {0}"}
diff --git a/data/lang/en.txt b/data/lang/en.txt
index 250ea48..c276aa4 100644
--- a/data/lang/en.txt
+++ b/data/lang/en.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en.xml
// *
@@ -19,6 +19,7 @@
colHiraganaQuaternary{"Kana Sorting"}
colNormalization{"Normalized Sorting"}
colNumeric{"Numeric Sorting"}
+ colReorder{"Script/Block Reordering"}
colStrength{"Sorting Strength"}
collation{"Sort Order"}
currency{"Currency"}
@@ -325,6 +326,7 @@
lez{"Lezghian"}
lg{"Ganda"}
li{"Limburgish"}
+ lkt{"Lakota"}
ln{"Lingala"}
lo{"Lao"}
lol{"Mongo"}
@@ -561,7 +563,7 @@
tyv{"Tuvinian"}
tzm{"Central Atlas Tamazight"}
udm{"Udmurt"}
- ug{"Uighur"}
+ ug{"Uyghur"}
uga{"Ugaritic"}
uk{"Ukrainian"}
umb{"Umbundu"}
@@ -786,6 +788,7 @@
indian{"Indian National Calendar"}
islamic{"Islamic Calendar"}
islamic-civil{"Islamic-Civil Calendar"}
+ iso8601{"ISO-8601 Calendar"}
japanese{"Japanese Calendar"}
persian{"Persian Calendar"}
roc{"Minguo Calendar"}
@@ -801,6 +804,7 @@
reformed{"Reformed Sort Order"}
search{"General-Purpose Search"}
searchjl{"Search By Hangul Initial Consonant"}
+ standard{"Standard Sort Order"}
stroke{"Stroke Sort Order"}
traditional{"Traditional Sort Order"}
unihan{"Radical-Stroke Sort Order"}
@@ -813,6 +817,8 @@
armnlow{"Armenian Lowercase Numerals"}
bali{"Balinese Digits"}
beng{"Bengali Digits"}
+ brah{"Brahmi Digits"}
+ cakm{"Chakma Digits"}
cham{"Cham Digits"}
deva{"Devanagari Digits"}
ethi{"Ethiopic Numerals"}
@@ -850,10 +856,14 @@
nkoo{"N'Ko Digits"}
olck{"Ol Chiki Digits"}
orya{"Oriya Digits"}
+ osma{"Osmanya Digits"}
roman{"Roman Numerals"}
romanlow{"Roman Lowercase Numerals"}
saur{"Saurashtra Digits"}
+ shrd{"Sharada Digits"}
+ sora{"Sora Sompeng Digits"}
sund{"Sundanese Digits"}
+ takr{"Takri Digits"}
talu{"New Tai Lue Digits"}
taml{"Traditional Tamil Numerals"}
tamldec{"Tamil Digits"}
@@ -863,6 +873,9 @@
traditional{"Traditional Numerals"}
vaii{"Vai Digits"}
}
+ va{
+ posix{"POSIX Compliant Locale"}
+ }
}
Variants{
1606NICT{"Late Middle French to 1606"}
@@ -912,7 +925,7 @@
VALENCIA{"Valencian"}
WADEGILE{"Wade-Giles Romanization"}
}
- Version{"2.0.78.36"}
+ Version{"2.0.82.76"}
codePatterns{
language{"Language: {0}"}
script{"Script: {0}"}
diff --git a/data/lang/en_GB.txt b/data/lang/en_GB.txt
index 3bba431..61d7759 100755
--- a/data/lang/en_GB.txt
+++ b/data/lang/en_GB.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GB.xml
// *
@@ -22,7 +22,7 @@
fullwide{"Full-Width Digits"}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
localeDisplayPattern{
keyTypePattern{"{0}: {1}"}
}
diff --git a/data/lang/en_NH.txt b/data/lang/en_NH.txt
index 92d7383..0b45233 100755
--- a/data/lang/en_NH.txt
+++ b/data/lang/en_NH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/en_RH.txt b/data/lang/en_RH.txt
index 928f668..bc71849 100644
--- a/data/lang/en_RH.txt
+++ b/data/lang/en_RH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/en_VU.txt b/data/lang/en_VU.txt
index a5076d7..2e3e092 100755
--- a/data/lang/en_VU.txt
+++ b/data/lang/en_VU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/en_ZW.txt b/data/lang/en_ZW.txt
index 6d0f9be..88c4471 100644
--- a/data/lang/en_ZW.txt
+++ b/data/lang/en_ZW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/eo.txt b/data/lang/eo.txt
index 2267483..70517b0 100644
--- a/data/lang/eo.txt
+++ b/data/lang/eo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/eo.xml
// *
@@ -166,5 +166,5 @@
zu{"zulua"}
zxx{"nelingvaĵo"}
}
- Version{"2.0.74.74"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/es.txt b/data/lang/es.txt
index 72f16ac..d2b0963 100644
--- a/data/lang/es.txt
+++ b/data/lang/es.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es.xml
// *
@@ -819,7 +819,7 @@
VALENCIA{"Valenciano"}
WADEGILE{"Romanización Wade-Giles"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.47"}
codePatterns{
language{"Idioma: {0}"}
script{"Dialecto: {0}"}
diff --git a/data/lang/es_419.txt b/data/lang/es_419.txt
index cb1c4b4..3cb238e 100755
--- a/data/lang/es_419.txt
+++ b/data/lang/es_419.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_419.xml
// *
@@ -66,5 +66,5 @@
tibt{"Dígitos tibetanos"}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/es_CL.txt b/data/lang/es_CL.txt
index 33fac71..51e2444 100644
--- a/data/lang/es_CL.txt
+++ b/data/lang/es_CL.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_CL.xml
// *
@@ -12,5 +12,5 @@
phonebook{"orden de directorio telefónico"}
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/et.txt b/data/lang/et.txt
index 9de5485..03883ea 100644
--- a/data/lang/et.txt
+++ b/data/lang/et.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/et.xml
// *
@@ -820,7 +820,7 @@
VALENCIA{"valentsia"}
WADEGILE{"Wade-Giles"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.47"}
codePatterns{
language{"Keel: {0}"}
script{"Skript: {0}"}
diff --git a/data/lang/eu.txt b/data/lang/eu.txt
index c5ef29f..e12ca05 100644
--- a/data/lang/eu.txt
+++ b/data/lang/eu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/eu.xml
// *
@@ -333,7 +333,7 @@
SCOTLAND{"ESKOZIAR INGELESA"}
VALENCIA{"VALENTZIERA"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
codePatterns{
language{"{0}"}
script{"{0}"}
diff --git a/data/lang/ewo.txt b/data/lang/ewo.txt
index 35cf9d0..9dea967 100755
--- a/data/lang/ewo.txt
+++ b/data/lang/ewo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ewo.xml
// *
@@ -57,5 +57,5 @@
zh{"Ǹkɔ́bɔ tsainís"}
zu{"ǹkɔ́bɔ zulú"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/fa.txt b/data/lang/fa.txt
index a865ca2..ad7c5e3 100644
--- a/data/lang/fa.txt
+++ b/data/lang/fa.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fa.xml
// *
@@ -732,7 +732,7 @@
SAAHO{"ساهویی"}
SCOTLAND{"انگلیسی معیار اسکاتلند"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
codePatterns{
language{"زبان: {0}"}
script{"خط: {0}"}
diff --git a/data/lang/fa_AF.txt b/data/lang/fa_AF.txt
index 684c723..f1ad013 100644
--- a/data/lang/fa_AF.txt
+++ b/data/lang/fa_AF.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fa_AF.xml
// *
@@ -31,5 +31,5 @@
Scripts{
Mong{"مغلی"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/ff.txt b/data/lang/ff.txt
index f5df41d..b832c22 100755
--- a/data/lang/ff.txt
+++ b/data/lang/ff.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ff.xml
// *
@@ -57,5 +57,5 @@
zh{"Sinuwaare"}
zu{"Suluŋkoore"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/fi.txt b/data/lang/fi.txt
index e1ecc2b..4ffa607 100644
--- a/data/lang/fi.txt
+++ b/data/lang/fi.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fi.xml
// *
@@ -789,7 +789,6 @@
collation{
big5han{"perinteinen kiinalainen järjestys Big5"}
dictionary{"sanakirjajärjestys"}
- direct{"koodiposition mukainen järjestys"}
ducet{"Unicoden oletusjärjestys"}
gb2312han{"yksinkertaistettu kiinalainen järjestys GB2312"}
phonebook{"puhelinluettelojärjestys"}
@@ -918,7 +917,7 @@
VALLADER{"reoromaanin vallader-muoto"}
WADEGILE{"kiinan Wade-Giles-latinaistus"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
codePatterns{
language{"kieli: {0}"}
script{"kirjoitusjärjestelmä: {0}"}
diff --git a/data/lang/fil.txt b/data/lang/fil.txt
index f93d3b6..1e8b09e 100755
--- a/data/lang/fil.txt
+++ b/data/lang/fil.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fil.xml
// *
@@ -336,7 +336,7 @@
PINYIN{"Pinyin Romanization"}
WADEGILE{"Wade-Giles Romanization"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
codePatterns{
language{"{0}"}
script{"{0}"}
diff --git a/data/lang/fil_PH.txt b/data/lang/fil_PH.txt
index 42baeba..3a691b4 100755
--- a/data/lang/fil_PH.txt
+++ b/data/lang/fil_PH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/fo.txt b/data/lang/fo.txt
index cf76b77..6b210c1 100644
--- a/data/lang/fo.txt
+++ b/data/lang/fo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fo.xml
// *
@@ -13,5 +13,5 @@
Languages{
fo{"føroyskt"}
}
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/fr.txt b/data/lang/fr.txt
index 0ea0268..34ea8ac 100644
--- a/data/lang/fr.txt
+++ b/data/lang/fr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr.xml
// *
@@ -816,7 +816,7 @@
VALENCIA{"valencien"}
WADEGILE{"Wade-Giles"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
codePatterns{
language{"langue : {0}"}
script{"écriture : {0}"}
diff --git a/data/lang/fr_CA.txt b/data/lang/fr_CA.txt
index 61422f1..a813a98 100755
--- a/data/lang/fr_CA.txt
+++ b/data/lang/fr_CA.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_CA.xml
// *
@@ -76,5 +76,5 @@
tibt{"Chiffres tibétains"}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/ga.txt b/data/lang/ga.txt
index 5bb90cc..0afe662 100644
--- a/data/lang/ga.txt
+++ b/data/lang/ga.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ga.xml
// *
@@ -156,5 +156,5 @@
zh_Hant{"Sínis Thraidisiúnta"}
zu{"Súlúis"}
}
- Version{"2.0.77.27"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/gl.txt b/data/lang/gl.txt
index 3c26fef..02b1b27 100644
--- a/data/lang/gl.txt
+++ b/data/lang/gl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gl.xml
// *
@@ -363,7 +363,7 @@
vaii{"Díxitos Vai"}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Idioma: {0}"}
script{"Alfabeto: {0}"}
diff --git a/data/lang/gsw.txt b/data/lang/gsw.txt
index 795a9aa..023e08e 100644
--- a/data/lang/gsw.txt
+++ b/data/lang/gsw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gsw.xml
// *
@@ -695,7 +695,7 @@
SOLBA{"Solbica-Mundart"}
TARASK{"Taraskievica-Rächtschriibig"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Schpraach: {0}"}
script{"Schrift: {0}"}
diff --git a/data/lang/gu.txt b/data/lang/gu.txt
index a8229b7..9504d2f 100644
--- a/data/lang/gu.txt
+++ b/data/lang/gu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gu.xml
// *
@@ -755,7 +755,7 @@
PINYIN{"પિનયિન રોમનાઇઝેશન"}
WADEGILE{"વેડ-ગિલ્સ રોમનાઇઝેશન"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
localeDisplayPattern{
pattern{"{0} ({1})"}
separator{","}
diff --git a/data/lang/guz.txt b/data/lang/guz.txt
index fc777b2..143834f 100755
--- a/data/lang/guz.txt
+++ b/data/lang/guz.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/guz.xml
// *
@@ -57,5 +57,5 @@
zh{"Kichina"}
zu{"Kizulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/gv.txt b/data/lang/gv.txt
index e40e06b..5630a20 100644
--- a/data/lang/gv.txt
+++ b/data/lang/gv.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gv.xml
// *
@@ -13,5 +13,5 @@
Languages{
gv{"Gaelg"}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/ha.txt b/data/lang/ha.txt
index 2a103f2..8e621ab 100644
--- a/data/lang/ha.txt
+++ b/data/lang/ha.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ha.xml
// *
@@ -56,5 +56,5 @@
zh{"Harshen Sin"}
zu{"Harshen Zulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/ha_GH.txt b/data/lang/ha_GH.txt
index a414604..5a59b2e 100644
--- a/data/lang/ha_GH.txt
+++ b/data/lang/ha_GH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/ha_Latn.txt b/data/lang/ha_Latn.txt
index 649d47f..bdcc668 100644
--- a/data/lang/ha_Latn.txt
+++ b/data/lang/ha_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ha_Latn.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/ha_Latn.xml
*/
ha_Latn{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/ha_Latn_GH.txt b/data/lang/ha_Latn_GH.txt
index 4a7717b..c10a415 100644
--- a/data/lang/ha_Latn_GH.txt
+++ b/data/lang/ha_Latn_GH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/ha_Latn_NE.txt b/data/lang/ha_Latn_NE.txt
index b383c7c..e80f6f7 100644
--- a/data/lang/ha_Latn_NE.txt
+++ b/data/lang/ha_Latn_NE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/ha_Latn_NG.txt b/data/lang/ha_Latn_NG.txt
index 1b09876..bb60f3c 100644
--- a/data/lang/ha_Latn_NG.txt
+++ b/data/lang/ha_Latn_NG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/ha_NE.txt b/data/lang/ha_NE.txt
index 5c06d78..f28adee 100644
--- a/data/lang/ha_NE.txt
+++ b/data/lang/ha_NE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/ha_NG.txt b/data/lang/ha_NG.txt
index 66e2170..1a5e209 100644
--- a/data/lang/ha_NG.txt
+++ b/data/lang/ha_NG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/haw.txt b/data/lang/haw.txt
index 56f59e8..10c85b8 100644
--- a/data/lang/haw.txt
+++ b/data/lang/haw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/haw.xml
// *
@@ -49,5 +49,5 @@
zh_Hans{"Pākē Hoʻomaʻalahi ʻia"}
zh_Hant{"Pākē Kuʻuna"}
}
- Version{"2.0.74.85"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/he.txt b/data/lang/he.txt
index d9f8300..758374d 100644
--- a/data/lang/he.txt
+++ b/data/lang/he.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/he.xml
// *
@@ -755,7 +755,7 @@
POSIX{"מחשב"}
SCOTLAND{"אנגלית סקוטית סטנדרטית"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.47"}
codePatterns{
language{"שפה: {0}"}
script{"כתב: {0}"}
diff --git a/data/lang/he_IL.txt b/data/lang/he_IL.txt
index 9925868..2324002 100644
--- a/data/lang/he_IL.txt
+++ b/data/lang/he_IL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/hi.txt b/data/lang/hi.txt
index 660f7f2..37c23de 100644
--- a/data/lang/hi.txt
+++ b/data/lang/hi.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hi.xml
// *
@@ -35,35 +35,36 @@
ach{"अकोली"}
ada{"अदान्गमे"}
ady{"अदिघे"}
- ae{"अवेस्तन"}
+ ae{"अवस्ताई"}
af{"अफ्रीकी"}
- afa{"अफ्रो-एशियाई भाषाएँ"}
+ afa{"अफ़्रीकी-एशियाई भाषा"}
afh{"अफ्रिहिली"}
ain{"ऐनू"}
ak{"अकन"}
- akk{"अक्केदिअन"}
+ akk{"अक्कादी"}
ale{"अलेउत"}
alg{"एल्गोनक्युइअन भाषा"}
alt{"दक्षिणी अल्ताई"}
- am{"अम्हारिक्"}
+ am{"अम्हारी"}
an{"अर्गोनी"}
ang{"पुरानी अंग्रेज़ी"}
anp{"अंगिका"}
apa{"अपाचे भाषा"}
ar{"अरबी"}
+ ar_001{"आधुनिक मानक अरबी"}
arc{"ऐरेमेक"}
- arn{"एरोकैनियन"}
+ arn{"मापूचे"}
arp{"अराफाओ"}
art{"कृत्रिम भाषा"}
arw{"अरावक"}
- as{"असामी"}
+ as{"आसामी"}
ast{"अस्तुरियन"}
ath{"अथापास्कान भाषा"}
aus{"आस्ट्रेलियाई भाषा"}
av{"अवेरिक"}
awa{"अवधी"}
ay{"आयमारा"}
- az{"अज़रबैंजानी"}
+ az{"अज़रबैजानी"}
ba{"बशख़िर"}
bad{"बांदा"}
bai{"बमिलेके भाषा"}
@@ -71,11 +72,11 @@
ban{"बालिनीस"}
bas{"बसा"}
bat{"बाल्टिक भाषा"}
- be{"बैलोरूशियन्"}
+ be{"बेलारूसी"}
bej{"बेजा"}
bem{"बेम्बा"}
ber{"बरबर"}
- bg{"बल्गेरियाई"}
+ bg{"बुल्गारियाई"}
bh{"बिहारी"}
bho{"भोजपुरी"}
bi{"बिस्लामा"}
@@ -83,7 +84,7 @@
bin{"बिनी"}
bla{"सिक्सिका"}
bm{"बाम्बारा"}
- bn{"बँगाली"}
+ bn{"बंगाली"}
bnt{"बन्तु"}
bo{"तिब्बती"}
br{"ब्रेटन"}
@@ -110,14 +111,14 @@
chn{"चिनूक जारगॉन"}
cho{"चोक्तौ"}
chp{"शिपेव्यान"}
- chr{"शेरूकी"}
+ chr{"चेरोकी"}
chy{"शेयेन्न"}
ckb{"सोरानी कुर्द"}
cmc{"शैमिक भाषा"}
co{"कोर्सीकन"}
cop{"कॉप्टिक"}
- cpe{"अंग्रेजी आधारित क्रेओल या पिजिन"}
- cpf{"फ्रेंच आधारित क्रेओल या पिजिन"}
+ cpe{"अंग्रेज़ी आधारित क्रेओल या पिजिन"}
+ cpf{"फ़्रांसीसी आधारित क्रेओल या पिजिन"}
cpp{"पुर्तगाली आधारित क्रेओल या पिजिन"}
cr{"क्री"}
crh{"क्रीमीन तुर्की"}
@@ -128,19 +129,18 @@
cus{"कुशितिक भाषा"}
cv{"चूवाश"}
cy{"वेल्श"}
- da{"डैनीश"}
+ da{"डेनिश"}
dak{"दाकोता"}
dar{"दार्गवा"}
day{"दायक"}
- de{"ज़र्मन"}
- de_AT{"जर्मन (ऑस्ट्रिया)"}
+ de{"जर्मन"}
de_CH{"स्विस हाई जर्मन"}
del{"डिलैवेयर"}
den{"स्लेव"}
dgr{"डोग्रिब"}
din{"दिन्का"}
doi{"डोग्री"}
- dra{"द्रविण भाषा"}
+ dra{"द्रविड़ भाषा"}
dsb{"निचला सॉर्बियन"}
dua{"दुआला"}
dum{"मध्य पुर्तगाली"}
@@ -151,41 +151,34 @@
efi{"एफिक"}
egy{"प्राचीन मिस्री"}
eka{"एकाजुक"}
- el{"ग्रीक"}
+ el{"यूनानी"}
elx{"एलामाइट"}
- en{"अंग्रेजी"}
- en_AU{"अंग्रेज़ी (ऑस्ट्रेलिया)"}
- en_CA{"अंग्रेज़ी(कनाडाई)"}
- en_GB{"अंग्रेजी(ब्रिटिश)"}
- en_US{"अंग्रेज़ी अमेरीकी"}
- enm{"मिडिल अंग्रजी"}
+ en{"अंग्रेज़ी"}
+ enm{"मध्यकालीन अंग्रेज़ी"}
eo{"एस्पेरान्तो"}
- es{"स्पेनिश"}
- es_419{"लेटिन अमेरिकी स्पेनिश"}
- es_ES{"ईवेरियाई स्पेनिश"}
- et{"ऐस्तोनियन्"}
- eu{"बास्क्"}
+ es{"स्पेनी"}
+ es_ES{"स्पेनी (यूरोप)"}
+ et{"एस्टोनियाई"}
+ eu{"बास्क"}
ewo{"इवोन्डो"}
- fa{"पर्शियन्"}
+ fa{"फ़ारसी"}
fan{"फैन्ग"}
fat{"फन्टी"}
ff{"फुलाह"}
- fi{"फिनिश"}
- fil{"फिलिपिनो"}
+ fi{"फ़िनिश"}
+ fil{"फ़िलिपीनो"}
fiu{"फिन्नो-उग्रीयन भाषा"}
fj{"फ़ीजी"}
fo{"फिरोज़ी"}
fon{"फॉन"}
- fr{"फ्रेंच"}
- fr_CA{"फ़्रेंच(कनाडाई)"}
- fr_CH{"स्विस फ़्रेंच"}
- frm{"मिडिल फ्रेंच"}
- fro{"पुरानी फ्रांसीसी"}
+ fr{"फ़्रांसीसी"}
+ frm{"मध्यकालीन फ़्रांसीसी"}
+ fro{"पुरातन फ़्रांसीसी"}
frr{"उत्तरी फ्रीसीयन"}
frs{"पूर्वी फ्रीसीयन"}
fur{"फ्रीयुलीयान"}
fy{"पश्चिमी फ़्रिसियाई"}
- ga{"आयरिश"}
+ ga{"आइरिश"}
gaa{"गा"}
gay{"गायो"}
gba{"ग्बाया"}
@@ -203,12 +196,12 @@
grb{"ग्रेबो"}
grc{"प्राचीन यूनानी"}
gsw{"स्विस जर्मन"}
- gu{"गुज़राती"}
+ gu{"गुजराती"}
gv{"मैंक्स"}
gwi{"ग्विच'इन"}
ha{"होउसा"}
hai{"हैडा"}
- haw{"हावाइयन"}
+ haw{"हवाई"}
he{"हीब्रू"}
hi{"हिन्दी"}
hil{"हिलिगेनन"}
@@ -216,7 +209,7 @@
hit{"हिताइत"}
hmn{"ह्मॉंग"}
ho{"हिरी मोटू"}
- hr{"क्रोएशन्"}
+ hr{"क्रोएशियाई"}
hsb{"ऊपरी सॉर्बियन"}
ht{"हैतीयन"}
hu{"हंगेरी"}
@@ -225,7 +218,7 @@
hz{"हरैरो"}
ia{"ईन्टरलिंगुआ"}
iba{"इबान"}
- id{"इन्डोनेशियाई"}
+ id{"इंडोनीशियाई"}
ie{"ईन्टरलिंगुइ"}
ig{"ईग्बो"}
ii{"सिचुआन यी"}
@@ -238,7 +231,7 @@
io{"इडौ"}
ira{"ईरानी भाषा"}
iro{"इरोक्युओइयन भाषा"}
- is{"आईस्लैंडिक्"}
+ is{"आइसलैंडी"}
it{"इतालवी"}
iu{"इनूकीटूत्"}
ja{"जापानी"}
@@ -246,7 +239,7 @@
jpr{"जुदेओ-पर्शियन"}
jrb{"जुदेओ-अरेबिक"}
jv{"जावानीस"}
- ka{"जॉर्जीयन्"}
+ ka{"जॉर्जियाई"}
kaa{"कारा-कल्पक"}
kab{"कबाइल"}
kac{"काचिन"}
@@ -268,7 +261,7 @@
km{"कैम्बोडियन्"}
kmb{"किम्बन्दु"}
kn{"कन्नड़"}
- ko{"कोरीयन्"}
+ ko{"कोरियाई"}
kok{"कोंकणी"}
kos{"कोसरैन"}
kpe{"क्पेल्लै"}
@@ -278,13 +271,13 @@
kro{"क्रु"}
kru{"कुरूख"}
ks{"कश्मीरी"}
- ku{"कुरदीश"}
+ ku{"कुर्दी"}
kum{"कुमीक"}
kut{"कुतेनाई"}
kv{"कोमी"}
kw{"कोर्निश"}
ky{"किरघिज़"}
- la{"लैटीन"}
+ la{"लातिनी"}
lad{"लादीनो"}
lah{"लाह्न्डा"}
lam{"लाम्बा"}
@@ -293,10 +286,10 @@
lg{"गांडा"}
li{"लिंबर्गिश"}
ln{"लिंगाला"}
- lo{"लाओथीयन्"}
+ lo{"लाओ"}
lol{"मोंगो"}
loz{"लोज़ी"}
- lt{"लिथुनियन्"}
+ lt{"लिथुएनियाई"}
lu{"ल्यूबा-कटांगा"}
lua{"ल्यूबा-लुलुआ"}
lui{"लुइसेनो"}
@@ -316,13 +309,13 @@
men{"मेन्डे"}
mfe{"मोरीस्येन"}
mg{"मालागासी"}
- mga{"मिडिल आइरिश"}
+ mga{"मध्यकाल आइरिश"}
mh{"मार्शलीज़"}
- mi{"मेओरी"}
+ mi{"माओरी"}
mic{"मिकमैक"}
min{"मिनांग्काबाउ"}
mis{"विविध भाषा"}
- mk{"मैसेडोनियन्"}
+ mk{"मैसिडोनियाई"}
mkh{"मॉन-ख्मेर भाषा"}
ml{"मलयालम"}
mn{"मंगोलीयाई"}
@@ -334,20 +327,20 @@
mos{"मोस्सी"}
mr{"मराठी"}
ms{"मलय"}
- mt{"मालटिस्"}
+ mt{"माल्टी"}
mul{"विविध भाषाएँ"}
mun{"मुन्डा भाषा"}
mus{"क्रीक"}
mwl{"मिरांडी"}
mwr{"मारवाड़ी"}
- my{"बर्लिस"}
+ my{"बर्मी"}
myn{"माया भाषा"}
myv{"एर्ज़या"}
na{"नाउरू"}
nah{"नहुआत्ल"}
nai{"उत्तरी अमेरीकी इंडियन भाषा"}
nap{"नीपोलिटन"}
- nb{"नॉर्वेजियन बोकमाल"}
+ nb{"नॉर्वेजियाई बोकमाल"}
nd{"उत्तरी देबेल"}
nds{"निचला जर्मन"}
ne{"नेपाली"}
@@ -356,10 +349,10 @@
nia{"नियास"}
nic{"नाइगर-कोर्डोफैनियन भाषा"}
niu{"नियुआन"}
- nl{"डच्"}
+ nl{"डच"}
nl_BE{"फ़्लेमिश"}
- nn{"नॉर्वेजियन नाइनोर्स्क"}
- no{"नार्वेजियन"}
+ nn{"नॉर्वेजियाई नाइनोर्स्क"}
+ no{"नॉर्वेजियाई"}
nog{"नोगाई"}
non{"पुराना नॉर्स"}
nqo{"एन्को"}
@@ -392,19 +385,18 @@
phi{"फिलिपीन भाषा"}
phn{"फोएनिशियन"}
pi{"पाली"}
- pl{"पॉलिश"}
+ pl{"पोलिश"}
pon{"पोह्नपिएन"}
pra{"प्राकृत"}
pro{"पुरानी प्रोवेन्सल"}
- ps{"पॉशतो"}
+ ps{"पश्तो"}
pt{"पुर्तगाली"}
- pt_BR{"पुर्तगाली (ब्राज़ील)"}
- pt_PT{"ईवेरियाई पुर्तगाली"}
+ pt_PT{"पुर्तगाली (यूरोप)"}
qu{"क्वेशुआ"}
raj{"राजस्थानी"}
rap{"रापानुई"}
rar{"रारोतोंगन"}
- rm{"रहेय्टो-रोमान्स"}
+ rm{"रोमान्श"}
rn{"रुन्दी"}
ro{"रोमानियाई"}
roa{"रोमांस भाषा"}
@@ -433,11 +425,11 @@
sgn{"सांकेतिक भाषा"}
sh{"सेर्बो-क्रोएशन्"}
shn{"शैन"}
- si{"शिंघालीस्"}
+ si{"सिंहली"}
sid{"सिदामो"}
sio{"सिउआन भाषा"}
sit{"चीनी-तिब्ब्ती भाषा"}
- sk{"स्लोवाक्"}
+ sk{"स्लोवाक"}
sl{"स्लोवेनियन्"}
sla{"स्लोवियाई भाषा"}
sm{"सामोन"}
@@ -452,7 +444,7 @@
sog{"सोग्डिएन"}
son{"सोन्घाई"}
sq{"अल्बेनियन्"}
- sr{"सर्बियन्"}
+ sr{"सर्बी"}
srn{"स्रानान टॉन्गो"}
srr{"सेरेर"}
ss{"स्वाती"}
@@ -462,22 +454,22 @@
suk{"सुकुमा"}
sus{"सुसु"}
sux{"सुमेरियन"}
- sv{"स्विडिश"}
+ sv{"स्वीडिश"}
sw{"स्वाहिली"}
syc{"क्लासिकल सिरिएक"}
syr{"सिरिएक"}
ta{"तमिल"}
tai{"ताई भाषा"}
- te{"तेलेगु"}
+ te{"तेलुगू"}
tem{"टिम्ने"}
ter{"तेरेनो"}
tet{"तेतुम"}
- tg{"ताजिक्"}
+ tg{"ताजिक"}
th{"थाई"}
ti{"तिग्रीन्या"}
tig{"टाइग्रे"}
tiv{"तिव"}
- tk{"तुक्रमेन"}
+ tk{"तुर्कमेन"}
tkl{"तोकेलाऊ"}
tl{"तागालोग"}
tlh{"क्लिंगन"}
@@ -503,12 +495,12 @@
uga{"युगैरिटिक"}
uk{"यूक्रेनी"}
umb{"उम्बुन्डु"}
- und{"अज्ञात या अवैध भाषा"}
+ und{"अज्ञात भाषा"}
ur{"उर्दू"}
uz{"उज़्बेक"}
vai{"वाई"}
ve{"वेन्दा"}
- vi{"वियेतनामी"}
+ vi{"वियतनामी"}
vo{"वोलापुक"}
vot{"वॉटिक"}
wa{"वाल्लून"}
@@ -517,9 +509,9 @@
war{"वारै"}
was{"वाशो"}
wen{"सॉर्बियन भाषा"}
- wo{"वोलोफ"}
+ wo{"वोलोफ़"}
xal{"काल्मिक"}
- xh{"षोसा"}
+ xh{"ख़ोसा"}
yao{"याओ"}
yap{"यापीस"}
yi{"येहुदी"}
@@ -530,8 +522,6 @@
zbl{"ब्लिसिम्बॉल्स"}
zen{"ज़ेनान्गा"}
zh{"चीनी"}
- zh_Hans{"चीनी (सरलीकृत)"}
- zh_Hant{"चीनी (पारम्परिक)"}
znd{"ज़न्डे"}
zu{"ज़ुलू"}
zun{"ज़ूनी"}
@@ -550,7 +540,7 @@
Batk{"बटकी"}
Beng{"बंगाली"}
Blis{"ब्लिसिम्बॉल्स"}
- Bopo{"बोपोमोफो"}
+ Bopo{"बोपोमोफ़ो"}
Brah{"ब्रह्मी"}
Brai{"ब्रेल"}
Bugi{"बगिनीस"}
@@ -559,7 +549,7 @@
Cans{"युनिफाइड कैनेडियन एबोरिजनल सिलेबिक्स"}
Cari{"करैन"}
Cham{"चाम"}
- Cher{"चिरूकी"}
+ Cher{"चेरोकी"}
Cirt{"किर्थ"}
Copt{"कॉप्टिक"}
Cprt{"काइप्रायट"}
@@ -570,21 +560,22 @@
Egyd{"इजिप्शियन डेमोटिक"}
Egyh{"इजिप्शियन हाइरेटिक"}
Egyp{"इजिप्शियन हाइरोग्लिफ्स"}
- Ethi{"ईथोपियाई"}
+ Ethi{"इथियोपियाई"}
Geok{"जॉर्जियन खुतसुरी"}
Geor{"जॉर्जियन"}
Glag{"ग्लेगोलिटिक"}
Goth{"गोथिक"}
- Grek{"ग्रीक"}
+ Gran{"ग्रन्थ"}
+ Grek{"यूनानी"}
Gujr{"गुजराती"}
Guru{"गुरमुखी"}
Hang{"हंगुल"}
Hani{"हन"}
Hano{"हनुनू"}
- Hans{"सरलीकृत हन"}
- Hant{"पारम्परिक हन"}
+ Hans{"सरलीकृत"}
+ Hant{"पारम्परिक"}
Hebr{"हिब्रू"}
- Hira{"हीरागाना"}
+ Hira{"हिरागाना"}
Hmng{"पाहो ह्मोन्ग"}
Hrkt{"कचाकना और हिरागना"}
Hung{"ऑल्ड हंगेरियन"}
@@ -593,17 +584,17 @@
Java{"जावानीस"}
Jpan{"जापानी"}
Kali{"कायाह ली"}
- Kana{"कटाकना"}
+ Kana{"काताकाना"}
Khar{"खारोशथी"}
- Khmr{"खमेर"}
+ Khmr{"ख्मेर"}
Knda{"कन्नड़"}
Kore{"कोरियाई"}
Kthi{"कैथी"}
Lana{"लाना"}
Laoo{"लाओ"}
- Latf{"फ्रैकतुर लैटिन"}
- Latg{"गैलिक लेटिन"}
- Latn{"लाटिन"}
+ Latf{"फ़्रैक्टुर लातिनी"}
+ Latg{"गेली लातिनी"}
+ Latn{"लातिनी"}
Lepc{"लेपचा"}
Limb{"लिम्बू"}
Lina{"लीनियर A"}
@@ -623,7 +614,7 @@
Ogam{"ओगम"}
Olck{"ऑल चिकी"}
Orkh{"ओरखोन"}
- Orya{"उडिया"}
+ Orya{"उड़िया"}
Osma{"ओस्मान्या"}
Perm{"ओल्ड परमिक"}
Phag{"फाग्स-पा"}
@@ -641,7 +632,7 @@
Saur{"सौराष्ट्र"}
Sgnw{"सांकेतिक लेख"}
Shaw{"शावियान"}
- Sinh{"सिहंली"}
+ Sinh{"सिंहली"}
Sund{"सूडानी"}
Sylo{"सिलोती नागरी"}
Syrc{"सिरियेक"}
@@ -671,11 +662,11 @@
Zsym{"चिन्ह"}
Zxxx{"अलिखित"}
Zyyy{"आम"}
- Zzzz{"अज्ञात या अवैध लिपि"}
+ Zzzz{"अज्ञात लिपि"}
}
Scripts%stand-alone{
Hans{"सरलीकृत हान"}
- Hant{"पारंपरिक हान"}
+ Hant{"पारम्परिक हान"}
}
Types{
calendar{
@@ -760,7 +751,7 @@
POSIX{"कम्प्यूटर"}
REVISED{"संशोधित वर्तनी"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
localeDisplayPattern{
pattern{"{0} ({1})"}
separator{", "}
diff --git a/data/lang/hr.txt b/data/lang/hr.txt
index b328663..e9e8a18 100644
--- a/data/lang/hr.txt
+++ b/data/lang/hr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hr.xml
// *
@@ -748,7 +748,7 @@
chinese{"kineski kalendar"}
coptic{"Koptski kalendar"}
ethiopic{"Etiopski kalendar"}
- ethiopic-amete-alem{"Etiopski kalendar \"Amete Alem\""}
+ ethiopic-amete-alem{"Etiopski kalendar \u0022Amete Alem\u0022"}
gregorian{"gregorijanski kalendar"}
hebrew{"hebrejski kalendar"}
indian{"indijski nacionalni kalendar"}
@@ -848,7 +848,7 @@
VALENCIA{"valencijski"}
WADEGILE{"Wade-Giles romanizacija"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Jezik: {0}"}
script{"Pismo: {0}"}
diff --git a/data/lang/hu.txt b/data/lang/hu.txt
index f467f30..ac83138 100644
--- a/data/lang/hu.txt
+++ b/data/lang/hu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hu.xml
// *
@@ -873,7 +873,7 @@
VALLADER{"Vallader"}
WADEGILE{"Wade-Giles átírás"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.47"}
codePatterns{
language{"Nyelv: {0}"}
script{"Írásrendszer: {0}"}
diff --git a/data/lang/hy.txt b/data/lang/hy.txt
index 3dfc4be..676df06 100644
--- a/data/lang/hy.txt
+++ b/data/lang/hy.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hy.xml
// *
@@ -10,8 +10,239 @@
* ICU <specials> source: <path>/xml/main/hy.xml
*/
hy{
- Languages{
- hy{"Հայերէն"}
+ Keys{
+ calendar{"Տոմար"}
+ collation{"Տեսակավորման կարգ"}
+ currency{"արժույթ"}
+ numbers{"թվեր"}
}
- Version{"2.0.78.38"}
+ Languages{
+ ab{"աբխազերեն"}
+ af{"աֆրիկաանս"}
+ am{"ամհարերեն"}
+ ar{"արաբերեն"}
+ as{"ասամերեն"}
+ az{"ադրբեջաներեն"}
+ be{"բելառուսերեն"}
+ bg{"բուլղարերեն"}
+ bn{"բենգալերեն"}
+ bo{"տիբեթերեն"}
+ bs{"բոսնիերեն"}
+ ca{"կատալաներեն"}
+ cs{"չեխերեն"}
+ cy{"ուելսերեն"}
+ da{"դանիերեն"}
+ de{"գերմաներեն"}
+ de_AT{"ավստրիական գերմաներեն"}
+ de_CH{"շվեյցարական բարձր գերմաներեն"}
+ el{"հունարեն"}
+ en{"անգլերեն"}
+ en_AU{"ավստրալական անգլերեն"}
+ en_CA{"կանադական անգլերեն"}
+ en_GB{"բրիտանական անգլերեն"}
+ en_US{"ամերիկյան անգլերեն"}
+ eo{"էսպերանտո"}
+ es{"իսպաներեն"}
+ es_419{"լատինաամերիկյան իսպաներեն"}
+ es_ES{"եվրոպական իսպաներեն"}
+ et{"էստոներեն"}
+ eu{"բասկերեն"}
+ fa{"պարսկերեն"}
+ fi{"ֆիններեն"}
+ fil{"ֆիլիպիներեն"}
+ fj{"ֆիջիերեն"}
+ fo{"ֆարյորերեն"}
+ fr{"ֆրանսերեն"}
+ fr_CA{"կանադական ֆրանսերեն"}
+ fr_CH{"շվեյցարական ֆրանսերեն"}
+ fy{"արևմտյան ֆրիզերեն"}
+ ga{"իռլանդերեն"}
+ gl{"գալիսերեն"}
+ gn{"գուարանի"}
+ gsw{"շվեյցարական գերմաներեն"}
+ gu{"գուջարաթի"}
+ ha{"հաուսա"}
+ haw{"հավայիերեն"}
+ he{"եբրայերեն"}
+ hi{"հինդի"}
+ hr{"խորվաթերեն"}
+ ht{"հաիթերեն"}
+ hu{"հունգարերեն"}
+ hy{"հայերեն"}
+ id{"ինդոնեզերեն"}
+ ig{"իգբո"}
+ is{"իսլանդերեն"}
+ it{"իտալերեն"}
+ ja{"ճապոներեն"}
+ jv{"ճավայերեն"}
+ ka{"վրացերեն"}
+ kk{"ղազախերեն"}
+ km{"քմերերեն"}
+ kn{"կաննադա"}
+ ko{"կորեերեն"}
+ ks{"քաշմիրերեն"}
+ ku{"քրդերեն"}
+ ky{"ղրղզերեն"}
+ la{"լատիներեն"}
+ lb{"լյուքսեմբուրգերեն"}
+ lo{"լաոսերեն"}
+ lt{"լիտվերեն"}
+ lv{"լատվիերեն"}
+ mg{"մալագասերեն"}
+ mi{"մաորի"}
+ mk{"մակեդոներեն"}
+ ml{"մալայալամ"}
+ mr{"մարաթի"}
+ ms{"մալայերեն"}
+ mt{"մալթերեն"}
+ my{"բիրմայերեն"}
+ nb{"նորվեգերեն բուկմոլ"}
+ ne{"նեպալերեն"}
+ nl{"հոլանդերեն"}
+ nl_BE{"ֆլամանդերեն"}
+ nn{"նորվեգերեն նյունորսկ"}
+ or{"օրիյա"}
+ pa{"փենջաբերեն"}
+ pl{"լեհերեն"}
+ ps{"փուշթու"}
+ pt{"պորտուգալերեն"}
+ pt_BR{"բրազիլական պորտուգալերեն"}
+ pt_PT{"եվրոպական պորտուգալերեն"}
+ qu{"քեչուա"}
+ rm{"ռոմանշերեն"}
+ ro{"ռումիներեն"}
+ ru{"ռուսերեն"}
+ sa{"սանսկրիտ"}
+ sd{"սինդհի"}
+ si{"սինհալերեն"}
+ sk{"սլովակերեն"}
+ sl{"սլովեներեն"}
+ so{"սոմալիերեն"}
+ sq{"ալբաներեն"}
+ sr{"սերբերեն"}
+ su{"սունդաներեն"}
+ sv{"շվեդերեն"}
+ sw{"սուահիլի"}
+ ta{"թամիլերեն"}
+ te{"թելուգու"}
+ tg{"տաջիկերեն"}
+ th{"թայերեն"}
+ ti{"թիգրինիա"}
+ tk{"թուրքմեներեն"}
+ to{"տոնգա"}
+ tr{"թուրքերեն"}
+ tt{"թաթարերեն"}
+ ug{"ույղուրերեն"}
+ uk{"ուկրաիներեն"}
+ und{"անհայտ լեզու"}
+ ur{"ուրդու"}
+ uz{"ուզբեկերեն"}
+ vi{"վիետնամերեն"}
+ wo{"վոլոֆ"}
+ xh{"քսոզա"}
+ yo{"յորուբա"}
+ zh{"չինարեն"}
+ zh_Hans{"պարզեցված չինարեն"}
+ zh_Hant{"ավանդական չինարեն"}
+ zu{"զուլուսերեն"}
+ zxx{"առանց լեզվային բովանդակության"}
+ }
+ Scripts{
+ Arab{"արաբական"}
+ Armn{"հայկական"}
+ Beng{"բենգալական"}
+ Bopo{"բոպոմոֆո"}
+ Brai{"բրայլի"}
+ Cyrl{"կյուրեղագիր"}
+ Deva{"դեվանագարի"}
+ Ethi{"եթովպական"}
+ Geor{"վրացական"}
+ Grek{"հունական"}
+ Gujr{"գուջարաթի"}
+ Guru{"գուրմուխի"}
+ Hang{"հանգուլ"}
+ Hani{"չինական"}
+ Hans{"պարզեցված չինական"}
+ Hant{"ավանդական չինական"}
+ Hebr{"եբրայական"}
+ Hira{"հիրագանա"}
+ Jpan{"ճապոնական"}
+ Kana{"կատականա"}
+ Khmr{"քմերական"}
+ Knda{"կաննադա"}
+ Kore{"կորեական"}
+ Laoo{"լաոսական"}
+ Latn{"լատինական"}
+ Mlym{"մալայալամ"}
+ Mong{"մոնղոլական"}
+ Mymr{"մյանմարական"}
+ Orya{"օրիյա"}
+ Sinh{"սինհալական"}
+ Taml{"թամիլական"}
+ Telu{"թելուգու"}
+ Thaa{"թաանա"}
+ Thai{"թայական"}
+ Tibt{"տիբեթական"}
+ Zsym{"նշաններ"}
+ Zxxx{"չգրված"}
+ Zyyy{"ընդհանուր"}
+ Zzzz{"անհայտ գիր"}
+ }
+ Types{
+ calendar{
+ gregorian{"Գրիգորյան տոմար"}
+ }
+ collation{
+ ducet{"Սկզբնադիր տեսակավորման կարգ Unicode-ի համար"}
+ search{"Ընդհանուր որոնում"}
+ }
+ numbers{
+ arab{"արաբա-հնդկական թվեր"}
+ arabext{"արաբա-հնդկական թվերի ընդլայնված համակարգ"}
+ armn{"հայկական թվեր"}
+ armnlow{"հայկական թվեր [փոքրատառ]"}
+ beng{"բենգալական թվեր"}
+ deva{"դեվանագարի թվեր"}
+ ethi{"եթովպական թվեր"}
+ fullwide{"թվերի լայն ձևաչափ"}
+ geor{"վրացական թվեր"}
+ grek{"հունական թվեր"}
+ greklow{"հունական թվեր [փոքրատառ]"}
+ gujr{"գուջարաթի թվեր"}
+ guru{"գուրմուխի թվեր"}
+ hanidec{"չինական տասնորդական թվեր"}
+ hans{"չինական պարզեցված թվեր"}
+ hansfin{"չինական պարզեցված ֆինանսական թվեր"}
+ hant{"չինական ավանդական թվեր"}
+ hantfin{"չինական ավանդական ֆինանսական թվեր"}
+ hebr{"եբրայերեն թվեր"}
+ jpan{"ճապոնական թվեր"}
+ jpanfin{"ճապոնական ֆինանսական թվեր"}
+ khmr{"քմերական թվեր"}
+ knda{"կաննադա թվեր"}
+ laoo{"լաոսական թվեր"}
+ latn{"արևմտյան թվեր"}
+ mlym{"մալայալամ թվեր"}
+ mymr{"բիրմական թվեր"}
+ orya{"օրիյա թվեր"}
+ roman{"հռոմեական թվեր"}
+ romanlow{"հռոմեական թվեր [փոքրատառ]"}
+ taml{"թամիլական ավանդական թվեր"}
+ tamldec{"թամիլական թվեր"}
+ telu{"թելուգու թվեր"}
+ thai{"թայական թվեր"}
+ tibt{"տիբեթական թվեր"}
+ }
+ }
+ Version{"2.0.82.51"}
+ codePatterns{
+ language{"Լեզու. {0}"}
+ script{"Գիր. {0}"}
+ territory{"Շրջան. {0}"}
+ }
+ localeDisplayPattern{
+ keyTypePattern{"{0}. {1}"}
+ pattern{"{0} ({1})"}
+ separator{", "}
+ }
}
diff --git a/data/lang/id.txt b/data/lang/id.txt
index 708c89b..26616e5 100644
--- a/data/lang/id.txt
+++ b/data/lang/id.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/id.xml
// *
@@ -48,7 +48,7 @@
alt{"Altai Selatan"}
am{"Amharik"}
an{"Aragon"}
- ang{"Inggris Kuno [kl.450-1100]"}
+ ang{"Inggris Kuno"}
anp{"Angika"}
apa{"Rumpun Bahasa Apache"}
ar{"Arab"}
@@ -176,7 +176,7 @@
en_CA{"Inggris Kanada"}
en_GB{"Inggris Inggris"}
en_US{"Inggris A.S."}
- enm{"Inggris Abad Pertengahan [1100-1500]"}
+ enm{"Inggris Abad Pertengahan"}
eo{"Esperanto"}
es{"Spanyol"}
es_419{"Spanyol Amerika Latin"}
@@ -197,8 +197,8 @@
fr{"Prancis"}
fr_CA{"Prancis Kanada"}
fr_CH{"Prancis Swiss"}
- frm{"Prancis Abad Pertengahan [kl.1400-1600]"}
- fro{"Prancis Kuno [842-kl.1400]"}
+ frm{"Prancis Abad Pertengahan"}
+ fro{"Prancis Kuno"}
frr{"Frisia Utara"}
frs{"Frisia Timur"}
fur{"Friuli"}
@@ -212,14 +212,14 @@
gez{"Geez"}
gil{"Gilbert"}
gl{"Galisia"}
- gmh{"Jerman Abad Pertengahan [kl.1050-1500]"}
+ gmh{"Jerman Abad Pertengahan"}
gn{"Guarani"}
- goh{"Jerman Kuno [kl.750-1050]"}
+ goh{"Jerman Kuno"}
gon{"Gondi"}
gor{"Gorontalo"}
got{"Gothik"}
grb{"Grebo"}
- grc{"Yunani Kuno [s/d 1453]"}
+ grc{"Yunani Kuno"}
gsw{"Jerman Swiss"}
gu{"Gujarati"}
guz{"Gusii"}
@@ -350,7 +350,7 @@
men{"Mende"}
mer{"Meru"}
mg{"Malagasi"}
- mga{"Irlandia Abad Pertengahan [900-1200]"}
+ mga{"Irlandia Abad Pertengahan"}
mgh{"Makhuwa-Meetto"}
mh{"Marshall"}
mi{"Maori"}
@@ -429,7 +429,7 @@
pam{"Pampanga"}
pap{"Papiamento"}
pau{"Palau"}
- peo{"Persia Kuno [kl.600-400 SM.]"}
+ peo{"Persia Kuno"}
phi{"Rumpun Bahasa Filipina"}
phn{"Funisia"}
pi{"Pali"}
@@ -788,7 +788,6 @@
collation{
big5han{"Urutan Sortir China Tradisional - Big5"}
dictionary{"Urutan Sortir Kamus"}
- direct{"Langsung"}
ducet{"Urutan Sortir Unicode Bawaan"}
gb2312han{"Urutan Sortir China Aks. Sederhana - GB2312"}
phonebook{"Urutan Sortir Buku Telepon"}
@@ -899,7 +898,7 @@
VALENCIA{"Valencia"}
WADEGILE{"Wade-Giles Latin"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
codePatterns{
language{"Bahasa: {0}"}
script{"Skrip: {0}"}
diff --git a/data/lang/id_ID.txt b/data/lang/id_ID.txt
index 6593209..85fc819 100644
--- a/data/lang/id_ID.txt
+++ b/data/lang/id_ID.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/ig.txt b/data/lang/ig.txt
index 73ded10..17c5043 100755
--- a/data/lang/ig.txt
+++ b/data/lang/ig.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ig.xml
// *
@@ -56,5 +56,5 @@
zh{"Mandarịịnị"}
zu{"Zulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/ii.txt b/data/lang/ii.txt
index 8fdaef2..eaa0fad 100644
--- a/data/lang/ii.txt
+++ b/data/lang/ii.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ii.xml
// *
@@ -42,7 +42,7 @@
islamic{"ꑳꌦꇂꑍꉖ"}
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
codePatterns{
language{"ꅇꉙ: {0}"}
script{"ꇇꁱ: {0}"}
diff --git a/data/lang/in.txt b/data/lang/in.txt
index cb3e2e0..2a3360a 100644
--- a/data/lang/in.txt
+++ b/data/lang/in.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/in_ID.txt b/data/lang/in_ID.txt
index d22885f..bc2b4af 100644
--- a/data/lang/in_ID.txt
+++ b/data/lang/in_ID.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/is.txt b/data/lang/is.txt
index d6f11cb..c8e068e 100644
--- a/data/lang/is.txt
+++ b/data/lang/is.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/is.xml
// *
@@ -644,7 +644,7 @@
vaii{"Vai-tölustafir"}
}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
codePatterns{
language{"tungumál: {0}"}
script{"leturgerð: {0}"}
diff --git a/data/lang/it.txt b/data/lang/it.txt
index bb44fa4..923e38f 100644
--- a/data/lang/it.txt
+++ b/data/lang/it.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/it.xml
// *
@@ -821,7 +821,7 @@
SAAHO{"saho"}
SCOTLAND{"inglese scozzese standard"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Lingua: {0}"}
script{"Scrittura: {0}"}
diff --git a/data/lang/iw.txt b/data/lang/iw.txt
index c10c184..8352a34 100644
--- a/data/lang/iw.txt
+++ b/data/lang/iw.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/iw_IL.txt b/data/lang/iw_IL.txt
index 6963f2d..5a4954b 100644
--- a/data/lang/iw_IL.txt
+++ b/data/lang/iw_IL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/ja.txt b/data/lang/ja.txt
index 9c5a9ab..ed2e1e4 100644
--- a/data/lang/ja.txt
+++ b/data/lang/ja.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ja.xml
// *
@@ -784,7 +784,6 @@
collation{
big5han{"繁体字中国語順[Big5]"}
dictionary{"辞書順"}
- direct{"直接"}
ducet{"ユニコード照合順"}
gb2312han{"簡体字中国語順[GB2312]"}
phonebook{"電話帳順"}
@@ -893,7 +892,7 @@
VALLADER{"ヴァラダー"}
WADEGILE{"ウェード式ローマ字表記法"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
codePatterns{
language{"言語: {0}"}
script{"文字: {0}"}
diff --git a/data/lang/ja_JP.txt b/data/lang/ja_JP.txt
index c049867..c0ce246 100644
--- a/data/lang/ja_JP.txt
+++ b/data/lang/ja_JP.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/ja_JP_TRADITIONAL.txt b/data/lang/ja_JP_TRADITIONAL.txt
index ca942f1..e95c34a 100644
--- a/data/lang/ja_JP_TRADITIONAL.txt
+++ b/data/lang/ja_JP_TRADITIONAL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/jgo.txt b/data/lang/jgo.txt
index 09d4f71..0fec98b 100755
--- a/data/lang/jgo.txt
+++ b/data/lang/jgo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/jgo.xml
// *
@@ -37,5 +37,5 @@
latn{"pɛnɔ́mba"}
}
}
- Version{"2.0.77.53"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/jmc.txt b/data/lang/jmc.txt
index 92ae19e..e098f89 100755
--- a/data/lang/jmc.txt
+++ b/data/lang/jmc.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/jmc.xml
// *
@@ -57,5 +57,5 @@
zh{"Kyichina"}
zu{"Kyizulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/ka.txt b/data/lang/ka.txt
index 5b9b606..b5f54f3 100644
--- a/data/lang/ka.txt
+++ b/data/lang/ka.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ka.xml
// *
@@ -12,42 +12,100 @@
ka{
Keys{
calendar{"კალენდარი"}
- collation{"მიმდევრობა"}
+ collation{"დახარისხების თანმიმდევრობა"}
currency{"ვალუტა"}
+ numbers{"რიცხვები"}
}
Languages{
+ aa{"აფარი"}
ab{"აფხაზური"}
+ ada{"ადანგმე"}
ady{"ადიღეური"}
- ae{"ავესტა"}
- af{"აფრიკული"}
- ain{"აინუ"}
+ ae{"ავესტური"}
+ af{"აფრიკაანსი"}
+ agq{"აღემი"}
+ ain{"აინუური"}
+ ak{"აკანი"}
+ akk{"აქადური"}
ale{"ალეუტური"}
+ alg{"ალგონკინური ენა"}
+ alt{"სამხრეთ ალთაური"}
+ am{"ამჰარული"}
+ an{"არაგონული"}
ang{"ძველი ინგლისური"}
+ anp{"ანგიკა"}
ar{"არაბული"}
arc{"არამეული"}
- art{"ხელოვნური სხვა"}
+ arn{"მაპუდუნგუნი"}
+ arp{"არაპაჰო"}
+ art{"ხელოვნური ენა"}
+ arw{"არავაკი"}
as{"ასამური"}
- ast{"ავსტრიული"}
+ asa{"ასუ"}
+ ast{"ასტურიული"}
+ ath{"ათაბასკური ენა"}
+ awa{"ავადი"}
+ ay{"აიმარა"}
az{"აზერბაიჯანული"}
+ ba{"ბაშკირული"}
+ bal{"ბელუჯი"}
+ ban{"ბალინური"}
+ bas{"ბასა"}
+ bat{"ბალტიური ენა"}
+ bax{"ბამუნი"}
be{"ბელორუსული"}
+ bej{"ბეჯა"}
+ bem{"ბემბა"}
+ ber{"ბერბერული"}
+ bez{"ბენა"}
bg{"ბულგარული"}
bh{"ბიჰარი"}
+ bho{"ბოჯპური"}
+ bn{"ბენგალური"}
+ bnt{"ბანტუ"}
bo{"ტიბეტური"}
br{"ბრეტონული"}
+ bra{"ბრაჯი"}
+ brx{"ბოდო"}
bs{"ბოსნიური"}
bua{"ბურიატული"}
ca{"კატალანური"}
- cau{"კავკასიური სხვა"}
+ cau{"კავკასიური ენა"}
+ cay{"კაიუგა"}
ce{"ჩეჩნური"}
- cel{"კელტური სხვა"}
+ cel{"კელტური ენა"}
+ chb{"ჩიბჩა"}
+ chm{"მარიული"}
+ chr{"ჩეროკი"}
+ ckb{"სორანი ქურთული"}
+ cop{"კოპტური"}
+ cr{"კრი"}
+ crh{"ყირიმულ-თურქული"}
cs{"ჩეხური"}
+ csb{"კაშუბური"}
cu{"საეკლესიო სლავური"}
+ cv{"ჩუვაშური"}
cy{"უელსური"}
da{"დანიური"}
+ dak{"დაკოტა"}
+ dar{"დარგუული"}
+ dav{"ტაიტა"}
de{"გერმანული"}
de_AT{"ავსტრიული გერმანული"}
- de_CH{"შვეიცარიული მაღალი გერმანული"}
- egy{"ეგვიპტური"}
+ de_CH{"შვეიცარიული ზემოგერმანული"}
+ del{"დელავარული"}
+ dgr{"დოგრიბი"}
+ din{"დინკა"}
+ dje{"ზარმა"}
+ doi{"დოგრი"}
+ dua{"დუალა"}
+ dv{"დივეჰი"}
+ dyu{"დიულა"}
+ dz{"ძონგხა"}
+ ebu{"ემბუ"}
+ ee{"ევე"}
+ efi{"ეფიკი"}
+ egy{"ძველეგვიპტური"}
el{"ბერძნული"}
en{"ინგლისური"}
en_AU{"ავსტრალიური ინგლისური"}
@@ -57,164 +115,415 @@
eo{"ესპერანტო"}
es{"ესპანური"}
es_419{"ლათინურ ამერიკული ესპანური"}
- es_ES{"იბერიული ესპანური"}
+ es_ES{"ევროპული ესპანური"}
et{"ესტონური"}
eu{"ბასკური"}
+ ewo{"ევონდო"}
fa{"სპარსული"}
fi{"ფინური"}
fil{"ფილიპინური"}
+ fj{"ფიჯი"}
+ fo{"ფარერული"}
+ fon{"ფონი"}
fr{"ფრანგული"}
fr_CA{"კანადური ფრანგული"}
fr_CH{"შვეიცარიული ფრანგული"}
fro{"ძველი ფრანგული"}
+ frr{"ჩრდილოფრიზიული"}
+ frs{"აღმოსავლეთფრიზიული"}
+ fur{"ფრიულური"}
+ fy{"დასავლეთფრიზიული"}
ga{"ირლანდიური"}
- gd{"შოტლანდიურ-გალური"}
- gl{"გალური"}
+ gba{"გბაია"}
+ gd{"შოტლანდიური გელური"}
+ gem{"გერმანიკული ენა"}
+ gl{"გალისიური"}
gn{"გუარანი"}
- goh{"ძველი გერმანული"}
+ goh{"ძველი ზემოგერმანული"}
+ gon{"გონდი"}
+ got{"გოთური"}
grc{"ძველი ბერძნული"}
gsw{"შვეიცარიული გერმანული"}
gu{"გუჯარათი"}
+ ha{"ჰაუსა"}
+ haw{"ჰავაიური"}
he{"ებრაული"}
hi{"ჰინდი"}
- hr{"ხორვატიული"}
+ hit{"ხეთური ენა"}
+ hr{"ხორვატული"}
+ ht{"ჰაიტიური"}
hu{"უნგრული"}
hy{"სომხური"}
ia{"ინტერლინგუალური"}
+ iba{"იბანი"}
+ ibb{"იბიბიო"}
id{"ინდონეზიური"}
ie{"ინტერლინგი"}
- ine{"ინდო-ევროპული სხვა"}
+ ig{"იგბო"}
+ inc{"ინდური ენა"}
+ ine{"ინდოევროპული ენა"}
+ inh{"ინგუშური"}
+ io{"იდო"}
+ ira{"ირანული ენა"}
+ iro{"იროკეზული ენა"}
is{"ისლანდიური"}
it{"იტალიური"}
+ iu{"ინუკტიტუტი"}
ja{"იაპონური"}
- jv{"იავანური"}
+ jbo{"ლოჟბანი"}
+ jpr{"იუდეო-სპარსული"}
+ jrb{"იუდეო-არაბული"}
+ jv{"იავური"}
ka{"ქართული"}
+ kaa{"ყარაყალფახური"}
+ kac{"კაჩინი"}
+ kam{"კამბა"}
+ kbd{"ყაბარდოული"}
+ kea{"კაბუვერდიანუ"}
kg{"კონგო"}
+ khi{"კოისანური ენა"}
kk{"ყაზახური"}
- km{"კამბოჯიური"}
+ kl{"გრენლანდიური"}
+ kln{"კალენჯინი"}
+ km{"ქმერული"}
+ kmb{"კიმბუნდუ"}
+ kn{"კანადა"}
ko{"კორეული"}
+ kok{"კონკანი"}
+ kpe{"კპელე"}
+ kr{"კანური"}
+ krc{"ყარაჩაულ-ბალყარული"}
+ krl{"კარელიური"}
+ kru{"კურუქი"}
+ ks{"ქაშმირული"}
+ ksb{"შამბალა"}
ku{"ქურთული"}
+ kum{"ყუმუხური"}
+ kut{"კუტენაი"}
+ kv{"კომი"}
+ kw{"კორნული"}
ky{"ყირგიზული"}
la{"ლათინური"}
+ lad{"ლადინო"}
+ lag{"ლანგი"}
+ lah{"ლანდა"}
+ lam{"ლამბა"}
lb{"ლუქსემბურგული"}
+ lez{"ლეზგიური"}
+ lg{"განდა"}
+ li{"ლიმბურგული"}
ln{"ლინგალა"}
lo{"ლაოსური"}
+ lol{"მონგო"}
+ loz{"ლოზი"}
lt{"ლიტვური"}
+ lu{"ლუბა-კატანგა"}
+ lui{"ლუისენიო"}
+ lun{"ლუნდა"}
+ luo{"ლუო"}
+ lus{"მიზო"}
+ luy{"ლუჰია"}
lv{"ლატვიური"}
- mk{"მაკედონიური"}
+ maf{"მაფა"}
+ mag{"მაგაჰი"}
+ mai{"მაითილი"}
+ map{"ავსტრონეზიური ენა"}
+ mde{"მაბა"}
+ mdf{"მოქშა"}
+ men{"მენდე"}
+ mer{"მერუ"}
+ mg{"მალაგასიური"}
+ mgh{"მაქუვა-მეეტო"}
+ mi{"მაორი"}
+ mk{"მაკედონური"}
+ mkh{"მონ-ქმერული ენა"}
+ ml{"მალაიალამური"}
mn{"მონღოლური"}
- mo{"მოლდოვური"}
- ms{"მალაიზიური"}
- myn{"მაიას ენები"}
+ mnc{"მანჯურიული"}
+ mni{"მანიპური"}
+ mno{"მანობო ენა"}
+ mo{"მოლდავური"}
+ mr{"მარათჰი"}
+ ms{"მალაიური"}
+ mt{"მალტური"}
+ mua{"მუნდანგი"}
+ mun{"მუნდა ენა"}
+ mus{"კრიკი"}
+ mwl{"მირანდული"}
+ mwr{"მარვარი"}
+ my{"ბირმული"}
+ mye{"მიენე"}
+ myn{"მაია ენა"}
+ myv{"ერზია"}
+ na{"ნაურუ"}
+ nah{"ნაუატლი"}
nap{"ნეაპოლიტანური"}
+ naq{"ნამა"}
+ nb{"ნორვეგიული ბუკმოლი"}
ne{"ნეპალური"}
- nl{"ჰოლანდიური"}
- nl_BE{"ფლომანდიური"}
- nn{"ნორვეგიული ნინორსკი"}
+ new{"ნევარი"}
+ nl{"ნიდერლანდური"}
+ nl_BE{"ფლამანდიური"}
+ nn{"ნორვეგიული ნიუნორსკი"}
no{"ნორვეგიული"}
+ nog{"ნოღაური"}
+ non{"ძველსკანდინავიური"}
+ nqo{"ნკო"}
nv{"ნავახო"}
- oc{"ოციტანური"}
- or{"ორიული"}
+ nwc{"კლასიკური ნევარული"}
+ ny{"ნიანჯა"}
+ nym{"ნიამვეზი"}
+ nyn{"ნიანკოლე"}
+ nyo{"ნიორო"}
+ nzi{"ნზიმა"}
+ oc{"ოქსიტანური"}
+ oj{"ოჯიბვე"}
+ or{"ორია"}
os{"ოსური"}
+ oto{"ოტომანგური ენა"}
+ pa{"პენჯაბური"}
+ pal{"ფალავი"}
peo{"ძველი სპარსული"}
+ phn{"ფინიკიური"}
+ pi{"პალი"}
pl{"პოლონური"}
- pra{"პრაკრიტის ენები"}
+ pra{"პრაკრიტის ენა"}
+ pro{"ძველი პროვანსული"}
ps{"პუშტუ"}
pt{"პორტუგალიური"}
pt_BR{"ბრაზილიური პორტუგალიური"}
- pt_PT{"იბერიულ-პორტუგალიური"}
+ pt_PT{"ევროპული პორტუგალიური"}
+ qu{"კეჩუა"}
+ raj{"რაჯასთანი"}
+ rap{"რაპანუი"}
+ rar{"რაროტონგული"}
+ rm{"რეტორომანული"}
+ rn{"რუნდი"}
ro{"რუმინული"}
- ru{"ru"}
+ roa{"რომანული ენა"}
+ rom{"ბოშური"}
+ ru{"რუსული"}
sa{"სანსკრიტი"}
+ sah{"იაკუტური"}
+ sal{"სალიშური ენა"}
+ sam{"სამარიულ-არამეული"}
sc{"სარდინიული"}
scn{"სიცილიური"}
- sd{"სინდური"}
+ sd{"სინდჰური"}
+ see{"სენეკა"}
+ sel{"სელკუპური"}
+ sem{"სემიტური ენა"}
sga{"ძველი ირლანდიური"}
sh{"სერბულ-ხორვატული"}
+ shn{"შანი"}
+ shu{"ჩადური არაბული"}
si{"სინჰალური"}
+ sio{"სიუ ენა"}
+ sit{"ჩინურ-ტიბეტური ენა"}
sk{"სლოვაკური"}
sl{"სლოვენური"}
- sla{"სლავური სხვა"}
+ sla{"სლავური ენა"}
+ sm{"სამოა"}
so{"სომალიური"}
sq{"ალბანური"}
sr{"სერბული"}
st{"სამხრეთ სოთოს ენა"}
+ su{"სუნდური"}
sux{"შუმერული"}
sv{"შვედური"}
sw{"სუაჰილი"}
+ swb{"კომორული"}
+ syc{"კლასიკური სირიული"}
+ syr{"სირიული"}
+ ta{"ტამილური"}
+ tai{"ტაი ენა"}
+ te{"ტელუგუ"}
tg{"ტაჯიკური"}
- th{"ტაილანდური"}
+ th{"ტაი"}
+ ti{"ტიგრინია"}
+ tig{"ტიგრე"}
tk{"თურქმენული"}
tlh{"კლინგონი"}
tn{"ტსვანა"}
+ to{"ტონგანური"}
tr{"თურქული"}
+ tt{"თათრული"}
+ tup{"ტუპი ენა"}
+ tut{"ალთაური"}
tw{"თუი"}
- udm{"უდმურტიული"}
- ug{"უიგურული"}
+ tyv{"ტუვა"}
+ udm{"უდმურტული"}
+ ug{"უიღურული"}
+ uga{"უგარითული"}
uk{"უკრაინული"}
- und{"უცნობი ან არასწორი ენა"}
+ und{"უცნობი ენა"}
ur{"ურდუ"}
uz{"უზბეკური"}
+ vai{"ვაი"}
vi{"ვიეტნამური"}
- xh{"ქსოზა"}
+ wak{"ვაკაშური ენა"}
+ wal{"ველაითა"}
+ wo{"ვოლოფური"}
+ xal{"ყალმუხური"}
+ xh{"ქჰოსა"}
yi{"იდიში"}
+ yo{"იორუბა"}
+ ypk{"იუპიკური ენა"}
+ yue{"კანტონური"}
+ zbl{"ბლისსიმბოლოები"}
+ zen{"ზენაგა"}
zh{"ჩინური"}
zh_Hans{"გამარტივებული ჩინური"}
zh_Hant{"ტრადიციული ჩინური"}
+ znd{"ზანდე"}
zu{"ზულუ"}
+ zxx{"ლინგვისტური შიგთავსი არ არის"}
+ zza{"ზაზაკი"}
}
Scripts{
+ Afak{"აფაკა"}
Arab{"არაბული"}
+ Armi{"იმპერიული არამეული"}
Armn{"სომხური"}
- Bali{"ბალი"}
+ Avst{"ავესტური"}
+ Bali{"ბალიური"}
+ Bamu{"ბამუმი"}
+ Bass{"ბასა ვაჰი"}
Batk{"ბატაკი"}
Beng{"ბენგალური"}
+ Blis{"ბლისსიმბოლოები"}
+ Bopo{"ბოპომოფო"}
+ Brah{"ბრაჰმი"}
Brai{"ბრაილი"}
+ Buhd{"ბუჰიდი"}
+ Cakm{"ჩაკმა"}
+ Cari{"კარიული"}
+ Cham{"ჩამი"}
+ Cher{"ჩეროკი"}
+ Cirt{"კირთი"}
Copt{"კოპტური"}
Cprt{"კვიპროსული"}
Cyrl{"კირილიცა"}
- Cyrs{"ძველი საეკლესიო კირილიცა"}
+ Cyrs{"ძველი სლავური კირილიცა"}
Deva{"დევანაგარი"}
+ Dsrt{"დეზერეტის"}
+ Dupl{"დუპლოის სტენოგრაფია"}
Egyd{"ეგვიპტური დემოტიკური"}
- Egyh{"ეგვიპტური ჰიერატიკული"}
+ Egyh{"ეგვიპტური იერატიკული"}
Egyp{"ეგვიპტური იეროგლიფური"}
- Ethi{"ეთიოპური"}
+ Ethi{"ეთიოპიური"}
Geok{"ხუცური"}
Geor{"ქართული"}
Glag{"გლაგოლიცა"}
Goth{"გოთური"}
+ Gran{"გრანთა"}
Grek{"ბერძნული"}
Gujr{"გუჯარათული"}
- Guru{"გურმუხული"}
+ Guru{"გურმუხი"}
+ Hang{"ჰანგული"}
Hani{"ჰანი"}
- Hans{"გამარტივებული ჰანი"}
- Hant{"ტრადიციული ჰანი"}
+ Hano{"ჰანუნოო"}
+ Hans{"გამარტივებული"}
+ Hant{"ტრადიციული"}
Hebr{"ებრაული"}
Hira{"ჰირაგანა"}
- Hrkt{"კატაკანა ან ჰირაგანა"}
+ Hluw{"ანატოლიური იეროგლიფური"}
+ Hmng{"ფაჰაუ-მონი"}
+ Hrkt{"იაპონური კანა"}
Hung{"ძველი უნგრული"}
+ Java{"იავური"}
Jpan{"იაპონური"}
+ Jurc{"ჯურჯენული"}
+ Kali{"კაიაჰ-ლი"}
Kana{"კატაკანა"}
- Khmr{"ქჰმერული"}
+ Khar{"ქაროშთი"}
+ Khmr{"ქმერული"}
+ Khoj{"ქოჯკი"}
+ Knda{"კანადა"}
+ Kore{"კორეული"}
+ Kpel{"კპელე"}
+ Kthi{"კაითი"}
Laoo{"ლაოსური"}
+ Latg{"გელური ლათინური"}
Latn{"ლათინური"}
- Lina{"წრფივი A"}
- Linb{"წრფივი B"}
+ Limb{"ლიმბუ"}
+ Lina{"A-ხაზოვანი"}
+ Linb{"B-ხაზოვანი"}
+ Loma{"ლომა"}
+ Lyci{"ლიკიური"}
+ Lydi{"ლიდიური"}
+ Mand{"მანდეური"}
+ Mani{"მანიქეური"}
Maya{"მაიას იეროგლიფები"}
+ Mend{"მენდე"}
+ Merc{"მეროიტული კურსივი"}
+ Mero{"მეროიტული"}
+ Mlym{"მალაიალამური"}
Mong{"მონღოლური"}
+ Mroo{"მრო"}
+ Mymr{"მიანმური"}
+ Narb{"ძველი ჩრდილოეთ-არაბული"}
+ Nbat{"ნაბატეური"}
+ Nkoo{"ნკო"}
+ Nshu{"ნუშუ"}
+ Ogam{"ოღამი"}
+ Olck{"ოლ-ჩიკი"}
+ Orkh{"ორხონული"}
+ Orya{"ორია"}
+ Osma{"ოსმანია"}
+ Palm{"პალმირული"}
+ Perm{"ძველი პერმული"}
+ Phag{"ფაგსპა"}
+ Phli{"მონუმენტური ფალაური"}
+ Phlp{"ფსალმუნური ფალაური"}
+ Phlv{"წიგნური ფალაური"}
Phnx{"ფინიკიური"}
+ Prti{"მონუმენტური პართული"}
+ Rjng{"რეჯანგი"}
+ Roro{"რონგორონგო"}
Runr{"რუნული"}
+ Samr{"სამარიული"}
+ Sara{"სარატი"}
+ Sarb{"ძველი სამხრეთ-არაბული"}
+ Saur{"საურაშტრა"}
+ Sgnw{"ჟესტთა"}
+ Shrd{"შარადა"}
+ Sind{"ქუდავადი"}
+ Sinh{"სინჰალური"}
+ Sora{"სორან-სომპენი"}
+ Sund{"სუნდანური"}
+ Sylo{"სილოტი ნაგრი"}
Syrc{"სირიული"}
- Syre{"ესტრანჯელოსეული სირიული"}
+ Syre{"სირიული ესტრანგელო"}
Syrj{"დასავლეთი სირიული"}
Syrn{"აღმოსავლეთი სირიული"}
+ Tagb{"ტაგბანვა"}
+ Takr{"ტაკრი"}
+ Tale{"ტაი ლე"}
+ Talu{"ახალი ტაი ლიუ"}
Taml{"ტამილური"}
- Thai{"ტაილანდური"}
+ Tang{"ტანღუტური"}
+ Tavt{"ტაი-ვიეტი"}
+ Telu{"ტელუგუ"}
+ Teng{"ტენგვარი"}
+ Tfng{"ტიფინაღი"}
+ Thaa{"თაანა"}
+ Thai{"ტაი"}
Tibt{"ტიბეტური"}
+ Tirh{"ტირჰუტა"}
+ Ugar{"უგარითული"}
+ Vaii{"ვაი"}
+ Visp{"ხილული მეტყველება"}
+ Wara{"ვარანგ-კშიტი"}
+ Wole{"ვოლეაი"}
Xpeo{"ძველი სპარსული"}
Xsux{"შუმერულ-აქადური ლურსმნული"}
- Zxxx{"დაუწერელი"}
- Zzzz{"უცნობი ან არასწორი დამწერლობა"}
+ Zinh{"გადაღებული"}
+ Zmth{"მათემატიკური ნოტაცია"}
+ Zsym{"სიმბოლოები"}
+ Zxxx{"უმწერლობო"}
+ Zyyy{"ზოგადი"}
+ Zzzz{"უცნობი დამწერლობა"}
}
Types{
calendar{
@@ -222,7 +531,7 @@
chinese{"ჩინური კალენდარი"}
gregorian{"გრიგორიანული კალენდარი"}
hebrew{"ებრაული კალენდარი"}
- indian{"ინდური ეროვნული კალენდარი"}
+ indian{"ინდოეთის ეროვნული კალენდარი"}
islamic{"ისლამური კალენდარი"}
islamic-civil{"ისლამური სამოქალაქო კალენდარი"}
japanese{"იაპონური კალენდარი"}
@@ -230,12 +539,62 @@
}
collation{
big5han{"ტრადიციული ჩინური"}
+ ducet{"უნიკოდის ნაგულისხმევი დახარისხების თანმიმდევრობა"}
gb2312han{"გამარტივებული ჩინური"}
+ search{"ზოგადი დანიშნულების ძიება"}
traditional{"ტრადიციული"}
}
+ numbers{
+ arab{"არაბულ-ინდური ციფრები"}
+ arabext{"გაფართოებული არაბულ-ინდური ციფრები"}
+ armn{"სომხური რიცხვები"}
+ armnlow{"სომხური ქვედა რეგისტრის რიცხვები"}
+ beng{"ბენგალური ციფრები"}
+ deva{"დევანაგარის ციფრები"}
+ ethi{"ეთიოპიური რიცხვები"}
+ fullwide{"სრულსიგანიანი ციფრები"}
+ geor{"ქართული რიცხვები"}
+ grek{"ბერძნული რიცხვები"}
+ greklow{"ბერძნული ქვედა რეგისტრის რიცხვები"}
+ gujr{"გუჯარათული ციფრები"}
+ guru{"გურმუხული ციფრები"}
+ hanidec{"ჩინური ათობითი რიცხვები"}
+ hans{"გამარტივებული ჩინური რიცხვები"}
+ hansfin{"გამარტივებული ჩინური ფინანსური რიცხვები"}
+ hant{"ტრადიციული ჩინური რიცხვები"}
+ hantfin{"ტრადიციული ჩინური ფინანსური რიცხვები"}
+ hebr{"ებრაული რიცხვები"}
+ jpan{"იაპონური რიცხვები"}
+ jpanfin{"იაპონური ფინანსური რიცხვები"}
+ khmr{"ქხმერული ციფრები"}
+ knda{"კანადური რიცხვები"}
+ laoo{"ლაოსური ციფრები"}
+ latn{"დასავლური ციფრები"}
+ limb{"ლიმბური ციფრები"}
+ mlym{"მალაიალამური ციფრები"}
+ mong{"მონღოლური ციფრები"}
+ mymr{"მიანმური ციფრები"}
+ orya{"ორიული ციფრები"}
+ roman{"რომაული ციფრები"}
+ romanlow{"რომაული ქვედა რეგისტრის ციფრები"}
+ saur{"საურაშტრული ციფრები"}
+ sund{"სუნდანური ციფრები"}
+ talu{"ახალი ტაი ლიუსი ციფრები"}
+ taml{"ტრადიციული ტამილური რიცხვები"}
+ tamldec{"ტამილური ციფრები"}
+ telu{"ტელუგუს ციფრები"}
+ thai{"ტაილანდური ციფრები"}
+ tibt{"ტიბეტური ციფრები"}
+ }
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.61"}
+ codePatterns{
+ language{"ენა: {0}"}
+ script{"დამწერლობა: {0}"}
+ territory{"რეგიონი: {0}"}
+ }
localeDisplayPattern{
+ keyTypePattern{"{0}: {1}"}
pattern{"{0} ({1})"}
separator{", "}
}
diff --git a/data/lang/kab.txt b/data/lang/kab.txt
index a364cde..6c654bd 100755
--- a/data/lang/kab.txt
+++ b/data/lang/kab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kab.xml
// *
@@ -57,5 +57,5 @@
zh{"Tacinwat, Tamundarint"}
zu{"Tazulut"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/kam.txt b/data/lang/kam.txt
index 33205e9..ebc8125 100755
--- a/data/lang/kam.txt
+++ b/data/lang/kam.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kam.xml
// *
@@ -57,5 +57,5 @@
zh{"Kichina"}
zu{"Kizulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/kde.txt b/data/lang/kde.txt
index f79e7f5..2bcfb1d 100755
--- a/data/lang/kde.txt
+++ b/data/lang/kde.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kde.xml
// *
@@ -57,5 +57,5 @@
zh{"Chichina"}
zu{"Chizulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/kea.txt b/data/lang/kea.txt
index 805fcf6..9724385 100755
--- a/data/lang/kea.txt
+++ b/data/lang/kea.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kea.xml
// *
@@ -193,7 +193,7 @@
latn{"Numerus Arabikus"}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Lingua: {0}"}
script{"Skrita: {0}"}
diff --git a/data/lang/khq.txt b/data/lang/khq.txt
index a25e20e..e417dc2 100755
--- a/data/lang/khq.txt
+++ b/data/lang/khq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/khq.xml
// *
@@ -57,5 +57,5 @@
zh{"Sinuwa senni, Mandareŋ"}
zu{"Julu senni"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/ki.txt b/data/lang/ki.txt
index 2feef82..93d50e4 100755
--- a/data/lang/ki.txt
+++ b/data/lang/ki.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ki.xml
// *
@@ -57,5 +57,5 @@
zh{"Kĩcaina"}
zu{"Kizulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/kk.txt b/data/lang/kk.txt
index e860396..9299647 100644
--- a/data/lang/kk.txt
+++ b/data/lang/kk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kk.xml
// *
@@ -54,7 +54,7 @@
latn{"Батыс сандары"}
}
}
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Тіл: {0}"}
script{"Жазылуы: {0}"}
diff --git a/data/lang/kk_Cyrl.txt b/data/lang/kk_Cyrl.txt
index 6e5a261..a368107 100644
--- a/data/lang/kk_Cyrl.txt
+++ b/data/lang/kk_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kk_Cyrl.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/kk_Cyrl.xml
*/
kk_Cyrl{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/kk_Cyrl_KZ.txt b/data/lang/kk_Cyrl_KZ.txt
index ec163a4..6917b0e 100644
--- a/data/lang/kk_Cyrl_KZ.txt
+++ b/data/lang/kk_Cyrl_KZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/kk_KZ.txt b/data/lang/kk_KZ.txt
index 6702eea..f94bda6 100644
--- a/data/lang/kk_KZ.txt
+++ b/data/lang/kk_KZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/kl.txt b/data/lang/kl.txt
index c16062f..b9fcf88 100644
--- a/data/lang/kl.txt
+++ b/data/lang/kl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kl.xml
// *
@@ -13,5 +13,5 @@
Languages{
kl{"kalaallisut"}
}
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/kln.txt b/data/lang/kln.txt
index 67024b5..c04b977 100755
--- a/data/lang/kln.txt
+++ b/data/lang/kln.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kln.xml
// *
@@ -57,5 +57,5 @@
zh{"kutitab China"}
zu{"kutitab Zulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/km.txt b/data/lang/km.txt
index 74a278b..289e7e6 100644
--- a/data/lang/km.txt
+++ b/data/lang/km.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/km.xml
// *
@@ -249,7 +249,7 @@
tibt{"លេខតៃប៉ិ"}
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
codePatterns{
language{"ភាសា ៖ {0}"}
script{"អក្សរ ៖ {0}"}
diff --git a/data/lang/kn.txt b/data/lang/kn.txt
index 6590b43..0488564 100644
--- a/data/lang/kn.txt
+++ b/data/lang/kn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kn.xml
// *
@@ -750,7 +750,7 @@
vaii{"ವಾಯ್ ಅಂಕೆಗಳು"}
}
}
- Version{"2.0.78.40"}
+ Version{"2.0.82.45"}
localeDisplayPattern{
pattern{"{0} ({1})"}
separator{","}
diff --git a/data/lang/ko.txt b/data/lang/ko.txt
index 64ca0ff..76e4099 100644
--- a/data/lang/ko.txt
+++ b/data/lang/ko.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ko.xml
// *
@@ -788,7 +788,6 @@
collation{
big5han{"중국어 번체 정렬 순서 [Big5]"}
dictionary{"사전 정렬순"}
- direct{"직접"}
ducet{"기본 유니코드 정렬 순서"}
gb2312han{"중국어 간체 정렬 순서 [GB2312]"}
phonebook{"전화번호부순"}
@@ -881,7 +880,7 @@
VAIDIKA{"바이디카"}
VALLADER{"발라더"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
codePatterns{
language{"언어: {0}"}
script{"스크립트: {0}"}
diff --git a/data/lang/kok.txt b/data/lang/kok.txt
index 843adab..69a1651 100644
--- a/data/lang/kok.txt
+++ b/data/lang/kok.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kok.xml
// *
@@ -152,5 +152,5 @@
zh{"चीनीस्"}
zu{"जुलू"}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/ks.txt b/data/lang/ks.txt
index 9dc49f2..8d17062 100755
--- a/data/lang/ks.txt
+++ b/data/lang/ks.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ks.xml
// *
@@ -346,7 +346,7 @@
non{"پرون نارسی"}
nqo{"ایٚن کو"}
nr{"جنوب ڈیٚبیل"}
- nso{"جنوبی سوتھو"}
+ nso{"شمالی ستھو"}
nub{"نوٗبیَن زبان"}
nv{"نَواجو"}
nwc{"کلاسِکَل نیواری"}
@@ -438,7 +438,7 @@
srr{"سیٚریر"}
ss{"سواتی"}
ssa{"نیٖلو سہارَن زبان"}
- st{"جنوٗبی سوتھو"}
+ st{"جنوبی ستھو"}
su{"سَنڈَنیٖز"}
suk{"سُکُما"}
sus{"سُسوٗ"}
@@ -682,7 +682,7 @@
SOLBA{"ثٹولوِزا/سولبِکا بوٗلۍ"}
TARASK{"تاراسکیٖوِکا علمہ ہِجاِ"}
}
- Version{"2.0.78.55"}
+ Version{"2.0.82.45"}
codePatterns{
language{"زَبان: {0}"}
script{"رَسم الخط: {0}"}
diff --git a/data/lang/ks_Arab.txt b/data/lang/ks_Arab.txt
index cbef02c..903481b 100755
--- a/data/lang/ks_Arab.txt
+++ b/data/lang/ks_Arab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ks_Arab.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/ks_Arab.xml
*/
ks_Arab{
- Version{"2.0.75.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/ks_Arab_IN.txt b/data/lang/ks_Arab_IN.txt
index 47b5e54..9eac4af 100755
--- a/data/lang/ks_Arab_IN.txt
+++ b/data/lang/ks_Arab_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/ks_IN.txt b/data/lang/ks_IN.txt
index 558e1ea..fa6550f 100755
--- a/data/lang/ks_IN.txt
+++ b/data/lang/ks_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/ksb.txt b/data/lang/ksb.txt
index b71638b..1629183 100755
--- a/data/lang/ksb.txt
+++ b/data/lang/ksb.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ksb.xml
// *
@@ -57,5 +57,5 @@
zh{"Kichina"}
zu{"Kizulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/ksf.txt b/data/lang/ksf.txt
index 432cbe0..8747695 100755
--- a/data/lang/ksf.txt
+++ b/data/lang/ksf.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ksf.xml
// *
@@ -57,5 +57,5 @@
zh{"ricinɔá"}
zu{"rizúlu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/kw.txt b/data/lang/kw.txt
index 8c3fe58..477d1e9 100644
--- a/data/lang/kw.txt
+++ b/data/lang/kw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kw.xml
// *
@@ -13,5 +13,5 @@
Languages{
kw{"kernewek"}
}
- Version{"2.0.74.74"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/lag.txt b/data/lang/lag.txt
index f4d4ab2..effbe87 100755
--- a/data/lang/lag.txt
+++ b/data/lang/lag.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lag.xml
// *
@@ -57,5 +57,5 @@
zh{"Kɨchíina"}
zu{"Kɨzúulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/lg.txt b/data/lang/lg.txt
index 58a7320..d916612 100755
--- a/data/lang/lg.txt
+++ b/data/lang/lg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lg.xml
// *
@@ -57,5 +57,5 @@
zh{"Lucayina"}
zu{"Luzzulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/ln.txt b/data/lang/ln.txt
index 3386fa3..535ca16 100755
--- a/data/lang/ln.txt
+++ b/data/lang/ln.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ln.xml
// *
@@ -57,5 +57,5 @@
zh{"lisinwa"}
zu{"zulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/lo.txt b/data/lang/lo.txt
index 31ca79b..0bf7c3c 100755
--- a/data/lang/lo.txt
+++ b/data/lang/lo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lo.xml
// *
@@ -751,7 +751,6 @@
collation{
big5han{"ລຽງຕາມອັກສອນຈີນດັ້ງເດີມ"}
dictionary{"ລຽງຕາມພົດຈະນານຸກົມ"}
- direct{"ໂດຍຕົງ"}
ducet{"ລຽງຕາມລໍາດັບຕາມຢູນີໂຄດ"}
gb2312han{"ລຽງຕາມອັກສອນຈີນປະຍຸກ"}
phonebook{"ລຽງຕາມສະໝຸດໂທລະສັບ"}
@@ -877,7 +876,7 @@
VALLADER{"ວັລລາເດີ"}
WADEGILE{"ການຖອດອັກສອນແບບເວດ-ໄຈລ໌"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
codePatterns{
language{"{0}"}
script{"{0}"}
diff --git a/data/lang/lt.txt b/data/lang/lt.txt
index 64aa9ad..d0b17c6 100644
--- a/data/lang/lt.txt
+++ b/data/lang/lt.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lt.xml
// *
@@ -760,7 +760,6 @@
collation{
big5han{"įprasta kiniška rūšiavimo tvarka - Big5"}
dictionary{"žodyno rūšiavimo tvarka"}
- direct{"tiesioginis"}
ducet{"numatytojo unikodo rūšiavimo tvarka"}
gb2312han{"supaprastinta kiniška rūšiavimo tvarka - GB2312"}
phonebook{"telefonų knygos rūšiavimo tvarka"}
@@ -852,7 +851,7 @@
VALENCIA{"Valenciečiai"}
WADEGILE{"Wade-Giles Romanization"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.57"}
codePatterns{
language{"Kalba: {0}"}
script{"Rašmenys: {0}"}
diff --git a/data/lang/lu.txt b/data/lang/lu.txt
index 6ec2bcd..c4d3084 100755
--- a/data/lang/lu.txt
+++ b/data/lang/lu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lu.xml
// *
@@ -55,5 +55,5 @@
zh{"shinɛ"}
zu{"Nzulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/luo.txt b/data/lang/luo.txt
index 257c86d..a839aa3 100755
--- a/data/lang/luo.txt
+++ b/data/lang/luo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/luo.xml
// *
@@ -57,5 +57,5 @@
zh{"Kichina"}
zu{"Kizulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/luy.txt b/data/lang/luy.txt
index 02bfc5e..abbc00c 100755
--- a/data/lang/luy.txt
+++ b/data/lang/luy.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/luy.xml
// *
@@ -57,5 +57,5 @@
zh{"Kichina"}
zu{"Kizulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/lv.txt b/data/lang/lv.txt
index 1fdf24e..22a1808 100644
--- a/data/lang/lv.txt
+++ b/data/lang/lv.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lv.xml
// *
@@ -781,7 +781,7 @@
VALENCIA{"valensiešu"}
WADEGILE{"Veida-Džailza romanizācija"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Valoda: {0}"}
script{"Rakstība: {0}"}
diff --git a/data/lang/mas.txt b/data/lang/mas.txt
index 6ed2a94..929dd2b 100755
--- a/data/lang/mas.txt
+++ b/data/lang/mas.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mas.xml
// *
@@ -57,5 +57,5 @@
zh{"nkʉtʉ́k ɔ́ɔ̄ lchina"}
zu{"nkʉtʉ́k ɔ́ɔ̄ lzulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/mer.txt b/data/lang/mer.txt
index 25b2b6f..7b835da 100755
--- a/data/lang/mer.txt
+++ b/data/lang/mer.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mer.xml
// *
@@ -57,5 +57,5 @@
zh{"Kĩchina"}
zu{"Kĩzulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/mfe.txt b/data/lang/mfe.txt
index 4e13de5..679d826 100755
--- a/data/lang/mfe.txt
+++ b/data/lang/mfe.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mfe.xml
// *
@@ -57,5 +57,5 @@
zh{"sinwa, mandarin"}
zu{"zoulou"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/mg.txt b/data/lang/mg.txt
index b5e3a17..1838da3 100755
--- a/data/lang/mg.txt
+++ b/data/lang/mg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mg.xml
// *
@@ -57,5 +57,5 @@
zh{"Sinoa, Mandarin"}
zu{"Zolò"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/mgh.txt b/data/lang/mgh.txt
index 41937f8..868ff53 100755
--- a/data/lang/mgh.txt
+++ b/data/lang/mgh.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mgh.xml
// *
@@ -56,5 +56,5 @@
zh{"Ichina"}
zu{"Izulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/mgo.txt b/data/lang/mgo.txt
index eb52394..b678eaf 100755
--- a/data/lang/mgo.txt
+++ b/data/lang/mgo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mgo.xml
// *
@@ -27,7 +27,7 @@
latn{"inu"}
}
}
- Version{"2.0.77.53"}
+ Version{"2.0.82.45"}
codePatterns{
language{"{0}"}
script{"{0}"}
diff --git a/data/lang/mk.txt b/data/lang/mk.txt
index fc7ac14..f047ed5 100644
--- a/data/lang/mk.txt
+++ b/data/lang/mk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mk.xml
// *
@@ -699,7 +699,7 @@
PINYIN{"Пинјин романизација"}
WADEGILE{"Вејд-Џајлс романизација"}
}
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Јазик: {0}"}
script{"Писмо: {0}"}
diff --git a/data/lang/ml.txt b/data/lang/ml.txt
index 0f9ebb8..5b0a548 100644
--- a/data/lang/ml.txt
+++ b/data/lang/ml.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ml.xml
// *
@@ -762,7 +762,7 @@
POSIX{"കമ്പ്യൂട്ടർ"}
REVISED{"പരിഷ്ക്കരിച്ച ലിപി"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
codePatterns{
language{"ഭാഷ: {0}"}
script{"ലിപി: {0}"}
diff --git a/data/lang/mn.txt b/data/lang/mn.txt
new file mode 100755
index 0000000..c247dc2
--- /dev/null
+++ b/data/lang/mn.txt
@@ -0,0 +1,250 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/mn.xml
+// *
+// ***************************************************************************
+/**
+ * ICU <specials> source: <path>/xml/main/mn.xml
+ */
+mn{
+ Keys{
+ calendar{"хуанли"}
+ collation{"Захиалга ялгах"}
+ currency{"мөнгөн тэмдэгт"}
+ numbers{"Тоонууд"}
+ }
+ Languages{
+ ab{"абхаз"}
+ af{"африк"}
+ am{"амхар"}
+ ar{"араб"}
+ as{"ассам"}
+ az{"азербайжан"}
+ be{"беларусь"}
+ bg{"болгар"}
+ bn{"бенгал"}
+ bo{"төвд"}
+ bs{"босни"}
+ ca{"каталан"}
+ cs{"чех"}
+ cy{"уэлс"}
+ da{"дани"}
+ de{"герман"}
+ de_AT{"австри герман"}
+ de_CH{"швейцари герман"}
+ el{"грек"}
+ en{"англи"}
+ en_AU{"австрали англи"}
+ en_CA{"канад англи"}
+ en_GB{"британийн англи"}
+ en_US{"америк англи"}
+ eo{"эсперанто"}
+ es{"испани"}
+ es_419{"латин америкийн испани"}
+ es_ES{"европын испани"}
+ et{"эстони"}
+ eu{"баск"}
+ fa{"перс"}
+ fi{"финлянд"}
+ fil{"филипин"}
+ fj{"фижи"}
+ fo{"фарер"}
+ fr{"франц"}
+ fr_CA{"канад франц"}
+ fr_CH{"швейцари франц"}
+ fy{"баруун фризын"}
+ ga{"ирланд"}
+ gl{"галик"}
+ gn{"гуарани"}
+ gsw{"швейцар герман"}
+ gu{"гужарати"}
+ ha{"хауса"}
+ haw{"хавай"}
+ he{"еврей"}
+ hi{"хинди"}
+ hr{"хорват"}
+ ht{"гаити"}
+ hu{"унгар"}
+ hy{"армен"}
+ id{"индонези"}
+ ig{"игбо"}
+ is{"исланд"}
+ it{"итали"}
+ ja{"япон"}
+ jv{"ява"}
+ ka{"гүрж"}
+ kk{"хасаг"}
+ km{"камбож"}
+ kn{"каннада"}
+ ko{"солонгос"}
+ ks{"кашмир"}
+ ku{"күрд"}
+ ky{"киргиз"}
+ la{"латин"}
+ lb{"люксембург"}
+ lo{"лаос"}
+ lt{"литва"}
+ lv{"латви"}
+ mg{"малагаси"}
+ mi{"маори"}
+ mk{"македон"}
+ ml{"малайлам"}
+ mn{"монгол"}
+ mr{"марати"}
+ ms{"малай"}
+ mt{"малти"}
+ my{"бирм"}
+ nb{"норвегийн букмол"}
+ ne{"балба"}
+ nl{"голланд"}
+ nl_BE{"фламанд"}
+ nn{"нюнорск"}
+ or{"ория"}
+ pa{"панжаб"}
+ pl{"польш"}
+ ps{"афган"}
+ pt{"португал"}
+ pt_BR{"португал (бразил)"}
+ pt_PT{"европын португал"}
+ qu{"кечуа"}
+ rm{"романш"}
+ ro{"румын"}
+ ru{"орос"}
+ sa{"санскрит"}
+ sd{"синди"}
+ si{"синхала"}
+ sk{"словак"}
+ sl{"словен"}
+ so{"сомали"}
+ sq{"албани"}
+ sr{"серб"}
+ su{"сундан"}
+ sv{"швед"}
+ sw{"свахили"}
+ ta{"тамил"}
+ te{"тэлүгү"}
+ tg{"тажик"}
+ th{"тай"}
+ ti{"тигрина"}
+ tk{"туркмен"}
+ to{"тонга"}
+ tr{"турк"}
+ tt{"татар"}
+ ug{"уйгар"}
+ uk{"украйн"}
+ und{"тодорхойгүй хэл"}
+ ur{"урду"}
+ uz{"узбек"}
+ vi{"вьетнам"}
+ wo{"волоф"}
+ xh{"хоса"}
+ yo{"ёруба"}
+ zh{"хятад"}
+ zh_Hans{"хялбаршуулсан хятад"}
+ zh_Hant{"уламжлалт хятад"}
+ zu{"зулу"}
+ zxx{"хэл зүйн агуулга байхгүй"}
+ }
+ Scripts{
+ Arab{"Араб"}
+ Armn{"Армен"}
+ Beng{"Бенгал"}
+ Bopo{"Бопомофо"}
+ Brai{"брайл"}
+ Cyrl{"Кирил"}
+ Deva{"деванагари"}
+ Ethi{"этиоп"}
+ Geor{"гүрж"}
+ Grek{"грек"}
+ Gujr{"гүжарати"}
+ Guru{"гурмукхи"}
+ Hang{"хангул"}
+ Hani{"хан"}
+ Hans{"хялбаршуулсан"}
+ Hant{"уламжлалт"}
+ Hebr{"еврей"}
+ Hira{"хирагана"}
+ Jpan{"Япон"}
+ Kana{"катакана"}
+ Khmr{"кхмер"}
+ Knda{"каннада"}
+ Kore{"солонгос"}
+ Laoo{"лаос"}
+ Latn{"Латин"}
+ Mlym{"малаялам"}
+ Mong{"Монгол бичиг"}
+ Mymr{"мьянмар"}
+ Orya{"ория"}
+ Sinh{"синхала"}
+ Taml{"тамил"}
+ Telu{"тэлүгү"}
+ Thaa{"тана"}
+ Thai{"Тай"}
+ Tibt{"Төвд"}
+ Zsym{"тэмдэг"}
+ Zxxx{"бичигдээгүй"}
+ Zyyy{"нийтлэг"}
+ Zzzz{"тодорхойгүй бичиг"}
+ }
+ Types{
+ calendar{
+ gregorian{"Грегорийн хуанли"}
+ }
+ collation{
+ ducet{"Өгөгдмөл Юникод захиалгыг ялгах"}
+ search{"ерөнхий зорилготой хайлт"}
+ }
+ numbers{
+ arab{"араб-энэтхэг тоо"}
+ arabext{"өргөтгөсөн араб-энэтхэг тоо"}
+ armn{"армен тоо"}
+ armnlow{"жижиг армен тоо"}
+ beng{"бенгал тоо"}
+ deva{"деванагари тоо"}
+ ethi{"этиоп тоо"}
+ fullwide{"бүрэн хэмжээтэй тоо"}
+ geor{"гүрж тоо"}
+ grek{"грек тоо"}
+ greklow{"жижиг грек тоо"}
+ gujr{"гүжарати тоо"}
+ guru{"гүрмүкхи тоо"}
+ hanidec{"хятад аравтын тоо"}
+ hans{"хялбаршуулсан хятад тоо"}
+ hansfin{"хялбаршуулсан хятад санхүүгийн тоо"}
+ hant{"уламжлалт хятад тоо"}
+ hantfin{"уламжлалт хятад санхүүгийн тоо"}
+ hebr{"еврей тоо"}
+ jpan{"япон тоо"}
+ jpanfin{"япон санхүүгийн тоо"}
+ khmr{"кхмер тоо"}
+ knda{"каннада тоо"}
+ laoo{"лаос тоо"}
+ latn{"араб тоо"}
+ mlym{"малаялам тоо"}
+ mong{"монгол тоо"}
+ mymr{"мьянмар тоо"}
+ orya{"ория тоо"}
+ roman{"ром тоо"}
+ romanlow{"жижиг ром тоо"}
+ taml{"уламжлалт тамил тоо"}
+ tamldec{"тамил тоо"}
+ telu{"телүгү тоо"}
+ thai{"тай тоо"}
+ tibt{"тибет тоо"}
+ }
+ }
+ Version{"2.0.82.51"}
+ codePatterns{
+ language{"{0}"}
+ script{"{0}"}
+ territory{"{0}"}
+ }
+ localeDisplayPattern{
+ keyTypePattern{"{0}: {1}"}
+ pattern{"{0} ({1})"}
+ separator{", "}
+ }
+}
diff --git a/data/lang/mn_Cyrl.txt b/data/lang/mn_Cyrl.txt
new file mode 100755
index 0000000..55d4dd3
--- /dev/null
+++ b/data/lang/mn_Cyrl.txt
@@ -0,0 +1,14 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/mn_Cyrl.xml
+// *
+// ***************************************************************************
+/**
+ * ICU <specials> source: <path>/xml/main/mn_Cyrl.xml
+ */
+mn_Cyrl{
+ Version{"2.0.82.45"}
+}
diff --git a/data/lang/shi_Latn_MA.txt b/data/lang/mn_Cyrl_MN.txt
similarity index 86%
rename from data/lang/shi_Latn_MA.txt
rename to data/lang/mn_Cyrl_MN.txt
index cd7fd64..5d61306 100755
--- a/data/lang/shi_Latn_MA.txt
+++ b/data/lang/mn_Cyrl_MN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* generated alias target
*/
-shi_Latn_MA{
+mn_Cyrl_MN{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/coll/hi__DIRECT.txt b/data/lang/mn_MN.txt
old mode 100644
new mode 100755
similarity index 73%
copy from data/coll/hi__DIRECT.txt
copy to data/lang/mn_MN.txt
index fd5973f..cf689b7
--- a/data/coll/hi__DIRECT.txt
+++ b/data/lang/mn_MN.txt
@@ -1,13 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
-hi__DIRECT{
- collations{
- default{"direct"}
- }
+mn_MN{
+ "%%ALIAS"{"mn_Cyrl_MN"}
}
diff --git a/data/lang/mo.txt b/data/lang/mo.txt
index ef3bdd7..55f72d2 100755
--- a/data/lang/mo.txt
+++ b/data/lang/mo.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/mr.txt b/data/lang/mr.txt
index c138a33..f20b8b9 100644
--- a/data/lang/mr.txt
+++ b/data/lang/mr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mr.xml
// *
@@ -756,7 +756,7 @@
PINYIN{"पिनयिन रोमनायझेशन"}
WADEGILE{"वादे-गिलेस रोमनायझेशन"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
localeDisplayPattern{
pattern{"{0} ({1})"}
separator{","}
diff --git a/data/lang/ms.txt b/data/lang/ms.txt
index 6a202c5..a6678e4 100644
--- a/data/lang/ms.txt
+++ b/data/lang/ms.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ms.xml
// *
@@ -329,7 +329,7 @@
vaii{"Digit Vai"}
}
}
- Version{"2.0.78.20"}
+ Version{"2.0.82.45"}
codePatterns{
language{"{0}"}
script{"{0}"}
diff --git a/data/coll/hi__DIRECT.txt b/data/lang/ms_BN.txt
similarity index 73%
copy from data/coll/hi__DIRECT.txt
copy to data/lang/ms_BN.txt
index fd5973f..3f5c08a 100644
--- a/data/coll/hi__DIRECT.txt
+++ b/data/lang/ms_BN.txt
@@ -1,13 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
-hi__DIRECT{
- collations{
- default{"direct"}
- }
+ms_BN{
+ "%%ALIAS"{"ms_Latn_BN"}
}
diff --git a/data/lang/ms_Latn.txt b/data/lang/ms_Latn.txt
new file mode 100644
index 0000000..62fa3e2
--- /dev/null
+++ b/data/lang/ms_Latn.txt
@@ -0,0 +1,14 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/ms_Latn.xml
+// *
+// ***************************************************************************
+/**
+ * ICU <specials> source: <path>/xml/main/ms_Latn.xml
+ */
+ms_Latn{
+ Version{"2.0.82.68"}
+}
diff --git a/data/lang/shi_Latn_MA.txt b/data/lang/ms_Latn_BN.txt
old mode 100755
new mode 100644
similarity index 86%
copy from data/lang/shi_Latn_MA.txt
copy to data/lang/ms_Latn_BN.txt
index cd7fd64..a54fd72
--- a/data/lang/shi_Latn_MA.txt
+++ b/data/lang/ms_Latn_BN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* generated alias target
*/
-shi_Latn_MA{
+ms_Latn_BN{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/lang/shi_Latn_MA.txt b/data/lang/ms_Latn_MY.txt
old mode 100755
new mode 100644
similarity index 86%
copy from data/lang/shi_Latn_MA.txt
copy to data/lang/ms_Latn_MY.txt
index cd7fd64..dc26b90
--- a/data/lang/shi_Latn_MA.txt
+++ b/data/lang/ms_Latn_MY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* generated alias target
*/
-shi_Latn_MA{
+ms_Latn_MY{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/lang/shi_Latn_MA.txt b/data/lang/ms_Latn_SG.txt
old mode 100755
new mode 100644
similarity index 86%
copy from data/lang/shi_Latn_MA.txt
copy to data/lang/ms_Latn_SG.txt
index cd7fd64..c65bf0a
--- a/data/lang/shi_Latn_MA.txt
+++ b/data/lang/ms_Latn_SG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* generated alias target
*/
-shi_Latn_MA{
+ms_Latn_SG{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/coll/hi__DIRECT.txt b/data/lang/ms_MY.txt
similarity index 73%
copy from data/coll/hi__DIRECT.txt
copy to data/lang/ms_MY.txt
index fd5973f..c926ea92 100644
--- a/data/coll/hi__DIRECT.txt
+++ b/data/lang/ms_MY.txt
@@ -1,13 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
-hi__DIRECT{
- collations{
- default{"direct"}
- }
+ms_MY{
+ "%%ALIAS"{"ms_Latn_MY"}
}
diff --git a/data/coll/hi__DIRECT.txt b/data/lang/ms_SG.txt
similarity index 73%
copy from data/coll/hi__DIRECT.txt
copy to data/lang/ms_SG.txt
index fd5973f..841c737 100644
--- a/data/coll/hi__DIRECT.txt
+++ b/data/lang/ms_SG.txt
@@ -1,13 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
-hi__DIRECT{
- collations{
- default{"direct"}
- }
+ms_SG{
+ "%%ALIAS"{"ms_Latn_SG"}
}
diff --git a/data/lang/mt.txt b/data/lang/mt.txt
index 4790e55..aba522d 100644
--- a/data/lang/mt.txt
+++ b/data/lang/mt.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mt.xml
// *
@@ -526,7 +526,7 @@
Variants{
REVISED{"Ortografija Irriveda"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Lingwa: {0}"}
script{"Skritt: {0}"}
diff --git a/data/lang/mua.txt b/data/lang/mua.txt
index 124cd51..cc09f90 100755
--- a/data/lang/mua.txt
+++ b/data/lang/mua.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mua.xml
// *
@@ -57,5 +57,5 @@
zh{"zah Syiŋ"}
zu{"Zulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/my.txt b/data/lang/my.txt
index b803ee0..1b8a074 100644
--- a/data/lang/my.txt
+++ b/data/lang/my.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/my.xml
// *
@@ -222,7 +222,7 @@
REVISED{"ပြန်လည်စီစစ်ထားသော ရေးထုံး"}
SCOTLAND{"စကော့ စံ အင်္ဂလိပ်"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
codePatterns{
language{"ဘာသာစကား - {0}"}
script{"စာ - {0}"}
diff --git a/data/lang/naq.txt b/data/lang/naq.txt
index 8d1c07d..d32861b 100755
--- a/data/lang/naq.txt
+++ b/data/lang/naq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/naq.xml
// *
@@ -57,5 +57,5 @@
zh{"Chineesǁî gowab, Mandarinni"}
zu{"Zulub"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/nb.txt b/data/lang/nb.txt
index 1718caf..e143281 100644
--- a/data/lang/nb.txt
+++ b/data/lang/nb.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nb.xml
// *
@@ -844,7 +844,7 @@
VALENCIA{"valensisk dialekt"}
WADEGILE{"Wade-Giles"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
codePatterns{
language{"Språk: {0}"}
script{"Skrift: {0}"}
diff --git a/data/lang/nb_NO.txt b/data/lang/nb_NO.txt
index a1437d3..db840a9 100644
--- a/data/lang/nb_NO.txt
+++ b/data/lang/nb_NO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/nd.txt b/data/lang/nd.txt
index 87ff685..5076d36 100755
--- a/data/lang/nd.txt
+++ b/data/lang/nd.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nd.xml
// *
@@ -57,5 +57,5 @@
zh{"isi-China"}
zu{"isi-Zulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/ne.txt b/data/lang/ne.txt
index 2f3e1a4..73e886e 100644
--- a/data/lang/ne.txt
+++ b/data/lang/ne.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ne.xml
// *
@@ -338,5 +338,5 @@
AREVELA{"पूर्वी आर्मेनियाली"}
POSIX{"कम्प्युटर"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/nl.txt b/data/lang/nl.txt
index 52ccbbd..1babed6 100644
--- a/data/lang/nl.txt
+++ b/data/lang/nl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nl.xml
// *
@@ -868,7 +868,7 @@
VALLADER{"Vallader"}
WADEGILE{"Wade-Giles"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Taal: {0}"}
script{"Schrift: {0}"}
diff --git a/data/lang/nl_BE.txt b/data/lang/nl_BE.txt
index 9a11f60..cb0e568 100644
--- a/data/lang/nl_BE.txt
+++ b/data/lang/nl_BE.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nl_BE.xml
// *
@@ -17,5 +17,5 @@
traditional{"Traditioneel"}
}
}
- Version{"2.0.77.28"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/nmg.txt b/data/lang/nmg.txt
index 3d2b235..360f8d2 100755
--- a/data/lang/nmg.txt
+++ b/data/lang/nmg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nmg.xml
// *
@@ -56,5 +56,5 @@
zh{"Kiɛl bó chinois"}
zu{"Zulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/nn.txt b/data/lang/nn.txt
index 225d22d..3783b35 100644
--- a/data/lang/nn.txt
+++ b/data/lang/nn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nn.xml
// *
@@ -730,7 +730,7 @@
TARASK{"taraskievica-ortografi"}
VALENCIA{"valensisk dialekt"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
codePatterns{
language{"Språk: {0}"}
script{"Skrift: {0}"}
diff --git a/data/lang/nn_NO.txt b/data/lang/nn_NO.txt
index e8050a8..e297007 100644
--- a/data/lang/nn_NO.txt
+++ b/data/lang/nn_NO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/no.txt b/data/lang/no.txt
index 49a17b2..6dc26b5 100644
--- a/data/lang/no.txt
+++ b/data/lang/no.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/no_NO.txt b/data/lang/no_NO.txt
index 4b958f6..408deef 100644
--- a/data/lang/no_NO.txt
+++ b/data/lang/no_NO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/no_NO_NY.txt b/data/lang/no_NO_NY.txt
index 61d8107..38940c7c 100644
--- a/data/lang/no_NO_NY.txt
+++ b/data/lang/no_NO_NY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/nus.txt b/data/lang/nus.txt
index 3817980..0cab6b2 100755
--- a/data/lang/nus.txt
+++ b/data/lang/nus.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nus.xml
// *
@@ -57,5 +57,5 @@
zh{"Thok cayna"}
zu{"Thok dhuluni"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/nyn.txt b/data/lang/nyn.txt
index 584012f..1b12701 100755
--- a/data/lang/nyn.txt
+++ b/data/lang/nyn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nyn.xml
// *
@@ -57,5 +57,5 @@
zh{"Oruchaina"}
zu{"Oruzuru"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/om.txt b/data/lang/om.txt
index 46f6356..5b3408c 100644
--- a/data/lang/om.txt
+++ b/data/lang/om.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/om.xml
// *
@@ -102,5 +102,5 @@
Scripts{
Latn{"Latin"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/or.txt b/data/lang/or.txt
index 92b4faf..27b9a71 100644
--- a/data/lang/or.txt
+++ b/data/lang/or.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/or.xml
// *
@@ -650,5 +650,5 @@
Zyyy{"ସାଧାରଣ"}
Zzzz{"ଅଞ୍ଜାତ କିମ୍ବା ଅବୈଧ ସ୍କ୍ରୀପ୍ଟ"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/pa.txt b/data/lang/pa.txt
index 12581f1..3cd1d89 100644
--- a/data/lang/pa.txt
+++ b/data/lang/pa.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pa.xml
// *
@@ -46,5 +46,5 @@
tw{"ਤ੍ਵਿ"}
ug{"ਉਇਘੁਰ"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/pa_Arab.txt b/data/lang/pa_Arab.txt
index e89be98..b41dc05 100644
--- a/data/lang/pa_Arab.txt
+++ b/data/lang/pa_Arab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pa_Arab.xml
// *
@@ -17,5 +17,5 @@
Arab{"العربية"}
Guru{"گُرمُکھی"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/pa_Arab_PK.txt b/data/lang/pa_Arab_PK.txt
index a535601..d07b5c6 100644
--- a/data/lang/pa_Arab_PK.txt
+++ b/data/lang/pa_Arab_PK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/pa_Guru.txt b/data/lang/pa_Guru.txt
index e2feb97..0562443 100644
--- a/data/lang/pa_Guru.txt
+++ b/data/lang/pa_Guru.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pa_Guru.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/pa_Guru.xml
*/
pa_Guru{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/pa_Guru_IN.txt b/data/lang/pa_Guru_IN.txt
index 69fdff4..7f5e984 100644
--- a/data/lang/pa_Guru_IN.txt
+++ b/data/lang/pa_Guru_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/pa_IN.txt b/data/lang/pa_IN.txt
index f8f230a..8a52933 100644
--- a/data/lang/pa_IN.txt
+++ b/data/lang/pa_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/pa_PK.txt b/data/lang/pa_PK.txt
index 22fb56e..8478504 100644
--- a/data/lang/pa_PK.txt
+++ b/data/lang/pa_PK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/pl.txt b/data/lang/pl.txt
index 3d35e39..69c8f4e 100644
--- a/data/lang/pl.txt
+++ b/data/lang/pl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pl.xml
// *
@@ -785,7 +785,7 @@
VALENCIA{"walencki"}
WADEGILE{"latynizacja Wade'a i Gilesa"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Język: {0}"}
script{"Pismo: {0}"}
diff --git a/data/lang/pool.res b/data/lang/pool.res
index 143dbd8..bf2ce0f 100644
--- a/data/lang/pool.res
+++ b/data/lang/pool.res
Binary files differ
diff --git a/data/lang/ps.txt b/data/lang/ps.txt
index 3d12481..a50700c 100644
--- a/data/lang/ps.txt
+++ b/data/lang/ps.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ps.xml
// *
@@ -47,5 +47,5 @@
Scripts{
Arab{"عربي"}
}
- Version{"2.0.75.94"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/pt.txt b/data/lang/pt.txt
index 9f0fe00..9f7ecce 100644
--- a/data/lang/pt.txt
+++ b/data/lang/pt.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt.xml
// *
@@ -799,7 +799,7 @@
VALENCIA{"valenciano"}
WADEGILE{"romanização Wade-Giles"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
codePatterns{
language{"Idioma: {0}"}
script{"Roteiro: {0}"}
diff --git a/data/lang/pt_PT.txt b/data/lang/pt_PT.txt
index 0d68f6f..c0d1a44 100644
--- a/data/lang/pt_PT.txt
+++ b/data/lang/pt_PT.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_PT.xml
// *
@@ -237,7 +237,7 @@
SOLBA{"dialecto stolvizza/solbica"}
WADEGILE{"Romanização Wade-Giles"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.51"}
codePatterns{
script{"Escrita: {0}"}
}
diff --git a/data/lang/resfiles.mk b/data/lang/resfiles.mk
index a0af94b..f726186 100644
--- a/data/lang/resfiles.mk
+++ b/data/lang/resfiles.mk
@@ -1,6 +1,6 @@
-# * Copyright (C) 1998-2012, International Business Machines
+# * Copyright (C) 1998-2013, International Business Machines
# * Corporation and others. All Rights Reserved.
-LANG_CLDR_VERSION = 22.1.1
+LANG_CLDR_VERSION = 23
# A list of txt's to build
# Note:
#
@@ -31,17 +31,19 @@
ha_GH.txt ha_Latn_GH.txt ha_Latn_NE.txt ha_Latn_NG.txt ha_NE.txt\
ha_NG.txt he_IL.txt id_ID.txt in.txt in_ID.txt\
iw.txt iw_IL.txt ja_JP.txt ja_JP_TRADITIONAL.txt kk_Cyrl_KZ.txt\
- kk_KZ.txt ks_Arab_IN.txt ks_IN.txt mo.txt nb_NO.txt\
- nn_NO.txt no.txt no_NO.txt no_NO_NY.txt pa_Arab_PK.txt\
- pa_Guru_IN.txt pa_IN.txt pa_PK.txt ro_MD.txt sh.txt\
- sh_BA.txt sh_CS.txt sh_YU.txt shi_Latn_MA.txt shi_MA.txt\
- sr_BA.txt sr_CS.txt sr_Cyrl_BA.txt sr_Cyrl_CS.txt sr_Cyrl_RS.txt\
- sr_Cyrl_YU.txt sr_Latn_BA.txt sr_Latn_CS.txt sr_Latn_ME.txt sr_Latn_RS.txt\
- sr_Latn_YU.txt sr_ME.txt sr_RS.txt sr_YU.txt th_TH.txt\
- th_TH_TRADITIONAL.txt tl.txt tl_PH.txt tzm_Latn_MA.txt tzm_MA.txt\
- uz_AF.txt uz_Arab_AF.txt uz_Cyrl_UZ.txt uz_UZ.txt vai_LR.txt\
- vai_Vaii_LR.txt zh_CN.txt zh_HK.txt zh_Hans_CN.txt zh_Hant_MO.txt\
- zh_Hant_TW.txt zh_MO.txt zh_SG.txt zh_TW.txt
+ kk_KZ.txt ks_Arab_IN.txt ks_IN.txt mn_Cyrl_MN.txt mn_MN.txt\
+ mo.txt ms_BN.txt ms_Latn_BN.txt ms_Latn_MY.txt ms_Latn_SG.txt\
+ ms_MY.txt ms_SG.txt nb_NO.txt nn_NO.txt no.txt\
+ no_NO.txt no_NO_NY.txt pa_Arab_PK.txt pa_Guru_IN.txt pa_IN.txt\
+ pa_PK.txt ro_MD.txt sh.txt sh_BA.txt sh_CS.txt\
+ sh_YU.txt shi_MA.txt shi_Tfng_MA.txt sr_BA.txt sr_CS.txt\
+ sr_Cyrl_BA.txt sr_Cyrl_CS.txt sr_Cyrl_RS.txt sr_Cyrl_YU.txt sr_Latn_BA.txt\
+ sr_Latn_CS.txt sr_Latn_ME.txt sr_Latn_RS.txt sr_Latn_YU.txt sr_ME.txt\
+ sr_RS.txt sr_YU.txt th_TH.txt th_TH_TRADITIONAL.txt tl.txt\
+ tl_PH.txt tzm_Latn_MA.txt tzm_MA.txt uz_AF.txt uz_Arab_AF.txt\
+ uz_Cyrl_UZ.txt uz_UZ.txt vai_LR.txt vai_Vaii_LR.txt zh_CN.txt\
+ zh_HK.txt zh_Hans_CN.txt zh_Hant_MO.txt zh_Hant_TW.txt zh_MO.txt\
+ zh_SG.txt zh_TW.txt
# All aliases (to not be included under 'installed'), but not including root.
@@ -72,22 +74,22 @@
lag.txt lg.txt ln.txt lo.txt lt.txt\
lu.txt luo.txt luy.txt lv.txt mas.txt\
mer.txt mfe.txt mg.txt mgh.txt mgo.txt\
- mk.txt ml.txt mr.txt ms.txt mt.txt\
- mua.txt my.txt naq.txt nb.txt nd.txt\
- ne.txt nl.txt nl_BE.txt nmg.txt nn.txt\
- nus.txt nyn.txt om.txt or.txt pa.txt\
- pa_Arab.txt pa_Guru.txt pl.txt ps.txt pt.txt\
- pt_PT.txt rm.txt rn.txt ro.txt rof.txt\
- ru.txt ru_UA.txt rw.txt rwk.txt saq.txt\
- sbp.txt seh.txt ses.txt sg.txt shi.txt\
- shi_Latn.txt shi_Tfng.txt si.txt sk.txt sl.txt\
- sn.txt so.txt sq.txt sr.txt sr_Cyrl.txt\
- sr_Latn.txt sv.txt sv_FI.txt sw.txt swc.txt\
- ta.txt te.txt teo.txt th.txt ti.txt\
- to.txt tr.txt twq.txt tzm.txt tzm_Latn.txt\
- uk.txt ur.txt uz.txt uz_Arab.txt uz_Cyrl.txt\
- uz_Latn.txt vai.txt vai_Latn.txt vai_Vaii.txt vi.txt\
- vun.txt xog.txt yav.txt yo.txt zh.txt\
- zh_Hans.txt zh_Hans_HK.txt zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt\
- zh_Hant_HK.txt zu.txt
+ mk.txt ml.txt mn.txt mn_Cyrl.txt mr.txt\
+ ms.txt ms_Latn.txt mt.txt mua.txt my.txt\
+ naq.txt nb.txt nd.txt ne.txt nl.txt\
+ nl_BE.txt nmg.txt nn.txt nus.txt nyn.txt\
+ om.txt or.txt pa.txt pa_Arab.txt pa_Guru.txt\
+ pl.txt ps.txt pt.txt pt_PT.txt rm.txt\
+ rn.txt ro.txt rof.txt ru.txt ru_UA.txt\
+ rw.txt rwk.txt saq.txt sbp.txt seh.txt\
+ ses.txt sg.txt shi.txt shi_Latn.txt shi_Tfng.txt\
+ si.txt sk.txt sl.txt sn.txt so.txt\
+ sq.txt sr.txt sr_Cyrl.txt sr_Latn.txt sv.txt\
+ sv_FI.txt sw.txt swc.txt ta.txt te.txt\
+ teo.txt th.txt ti.txt to.txt tr.txt\
+ twq.txt tzm.txt tzm_Latn.txt uk.txt ur.txt\
+ uz.txt uz_Arab.txt uz_Cyrl.txt uz_Latn.txt vai.txt\
+ vai_Latn.txt vai_Vaii.txt vi.txt vun.txt xog.txt\
+ yav.txt yo.txt zh.txt zh_Hans.txt zh_Hans_HK.txt\
+ zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt zh_Hant_HK.txt zu.txt
diff --git a/data/lang/rm.txt b/data/lang/rm.txt
index 9546a82..c1d2fd5 100755
--- a/data/lang/rm.txt
+++ b/data/lang/rm.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rm.xml
// *
@@ -703,7 +703,7 @@
TARASK{"ortografia taraskievica"}
VALENCIA{"valencian"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Lingua: {0}"}
script{"Scrittira: {0}"}
diff --git a/data/lang/rn.txt b/data/lang/rn.txt
index e33e5b6..0220219 100755
--- a/data/lang/rn.txt
+++ b/data/lang/rn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rn.xml
// *
@@ -57,5 +57,5 @@
zh{"Igishinwa"}
zu{"Ikizulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/ro.txt b/data/lang/ro.txt
index d86b1d5..d0c51d3 100644
--- a/data/lang/ro.txt
+++ b/data/lang/ro.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ro.xml
// *
@@ -762,7 +762,7 @@
SCOTLAND{"engleză standard scoțiană"}
WADEGILE{"Wade-Giles"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Limbă: {0}"}
script{"Scriere: {0}"}
diff --git a/data/lang/ro_MD.txt b/data/lang/ro_MD.txt
index eed93a7..cb90da0 100755
--- a/data/lang/ro_MD.txt
+++ b/data/lang/ro_MD.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/rof.txt b/data/lang/rof.txt
index c4736cc..52c0bc6 100755
--- a/data/lang/rof.txt
+++ b/data/lang/rof.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rof.xml
// *
@@ -57,5 +57,5 @@
zh{"Kichina"}
zu{"Kizulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/root.txt b/data/lang/root.txt
index 35c56c4..0c31a99 100644
--- a/data/lang/root.txt
+++ b/data/lang/root.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/root.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/root.xml
*/
root{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
codePatterns{
language{"{0}"}
script{"{0}"}
diff --git a/data/lang/ru.txt b/data/lang/ru.txt
index 6b92535..e938c43 100644
--- a/data/lang/ru.txt
+++ b/data/lang/ru.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ru.xml
// *
@@ -523,7 +523,7 @@
tli{"тлингит"}
tmh{"тамашек"}
tn{"тсвана"}
- to{"тонга"}
+ to{"тонганский"}
tog{"ньяса (тонга)"}
tpi{"ток-писин"}
tr{"турецкий"}
@@ -601,7 +601,7 @@
Bugi{"Бугинизийская"}
Buhd{"Бухид"}
Cakm{"Чакмийская"}
- Cans{"Унифицированные Символы Канадских Аборигенов"}
+ Cans{"Канадское слоговое письмо"}
Cari{"Карийская"}
Cham{"Чамская"}
Cher{"Чероки"}
@@ -723,7 +723,7 @@
chinese{"Китайский календарь"}
coptic{"Коптский календарь"}
ethiopic{"Эфиопский календарь"}
- ethiopic-amete-alem{"Эфиопский календарь \"Амете Алем\""}
+ ethiopic-amete-alem{"Эфиопский календарь \u0022Амете Алем\u0022"}
gregorian{"Григорианский календарь"}
hebrew{"Еврейский календарь"}
indian{"Национальный календарь Индии"}
@@ -811,7 +811,7 @@
VALENCIA{"Валенсийский"}
WADEGILE{"Система Уэйда – Джайлза"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Язык: {0}"}
script{"Написание: {0}"}
diff --git a/data/lang/ru_UA.txt b/data/lang/ru_UA.txt
index 18a8169..b4c5865 100644
--- a/data/lang/ru_UA.txt
+++ b/data/lang/ru_UA.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ru_UA.xml
// *
@@ -13,5 +13,5 @@
mh{"маршальский"}
tlh{"клингон"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/rw.txt b/data/lang/rw.txt
index 3362529..b2b4c37 100755
--- a/data/lang/rw.txt
+++ b/data/lang/rw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rw.xml
// *
@@ -118,5 +118,5 @@
yi{"Inyeyidishi"}
zu{"Inyezulu"}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/rwk.txt b/data/lang/rwk.txt
index ef3a36a..f62910f 100755
--- a/data/lang/rwk.txt
+++ b/data/lang/rwk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rwk.xml
// *
@@ -57,5 +57,5 @@
zh{"Kyichina"}
zu{"Kyizulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/saq.txt b/data/lang/saq.txt
index aeef054..402be72 100755
--- a/data/lang/saq.txt
+++ b/data/lang/saq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/saq.xml
// *
@@ -57,5 +57,5 @@
zh{"Kichina"}
zu{"Kizulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/sbp.txt b/data/lang/sbp.txt
index d162ea9..fc51c32 100755
--- a/data/lang/sbp.txt
+++ b/data/lang/sbp.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sbp.xml
// *
@@ -57,5 +57,5 @@
zh{"Ishishina"}
zu{"Ishisulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/seh.txt b/data/lang/seh.txt
index 926b4d7..d9869ca 100755
--- a/data/lang/seh.txt
+++ b/data/lang/seh.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/seh.xml
// *
@@ -57,5 +57,5 @@
zh{"chinês"}
zu{"zulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/ses.txt b/data/lang/ses.txt
index b428932..e1c5f92 100755
--- a/data/lang/ses.txt
+++ b/data/lang/ses.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ses.xml
// *
@@ -57,5 +57,5 @@
zh{"Sinuwa senni, Mandareŋ"}
zu{"Zulu senni"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/sg.txt b/data/lang/sg.txt
index 6e45634..b080327 100755
--- a/data/lang/sg.txt
+++ b/data/lang/sg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sg.xml
// *
@@ -57,5 +57,5 @@
zh{"Shinuäa"}
zu{"Zûlu"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/sh.txt b/data/lang/sh.txt
index 3f0a236..1433f43 100644
--- a/data/lang/sh.txt
+++ b/data/lang/sh.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/sh_BA.txt b/data/lang/sh_BA.txt
index af5634f..82a1a16 100644
--- a/data/lang/sh_BA.txt
+++ b/data/lang/sh_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/sh_CS.txt b/data/lang/sh_CS.txt
index 2adfb4a..8967fc8 100644
--- a/data/lang/sh_CS.txt
+++ b/data/lang/sh_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/sh_YU.txt b/data/lang/sh_YU.txt
index 516cdf3..85f7ad6 100644
--- a/data/lang/sh_YU.txt
+++ b/data/lang/sh_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/shi.txt b/data/lang/shi.txt
index 91b4f20..357676a 100755
--- a/data/lang/shi.txt
+++ b/data/lang/shi.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/shi.xml
// *
@@ -57,5 +57,5 @@
zh{"ⵜⴰⵛⵉⵏⵡⵉⵜ"}
zu{"ⵜⴰⵣⵓⵍⵓⵜ"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/shi_Latn.txt b/data/lang/shi_Latn.txt
index 6bc3b9d..2eb3e23 100755
--- a/data/lang/shi_Latn.txt
+++ b/data/lang/shi_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/shi_Latn.xml
// *
@@ -57,5 +57,5 @@
zh{"tacinwit"}
zu{"tazulut"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/shi_MA.txt b/data/lang/shi_MA.txt
index 91d13a9..084cfbe 100755
--- a/data/lang/shi_MA.txt
+++ b/data/lang/shi_MA.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
shi_MA{
- "%%ALIAS"{"shi_Latn_MA"}
+ "%%ALIAS"{"shi_Tfng_MA"}
}
diff --git a/data/lang/shi_Tfng.txt b/data/lang/shi_Tfng.txt
index 12bcee9..49f4299 100755
--- a/data/lang/shi_Tfng.txt
+++ b/data/lang/shi_Tfng.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/shi_Tfng.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/shi_Tfng.xml
*/
shi_Tfng{
- Version{"2.0.75.56"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/shi_Latn_MA.txt b/data/lang/shi_Tfng_MA.txt
similarity index 86%
copy from data/lang/shi_Latn_MA.txt
copy to data/lang/shi_Tfng_MA.txt
index cd7fd64..0573400 100755
--- a/data/lang/shi_Latn_MA.txt
+++ b/data/lang/shi_Tfng_MA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* generated alias target
*/
-shi_Latn_MA{
+shi_Tfng_MA{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/lang/si.txt b/data/lang/si.txt
index 22bf6f1..7c1012b 100644
--- a/data/lang/si.txt
+++ b/data/lang/si.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/si.xml
// *
@@ -239,7 +239,7 @@
tibt{"ටිබෙට ඉලක්කම්"}
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
codePatterns{
language{"{0} භාෂාව: සිංහල"}
script{"{0} අක්ෂර මාලාව: සිංහල"}
diff --git a/data/lang/sk.txt b/data/lang/sk.txt
index c3792ad..6d7b2c9 100644
--- a/data/lang/sk.txt
+++ b/data/lang/sk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sk.xml
// *
@@ -737,7 +737,7 @@
Variants{
SCOTLAND{"škótska štandardná angličtina"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Jazyk: {0}"}
script{"Písmo: {0}"}
diff --git a/data/lang/sl.txt b/data/lang/sl.txt
index cbdea9b..8df2d15 100644
--- a/data/lang/sl.txt
+++ b/data/lang/sl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sl.xml
// *
@@ -755,7 +755,7 @@
VALENCIA{"valencijski pravopis"}
WADEGILE{"romanizacija Wade-Giles"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Jezik: {0}"}
script{"{0}"}
diff --git a/data/lang/sn.txt b/data/lang/sn.txt
index 7003e80..35ce2ea 100755
--- a/data/lang/sn.txt
+++ b/data/lang/sn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sn.xml
// *
@@ -57,5 +57,5 @@
zh{"chiChinese"}
zu{"chiZulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/so.txt b/data/lang/so.txt
index 6040bbc..d262dd3 100644
--- a/data/lang/so.txt
+++ b/data/lang/so.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/so.xml
// *
@@ -61,5 +61,5 @@
Zxxx{"Aan la qorin"}
Zzzz{"Far aan la aqoon amase aan saxnayn"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/sq.txt b/data/lang/sq.txt
index becfb3b..b2c81a4 100644
--- a/data/lang/sq.txt
+++ b/data/lang/sq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sq.xml
// *
@@ -31,5 +31,5 @@
Zxxx{"I pashkruar"}
Zzzz{"Skript i panjohur"}
}
- Version{"2.0.77.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/sr.txt b/data/lang/sr.txt
index fb5b5b9..238aeac 100644
--- a/data/lang/sr.txt
+++ b/data/lang/sr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr.xml
// *
@@ -62,7 +62,7 @@
aus{"Аустралијски језик"}
av{"Аварски"}
awa{"Авадхи"}
- ay{"ајмара"}
+ ay{"Ајмара"}
az{"Азербејџански"}
ba{"Башкир"}
bad{"Банда"}
@@ -171,7 +171,7 @@
fat{"Фанти"}
ff{"Фулах"}
fi{"Фински"}
- fil{"Тагалог"}
+ fil{"Филипински"}
fiu{"Угро-фински"}
fj{"Фиджијски"}
fo{"Фарски"}
@@ -314,7 +314,7 @@
mdf{"Мокша"}
mdr{"Мандар"}
men{"Менде"}
- mfe{"морисјен"}
+ mfe{"Морисјен"}
mg{"Малагасијски"}
mga{"Средњи ирски"}
mh{"Маршалски"}
@@ -541,7 +541,7 @@
zza{"Заза"}
}
LanguagesShort{
- az{"азерски"}
+ az{"Азерски"}
}
Scripts{
Arab{"арапско писмо"}
@@ -782,11 +782,11 @@
TARASK{"Тараскијевичка ортографија"}
VALENCIA{"Валенцијска"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.47"}
codePatterns{
- language{"{0}"}
- script{"{0}"}
- territory{"{0}"}
+ language{"Језик: {0}"}
+ script{"Скрипт: {0}"}
+ territory{"Регион: {0}"}
}
localeDisplayPattern{
keyTypePattern{"{0}: {1}"}
diff --git a/data/lang/sr_BA.txt b/data/lang/sr_BA.txt
index bad5005..9754916 100644
--- a/data/lang/sr_BA.txt
+++ b/data/lang/sr_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/sr_CS.txt b/data/lang/sr_CS.txt
index b6ee46c..23bc131 100644
--- a/data/lang/sr_CS.txt
+++ b/data/lang/sr_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/sr_Cyrl.txt b/data/lang/sr_Cyrl.txt
index 426675a..4d109a8 100644
--- a/data/lang/sr_Cyrl.txt
+++ b/data/lang/sr_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr_Cyrl.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/sr_Cyrl.xml
*/
sr_Cyrl{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/sr_Cyrl_BA.txt b/data/lang/sr_Cyrl_BA.txt
index 6db5bfa..34df035 100644
--- a/data/lang/sr_Cyrl_BA.txt
+++ b/data/lang/sr_Cyrl_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/sr_Cyrl_CS.txt b/data/lang/sr_Cyrl_CS.txt
index 99b0d57..54c3633 100644
--- a/data/lang/sr_Cyrl_CS.txt
+++ b/data/lang/sr_Cyrl_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/sr_Cyrl_RS.txt b/data/lang/sr_Cyrl_RS.txt
index 5475cea..dfb1855 100644
--- a/data/lang/sr_Cyrl_RS.txt
+++ b/data/lang/sr_Cyrl_RS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/sr_Cyrl_YU.txt b/data/lang/sr_Cyrl_YU.txt
index 088b496..608f5f9 100644
--- a/data/lang/sr_Cyrl_YU.txt
+++ b/data/lang/sr_Cyrl_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/sr_Latn.txt b/data/lang/sr_Latn.txt
index af2c3db..0f31891 100644
--- a/data/lang/sr_Latn.txt
+++ b/data/lang/sr_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr_Latn.xml
// *
@@ -12,8 +12,21 @@
sr_Latn{
Keys{
calendar{"Kalendar"}
+ colAlternate{"Sortiranje uz ignorisanje simbola"}
+ colBackwards{"Sortiranje prema obrnutim akcentima"}
+ colCaseFirst{"Ređanje prema malom/velikom slovu"}
+ colCaseLevel{"Sortiranje prema malom/velikom slovu"}
+ colHiraganaQuaternary{"Sortiranje prema kana simbolima"}
+ colNormalization{"Normalizovano sortiranje"}
+ colNumeric{"Numeričko sortiranje"}
+ colStrength{"Sortiranje prema jačini"}
collation{"Sortiranje"}
currency{"Valuta"}
+ numbers{"Brojevi"}
+ timezone{"Vremenska zona"}
+ va{"Varijanta lokaliteta"}
+ variableTop{"Sortiraj kao simbole"}
+ x{"Privatna upotreba"}
}
Languages{
aa{"Afarski"}
@@ -68,9 +81,9 @@
bi{"Bislama"}
bik{"Bikol"}
bin{"Bini"}
- bla{"Siksika"}
+ bla{"Sisika"}
bm{"Bambara"}
- bn{"Bengalski"}
+ bn{"Benglaski"}
bnt{"Bantu"}
bo{"Tibetanski"}
br{"Bretonski"}
@@ -78,17 +91,17 @@
bs{"Bosanski"}
btk{"Batak"}
bua{"Buriat"}
- bug{"Buginežanskii"}
+ bug{"Buginežanski"}
byn{"Blin"}
ca{"Katalonski"}
cad{"Kado"}
- cai{"Jezik centralno-američkih Indijanaca"}
+ cai{"Centralno američki Indijanski jezik"}
car{"Karipski"}
cau{"Kavkaski"}
- cch{"Atsam"}
+ cch{"Atsamski"}
ce{"Čečenski"}
ceb{"Cebuano"}
- cel{"Keltski jezik"}
+ cel{"Keltski"}
ch{"Čamoro"}
chb{"Čibča"}
chg{"Čagatai"}
@@ -99,6 +112,7 @@
chp{"Čipvijanski"}
chr{"Čeroki"}
chy{"Čejenski"}
+ ckb{"sorani kurdski"}
cmc{"Čamski jezik"}
co{"Korzikanski"}
cop{"Koptski"}
@@ -126,8 +140,8 @@
dgr{"Dogrib"}
din{"Dinka"}
doi{"Dogri"}
- dra{"Dravidijski jezik"}
- dsb{"Niski Sorbijanski"}
+ dra{"Darvidijski jezik"}
+ dsb{"Niski sorbijanski"}
dua{"Duala"}
dum{"Srednji holandski"}
dv{"Divehijski"}
@@ -143,7 +157,7 @@
en_AU{"Australijski engleski"}
en_CA{"Kanadski engleski"}
en_GB{"Britanski engleski"}
- en_US{"Engleski (SAD)"}
+ en_US{"SAD engleski"}
enm{"Srednji engleski"}
eo{"Esperanto"}
es{"Španski"}
@@ -158,7 +172,7 @@
ff{"Fulah"}
fi{"Finski"}
fil{"Filipinski"}
- fiu{"Ugro-finski jezik"}
+ fiu{"Ugro-finski"}
fj{"Fidžijski"}
fo{"Farski"}
fon{"Fon"}
@@ -188,10 +202,10 @@
got{"Gotski"}
grb{"Grebo"}
grc{"Starogrčki"}
- gsw{"Švajcarsko nemački"}
+ gsw{"Švajcarski nemački"}
gu{"Gudžarati"}
gv{"Manks"}
- gwi{"Gvich'in"}
+ gwi{"Gvič'in"}
ha{"Hausa"}
hai{"Haida"}
haw{"Havajski"}
@@ -204,23 +218,23 @@
ho{"Hiri Motu"}
hr{"Hrvatski"}
hsb{"Gornji sorbijski"}
- ht{"Haićanski"}
+ ht{"Haitski"}
hu{"Mađarski"}
hup{"Hupa"}
hy{"Jermenski"}
hz{"Herero"}
ia{"Interlingva"}
iba{"Iban"}
- id{"Indonezijski"}
- ie{"Interlingve"}
+ id{"Indonežanski"}
+ ie{"Međujezički"}
ig{"Igbo"}
ii{"Sičuan ji"}
ijo{"Ijo"}
- ik{"Inupiak"}
+ ik{"Unupiak"}
ilo{"Iloko"}
inc{"Indik"}
ine{"Indo-evropski jezik"}
- inh{"Ingušetski"}
+ inh{"Ingviški"}
io{"Ido"}
ira{"Iranski jezik"}
iro{"Irokvojanski"}
@@ -236,7 +250,7 @@
kaa{"Kara-kalpaški"}
kab{"Kabile"}
kac{"Kačin"}
- kaj{"Žju"}
+ kaj{"Đu"}
kam{"Kamba"}
kar{"Karenski"}
kaw{"Kavi"}
@@ -246,11 +260,11 @@
kg{"Kongo"}
kha{"Kasi"}
khi{"Koisanski jezik"}
- kho{"Kotanizijski"}
+ kho{"Kotaneški"}
ki{"Kikuju"}
kj{"Kuanjama"}
kk{"Kozački"}
- kl{"Kalalisutski"}
+ kl{"Kalalisut"}
km{"Kmerski"}
kmb{"Kimbundu"}
kn{"Kanada"}
@@ -263,7 +277,7 @@
krl{"Karelijski"}
kro{"Kru"}
kru{"Kurukh"}
- ks{"Kašmiri"}
+ ks{"Kašmirski"}
ku{"Kurdski"}
kum{"Kumik"}
kut{"Kutenai"}
@@ -279,7 +293,7 @@
lg{"Ganda"}
li{"Limburgiš"}
ln{"Lingala"}
- lo{"Laoški"}
+ lo{"Laoski"}
lol{"Mongo"}
loz{"Lozi"}
lt{"Litvanski"}
@@ -300,7 +314,8 @@
mdf{"Mokša"}
mdr{"Mandar"}
men{"Mende"}
- mg{"Malagazijski"}
+ mfe{"Morisjen"}
+ mg{"Malagasijski"}
mga{"Srednji irski"}
mh{"Maršalski"}
mi{"Maorski"}
@@ -330,9 +345,9 @@
myv{"Erzija"}
na{"Nauru"}
nah{"Nahuatl"}
- nai{"Jezik severno-američkih Indijanaca"}
+ nai{"Jezik severnoameričkih Indijanaca"}
nap{"Neapolitanski"}
- nb{"Norveški bokmål"}
+ nb{"Norveški bokmal"}
nd{"Severni ndebele"}
nds{"Niski nemački"}
ne{"Nepalski"}
@@ -379,7 +394,7 @@
pi{"Pali"}
pl{"Poljski"}
pon{"Ponpejski"}
- pra{"Prakritski jezik"}
+ pra{"Prakritski"}
pro{"Staroprovansalski"}
ps{"Paštunski"}
pt{"Portugalski"}
@@ -394,19 +409,19 @@
ro{"Rumunski"}
roa{"Romanski jezik"}
rom{"Romani"}
- root{"Run"}
+ root{"Rut"}
ru{"Ruski"}
rup{"Aromanijski"}
- rw{"Kinjarvanda"}
+ rw{"Kinjaruanda"}
sa{"Sanskrit"}
sad{"Sandave"}
sah{"Jakut"}
- sai{"Jezik južno-američkih Indijanaca"}
+ sai{"Jezik južnoameričkih Indijanaca"}
sal{"Sališanski jezik"}
sam{"Samaritanski aramejski"}
sas{"Sasak"}
sat{"Santali"}
- sc{"Sardinijski"}
+ sc{"Sardinjaski"}
scn{"Sicilijanski"}
sco{"Škotski"}
sd{"Sindi"}
@@ -415,7 +430,7 @@
sem{"Semitski jezik"}
sg{"Sango"}
sga{"Staroirski"}
- sgn{"Jezik znakova"}
+ sgn{"Znakovni jezik"}
sh{"Srpskohrvatski"}
shn{"Šan"}
si{"Singaleski"}
@@ -449,6 +464,7 @@
sux{"Sumerski"}
sv{"Švedski"}
sw{"Svahili"}
+ swb{"Komorski"}
syc{"Klasični sirijski"}
syr{"Sirijski"}
ta{"Tamilski"}
@@ -471,7 +487,7 @@
tn{"Tsvana"}
to{"Tonga"}
tog{"Njasa tonga"}
- tpi{"Tok pisin"}
+ tpi{"Tok Pisin"}
tr{"Turski"}
ts{"Tsonga"}
tsi{"Tsimšian"}
@@ -494,23 +510,24 @@
vai{"Vai"}
ve{"Venda"}
vi{"Vijetnamski"}
- vo{"Volapük"}
+ vo{"Volapuk"}
vot{"Votski"}
wa{"Valun"}
wak{"Vakašanski jezik"}
wal{"Valamo"}
- war{"Varej"}
+ war{"Varaj"}
was{"Vašo"}
wen{"Sorbijanski jezik"}
wo{"Volof"}
xal{"Kalmik"}
- xh{"Khosa"}
+ xh{"Kshosa"}
yao{"Jao"}
yap{"Japeški"}
yi{"Jidiš"}
- yo{"Jorubanski"}
+ yo{"Joruba"}
ypk{"Jupik"}
- za{"Zuang"}
+ yue{"Kantonski"}
+ za{"Žuang"}
zap{"Zapotečki"}
zbl{"Blisimboli"}
zen{"Zenaga"}
@@ -523,6 +540,9 @@
zxx{"Bez lingvističkog sadržaja"}
zza{"Zaza"}
}
+ LanguagesShort{
+ az{"Azerski"}
+ }
Scripts{
Arab{"arapsko pismo"}
Armi{"imperijsko aramejsko pismo"}
@@ -533,58 +553,58 @@
Beng{"bengalsko pismo"}
Blis{"blisimbolično pismo"}
Bopo{"bopomofo pismo"}
- Brah{"Bramansko pismo"}
+ Brah{"bramansko pismo"}
Brai{"Brajevo pismo"}
Bugi{"buginsko pismo"}
Buhd{"buhidsko pismo"}
Cakm{"čakmansko pismo"}
- Cans{"Ujedinjeni kanadski aboridžinski silabici"}
+ Cans{"ujedinjeni kanadski aboridžinski silabici"}
Cari{"karijsko pismo"}
Cham{"čamsko pismo"}
Cher{"Čeroki"}
Cirt{"cirt pismo"}
Copt{"koptičko pismo"}
Cprt{"kiparsko pismo"}
- Cyrl{"Ćirilica"}
- Cyrs{"Staroslovenska crkvena ćirilica"}
+ Cyrl{"Ćirilica"}
+ Cyrs{"Staroslovenska crkvena ćirilica"}
Deva{"Devanagari"}
Dsrt{"Dezeret"}
Egyd{"egipatsko narodno pismo"}
Egyh{"egipatsko hijeratsko pismo"}
- Egyp{"Egipatski hijeroglifi"}
+ Egyp{"egipatski hijeroglifi"}
Ethi{"etiopsko pismo"}
Geok{"gruzijsko khutsuri pismo"}
Geor{"gruzijsko pismo"}
Glag{"glagoljica"}
Goth{"Gotika"}
Grek{"grčko pismo"}
- Gujr{"gužarati pismo"}
- Guru{"gurmukhi pismo"}
- Hang{"hangul pismo"}
- Hani{"han pismo"}
- Hano{"hanuno pismo"}
+ Gujr{"gujarati pismo"}
+ Guru{"gurmuki pismo"}
+ Hang{"hangul"}
+ Hani{"han"}
+ Hano{"hanuno"}
Hans{"pojednostavljeno kinesko pismo"}
Hant{"tradicionalno kinesko pismo"}
Hebr{"hebrejsko pismo"}
Hira{"Hiragana"}
- Hmng{"pahawh hmong pismo"}
+ Hmng{"pahav hmong pismo"}
Hrkt{"Katakana ili Hiragana"}
- Hung{"Staromađarsko pismo"}
- Inds{"induško ismo"}
- Ital{"staro italsko pismo"}
+ Hung{"staromađarsko pismo"}
+ Inds{"induško pismo"}
+ Ital{"stari italik"}
Java{"javansko pismo"}
Jpan{"japansko pismo"}
- Kali{"kajah li pismo"}
+ Kali{"kajah-li pismo"}
Kana{"Katakana"}
Khar{"karošti pismo"}
Khmr{"kmersko pismo"}
Knda{"kannada pismo"}
- Kore{"Korejsko pismo"}
- Kthi{"kaićansko pismo"}
+ Kore{"korejsko pismo"}
+ Kthi{"kaiti"}
Lana{"lanna pismo"}
- Laoo{"lao pismo"}
- Latf{"Latinica (Fraktur varijanta)"}
- Latg{"Galska latinica"}
+ Laoo{"laoško pismo"}
+ Latf{"latinica (fraktur varijanta)"}
+ Latg{"galska latinica"}
Latn{"Latinica"}
Lepc{"lepča pismo"}
Limb{"limbu pismo"}
@@ -597,23 +617,23 @@
Maya{"majanski hijeroglifi"}
Mero{"meroitik pismo"}
Mlym{"malajalam pismo"}
- Mong{"Mongolsko pismo"}
+ Mong{"mongolsko pismo"}
Moon{"mesečevo pismo"}
Mtei{"meitei majek pismo"}
- Mymr{"mianmarko pismo"}
- Nkoo{"n'ko pismo"}
- Ogam{"ogham pismo"}
+ Mymr{"mijanmarsko pismo"}
+ Nkoo{"n’ko pismo"}
+ Ogam{"ogamsko pismo"}
Olck{"ol čiki pismo"}
- Orkh{"orkhon pismo"}
- Orya{"orija pismo"}
- Osma{"osmanja pismo"}
+ Orkh{"orkonsko pismo"}
+ Orya{"orijansko pismo"}
+ Osma{"osmanjansko pismo"}
Perm{"staro permiksko pismo"}
- Phag{"phags-pa pismo"}
+ Phag{"pags-pa pismo"}
Phli{"pisani pahlavi"}
Phlp{"psalter pahlavi"}
Phlv{"pahlavi pismo"}
Phnx{"Feničansko pismo"}
- Plrd{"polard fonetsko pismo"}
+ Plrd{"porald fonetsko pismo"}
Prti{"pisani partian"}
Rjng{"rejang pismo"}
Roro{"rongorongo pismo"}
@@ -622,30 +642,30 @@
Sara{"sarati pismo"}
Saur{"sauraštra pismo"}
Sgnw{"znakovno pismo"}
- Shaw{"šavian pismo"}
+ Shaw{"šavijansko pismo"}
Sinh{"sinhala pismo"}
Sund{"sudansko pismo"}
Sylo{"siloti nagri pismo"}
Syrc{"sirijsko pismo"}
Syre{"sirijsko estrangelo pismo"}
- Syrj{"Zapadnosirijsko pismo"}
+ Syrj{"zapadnosirijsko pismo"}
Syrn{"pismo istočne Sirije"}
Tagb{"tagbanva pismo"}
Tale{"tai le pismo"}
- Talu{"novo tai lue pismo"}
+ Talu{"novi tai lue"}
Taml{"tamilsko pismo"}
Tavt{"tai viet pismo"}
Telu{"telugu pismo"}
Teng{"tengvar pismo"}
Tfng{"tifinag pismo"}
- Tglg{"tagalog"}
+ Tglg{"Tagalog"}
Thaa{"thana pismo"}
- Thai{"Tajlandsko pismo"}
+ Thai{"tajlandsko pismo"}
Tibt{"tibetansko pismo"}
Ugar{"ugaritsko pismo"}
Vaii{"vai pismo"}
Visp{"vidljivi govor"}
- Xpeo{"Staropersijsko pismo"}
+ Xpeo{"staropersijsko pismo"}
Xsux{"sumersko-akadsko kuneiform pismo"}
Yiii{"ji pismo"}
Zinh{"nasledno pismo"}
@@ -653,62 +673,124 @@
Zsym{"simboli"}
Zxxx{"Nepisani jezik"}
Zyyy{"zajedničko pismo"}
- Zzzz{"Nepoznato ili nevažeće pismo"}
+ Zzzz{"Nepoznato ili nevažeće pismo"}
+ }
+ Scripts%stand-alone{
+ Hans{"pojednostavljeno han pismo"}
+ Hant{"tradicionalno han pismo"}
}
Types{
calendar{
buddhist{"Budistički kalendar"}
chinese{"Kineski kalendar"}
+ coptic{"koptski kalendar"}
+ ethiopic{"etiopski kalendar"}
+ ethiopic-amete-alem{"etiopski amet alem kalendar"}
gregorian{"Gregorijanski kalendar"}
hebrew{"Hebrejski kalendar"}
indian{"Indijski nacionalni kalendar"}
islamic{"Islamski kalendar"}
islamic-civil{"Islamski civilni kalendar"}
japanese{"Japanski kalendar"}
+ persian{"persijski kalendar"}
roc{"Kalendar Republike Kine"}
}
collation{
big5han{"Tradicionalno kinesko sortiranje"}
+ dictionary{"Redosled sortiranja u rečniku"}
+ ducet{"Podrazumevani Unicode redosled sortiranja"}
gb2312han{"Pojednostavljeno kinesko sortiranje"}
phonebook{"Sortiranje kao telefonski imenik"}
+ phonetic{"Fonetski redosled sortiranja"}
pinyin{"Pinjin sortiranje"}
+ reformed{"Reformisani redosled sortiranja"}
+ search{"Opšte namenjena pretraga"}
+ searchjl{"Pretraga prema hangul početnom suglasniku"}
stroke{"Sortiranje po broju crta"}
traditional{"Tradicionalno sortiranje"}
+ unihan{"Redosled sortiranja radikalnim crticama"}
+ }
+ numbers{
+ arab{"arapsko-indijske cifre"}
+ arabext{"produžene arapsko-indijske cifre"}
+ armn{"jermenski brojevi"}
+ armnlow{"mali jermenski brojevi"}
+ beng{"bengalske cifre"}
+ deva{"devangari cifre"}
+ ethi{"etiopski brojevi"}
+ finance{"Finansijski brojevi"}
+ fullwide{"cifre pune širine"}
+ geor{"gruzijski brojevi"}
+ grek{"grčki brojevi"}
+ greklow{"mali grčki brojevi"}
+ gujr{"gudžaratske cifre"}
+ guru{"gurmuki cifre"}
+ hanidec{"kineski decimalni brojevi"}
+ hans{"pojednostavljeni kineski brojevi"}
+ hansfin{"pojednostavljeni kineski finansijski brojevi"}
+ hant{"tradicionalni kineski brojevi"}
+ hantfin{"tradicionalni kineski finansijski brojevi"}
+ hebr{"hebrejski brojevi"}
+ jpan{"japanski brojevi"}
+ jpanfin{"japanski finansijski brojevi"}
+ khmr{"kmerske cifre"}
+ knda{"kanada cifre"}
+ laoo{"laoške cifre"}
+ latn{"zapadne cifre"}
+ mlym{"malajalam cifre"}
+ mong{"mongolske cifre"}
+ mymr{"mijanmarske cifre"}
+ native{"Lokalne cifre"}
+ orya{"orija cifre"}
+ roman{"rimski brojevi"}
+ romanlow{"mali rimski brojevi"}
+ taml{"tamilski brojevi"}
+ tamldec{"tamilske cifre"}
+ telu{"telugu cifre"}
+ thai{"tajske cifre"}
+ tibt{"tibetanske cifre"}
+ traditional{"Tradicionalni brojevi"}
+ vaii{"Vai cifre"}
}
}
Variants{
1606NICT{"Francuski iz kasnog srednjeg veka do 1606."}
1694ACAD{"Rani moderni francuski"}
1901{"Tradicionalna nemačka ortografija"}
- 1994{"Standardizovana rezijanska ortografija"}
- 1996{"Nemačka ortografija 1996"}
- AREVELA{"Istočni jermenski"}
- AREVMDA{"Zapadno-jermenski"}
- BAKU1926{"Ujedinjeni turski latinični alfabet"}
- BISKE{"San Đorđijo/Bila dijalekt"}
+ 1994{"Standardnizovana resijanska ortografija"}
+ 1996{"Nemačka ortografija iz 1996"}
+ AREVELA{"Istočni armenijski"}
+ AREVMDA{"Zapadno jermenska"}
+ BAKU1926{"Ujedinjen turski latinični alfabet"}
+ BISKE{"San Đorđio/Bila dijalekt"}
BOONT{"Buntling"}
FONIPA{"IPA fonetika"}
FONUPA{"UPA fonetika"}
- LIPAW{"Lipovac dijalekt rezijanski"}
+ LIPAW{"Lipovički dijalekt resijanski"}
MONOTON{"Monotonik"}
- NEDIS{"Natison dijalekt"}
- NJIVA{"Gnjiva/Njiva dijalekt"}
+ NEDIS{"Natisone dijalekt"}
+ NJIVA{"Gnjiva/Njiva dijalkekt"}
OSOJS{"Oseako/Osojane dijalekt"}
POLYTON{"Politonik"}
POSIX{"Kompjuter"}
- REVISED{"Revidirana ortigrafija"}
- ROZAJ{"Rezijan"}
+ REVISED{"Revidirana ortografija"}
+ ROZAJ{"Resijan"}
SAAHO{"Saho"}
- SCOTLAND{"Škotski standardni engleski"}
+ SCOTLAND{"Škotski standardni Engleski"}
SCOUSE{"Skauz"}
SOLBA{"Stolvica/Solbica dijalekt"}
- TARASK{"Taraskijevica ortografija"}
- VALENCIA{"Valencijski"}
+ TARASK{"Taraskijevička ortografija"}
+ VALENCIA{"Valencijska"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.51"}
codePatterns{
language{"Jezik: {0}"}
script{"Skript: {0}"}
territory{"Region: {0}"}
}
+ localeDisplayPattern{
+ keyTypePattern{"{0}: {1}"}
+ pattern{"{0} ({1})"}
+ separator{", "}
+ }
}
diff --git a/data/lang/sr_Latn_BA.txt b/data/lang/sr_Latn_BA.txt
index cb015a6..1a5f126 100644
--- a/data/lang/sr_Latn_BA.txt
+++ b/data/lang/sr_Latn_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/sr_Latn_CS.txt b/data/lang/sr_Latn_CS.txt
index f80a8a8..9df1eb2 100644
--- a/data/lang/sr_Latn_CS.txt
+++ b/data/lang/sr_Latn_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/sr_Latn_ME.txt b/data/lang/sr_Latn_ME.txt
index fefdf54..700e1cb 100755
--- a/data/lang/sr_Latn_ME.txt
+++ b/data/lang/sr_Latn_ME.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/sr_Latn_RS.txt b/data/lang/sr_Latn_RS.txt
index 418f50c..4e4b742 100644
--- a/data/lang/sr_Latn_RS.txt
+++ b/data/lang/sr_Latn_RS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/sr_Latn_YU.txt b/data/lang/sr_Latn_YU.txt
index 56911ca..9451580 100644
--- a/data/lang/sr_Latn_YU.txt
+++ b/data/lang/sr_Latn_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/sr_ME.txt b/data/lang/sr_ME.txt
index 76ef7f7..8535ec0 100644
--- a/data/lang/sr_ME.txt
+++ b/data/lang/sr_ME.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/sr_RS.txt b/data/lang/sr_RS.txt
index d9c7dc2..2fba029 100644
--- a/data/lang/sr_RS.txt
+++ b/data/lang/sr_RS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/sr_YU.txt b/data/lang/sr_YU.txt
index 9bb7c27..e3b8f74 100644
--- a/data/lang/sr_YU.txt
+++ b/data/lang/sr_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/sv.txt b/data/lang/sv.txt
index b682078..0ca9115 100644
--- a/data/lang/sv.txt
+++ b/data/lang/sv.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sv.xml
// *
@@ -789,7 +789,6 @@
collation{
big5han{"big5-sorteringsordning"}
dictionary{"ordbokssorteringsordning"}
- direct{"∅∅∅"}
ducet{"grundläggande Unicode-sorteringsordning"}
gb2312han{"gb2312-sorteringsordning"}
phonebook{"telefonkatalogssorteringsordning"}
@@ -915,7 +914,7 @@
VALLADER{"vallader-dialekt"}
WADEGILE{"Wade-Giles"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
codePatterns{
language{"språk: {0}"}
script{"skrift: {0}"}
diff --git a/data/lang/sv_FI.txt b/data/lang/sv_FI.txt
index bd3e477..7e6a167 100644
--- a/data/lang/sv_FI.txt
+++ b/data/lang/sv_FI.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sv_FI.xml
// *
@@ -13,5 +13,5 @@
Variants{
1996{"1996 års stavning"}
}
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/sw.txt b/data/lang/sw.txt
index 72684e3..98cbb6e 100644
--- a/data/lang/sw.txt
+++ b/data/lang/sw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sw.xml
// *
@@ -327,7 +327,7 @@
vaii{"Dijiti za Vai"}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
localeDisplayPattern{
pattern{"{0} ({1})"}
separator{","}
diff --git a/data/lang/swc.txt b/data/lang/swc.txt
index ff67ad4..80fa634 100755
--- a/data/lang/swc.txt
+++ b/data/lang/swc.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/swc.xml
// *
@@ -58,5 +58,5 @@
zh{"Kichina"}
zu{"Kizulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/ta.txt b/data/lang/ta.txt
index 5862721..05df2e4 100644
--- a/data/lang/ta.txt
+++ b/data/lang/ta.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ta.xml
// *
@@ -755,7 +755,7 @@
PINYIN{"பின்யின் ரோமானைசெஷன்"}
WADEGILE{"வேட்-கைல்ஸ் ரோமனைஷேசன்"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
codePatterns{
language{"மொழி: {0}"}
script{"எழுத்து: {0}"}
diff --git a/data/lang/te.txt b/data/lang/te.txt
index fb784ba..b147be3 100644
--- a/data/lang/te.txt
+++ b/data/lang/te.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/te.xml
// *
@@ -760,7 +760,7 @@
REVISED{"సవరించబడిన వర్ణక్రమం"}
WADEGILE{"వేడ్-గైల్స్ రోమనైజేషన్"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
codePatterns{
language{"భాష: {0}"}
script{"లిపి: {0}"}
diff --git a/data/lang/teo.txt b/data/lang/teo.txt
index 6624f13..6f9e936 100755
--- a/data/lang/teo.txt
+++ b/data/lang/teo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/teo.xml
// *
@@ -57,5 +57,5 @@
zh{"Kichina"}
zu{"Kizulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/th.txt b/data/lang/th.txt
index 0f005e2..af17a43 100644
--- a/data/lang/th.txt
+++ b/data/lang/th.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/th.xml
// *
@@ -787,7 +787,6 @@
collation{
big5han{"เรียงตามอักษรจีนดั้งเดิม"}
dictionary{"เรียงตามพจนานุกรม"}
- direct{"โดยตรง"}
ducet{"ลำดับการจัดเรียงรหัสยูนิโค้ดค่าเริ่มต้น"}
gb2312han{"เรียงตามอักษรจีนประยุกต์"}
phonebook{"เรียงตามสมุดโทรศัพท์"}
@@ -917,7 +916,7 @@
VALLADER{"วัลลาเดอร์"}
WADEGILE{"การถอดอักษรแบบเวด-ไจลส์"}
}
- Version{"2.0.79.79"}
+ Version{"2.0.82.57"}
codePatterns{
language{"{0}"}
script{"{0}"}
diff --git a/data/lang/th_TH.txt b/data/lang/th_TH.txt
index 94c4a72..9820811 100644
--- a/data/lang/th_TH.txt
+++ b/data/lang/th_TH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/th_TH_TRADITIONAL.txt b/data/lang/th_TH_TRADITIONAL.txt
index 9a5620e..37548cf 100644
--- a/data/lang/th_TH_TRADITIONAL.txt
+++ b/data/lang/th_TH_TRADITIONAL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/ti.txt b/data/lang/ti.txt
index 468e0f5..803f2b0 100644
--- a/data/lang/ti.txt
+++ b/data/lang/ti.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ti.xml
// *
@@ -110,5 +110,5 @@
Ethi{"ፊደል"}
Latn{"ላቲን"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/tl.txt b/data/lang/tl.txt
index 2a55f9a..85b090c 100755
--- a/data/lang/tl.txt
+++ b/data/lang/tl.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/tl_PH.txt b/data/lang/tl_PH.txt
index 52f1969..c788c54 100755
--- a/data/lang/tl_PH.txt
+++ b/data/lang/tl_PH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/to.txt b/data/lang/to.txt
index 18f5749..c4ea800 100755
--- a/data/lang/to.txt
+++ b/data/lang/to.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/to.xml
// *
@@ -244,7 +244,7 @@
traditional{"tukufakaholo"}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
codePatterns{
language{"Lea: {0}"}
script{"Tohinima Fakaha: {0}"}
diff --git a/data/lang/tr.txt b/data/lang/tr.txt
index 18a4a60..b690e8c 100644
--- a/data/lang/tr.txt
+++ b/data/lang/tr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/tr.xml
// *
@@ -851,7 +851,7 @@
VALENCIA{"Valensiyaca"}
WADEGILE{"Wade-Giles (Latin Alfabesinde Yazımı)"}
}
- Version{"2.0.79.79"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Dil: {0}"}
script{"Alfabe: {0}"}
diff --git a/data/lang/twq.txt b/data/lang/twq.txt
index 00e231f..3d1d1f7 100755
--- a/data/lang/twq.txt
+++ b/data/lang/twq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/twq.xml
// *
@@ -57,5 +57,5 @@
zh{"Sinuwa senni, Mandareŋ"}
zu{"Zulu senni"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/tzm.txt b/data/lang/tzm.txt
index cada9e7..a370d95 100755
--- a/data/lang/tzm.txt
+++ b/data/lang/tzm.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/tzm.xml
// *
@@ -57,5 +57,5 @@
zh{"Tacinwit,Mandarin"}
zu{"tazulut"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/tzm_Latn.txt b/data/lang/tzm_Latn.txt
index 0bbb4b4..72fe963 100755
--- a/data/lang/tzm_Latn.txt
+++ b/data/lang/tzm_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/tzm_Latn.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/tzm_Latn.xml
*/
tzm_Latn{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/tzm_Latn_MA.txt b/data/lang/tzm_Latn_MA.txt
index 271f885..6465f27 100755
--- a/data/lang/tzm_Latn_MA.txt
+++ b/data/lang/tzm_Latn_MA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/tzm_MA.txt b/data/lang/tzm_MA.txt
index ebd194c..ee6f521 100755
--- a/data/lang/tzm_MA.txt
+++ b/data/lang/tzm_MA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/uk.txt b/data/lang/uk.txt
index 5290c38..52d90f2 100644
--- a/data/lang/uk.txt
+++ b/data/lang/uk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uk.xml
// *
@@ -844,7 +844,7 @@
VALENCIA{"Валенсійська"}
WADEGILE{"Романізація Вейда-Джайлза"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
codePatterns{
language{"Мова з кодом {0}"}
script{"Скрипт із кодом {0}"}
diff --git a/data/lang/ur.txt b/data/lang/ur.txt
index f9d76ef..54e82e0 100644
--- a/data/lang/ur.txt
+++ b/data/lang/ur.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ur.xml
// *
@@ -330,7 +330,7 @@
vaii{"وائی ہندسے"}
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
codePatterns{
language{"زبان:{0}"}
script{"رسم الخط:{0}"}
diff --git a/data/lang/uz.txt b/data/lang/uz.txt
index adcf3ce..f62ec90 100644
--- a/data/lang/uz.txt
+++ b/data/lang/uz.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz.xml
// *
@@ -13,5 +13,5 @@
Languages{
uz{"Ўзбек"}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/uz_AF.txt b/data/lang/uz_AF.txt
index 0010d89..5996fc9 100644
--- a/data/lang/uz_AF.txt
+++ b/data/lang/uz_AF.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/uz_Arab.txt b/data/lang/uz_Arab.txt
index 5716b30..5e0d0ca 100644
--- a/data/lang/uz_Arab.txt
+++ b/data/lang/uz_Arab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz_Arab.xml
// *
@@ -15,5 +15,5 @@
ps{"پشتو"}
uz{"اوزبیک"}
}
- Version{"2.0.76.36"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/uz_Arab_AF.txt b/data/lang/uz_Arab_AF.txt
index 972b280..9e5d31f 100644
--- a/data/lang/uz_Arab_AF.txt
+++ b/data/lang/uz_Arab_AF.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/uz_Cyrl.txt b/data/lang/uz_Cyrl.txt
index 4f1cc29..9f16779 100644
--- a/data/lang/uz_Cyrl.txt
+++ b/data/lang/uz_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz_Cyrl.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/uz_Cyrl.xml
*/
uz_Cyrl{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/uz_Cyrl_UZ.txt b/data/lang/uz_Cyrl_UZ.txt
index 0776fef..97d565c 100644
--- a/data/lang/uz_Cyrl_UZ.txt
+++ b/data/lang/uz_Cyrl_UZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/uz_Latn.txt b/data/lang/uz_Latn.txt
index 7a0fe0a..687bb81 100644
--- a/data/lang/uz_Latn.txt
+++ b/data/lang/uz_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz_Latn.xml
// *
@@ -28,5 +28,5 @@
Cyrl{"Kiril"}
Latn{"Lotin"}
}
- Version{"2.0.74.98"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/uz_UZ.txt b/data/lang/uz_UZ.txt
index a419389..35e0a7f 100644
--- a/data/lang/uz_UZ.txt
+++ b/data/lang/uz_UZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/vai.txt b/data/lang/vai.txt
index ddf704e..c00c634 100755
--- a/data/lang/vai.txt
+++ b/data/lang/vai.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vai.xml
// *
@@ -57,5 +57,5 @@
zh{"ꕦꕇꔧ"}
zu{"ꖮꖨ"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/vai_LR.txt b/data/lang/vai_LR.txt
index 9d1560d..403f4c0 100755
--- a/data/lang/vai_LR.txt
+++ b/data/lang/vai_LR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/vai_Latn.txt b/data/lang/vai_Latn.txt
index 82e621d..f2ac3c6 100755
--- a/data/lang/vai_Latn.txt
+++ b/data/lang/vai_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vai_Latn.xml
// *
@@ -57,5 +57,5 @@
zh{"Chaniĩ"}
zu{"Zúlu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/vai_Vaii.txt b/data/lang/vai_Vaii.txt
index a7f9e21..42c6a51 100755
--- a/data/lang/vai_Vaii.txt
+++ b/data/lang/vai_Vaii.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vai_Vaii.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/vai_Vaii.xml
*/
vai_Vaii{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/vai_Vaii_LR.txt b/data/lang/vai_Vaii_LR.txt
index edccde9..dd7fb4c 100755
--- a/data/lang/vai_Vaii_LR.txt
+++ b/data/lang/vai_Vaii_LR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/vi.txt b/data/lang/vi.txt
index d468517..fd7df9c 100644
--- a/data/lang/vi.txt
+++ b/data/lang/vi.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vi.xml
// *
@@ -783,7 +783,6 @@
collation{
big5han{"Thứ tự sắp xếp theo tiếng Trung phồn thể - Big5"}
dictionary{"Thứ tự sắp xếp theo từ điển"}
- direct{"Trực tiếp"}
ducet{"Thứ tự sắp xếp unicode mặc định"}
gb2312han{"Thứ tự sắp xếp theo tiếng Trung giản thể - GB2312"}
phonebook{"Thứ tự sắp xếp theo danh bạ điện thoại"}
@@ -892,7 +891,7 @@
VALENCIA{"Tiếng Valencia"}
WADEGILE{"La Mã hóa Wade-Giles"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
codePatterns{
language{"Ngôn ngữ: {0}"}
script{"Chữ viết: {0}"}
diff --git a/data/lang/vun.txt b/data/lang/vun.txt
index c2d5935..bfaf373 100755
--- a/data/lang/vun.txt
+++ b/data/lang/vun.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vun.xml
// *
@@ -57,5 +57,5 @@
zh{"Kyichina"}
zu{"Kyizulu"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/xog.txt b/data/lang/xog.txt
index dfb15d9..a5b3103 100755
--- a/data/lang/xog.txt
+++ b/data/lang/xog.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/xog.xml
// *
@@ -57,5 +57,5 @@
zh{"Olucayina"}
zu{"Oluzzulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/yav.txt b/data/lang/yav.txt
index 83c9ae6..d0f61eb 100755
--- a/data/lang/yav.txt
+++ b/data/lang/yav.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/yav.xml
// *
@@ -57,5 +57,5 @@
zh{"sinúɛ"}
zu{"nusulú"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/yo.txt b/data/lang/yo.txt
index 3464669..1b25217 100755
--- a/data/lang/yo.txt
+++ b/data/lang/yo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/yo.xml
// *
@@ -111,5 +111,5 @@
zh{"Èdè Mandari"}
zu{"Èdè Ṣulu"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/zh.txt b/data/lang/zh.txt
index 8ad7df1..0e5b653 100644
--- a/data/lang/zh.txt
+++ b/data/lang/zh.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh.xml
// *
@@ -790,7 +790,6 @@
collation{
big5han{"繁体中文(Big5)"}
dictionary{"字典排序顺序"}
- direct{"直接"}
ducet{"默认 Unicode 排序顺序"}
gb2312han{"简体中文(GB2312)"}
phonebook{"电话簿排序顺序"}
@@ -920,7 +919,7 @@
VALLADER{"瑞士瓦勒德方言"}
WADEGILE{"WG 威氏拼音法"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.60"}
codePatterns{
language{"语言：{0}"}
script{"文字：{0}"}
diff --git a/data/lang/zh_CN.txt b/data/lang/zh_CN.txt
index 348f06e..28103b9 100644
--- a/data/lang/zh_CN.txt
+++ b/data/lang/zh_CN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/zh_HK.txt b/data/lang/zh_HK.txt
index 8e03c71..67efd92 100644
--- a/data/lang/zh_HK.txt
+++ b/data/lang/zh_HK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/zh_Hans.txt b/data/lang/zh_Hans.txt
index e8cbcd7..1542b90 100644
--- a/data/lang/zh_Hans.txt
+++ b/data/lang/zh_Hans.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/zh_Hans.xml
*/
zh_Hans{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/lang/zh_Hans_CN.txt b/data/lang/zh_Hans_CN.txt
index c4f5185..6e6723b 100644
--- a/data/lang/zh_Hans_CN.txt
+++ b/data/lang/zh_Hans_CN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/zh_Hans_HK.txt b/data/lang/zh_Hans_HK.txt
index 2e26ad4..df77010 100755
--- a/data/lang/zh_Hans_HK.txt
+++ b/data/lang/zh_Hans_HK.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans_HK.xml
// *
@@ -29,7 +29,7 @@
Variants{
WADEGILE{"韦氏拼音罗马字"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
codePatterns{
script{"语系：{0}"}
}
diff --git a/data/lang/zh_Hans_MO.txt b/data/lang/zh_Hans_MO.txt
index d1106aa..3fa3bfc 100755
--- a/data/lang/zh_Hans_MO.txt
+++ b/data/lang/zh_Hans_MO.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans_MO.xml
// *
@@ -30,7 +30,7 @@
Variants{
WADEGILE{"韦氏拼音罗马字"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
codePatterns{
script{"语系：{0}"}
}
diff --git a/data/lang/zh_Hans_SG.txt b/data/lang/zh_Hans_SG.txt
index 77966f5..0bef5ca 100644
--- a/data/lang/zh_Hans_SG.txt
+++ b/data/lang/zh_Hans_SG.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans_SG.xml
// *
@@ -28,7 +28,7 @@
Variants{
WADEGILE{"韦氏拼音罗马字"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
codePatterns{
script{"语系：{0}"}
}
diff --git a/data/lang/zh_Hant.txt b/data/lang/zh_Hant.txt
index 153d1e2..e2c960f 100644
--- a/data/lang/zh_Hant.txt
+++ b/data/lang/zh_Hant.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hant.xml
// *
@@ -778,7 +778,6 @@
collation{
big5han{"繁體中文排序 (Big5)"}
dictionary{"字典排序"}
- direct{"直接排序"}
ducet{"預設 Unicode 排序"}
gb2312han{"簡體中文排序 (GB2312)"}
phonebook{"電話簿排序"}
@@ -906,7 +905,7 @@
VALLADER{"瑞士瓦勒德方言"}
WADEGILE{"威妥瑪式拼音"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
codePatterns{
language{"語言：{0}"}
script{"文字：{0}"}
diff --git a/data/lang/zh_Hant_HK.txt b/data/lang/zh_Hant_HK.txt
index 176e65f..49983ce 100644
--- a/data/lang/zh_Hant_HK.txt
+++ b/data/lang/zh_Hant_HK.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hant_HK.xml
// *
@@ -85,5 +85,5 @@
REVISED{"已修訂拼字法"}
SCOTLAND{"蘇格蘭標準英語"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.47"}
}
diff --git a/data/lang/zh_Hant_MO.txt b/data/lang/zh_Hant_MO.txt
index 686610b..08cadc7 100644
--- a/data/lang/zh_Hant_MO.txt
+++ b/data/lang/zh_Hant_MO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/zh_Hant_TW.txt b/data/lang/zh_Hant_TW.txt
index 659b708..99d5a6f 100644
--- a/data/lang/zh_Hant_TW.txt
+++ b/data/lang/zh_Hant_TW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/zh_MO.txt b/data/lang/zh_MO.txt
index 7a340a7..0492740 100644
--- a/data/lang/zh_MO.txt
+++ b/data/lang/zh_MO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/zh_SG.txt b/data/lang/zh_SG.txt
index e5b7c41..4ebb462 100644
--- a/data/lang/zh_SG.txt
+++ b/data/lang/zh_SG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/zh_TW.txt b/data/lang/zh_TW.txt
index 5957fe3..dc597d3 100644
--- a/data/lang/zh_TW.txt
+++ b/data/lang/zh_TW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/lang/zu.txt b/data/lang/zu.txt
index a1de731..d88d894 100644
--- a/data/lang/zu.txt
+++ b/data/lang/zu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zu.xml
// *
@@ -327,7 +327,7 @@
vaii{"Izinhlazu Zezinombolo ze-Vai"}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
localeDisplayPattern{
pattern{"{0} ({1})"}
separator{","}
diff --git a/data/locales/af.txt b/data/locales/af.txt
index 078e13e..cb45f1d 100644
--- a/data/locales/af.txt
+++ b/data/locales/af.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/af.xml
// *
@@ -143,8 +143,150 @@
}
}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE dd MMMM y G",
+ "dd MMMM y G",
+ "dd MMM y G",
+ "GGGGG y-MM-dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMMdd{"dd MMMM"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, d MMM y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"M/d/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, M/d – E, M/d"}
+ d{"E, M/d – E, M/d"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E, MMM d – E, MMM d"}
+ d{"E, MMM d – E, MMM d"}
+ }
+ MMMd{
+ M{"MMM d – MMM d"}
+ d{"MMM d–d"}
+ }
+ Md{
+ M{"M/d – M/d"}
+ d{"M/d – M/d"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
+ }
+ yMEd{
+ M{"E, M/d/y – E, M/d/y"}
+ d{"E, M/d/y – E, M/d/y"}
+ y{"E, M/d/y – E, M/d/y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y – MMM y"}
+ }
+ yMMMEd{
+ M{"E, d MMM – E, d MMM, y"}
+ d{"E, d MMM – E, d MMM, y"}
+ y{"E, MMM d, y – E, MMM d, y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"MMM d – MMM d, y"}
+ d{"d–d MMM, y"}
+ y{"d MMM, y – d MMM, y"}
+ }
+ yMd{
+ M{"M/d/y – M/d/y"}
+ d{"M/d/y – M/d/y"}
+ y{"M/d/y – M/d/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"vm.",
@@ -158,7 +300,7 @@
"EEEE dd MMMM y",
"dd MMMM y",
"dd MMM y",
- "yyyy-MM-dd",
+ "y-MM-dd",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -256,63 +398,6 @@
"na Christus",
}
}
- fields{
- day{
- dn{"Dag"}
- relative{
- "-1"{"Gister"}
- "-2"{"Die dag voor gister"}
- "0"{"Vandag"}
- "1"{"Môre"}
- "2"{"Die dag na môre"}
- }
- }
- dayperiod{
- dn{"AM/PM"}
- }
- era{
- dn{"Era"}
- }
- hour{
- dn{"Uur"}
- }
- minute{
- dn{"Minuut"}
- }
- month{
- dn{"Maand"}
- relative{
- "-1"{"Verlede maand"}
- "0"{"Vandeesmaand"}
- "1"{"Volgende maand"}
- }
- }
- second{
- dn{"Sekonde"}
- }
- week{
- dn{"Week"}
- relative{
- "-1"{"Verlede week"}
- "0"{"Vandeesweek"}
- "1"{"Volgende week"}
- }
- }
- weekday{
- dn{"Weeksdag"}
- }
- year{
- dn{"Jaar"}
- relative{
- "-1"{"Verlede jaar"}
- "0"{"Hierdie jaar"}
- "1"{"Volgende jaar"}
- }
- }
- zone{
- dn{"Tydsone"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -376,13 +461,13 @@
y{"y–y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E, M/d/yy – E, M/d/yy"}
- d{"E, M/d/yy – E, M/d/yy"}
- y{"E, M/d/yy – E, M/d/yy"}
+ M{"E, M/d/y – E, M/d/y"}
+ d{"E, M/d/y – E, M/d/y"}
+ y{"E, M/d/y – E, M/d/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -403,9 +488,9 @@
y{"d MMM, y – d MMM, y"}
}
yMd{
- M{"M/d/yy – M/d/yy"}
- d{"M/d/yy – M/d/yy"}
- y{"M/d/yy – M/d/yy"}
+ M{"M/d/y – M/d/y"}
+ d{"M/d/y – M/d/y"}
+ y{"M/d/y – M/d/y"}
}
}
monthNames{
@@ -508,6 +593,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Dag"}
+ relative{
+ "-1"{"Gister"}
+ "-2"{"Die dag voor gister"}
+ "0"{"Vandag"}
+ "1"{"Môre"}
+ "2"{"Die dag na môre"}
+ }
+ }
+ dayperiod{
+ dn{"AM/PM"}
+ }
+ era{
+ dn{"Era"}
+ }
+ hour{
+ dn{"Uur"}
+ }
+ minute{
+ dn{"Minuut"}
+ }
+ month{
+ dn{"Maand"}
+ relative{
+ "-1"{"Verlede maand"}
+ "0"{"Vandeesmaand"}
+ "1"{"Volgende maand"}
+ }
+ }
+ second{
+ dn{"Sekonde"}
+ }
+ week{
+ dn{"Week"}
+ relative{
+ "-1"{"Verlede week"}
+ "0"{"Vandeesweek"}
+ "1"{"Volgende week"}
+ }
+ }
+ weekday{
+ dn{"Weeksdag"}
+ }
+ year{
+ dn{"Jaar"}
+ relative{
+ "-1"{"Verlede jaar"}
+ "0"{"Hierdie jaar"}
+ "1"{"Volgende jaar"}
+ }
+ }
+ zone{
+ dn{"Tydsone"}
+ }
+ }
listPattern{
standard{
2{"{0} en {1}"}
diff --git a/data/locales/af_NA.txt b/data/locales/af_NA.txt
index e9bd3cb..13c8e5f 100644
--- a/data/locales/af_NA.txt
+++ b/data/locales/af_NA.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/af_NA.xml
// *
@@ -14,5 +14,5 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/af_ZA.txt b/data/locales/af_ZA.txt
index 7671874..c87eed2 100644
--- a/data/locales/af_ZA.txt
+++ b/data/locales/af_ZA.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/af_ZA.xml
// *
// ***************************************************************************
af_ZA{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/agq.txt b/data/locales/agq.txt
index c23c48e..c3ec6fe 100755
--- a/data/locales/agq.txt
+++ b/data/locales/agq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/agq.xml
// *
@@ -34,8 +34,49 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM, y G",
+ "d/M/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"a.g",
@@ -49,7 +90,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM, y",
- "d/M/yyyy",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -123,46 +164,6 @@
"Bǎa Kɨ̀lesto",
}
}
- fields{
- day{
- dn{"utsuʔ"}
- relative{
- "-1"{"ā zūɛɛ"}
- "0"{"nɛ"}
- "1"{"tsʉtsʉ"}
- }
- }
- dayperiod{
- dn{"â tsɨ̀"}
- }
- era{
- dn{"kɨtîgh"}
- }
- hour{
- dn{"tàm"}
- }
- minute{
- dn{"menè"}
- }
- month{
- dn{"ndzɔŋ"}
- }
- second{
- dn{"sɛkɔ̀n"}
- }
- week{
- dn{"ewɨn"}
- }
- weekday{
- dn{"tsuʔu mɨ̀ èwɨ̄n"}
- }
- year{
- dn{"kɨnûm"}
- }
- zone{
- dn{"dɨŋò kɨ enɨ̀gha"}
- }
- }
monthNames{
format{
abbreviated{
@@ -229,4 +230,44 @@
quotationEnd{"”"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"utsuʔ"}
+ relative{
+ "-1"{"ā zūɛɛ"}
+ "0"{"nɛ"}
+ "1"{"tsʉtsʉ"}
+ }
+ }
+ dayperiod{
+ dn{"â tsɨ̀"}
+ }
+ era{
+ dn{"kɨtîgh"}
+ }
+ hour{
+ dn{"tàm"}
+ }
+ minute{
+ dn{"menè"}
+ }
+ month{
+ dn{"ndzɔŋ"}
+ }
+ second{
+ dn{"sɛkɔ̀n"}
+ }
+ week{
+ dn{"ewɨn"}
+ }
+ weekday{
+ dn{"tsuʔu mɨ̀ èwɨ̄n"}
+ }
+ year{
+ dn{"kɨnûm"}
+ }
+ zone{
+ dn{"dɨŋò kɨ enɨ̀gha"}
+ }
+ }
}
diff --git a/data/locales/agq_CM.txt b/data/locales/agq_CM.txt
index 77df6cd..0c25fd3 100755
--- a/data/locales/agq_CM.txt
+++ b/data/locales/agq_CM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/agq_CM.xml
// *
// ***************************************************************************
agq_CM{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ak.txt b/data/locales/ak.txt
index 2b144c4..4b7faee 100755
--- a/data/locales/ak.txt
+++ b/data/locales/ak.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ak.xml
// *
@@ -27,8 +27,49 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, G y MMMM dd",
+ "G y MMMM d",
+ "G y MMM d",
+ "GGGGG yy/MM/dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yMd{"y/M/d"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"AN",
@@ -63,12 +104,12 @@
d{"d"}
hm{"h:mm a"}
ms{"mm:ss"}
- y{"yyyy"}
- yM{"M/yyyy"}
- yMEd{"E, M/d/yyyy"}
- yMMM{"MMM yyyy"}
- yMMMEd{"E, MMM d, yyyy"}
- yMMMM{"MMMM yyyy"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
yMd{"y/M/d"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
@@ -116,46 +157,6 @@
"Kristo Ekyiri",
}
}
- fields{
- day{
- dn{"Da"}
- relative{
- "-1"{"Ndeda"}
- "0"{"Ndɛ"}
- "1"{"Ɔkyena"}
- }
- }
- dayperiod{
- dn{"Da bere"}
- }
- era{
- dn{"Bere"}
- }
- hour{
- dn{"Dɔnhwer"}
- }
- minute{
- dn{"Sema"}
- }
- month{
- dn{"Bosome"}
- }
- second{
- dn{"Sɛkɛnd"}
- }
- week{
- dn{"Dapɛn"}
- }
- weekday{
- dn{"Dapɛn mu da"}
- }
- year{
- dn{"Afe"}
- }
- zone{
- dn{"Bere apaamu"}
- }
- }
monthNames{
format{
abbreviated{
@@ -196,4 +197,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Da"}
+ relative{
+ "-1"{"Ndeda"}
+ "0"{"Ndɛ"}
+ "1"{"Ɔkyena"}
+ }
+ }
+ dayperiod{
+ dn{"Da bere"}
+ }
+ era{
+ dn{"Bere"}
+ }
+ hour{
+ dn{"Dɔnhwer"}
+ }
+ minute{
+ dn{"Sema"}
+ }
+ month{
+ dn{"Bosome"}
+ }
+ second{
+ dn{"Sɛkɛnd"}
+ }
+ week{
+ dn{"Dapɛn"}
+ }
+ weekday{
+ dn{"Dapɛn mu da"}
+ }
+ year{
+ dn{"Afe"}
+ }
+ zone{
+ dn{"Bere apaamu"}
+ }
+ }
}
diff --git a/data/locales/ak_GH.txt b/data/locales/ak_GH.txt
index 95bca37..16a7739 100755
--- a/data/locales/ak_GH.txt
+++ b/data/locales/ak_GH.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ak_GH.xml
// *
// ***************************************************************************
ak_GH{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/am.txt b/data/locales/am.txt
index 6788a3d..b86aa08 100644
--- a/data/locales/am.txt
+++ b/data/locales/am.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/am.xml
// *
@@ -144,7 +144,7 @@
native{"latn"}
traditional{"ethi"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.52"}
calendar{
ethiopic{
monthNames{
@@ -244,6 +244,147 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ H{"H"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E፣ d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E፣ MMM d y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"hh–hh a"}
+ }
+ Hm{
+ H{"hh:mm–hh:mm a"}
+ m{"hh:mm–hh:mm a"}
+ }
+ Hmv{
+ H{"hh:mm–hh:mm a v"}
+ m{"hh:mm–hh:mm a v"}
+ }
+ Hv{
+ H{"hh–hh a v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E፣ d/M – E፣ d/M"}
+ d{"E d/M – E d/M"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E፣ MMM d – E፣ MMM d"}
+ d{"E d – E d፣ MMM"}
+ }
+ MMMd{
+ M{"MMM d – MMM d"}
+ d{"MMM d–d"}
+ }
+ Md{
+ M{"d/M – d/M"}
+ d{"d–d/M"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h – h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm – h:mm a"}
+ m{"h:mm – h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm – h:mm a v"}
+ m{"h:mm – h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h – h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
+ }
+ yMEd{
+ M{"E d/M/ – E d/M፣ y"}
+ d{"E፣ d/M/y – E፣ d/M/y"}
+ y{"E፣ d/M/y – E፣ d/M/y"}
+ }
+ yMMM{
+ M{"MMM–MMM፣ y"}
+ y{"MMM y – MMM y"}
+ }
+ yMMMEd{
+ M{"E MMM d – E MMM d፣ y"}
+ d{"E MMM d – E MMM d፣ y"}
+ y{"E፣ MMM d፣ y – E፣ MMM d፣ y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"MMM d – MMM d፣ y"}
+ d{"MMM d–d፣ y"}
+ y{"MMM d፣ y – MMM d፣ y"}
+ }
+ yMd{
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"ጥዋት",
@@ -257,7 +398,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -381,63 +522,6 @@
"ዓመተ ምሕረት",
}
}
- fields{
- day{
- dn{"ቀን"}
- relative{
- "-1"{"ትናንት"}
- "-2"{"ከትናንት ወዲያ"}
- "0"{"ዛሬ"}
- "1"{"ነገ"}
- "2"{"ከነገ ወዲያ"}
- }
- }
- dayperiod{
- dn{"ጥዋት/ከሰዓት"}
- }
- era{
- dn{"ዘመን"}
- }
- hour{
- dn{"ሰዓት"}
- }
- minute{
- dn{"ደቂቃ"}
- }
- month{
- dn{"ወር"}
- relative{
- "-1"{"ያለፈው ወር"}
- "0"{"በዚህ ወር"}
- "1"{"የሚቀጥለው ወር"}
- }
- }
- second{
- dn{"ሰከንድ"}
- }
- week{
- dn{"ሳምንት"}
- relative{
- "-1"{"ባለፈው ሳምንት"}
- "0"{"በዚህ ሣምንት"}
- "1"{"የሚቀጥለው ሳምንት"}
- }
- }
- weekday{
- dn{"አዘቦት"}
- }
- year{
- dn{"ዓመት"}
- relative{
- "-1"{"ያለፈው ዓመት"}
- "0"{"በዚህ ዓመት"}
- "1"{"የሚቀጥለው ዓመት"}
- }
- }
- zone{
- dn{"የሰዓት ሰቅ"}
- }
- }
intervalFormats{
H{
H{"hh–hh a"}
@@ -501,13 +585,13 @@
y{"y–y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E d/M/ – E d/M፣ yy"}
- d{"E፣ d/M/yy – E፣ d/M/yy"}
- y{"E፣ d/M/yy – E፣ d/M/yy"}
+ M{"E d/M/ – E d/M፣ y"}
+ d{"E፣ d/M/y – E፣ d/M/y"}
+ y{"E፣ d/M/y – E፣ d/M/y"}
}
yMMM{
M{"MMM–MMM፣ y"}
@@ -528,9 +612,9 @@
y{"MMM d፣ y – MMM d፣ y"}
}
yMd{
- M{"d/M/yy – d/M/yy"}
- d{"d/M/yy – d/M/yy"}
- y{"d/M/yy – d/M/yy"}
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
}
}
monthNames{
@@ -673,6 +757,63 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"ቀን"}
+ relative{
+ "-1"{"ትናንት"}
+ "-2"{"ከትናንት ወዲያ"}
+ "0"{"ዛሬ"}
+ "1"{"ነገ"}
+ "2"{"ከነገ ወዲያ"}
+ }
+ }
+ dayperiod{
+ dn{"ጥዋት/ከሰዓት"}
+ }
+ era{
+ dn{"ዘመን"}
+ }
+ hour{
+ dn{"ሰዓት"}
+ }
+ minute{
+ dn{"ደቂቃ"}
+ }
+ month{
+ dn{"ወር"}
+ relative{
+ "-1"{"ያለፈው ወር"}
+ "0"{"በዚህ ወር"}
+ "1"{"የሚቀጥለው ወር"}
+ }
+ }
+ second{
+ dn{"ሰከንድ"}
+ }
+ week{
+ dn{"ሳምንት"}
+ relative{
+ "-1"{"ባለፈው ሳምንት"}
+ "0"{"በዚህ ሣምንት"}
+ "1"{"የሚቀጥለው ሳምንት"}
+ }
+ }
+ weekday{
+ dn{"አዘቦት"}
+ }
+ year{
+ dn{"ዓመት"}
+ relative{
+ "-1"{"ያለፈው ዓመት"}
+ "0"{"በዚህ ዓመት"}
+ "1"{"የሚቀጥለው ዓመት"}
+ }
+ }
+ zone{
+ dn{"የሰዓት ሰቅ"}
+ }
+ }
listPattern{
standard{
2{"{0} እና {1}"}
diff --git a/data/locales/am_ET.txt b/data/locales/am_ET.txt
index b677d99..889e92a 100644
--- a/data/locales/am_ET.txt
+++ b/data/locales/am_ET.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/am_ET.xml
// *
// ***************************************************************************
am_ET{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ar.txt b/data/locales/ar.txt
index 406db0f..1533cd7 100644
--- a/data/locales/ar.txt
+++ b/data/locales/ar.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar.xml
// *
@@ -263,48 +263,9 @@
}
native{"arab"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
- DateTimePatterns{
- "h:mm:ss a zzzz",
- "h:mm:ss a z",
- "h:mm:ss a",
- "h:mm a",
- "EEEE، d MMMM، y G",
- "d MMMM، y G",
- "dd/MM/y G",
- "d/M/y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E، d"}
- Hm{"HH:mm"}
- M{"L"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMEd{"E d MMMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d"}
- ms{"mm:ss"}
- y{"y G"}
- yM{"M/y G"}
- yMEd{"E، d/M/y G"}
- yMMM{"MMM y G"}
- yMMMEd{"E، d MMM، y G"}
- yMMMM{"MMMM y G"}
- yMMMd{"d MMM، y G"}
- yMd{"d/M/y G"}
- yyyyMM{"MM/y G"}
- yyyyMMMM{"MMMM، y G"}
- }
eras{
abbreviated{
"التقويم البوذي",
@@ -385,6 +346,153 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE، d MMMM، y G",
+ "d MMMM، y G",
+ "dd/MM/y G",
+ "d/M/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E، d"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E، d MMM، y G"}
+ GyMMMd{"d MMM، y G"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E، d/M"}
+ MMM{"LLL"}
+ MMMEd{"E، d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y G"}
+ yyyy{"y G"}
+ yyyyM{"M/y G"}
+ yyyyMEd{"E، d/M/y G"}
+ yyyyMMM{"MMM y G"}
+ yyyyMMMEd{"E، d MMM، y G"}
+ yyyyMMMM{"MMMM y G"}
+ yyyyMMMd{"d MMM، y G"}
+ yyyyMd{"d/M/y G"}
+ yyyyQQQ{"QQQ y G"}
+ yyyyQQQQ{"QQQQ y G"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E، d/M – E، d/M"}
+ d{"E، d/M – E، d/M"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E، d MMM – E، d MMM"}
+ d{"E، d – E، d MMM"}
+ }
+ MMMM{
+ M{"LLLL–LLLL"}
+ }
+ MMMd{
+ M{"d MMM – d MMM"}
+ d{"MMM d–d"}
+ }
+ Md{
+ M{"M/d – M/d"}
+ d{"M/d – M/d"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y G"}
+ }
+ yM{
+ M{"M/y – M/y G"}
+ y{"M/y – M/y G"}
+ }
+ yMEd{
+ M{"E، d/M/y – E، d/M/y G"}
+ d{"E، dd/MM/y – E، dd/MM/y G"}
+ y{"E، d/M/y – E، d/M/y G"}
+ }
+ yMMM{
+ M{"MMM – MMM، y G"}
+ y{"MMM، y – MMM، y G"}
+ }
+ yMMMEd{
+ M{"E، d MMM – E، d MMM، y G"}
+ d{"E، d – E، d MMM، y G"}
+ y{"E، d MMM، y – E، d MMM، y G"}
+ }
+ yMMMM{
+ M{"MMMM – MMMM، y G"}
+ y{"MMMM، y – MMMM، y G"}
+ }
+ yMMMd{
+ M{"d MMM – d MMM، y G"}
+ d{"d–d MMM، y G"}
+ y{"d MMM، y – d MMM، y G"}
+ }
+ yMd{
+ M{"d/M/y – d/M/y G"}
+ d{"d/M/y – d/M/y G"}
+ y{"d/M/y – d/M/y G"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"ص",
@@ -397,8 +505,8 @@
"h:mm a",
"EEEE، d MMMM، y",
"d MMMM، y",
- "dd/MM/yyyy",
- "d/M/yyyy",
+ "dd/MM/y",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -407,6 +515,10 @@
}
availableFormats{
Ed{"E، d"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E، d MMM، y G"}
+ GyMMMd{"d MMM، y G"}
H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -425,17 +537,16 @@
hms{"h:mm:ss a"}
ms{"mm:ss"}
y{"y"}
- yM{"M/yyyy"}
- yMEd{"E، d/M/yyyy"}
+ yM{"M/y"}
+ yMEd{"E، d/M/y"}
+ yMM{"MM/y"}
yMMM{"MMM y"}
yMMMEd{"E، d MMM، y"}
yMMMM{"MMMM y"}
yMMMd{"d MMM، y"}
- yMd{"d/M/yyyy"}
+ yMd{"d/M/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyyyMM{"MM/yyyy"}
- yyyyMMMM{"MMMM، y"}
}
dayNames{
format{
@@ -516,63 +627,6 @@
"ميلادي",
}
}
- fields{
- day{
- dn{"يوم"}
- relative{
- "-1"{"أمس"}
- "-2"{"أول أمس"}
- "0"{"اليوم"}
- "1"{"غدًا"}
- "2"{"بعد الغد"}
- }
- }
- dayperiod{
- dn{"ص/م"}
- }
- era{
- dn{"العصر"}
- }
- hour{
- dn{"الساعات"}
- }
- minute{
- dn{"الدقائق"}
- }
- month{
- dn{"الشهر"}
- relative{
- "-1"{"الشهر الماضي"}
- "0"{"هذا الشهر"}
- "1"{"الشهر التالي"}
- }
- }
- second{
- dn{"الثواني"}
- }
- week{
- dn{"الأسبوع"}
- relative{
- "-1"{"الأسبوع الماضي"}
- "0"{"هذا الأسبوع"}
- "1"{"الأسبوع التالي"}
- }
- }
- weekday{
- dn{"اليوم"}
- }
- year{
- dn{"السنة"}
- relative{
- "-1"{"السنة الماضية"}
- "0"{"هذه السنة"}
- "1"{"السنة التالية"}
- }
- }
- zone{
- dn{"التوقيت"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -639,13 +693,13 @@
y{"y–y"}
}
yM{
- M{"M/yyyy – M/yyyy"}
- y{"M/yyyy – M/yyyy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E، d/M/yyyy – E، d/M/yyyy"}
- d{"E، dd/MM/yyyy – E، dd/MM/yyyy"}
- y{"E، d/M/yyyy – E، d/M/yyyy"}
+ M{"E، d/M/y – E، d/M/y"}
+ d{"E، dd/MM/y – E، dd/MM/y"}
+ y{"E، d/M/y – E، d/M/y"}
}
yMMM{
M{"MMM – MMM، y"}
@@ -653,7 +707,7 @@
}
yMMMEd{
M{"E، d MMM – E، d MMM، y"}
- d{"E، d – E، d MMM، yyyy"}
+ d{"E، d – E، d MMM، y"}
y{"E، d MMM، y – E، d MMM، y"}
}
yMMMM{
@@ -661,14 +715,14 @@
y{"MMMM، y – MMMM، y"}
}
yMMMd{
- M{"d MMM – d MMM، yyyy"}
+ M{"d MMM – d MMM، y"}
d{"d–d MMM، y"}
y{"d MMM، y – d MMM، y"}
}
yMd{
- M{"d/M/yyyy – d/M/yyyy"}
- d{"d/M/yyyy – d/M/yyyy"}
- y{"d/M/yyyy – d/M/yyyy"}
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
}
}
monthNames{
@@ -805,43 +859,16 @@
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
- "EEEE، d MMMM y",
- "d MMMM y",
+ "EEEE، d MMMM y G",
+ "d MMMM y G",
"d MMM، y G",
- "d/M/yyyy",
+ "d/M/y GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
- availableFormats{
- Ed{"d E"}
- H{"HH"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E، d/M"}
- MMM{"LLL"}
- MMMEd{"E، d MMM"}
- MMMMEd{"E، d MMMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- Md{"d/M"}
- d{"d"}
- h{"h a"}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- ms{"mm:ss"}
- y{"y"}
- yM{"M/yyyy"}
- yMEd{"E، d/M/yyyy"}
- yMMM{"MMM y"}
- yMMMEd{"E، d MMM y"}
- yMMMM{"MMMM y"}
- yQQQ{"QQQ y"}
- yQQQQ{"QQQQ y"}
- }
eras{
abbreviated{
"هـ",
@@ -939,46 +966,6 @@
}
}
japanese{
- DateTimePatterns{
- "h:mm:ss a zzzz",
- "h:mm:ss a z",
- "h:mm:ss a",
- "h:mm a",
- "EEEE، d MMMM، y G",
- "d MMMM، y G",
- "dd/MM/y G",
- "d/M/y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E، d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- M{"L"}
- MEd{"E، d/M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMEd{"E d MMMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d"}
- ms{"mm:ss"}
- y{"y G"}
- yyyy{"y G"}
- yyyyM{"M/y G"}
- yyyyMEd{"E، d/M/y G"}
- yyyyMM{"MM/y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E، d MMM، y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMd{"d/M/y G"}
- }
eras{
abbreviated{
"تيكا",
@@ -1246,47 +1233,6 @@
}
}
roc{
- DateTimePatterns{
- "h:mm:ss a zzzz",
- "h:mm:ss a z",
- "h:mm:ss a",
- "h:mm a",
- "EEEE، d MMMM، y G",
- "d MMMM، y G",
- "dd/MM/y G",
- "d/M/y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E، d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- M{"L"}
- MEd{"E، d/M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMEd{"E d MMMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d"}
- ms{"mm:ss"}
- y{"y G"}
- yyyy{"y G"}
- yyyyM{"M/y G"}
- yyyyMEd{"E، d/M/y G"}
- yyyyMM{"MM/y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E، d MMM، y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d MMM، y G"}
- yyyyMd{"d/M/y G"}
- }
eras{
abbreviated{
"Before R.O.C.",
@@ -1301,9 +1247,65 @@
quotationEnd{"“"}
quotationStart{"”"}
}
+ fields{
+ day{
+ dn{"يوم"}
+ relative{
+ "-1"{"أمس"}
+ "-2"{"أول أمس"}
+ "0"{"اليوم"}
+ "1"{"غدًا"}
+ "2"{"بعد الغد"}
+ }
+ }
+ dayperiod{
+ dn{"ص/م"}
+ }
+ era{
+ dn{"العصر"}
+ }
+ hour{
+ dn{"الساعات"}
+ }
+ minute{
+ dn{"الدقائق"}
+ }
+ month{
+ dn{"الشهر"}
+ relative{
+ "-1"{"الشهر الماضي"}
+ "0"{"هذا الشهر"}
+ "1"{"الشهر التالي"}
+ }
+ }
+ second{
+ dn{"الثواني"}
+ }
+ week{
+ dn{"الأسبوع"}
+ relative{
+ "-1"{"الأسبوع الماضي"}
+ "0"{"هذا الأسبوع"}
+ "1"{"الأسبوع التالي"}
+ }
+ }
+ weekday{
+ dn{"اليوم"}
+ }
+ year{
+ dn{"السنة"}
+ relative{
+ "-1"{"السنة الماضية"}
+ "0"{"هذه السنة"}
+ "1"{"السنة التالية"}
+ }
+ }
+ zone{
+ dn{"التوقيت"}
+ }
+ }
layout{
characters{"right-to-left"}
- lines{"top-to-bottom"}
}
listPattern{
standard{
diff --git a/data/locales/ar_001.txt b/data/locales/ar_001.txt
index d154f8f..1596ae1 100644
--- a/data/locales/ar_001.txt
+++ b/data/locales/ar_001.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_001.xml
// *
// ***************************************************************************
ar_001{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ar_AE.txt b/data/locales/ar_AE.txt
index 74cfa56..c5c4e84 100644
--- a/data/locales/ar_AE.txt
+++ b/data/locales/ar_AE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_AE.xml
// *
// ***************************************************************************
ar_AE{
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ar_BH.txt b/data/locales/ar_BH.txt
index 526e2e2..0d5adc4 100644
--- a/data/locales/ar_BH.txt
+++ b/data/locales/ar_BH.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_BH.xml
// *
// ***************************************************************************
ar_BH{
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ar_DJ.txt b/data/locales/ar_DJ.txt
index 5fe4ebe..9e9914f 100755
--- a/data/locales/ar_DJ.txt
+++ b/data/locales/ar_DJ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_DJ.xml
// *
// ***************************************************************************
ar_DJ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ar_DZ.txt b/data/locales/ar_DZ.txt
index 789a51d..8a8d52e 100644
--- a/data/locales/ar_DZ.txt
+++ b/data/locales/ar_DZ.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_DZ.xml
// *
@@ -16,18 +16,18 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
+ generic{
DateTimePatterns{
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
- "EEEE، d MMMM، y",
- "d MMMM، y",
- "yyyy/MM/dd",
- "yyyy/M/d",
+ "EEEE، d MMMM، y G",
+ "d MMMM، y G",
+ "G y/MM/dd",
+ "GGGGG y/M/d",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -37,8 +37,45 @@
availableFormats{
MMdd{"MM/dd"}
Md{"M/d"}
- yM{"yyyy/M"}
- yyyyMM{"yyyy/MM"}
+ yM{"y/M"}
+ yMM{"y/MM"}
+ }
+ intervalFormats{
+ M{
+ M{"M-M"}
+ }
+ MMMd{
+ d{"d-d MMM"}
+ }
+ d{
+ d{"d-d"}
+ }
+ y{
+ y{"y-y"}
+ }
+ }
+ }
+ gregorian{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE، d MMMM، y",
+ "d MMMM، y",
+ "y/MM/dd",
+ "y/M/d",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MMdd{"MM/dd"}
+ Md{"M/d"}
+ yM{"y/M"}
+ yMM{"y/MM"}
}
intervalFormats{
M{
diff --git a/data/locales/ar_EG.txt b/data/locales/ar_EG.txt
index 5923052..d5c8e9c 100644
--- a/data/locales/ar_EG.txt
+++ b/data/locales/ar_EG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_EG.xml
// *
// ***************************************************************************
ar_EG{
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ar_EH.txt b/data/locales/ar_EH.txt
index 0124431..d078b8c 100755
--- a/data/locales/ar_EH.txt
+++ b/data/locales/ar_EH.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_EH.xml
// *
@@ -10,5 +10,5 @@
NumberElements{
default{"latn"}
}
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ar_ER.txt b/data/locales/ar_ER.txt
index 3777b7f..61db14e 100755
--- a/data/locales/ar_ER.txt
+++ b/data/locales/ar_ER.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_ER.xml
// *
// ***************************************************************************
ar_ER{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ar_IL.txt b/data/locales/ar_IL.txt
index e0a71c1..c6ff9b9 100755
--- a/data/locales/ar_IL.txt
+++ b/data/locales/ar_IL.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_IL.xml
// *
// ***************************************************************************
ar_IL{
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ar_IQ.txt b/data/locales/ar_IQ.txt
index e9877e6..7479b4a 100644
--- a/data/locales/ar_IQ.txt
+++ b/data/locales/ar_IQ.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_IQ.xml
// *
// ***************************************************************************
ar_IQ{
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
calendar{
gregorian{
monthNames{
diff --git a/data/locales/ar_JO.txt b/data/locales/ar_JO.txt
index d9dec90..20dce39 100644
--- a/data/locales/ar_JO.txt
+++ b/data/locales/ar_JO.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_JO.xml
// *
// ***************************************************************************
ar_JO{
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
calendar{
gregorian{
monthNames{
diff --git a/data/locales/ar_KM.txt b/data/locales/ar_KM.txt
index 576a372..59f3037 100755
--- a/data/locales/ar_KM.txt
+++ b/data/locales/ar_KM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_KM.xml
// *
// ***************************************************************************
ar_KM{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ar_KW.txt b/data/locales/ar_KW.txt
index 14b1a2f..7251eb2 100644
--- a/data/locales/ar_KW.txt
+++ b/data/locales/ar_KW.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_KW.xml
// *
// ***************************************************************************
ar_KW{
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ar_LB.txt b/data/locales/ar_LB.txt
index 26d9f03..fe77d66 100644
--- a/data/locales/ar_LB.txt
+++ b/data/locales/ar_LB.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_LB.xml
// *
@@ -15,7 +15,7 @@
}
}
}
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
calendar{
gregorian{
monthNames{
diff --git a/data/locales/ar_LY.txt b/data/locales/ar_LY.txt
index 5c6ed75..4f91568 100644
--- a/data/locales/ar_LY.txt
+++ b/data/locales/ar_LY.txt
@@ -1,13 +1,14 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_LY.xml
// *
// ***************************************************************************
ar_LY{
NumberElements{
+ default{"latn"}
latn{
symbols{
decimal{","}
@@ -15,5 +16,5 @@
}
}
}
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ar_MA.txt b/data/locales/ar_MA.txt
index 2285805..adfbfe2 100644
--- a/data/locales/ar_MA.txt
+++ b/data/locales/ar_MA.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_MA.xml
// *
@@ -16,18 +16,18 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
+ generic{
DateTimePatterns{
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
- "EEEE، d MMMM، y",
- "d MMMM، y",
- "yyyy/MM/dd",
- "yyyy/M/d",
+ "EEEE، d MMMM، y G",
+ "d MMMM، y G",
+ "G y/MM/dd",
+ "GGGGG y/M/d",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -37,8 +37,8 @@
availableFormats{
MMdd{"MM/dd"}
Md{"M/d"}
- yM{"yyyy/M"}
- yyyyMM{"yyyy/MM"}
+ yM{"y/M"}
+ yMM{"y/MM"}
}
intervalFormats{
MMMd{
@@ -51,7 +51,47 @@
y{"y-y"}
}
yMMMM{
- M{"MM - MM –yyyy"}
+ M{"MM - MM –y"}
+ }
+ yMMMd{
+ d{"d–d MMM، y"}
+ }
+ }
+ }
+ gregorian{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE، d MMMM، y",
+ "d MMMM، y",
+ "y/MM/dd",
+ "y/M/d",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MMdd{"MM/dd"}
+ Md{"M/d"}
+ yM{"y/M"}
+ yMM{"y/MM"}
+ }
+ intervalFormats{
+ MMMd{
+ d{"d-d MMM"}
+ }
+ d{
+ d{"d-d"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yMMMM{
+ M{"MM - MM –y"}
}
yMMMd{
d{"d–d MMM، y"}
diff --git a/data/locales/ar_MR.txt b/data/locales/ar_MR.txt
index 340ca67..f588891 100755
--- a/data/locales/ar_MR.txt
+++ b/data/locales/ar_MR.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_MR.xml
// *
@@ -15,5 +15,5 @@
}
}
}
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ar_OM.txt b/data/locales/ar_OM.txt
index a441f9c..fed7cb8 100644
--- a/data/locales/ar_OM.txt
+++ b/data/locales/ar_OM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_OM.xml
// *
// ***************************************************************************
ar_OM{
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ar_PS.txt b/data/locales/ar_PS.txt
index 993d59f..c781fb0 100755
--- a/data/locales/ar_PS.txt
+++ b/data/locales/ar_PS.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_PS.xml
// *
@@ -35,5 +35,5 @@
}
}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ar_QA.txt b/data/locales/ar_QA.txt
index 2adaab8..f391c0f 100644
--- a/data/locales/ar_QA.txt
+++ b/data/locales/ar_QA.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_QA.xml
// *
@@ -11,9 +11,8 @@
latn{
patterns{
currencyFormat{"¤#0.00"}
- decimalFormat{"#0.###;#0.###-"}
}
}
}
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ar_SA.txt b/data/locales/ar_SA.txt
index 5902d92..8a253fe 100644
--- a/data/locales/ar_SA.txt
+++ b/data/locales/ar_SA.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_SA.xml
// *
@@ -11,9 +11,8 @@
latn{
patterns{
currencyFormat{"¤#0.00"}
- decimalFormat{"#0.###;#0.###-"}
}
}
}
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ar_SD.txt b/data/locales/ar_SD.txt
index ae37cfb..8ec8647 100644
--- a/data/locales/ar_SD.txt
+++ b/data/locales/ar_SD.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_SD.xml
// *
// ***************************************************************************
ar_SD{
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ar_SO.txt b/data/locales/ar_SO.txt
index 3f86d08..eecdc40 100755
--- a/data/locales/ar_SO.txt
+++ b/data/locales/ar_SO.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_SO.xml
// *
// ***************************************************************************
ar_SO{
- Version{"2.0.74.89"}
+ Version{"2.0.82.68"}
}
diff --git a/data/locales/ar_SY.txt b/data/locales/ar_SY.txt
index 166a34a..d26a6de 100644
--- a/data/locales/ar_SY.txt
+++ b/data/locales/ar_SY.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_SY.xml
// *
@@ -11,11 +11,10 @@
latn{
patterns{
currencyFormat{"¤#0.00"}
- decimalFormat{"#0.###;#0.###-"}
}
}
}
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
calendar{
gregorian{
monthNames{
diff --git a/data/locales/ar_TD.txt b/data/locales/ar_TD.txt
index 9c7b274..3f67c51 100755
--- a/data/locales/ar_TD.txt
+++ b/data/locales/ar_TD.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_TD.xml
// *
// ***************************************************************************
ar_TD{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ar_TN.txt b/data/locales/ar_TN.txt
index 5561154..2db169e 100644
--- a/data/locales/ar_TN.txt
+++ b/data/locales/ar_TN.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_TN.xml
// *
@@ -12,7 +12,6 @@
latn{
patterns{
currencyFormat{"¤#0.00"}
- decimalFormat{"#0.###;#0.###-"}
}
symbols{
decimal{","}
@@ -20,18 +19,18 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
+ generic{
DateTimePatterns{
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
- "EEEE، d MMMM، y",
- "d MMMM، y",
- "yyyy/MM/dd",
- "yyyy/M/d",
+ "EEEE، d MMMM، y G",
+ "d MMMM، y G",
+ "G y/MM/dd",
+ "GGGGG y/M/d",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -41,8 +40,48 @@
availableFormats{
MMdd{"MM/dd"}
Md{"M/d"}
- yM{"yyyy/M"}
- yyyyMM{"yyyy/MM"}
+ yM{"y/M"}
+ yMM{"y/MM"}
+ }
+ intervalFormats{
+ M{
+ M{"M-M"}
+ }
+ MMMd{
+ d{"d-d MMM"}
+ }
+ d{
+ d{"d-d"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yMMMd{
+ d{"d-d MMM، y"}
+ }
+ }
+ }
+ gregorian{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE، d MMMM، y",
+ "d MMMM، y",
+ "y/MM/dd",
+ "y/M/d",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MMdd{"MM/dd"}
+ Md{"M/d"}
+ yM{"y/M"}
+ yMM{"y/MM"}
}
intervalFormats{
M{
diff --git a/data/locales/ar_YE.txt b/data/locales/ar_YE.txt
index 1ef70e2..aec9e5e 100644
--- a/data/locales/ar_YE.txt
+++ b/data/locales/ar_YE.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar_YE.xml
// *
@@ -11,9 +11,8 @@
latn{
patterns{
currencyFormat{"¤#0.00"}
- decimalFormat{"#0.###;#0.###-"}
}
}
}
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/as.txt b/data/locales/as.txt
index 78a5613..264f585 100644
--- a/data/locales/as.txt
+++ b/data/locales/as.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/as.xml
// *
@@ -12,9 +12,9 @@
as{
AuxExemplarCharacters{"[\u200C\u200D ৲]"}
ExemplarCharacters{
- "[অ আ ই ঈ উ ঊ ঋ এ ঐ ও ঔ ং \u0981 ঃ ক খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড {ড\u09BC}ড় ঢ {ঢ"
- "\u09BC}ঢ় ণ ত থ দ ধ ন প ফ ব ভ ম য {য\u09BC} ৰ ল ৱ শ ষ স হ া ি ী \u09C1 \u09C2"
- " \u09C3 ে ৈ ো ৌ \u09CD]"
+ "[অ আ ই ঈ উ ঊ ঋ এ ঐ ও ঔ ং \u0981 ঃ ক {ক\u09CDষ} খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড {ড"
+ "\u09BC}ড় ঢ {ঢ\u09BC}ঢ় ণ ত থ দ ধ ন প ফ ব ভ ম য {য\u09BC} ৰ ল ৱ শ ষ স হ া ি ী "
+ "\u09C1 \u09C2 \u09C3 ে ৈ ো ৌ \u09CD]"
}
LocaleScript{
"Beng",
@@ -30,7 +30,7 @@
}
native{"beng"}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
calendar{
gregorian{
AmPmMarkers{
@@ -59,40 +59,6 @@
}
}
}
- fields{
- day{
- dn{"দিন"}
- relative{
- "-1"{"কালি"}
- "1"{"কাইলৈ"}
- "2"{"পৰহিলৈ"}
- }
- }
- era{
- dn{"যুগ"}
- }
- hour{
- dn{"ঘণ্টা"}
- }
- minute{
- dn{"মিনিট"}
- }
- month{
- dn{"মাহ"}
- }
- second{
- dn{"ছেকেণ্ড"}
- }
- week{
- dn{"সপ্তাহ"}
- }
- year{
- dn{"বছৰ"}
- }
- zone{
- dn{"ক্ষেত্ৰ"}
- }
- }
monthNames{
format{
abbreviated{
@@ -137,6 +103,40 @@
}
}
}
+ fields{
+ day{
+ dn{"দিন"}
+ relative{
+ "-1"{"কালি"}
+ "1"{"কাইলৈ"}
+ "2"{"পৰহিলৈ"}
+ }
+ }
+ era{
+ dn{"যুগ"}
+ }
+ hour{
+ dn{"ঘণ্টা"}
+ }
+ minute{
+ dn{"মিনিট"}
+ }
+ month{
+ dn{"মাহ"}
+ }
+ second{
+ dn{"ছেকেণ্ড"}
+ }
+ week{
+ dn{"সপ্তাহ"}
+ }
+ year{
+ dn{"বছৰ"}
+ }
+ zone{
+ dn{"ক্ষেত্ৰ"}
+ }
+ }
measurementSystemNames{
US{"ইউ.এছ."}
metric{"মেট্ৰিক"}
diff --git a/data/locales/as_IN.txt b/data/locales/as_IN.txt
index b176f6c..1114bde 100644
--- a/data/locales/as_IN.txt
+++ b/data/locales/as_IN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/as_IN.xml
// *
// ***************************************************************************
as_IN{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/asa.txt b/data/locales/asa.txt
index e52466d..706a2e4 100755
--- a/data/locales/asa.txt
+++ b/data/locales/asa.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/asa.xml
// *
@@ -23,8 +23,50 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"icheheavo",
@@ -38,7 +80,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -113,46 +155,6 @@
"Baada yakwe Yethu",
}
}
- fields{
- day{
- dn{"Thiku"}
- relative{
- "-1"{"Ighuo"}
- "0"{"Iyoo"}
- "1"{"Yavo"}
- }
- }
- dayperiod{
- dn{"Marango athiku"}
- }
- era{
- dn{"Edhi"}
- }
- hour{
- dn{"Thaa"}
- }
- minute{
- dn{"Dakika"}
- }
- month{
- dn{"Mweji"}
- }
- second{
- dn{"Thekunde"}
- }
- week{
- dn{"Ndisha"}
- }
- weekday{
- dn{"Thiku ya ndisha"}
- }
- year{
- dn{"Mwaka"}
- }
- zone{
- dn{"Majira Athaa"}
- }
- }
monthNames{
format{
abbreviated{
@@ -225,4 +227,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Thiku"}
+ relative{
+ "-1"{"Ighuo"}
+ "0"{"Iyoo"}
+ "1"{"Yavo"}
+ }
+ }
+ dayperiod{
+ dn{"Marango athiku"}
+ }
+ era{
+ dn{"Edhi"}
+ }
+ hour{
+ dn{"Thaa"}
+ }
+ minute{
+ dn{"Dakika"}
+ }
+ month{
+ dn{"Mweji"}
+ }
+ second{
+ dn{"Thekunde"}
+ }
+ week{
+ dn{"Ndisha"}
+ }
+ weekday{
+ dn{"Thiku ya ndisha"}
+ }
+ year{
+ dn{"Mwaka"}
+ }
+ zone{
+ dn{"Majira Athaa"}
+ }
+ }
}
diff --git a/data/locales/asa_TZ.txt b/data/locales/asa_TZ.txt
index 955f30f..4f3c30f 100755
--- a/data/locales/asa_TZ.txt
+++ b/data/locales/asa_TZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/asa_TZ.xml
// *
// ***************************************************************************
asa_TZ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/az.txt b/data/locales/az.txt
index 175bb71..443856d 100644
--- a/data/locales/az.txt
+++ b/data/locales/az.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/az.xml
// *
@@ -11,7 +11,7 @@
*/
az{
AuxExemplarCharacters{"[w]"}
- ExemplarCharacters{"[a b c ç d e ə f g ğ h x ı i {i\u0307} j k q l m n o ö p r s ş t u ü v y z]"}
+ ExemplarCharacters{"[a b c ç d e ə f g ğ h x ı i İ j k q l m n o ö p r s ş t u ü v y z]"}
ExemplarCharactersIndex{"[A B C Ç D E Ə F G Ğ H X I İ J K Q L M N O Ö P R S Ş T U Ü V W Y Z]"}
LocaleScript{
"Latn",
@@ -35,8 +35,33 @@
}
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d, MMMM, y G",
+ "d MMMM , y G",
+ "d MMM, y G",
+ "GGGGG y-MM-dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MMM{"LLL"}
+ MMMEd{"E, d, MMM"}
+ MMMd{"d MMM"}
+ yMMM{"MMM, y"}
+ yMMMEd{"E, d, MMM, y"}
+ yMMMd{"d MMM, y"}
+ }
+ }
gregorian{
DateTimePatterns{
"HH:mm:ss zzzz",
@@ -46,7 +71,7 @@
"EEEE, d, MMMM, y",
"d MMMM , y",
"d MMM, y",
- "yyyy-MM-dd",
+ "y-MM-dd",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -104,43 +129,6 @@
"bizim eramızın",
}
}
- fields{
- day{
- dn{"bu gün"}
- relative{
- "-1"{"dünən"}
- "0"{"bu gün"}
- "1"{"sabah"}
- }
- }
- era{
- dn{"era"}
- }
- hour{
- dn{"saat"}
- }
- minute{
- dn{"dəqiqə"}
- }
- month{
- dn{"ay"}
- }
- second{
- dn{"saniyə"}
- }
- week{
- dn{"həftə"}
- }
- weekday{
- dn{"həftə günü"}
- }
- year{
- dn{"il"}
- }
- zone{
- dn{"zona"}
- }
- }
monthNames{
format{
abbreviated{
@@ -197,6 +185,43 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"bu gün"}
+ relative{
+ "-1"{"dünən"}
+ "0"{"bu gün"}
+ "1"{"sabah"}
+ }
+ }
+ era{
+ dn{"era"}
+ }
+ hour{
+ dn{"saat"}
+ }
+ minute{
+ dn{"dəqiqə"}
+ }
+ month{
+ dn{"ay"}
+ }
+ second{
+ dn{"saniyə"}
+ }
+ week{
+ dn{"həftə"}
+ }
+ weekday{
+ dn{"həftə günü"}
+ }
+ year{
+ dn{"il"}
+ }
+ zone{
+ dn{"zona"}
+ }
+ }
measurementSystemNames{
US{"ABŞ"}
metric{"metr"}
diff --git a/data/locales/az_AZ.txt b/data/locales/az_AZ.txt
index 881b97c..f76eaaa 100644
--- a/data/locales/az_AZ.txt
+++ b/data/locales/az_AZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/az_Cyrl.txt b/data/locales/az_Cyrl.txt
index bcffcd7..a0faa17 100644
--- a/data/locales/az_Cyrl.txt
+++ b/data/locales/az_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/az_Cyrl.xml
// *
@@ -35,8 +35,33 @@
}
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d, MMMM, y G",
+ "d MMMM , y G",
+ "d MMM, y G",
+ "GGGGG y-MM-dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MMM{"LLL"}
+ MMMEd{"E, d, MMM"}
+ MMMd{"d MMM"}
+ yMMM{"MMM, y"}
+ yMMMEd{"E, d, MMM, y"}
+ yMMMd{"d MMM, y"}
+ }
+ }
gregorian{
DateTimePatterns{
"HH:mm:ss zzzz",
@@ -46,7 +71,7 @@
"EEEE, d, MMMM, y",
"d MMMM , y",
"d MMM, y",
- "yyyy-MM-dd",
+ "y-MM-dd",
"{1} {0}",
"{1} {0}",
"{1} {0}",
diff --git a/data/locales/az_Cyrl_AZ.txt b/data/locales/az_Cyrl_AZ.txt
index cb5db8b..de6b84d 100644
--- a/data/locales/az_Cyrl_AZ.txt
+++ b/data/locales/az_Cyrl_AZ.txt
@@ -1,11 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/az_Cyrl_AZ.xml
// *
// ***************************************************************************
az_Cyrl_AZ{
- Version{"2.0.73.97"}
+ %%Parent{"az_Cyrl"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/az_Latn.txt b/data/locales/az_Latn.txt
index a17ae64..18be434 100644
--- a/data/locales/az_Latn.txt
+++ b/data/locales/az_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/az_Latn.xml
// *
@@ -13,5 +13,5 @@
LocaleScript{
"Latn",
}
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/az_Latn_AZ.txt b/data/locales/az_Latn_AZ.txt
index a1fea90..2907c93 100644
--- a/data/locales/az_Latn_AZ.txt
+++ b/data/locales/az_Latn_AZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/az_Latn_AZ.xml
// *
// ***************************************************************************
az_Latn_AZ{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/bas.txt b/data/locales/bas.txt
index 0d34d0b..082a228 100755
--- a/data/locales/bas.txt
+++ b/data/locales/bas.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bas.xml
// *
@@ -35,8 +35,49 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM, y G",
+ "d/M/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"I bikɛ̂glà",
@@ -50,7 +91,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM, y",
- "d/M/yyyy",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -124,46 +165,6 @@
"i mbūs Yesù Krǐstò",
}
}
- fields{
- day{
- dn{"kɛl"}
- relative{
- "-1"{"yààni"}
- "0"{"lɛ̀n"}
- "1"{"yàni"}
- }
- }
- dayperiod{
- dn{"njǎmùha"}
- }
- era{
- dn{"kèk"}
- }
- hour{
- dn{"ŋgɛŋ"}
- }
- minute{
- dn{"ŋget"}
- }
- month{
- dn{"soŋ"}
- }
- second{
- dn{"hìŋgeŋget"}
- }
- week{
- dn{"sɔndɛ̂"}
- }
- weekday{
- dn{"hìlɔ hi sɔndɛ̂"}
- }
- year{
- dn{"ŋwìi"}
- }
- zone{
- dn{"komboo i ŋgɛŋ"}
- }
- }
monthNames{
format{
abbreviated{
@@ -236,4 +237,44 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"kɛl"}
+ relative{
+ "-1"{"yààni"}
+ "0"{"lɛ̀n"}
+ "1"{"yàni"}
+ }
+ }
+ dayperiod{
+ dn{"njǎmùha"}
+ }
+ era{
+ dn{"kèk"}
+ }
+ hour{
+ dn{"ŋgɛŋ"}
+ }
+ minute{
+ dn{"ŋget"}
+ }
+ month{
+ dn{"soŋ"}
+ }
+ second{
+ dn{"hìŋgeŋget"}
+ }
+ week{
+ dn{"sɔndɛ̂"}
+ }
+ weekday{
+ dn{"hìlɔ hi sɔndɛ̂"}
+ }
+ year{
+ dn{"ŋwìi"}
+ }
+ zone{
+ dn{"komboo i ŋgɛŋ"}
+ }
+ }
}
diff --git a/data/locales/bas_CM.txt b/data/locales/bas_CM.txt
index fa07c8d..180fa31 100755
--- a/data/locales/bas_CM.txt
+++ b/data/locales/bas_CM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bas_CM.xml
// *
// ***************************************************************************
bas_CM{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/be.txt b/data/locales/be.txt
index f83848e..d1b1259 100644
--- a/data/locales/be.txt
+++ b/data/locales/be.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/be.xml
// *
@@ -30,7 +30,7 @@
}
}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.49"}
calendar{
buddhist{
DateTimePatterns{
@@ -63,12 +63,54 @@
hm{"h.mm a"}
hms{"h.mm.ss a"}
y{"G y"}
- yM{"M.yy"}
- yMEd{"E, d.M.yy"}
+ yM{"M.y"}
+ yMEd{"E, d.M.y"}
yMMM{"MMM y G"}
yMMMEd{"E, d MMM y G"}
yMMMd{"d MMM y G"}
- yMd{"d.M.yy"}
+ yMd{"d.M.y"}
+ }
+ }
+ generic{
+ DateTimePatterns{
+ "HH.mm.ss zzzz",
+ "HH.mm.ss z",
+ "HH.mm.ss",
+ "HH.mm",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d.M.y G",
+ "d.M.yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH.mm"}
+ Hms{"HH.mm.ss"}
+ M{"L"}
+ MEd{"E, d MMM"}
+ MMM{"LLL"}
+ MMMEd{"E, d MMM"}
+ MMMMEd{"MMMM d, EEEE"}
+ MMMMd{"MMMM d"}
+ MMMd{"d MMM"}
+ d{"d"}
+ hm{"h.mm a"}
+ hms{"h.mm.ss a"}
+ ms{"mm.ss"}
+ y{"y"}
+ yM{"MM/y"}
+ yMEd{"E, dd/MM/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, d MMM y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d.M.y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
}
}
gregorian{
@@ -83,7 +125,7 @@
"HH.mm",
"EEEE, d MMMM y",
"d MMMM y",
- "d.M.yyyy",
+ "d.M.y",
"d.M.yy",
"{1} {0}",
"{1} {0}",
@@ -106,16 +148,15 @@
hms{"h.mm.ss a"}
ms{"mm.ss"}
y{"y"}
- yM{"MM/yyyy"}
- yMEd{"E, dd/MM/yyyy"}
+ yM{"MM/y"}
+ yMEd{"E, dd/MM/y"}
yMMM{"MMM y"}
yMMMEd{"E, d MMM y"}
yMMMM{"MMMM y"}
yMMMd{"d MMM y"}
- yMd{"d.M.yy"}
+ yMd{"d.M.y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyyyM{"MM/yyyy"}
}
dayNames{
format{
@@ -156,48 +197,6 @@
"н.э.",
}
}
- fields{
- day{
- dn{"дзень"}
- relative{
- "-1"{"учора"}
- "-2"{"пазаўчора"}
- "0"{"сёння"}
- "1"{"заўтра"}
- "2"{"паслязаўтра"}
- }
- }
- dayperiod{
- dn{"ДП/ПП"}
- }
- era{
- dn{"эра"}
- }
- hour{
- dn{"гадзіна"}
- }
- minute{
- dn{"хвіліна"}
- }
- month{
- dn{"месяц"}
- }
- second{
- dn{"секунда"}
- }
- week{
- dn{"тыдзень"}
- }
- weekday{
- dn{"дзень тыдня"}
- }
- year{
- dn{"год"}
- }
- zone{
- dn{"Zone"}
- }
- }
monthNames{
format{
abbreviated{
@@ -312,6 +311,48 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"дзень"}
+ relative{
+ "-1"{"учора"}
+ "-2"{"пазаўчора"}
+ "0"{"сёння"}
+ "1"{"заўтра"}
+ "2"{"паслязаўтра"}
+ }
+ }
+ dayperiod{
+ dn{"ДП/ПП"}
+ }
+ era{
+ dn{"эра"}
+ }
+ hour{
+ dn{"гадзіна"}
+ }
+ minute{
+ dn{"хвіліна"}
+ }
+ month{
+ dn{"месяц"}
+ }
+ second{
+ dn{"секунда"}
+ }
+ week{
+ dn{"тыдзень"}
+ }
+ weekday{
+ dn{"дзень тыдня"}
+ }
+ year{
+ dn{"год"}
+ }
+ zone{
+ dn{"Zone"}
+ }
+ }
measurementSystemNames{
US{"ЗША"}
metric{"метрычная"}
diff --git a/data/locales/be_BY.txt b/data/locales/be_BY.txt
index 7af63f0..f3c328a 100644
--- a/data/locales/be_BY.txt
+++ b/data/locales/be_BY.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/be_BY.xml
// *
// ***************************************************************************
be_BY{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/bem.txt b/data/locales/bem.txt
index 60bd018..4dba4dd 100755
--- a/data/locales/bem.txt
+++ b/data/locales/bem.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bem.xml
// *
@@ -23,8 +23,50 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"uluchelo",
@@ -38,7 +80,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -93,38 +135,6 @@
"After Yesu",
}
}
- fields{
- day{
- dn{"Ubushiku"}
- relative{
- "0"{"Lelo"}
- }
- }
- dayperiod{
- dn{"Akasuba"}
- }
- era{
- dn{"Inkulo"}
- }
- hour{
- dn{"Insa"}
- }
- minute{
- dn{"Mineti"}
- }
- month{
- dn{"Umweshi"}
- }
- second{
- dn{"Sekondi"}
- }
- week{
- dn{"Umulungu"}
- }
- year{
- dn{"Umwaka"}
- }
- }
monthNames{
format{
abbreviated{
@@ -181,4 +191,36 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Ubushiku"}
+ relative{
+ "0"{"Lelo"}
+ }
+ }
+ dayperiod{
+ dn{"Akasuba"}
+ }
+ era{
+ dn{"Inkulo"}
+ }
+ hour{
+ dn{"Insa"}
+ }
+ minute{
+ dn{"Mineti"}
+ }
+ month{
+ dn{"Umweshi"}
+ }
+ second{
+ dn{"Sekondi"}
+ }
+ week{
+ dn{"Umulungu"}
+ }
+ year{
+ dn{"Umwaka"}
+ }
+ }
}
diff --git a/data/locales/bem_ZM.txt b/data/locales/bem_ZM.txt
index 276a8ad..06b408c 100755
--- a/data/locales/bem_ZM.txt
+++ b/data/locales/bem_ZM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bem_ZM.xml
// *
// ***************************************************************************
bem_ZM{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/bez.txt b/data/locales/bez.txt
index a8591ba..845e242 100755
--- a/data/locales/bez.txt
+++ b/data/locales/bez.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bez.xml
// *
@@ -23,8 +23,50 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"pamilau",
@@ -38,7 +80,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -113,46 +155,6 @@
"Baada ya Mtwaa",
}
}
- fields{
- day{
- dn{"Sihu"}
- relative{
- "-1"{"Igolo"}
- "0"{"Neng'u ni"}
- "1"{"Hilawu"}
- }
- }
- dayperiod{
- dn{"Lwamelau"}
- }
- era{
- dn{"Amajira"}
- }
- hour{
- dn{"Saa"}
- }
- minute{
- dn{"Dakika"}
- }
- month{
- dn{"Mwedzi"}
- }
- second{
- dn{"Sekunde"}
- }
- week{
- dn{"Mlungu gumamfu"}
- }
- weekday{
- dn{"Sihudza kasi"}
- }
- year{
- dn{"Mwaha"}
- }
- zone{
- dn{"Amajira ga saa"}
- }
- }
monthNames{
format{
abbreviated{
@@ -225,4 +227,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Sihu"}
+ relative{
+ "-1"{"Igolo"}
+ "0"{"Neng'u ni"}
+ "1"{"Hilawu"}
+ }
+ }
+ dayperiod{
+ dn{"Lwamelau"}
+ }
+ era{
+ dn{"Amajira"}
+ }
+ hour{
+ dn{"Saa"}
+ }
+ minute{
+ dn{"Dakika"}
+ }
+ month{
+ dn{"Mwedzi"}
+ }
+ second{
+ dn{"Sekunde"}
+ }
+ week{
+ dn{"Mlungu gumamfu"}
+ }
+ weekday{
+ dn{"Sihudza kasi"}
+ }
+ year{
+ dn{"Mwaha"}
+ }
+ zone{
+ dn{"Amajira ga saa"}
+ }
+ }
}
diff --git a/data/locales/bez_TZ.txt b/data/locales/bez_TZ.txt
index 537c575..b41f501 100755
--- a/data/locales/bez_TZ.txt
+++ b/data/locales/bez_TZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bez_TZ.xml
// *
// ***************************************************************************
bez_TZ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/bg.txt b/data/locales/bg.txt
index dcae157..ad5f580 100644
--- a/data/locales/bg.txt
+++ b/data/locales/bg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bg.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/bg.xml
*/
bg{
- AuxExemplarCharacters{"[{а\u0300} ѐ ё ѝ {о\u0300} {у\u0300} ъ ы ѣ э {ю\u0300} {я\u0300} ѫ]"}
+ AuxExemplarCharacters{"[{а\u0300} ѐ ё ѝ {о\u0300} {у\u0300} {ъ\u0300} ы ѣ э {ю\u0300} {я\u0300} ѫ]"}
ExemplarCharacters{"[а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ь ю я]"}
ExemplarCharactersIndex{"[А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ю Я]"}
LocaleScript{
@@ -142,8 +142,152 @@
}
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "dd MMMM y G, EEEE",
+ "dd MMMM y G",
+ "dd.MM.y G",
+ "dd.MM.yy GGGGG",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ }
+ availableFormats{
+ Ed{"E, d"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d.MM"}
+ MMM{"LLL"}
+ MMMEd{"d MMM, E"}
+ MMMMd{"d MMMM"}
+ MMMMdd{"dd MMMM"}
+ MMMd{"d MMM"}
+ MMdd{"dd.MM"}
+ Md{"d.M"}
+ d{"d"}
+ h{"h"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ mmss{"mm:ss"}
+ ms{"mm:ss"}
+ y{"y 'г'."}
+ yM{"M.y 'г'."}
+ yMEd{"E, d.MM.y 'г'."}
+ yMM{"MM.y"}
+ yMMM{"MMM y 'г'."}
+ yMMMEd{"E, d MMM y 'г'."}
+ yMMMM{"MMMM y"}
+ yMMMd{"dd MMM y"}
+ yMd{"dd.MM.y"}
+ yQQQ{"QQQ y 'г'."}
+ yQQQQ{"QQQQ y 'г'."}
+ }
+ intervalFormats{
+ H{
+ H{"HH-HH"}
+ }
+ Hm{
+ H{"HH:mm-HH:mm"}
+ m{"HH:mm-HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm-HH:mm v"}
+ m{"HH:mm-HH:mm v"}
+ }
+ Hv{
+ H{"HH-HH v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"dd.MM, E - dd.MM, E"}
+ d{"dd.MM, E - dd.MM, E"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"d MMM, E - d MMM, E"}
+ d{"d MMM, E - d MMM, E"}
+ }
+ MMMd{
+ M{"dd MMM - dd MMM"}
+ d{"dd-dd MMM"}
+ }
+ Md{
+ M{"dd.MM - dd.MM"}
+ d{"dd.MM - dd.MM"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"H – H"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"H:mm – H:mm"}
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ a{"H:mm – H:mm v"}
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"H – H v"}
+ h{"h-h a v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"MM.y - MM.y"}
+ y{"MM.y - MM.y"}
+ }
+ yMEd{
+ M{"dd.MM.y, E - dd.MM.y, E"}
+ d{"dd.MM.y, E - dd.MM.y, E"}
+ y{"dd.MM.y, E - dd.MM.y, E"}
+ }
+ yMMM{
+ M{"MMM-MMM y"}
+ y{"MMM y - MMM y"}
+ }
+ yMMMEd{
+ M{"d MMM y, E - d MMM y, E"}
+ d{"d MMM y, E - d MMM y, E"}
+ y{"d MMM y, E - d MMM y, E"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y 'г'."}
+ y{"MMMM y 'г'. – MMMM y 'г'."}
+ }
+ yMMMd{
+ M{"dd MMM - dd MMM y"}
+ d{"dd-dd MMM y"}
+ y{"dd MMM y - dd MMM y"}
+ }
+ yMd{
+ M{"dd.MM.y - dd.MM.y"}
+ d{"dd.MM.y - dd.MM.y"}
+ y{"dd.MM.y - dd.MM.y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"пр. об.",
@@ -156,7 +300,7 @@
"HH:mm",
"dd MMMM y, EEEE",
"dd MMMM y",
- "dd.MM.yyyy",
+ "dd.MM.y",
"dd.MM.yy",
"{1}, {0}",
"{1}, {0}",
@@ -187,18 +331,14 @@
y{"y 'г'."}
yM{"M.y 'г'."}
yMEd{"E, d.MM.y 'г'."}
+ yMM{"MM.y"}
yMMM{"MMM y 'г'."}
yMMMEd{"E, d MMM y 'г'."}
+ yMMMM{"MMMM y"}
yMMMd{"dd MMM y"}
- yMd{"dd.MM.yy"}
+ yMd{"dd.MM.y"}
yQQQ{"QQQ y 'г'."}
yQQQQ{"QQQQ y 'г'."}
- yyMM{"MM.yy"}
- yyQQQ{"QQQ yy"}
- yyyy{"y"}
- yyyyMM{"MM.yyyy"}
- yyyyMMMM{"MMMM y"}
- yyyyQQQQ{"QQQQ y 'г'."}
}
dayNames{
format{
@@ -265,63 +405,6 @@
"сл.Хр.",
}
}
- fields{
- day{
- dn{"Ден"}
- relative{
- "-1"{"Вчера"}
- "-2"{"Онзи ден"}
- "0"{"Днес"}
- "1"{"Утре"}
- "2"{"Вдругиден"}
- }
- }
- dayperiod{
- dn{"ден"}
- }
- era{
- dn{"ера"}
- }
- hour{
- dn{"час"}
- }
- minute{
- dn{"минута"}
- }
- month{
- dn{"месец"}
- relative{
- "-1"{"Миналия месец"}
- "0"{"Този месец"}
- "1"{"Следващия месец"}
- }
- }
- second{
- dn{"секунда"}
- }
- week{
- dn{"седмица"}
- relative{
- "-1"{"Миналата седмица"}
- "0"{"Тази седмица"}
- "1"{"Следващата седмица"}
- }
- }
- weekday{
- dn{"Ден от седмицата"}
- }
- year{
- dn{"година"}
- relative{
- "-1"{"Миналата година"}
- "0"{"Тази година"}
- "1"{"Следващата година"}
- }
- }
- zone{
- dn{"зона"}
- }
- }
intervalFormats{
H{
H{"HH-HH"}
@@ -385,13 +468,13 @@
y{"y-y"}
}
yM{
- M{"MM.yy - MM.yy"}
- y{"MM.yy - MM.yy"}
+ M{"MM.y - MM.y"}
+ y{"MM.y - MM.y"}
}
yMEd{
- M{"dd.MM.yy, E - dd.MM.yy, E"}
- d{"dd.MM.yy, E - dd.MM.yy, E"}
- y{"dd.MM.yy, E - dd.MM.yy, E"}
+ M{"dd.MM.y, E - dd.MM.y, E"}
+ d{"dd.MM.y, E - dd.MM.y, E"}
+ y{"dd.MM.y, E - dd.MM.y, E"}
}
yMMM{
M{"MMM-MMM y"}
@@ -412,9 +495,9 @@
y{"dd MMM y - dd MMM y"}
}
yMd{
- M{"dd.MM.yy - dd.MM.yy"}
- d{"dd.MM.yy - dd.MM.yy"}
- y{"dd.MM.yy - dd.MM.yy"}
+ M{"dd.MM.y - dd.MM.y"}
+ d{"dd.MM.y - dd.MM.y"}
+ y{"dd.MM.y - dd.MM.y"}
}
}
monthNames{
@@ -571,6 +654,63 @@
quotationEnd{"“"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"Ден"}
+ relative{
+ "-1"{"Вчера"}
+ "-2"{"Онзи ден"}
+ "0"{"Днес"}
+ "1"{"Утре"}
+ "2"{"Вдругиден"}
+ }
+ }
+ dayperiod{
+ dn{"ден"}
+ }
+ era{
+ dn{"ера"}
+ }
+ hour{
+ dn{"час"}
+ }
+ minute{
+ dn{"минута"}
+ }
+ month{
+ dn{"месец"}
+ relative{
+ "-1"{"Миналия месец"}
+ "0"{"Този месец"}
+ "1"{"Следващия месец"}
+ }
+ }
+ second{
+ dn{"секунда"}
+ }
+ week{
+ dn{"седмица"}
+ relative{
+ "-1"{"Миналата седмица"}
+ "0"{"Тази седмица"}
+ "1"{"Следващата седмица"}
+ }
+ }
+ weekday{
+ dn{"Ден от седмицата"}
+ }
+ year{
+ dn{"година"}
+ relative{
+ "-1"{"Миналата година"}
+ "0"{"Тази година"}
+ "1"{"Следващата година"}
+ }
+ }
+ zone{
+ dn{"зона"}
+ }
+ }
listPattern{
standard{
2{"{0} и {1}"}
diff --git a/data/locales/bg_BG.txt b/data/locales/bg_BG.txt
index 2d9997c..86fc228 100644
--- a/data/locales/bg_BG.txt
+++ b/data/locales/bg_BG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bg_BG.xml
// *
// ***************************************************************************
bg_BG{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/bm.txt b/data/locales/bm.txt
index 4a1562e..8ad7d40 100755
--- a/data/locales/bm.txt
+++ b/data/locales/bm.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bm.xml
// *
@@ -23,18 +23,18 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
+ generic{
DateTimePatterns{
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE d MMMM y",
- "d MMMM y",
- "d MMM, y",
- "d/M/yyyy",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM, y G",
+ "d/M/y GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -56,6 +56,7 @@
y{"y"}
yM{"M/y"}
yMEd{"E d/M/y"}
+ yMM{"MM/y"}
yMMM{"MMM y"}
yMMMEd{"E d MMM y"}
yMMMM{"MMMM y"}
@@ -63,11 +64,47 @@
yMd{"d/M/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"MM/y"}
- yyMMM{"MMM yy"}
- yyMMMEd{"E d MMM yy"}
- yyMMMd{"d MMM yy"}
- yyyyMMMM{"MMMM yyyy"}
+ }
+ }
+ gregorian{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y",
+ "d MMMM y",
+ "d MMM, y",
+ "d/M/y",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ M{"M"}
+ MMM{"MMM"}
+ MMMEd{"E d MMM"}
+ MMMMEd{"E d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMMdd{"dd MMM"}
+ MMd{"d/MM"}
+ MMdd{"dd/MM"}
+ Md{"d/M"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMM{"MM/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
}
dayNames{
format{
@@ -112,43 +149,6 @@
"jezu krisiti minkɛ",
}
}
- fields{
- day{
- dn{"don"}
- relative{
- "-1"{"kunu"}
- "0"{"bi"}
- "1"{"sini"}
- }
- }
- dayperiod{
- dn{"sɔgɔma/tile/wula/su"}
- }
- era{
- dn{"tile"}
- }
- hour{
- dn{"lɛrɛ"}
- }
- minute{
- dn{"miniti"}
- }
- month{
- dn{"kalo"}
- }
- second{
- dn{"sekondi"}
- }
- week{
- dn{"dɔgɔkun"}
- }
- year{
- dn{"san"}
- }
- zone{
- dn{"sigikun tilena"}
- }
- }
monthNames{
format{
abbreviated{
@@ -221,4 +221,41 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"don"}
+ relative{
+ "-1"{"kunu"}
+ "0"{"bi"}
+ "1"{"sini"}
+ }
+ }
+ dayperiod{
+ dn{"sɔgɔma/tile/wula/su"}
+ }
+ era{
+ dn{"tile"}
+ }
+ hour{
+ dn{"lɛrɛ"}
+ }
+ minute{
+ dn{"miniti"}
+ }
+ month{
+ dn{"kalo"}
+ }
+ second{
+ dn{"sekondi"}
+ }
+ week{
+ dn{"dɔgɔkun"}
+ }
+ year{
+ dn{"san"}
+ }
+ zone{
+ dn{"sigikun tilena"}
+ }
+ }
}
diff --git a/data/locales/bm_ML.txt b/data/locales/bm_ML.txt
index ad54e0c..49a5fa5 100755
--- a/data/locales/bm_ML.txt
+++ b/data/locales/bm_ML.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bm_ML.xml
// *
// ***************************************************************************
bm_ML{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/bn.txt b/data/locales/bn.txt
index 08835e8..fb50215 100644
--- a/data/locales/bn.txt
+++ b/data/locales/bn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bn.xml
// *
@@ -156,12 +156,155 @@
}
native{"beng"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.47"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM, y G",
+ "d MMMM, y G",
+ "d MMM, y G",
+ "d/M/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d-M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMMEd{"E d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMdd{"dd-MM"}
+ Md{"d/M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, d/M/y"}
+ yMM{"MM-y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, d MMM, y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM, y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E, d/M – E, d/M"}
+ d{"E, d/M – E, d/M"}
+ }
+ MMM{
+ M{"LLL-LLL"}
+ }
+ MMMEd{
+ M{"E, d MMM – E, d MMM"}
+ d{"E, d MMM – E, d MMM"}
+ }
+ MMMd{
+ M{"d MMM – d MMM"}
+ d{"d–d MMM"}
+ }
+ Md{
+ M{"d/M - d/M"}
+ d{"d/M - d/M"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
+ }
+ yMEd{
+ M{"E, d/M/y – E, d/M/y"}
+ d{"E, d/M/y – E, d/M/y"}
+ y{"E, d/M/y – E, d/M/y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y – MMM y"}
+ }
+ yMMMEd{
+ M{"E, d MMM – E, d MMM, y"}
+ d{"E, d MMM – E, d MMM, y"}
+ y{"E, d MMM, y – E, d MMM, y"}
+ }
+ yMMMM{
+ M{"MM – MM -y"}
+ y{"MM-y – MM-y"}
+ }
+ yMMMd{
+ M{"d MMM – d MMM, y"}
+ d{"d–d MMM, y"}
+ y{"d MMM, y – d MMM, y"}
+ }
+ yMd{
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
- "পূর্বাহ্ণ",
- "অপরাহ্ণ",
+ "am",
+ "pm",
}
DateTimePatterns{
"h:mm:ss a zzzz",
@@ -198,8 +341,9 @@
hms{"h:mm:ss a"}
ms{"mm:ss"}
y{"y"}
- yM{"M/yyyy"}
+ yM{"M/y"}
yMEd{"E, d/M/y"}
+ yMM{"MM-y"}
yMMM{"MMM y"}
yMMMEd{"E, d MMM, y"}
yMMMM{"MMMM y"}
@@ -207,9 +351,6 @@
yMd{"d/M/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyQQQ{"QQQ yy"}
- yyyyMM{"MM-yyyy"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -268,63 +409,6 @@
"খৃষ্টাব্দ",
}
}
- fields{
- day{
- dn{"দিন"}
- relative{
- "-1"{"গতকাল"}
- "-2"{"গত পরশু"}
- "0"{"আজ"}
- "1"{"আগামীকাল"}
- "2"{"আগামী পরশু"}
- }
- }
- dayperiod{
- dn{"পূর্বাহ্ণ/অপরাহ্ণ"}
- }
- era{
- dn{"যুগ"}
- }
- hour{
- dn{"ঘন্টা"}
- }
- minute{
- dn{"মিনিট"}
- }
- month{
- dn{"মাস"}
- relative{
- "-1"{"গত মাস"}
- "0"{"এই মাস"}
- "1"{"পরের মাস"}
- }
- }
- second{
- dn{"সেকেন্ড"}
- }
- week{
- dn{"সপ্তাহ"}
- relative{
- "-1"{"গত সপ্তাহ"}
- "0"{"এই সপ্তাহ"}
- "1"{"পরবর্তী সপ্তাহ"}
- }
- }
- weekday{
- dn{"সপ্তাহের দিন"}
- }
- year{
- dn{"বছর"}
- relative{
- "-1"{"আগের বছর"}
- "0"{"এই বছর"}
- "1"{"পরের বছর"}
- }
- }
- zone{
- dn{"এলাকা"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -388,13 +472,13 @@
y{"y-y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E, d/M/yy – E, d/M/yy"}
- d{"E, d/M/yy – E, d/M/yy"}
- y{"E, d/M/yy – E, d/M/yy"}
+ M{"E, d/M/y – E, d/M/y"}
+ d{"E, d/M/y – E, d/M/y"}
+ y{"E, d/M/y – E, d/M/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -406,8 +490,8 @@
y{"E, d MMM, y – E, d MMM, y"}
}
yMMMM{
- M{"MM – MM -yyyy"}
- y{"MM-yyyy – MM-yyyy"}
+ M{"MM – MM -y"}
+ y{"MM-y – MM-y"}
}
yMMMd{
M{"d MMM – d MMM, y"}
@@ -415,9 +499,9 @@
y{"d MMM, y – d MMM, y"}
}
yMd{
- M{"d/M/yy – d/M/yy"}
- d{"d/M/yy – d/M/yy"}
- y{"d/M/yy – d/M/yy"}
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
}
}
monthNames{
@@ -580,6 +664,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"দিন"}
+ relative{
+ "-1"{"গতকাল"}
+ "-2"{"গত পরশু"}
+ "0"{"আজ"}
+ "1"{"আগামীকাল"}
+ "2"{"আগামী পরশু"}
+ }
+ }
+ dayperiod{
+ dn{"পূর্বাহ্ণ/অপরাহ্ণ"}
+ }
+ era{
+ dn{"যুগ"}
+ }
+ hour{
+ dn{"ঘন্টা"}
+ }
+ minute{
+ dn{"মিনিট"}
+ }
+ month{
+ dn{"মাস"}
+ relative{
+ "-1"{"গত মাস"}
+ "0"{"এই মাস"}
+ "1"{"পরের মাস"}
+ }
+ }
+ second{
+ dn{"সেকেন্ড"}
+ }
+ week{
+ dn{"সপ্তাহ"}
+ relative{
+ "-1"{"গত সপ্তাহ"}
+ "0"{"এই সপ্তাহ"}
+ "1"{"পরবর্তী সপ্তাহ"}
+ }
+ }
+ weekday{
+ dn{"সপ্তাহের দিন"}
+ }
+ year{
+ dn{"বছর"}
+ relative{
+ "-1"{"আগের বছর"}
+ "0"{"এই বছর"}
+ "1"{"পরের বছর"}
+ }
+ }
+ zone{
+ dn{"এলাকা"}
+ }
+ }
listPattern{
standard{
2{"{0} এবং {1}"}
diff --git a/data/locales/bn_BD.txt b/data/locales/bn_BD.txt
index 4f5dfa6..cf5c983 100644
--- a/data/locales/bn_BD.txt
+++ b/data/locales/bn_BD.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bn_BD.xml
// *
// ***************************************************************************
bn_BD{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/bn_IN.txt b/data/locales/bn_IN.txt
index a0a4ee3..73b3677 100644
--- a/data/locales/bn_IN.txt
+++ b/data/locales/bn_IN.txt
@@ -1,28 +1,15 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bn_IN.xml
// *
// ***************************************************************************
bn_IN{
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
- fields{
- day{
- relative{
- "-2"{"গতপরশু"}
- }
- }
- hour{
- dn{"ঘণ্টা"}
- }
- second{
- dn{"সেকেণ্ড"}
- }
- }
+ generic{
quarters{
format{
abbreviated{
@@ -48,5 +35,44 @@
}
}
}
+ gregorian{
+ quarters{
+ format{
+ abbreviated{
+ "ত্রৈমাসিক",
+ "ষাণ্মাসিক",
+ "চতুর্থাংশ ৩",
+ "বার্ষিক",
+ }
+ wide{
+ "ত্রৈমাসিক",
+ "ষাণ্মাসিক",
+ "তৃতীয় চতুর্থাংশ",
+ "বার্ষিক",
+ }
+ }
+ stand-alone{
+ wide{
+ "ত্রৈমাসিক",
+ "ষাণ্মাসিক",
+ "তৃতীয় চতুর্থাংশ",
+ "বার্ষিক",
+ }
+ }
+ }
+ }
+ }
+ fields{
+ day{
+ relative{
+ "-2"{"গতপরশু"}
+ }
+ }
+ hour{
+ dn{"ঘণ্টা"}
+ }
+ second{
+ dn{"সেকেণ্ড"}
+ }
}
}
diff --git a/data/locales/bo.txt b/data/locales/bo.txt
index 22209e9..3db59ce 100644
--- a/data/locales/bo.txt
+++ b/data/locales/bo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bo.xml
// *
@@ -44,8 +44,29 @@
}
}
}
- Version{"2.0.74.85"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "G y MMMM d, EEEE",
+ "G སྦྱི་ལོ་y MMMMའི་ཙེས་dད",
+ "G y ལོ་འི་MMMཙེས་d",
+ "GGGGG y-MM-dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ yMMMMd{"སྦྱི་ལོ་y MMMMའི་ཙེས་dད"}
+ yMMMd{"y ལོ་འི་MMMཙེས་d"}
+ }
+ }
gregorian{
AmPmMarkers{
"སྔ་དྲོ་",
@@ -56,10 +77,10 @@
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE, y MMMM dd",
+ "y MMMM d, EEEE",
"སྦྱི་ལོ་y MMMMའི་ཙེས་dད",
"y ལོ་འི་MMMཙེས་d",
- "yyyy-MM-dd",
+ "y-MM-dd",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -136,36 +157,6 @@
"སྤྱི་ལོ།",
}
}
- fields{
- day{
- dn{"ཉིན།"}
- relative{
- "-1"{"ཁས་ས་"}
- "-2"{"ཁས་ཉིན་ཀ་"}
- "0"{"དེ་རིང་"}
- "1"{"སང་ཉིན་"}
- "2"{"གནངས་ཉིན་ཀ་"}
- }
- }
- hour{
- dn{"ཆུ་ཙོ་"}
- }
- minute{
- dn{"སྐར་མ།"}
- }
- month{
- dn{"ཟླ་བ་"}
- }
- second{
- dn{"སྐར་ཆ།"}
- }
- year{
- dn{"ལོ།"}
- }
- zone{
- dn{"དུས་ཚོད།"}
- }
- }
monthNames{
format{
abbreviated{
@@ -200,4 +191,34 @@
}
}
}
+ fields{
+ day{
+ dn{"ཉིན།"}
+ relative{
+ "-1"{"ཁས་ས་"}
+ "-2"{"ཁས་ཉིན་ཀ་"}
+ "0"{"དེ་རིང་"}
+ "1"{"སང་ཉིན་"}
+ "2"{"གནངས་ཉིན་ཀ་"}
+ }
+ }
+ hour{
+ dn{"ཆུ་ཙོ་"}
+ }
+ minute{
+ dn{"སྐར་མ།"}
+ }
+ month{
+ dn{"ཟླ་བ་"}
+ }
+ second{
+ dn{"སྐར་ཆ།"}
+ }
+ year{
+ dn{"ལོ།"}
+ }
+ zone{
+ dn{"དུས་ཚོད།"}
+ }
+ }
}
diff --git a/data/locales/bo_CN.txt b/data/locales/bo_CN.txt
index e77e315..340d02b 100644
--- a/data/locales/bo_CN.txt
+++ b/data/locales/bo_CN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bo_CN.xml
// *
// ***************************************************************************
bo_CN{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/bo_IN.txt b/data/locales/bo_IN.txt
index 56963d9..390da35 100644
--- a/data/locales/bo_IN.txt
+++ b/data/locales/bo_IN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bo_IN.xml
// *
// ***************************************************************************
bo_IN{
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/br.txt b/data/locales/br.txt
index 1db9cda..4c24b2e 100755
--- a/data/locales/br.txt
+++ b/data/locales/br.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/br.xml
// *
@@ -24,7 +24,7 @@
}
}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.57"}
calendar{
gregorian{
dayNames{
@@ -87,31 +87,6 @@
}
}
}
- fields{
- day{
- relative{
- "-1"{"decʼh"}
- "-2"{"dercʼhent-decʼh"}
- "0"{"hiziv"}
- "1"{"warcʼhoazh"}
- }
- }
- hour{
- dn{"eur"}
- }
- minute{
- dn{"munut"}
- }
- month{
- dn{"miz"}
- }
- second{
- dn{"eilenn"}
- }
- week{
- dn{"sizhun"}
- }
- }
monthNames{
format{
abbreviated{
@@ -182,6 +157,31 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ relative{
+ "-1"{"decʼh"}
+ "-2"{"dercʼhent-decʼh"}
+ "0"{"hiziv"}
+ "1"{"warcʼhoazh"}
+ }
+ }
+ hour{
+ dn{"eur"}
+ }
+ minute{
+ dn{"munut"}
+ }
+ month{
+ dn{"miz"}
+ }
+ second{
+ dn{"eilenn"}
+ }
+ week{
+ dn{"sizhun"}
+ }
+ }
measurementSystemNames{
UK{"RU"}
US{"SU"}
diff --git a/data/locales/br_FR.txt b/data/locales/br_FR.txt
index 6c785b5..670ca1d 100755
--- a/data/locales/br_FR.txt
+++ b/data/locales/br_FR.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/br_FR.xml
// *
// ***************************************************************************
br_FR{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/brx.txt b/data/locales/brx.txt
index 7b37c67..9775b32 100755
--- a/data/locales/brx.txt
+++ b/data/locales/brx.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/brx.xml
// *
@@ -47,8 +47,49 @@
}
native{"deva"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, MMMM d, y G",
+ "MMMM d, y G",
+ "MMM d, y G",
+ "M/d/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ GGGGyMMMMEEEEdd{"EEEE,dd MMMM GGGGy"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"d-MMM"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"फुं",
@@ -84,12 +125,12 @@
d{"d"}
hm{"h:mm a"}
ms{"mm:ss"}
- y{"yyyy"}
- yM{"M/yyyy"}
- yMEd{"E, M/d/yyyy"}
- yMMM{"MMM yyyy"}
- yMMMEd{"E, MMM d, yyyy"}
- yMMMM{"MMMM yyyy"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
}
@@ -132,46 +173,6 @@
"सन",
}
}
- fields{
- day{
- dn{"सान"}
- relative{
- "-1"{"मैया"}
- "0"{"दिनै"}
- "1"{"गाबोन"}
- }
- }
- dayperiod{
- dn{"फुं/बेलासे"}
- }
- era{
- dn{"जौथाय"}
- }
- hour{
- dn{"रिंगा"}
- }
- minute{
- dn{"मिनिथ"}
- }
- month{
- dn{"दान"}
- }
- second{
- dn{"सेखेन्द"}
- }
- week{
- dn{"सबथा/हबथा"}
- }
- weekday{
- dn{"सप्ताह के दिन"}
- }
- year{
- dn{"बोसोर"}
- }
- zone{
- dn{"ओनसोल"}
- }
- }
monthNames{
format{
wide{
@@ -244,6 +245,46 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"सान"}
+ relative{
+ "-1"{"मैया"}
+ "0"{"दिनै"}
+ "1"{"गाबोन"}
+ }
+ }
+ dayperiod{
+ dn{"फुं/बेलासे"}
+ }
+ era{
+ dn{"जौथाय"}
+ }
+ hour{
+ dn{"रिंगा"}
+ }
+ minute{
+ dn{"मिनिथ"}
+ }
+ month{
+ dn{"दान"}
+ }
+ second{
+ dn{"सेखेन्द"}
+ }
+ week{
+ dn{"सबथा/हबथा"}
+ }
+ weekday{
+ dn{"सप्ताह के दिन"}
+ }
+ year{
+ dn{"बोसोर"}
+ }
+ zone{
+ dn{"ओनसोल"}
+ }
+ }
measurementSystemNames{
US{"यु.एस"}
metric{"मिथार खिलमिथार"}
diff --git a/data/locales/brx_IN.txt b/data/locales/brx_IN.txt
index 0eaee3e..2e41782 100755
--- a/data/locales/brx_IN.txt
+++ b/data/locales/brx_IN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/brx_IN.xml
// *
// ***************************************************************************
brx_IN{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/bs.txt b/data/locales/bs.txt
index 885643d..60b40b0 100644
--- a/data/locales/bs.txt
+++ b/data/locales/bs.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bs.xml
// *
@@ -23,8 +23,49 @@
}
}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, dd. MMMM y. G",
+ "dd. MMMM y. G",
+ "dd.MM.y. G",
+ "dd.MM.yy. GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E, dd."}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, dd.MM."}
+ MMM{"LLL"}
+ MMMEd{"E, dd. MMM"}
+ MMMd{"dd. MMM"}
+ Md{"dd.MM."}
+ d{"d"}
+ hm{"hh:mm a"}
+ hms{"hh:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y."}
+ yM{"MM.y."}
+ yMEd{"E, dd.MM.y."}
+ yMMM{"MMM y."}
+ yMMMEd{"E, dd. MMM y."}
+ yMMMd{"dd. MMM y."}
+ yMd{"dd.MM.y."}
+ yQQQ{"y QQQ"}
+ yQQQQ{"y QQQQ"}
+ }
+ }
gregorian{
AmPmMarkers{
"pre podne",
@@ -101,48 +142,6 @@
"Nove ere",
}
}
- fields{
- day{
- dn{"dan"}
- relative{
- "-1"{"juče"}
- "-2"{"prekjuče"}
- "0"{"danas"}
- "1"{"sutra"}
- "2"{"prekosutra"}
- }
- }
- dayperiod{
- dn{"pre podne/ popodne"}
- }
- era{
- dn{"era"}
- }
- hour{
- dn{"čas"}
- }
- minute{
- dn{"minut"}
- }
- month{
- dn{"mesec"}
- }
- second{
- dn{"sekund"}
- }
- week{
- dn{"nedelja"}
- }
- weekday{
- dn{"dan u nedelji"}
- }
- year{
- dn{"godina"}
- }
- zone{
- dn{"zona"}
- }
- }
monthNames{
format{
abbreviated{
@@ -238,15 +237,15 @@
hm{"hh:mm a"}
hms{"hh:mm:ss a"}
ms{"mm:ss"}
- yyyy{"y. G"}
- yyyyM{"MM.y. G"}
- yyyyMEd{"E, dd.MM.y. G"}
- yyyyMMM{"MMM y. G"}
- yyyyMMMEd{"E, dd. MMM y. G"}
- yyyyMMMd{"dd. MMM y. G"}
- yyyyMd{"dd.MM.y. G"}
- yyyyQQQ{"y G QQQ"}
- yyyyQQQQ{"y G QQQQ"}
+ y{"y. G"}
+ yM{"MM.y. G"}
+ yMEd{"E, dd.MM.y. G"}
+ yMMM{"MMM y. G"}
+ yMMMEd{"E, dd. MMM y. G"}
+ yMMMd{"dd. MMM y. G"}
+ yMd{"dd.MM.y. G"}
+ yQQQ{"y G QQQ"}
+ yQQQQ{"y G QQQQ"}
}
eras{
abbreviated{
@@ -255,6 +254,48 @@
}
}
}
+ fields{
+ day{
+ dn{"dan"}
+ relative{
+ "-1"{"juče"}
+ "-2"{"prekjuče"}
+ "0"{"danas"}
+ "1"{"sutra"}
+ "2"{"prekosutra"}
+ }
+ }
+ dayperiod{
+ dn{"pre podne/ popodne"}
+ }
+ era{
+ dn{"era"}
+ }
+ hour{
+ dn{"čas"}
+ }
+ minute{
+ dn{"minut"}
+ }
+ month{
+ dn{"mesec"}
+ }
+ second{
+ dn{"sekund"}
+ }
+ week{
+ dn{"nedelja"}
+ }
+ weekday{
+ dn{"dan u nedelji"}
+ }
+ year{
+ dn{"godina"}
+ }
+ zone{
+ dn{"zona"}
+ }
+ }
listPattern{
standard{
2{"{0} i {1}"}
diff --git a/data/locales/bs_BA.txt b/data/locales/bs_BA.txt
index 3fb951c..a5158e5 100755
--- a/data/locales/bs_BA.txt
+++ b/data/locales/bs_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/bs_Cyrl.txt b/data/locales/bs_Cyrl.txt
index 3432aed..a61a184 100755
--- a/data/locales/bs_Cyrl.txt
+++ b/data/locales/bs_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bs_Cyrl.xml
// *
@@ -191,7 +191,7 @@
}
}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.47"}
calendar{
buddhist{
eras{
@@ -242,6 +242,143 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, dd. MMMM y. G",
+ "dd. MMMM y. G",
+ "dd.MM.y. G",
+ "d.M.yy. GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E, d."}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, dd.MM."}
+ MMM{"LLL"}
+ MMMEd{"E, dd. MMM"}
+ MMMd{"dd. MMM"}
+ Md{"dd.MM."}
+ d{"d"}
+ h{"hh a"}
+ hm{"hh:mm a"}
+ hms{"hh:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y."}
+ yM{"MM.y."}
+ yMEd{"E, dd.MM.y."}
+ yMMM{"MMM y."}
+ yMMMEd{"E, dd. MMM y."}
+ yMMMd{"dd. MMM y."}
+ yMd{"dd.MM.y."}
+ yQQQ{"y QQQ"}
+ yQQQQ{"y QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"HH-HH"}
+ }
+ Hm{
+ H{"HH:mm-HH:mm"}
+ m{"HH:mm-HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm-HH:mm v"}
+ m{"HH:mm-HH:mm v"}
+ }
+ Hv{
+ H{"HH-HH v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E, d.M - E, d.M"}
+ d{"E, d.M - E, d.M"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"E, dd. MMM - E, dd. MMM"}
+ d{"E, dd. - E, dd. MMM"}
+ }
+ MMMd{
+ M{"dd. MMM - dd. MMM"}
+ d{"dd.-dd. MMM"}
+ }
+ Md{
+ M{"d.M - d.M"}
+ d{"d.M - d.M"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"hh a - hh a"}
+ h{"hh-hh a"}
+ }
+ hm{
+ a{"hh:mm a - hh:mm a"}
+ h{"hh:mm-hh:mm a"}
+ m{"hh:mm-hh:mm a"}
+ }
+ hmv{
+ a{"hh:mm a - hh:mm a v"}
+ h{"hh:mm-hh:mm a v"}
+ m{"hh:mm-hh:mm a v"}
+ }
+ hv{
+ a{"hh a - hh a v"}
+ h{"hh-hh a v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"MM.-MM. y."}
+ y{"MM.y. - MM.y."}
+ }
+ yMEd{
+ M{"E, d.M.y. - E, d.M.y."}
+ d{"E, d.M.y. - E, d.M.y."}
+ y{"E, d.M.y. - E, d.M.y."}
+ }
+ yMMM{
+ M{"MMM-MMM y."}
+ y{"MMM y. - MMM y."}
+ }
+ yMMMEd{
+ M{"E, dd. MMM - E, dd. MMM y."}
+ d{"E, dd. - E, dd. MMM y."}
+ y{"E, dd. MMM y. - E, dd. MMM y."}
+ }
+ yMMMM{
+ M{"MMMM-MMMM y."}
+ y{"MMMM y. - MMMM y."}
+ }
+ yMMMd{
+ M{"dd. MMM - dd. MMM y."}
+ d{"dd.-dd. MMM y."}
+ y{"dd. MMM y. - dd. MMM y."}
+ }
+ yMd{
+ M{"d.M.y. - d.M.y."}
+ d{"d.M.y. - d.M.y."}
+ y{"d.M.y. - d.M.y."}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"пре подне",
@@ -334,63 +471,6 @@
"Нове ере",
}
}
- fields{
- day{
- dn{"дан"}
- relative{
- "-1"{"јуче"}
- "-2"{"прекјуче"}
- "0"{"данас"}
- "1"{"сутра"}
- "2"{"прекосутра"}
- }
- }
- dayperiod{
- dn{"пре подне/поподне"}
- }
- era{
- dn{"ера"}
- }
- hour{
- dn{"час"}
- }
- minute{
- dn{"минут"}
- }
- month{
- dn{"месец"}
- relative{
- "-1"{"Прошлог месеца"}
- "0"{"Овог месеца"}
- "1"{"Следећег месеца"}
- }
- }
- second{
- dn{"секунд"}
- }
- week{
- dn{"недеља"}
- relative{
- "-1"{"Прошле недеље"}
- "0"{"Ове недеље"}
- "1"{"Следеће недеље"}
- }
- }
- weekday{
- dn{"дан у недељи"}
- }
- year{
- dn{"година"}
- relative{
- "-1"{"Прошле године"}
- "0"{"Ове године"}
- "1"{"Следеће године"}
- }
- }
- zone{
- dn{"зона"}
- }
- }
intervalFormats{
H{
H{"HH-HH"}
@@ -642,15 +722,15 @@
hm{"hh:mm a"}
hms{"hh:mm:ss a"}
ms{"mm:ss"}
- yyyy{"y. G"}
- yyyyM{"MM.y. G"}
- yyyyMEd{"E, dd.MM.y. G"}
- yyyyMMM{"MMM y. G"}
- yyyyMMMEd{"E, dd. MMM y. G"}
- yyyyMMMd{"dd. MMM y. G"}
- yyyyMd{"dd.MM.y. G"}
- yyyyQQQ{"y G QQQ"}
- yyyyQQQQ{"y G QQQQ"}
+ y{"y. G"}
+ yM{"MM.y. G"}
+ yMEd{"E, dd.MM.y. G"}
+ yMMM{"MMM y. G"}
+ yMMMEd{"E, dd. MMM y. G"}
+ yMMMd{"dd. MMM y. G"}
+ yMd{"dd.MM.y. G"}
+ yQQQ{"y G QQQ"}
+ yQQQQ{"y G QQQQ"}
}
eras{
abbreviated{
@@ -968,6 +1048,63 @@
quotationEnd{"“"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"дан"}
+ relative{
+ "-1"{"јуче"}
+ "-2"{"прекјуче"}
+ "0"{"данас"}
+ "1"{"сутра"}
+ "2"{"прекосутра"}
+ }
+ }
+ dayperiod{
+ dn{"пре подне/поподне"}
+ }
+ era{
+ dn{"ера"}
+ }
+ hour{
+ dn{"час"}
+ }
+ minute{
+ dn{"минут"}
+ }
+ month{
+ dn{"месец"}
+ relative{
+ "-1"{"Прошлог месеца"}
+ "0"{"Овог месеца"}
+ "1"{"Следећег месеца"}
+ }
+ }
+ second{
+ dn{"секунд"}
+ }
+ week{
+ dn{"недеља"}
+ relative{
+ "-1"{"Прошле недеље"}
+ "0"{"Ове недеље"}
+ "1"{"Следеће недеље"}
+ }
+ }
+ weekday{
+ dn{"дан у недељи"}
+ }
+ year{
+ dn{"година"}
+ relative{
+ "-1"{"Прошле године"}
+ "0"{"Ове године"}
+ "1"{"Следеће године"}
+ }
+ }
+ zone{
+ dn{"зона"}
+ }
+ }
listPattern{
standard{
2{"{0} и {1}"}
diff --git a/data/locales/bs_Cyrl_BA.txt b/data/locales/bs_Cyrl_BA.txt
index 77fa9c6..031a678 100755
--- a/data/locales/bs_Cyrl_BA.txt
+++ b/data/locales/bs_Cyrl_BA.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bs_Cyrl_BA.xml
// *
// ***************************************************************************
bs_Cyrl_BA{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/bs_Latn.txt b/data/locales/bs_Latn.txt
index 3ea3b65..940f036 100755
--- a/data/locales/bs_Latn.txt
+++ b/data/locales/bs_Latn.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bs_Latn.xml
// *
// ***************************************************************************
bs_Latn{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/bs_Latn_BA.txt b/data/locales/bs_Latn_BA.txt
index 87e9dcc..25884eb 100755
--- a/data/locales/bs_Latn_BA.txt
+++ b/data/locales/bs_Latn_BA.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bs_Latn_BA.xml
// *
// ***************************************************************************
bs_Latn_BA{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ca.txt b/data/locales/ca.txt
index c1406cb..3552c4a 100644
--- a/data/locales/ca.txt
+++ b/data/locales/ca.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ca.xml
// *
@@ -142,7 +142,7 @@
}
}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.57"}
calendar{
buddhist{
DateTimePatterns{
@@ -153,7 +153,7 @@
"EEEE, dd MMMM y G",
"d MMMM y G",
"d MMM y G",
- "dd/MM/yyyy GGGGG",
+ "dd/MM/y GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -176,8 +176,8 @@
hms{"h:mm:ss a"}
ms{"mm:ss"}
y{"y G"}
- yM{"MM/yyyy GGGGG"}
- yMEd{"E, dd/MM/yyyy GGGGG"}
+ yM{"MM/y GGGGG"}
+ yMEd{"E, dd/MM/y GGGGG"}
yMMM{"MMM y G"}
yMMMEd{"E, d MMM y G"}
yQQQ{"QQQ y GGGGG"}
@@ -400,6 +400,149 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "H.mm.ss zzzz",
+ "H.mm.ss z",
+ "H.mm.ss",
+ "H.mm",
+ "EEEE d MMMM 'de' y G",
+ "d MMMM 'de' y G",
+ "dd/MM/y G",
+ "dd/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ H{"H"}
+ Hm{"H.mm"}
+ Hms{"H.mm.ss"}
+ M{"L"}
+ MEd{"E d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMMEd{"E d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h.mm a"}
+ hms{"h.mm.ss a"}
+ mmss{"mm:ss"}
+ ms{"mm.ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, d.M.y"}
+ yMM{"MM/y"}
+ yMMM{"LLL y"}
+ yMMMEd{"E, d MMM, y"}
+ yMMMM{"LLLL 'de' y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"H-H"}
+ }
+ Hm{
+ H{"HH.mm-HH.mm"}
+ m{"HH.mm-HH.mm"}
+ }
+ Hmv{
+ H{"HH.mm-HH.mm v"}
+ m{"HH.mm-HH.mm v"}
+ }
+ Hv{
+ H{"H-H v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E dd/MM - E dd/MM"}
+ d{"E dd/MM - E dd/MM"}
+ }
+ MMM{
+ M{"LLL-LLL"}
+ }
+ MMMEd{
+ M{"E d MMM - E d MMM"}
+ d{"E d - E d MMM"}
+ }
+ MMMd{
+ M{"d MMM - d MMM"}
+ d{"d-d MMM"}
+ }
+ Md{
+ M{"dd/MM - dd/MM"}
+ d{"dd/MM - dd/MM"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a - h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h.mm a -h.mm a"}
+ h{"h.mm-h.mm a"}
+ m{"h.mm-h.mm a"}
+ }
+ hmv{
+ a{"h.mm a - h.mm a v"}
+ h{"h.mm-h.mm a v"}
+ m{"h.mm-h.mm a v"}
+ }
+ hv{
+ a{"h a - h a v"}
+ h{"h-h a v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"MM/y - MM/y"}
+ y{"MM/y - MM/y"}
+ }
+ yMEd{
+ M{"E dd/MM/y - E dd/MM/y"}
+ d{"E dd/MM/y - E dd/MM/y"}
+ y{"E dd/MM/y - E dd/MM/y"}
+ }
+ yMMM{
+ M{"LLL-LLL 'de' y"}
+ y{"LLL 'de' y - LLL 'de' y"}
+ }
+ yMMMEd{
+ M{"E d MMM - E d MMM 'de' y"}
+ d{"E d - E d MMM 'de' y"}
+ y{"E d MMM 'de' y - E d MMM 'de' y"}
+ }
+ yMMMM{
+ M{"LLLL-LLLL 'de' y"}
+ y{"LLLL 'de' y - LLLL 'de' y"}
+ }
+ yMMMd{
+ M{"d MMM - d MMM 'de' y"}
+ d{"d-d MMM 'de' y"}
+ y{"d MMM 'de' y - d MMM 'de' y"}
+ }
+ yMd{
+ M{"dd/MM/y - dd/MM/y"}
+ d{"dd/MM/y - dd/MM/y"}
+ y{"dd/MM/y - dd/MM/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"a.m.",
@@ -412,7 +555,7 @@
"H.mm",
"EEEE d MMMM 'de' y",
"d MMMM 'de' y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"dd/MM/yy",
"{1} {0}",
"{1} {0}",
@@ -440,16 +583,16 @@
mmss{"mm:ss"}
ms{"mm.ss"}
y{"y"}
- yM{"M/yyyy"}
+ yM{"M/y"}
yMEd{"E, d.M.y"}
+ yMM{"MM/y"}
yMMM{"LLL y"}
yMMMEd{"E, d MMM, y"}
yMMMM{"LLLL 'de' y"}
yMMMd{"d MMM y"}
- yMd{"d/M/yyyy"}
+ yMd{"d/M/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyyyMM{"MM/yyyy"}
}
dayNames{
format{
@@ -543,63 +686,6 @@
"després de Crist",
}
}
- fields{
- day{
- dn{"dia"}
- relative{
- "-1"{"ahir"}
- "-2"{"abans d'ahir"}
- "0"{"avui"}
- "1"{"demà"}
- "2"{"demà passat"}
- }
- }
- dayperiod{
- dn{"a.m./p.m."}
- }
- era{
- dn{"era"}
- }
- hour{
- dn{"hora"}
- }
- minute{
- dn{"minut"}
- }
- month{
- dn{"mes"}
- relative{
- "-1"{"Últim mes"}
- "0"{"Aquest mes"}
- "1"{"Mes següent"}
- }
- }
- second{
- dn{"segon"}
- }
- week{
- dn{"setmana"}
- relative{
- "-1"{"Última setmana"}
- "0"{"Aquesta setmana"}
- "1"{"Setmana següent"}
- }
- }
- weekday{
- dn{"dia de la setmana"}
- }
- year{
- dn{"any"}
- relative{
- "-1"{"Últim any"}
- "0"{"Aquest any"}
- "1"{"Any següent"}
- }
- }
- zone{
- dn{"zona"}
- }
- }
intervalFormats{
H{
H{"H-H"}
@@ -663,13 +749,13 @@
y{"y-y"}
}
yM{
- M{"MM/yy - MM/yy"}
- y{"MM/yy - MM/yy"}
+ M{"MM/y - MM/y"}
+ y{"MM/y - MM/y"}
}
yMEd{
- M{"E dd/MM/yy - E dd/MM/yy"}
- d{"E dd/MM/yy - E dd/MM/yy"}
- y{"E dd/MM/yy - E dd/MM/yy"}
+ M{"E dd/MM/y - E dd/MM/y"}
+ d{"E dd/MM/y - E dd/MM/y"}
+ y{"E dd/MM/y - E dd/MM/y"}
}
yMMM{
M{"LLL-LLL 'de' y"}
@@ -690,9 +776,9 @@
y{"d MMM 'de' y - d MMM 'de' y"}
}
yMd{
- M{"dd/MM/yy - dd/MM/yy"}
- d{"dd/MM/yy - dd/MM/yy"}
- y{"dd/MM/yy - dd/MM/yy"}
+ M{"dd/MM/y - dd/MM/y"}
+ d{"dd/MM/y - dd/MM/y"}
+ y{"dd/MM/y - dd/MM/y"}
}
}
monthNames{
@@ -835,6 +921,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"dia"}
+ relative{
+ "-1"{"ahir"}
+ "-2"{"abans d'ahir"}
+ "0"{"avui"}
+ "1"{"demà"}
+ "2"{"demà passat"}
+ }
+ }
+ dayperiod{
+ dn{"a.m./p.m."}
+ }
+ era{
+ dn{"era"}
+ }
+ hour{
+ dn{"hora"}
+ }
+ minute{
+ dn{"minut"}
+ }
+ month{
+ dn{"mes"}
+ relative{
+ "-1"{"Últim mes"}
+ "0"{"Aquest mes"}
+ "1"{"Mes següent"}
+ }
+ }
+ second{
+ dn{"segon"}
+ }
+ week{
+ dn{"setmana"}
+ relative{
+ "-1"{"Última setmana"}
+ "0"{"Aquesta setmana"}
+ "1"{"Setmana següent"}
+ }
+ }
+ weekday{
+ dn{"dia de la setmana"}
+ }
+ year{
+ dn{"any"}
+ relative{
+ "-1"{"Últim any"}
+ "0"{"Aquest any"}
+ "1"{"Any següent"}
+ }
+ }
+ zone{
+ dn{"zona"}
+ }
+ }
listPattern{
standard{
2{"{0} i {1}"}
diff --git a/data/locales/ca_AD.txt b/data/locales/ca_AD.txt
index b5c7834..7ce7ec7 100755
--- a/data/locales/ca_AD.txt
+++ b/data/locales/ca_AD.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ca_AD.xml
// *
// ***************************************************************************
ca_AD{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ca_ES.txt b/data/locales/ca_ES.txt
index 4c74fdb..af6e40d 100644
--- a/data/locales/ca_ES.txt
+++ b/data/locales/ca_ES.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ca_ES.xml
// *
// ***************************************************************************
ca_ES{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/cgg.txt b/data/locales/cgg.txt
index 02b2465..0608db7 100755
--- a/data/locales/cgg.txt
+++ b/data/locales/cgg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/cgg.xml
// *
@@ -22,8 +22,50 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
DateTimePatterns{
"h:mm:ss a zzzz",
@@ -33,7 +75,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -108,43 +150,6 @@
"Kurisito Yaijire",
}
}
- fields{
- day{
- dn{"Eizooba"}
- relative{
- "-1"{"Nyomwabazyo"}
- "0"{"Erizooba"}
- "1"{"Nyenkyakare"}
- }
- }
- dayperiod{
- dn{"Nyomushana/nyekiro"}
- }
- era{
- dn{"Obunaku"}
- }
- hour{
- dn{"Shaaha"}
- }
- minute{
- dn{"Edakiika"}
- }
- month{
- dn{"Omwezi"}
- }
- second{
- dn{"Obucweka/Esekendi"}
- }
- week{
- dn{"Esande"}
- }
- weekday{
- dn{"Eizooba ry'okukora"}
- }
- year{
- dn{"Omwaka"}
- }
- }
monthNames{
format{
abbreviated{
@@ -217,4 +222,41 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Eizooba"}
+ relative{
+ "-1"{"Nyomwabazyo"}
+ "0"{"Erizooba"}
+ "1"{"Nyenkyakare"}
+ }
+ }
+ dayperiod{
+ dn{"Nyomushana/nyekiro"}
+ }
+ era{
+ dn{"Obunaku"}
+ }
+ hour{
+ dn{"Shaaha"}
+ }
+ minute{
+ dn{"Edakiika"}
+ }
+ month{
+ dn{"Omwezi"}
+ }
+ second{
+ dn{"Obucweka/Esekendi"}
+ }
+ week{
+ dn{"Esande"}
+ }
+ weekday{
+ dn{"Eizooba ry'okukora"}
+ }
+ year{
+ dn{"Omwaka"}
+ }
+ }
}
diff --git a/data/locales/cgg_UG.txt b/data/locales/cgg_UG.txt
index 9b54002..889f9a0 100755
--- a/data/locales/cgg_UG.txt
+++ b/data/locales/cgg_UG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/cgg_UG.xml
// *
// ***************************************************************************
cgg_UG{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/chr.txt b/data/locales/chr.txt
index d28f8a1..a400075 100755
--- a/data/locales/chr.txt
+++ b/data/locales/chr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/chr.xml
// *
@@ -42,8 +42,93 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, MMMM d, y G",
+ "MMMM d, y G",
+ "MMM d, y G",
+ "M/d/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"H:mm"}
+ Hms{"H:mm:ss"}
+ MEd{"E, M/d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"MMM d, y"}
+ yMd{"M/d/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ MEd{
+ M{"E, M/d – E, M/d"}
+ d{"E, M/d – E, M/d"}
+ }
+ MMMEd{
+ M{"E, MMM d – E, MMM d"}
+ d{"E, MMM d – E, MMM d"}
+ }
+ MMMd{
+ M{"MMM d – MMM d"}
+ d{"MMM d–d"}
+ }
+ Md{
+ M{"M/d – M/d"}
+ d{"M/d – M/d"}
+ }
+ yM{
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
+ }
+ yMEd{
+ M{"E, M/d/y – E, M/d/y"}
+ d{"E, M/d/y – E, M/d/y"}
+ y{"E, M/d/y – E, M/d/y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y – MMM y"}
+ }
+ yMMMEd{
+ M{"E, MMM d – E, MMM d, y"}
+ d{"E, MMM d – E, MMM d, y"}
+ y{"E, MMM d, y – E, MMM d, y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"MMM d – MMM d, y"}
+ d{"MMM d–d, y"}
+ y{"MMM d, y – MMM d, y"}
+ }
+ yMd{
+ M{"M/d/y – M/d/y"}
+ d{"M/d/y – M/d/y"}
+ y{"M/d/y – M/d/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"ᏌᎾᎴ",
@@ -125,43 +210,6 @@
"ᎠᎩᏃᎮᎵᏓᏍᏗᏱ ᎠᏕᏘᏱᏍᎬ ᏱᎰᏩ ᏧᏓᏂᎸᎢᏍᏗ",
}
}
- fields{
- day{
- dn{"ᏏᎦ"}
- relative{
- "-1"{"ᏒᎯ"}
- "0"{"ᎪᎯ ᎢᎦ"}
- "1"{"ᏌᎾᎴᎢ"}
- }
- }
- era{
- dn{"ᎡᎶᎯ ᎠᏣᎢᎵᏒᎢ"}
- }
- hour{
- dn{"ᏑᏣᎶᏓ"}
- }
- minute{
- dn{"ᎢᏯᏔᏬᏍᏔᏅ"}
- }
- month{
- dn{"ᏏᏅᏓ"}
- }
- second{
- dn{"ᎠᏎᏢ"}
- }
- week{
- dn{"ᏒᎾᏙᏓᏆᏍᏗ"}
- }
- weekday{
- dn{"ᏒᎾᏙᏓᏆᏍᏗ ᎠᏣᎢᎵᏒ"}
- }
- year{
- dn{"ᏑᏕᏘᏴᏓ"}
- }
- zone{
- dn{"ᎡᎶᎯ ᎠᏍᏓᏅᏅ"}
- }
- }
intervalFormats{
MEd{
M{"E, M/d – E, M/d"}
@@ -180,13 +228,13 @@
d{"M/d – M/d"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E, M/d/yy – E, M/d/yy"}
- d{"E, M/d/yy – E, M/d/yy"}
- y{"E, M/d/yy – E, M/d/yy"}
+ M{"E, M/d/y – E, M/d/y"}
+ d{"E, M/d/y – E, M/d/y"}
+ y{"E, M/d/y – E, M/d/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -207,9 +255,9 @@
y{"MMM d, y – MMM d, y"}
}
yMd{
- M{"M/d/yy – M/d/yy"}
- d{"M/d/yy – M/d/yy"}
- y{"M/d/yy – M/d/yy"}
+ M{"M/d/y – M/d/y"}
+ d{"M/d/y – M/d/y"}
+ y{"M/d/y – M/d/y"}
}
}
monthNames{
@@ -268,6 +316,43 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"ᏏᎦ"}
+ relative{
+ "-1"{"ᏒᎯ"}
+ "0"{"ᎪᎯ ᎢᎦ"}
+ "1"{"ᏌᎾᎴᎢ"}
+ }
+ }
+ era{
+ dn{"ᎡᎶᎯ ᎠᏣᎢᎵᏒᎢ"}
+ }
+ hour{
+ dn{"ᏑᏣᎶᏓ"}
+ }
+ minute{
+ dn{"ᎢᏯᏔᏬᏍᏔᏅ"}
+ }
+ month{
+ dn{"ᏏᏅᏓ"}
+ }
+ second{
+ dn{"ᎠᏎᏢ"}
+ }
+ week{
+ dn{"ᏒᎾᏙᏓᏆᏍᏗ"}
+ }
+ weekday{
+ dn{"ᏒᎾᏙᏓᏆᏍᏗ ᎠᏣᎢᎵᏒ"}
+ }
+ year{
+ dn{"ᏑᏕᏘᏴᏓ"}
+ }
+ zone{
+ dn{"ᎡᎶᎯ ᎠᏍᏓᏅᏅ"}
+ }
+ }
measurementSystemNames{
US{"ᎣᏂᏏ"}
metric{"ᎺᏘᎩ"}
diff --git a/data/locales/chr_US.txt b/data/locales/chr_US.txt
index bf1845b..0f57bd0 100755
--- a/data/locales/chr_US.txt
+++ b/data/locales/chr_US.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/chr_US.xml
// *
@@ -12,5 +12,5 @@
279,
216,
}
- Version{"2.0.44.21"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/cs.txt b/data/locales/cs.txt
index 0749ada..b166ea1 100644
--- a/data/locales/cs.txt
+++ b/data/locales/cs.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/cs.xml
// *
@@ -19,7 +19,7 @@
"w x y ý z ž]"
}
ExemplarCharactersIndex{"[A B C Č D E F G H {CH} I J K L M N O P Q R Ř S Š T U V W X Y Z Ž]"}
- ExemplarCharactersPunctuation{"[\- ‐ – , ; \: ! ? . … ‘ ‚ “ „ ( ) \[ \] § @ * / \&]"}
+ ExemplarCharactersPunctuation{"[\\- ‐ – , ; \\: ! ? . … ‘ ‚ “ „ ( ) \\[ \\] § @ * / \\&]"}
LocaleScript{
"Latn",
}
@@ -173,38 +173,13 @@
}
}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
- DateTimePatterns{
- "H:mm:ss zzzz",
- "H:mm:ss z",
- "H:mm:ss",
- "H:mm",
- "EEEE, d. MMMM y G",
- "d. MMMM y G",
- "d. M. y G",
- "dd.MM.yy GGGGG",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E, d."}
- MEd{"E, d. M."}
- MMMEd{"E, d. M."}
- MMMd{"d. M."}
- Md{"d. M."}
- d{"d."}
- y{"y G"}
- yM{"LLLL y GGGGG"}
- yMEd{"E, d. M. y GGGGG"}
- yMMM{"LLLL y G"}
- yMMMEd{"E, d. M. y G"}
- yQQQ{"QQQ, y GGGGG"}
- yQQQQ{"QQQQ, y G"}
+ eras{
+ abbreviated{
+ "BE",
+ }
}
}
chinese{
@@ -224,10 +199,154 @@
"{1} {0}",
}
}
+ generic{
+ DateTimePatterns{
+ "H:mm:ss zzzz",
+ "H:mm:ss z",
+ "H:mm:ss",
+ "H:mm",
+ "EEEE, d. MMMM y G",
+ "d. MMMM y G",
+ "d. M. y G",
+ "dd.MM.yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E, d."}
+ Gy{"y G"}
+ GyMMM{"LLLL y G"}
+ GyMMMEd{"E, d. M. y G"}
+ GyMMMd{"d. M. y G"}
+ H{"H"}
+ Hm{"H:mm"}
+ Hms{"H:mm:ss"}
+ M{"L"}
+ MEd{"E, d. M."}
+ MMM{"LLL"}
+ MMMEd{"E, d. M."}
+ MMMd{"d. M."}
+ Md{"d. M."}
+ d{"d."}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y G"}
+ yyyy{"y G"}
+ yyyyM{"M/y GGGGG"}
+ yyyyMEd{"E, d. M. y GGGGG"}
+ yyyyMMM{"LLLL y G"}
+ yyyyMMMEd{"E, d. M. y G"}
+ yyyyMMMM{"LLLL y G"}
+ yyyyMMMd{"d. M. y G"}
+ yyyyMd{"d. M. y GGGGG"}
+ yyyyQQQ{"QQQ y G"}
+ yyyyQQQQ{"QQQQ y G"}
+ }
+ intervalFormats{
+ H{
+ H{"H–H"}
+ }
+ Hm{
+ H{"H:mm–H:mm"}
+ m{"H:mm–H:mm"}
+ }
+ Hmv{
+ H{"H:mm–H:mm v"}
+ m{"H:mm–H:mm v"}
+ }
+ Hv{
+ H{"H–H v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, d. M. – E, d. M."}
+ d{"E, d. M. – E, d. M."}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E, d. M. – E, d. M."}
+ d{"E, d. M. – E, d. M."}
+ }
+ MMMd{
+ M{"d. M. – d. M."}
+ d{"d.–d. M."}
+ }
+ Md{
+ M{"d. M. – d. M."}
+ d{"d. M. – d. M."}
+ }
+ d{
+ d{"d.–d."}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"H – H"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"H:mm – H:mm v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"H – H v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y G"}
+ }
+ yM{
+ M{"M/y – M/y G"}
+ y{"M/y – M/y G"}
+ }
+ yMEd{
+ M{"E, dd.MM.y – E, dd.MM.y G"}
+ d{"E, dd.MM.y – E, dd.MM.y G"}
+ y{"E, dd.MM.y – E, dd.MM.y G"}
+ }
+ yMMM{
+ M{"MMM–MMM y G"}
+ y{"MMM y – MMM y G"}
+ }
+ yMMMEd{
+ M{"E, d. M. – E, d. M. y G"}
+ d{"E, d. M. – E, d. M. y G"}
+ y{"E, d. M. y – E, d. M. y G"}
+ }
+ yMMMM{
+ M{"LLLL – LLLL y G"}
+ y{"LLLL y – LLLL y G"}
+ }
+ yMMMd{
+ M{"d. M. – d. M. y G"}
+ d{"d.–d. M. y G"}
+ y{"d. M. y – d. M. y G"}
+ }
+ yMd{
+ M{"dd.MM.y – dd.MM.y G"}
+ d{"dd.MM.y – dd.MM.y G"}
+ y{"dd.MM.y – dd.MM.y G"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
- "AM",
- "PM",
+ "dop.",
+ "odp.",
}
DateTimePatterns{
"H:mm:ss zzzz",
@@ -236,7 +355,7 @@
"H:mm",
"EEEE, d. MMMM y",
"d. MMMM y",
- "d. M. yyyy",
+ "d. M. y",
"dd.MM.yy",
"{1} {0}",
"{1} {0}",
@@ -246,6 +365,10 @@
}
availableFormats{
Ed{"E, d."}
+ Gy{"y G"}
+ GyMMM{"LLLL y G"}
+ GyMMMEd{"E, d. M. y G"}
+ GyMMMd{"d. M. y G"}
H{"H"}
Hm{"H:mm"}
Hms{"H:mm:ss"}
@@ -265,13 +388,11 @@
yMEd{"E, d. M. y"}
yMMM{"LLLL y"}
yMMMEd{"E, d. M. y"}
+ yMMMM{"LLLL y"}
yMMMd{"d. M. y"}
yMd{"d. M. y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyyy{"y"}
- yyyyM{"M/yyyy"}
- yyyyMMMM{"LLLL y"}
}
dayNames{
format{
@@ -365,63 +486,6 @@
"n. l.",
}
}
- fields{
- day{
- dn{"Den"}
- relative{
- "-1"{"Včera"}
- "-2"{"Předevčírem"}
- "0"{"Dnes"}
- "1"{"Zítra"}
- "2"{"Pozítří"}
- }
- }
- dayperiod{
- dn{"AM/PM"}
- }
- era{
- dn{"Letopočet"}
- }
- hour{
- dn{"Hodina"}
- }
- minute{
- dn{"Minuta"}
- }
- month{
- dn{"Měsíc"}
- relative{
- "-1"{"Minulý měsíc"}
- "0"{"Tento měsíc"}
- "1"{"Příští měsíc"}
- }
- }
- second{
- dn{"Sekunda"}
- }
- week{
- dn{"Týden"}
- relative{
- "-1"{"Minulý týden"}
- "0"{"Tento týden"}
- "1"{"Příští týden"}
- }
- }
- weekday{
- dn{"Den v týdnu"}
- }
- year{
- dn{"Rok"}
- relative{
- "-1"{"Minulý rok"}
- "0"{"Tento rok"}
- "1"{"Příští rok"}
- }
- }
- zone{
- dn{"Časové pásmo"}
- }
- }
intervalFormats{
H{
H{"H–H"}
@@ -485,13 +549,13 @@
y{"y–y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E, dd.MM.yy – E, dd.MM.yy"}
- d{"E, dd.MM.yy – E, dd.MM.yy"}
- y{"E, dd.MM.yy – E, dd.MM.yy"}
+ M{"E, dd.MM.y – E, dd.MM.y"}
+ d{"E, dd.MM.y – E, dd.MM.y"}
+ y{"E, dd.MM.y – E, dd.MM.y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -512,9 +576,9 @@
y{"d. M. y – d. M. y"}
}
yMd{
- M{"dd.MM.yy – dd.MM.yy"}
- d{"dd.MM.yy – dd.MM.yy"}
- y{"dd.MM.yy – dd.MM.yy"}
+ M{"dd.MM.y – dd.MM.y"}
+ d{"dd.MM.y – dd.MM.y"}
+ y{"dd.MM.y – dd.MM.y"}
}
}
monthNames{
@@ -650,33 +714,18 @@
}
}
}
- islamic{
- DateTimePatterns{
- "H:mm:ss zzzz",
- "H:mm:ss z",
- "H:mm:ss",
- "H:mm",
- "EEEE, d. MMMM y G",
- "d. MMMM y",
- "d. MMM. y G",
- "dd.MM.yy. G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
+ hebrew{
+ eras{
+ abbreviated{
+ "AM",
+ }
}
- availableFormats{
- Ed{"E, d."}
- MEd{"E, d. M."}
- MMMEd{"E, d. MMM."}
- MMMd{"d. MMM."}
- Md{"d. M."}
- d{"d."}
- yM{"MM/y"}
- yMEd{"E, d. M. y"}
- yMMM{"LLL y"}
- yMMMEd{"E, d. MMM y"}
+ }
+ islamic{
+ eras{
+ abbreviated{
+ "AH",
+ }
}
}
japanese{
@@ -685,32 +734,6 @@
"H:mm:ss z",
"H:mm:ss",
"H:mm",
- "EEEE d. MMMM y G",
- "d. MMMM y G",
- "d. M. y G",
- "dd.MM.yy GGGGG",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E, d."}
- MEd{"E, d. M."}
- MMMEd{"E, d. M."}
- MMMd{"d. M."}
- Md{"d. M."}
- d{"d."}
- y{"y G"}
- }
- }
- roc{
- DateTimePatterns{
- "H:mm:ss zzzz",
- "H:mm:ss z",
- "H:mm:ss",
- "H:mm",
"EEEE, d. MMMM y G",
"d. MMMM y G",
"d. M. y G",
@@ -721,15 +744,8 @@
"{1} {0}",
"{1} {0}",
}
- availableFormats{
- Ed{"E, d."}
- MEd{"E, d. M."}
- MMMEd{"E, d. M."}
- MMMd{"d. M."}
- Md{"d. M."}
- d{"d."}
- y{"y G"}
- }
+ }
+ roc{
eras{
abbreviated{
"Před R. O. C.",
@@ -766,6 +782,63 @@
quotationEnd{"“"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"Den"}
+ relative{
+ "-1"{"Včera"}
+ "-2"{"Předevčírem"}
+ "0"{"Dnes"}
+ "1"{"Zítra"}
+ "2"{"Pozítří"}
+ }
+ }
+ dayperiod{
+ dn{"AM/PM"}
+ }
+ era{
+ dn{"Letopočet"}
+ }
+ hour{
+ dn{"Hodina"}
+ }
+ minute{
+ dn{"Minuta"}
+ }
+ month{
+ dn{"Měsíc"}
+ relative{
+ "-1"{"Minulý měsíc"}
+ "0"{"Tento měsíc"}
+ "1"{"Příští měsíc"}
+ }
+ }
+ second{
+ dn{"Sekunda"}
+ }
+ week{
+ dn{"Týden"}
+ relative{
+ "-1"{"Minulý týden"}
+ "0"{"Tento týden"}
+ "1"{"Příští týden"}
+ }
+ }
+ weekday{
+ dn{"Den v týdnu"}
+ }
+ year{
+ dn{"Rok"}
+ relative{
+ "-1"{"Minulý rok"}
+ "0"{"Tento rok"}
+ "1"{"Příští rok"}
+ }
+ }
+ zone{
+ dn{"Časové pásmo"}
+ }
+ }
listPattern{
standard{
2{"{0} a {1}"}
diff --git a/data/locales/cs_CZ.txt b/data/locales/cs_CZ.txt
index 573967d..67669d9 100644
--- a/data/locales/cs_CZ.txt
+++ b/data/locales/cs_CZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/cs_CZ.xml
// *
// ***************************************************************************
cs_CZ{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/cy.txt b/data/locales/cy.txt
index 32cb5f2..28a766a 100644
--- a/data/locales/cy.txt
+++ b/data/locales/cy.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/cy.xml
// *
@@ -10,27 +10,256 @@
* ICU <specials> source: <path>/xml/main/cy.xml
*/
cy{
- AuxExemplarCharacters{"[j k q v x z]"}
+ AuxExemplarCharacters{"[k q v x z]"}
ExemplarCharacters{
- "[a á à â ä b c {ch} d {dd} e é è ê ë f {ff} g {ng} h i í ì î ï l {ll} m n o "
- "ó ò ô ö p {ph} r {rh} s t {th} u ú ù û ü w ẃ ẁ ŵ ẅ y ý ỳ ŷ ÿ]"
+ "[a á à â ä b c {ch} d {dd} e é è ê ë f {ff} g {ng} h i í ì î ï j l {ll} m n "
+ "o ó ò ô ö p {ph} r {rh} s t {th} u ú ù û ü w ẃ ẁ ŵ ẅ y ý ỳ ŷ ÿ]"
}
- ExemplarCharactersIndex{"[A B C {CH} D E F {FF} G H I J L {LL} M N O P {PH} R {RH} S T {TH} U W Y]"}
+ ExemplarCharactersIndex{
+ "[A B C {CH} D {DD} E F {FF} G {NG} H I J L {LL} M N O P {PH} R {RH} S T {TH}"
+ " U W Y]"
+ }
+ ExemplarCharactersPunctuation{
+ "[\\- ‐ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ "
+ "″]"
+ }
LocaleScript{
"Latn",
}
- Version{"2.0.78.38"}
+ NumberElements{
+ latn{
+ patterns{
+ currencyFormat{"¤#,##0.00"}
+ decimalFormat{"#,##0.###"}
+ percentFormat{"#,##0%"}
+ scientificFormat{"#E0"}
+ }
+ patternsLong{
+ decimalFormat{
+ 1000{
+ few{"0 mil"}
+ many{"0 mil"}
+ one{"0 fil"}
+ other{"0 mil"}
+ two{"0 fil"}
+ zero{"0 mil"}
+ }
+ 10000{
+ few{"00 mil"}
+ many{"00 mil"}
+ one{"00 mil"}
+ other{"00 mil"}
+ two{"00 mil"}
+ zero{"00 mil"}
+ }
+ 100000{
+ few{"000 mil"}
+ many{"000 mil"}
+ one{"000 mil"}
+ other{"000 mil"}
+ two{"000 mil"}
+ zero{"000 mil"}
+ }
+ 1000000{
+ few{"0 miliwn"}
+ many{"0 miliwn"}
+ one{"0 filiwn"}
+ other{"0 miliwn"}
+ two{"0 filiwn"}
+ zero{"0 miliwn"}
+ }
+ 10000000{
+ few{"00 miliwn"}
+ many{"00 miliwn"}
+ one{"00 miliwn"}
+ other{"00 miliwn"}
+ two{"00 miliwn"}
+ zero{"00 miliwn"}
+ }
+ 100000000{
+ few{"000 miliwn"}
+ many{"000 miliwn"}
+ one{"000 miliwn"}
+ other{"000 miliwn"}
+ two{"000 miliwn"}
+ zero{"000 miliwn"}
+ }
+ 1000000000{
+ few{"0 biliwn"}
+ many{"0 biliwn"}
+ one{"0 biliwn"}
+ other{"0 biliwn"}
+ two{"0 biliwn"}
+ zero{"0 biliwn"}
+ }
+ 10000000000{
+ few{"00 biliwn"}
+ many{"00 biliwn"}
+ one{"00 biliwn"}
+ other{"00 biliwn"}
+ two{"00 biliwn"}
+ zero{"00 biliwn"}
+ }
+ 100000000000{
+ few{"000 biliwn"}
+ many{"000 biliwn"}
+ one{"000 biliwn"}
+ other{"000 biliwn"}
+ two{"000 biliwn"}
+ zero{"000 biliwn"}
+ }
+ 1000000000000{
+ few{"0 thriliwn"}
+ many{"0 thriliwn"}
+ one{"0 triliwn"}
+ other{"0 triliwn"}
+ two{"0 driliwn"}
+ zero{"0 triliwn"}
+ }
+ 10000000000000{
+ few{"00 triliwn"}
+ many{"00 triliwn"}
+ one{"00 triliwn"}
+ other{"00 triliwn"}
+ two{"00 triliwn"}
+ zero{"00 triliwn"}
+ }
+ 100000000000000{
+ few{"000 triliwn"}
+ many{"000 triliwn"}
+ one{"000 triliwn"}
+ other{"000 triliwn"}
+ two{"000 triliwn"}
+ zero{"000 triliwn"}
+ }
+ }
+ }
+ patternsShort{
+ decimalFormat{
+ 1000{
+ few{"0K"}
+ many{"0K"}
+ one{"0K"}
+ other{"0K"}
+ two{"0K"}
+ zero{"0K"}
+ }
+ 10000{
+ few{"00K"}
+ many{"00K"}
+ one{"00K"}
+ other{"00K"}
+ two{"00K"}
+ zero{"00K"}
+ }
+ 100000{
+ few{"000K"}
+ many{"000K"}
+ one{"000K"}
+ other{"000K"}
+ two{"000K"}
+ zero{"000K"}
+ }
+ 1000000{
+ few{"0M"}
+ many{"0M"}
+ one{"0M"}
+ other{"0M"}
+ two{"0M"}
+ zero{"0M"}
+ }
+ 10000000{
+ few{"00M"}
+ many{"00M"}
+ one{"00M"}
+ other{"00M"}
+ two{"00M"}
+ zero{"00M"}
+ }
+ 100000000{
+ few{"000M"}
+ many{"000M"}
+ one{"000M"}
+ other{"000M"}
+ two{"000M"}
+ zero{"000M"}
+ }
+ 1000000000{
+ few{"0B"}
+ many{"0B"}
+ one{"0B"}
+ other{"0B"}
+ two{"0B"}
+ zero{"0B"}
+ }
+ 10000000000{
+ few{"00B"}
+ many{"00B"}
+ one{"00B"}
+ other{"00B"}
+ two{"00B"}
+ zero{"00B"}
+ }
+ 100000000000{
+ few{"000B"}
+ many{"000B"}
+ one{"000B"}
+ other{"000B"}
+ two{"000B"}
+ zero{"000B"}
+ }
+ 1000000000000{
+ few{"0T"}
+ many{"0T"}
+ one{"0T"}
+ other{"0T"}
+ two{"0T"}
+ zero{"0T"}
+ }
+ 10000000000000{
+ few{"00T"}
+ many{"00T"}
+ one{"00T"}
+ other{"00T"}
+ two{"00T"}
+ zero{"00T"}
+ }
+ 100000000000000{
+ few{"000T"}
+ many{"000T"}
+ one{"000T"}
+ other{"000T"}
+ two{"000T"}
+ zero{"000T"}
+ }
+ }
+ }
+ symbols{
+ decimal{"."}
+ exponential{"E"}
+ group{","}
+ infinity{"∞"}
+ list{";"}
+ minusSign{"-"}
+ nan{"NaN"}
+ perMille{"‰"}
+ percentSign{"%"}
+ plusSign{"+"}
+ }
+ }
+ }
+ Version{"2.0.82.51"}
calendar{
- gregorian{
+ generic{
DateTimePatterns{
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE, d MMMM y",
- "d MMMM y",
- "d MMM y",
- "dd/MM/yyyy",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -38,118 +267,45 @@
"{1} {0}",
}
availableFormats{
+ Ed{"d E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
MEd{"E, d/M"}
+ MMM{"LLL"}
MMMEd{"E, d MMM"}
MMMd{"d MMM"}
Md{"d/M"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
yM{"M/y"}
yMEd{"E, d/M/y"}
yMMM{"MMM y"}
yMMMEd{"E, d MMM y"}
yMMMd{"d MMM y"}
yMd{"d/M/y"}
- }
- dayNames{
- format{
- abbreviated{
- "Sul",
- "Llun",
- "Maw",
- "Mer",
- "Iau",
- "Gwen",
- "Sad",
- }
- narrow{
- "S",
- "L",
- "M",
- "M",
- "I",
- "G",
- "S",
- }
- wide{
- "Dydd Sul",
- "Dydd Llun",
- "Dydd Mawrth",
- "Dydd Mercher",
- "Dydd Iau",
- "Dydd Gwener",
- "Dydd Sadwrn",
- }
- }
- stand-alone{
- abbreviated{
- "Sul",
- "Llun",
- "Maw",
- "Mer",
- "Iau",
- "Gwe",
- "Sad",
- }
- narrow{
- "S",
- "L",
- "M",
- "M",
- "I",
- "G",
- "S",
- }
- }
- }
- eras{
- abbreviated{
- "CC",
- "OC",
- }
- narrow{
- "C",
- "O",
- }
- wide{
- "Cyn Crist",
- "Oed Crist",
- }
- }
- fields{
- day{
- dn{"Dydd"}
- }
- dayperiod{
- dn{"AM/PM"}
- }
- era{
- dn{"Oes"}
- }
- hour{
- dn{"Awr"}
- }
- minute{
- dn{"Munud"}
- }
- month{
- dn{"Mis"}
- }
- second{
- dn{"Eiliad"}
- }
- week{
- dn{"Wythnos"}
- }
- weekday{
- dn{"Dydd o'r Wythnos"}
- }
- year{
- dn{"Blwyddyn"}
- }
- zone{
- dn{"Cylchfa"}
- }
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
}
intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
M{
M{"M-M"}
}
@@ -201,13 +357,13 @@
y{"y-y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E, d/M/yy - E, d/M/yy"}
- d{"E, d/M/yy - E, d/M/yy"}
- y{"E, d/M/yy - E, d/M/yy"}
+ M{"E, d/M/y - E, d/M/y"}
+ d{"E, d/M/y - E, d/M/y"}
+ y{"E, d/M/y - E, d/M/y"}
}
yMMM{
M{"MMM - MMM, y"}
@@ -228,9 +384,245 @@
y{"d MMM, y - d MMM, y"}
}
yMd{
- M{"d/M/yy - d/M/yy"}
- d{"d/M/yy - d/M/yy"}
- y{"d/M/yy - d/M/yy"}
+ M{"d/M/y - d/M/y"}
+ d{"d/M/y - d/M/y"}
+ y{"d/M/y - d/M/y"}
+ }
+ }
+ }
+ gregorian{
+ AmPmMarkers{
+ "AM",
+ "PM",
+ }
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d MMMM y",
+ "d MMMM y",
+ "d MMM y",
+ "dd/MM/y",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d/M"}
+ MMM{"LLL"}
+ MMMEd{"E, d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, d MMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ dayNames{
+ format{
+ abbreviated{
+ "Sul",
+ "Llun",
+ "Maw",
+ "Mer",
+ "Iau",
+ "Gwen",
+ "Sad",
+ }
+ narrow{
+ "S",
+ "Ll",
+ "M",
+ "M",
+ "I",
+ "G",
+ "S",
+ }
+ short{
+ "Su",
+ "Ll",
+ "Ma",
+ "Me",
+ "Ia",
+ "Gw",
+ "Sa",
+ }
+ wide{
+ "Dydd Sul",
+ "Dydd Llun",
+ "Dydd Mawrth",
+ "Dydd Mercher",
+ "Dydd Iau",
+ "Dydd Gwener",
+ "Dydd Sadwrn",
+ }
+ }
+ stand-alone{
+ abbreviated{
+ "Sul",
+ "Llun",
+ "Maw",
+ "Mer",
+ "Iau",
+ "Gwe",
+ "Sad",
+ }
+ narrow{
+ "S",
+ "Ll",
+ "M",
+ "M",
+ "I",
+ "G",
+ "S",
+ }
+ short{
+ "Su",
+ "Ll",
+ "Ma",
+ "Me",
+ "Ia",
+ "Gw",
+ "Sa",
+ }
+ wide{
+ "Dydd Sul",
+ "Dydd Llun",
+ "Dydd Mawrth",
+ "Dydd Mercher",
+ "Dydd Iau",
+ "Dydd Gwener",
+ "Dydd Sadwrn",
+ }
+ }
+ }
+ eras{
+ abbreviated{
+ "CC",
+ "OC",
+ }
+ narrow{
+ "C",
+ "O",
+ }
+ wide{
+ "Cyn Crist",
+ "Oed Crist",
+ }
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E, d/M – E, d/M"}
+ d{"E, d/M – E, d/M"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"E, d MMM – E, d MMM"}
+ d{"E, d MMM – E, d MMM"}
+ }
+ MMMM{
+ M{"LLLL-LLLL"}
+ }
+ MMMd{
+ M{"d MMM – d MMM"}
+ d{"d–d MMM"}
+ }
+ Md{
+ M{"d/M – d/M"}
+ d{"d/M – d/M"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
+ }
+ yMEd{
+ M{"E, d/M/y - E, d/M/y"}
+ d{"E, d/M/y - E, d/M/y"}
+ y{"E, d/M/y - E, d/M/y"}
+ }
+ yMMM{
+ M{"MMM - MMM, y"}
+ y{"MMM y - MMM y"}
+ }
+ yMMMEd{
+ M{"E, d MMM - E, d MMM, y"}
+ d{"E, d MMM - E, d MMM, y"}
+ y{"E, d MMM, y - E, d MMM, y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"d MMM - d MMM, y"}
+ d{"d-d MMM, y"}
+ y{"d MMM, y - d MMM, y"}
+ }
+ yMd{
+ M{"d/M/y - d/M/y"}
+ d{"d/M/y - d/M/y"}
+ y{"d/M/y - d/M/y"}
}
}
monthNames{
@@ -251,7 +643,7 @@
}
narrow{
"I",
- "C",
+ "Ch",
"M",
"E",
"M",
@@ -261,7 +653,7 @@
"M",
"H",
"T",
- "R",
+ "Rh",
}
wide{
"Ionawr",
@@ -281,7 +673,7 @@
stand-alone{
abbreviated{
"Ion",
- "Chwe",
+ "Chw",
"Maw",
"Ebr",
"Mai",
@@ -295,7 +687,7 @@
}
narrow{
"I",
- "C",
+ "Ch",
"M",
"E",
"M",
@@ -305,7 +697,7 @@
"M",
"H",
"T",
- "R",
+ "Rh",
}
wide{
"Ionawr",
@@ -331,6 +723,12 @@
"Ch3",
"Ch4",
}
+ narrow{
+ "1",
+ "2",
+ "3",
+ "4",
+ }
wide{
"Chwarter 1af",
"2il chwarter",
@@ -338,11 +736,315 @@
"4ydd chwarter",
}
}
+ stand-alone{
+ abbreviated{
+ "Ch1",
+ "Ch2",
+ "Ch3",
+ "Ch4",
+ }
+ narrow{
+ "1",
+ "2",
+ "3",
+ "4",
+ }
+ wide{
+ "chwarter 1af",
+ "2il chwarter",
+ "3ydd chwarter",
+ "4ydd chwarter",
+ }
+ }
}
}
}
+ delimiters{
+ alternateQuotationEnd{"’"}
+ alternateQuotationStart{"‘"}
+ quotationEnd{"”"}
+ quotationStart{"“"}
+ }
+ fields{
+ day{
+ dn{"Dydd"}
+ relative{
+ "-1"{"Ddoe"}
+ "-2"{"Echdoe"}
+ "0"{"Heddiw"}
+ "1"{"Yfory"}
+ }
+ }
+ dayperiod{
+ dn{"AM/PM"}
+ }
+ era{
+ dn{"Oes"}
+ }
+ hour{
+ dn{"Awr"}
+ }
+ minute{
+ dn{"Munud"}
+ }
+ month{
+ dn{"Mis"}
+ }
+ second{
+ dn{"Eiliad"}
+ }
+ week{
+ dn{"Wythnos"}
+ }
+ weekday{
+ dn{"Dydd o'r Wythnos"}
+ }
+ year{
+ dn{"Blwyddyn"}
+ }
+ zone{
+ dn{"Cylchfa"}
+ }
+ }
+ listPattern{
+ standard{
+ 2{"{0} a {1}"}
+ end{"{0} a {1}"}
+ middle{"{0}, {1}"}
+ start{"{0}, {1}"}
+ }
+ }
measurementSystemNames{
- US{"UD"}
+ UK{"DU"}
+ US{"UDA"}
metric{"Metrig"}
}
+ units{
+ day{
+ few{"{0} diwrnod"}
+ many{"{0} diwrnod"}
+ one{"{0} diwrnod"}
+ other{"{0} diwrnod"}
+ two{"{0} ddiwrnod"}
+ zero{"{0} diwrnod"}
+ }
+ day-future{
+ few{"Ymhen {0} diwrnod"}
+ many{"Ymhen {0} diwrnod"}
+ one{"Ymhen {0} diwrnod"}
+ other{"Ymhen {0} diwrnod"}
+ two{"Ymhen {0} ddiwrnod"}
+ zero{"Ymhen {0} diwrnod"}
+ }
+ day-past{
+ few{"{0} diwrnod yn ôl"}
+ many{"{0} diwrnod yn ôl"}
+ one{"{0} diwrnod yn ôl"}
+ other{"{0} diwrnod yn ôl"}
+ two{"{0} ddiwrnod yn ôl"}
+ zero{"{0} diwrnod yn ôl"}
+ }
+ hour{
+ few{"{0} awr"}
+ many{"{0} awr"}
+ one{"{0} awr"}
+ other{"{0} awr"}
+ two{"{0} awr"}
+ zero{"{0} awr"}
+ }
+ hour-future{
+ few{"Ymhen {0} awr"}
+ many{"Ymhen {0} awr"}
+ one{"Ymhen {0} awr"}
+ other{"Ymhen {0} awr"}
+ two{"Ymhen {0} awr"}
+ zero{"Ymhen {0} awr"}
+ }
+ hour-past{
+ few{"{0} awr yn ôl"}
+ many{"{0} awr yn ôl"}
+ one{"{0} awr yn ôl"}
+ other{"{0} awr yn ôl"}
+ two{"{0} awr yn ôl"}
+ zero{"{0} awr yn ôl"}
+ }
+ minute{
+ few{"{0} munud"}
+ many{"{0} munud"}
+ one{"{0} munud"}
+ other{"{0} munud"}
+ two{"{0} funud"}
+ zero{"{0} munud"}
+ }
+ minute-future{
+ few{"Ymhen {0} munud"}
+ many{"Ymhen {0} munud"}
+ one{"Ymhen {0} munud"}
+ other{"Ymhen {0} munud"}
+ two{"Ymhen {0} funud"}
+ zero{"Ymhen {0} munud"}
+ }
+ minute-past{
+ few{"{0} munud yn ôl"}
+ many{"{0} munud yn ôl"}
+ one{"{0} munud yn ôl"}
+ other{"{0} munud yn ôl"}
+ two{"{0} funud yn ôl"}
+ zero{"{0} munud yn ôl"}
+ }
+ month{
+ few{"{0} mis"}
+ many{"{0} mis"}
+ one{"{0} mis"}
+ other{"{0} mis"}
+ two{"{0} fis"}
+ zero{"{0} mis"}
+ }
+ month-future{
+ few{"Ymhen {0} mis"}
+ many{"Ymhen {0} mis"}
+ one{"Ymhen {0} mis"}
+ other{"Ymhen {0} mis"}
+ two{"Ymhen {0} fis"}
+ zero{"Ymhen {0} mis"}
+ }
+ month-past{
+ few{"{0} mis yn ôl"}
+ many{"{0} mis yn ôl"}
+ one{"{0} mis yn ôl"}
+ other{"{0} mis yn ôl"}
+ two{"{0} fis yn ôl"}
+ zero{"{0} mis yn ôl"}
+ }
+ second{
+ few{"{0} eiliad"}
+ many{"{0} eiliad"}
+ one{"{0} eiliad"}
+ other{"{0} eiliad"}
+ two{"{0} eiliad"}
+ zero{"{0} eiliad"}
+ }
+ second-future{
+ few{"Ymhen {0} eiliad"}
+ many{"Ymhen {0} eiliad"}
+ one{"Ymhen {0} eiliad"}
+ other{"Ymhen {0} eiliad"}
+ two{"Ymhen {0} eiliad"}
+ zero{"Ymhen {0} eiliad"}
+ }
+ second-past{
+ few{"{0} eiliad yn ôl"}
+ many{"{0} eiliad yn ôl"}
+ one{"{0} eiliad yn ôl"}
+ other{"{0} eiliad yn ôl"}
+ two{"{0} eiliad yn ôl"}
+ zero{"{0} eiliad yn ôl"}
+ }
+ week{
+ few{"{0} wythnos"}
+ many{"{0} wythnos"}
+ one{"{0} wythnos"}
+ other{"{0} wythnos"}
+ two{"{0} wythnos"}
+ zero{"{0} wythnos"}
+ }
+ week-future{
+ few{"Ymhen {0} wythnos"}
+ many{"Ymhen {0} wythnos"}
+ one{"Ymhen {0} wythnos"}
+ other{"Ymhen {0} wythnos"}
+ two{"Ymhen {0} wythnos"}
+ zero{"Ymhen {0} wythnos"}
+ }
+ week-past{
+ few{"{0} wythnos yn ôl"}
+ many{"{0} wythnos yn ôl"}
+ one{"{0} wythnos yn ôl"}
+ other{"{0} wythnos yn ôl"}
+ two{"{0} wythnos yn ôl"}
+ zero{"{0} wythnos yn ôl"}
+ }
+ year{
+ few{"{0} blynedd"}
+ many{"{0} blynedd"}
+ one{"{0} blwyddyn"}
+ other{"{0} o flynyddoedd"}
+ two{"{0} flynedd"}
+ zero{"{0} blwyddyn"}
+ }
+ year-future{
+ few{"Ymhen {0} blynedd"}
+ many{"Ymhen {0} blynedd"}
+ one{"Ymhen {0} blwyddyn"}
+ other{"Ymhen {0} o flynyddoedd"}
+ two{"Ymhen {0} flynedd"}
+ zero{"Ymhen {0} o flynyddoedd"}
+ }
+ year-past{
+ few{"{0} blynedd yn ôl"}
+ many{"{0} blynedd yn ôl"}
+ one{"{0} flwyddyn yn ôl"}
+ other{"{0} o flynyddoedd yn ôl"}
+ two{"{0} flynedd yn ôl"}
+ zero{"{0} o flynyddoedd yn ôl"}
+ }
+ }
+ unitsShort{
+ day{
+ few{"{0} diwrnod"}
+ many{"{0} diwrnod"}
+ one{"{0} diwrnod"}
+ other{"{0} diwrnod"}
+ two{"{0} ddiwrnod"}
+ zero{"{0} diwrnod"}
+ }
+ hour{
+ few{"{0} awr"}
+ many{"{0} awr"}
+ one{"{0} awr"}
+ other{"{0} awr"}
+ two{"{0} awr"}
+ zero{"{0} awr"}
+ }
+ minute{
+ few{"{0} mun"}
+ many{"{0} mun"}
+ one{"{0} mun"}
+ other{"{0} mun"}
+ two{"{0} mun"}
+ zero{"{0} mun"}
+ }
+ month{
+ few{"{0} mis"}
+ many{"{0} mis"}
+ one{"{0} mis"}
+ other{"{0} mis"}
+ two{"{0} fis"}
+ zero{"{0} mis"}
+ }
+ second{
+ few{"{0} eil"}
+ many{"{0} eil"}
+ one{"{0} eil"}
+ other{"{0} eil"}
+ two{"{0} eil"}
+ zero{"{0} eil"}
+ }
+ week{
+ few{"{0} wythnos"}
+ many{"{0} wythnos"}
+ one{"{0} wythnos"}
+ other{"{0} wythnos"}
+ two{"{0} wythnos"}
+ zero{"{0} wythnos"}
+ }
+ year{
+ few{"{0} bl"}
+ many{"{0} bl"}
+ one{"{0} bl"}
+ other{"{0} bl"}
+ two{"{0} bl"}
+ zero{"{0} bl"}
+ }
+ }
}
diff --git a/data/locales/cy_GB.txt b/data/locales/cy_GB.txt
index 4fcc887..5ba1df4 100644
--- a/data/locales/cy_GB.txt
+++ b/data/locales/cy_GB.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/cy_GB.xml
// *
// ***************************************************************************
cy_GB{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/da.txt b/data/locales/da.txt
index c99205d..6ad387a 100644
--- a/data/locales/da.txt
+++ b/data/locales/da.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/da.xml
// *
@@ -13,7 +13,7 @@
AuxExemplarCharacters{"[á à â ç é è ê ë í î ï ñ ó ô ú ù û ÿ ü æ ä ø ö œ å]"}
ExemplarCharacters{"[a b c d e f g h i j k l m n o p q r s t u v w x y z æ ø å]"}
ExemplarCharactersIndex{"[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Æ Ø Å]"}
- ExemplarCharactersPunctuation{"[\- ‐ – , ; \: ! ? . … ' ‘ ’ \" “ ” ( ) \[ \] § @ * / \& # † ′ ″]"}
+ ExemplarCharactersPunctuation{"[\\- ‐ – , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ′ ″]"}
LocaleScript{
"Latn",
}
@@ -143,9 +143,16 @@
}
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
+ eras{
+ abbreviated{
+ "BE",
+ }
+ }
+ }
+ generic{
DateTimePatterns{
"HH.mm.ss zzzz",
"HH.mm.ss z",
@@ -154,7 +161,7 @@
"EEEE d. MMMM y G",
"d. MMMM y G",
"d. MMM y G",
- "d/M/yyyy",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -162,8 +169,11 @@
"{1} {0}",
}
availableFormats{
- Ed{"E d."}
+ Ed{"E 'd'. d."}
Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E d. MMM y G"}
+ GyMMMd{"d. MMM y G"}
H{"HH"}
Hm{"HH.mm"}
Hms{"HH.mm.ss"}
@@ -173,26 +183,117 @@
MMMEd{"E d. MMM"}
MMMMEd{"E d. MMMM"}
MMMd{"d. MMM"}
- MMdd{"dd/MM"}
Md{"d/M"}
d{"d."}
+ h{"h a"}
hm{"h.mm a"}
hms{"h.mm.ss a"}
ms{"mm.ss"}
y{"y G"}
- yM{"M/y G"}
- yMEd{"E d/M/y G"}
- yMMM{"MMM y G"}
- yMMMEd{"E d. MMM y G"}
- yMMMd{"d. MMM y G"}
- yMd{"d/M/y G"}
- yQQQ{"QQQ y G"}
- yQQQQ{"QQQQ y G"}
- yyMM{"MM/y G"}
- yyMMM{"MMM y G"}
yyyy{"y G"}
- yyyyMM{"MM/y G"}
+ yyyyM{"M/y G"}
+ yyyyMEd{"E d/M/y G"}
yyyyMMM{"MMM y G"}
+ yyyyMMMEd{"E d. MMM y G"}
+ yyyyMMMd{"d. MMM y G"}
+ yyyyMd{"d/M/y G"}
+ yyyyQQQ{"QQQ y G"}
+ yyyyQQQQ{"QQQQ y G"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH.mm–HH.mm"}
+ m{"HH.mm–HH.mm"}
+ }
+ Hmv{
+ H{"HH.mm–HH.mm v"}
+ m{"HH.mm–HH.mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E dd/MM – E dd/MM"}
+ d{"E dd/MM – E dd/MM"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E 'den' d. MMM – E 'den' d. MMM"}
+ d{"E 'den' d. – E 'den' d. MMM"}
+ }
+ MMMd{
+ M{"d. MMM – d. MMM"}
+ d{"d.–d. MMM"}
+ }
+ Md{
+ M{"dd/MM – dd/MM"}
+ d{"dd/MM – dd/MM"}
+ }
+ d{
+ d{"d.–d."}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h.mm a – h.mm a"}
+ h{"h.mm–h.mm a"}
+ m{"h.mm–h.mm a"}
+ }
+ hmv{
+ a{"h.mm a – h.mm a v"}
+ h{"h.mm–h.mm a v"}
+ m{"h.mm–h.mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y G"}
+ }
+ yM{
+ M{"MM/y – MM/y G"}
+ y{"MM/y – MM/y G"}
+ }
+ yMEd{
+ M{"E dd/MM/y – E dd/MM/y G"}
+ d{"E dd/MM/y – E dd/MM/y G"}
+ y{"E dd/MM/y – E dd/MM/y G"}
+ }
+ yMMM{
+ M{"MMM–MMM y G"}
+ y{"MMM y – MMM y G"}
+ }
+ yMMMEd{
+ M{"E 'den' d. MMM – E 'den' d. MMM y G"}
+ d{"E 'den' d. – E 'den' d. MMM y G"}
+ y{"E 'den' d. MMM y – E 'den' d. MMM y G"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y G"}
+ y{"MMMM y – MMMM y G"}
+ }
+ yMMMd{
+ M{"d. MMM – d. MMM y G"}
+ d{"d.–d. MMM y G"}
+ y{"d. MMM y – d. MMM y G"}
+ }
+ yMd{
+ M{"dd/MM/y – dd/MM/y G"}
+ d{"dd/MM/y – dd/MM/y G"}
+ y{"dd/MM/y – dd/MM/y G"}
+ }
}
}
gregorian{
@@ -207,7 +308,7 @@
"HH.mm",
"EEEE 'den' d. MMMM y",
"d. MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"dd/MM/yy",
"{1} {0}",
"{1} {0}",
@@ -217,6 +318,10 @@
}
availableFormats{
Ed{"E 'd'. d."}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E d. MMM y G"}
+ GyMMMd{"d. MMM y G"}
H{"HH"}
Hm{"HH.mm"}
Hms{"HH.mm.ss"}
@@ -236,17 +341,13 @@
y{"y"}
yM{"M/y"}
yMEd{"E d/M/y"}
+ yMM{"MM/y"}
yMMM{"MMM y"}
yMMMEd{"E d. MMM y"}
yMMMd{"d. MMM y"}
yMd{"d/M/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"MM/yy"}
- yyMMM{"MMM yy"}
- yyyy{"y"}
- yyyyMM{"MM/yyyy"}
- yyyyMMM{"MMM y"}
}
dayNames{
format{
@@ -336,63 +437,6 @@
"e.Kr.",
}
}
- fields{
- day{
- dn{"dag"}
- relative{
- "-1"{"i går"}
- "-2"{"i forgårs"}
- "0"{"i dag"}
- "1"{"i morgen"}
- "2"{"i overmorgen"}
- }
- }
- dayperiod{
- dn{"dagtid"}
- }
- era{
- dn{"æra"}
- }
- hour{
- dn{"time"}
- }
- minute{
- dn{"minut"}
- }
- month{
- dn{"måned"}
- relative{
- "-1"{"sidste måned"}
- "0"{"denne måned"}
- "1"{"næste måned"}
- }
- }
- second{
- dn{"sekund"}
- }
- week{
- dn{"uge"}
- relative{
- "-1"{"sidste uge"}
- "0"{"denne uge"}
- "1"{"næste uge"}
- }
- }
- weekday{
- dn{"ugedag"}
- }
- year{
- dn{"år"}
- relative{
- "-1"{"sidste år"}
- "0"{"i år"}
- "1"{"næste år"}
- }
- }
- zone{
- dn{"tidszone"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -456,13 +500,13 @@
y{"y–y"}
}
yM{
- M{"MM/yyyy – MM/yyyy"}
- y{"MM/yyyy – MM/yyyy"}
+ M{"MM/y – MM/y"}
+ y{"MM/y – MM/y"}
}
yMEd{
- M{"E dd/MM/yy – E dd/MM/yy"}
- d{"E dd/MM/yy – E dd/MM/yy"}
- y{"E dd/MM/yy – E dd/MM/yy"}
+ M{"E dd/MM/y – E dd/MM/y"}
+ d{"E dd/MM/y – E dd/MM/y"}
+ y{"E dd/MM/y – E dd/MM/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -483,9 +527,9 @@
y{"d. MMM y – d. MMM y"}
}
yMd{
- M{"dd/MM/yy – dd/MM/yy"}
- d{"dd/MM/yy – dd/MM/yy"}
- y{"dd/MM/yy – dd/MM/yy"}
+ M{"dd/MM/y – dd/MM/y"}
+ d{"dd/MM/y – dd/MM/y"}
+ y{"dd/MM/y – dd/MM/y"}
}
}
monthNames{
@@ -621,52 +665,18 @@
}
}
}
- islamic{
- DateTimePatterns{
- "HH.mm.ss zzzz",
- "HH.mm.ss z",
- "HH.mm.ss",
- "HH.mm",
- "EEEE d. MMMM y G",
- "d. MMMM y G",
- "d. MMM y G",
- "d/M/y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
+ hebrew{
+ eras{
+ abbreviated{
+ "AM",
+ }
}
- availableFormats{
- Ed{"E d."}
- Gy{"y G"}
- H{"HH"}
- Hm{"HH.mm"}
- Hms{"HH.mm.ss"}
- M{"M"}
- MEd{"E d/M"}
- MMM{"MMM"}
- MMMEd{"E d. MMM"}
- MMMMEd{"E d. MMMM"}
- MMMd{"d. MMM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d."}
- hm{"h.mm a"}
- hms{"h.mm.ss a"}
- ms{"mm.ss"}
- y{"y G"}
- yyMM{"MM/y G"}
- yyMMM{"MMM y G"}
- yyyy{"y G"}
- yyyyM{"M/y G"}
- yyyyMEd{"E d/M/y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E d. MMM y G"}
- yyyyMMMd{"d. MMM y G"}
- yyyyMd{"d/M/y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
+ }
+ islamic{
+ eras{
+ abbreviated{
+ "AH",
+ }
}
}
japanese{
@@ -678,93 +688,20 @@
"EEEE d. MMMM y G",
"d. MMMM y G",
"d. MMM y G",
- "d/M/y GGGGG",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
- availableFormats{
- Ed{"E d."}
- Gy{"y G"}
- H{"HH"}
- Hm{"HH.mm"}
- Hms{"HH.mm.ss"}
- M{"M"}
- MEd{"E d/M"}
- MMM{"MMM"}
- MMMEd{"E d. MMM"}
- MMMMEd{"E d. MMMM"}
- MMMd{"d. MMM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d."}
- hm{"h.mm a"}
- hms{"h.mm.ss a"}
- ms{"mm.ss"}
- y{"y G"}
- yyMM{"MM/y GGGGG"}
- yyMMM{"MMM y G"}
- yyyy{"y G"}
- yyyyM{"M/y GGGGG"}
- yyyyMEd{"E d/M/y GGGGG"}
- yyyyMM{"MM/y GGGGG"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E d. MMM y G"}
- yyyyMMMd{"d. MMM y G"}
- yyyyMd{"d/M/y GGGGG"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
- }
}
roc{
- DateTimePatterns{
- "HH.mm.ss zzzz",
- "HH.mm.ss z",
- "HH.mm.ss",
- "HH.mm",
- "EEEE d. MMMM y G",
- "d. MMMM y G",
- "d. MMM y G",
- "d/M/y GGGGG",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E d."}
- Gy{"y G"}
- H{"HH"}
- Hm{"HH.mm"}
- Hms{"HH.mm.ss"}
- M{"M"}
- MEd{"E d/M"}
- MMM{"MMM"}
- MMMEd{"E d. MMM"}
- MMMMEd{"E d. MMMM"}
- MMMd{"d. MMM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d."}
- hm{"h.mm a"}
- hms{"h.mm.ss a"}
- ms{"mm.ss"}
- y{"y G"}
- yyMM{"MM/y GGGGG"}
- yyMMM{"MMM y G"}
- yyyy{"y G"}
- yyyyM{"M/y GGGGG"}
- yyyyMEd{"E d/M/y GGGGG"}
- yyyyMM{"MM/y GGGGG"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E d. MMM y G"}
- yyyyMMMd{"d. MMM y G"}
- yyyyMd{"d/M/y GGGGG"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
+ eras{
+ abbreviated{
+ "Before R.O.C.",
+ "Minguo",
+ }
}
}
}
@@ -774,6 +711,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"dag"}
+ relative{
+ "-1"{"i går"}
+ "-2"{"i forgårs"}
+ "0"{"i dag"}
+ "1"{"i morgen"}
+ "2"{"i overmorgen"}
+ }
+ }
+ dayperiod{
+ dn{"dagtid"}
+ }
+ era{
+ dn{"æra"}
+ }
+ hour{
+ dn{"time"}
+ }
+ minute{
+ dn{"minut"}
+ }
+ month{
+ dn{"måned"}
+ relative{
+ "-1"{"sidste måned"}
+ "0"{"denne måned"}
+ "1"{"næste måned"}
+ }
+ }
+ second{
+ dn{"sekund"}
+ }
+ week{
+ dn{"uge"}
+ relative{
+ "-1"{"sidste uge"}
+ "0"{"denne uge"}
+ "1"{"næste uge"}
+ }
+ }
+ weekday{
+ dn{"ugedag"}
+ }
+ year{
+ dn{"år"}
+ relative{
+ "-1"{"sidste år"}
+ "0"{"i år"}
+ "1"{"næste år"}
+ }
+ }
+ zone{
+ dn{"tidszone"}
+ }
+ }
listPattern{
standard{
2{"{0} og {1}"}
diff --git a/data/locales/da_DK.txt b/data/locales/da_DK.txt
index 4835dfb..1f11b5d 100644
--- a/data/locales/da_DK.txt
+++ b/data/locales/da_DK.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/da_DK.xml
// *
// ***************************************************************************
da_DK{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/dav.txt b/data/locales/dav.txt
index a9ed6ae..6e43f37 100755
--- a/data/locales/dav.txt
+++ b/data/locales/dav.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dav.xml
// *
@@ -23,8 +23,50 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"Luma lwa K",
@@ -38,7 +80,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -113,43 +155,6 @@
"Baada ya Kristo",
}
}
- fields{
- day{
- dn{"Ituku"}
- relative{
- "-1"{"Iguo"}
- "0"{"Idime"}
- "1"{"Kesho"}
- }
- }
- dayperiod{
- dn{"KE/PE"}
- }
- era{
- dn{"Ngelo"}
- }
- hour{
- dn{"Saa"}
- }
- minute{
- dn{"Dakika"}
- }
- month{
- dn{"Mori"}
- }
- second{
- dn{"Sekunde"}
- }
- week{
- dn{"Juma"}
- }
- year{
- dn{"Mwaka"}
- }
- zone{
- dn{"Majira ya saa"}
- }
- }
monthNames{
format{
abbreviated{
@@ -222,4 +227,41 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Ituku"}
+ relative{
+ "-1"{"Iguo"}
+ "0"{"Idime"}
+ "1"{"Kesho"}
+ }
+ }
+ dayperiod{
+ dn{"KE/PE"}
+ }
+ era{
+ dn{"Ngelo"}
+ }
+ hour{
+ dn{"Saa"}
+ }
+ minute{
+ dn{"Dakika"}
+ }
+ month{
+ dn{"Mori"}
+ }
+ second{
+ dn{"Sekunde"}
+ }
+ week{
+ dn{"Juma"}
+ }
+ year{
+ dn{"Mwaka"}
+ }
+ zone{
+ dn{"Majira ya saa"}
+ }
+ }
}
diff --git a/data/locales/dav_KE.txt b/data/locales/dav_KE.txt
index 5ff9ab3..3e20d9d 100755
--- a/data/locales/dav_KE.txt
+++ b/data/locales/dav_KE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dav_KE.xml
// *
// ***************************************************************************
dav_KE{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/de.txt b/data/locales/de.txt
index a5a42a3..2cc34b6 100644
--- a/data/locales/de.txt
+++ b/data/locales/de.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/de.xml
// *
@@ -11,12 +11,15 @@
*/
de{
AuxExemplarCharacters{
- "[á à ă â å ã ā æ ç é è ĕ ê ë ē ğ í ì ĭ î ï {i\u0307} ī ı ñ ó ò ŏ ô ø ō œ ş ú"
- " ù ŭ û ū ÿ]"
+ "[á à ă â å ã ā æ ç é è ĕ ê ë ē ğ í ì ĭ î ï İ ī ı ñ ó ò ŏ ô ø ō œ ş ú ù ŭ û ū"
+ " ÿ]"
}
ExemplarCharacters{"[a ä b c d e f g h i j k l m n o ö p q r s ß t u ü v w x y z]"}
- ExemplarCharactersIndex{"[A B C D E F G H I J K L M N O P Q R S {Sch*} {St*} T U V W X Y Z]"} // Android patch: add Sch, St from ICU 51
- ExemplarCharactersPunctuation{"[\- ‐ – — , ; \: ! ? . … ' ‘ ‚ \" “ „ « » ( ) \[ \] \{ \} § @ * / \& #]"}
+ ExemplarCharactersIndex{"[A B C D E F G H I J K L M N O P Q R S {Sch*} {St*} T U V W X Y Z]"}
+ ExemplarCharactersPunctuation{
+ "[\\- ‐ – — , ; \\: ! ? . … ' ‘ ‚ \u0022 “ „ « » ( ) \\[ \\] \\{ \\} § @ * / "
+ "\\& #]"
+ }
LocaleScript{
"Latn",
}
@@ -146,18 +149,25 @@
}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
+ eras{
+ abbreviated{
+ "BE",
+ }
+ }
+ }
+ chinese{
DateTimePatterns{
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE d. MMMM y G",
- "d. MMMM y G",
- "d. MMM y G",
- "d.M.yyyy",
+ "EEEE, d. MMMM U",
+ "d. MMMM U",
+ "dd.MM U",
+ "dd.MM.yy",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -165,8 +175,11 @@
"{1} {0}",
}
availableFormats{
- Ed{"E d."}
- Gy{"y G"}
+ Ed{"E, d."}
+ Gy{"U"}
+ GyMMM{"MMM U"}
+ GyMMMEd{"E, d. MMM U"}
+ GyMMMd{"d. MMM U"}
H{"HH 'Uhr'"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -174,29 +187,171 @@
MEd{"E, d.M."}
MMM{"LLL"}
MMMEd{"E, d. MMM"}
- MMMMdd{"dd. MMMM"}
MMMd{"d. MMM"}
- MMd{"d.MM."}
- MMdd{"dd.MM."}
Md{"d.M."}
d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"U"}
+ yyyy{"U"}
+ yyyyM{"M.y"}
+ yyyyMEd{"E, d.M.y"}
+ yyyyMMM{"MMM U"}
+ yyyyMMMEd{"E, d. MMM U"}
+ yyyyMMMM{"MMMM U"}
+ yyyyMMMd{"d. MMM U"}
+ yyyyMd{"d.M.y"}
+ yyyyQQQ{"QQQ U"}
+ yyyyQQQQ{"QQQQ U"}
+ }
+ }
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d. MMMM y G",
+ "d. MMMM y G",
+ "dd.MM.y G",
+ "dd.MM.yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E, d."}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E, d. MMM y G"}
+ GyMMMd{"d. MMM y G"}
+ H{"HH 'Uhr'"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d.M."}
+ MMM{"LLL"}
+ MMMEd{"E, d. MMM"}
+ MMMd{"d. MMM"}
+ Md{"d.M."}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
ms{"mm:ss"}
y{"y G"}
- yM{"M.y G"}
- yMEd{"E, d.M.y G"}
- yMMM{"MMM y G"}
- yMMMEd{"E, d. MMM y G"}
- yMMMd{"d. MMM y G"}
- yMd{"d.M.y G"}
- yQQQ{"QQQ y G"}
- yQQQQ{"QQQQ y G"}
- yyMM{"MM.y G"}
- yyMMM{"MMM y G"}
- yyMMdd{"dd.MM.y G"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ y G"}
yyyy{"y G"}
+ yyyyM{"M.y GGGGG"}
+ yyyyMEd{"E, d.M.y GGGGG"}
+ yyyyMMM{"MMM y G"}
+ yyyyMMMEd{"E, d. MMM y G"}
yyyyMMMM{"MMMM y G"}
+ yyyyMMMd{"d. MMM y G"}
+ yyyyMd{"d.M.y GGGGG"}
+ yyyyQQQ{"QQQ y G"}
+ yyyyQQQQ{"QQQQ y G"}
+ }
+ intervalFormats{
+ H{
+ H{"HH-HH 'Uhr'"}
+ }
+ Hm{
+ H{"HH:mm-HH:mm"}
+ m{"HH:mm-HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm-HH:mm v"}
+ m{"HH:mm-HH:mm v"}
+ }
+ Hv{
+ H{"HH-HH 'Uhr' v"}
+ }
+ M{
+ M{"M.-M."}
+ }
+ MEd{
+ M{"E, dd.MM. - E, dd.MM."}
+ d{"E, dd.MM. - E, dd.MM."}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"E, d. MMM - E, d. MMM"}
+ d{"E, d. - E, d. MMM"}
+ }
+ MMMM{
+ M{"LLLL-LLLL"}
+ }
+ MMMd{
+ M{"d. MMM - d. MMM"}
+ d{"d.-d. MMM"}
+ }
+ Md{
+ M{"dd.MM. - dd.MM."}
+ d{"dd.MM. - dd.MM."}
+ }
+ d{
+ d{"d.-d."}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a - h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h:mm a - h:mm a"}
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ a{"h:mm a - h:mm a v"}
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"h a - h a v"}
+ h{"h-h a v"}
+ }
+ y{
+ y{"y-y G"}
+ }
+ yM{
+ M{"MM.y - MM.y G"}
+ y{"MM.y - MM.y G"}
+ }
+ yMEd{
+ M{"E, dd.MM.y - E, dd.MM.y G"}
+ d{"E, dd.MM.y - E, dd.MM.y G"}
+ y{"E, dd.MM.y - E, dd.MM.y G"}
+ }
+ yMMM{
+ M{"MMM-MMM y G"}
+ y{"MMM y - MMM y G"}
+ }
+ yMMMEd{
+ M{"E, d. MMM - E, d. MMM y G"}
+ d{"E, d. - E, d. MMM y G"}
+ y{"E, d. MMM y - E, d. MMM y G"}
+ }
+ yMMMM{
+ M{"MMMM-MMMM y G"}
+ y{"MMMM y - MMMM y G"}
+ }
+ yMMMd{
+ M{"d. MMM - d. MMM y G"}
+ d{"d.-d. MMM y G"}
+ y{"d. MMM y - d. MMM y G"}
+ }
+ yMd{
+ M{"dd.MM.y - dd.MM.y G"}
+ d{"dd.MM.y - dd.MM.y G"}
+ y{"dd.MM.y - dd.MM.y G"}
+ }
}
}
gregorian{
@@ -211,7 +366,7 @@
"HH:mm",
"EEEE, d. MMMM y",
"d. MMMM y",
- "dd.MM.yyyy",
+ "dd.MM.y",
"dd.MM.yy",
"{1} {0}",
"{1} {0}",
@@ -221,6 +376,10 @@
}
availableFormats{
Ed{"E, d."}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E, d. MMM y G"}
+ GyMMMd{"d. MMM y G"}
H{"HH 'Uhr'"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -242,19 +401,15 @@
y{"y"}
yM{"M.y"}
yMEd{"E, d.M.y"}
+ yMM{"MM.y"}
yMMM{"MMM y"}
yMMMEd{"E, d. MMM y"}
+ yMMMM{"MMMM y"}
yMMMd{"d. MMM y"}
+ yMMdd{"dd.MM.y"}
yMd{"d.M.y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"MM.yy"}
- yyMMM{"MMM yy"}
- yyMMdd{"dd.MM.yy"}
- yyQQQ{"QQQ yy"}
- yyQQQQ{"QQQQ yy"}
- yyyy{"y"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -344,63 +499,6 @@
"n. Chr.",
}
}
- fields{
- day{
- dn{"Tag"}
- relative{
- "-1"{"Gestern"}
- "-2"{"Vorgestern"}
- "0"{"Heute"}
- "1"{"Morgen"}
- "2"{"Übermorgen"}
- }
- }
- dayperiod{
- dn{"Tageshälfte"}
- }
- era{
- dn{"Epoche"}
- }
- hour{
- dn{"Stunde"}
- }
- minute{
- dn{"Minute"}
- }
- month{
- dn{"Monat"}
- relative{
- "-1"{"Letzter Monat"}
- "0"{"Dieser Monat"}
- "1"{"Nächster Monat"}
- }
- }
- second{
- dn{"Sekunde"}
- }
- week{
- dn{"Woche"}
- relative{
- "-1"{"Letzte Woche"}
- "0"{"Diese Woche"}
- "1"{"Nächste Woche"}
- }
- }
- weekday{
- dn{"Wochentag"}
- }
- year{
- dn{"Jahr"}
- relative{
- "-1"{"Letztes Jahr"}
- "0"{"Dieses Jahr"}
- "1"{"Nächstes Jahr"}
- }
- }
- zone{
- dn{"Zone"}
- }
- }
intervalFormats{
H{
H{"HH-HH 'Uhr'"}
@@ -467,13 +565,13 @@
y{"y-y"}
}
yM{
- M{"MM.yy - MM.yy"}
- y{"MM.yy - MM.yy"}
+ M{"MM.y - MM.y"}
+ y{"MM.y - MM.y"}
}
yMEd{
- M{"E, dd.MM.yy - E, dd.MM.yy"}
- d{"E, dd.MM.yy - E, dd.MM.yy"}
- y{"E, dd.MM.yy - E, dd.MM.yy"}
+ M{"E, dd.MM.y - E, dd.MM.y"}
+ d{"E, dd.MM.y - E, dd.MM.y"}
+ y{"E, dd.MM.y - E, dd.MM.y"}
}
yMMM{
M{"MMM-MMM y"}
@@ -494,9 +592,9 @@
y{"d. MMM y - d. MMM y"}
}
yMd{
- M{"dd.MM.yy - dd.MM.yy"}
- d{"dd.MM.yy - dd.MM.yy"}
- y{"dd.MM.yy - dd.MM.yy"}
+ M{"dd.MM.y - dd.MM.y"}
+ d{"dd.MM.y - dd.MM.y"}
+ y{"dd.MM.y - dd.MM.y"}
}
}
monthNames{
@@ -632,55 +730,18 @@
}
}
}
- islamic{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE d. MMMM y G",
- "d. MMMM y G",
- "d. MMM y G",
- "d.M.y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
+ hebrew{
+ eras{
+ abbreviated{
+ "AM",
+ }
}
- availableFormats{
- Ed{"E d."}
- Gy{"y G"}
- H{"HH 'Uhr'"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E, d.M."}
- MMM{"LLL"}
- MMMEd{"E, d. MMM"}
- MMMMdd{"dd. MMMM"}
- MMMd{"d. MMM"}
- MMd{"d.MM."}
- MMdd{"dd.MM."}
- Md{"d.M."}
- d{"d"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM.y G"}
- yyMMM{"MMM y G"}
- yyMMdd{"dd.MM.y G"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ y G"}
- yyyy{"y G"}
- yyyyM{"M.y G"}
- yyyyMEd{"E, d.M.y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E, d. MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d. MMM y G"}
- yyyyMd{"d.M.y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
+ }
+ islamic{
+ eras{
+ abbreviated{
+ "AH",
+ }
}
}
japanese{
@@ -689,98 +750,23 @@
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE d. MMMM y G",
+ "EEEE, d. MMMM y G",
"d. MMMM y G",
- "d. MMM y G",
- "d.M.y GGGGG",
+ "dd.MM.y G",
+ "dd.MM.yy GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
- availableFormats{
- Ed{"E d."}
- Gy{"y G"}
- H{"HH 'Uhr'"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E, d.M."}
- MMM{"LLL"}
- MMMEd{"E, d. MMM"}
- MMMMdd{"dd. MMMM"}
- MMMd{"d. MMM"}
- MMd{"d.MM."}
- MMdd{"dd.MM."}
- Md{"d.M."}
- d{"d"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM.y GGGGG"}
- yyMMM{"MMM y G"}
- yyMMdd{"dd.MM.y GGGGG"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ y G"}
- yyyy{"y G"}
- yyyyM{"M.y GGGGG"}
- yyyyMEd{"E, d.M.y GGGGG"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E, d. MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d. MMM y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
- }
}
roc{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE d. MMMM y G",
- "d. MMMM y G",
- "d. MMM y G",
- "d.M.y GGGGG",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E d."}
- Gy{"y G"}
- H{"HH 'Uhr'"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E, d.M."}
- MMM{"LLL"}
- MMMEd{"E, d. MMM"}
- MMMMdd{"dd. MMMM"}
- MMMd{"d. MMM"}
- MMd{"d.MM."}
- MMdd{"dd.MM."}
- Md{"d.M."}
- d{"d"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM.y GGGGG"}
- yyMMM{"MMM y G"}
- yyMMdd{"dd.MM.y GGGGG"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ y G"}
- yyyy{"y G"}
- yyyyM{"M.y GGGGG"}
- yyyyMEd{"E, d.M.y GGGGG"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E, d. MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d. MMM y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
+ eras{
+ abbreviated{
+ "Before R.O.C.",
+ "Minguo",
+ }
}
}
}
@@ -790,6 +776,63 @@
quotationEnd{"“"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"Tag"}
+ relative{
+ "-1"{"Gestern"}
+ "-2"{"Vorgestern"}
+ "0"{"Heute"}
+ "1"{"Morgen"}
+ "2"{"Übermorgen"}
+ }
+ }
+ dayperiod{
+ dn{"Tageshälfte"}
+ }
+ era{
+ dn{"Epoche"}
+ }
+ hour{
+ dn{"Stunde"}
+ }
+ minute{
+ dn{"Minute"}
+ }
+ month{
+ dn{"Monat"}
+ relative{
+ "-1"{"Letzter Monat"}
+ "0"{"Dieser Monat"}
+ "1"{"Nächster Monat"}
+ }
+ }
+ second{
+ dn{"Sekunde"}
+ }
+ week{
+ dn{"Woche"}
+ relative{
+ "-1"{"Letzte Woche"}
+ "0"{"Diese Woche"}
+ "1"{"Nächste Woche"}
+ }
+ }
+ weekday{
+ dn{"Wochentag"}
+ }
+ year{
+ dn{"Jahr"}
+ relative{
+ "-1"{"Letztes Jahr"}
+ "0"{"Dieses Jahr"}
+ "1"{"Nächstes Jahr"}
+ }
+ }
+ zone{
+ dn{"Zone"}
+ }
+ }
listPattern{
standard{
2{"{0} und {1}"}
diff --git a/data/locales/de_AT.txt b/data/locales/de_AT.txt
index a2f76e8..1f05362 100644
--- a/data/locales/de_AT.txt
+++ b/data/locales/de_AT.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/de_AT.xml
// *
@@ -14,8 +14,25 @@
}
}
}
- Version{"2.0.65.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, dd. MMMM y G",
+ "dd. MMMM y G",
+ "dd.MM.y G",
+ "dd.MM.yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
gregorian{
DateTimePatterns{
"HH:mm:ss zzzz",
@@ -24,7 +41,7 @@
"HH:mm",
"EEEE, dd. MMMM y",
"dd. MMMM y",
- "dd.MM.yyyy",
+ "dd.MM.y",
"dd.MM.yy",
"{1} {0}",
"{1} {0}",
diff --git a/data/locales/de_BE.txt b/data/locales/de_BE.txt
index 6de431c..561b531 100644
--- a/data/locales/de_BE.txt
+++ b/data/locales/de_BE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/de_BE.xml
// *
// ***************************************************************************
de_BE{
- Version{"2.0.58.78"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/de_CH.txt b/data/locales/de_CH.txt
index e187bb7..b014900 100644
--- a/data/locales/de_CH.txt
+++ b/data/locales/de_CH.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/de_CH.xml
// *
@@ -18,7 +18,7 @@
}
}
}
- Version{"2.0.65.46"}
+ Version{"2.0.82.45"}
delimiters{
alternateQuotationEnd{"›"}
alternateQuotationStart{"‹"}
diff --git a/data/locales/de_DE.txt b/data/locales/de_DE.txt
index 215499f..99ddd7b 100644
--- a/data/locales/de_DE.txt
+++ b/data/locales/de_DE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/de_DE.xml
// *
// ***************************************************************************
de_DE{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/de_LI.txt b/data/locales/de_LI.txt
index 6a7dd9c..65c65b8 100644
--- a/data/locales/de_LI.txt
+++ b/data/locales/de_LI.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/de_LI.xml
// *
@@ -18,5 +18,5 @@
}
}
}
- Version{"2.0.65.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/de_LU.txt b/data/locales/de_LU.txt
index f9a6bb8..758e04e 100644
--- a/data/locales/de_LU.txt
+++ b/data/locales/de_LU.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/de_LU.xml
// *
// ***************************************************************************
de_LU{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/dje.txt b/data/locales/dje.txt
index 8a4c078..0478a9b 100755
--- a/data/locales/dje.txt
+++ b/data/locales/dje.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dje.xml
// *
@@ -29,8 +29,49 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM, y G",
+ "d/M/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"Subbaahi",
@@ -44,7 +85,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM, y",
- "d/M/yyyy",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -118,43 +159,6 @@
"Isaa zamanoo",
}
}
- fields{
- day{
- dn{"Zaari"}
- relative{
- "-1"{"Bi"}
- "0"{"Hõo"}
- "1"{"Suba"}
- }
- }
- dayperiod{
- dn{"Subbaahi/Zaarikay banda"}
- }
- era{
- dn{"Zaman"}
- }
- hour{
- dn{"Guuru"}
- }
- minute{
- dn{"Miniti"}
- }
- month{
- dn{"Handu"}
- }
- second{
- dn{"Miti"}
- }
- week{
- dn{"Hebu"}
- }
- year{
- dn{"Jiiri"}
- }
- zone{
- dn{"Leerazuu"}
- }
- }
monthNames{
format{
abbreviated{
@@ -227,4 +231,41 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Zaari"}
+ relative{
+ "-1"{"Bi"}
+ "0"{"Hõo"}
+ "1"{"Suba"}
+ }
+ }
+ dayperiod{
+ dn{"Subbaahi/Zaarikay banda"}
+ }
+ era{
+ dn{"Zaman"}
+ }
+ hour{
+ dn{"Guuru"}
+ }
+ minute{
+ dn{"Miniti"}
+ }
+ month{
+ dn{"Handu"}
+ }
+ second{
+ dn{"Miti"}
+ }
+ week{
+ dn{"Hebu"}
+ }
+ year{
+ dn{"Jiiri"}
+ }
+ zone{
+ dn{"Leerazuu"}
+ }
+ }
}
diff --git a/data/locales/dje_NE.txt b/data/locales/dje_NE.txt
index cf7f9e6..b31a29d 100755
--- a/data/locales/dje_NE.txt
+++ b/data/locales/dje_NE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dje_NE.xml
// *
// ***************************************************************************
dje_NE{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/dua.txt b/data/locales/dua.txt
index 3d28c5e..d01b58c 100755
--- a/data/locales/dua.txt
+++ b/data/locales/dua.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dua.xml
// *
@@ -32,8 +32,49 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d/M/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"idiɓa",
@@ -47,7 +88,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM y",
- "d/M/yyyy",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -121,43 +162,6 @@
"mbúsa kwédi a Yés",
}
}
- fields{
- day{
- dn{"búnyá"}
- relative{
- "-1"{"kíɛlɛ nítómb́í"}
- "0"{"wɛ́ŋgɛ̄"}
- "1"{"kíɛlɛ"}
- }
- }
- dayperiod{
- dn{"epasi a búnyá"}
- }
- era{
- dn{"póndá"}
- }
- hour{
- dn{"ŋgandɛ"}
- }
- minute{
- dn{"ndɔkɔ"}
- }
- month{
- dn{"mɔ́di"}
- }
- second{
- dn{"píndí"}
- }
- week{
- dn{"disama"}
- }
- weekday{
- dn{"mínyá má disama"}
- }
- year{
- dn{"mbú"}
- }
- }
monthNames{
format{
abbreviated{
@@ -230,4 +234,41 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"búnyá"}
+ relative{
+ "-1"{"kíɛlɛ nítómb́í"}
+ "0"{"wɛ́ŋgɛ̄"}
+ "1"{"kíɛlɛ"}
+ }
+ }
+ dayperiod{
+ dn{"epasi a búnyá"}
+ }
+ era{
+ dn{"póndá"}
+ }
+ hour{
+ dn{"ŋgandɛ"}
+ }
+ minute{
+ dn{"ndɔkɔ"}
+ }
+ month{
+ dn{"mɔ́di"}
+ }
+ second{
+ dn{"píndí"}
+ }
+ week{
+ dn{"disama"}
+ }
+ weekday{
+ dn{"mínyá má disama"}
+ }
+ year{
+ dn{"mbú"}
+ }
+ }
}
diff --git a/data/locales/dua_CM.txt b/data/locales/dua_CM.txt
index fd8f10f..70b2fec 100755
--- a/data/locales/dua_CM.txt
+++ b/data/locales/dua_CM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dua_CM.xml
// *
// ***************************************************************************
dua_CM{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/dyo.txt b/data/locales/dyo.txt
index 3406e87..c9a2921 100755
--- a/data/locales/dyo.txt
+++ b/data/locales/dyo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dyo.xml
// *
@@ -29,8 +29,49 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d/M/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
DateTimePatterns{
"HH:mm:ss zzzz",
@@ -40,7 +81,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM y",
- "d/M/yyyy",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -114,31 +155,6 @@
"Atooŋe Yeesu",
}
}
- fields{
- day{
- dn{"Funak"}
- relative{
- "-1"{"Fucen"}
- "0"{"Jaat"}
- "1"{"Kajom"}
- }
- }
- dayperiod{
- dn{"Bujom / Kalíim"}
- }
- era{
- dn{"Jamanay"}
- }
- month{
- dn{"Fuleeŋ"}
- }
- week{
- dn{"Lóokuŋ"}
- }
- year{
- dn{"Emit"}
- }
- }
monthNames{
format{
abbreviated{
@@ -195,4 +211,29 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"Funak"}
+ relative{
+ "-1"{"Fucen"}
+ "0"{"Jaat"}
+ "1"{"Kajom"}
+ }
+ }
+ dayperiod{
+ dn{"Bujom / Kalíim"}
+ }
+ era{
+ dn{"Jamanay"}
+ }
+ month{
+ dn{"Fuleeŋ"}
+ }
+ week{
+ dn{"Lóokuŋ"}
+ }
+ year{
+ dn{"Emit"}
+ }
+ }
}
diff --git a/data/locales/dyo_SN.txt b/data/locales/dyo_SN.txt
index af2084f..1d1177b 100755
--- a/data/locales/dyo_SN.txt
+++ b/data/locales/dyo_SN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dyo_SN.xml
// *
// ***************************************************************************
dyo_SN{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/dz.txt b/data/locales/dz.txt
index 13515bf..95d1c85 100755
--- a/data/locales/dz.txt
+++ b/data/locales/dz.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dz.xml
// *
@@ -22,8 +22,8 @@
}
ExemplarCharactersIndex{"[ཀ ཁ ག ང ཅ ཆ ཇ ཉ ཏ ཐ ད ན པ ཕ བ མ ཙ ཚ ཛ ཝ ཞ ཟ འ ཡ ར ལ ཤ ས ཧ ཨ]"}
ExemplarCharactersPunctuation{
- "[\- ‐ – — , ; \: ༔ ! ? . … ' ‘ ’ \" “ ” ( ) \[ \] ༼ ༽ § @ * / \& # † ‡ ༄ ༅ ༆"
- " ༈ ༉ ༊ ࿐ ࿑ ༌ ། ༎ ༏ ༐ ༑ ༒ ࿒ ࿓ ࿔ ༴ ༶ ྾ ྿]"
+ "[\\- ‐ – — , ; \\: ༔ ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] ༼ ༽ § @ * / \\& # "
+ "† ‡ ༄ ༅ ༆ ༈ ༉ ༊ ࿐ ࿑ ༌ ། ༎ ༏ ༐ ༑ ༒ ࿒ ࿓ ࿔ ༴ ༶ ྾ ྿]"
}
LocaleScript{
"Tibt",
@@ -106,8 +106,146 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "ཆུ་ཚོད་ h སྐར་མ་ mm:ss a zzzz",
+ "ཆུ་ཚོད་ h སྐར་མ་ mm:ss a z",
+ "ཆུ་ཚོད་h:mm:ss a",
+ "ཆུ་ཚོད་ h སྐར་མ་ mm a",
+ "EEEE, G སྤྱི་ལོ་y MMMM ཚེས་dd",
+ "G སྤྱི་ལོ་y MMMM ཚེས་ dd",
+ "G སྤྱི་ལོ་y ཟླ་MMM ཚེས་dd",
+ "GGGGG y-MM-dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ H{"ཆུ་ཚོད་HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M-d"}
+ MMM{"སྤྱི་LLL"}
+ MMMEd{"E, སྤྱི་LLL ཚེ་d"}
+ MMMd{"སྤྱི་LLL ཚེ་d"}
+ Md{"M-d"}
+ d{"d"}
+ h{"ཆུ་ཚོད་h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"y-M"}
+ yMEd{"E, y-M-d"}
+ yMMM{"y སྤྱི་ཟླ་MMM"}
+ yMMMEd{"གཟའ་E, ལོy ཟླ་MMM ཚེ་d"}
+ yMMMd{"y MMM d"}
+ yMd{"y-M-d"}
+ yQQQ{"y QQQ"}
+ yQQQQ{"y QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"སྤྱི་ཟླ་M–M"}
+ }
+ MEd{
+ M{"E, སྤྱི་ཟླ་MM ཚེས་dd–ཟླ་MM ཚེས་dd"}
+ d{"E, སྤྱི་ཟླ་MM ཚེས་dd–ཟླ་MM ཚེས་dd"}
+ }
+ MMM{
+ M{"སྤྱི་LLL–LLL"}
+ }
+ MMMEd{
+ M{"E, སྤྱི་ཟླ་MM ཚེས་d – E, ཟླ་MM ཚེས་d"}
+ d{"E, སྤྱི་ཟླ་MM ཚེས་d – E, ཟླ་MM ཚེས་d"}
+ }
+ MMMd{
+ M{"སྤྱི་ཟླ་MM ཚེས་d–ཟླ་MM ཚེས་d"}
+ d{"སྤྱི་ཟླ་MM ཚེས་d–d"}
+ }
+ Md{
+ M{"སྤྱི་ཟླ་MM ཚེས་dd–ཟླ་MM ཚེས་dd"}
+ d{"སྤྱི་ཟླ་M ཚེས་dd/dd"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"y-MM – MM"}
+ y{"y-MM – y-MM"}
+ }
+ yMEd{
+ M{"E, y-MM-dd – E, y-MM-dd"}
+ d{"E, y-MM-dd – E, y-MM-dd"}
+ y{"E, y-MM-dd – E, y-MM-dd"}
+ }
+ yMMM{
+ M{"སྤྱི་ཟླ་MMM/MMM, y"}
+ y{"y-MM – y-MM"}
+ }
+ yMMMEd{
+ M{"E, y-MM-dd – E, y-MM-dd"}
+ d{"E, y-MM-dd – E, y-MM-dd"}
+ y{"E, y-MM-dd – E, y-MM-dd"}
+ }
+ yMMMM{
+ M{"y-སྤྱི་ཟླ་MM – MM"}
+ y{"y-MM – y-MM"}
+ }
+ yMMMd{
+ M{"y-MM-dd – MM-d"}
+ d{"y-MM-d – d"}
+ y{"y-MM-dd – y-MM-dd"}
+ }
+ yMd{
+ M{"y-MM-dd – MM-dd"}
+ d{"y-MM-dd – dd"}
+ y{"y-MM-dd – y-MM-dd"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"སྔ་ཆ་",
@@ -121,7 +259,7 @@
"EEEE, སྤྱི་ལོ་y MMMM ཚེས་dd",
"སྤྱི་ལོ་y MMMM ཚེས་ dd",
"སྤྱི་ལོ་y ཟླ་MMM ཚེས་dd",
- "yyyy-MM-dd",
+ "y-MM-dd",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -238,48 +376,6 @@
"CE",
}
}
- fields{
- day{
- dn{"ཚེས་"}
- relative{
- "-1"{"ཁ་ཙ་"}
- "-2"{"ཁ་ཉིམ"}
- "0"{"ད་རིས་"}
- "1"{"ནངས་པ་"}
- "2"{"གནངས་ཚེ"}
- }
- }
- dayperiod{
- dn{"སྔ་ཆ/ཕྱི་ཆ་"}
- }
- era{
- dn{"དུས་བསྐལ"}
- }
- hour{
- dn{"ཆུ་ཚོད"}
- }
- minute{
- dn{"སྐར་མ"}
- }
- month{
- dn{"ཟླ་ཝ་"}
- }
- second{
- dn{"སྐར་ཆཱ་"}
- }
- week{
- dn{"བདུན་ཕྲག"}
- }
- weekday{
- dn{"བདུན་ཕྲག་གི་ཉིམ"}
- }
- year{
- dn{"ལོ"}
- }
- zone{
- dn{"དུས་ཀུལ"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -343,36 +439,36 @@
y{"y–y"}
}
yM{
- M{"yyyy-MM – MM"}
- y{"yyyy-MM – yyyy-MM"}
+ M{"y-MM – MM"}
+ y{"y-MM – y-MM"}
}
yMEd{
- M{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
- d{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
- y{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
+ M{"E, y-MM-dd – E, y-MM-dd"}
+ d{"E, y-MM-dd – E, y-MM-dd"}
+ y{"E, y-MM-dd – E, y-MM-dd"}
}
yMMM{
M{"སྤྱི་ཟླ་MMM/MMM, y"}
- y{"yyyy-MM – yyyy-MM"}
+ y{"y-MM – y-MM"}
}
yMMMEd{
- M{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
- d{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
- y{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
+ M{"E, y-MM-dd – E, y-MM-dd"}
+ d{"E, y-MM-dd – E, y-MM-dd"}
+ y{"E, y-MM-dd – E, y-MM-dd"}
}
yMMMM{
- M{"yyyy-སྤྱི་ཟླ་MM – MM"}
- y{"yyyy-MM – yyyy-MM"}
+ M{"y-སྤྱི་ཟླ་MM – MM"}
+ y{"y-MM – y-MM"}
}
yMMMd{
- M{"yyyy-MM-dd – MM-d"}
- d{"yyyy-MM-d – d"}
- y{"yyyy-MM-dd – yyyy-MM-dd"}
+ M{"y-MM-dd – MM-d"}
+ d{"y-MM-d – d"}
+ y{"y-MM-dd – y-MM-dd"}
}
yMd{
- M{"yyyy-MM-dd – MM-dd"}
- d{"yyyy-MM-dd – dd"}
- y{"yyyy-MM-dd – yyyy-MM-dd"}
+ M{"y-MM-dd – MM-dd"}
+ d{"y-MM-dd – dd"}
+ y{"y-MM-dd – y-MM-dd"}
}
}
monthNames{
@@ -515,6 +611,48 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"ཚེས་"}
+ relative{
+ "-1"{"ཁ་ཙ་"}
+ "-2"{"ཁ་ཉིམ"}
+ "0"{"ད་རིས་"}
+ "1"{"ནངས་པ་"}
+ "2"{"གནངས་ཚེ"}
+ }
+ }
+ dayperiod{
+ dn{"སྔ་ཆ/ཕྱི་ཆ་"}
+ }
+ era{
+ dn{"དུས་བསྐལ"}
+ }
+ hour{
+ dn{"ཆུ་ཚོད"}
+ }
+ minute{
+ dn{"སྐར་མ"}
+ }
+ month{
+ dn{"ཟླ་ཝ་"}
+ }
+ second{
+ dn{"སྐར་ཆཱ་"}
+ }
+ week{
+ dn{"བདུན་ཕྲག"}
+ }
+ weekday{
+ dn{"བདུན་ཕྲག་གི་ཉིམ"}
+ }
+ year{
+ dn{"ལོ"}
+ }
+ zone{
+ dn{"དུས་ཀུལ"}
+ }
+ }
listPattern{
standard{
2{"{0} དང་ {1}"}
diff --git a/data/locales/dz_BT.txt b/data/locales/dz_BT.txt
index e14e4de..99d85f7 100755
--- a/data/locales/dz_BT.txt
+++ b/data/locales/dz_BT.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dz_BT.xml
// *
// ***************************************************************************
dz_BT{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ebu.txt b/data/locales/ebu.txt
index 0a88ea1..e325c99 100755
--- a/data/locales/ebu.txt
+++ b/data/locales/ebu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ebu.xml
// *
@@ -22,8 +22,50 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"KI",
@@ -37,7 +79,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -112,43 +154,6 @@
"Thutha wa Kristo",
}
}
- fields{
- day{
- dn{"Mũthenya"}
- relative{
- "-1"{"Ĩgoro"}
- "0"{"Ũmũnthĩ"}
- "1"{"Rũciũ"}
- }
- }
- era{
- dn{"Ivinda"}
- }
- hour{
- dn{"Ithaa"}
- }
- minute{
- dn{"Ndagĩka"}
- }
- month{
- dn{"Mweri"}
- }
- second{
- dn{"Sekondi"}
- }
- week{
- dn{"Kiumia"}
- }
- weekday{
- dn{"Mũthenya kiumia-inĩ"}
- }
- year{
- dn{"Mwaka"}
- }
- zone{
- dn{"Gĩthaa"}
- }
- }
monthNames{
format{
abbreviated{
@@ -221,4 +226,41 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Mũthenya"}
+ relative{
+ "-1"{"Ĩgoro"}
+ "0"{"Ũmũnthĩ"}
+ "1"{"Rũciũ"}
+ }
+ }
+ era{
+ dn{"Ivinda"}
+ }
+ hour{
+ dn{"Ithaa"}
+ }
+ minute{
+ dn{"Ndagĩka"}
+ }
+ month{
+ dn{"Mweri"}
+ }
+ second{
+ dn{"Sekondi"}
+ }
+ week{
+ dn{"Kiumia"}
+ }
+ weekday{
+ dn{"Mũthenya kiumia-inĩ"}
+ }
+ year{
+ dn{"Mwaka"}
+ }
+ zone{
+ dn{"Gĩthaa"}
+ }
+ }
}
diff --git a/data/locales/ebu_KE.txt b/data/locales/ebu_KE.txt
index 6a9aa7a..479af91 100755
--- a/data/locales/ebu_KE.txt
+++ b/data/locales/ebu_KE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ebu_KE.xml
// *
// ***************************************************************************
ebu_KE{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ee.txt b/data/locales/ee.txt
index 9cb413b..0e468ca 100755
--- a/data/locales/ee.txt
+++ b/data/locales/ee.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ee.xml
// *
@@ -16,7 +16,10 @@
" l m n ŋ o ó ò õ ɔ {ɔ\u0301} {ɔ\u0300} {ɔ\u0303} p r s t u ú ù ũ v ʋ w y z]"
}
ExemplarCharactersIndex{"[A B D Ɖ E Ɛ F Ƒ G Ɣ H X I K L M N Ŋ O Ɔ P R S T U V Ʋ W Y Z]"}
- ExemplarCharactersPunctuation{"[\- ‐ – — , ; \: ! ? . … ' ‘ ’ \" “ ” ( ) \[ \] \{ \} § @ * / \& # † ‡ ′ ″]"}
+ ExemplarCharactersPunctuation{
+ "[\\- ‐ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] \\{ \\} § @ * / \\& "
+ "# † ‡ ′ ″]"
+ }
LocaleScript{
"Latn",
}
@@ -74,8 +77,146 @@
}
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
calendar{
+ generic{
+ DateTimePatterns{
+ "a h:mm:ss zzzz",
+ "a 'ga' h:mm:ss z",
+ "a 'ga' h:mm:ss",
+ "a 'ga' h:mm",
+ "EEEE, MMMM d 'lia' y G",
+ "MMMM d 'lia' y G",
+ "MMM d 'lia', y G",
+ "M/d/yy GGGGG",
+ "{0} {1}",
+ "{0} {1}",
+ "{0} {1}",
+ "{0} {1}",
+ "{0} {1}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d 'lia'"}
+ MMMMEd{"E, MMMM d 'lia'"}
+ MMMMd{"MMMM d 'lia'"}
+ MMMd{"MMM d 'lia'"}
+ Md{"M/d"}
+ d{"d"}
+ h{"a 'ga' h"}
+ hm{"a 'ga' h:mm"}
+ hms{"a 'ga' h:mm:ss"}
+ ms{"'aɖabaƒoƒo' mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"MMM d 'lia', y"}
+ yMd{"M/d/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"'ɣleti' M 'lia' – 'ɣleti' M 'lia'"}
+ }
+ MEd{
+ M{"E, M/d – E, M/d"}
+ d{"E, M/d – E, M/d"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E, MMM d 'lia' – E, MMM d 'lia'"}
+ d{"E, MMM d 'lia' – E, MMM d 'lia'"}
+ }
+ MMMd{
+ M{"MMM d 'lia' – MMM d 'lia'"}
+ d{"MMM d 'lia' – d 'lia'"}
+ }
+ Md{
+ M{"M/d – M/d"}
+ d{"M/d – M/d"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"a h – a h"}
+ h{"a h–h"}
+ }
+ hm{
+ a{"a 'ga' h:mm - a 'ga' h:mm"}
+ h{"a 'ga' h:mm - 'ga' h:mm"}
+ m{"a 'ga' h:mm – 'ga' h:mm"}
+ }
+ hmv{
+ a{"a 'ga' h:mm – a 'ga' h:mm v"}
+ h{"a 'ga' h:mm–h:mm v"}
+ m{"a h:mm–h:mm v"}
+ }
+ hv{
+ a{"a h – a h v"}
+ h{"a 'ga' h–h v"}
+ }
+ yM{
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
+ }
+ yMEd{
+ M{"E, M/d/y – E, M/d/y"}
+ d{"E, M/d/y – E, M/d/y"}
+ y{"E, M/d/y – E, M/d/y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y – MMM y"}
+ }
+ yMMMEd{
+ M{"E, MMM d 'lia' – E, MMM d 'lia', y"}
+ d{"E, MMM d 'lia' – E, MMM d 'lia', y"}
+ y{"E, MMM d 'lia', y – E, MMM d 'lia', y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"MMM d 'lia' – MMM d 'lia', y"}
+ d{"MMM d 'lia' – d 'lia' , y"}
+ y{"MMM d 'lia' , y – MMM d 'lia', y"}
+ }
+ yMd{
+ M{"M/d/y – M/d/y"}
+ d{"M/d/y – M/d/y"}
+ y{"M/d/y – M/d/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"ŋdi",
@@ -213,48 +354,6 @@
"Yesu Ŋɔli",
}
}
- fields{
- day{
- dn{"ŋkeke"}
- relative{
- "-1"{"etsɔ si va yi"}
- "-2"{"nyitsɔ"}
- "0"{"egbe"}
- "1"{"etsɔ si gbɔna"}
- "2"{"nyitsɔ si gbɔna"}
- }
- }
- dayperiod{
- dn{"ŋkekea me"}
- }
- era{
- dn{"ŋɔli"}
- }
- hour{
- dn{"gaƒoƒo"}
- }
- minute{
- dn{"Mintigaƒoƒo"}
- }
- month{
- dn{"Xleti"}
- }
- second{
- dn{"sekend"}
- }
- week{
- dn{"kɔsiɖa ɖeka"}
- }
- weekday{
- dn{"kɔsiɖa me ŋkeke"}
- }
- year{
- dn{"ƒe"}
- }
- zone{
- dn{"nutomegaƒoƒome"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -315,13 +414,13 @@
h{"a 'ga' h–h v"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E, M/d/yy – E, M/d/yy"}
- d{"E, M/d/yy – E, M/d/yy"}
- y{"E, M/d/yy – E, M/d/yy"}
+ M{"E, M/d/y – E, M/d/y"}
+ d{"E, M/d/y – E, M/d/y"}
+ y{"E, M/d/y – E, M/d/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -342,9 +441,9 @@
y{"MMM d 'lia' , y – MMM d 'lia', y"}
}
yMd{
- M{"M/d/yy – M/d/yy"}
- d{"M/d/yy – M/d/yy"}
- y{"M/d/yy – M/d/yy"}
+ M{"M/d/y – M/d/y"}
+ d{"M/d/y – M/d/y"}
+ y{"M/d/y – M/d/y"}
}
}
monthNames{
@@ -481,6 +580,48 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"ŋkeke"}
+ relative{
+ "-1"{"etsɔ si va yi"}
+ "-2"{"nyitsɔ"}
+ "0"{"egbe"}
+ "1"{"etsɔ si gbɔna"}
+ "2"{"nyitsɔ si gbɔna"}
+ }
+ }
+ dayperiod{
+ dn{"ŋkekea me"}
+ }
+ era{
+ dn{"ŋɔli"}
+ }
+ hour{
+ dn{"gaƒoƒo"}
+ }
+ minute{
+ dn{"Mintigaƒoƒo"}
+ }
+ month{
+ dn{"Xleti"}
+ }
+ second{
+ dn{"sekend"}
+ }
+ week{
+ dn{"kɔsiɖa ɖeka"}
+ }
+ weekday{
+ dn{"kɔsiɖa me ŋkeke"}
+ }
+ year{
+ dn{"ƒe"}
+ }
+ zone{
+ dn{"nutomegaƒoƒome"}
+ }
+ }
listPattern{
standard{
2{"{0} kple {1}"}
diff --git a/data/locales/ee_GH.txt b/data/locales/ee_GH.txt
index 4e979b1..85a4a5e 100755
--- a/data/locales/ee_GH.txt
+++ b/data/locales/ee_GH.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ee_GH.xml
// *
// ***************************************************************************
ee_GH{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ee_TG.txt b/data/locales/ee_TG.txt
index 4525fc6..e994dfb 100755
--- a/data/locales/ee_TG.txt
+++ b/data/locales/ee_TG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ee_TG.xml
// *
// ***************************************************************************
ee_TG{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/el.txt b/data/locales/el.txt
index d8537ba..5aeb752 100644
--- a/data/locales/el.txt
+++ b/data/locales/el.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/el.xml
// *
@@ -16,7 +16,7 @@
}
ExemplarCharacters{"[α ά β γ δ ε έ ζ η ή θ ι ί ϊ ΐ κ λ μ ν ξ ο ό π ρ σ ς τ υ ύ ϋ ΰ φ χ ψ ω ώ]"}
ExemplarCharactersIndex{"[Α Β Γ Δ Ε Ζ Η Θ Ι Κ Λ Μ Ν Ξ Ο Π Ρ Σ Τ Υ Φ Χ Ψ Ω]"}
- ExemplarCharactersPunctuation{"[\- ‐ – — , ; \: ! . … \" ( ) \[ \] § @ * / \\ \&]"}
+ ExemplarCharactersPunctuation{"[\\- ‐ – — , ; \\: ! . … \u0022 ( ) \\[ \\] § @ * / \\\\ \\&]"}
LocaleScript{
"Grek",
}
@@ -148,7 +148,7 @@
native{"latn"}
traditional{"grek"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
DateTimePatterns{
@@ -159,7 +159,7 @@
"EEEE, d MMMM, y G",
"d MMMM, y G",
"d MMM, y G",
- "d/M/yyyy",
+ "d/M/y",
"{1} - {0}",
"{1} - {0}",
"{1} - {0}",
@@ -183,6 +183,153 @@
yMd{"d/M/y"}
}
}
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d/M/yy GGGGG",
+ "{1} - {0}",
+ "{1} - {0}",
+ "{1} - {0}",
+ "{1} - {0}",
+ "{1} - {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ H{"HH"}
+ HHmm{"HH:mm"}
+ HHmmss{"HH:mm:ss"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d/M"}
+ MMM{"LLL"}
+ MMMEd{"E, d MMM"}
+ MMMMEd{"E, d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMMdd{"dd MMMM"}
+ MMMd{"d MMM"}
+ MMdd{"dd/MM"}
+ Md{"d/M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ mmss{"mm:ss"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, d/M/y"}
+ yMM{"MM/y"}
+ yMMM{"LLL y"}
+ yMMMEd{"E, d MMM y"}
+ yMMMM{"LLLL y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"y QQQ"}
+ yQQQQ{"y QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E, dd/MM - E, dd/MM"}
+ d{"E, dd/MM - E, dd/MM"}
+ }
+ MMM{
+ M{"LLL-LLL"}
+ }
+ MMMEd{
+ M{"E, dd MMM - E, dd MMM"}
+ d{"E, dd - E, dd MMM"}
+ }
+ MMMd{
+ M{"dd MMM - dd MMM"}
+ d{"dd-dd MMM"}
+ }
+ Md{
+ M{"dd/MM - dd/MM"}
+ d{"dd/MM - dd/MM"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a - h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h:mm a - h:mm a"}
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ a{"h:mm a - h:mm a v"}
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"h a - h a v"}
+ h{"h-h a v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"MM/y - MM/y"}
+ y{"MM/y - MM/y"}
+ }
+ yMEd{
+ M{"E, dd/MM/y - E, dd/MM/y"}
+ d{"E, dd/MM/y - E, dd/MM/y"}
+ y{"E, dd/MM/y - E, dd/MM/y"}
+ }
+ yMMM{
+ M{"LLL-LLL y"}
+ y{"LLL y - LLL y"}
+ }
+ yMMMEd{
+ M{"E, dd MMM - E, dd MMM y"}
+ d{"E, dd - E, dd MMM y"}
+ y{"E, dd MMM y - E, dd MMM y"}
+ }
+ yMMMM{
+ M{"LLLL-LLLL y"}
+ y{"LLLL y - LLLL y"}
+ }
+ yMMMd{
+ M{"dd MMM - dd MMM y"}
+ d{"dd-dd MMM y"}
+ y{"dd MMM y - dd MMM y"}
+ }
+ yMd{
+ M{"dd/MM/y - dd/MM/y"}
+ d{"dd/MM/y - dd/MM/y"}
+ y{"dd/MM/y - dd/MM/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"π.μ.",
@@ -227,19 +374,16 @@
mmss{"mm:ss"}
ms{"mm:ss"}
y{"y"}
- yM{"M/yyyy"}
- yMEd{"E, d/M/yyyy"}
+ yM{"M/y"}
+ yMEd{"E, d/M/y"}
+ yMM{"MM/y"}
yMMM{"LLL y"}
yMMMEd{"E, d MMM y"}
+ yMMMM{"LLLL y"}
yMMMd{"d MMM y"}
- yMd{"d/M/yyyy"}
+ yMd{"d/M/y"}
yQQQ{"y QQQ"}
yQQQQ{"y QQQQ"}
- yyMM{"MM/yy"}
- yyMMM{"LLL yy"}
- yyyy{"y"}
- yyyyMM{"MM/yyyy"}
- yyyyMMMM{"LLLL y"}
}
dayNames{
format{
@@ -325,63 +469,6 @@
"μ.Χ.",
}
}
- fields{
- day{
- dn{"Ημέρα"}
- relative{
- "-1"{"Χτες"}
- "-2"{"Προχτές"}
- "0"{"Σήμερα"}
- "1"{"Αύριο"}
- "2"{"Μεθαύριο"}
- }
- }
- dayperiod{
- dn{"π.μ./μ.μ."}
- }
- era{
- dn{"Περίοδος"}
- }
- hour{
- dn{"Ώρα"}
- }
- minute{
- dn{"Λεπτό"}
- }
- month{
- dn{"Μήνας"}
- relative{
- "-1"{"Προηγούμενος μήνας"}
- "0"{"Τρέχων μήνας"}
- "1"{"Επόμενος μήνας"}
- }
- }
- second{
- dn{"Δευτερόλεπτο"}
- }
- week{
- dn{"Εβδομάδα"}
- relative{
- "-1"{"Προηγούμενη εβδομάδα"}
- "0"{"Αυτήν την εβδομάδα"}
- "1"{"Επόμενη εβδομάδα"}
- }
- }
- weekday{
- dn{"Ημέρα εβδομάδας"}
- }
- year{
- dn{"Έτος"}
- relative{
- "-1"{"Προηγούμενο έτος"}
- "0"{"Φέτος"}
- "1"{"Επόμενο έτος"}
- }
- }
- zone{
- dn{"Ζώνη"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -445,13 +532,13 @@
y{"y-y"}
}
yM{
- M{"MM/yyyy - MM/yyyy"}
- y{"MM/yyyy - MM/yyyy"}
+ M{"MM/y - MM/y"}
+ y{"MM/y - MM/y"}
}
yMEd{
- M{"E, dd/MM/yyyy - E, dd/MM/yyyy"}
- d{"E, dd/MM/yyyy - E, dd/MM/yyyy"}
- y{"E, dd/MM/yyyy - E, dd/MM/yyyy"}
+ M{"E, dd/MM/y - E, dd/MM/y"}
+ d{"E, dd/MM/y - E, dd/MM/y"}
+ y{"E, dd/MM/y - E, dd/MM/y"}
}
yMMM{
M{"LLL-LLL y"}
@@ -472,9 +559,9 @@
y{"dd MMM y - dd MMM y"}
}
yMd{
- M{"dd/MM/yyyy - dd/MM/yyyy"}
- d{"dd/MM/yyyy - dd/MM/yyyy"}
- y{"dd/MM/yyyy - dd/MM/yyyy"}
+ M{"dd/MM/y - dd/MM/y"}
+ d{"dd/MM/y - dd/MM/y"}
+ y{"dd/MM/y - dd/MM/y"}
}
}
monthNames{
@@ -627,11 +714,11 @@
"d MMMM, y G",
"d MMM, y G",
"d/M/yy",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
+ "{1} - {0}",
+ "{1} - {0}",
+ "{1} - {0}",
+ "{1} - {0}",
+ "{1} - {0}",
}
availableFormats{
Ed{"E d"}
@@ -642,14 +729,13 @@
MMMd{"d MMM"}
Md{"d/M"}
y{"y G"}
- yyyy{"y G"}
- yyyyM{"MM/yy GGGGG"}
- yyyyMEd{"E, dd/MM/yy GGGGG"}
- yyyyMMM{"LLL yy GGGGG"}
- yyyyMMMEd{"E, d MMM, y G"}
- yyyyMMMd{"d MMM, y G"}
- yyyyMd{"dd/MM/yy GGGGG"}
- yyyyQQQ{"yy GGGGG QQQ"}
+ yM{"MM/y GGGGG"}
+ yMEd{"E, dd/MM/y GGGGG"}
+ yMMM{"LLL y GGGGG"}
+ yMMMEd{"E, d MMM, y G"}
+ yMMMd{"d MMM, y G"}
+ yMd{"dd/MM/y GGGGG"}
+ yQQQ{"y GGGGG QQQ"}
}
}
roc{
@@ -677,15 +763,14 @@
MMMd{"d MMM"}
Md{"d/M"}
y{"y G"}
- yyyy{"y G"}
- yyyyM{"M/y G"}
- yyyyMEd{"E, d/M/y G"}
- yyyyMMM{"LLL, y G"}
- yyyyMMMEd{"E, d MMM, y G"}
- yyyyMMMd{"d MMM, y G"}
- yyyyMd{"d/M/y G"}
- yyyyQQQ{"y G QQQ"}
- yyyyQQQQ{"QQQQ y G"}
+ yM{"M/y G"}
+ yMEd{"E, d/M/y G"}
+ yMMM{"LLL, y G"}
+ yMMMEd{"E, d MMM, y G"}
+ yMMMd{"d MMM, y G"}
+ yMd{"d/M/y G"}
+ yQQQ{"y G QQQ"}
+ yQQQQ{"QQQQ y G"}
}
eras{
abbreviated{
@@ -701,6 +786,63 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"Ημέρα"}
+ relative{
+ "-1"{"Χτες"}
+ "-2"{"Προχτές"}
+ "0"{"Σήμερα"}
+ "1"{"Αύριο"}
+ "2"{"Μεθαύριο"}
+ }
+ }
+ dayperiod{
+ dn{"π.μ./μ.μ."}
+ }
+ era{
+ dn{"Περίοδος"}
+ }
+ hour{
+ dn{"Ώρα"}
+ }
+ minute{
+ dn{"Λεπτό"}
+ }
+ month{
+ dn{"Μήνας"}
+ relative{
+ "-1"{"Προηγούμενος μήνας"}
+ "0"{"Τρέχων μήνας"}
+ "1"{"Επόμενος μήνας"}
+ }
+ }
+ second{
+ dn{"Δευτερόλεπτο"}
+ }
+ week{
+ dn{"Εβδομάδα"}
+ relative{
+ "-1"{"Προηγούμενη εβδομάδα"}
+ "0"{"Αυτήν την εβδομάδα"}
+ "1"{"Επόμενη εβδομάδα"}
+ }
+ }
+ weekday{
+ dn{"Ημέρα εβδομάδας"}
+ }
+ year{
+ dn{"Έτος"}
+ relative{
+ "-1"{"Προηγούμενο έτος"}
+ "0"{"Φέτος"}
+ "1"{"Επόμενο έτος"}
+ }
+ }
+ zone{
+ dn{"Ζώνη"}
+ }
+ }
listPattern{
standard{
2{"{0} και {1}"}
diff --git a/data/locales/el_CY.txt b/data/locales/el_CY.txt
index 346ff08..2f9ef6a 100644
--- a/data/locales/el_CY.txt
+++ b/data/locales/el_CY.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/el_CY.xml
// *
@@ -14,5 +14,5 @@
}
}
}
- Version{"2.0.65.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/el_GR.txt b/data/locales/el_GR.txt
index fb43700..8f8b593 100644
--- a/data/locales/el_GR.txt
+++ b/data/locales/el_GR.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/el_GR.xml
// *
// ***************************************************************************
el_GR{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en.txt b/data/locales/en.txt
index 8a150a0..359eb1a 100644
--- a/data/locales/en.txt
+++ b/data/locales/en.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en.xml
// *
@@ -16,7 +16,10 @@
}
ExemplarCharacters{"[a b c d e f g h i j k l m n o p q r s t u v w x y z]"}
ExemplarCharactersIndex{"[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]"}
- ExemplarCharactersPunctuation{"[\- ‐ – — , ; \: ! ? . … ' ‘ ’ \" “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]"}
+ ExemplarCharactersPunctuation{
+ "[\\- ‐ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ "
+ "″]"
+ }
LocaleScript{
"Latn",
}
@@ -146,48 +149,13 @@
}
}
}
- Version{"2.0.78.36"}
+ Version{"2.0.82.76"}
calendar{
buddhist{
- DateTimePatterns{
- "h:mm:ss a zzzz",
- "h:mm:ss a z",
- "h:mm:ss a",
- "h:mm a",
- "EEEE, MMMM d, y G",
- "MMMM d, y G",
- "MMM d, y G",
- "M/d/yy GGGGG",
- "{1}, {0}",
- "{1} 'at' {0}",
- "{1} 'at' {0}",
- "{1}, {0}",
- "{1}, {0}",
- }
- availableFormats{
- Ed{"d E"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E, M/d"}
- MMM{"LLL"}
- MMMEd{"E, MMM d"}
- MMMd{"MMM d"}
- Md{"M/d"}
- d{"d"}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yM{"M/y GGGGG"}
- yMEd{"E, M/d/y GGGGG"}
- yMMM{"MMM y G"}
- yMMMEd{"E, MMM d, y G"}
- yMMMd{"MMM d, y G"}
- yMd{"M/d/y GGGGG"}
- yQQQ{"QQQ y G"}
- yQQQQ{"QQQQ y G"}
+ eras{
+ abbreviated{
+ "BE",
+ }
}
}
chinese{
@@ -207,7 +175,16 @@
"{1}, {0}",
}
availableFormats{
+ EHm{"E HH:mm"}
+ EHms{"E HH:mm:ss"}
Ed{"d E"}
+ Ehm{"E h:mm a"}
+ Ehms{"E h:mm:ss a"}
+ Gy{"U"}
+ GyMMM{"MMM U"}
+ GyMMMEd{"E, MMM d, U"}
+ GyMMMd{"MMM d, U"}
+ H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
M{"L"}
@@ -217,18 +194,21 @@
MMMd{"MMM d"}
Md{"M/d"}
d{"d"}
+ h{"h a"}
hm{"h:mm a"}
hms{"h:mm:ss a"}
ms{"mm:ss"}
y{"U"}
- yM{"M/y"}
- yMEd{"E, M/d/y"}
- yMMM{"MMM U"}
- yMMMEd{"E, MMM d, U"}
- yMMMd{"MMM d, U"}
yMd{"M/d/y"}
- yQQQ{"QQQ U"}
- yQQQQ{"QQQQ U"}
+ yyyy{"U"}
+ yyyyM{"M/y"}
+ yyyyMEd{"E, M/d/y"}
+ yyyyMMM{"MMM U"}
+ yyyyMMMEd{"E, MMM d, U"}
+ yyyyMMMd{"MMM d, U"}
+ yyyyMd{"M/d/y"}
+ yyyyQQQ{"QQQ U"}
+ yyyyQQQQ{"QQQQ U"}
}
cyclicNameSets{
zodiacs{
@@ -251,6 +231,20 @@
}
}
intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
M{
M{"M–M"}
}
@@ -296,16 +290,16 @@
h{"h–h a v"}
}
y{
- y{"U – U"}
+ y{"U–U"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E, M/d/yy – E, M/d/yy"}
- d{"E, M/d/yy – E, M/d/yy"}
- y{"E, M/d/yy – E, M/d/yy"}
+ M{"E, M/d/y – E, M/d/y"}
+ d{"E, M/d/y – E, M/d/y"}
+ y{"E, M/d/y – E, M/d/y"}
}
yMMM{
M{"MMM–MMM U"}
@@ -326,9 +320,201 @@
y{"MMM d, U – MMM d, U"}
}
yMd{
- M{"M/d/yy – M/d/yy"}
- d{"M/d/yy – M/d/yy"}
- y{"M/d/yy – M/d/yy"}
+ M{"M/d/y – M/d/y"}
+ d{"M/d/y – M/d/y"}
+ y{"M/d/y – M/d/y"}
+ }
+ }
+ monthNames{
+ format{
+ abbreviated{
+ "Mo1",
+ "Mo2",
+ "Mo3",
+ "Mo4",
+ "Mo5",
+ "Mo6",
+ "Mo7",
+ "Mo8",
+ "Mo9",
+ "Mo10",
+ "Mo11",
+ "Mo12",
+ }
+ wide{
+ "1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+ "11",
+ "12",
+ }
+ }
+ }
+ }
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, MMMM d, y G",
+ "MMMM d, y G",
+ "MMM d, y G",
+ "M/d/y GGGGG",
+ "{1}, {0}",
+ "{1} 'at' {0}",
+ "{1} 'at' {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ }
+ appendItems{
+ Day{"{0} ({2}: {1})"}
+ Day-Of-Week{"{0} {1}"}
+ Era{"{0} {1}"}
+ Hour{"{0} ({2}: {1})"}
+ Minute{"{0} ({2}: {1})"}
+ Month{"{0} ({2}: {1})"}
+ Quarter{"{0} ({2}: {1})"}
+ Second{"{0} ({2}: {1})"}
+ Timezone{"{0} {1}"}
+ Week{"{0} ({2}: {1})"}
+ Year{"{0} {1}"}
+ }
+ availableFormats{
+ EHm{"E HH:mm"}
+ EHms{"E HH:mm:ss"}
+ Ed{"d E"}
+ Ehm{"E h:mm a"}
+ Ehms{"E h:mm:ss a"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E, MMM d, y G"}
+ GyMMMd{"MMM d, y G"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y G"}
+ yyyy{"y G"}
+ yyyyM{"M/y GGGGG"}
+ yyyyMEd{"E, M/d/y GGGGG"}
+ yyyyMMM{"MMM y G"}
+ yyyyMMMEd{"E, MMM d, y G"}
+ yyyyMMMd{"MMM d, y G"}
+ yyyyMd{"M/d/y GGGGG"}
+ yyyyQQQ{"QQQ y G"}
+ yyyyQQQQ{"QQQQ y G"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, M/d – E, M/d"}
+ d{"E, M/d – E, M/d"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E, MMM d – E, MMM d"}
+ d{"E, MMM d – E, MMM d"}
+ }
+ MMMd{
+ M{"MMM d – MMM d"}
+ d{"MMM d–d"}
+ }
+ Md{
+ M{"M/d – M/d"}
+ d{"M/d – M/d"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y G"}
+ }
+ yM{
+ M{"M/y – M/y GGGGG"}
+ y{"M/y – M/y GGGGG"}
+ }
+ yMEd{
+ M{"E, M/d/y – E, M/d/y GGGGG"}
+ d{"E, M/d/y – E, M/d/y GGGGG"}
+ y{"E, M/d/y – E, M/d/y GGGGG"}
+ }
+ yMMM{
+ M{"MMM–MMM y G"}
+ y{"MMM y – MMM y G"}
+ }
+ yMMMEd{
+ M{"E, MMM d – E, MMM d, y G"}
+ d{"E, MMM d – E, MMM d, y G"}
+ y{"E, MMM d, y – E, MMM d, y G"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y G"}
+ y{"MMMM y – MMMM y G"}
+ }
+ yMMMd{
+ M{"MMM d – MMM d, y G"}
+ d{"MMM d–d, y G"}
+ y{"MMM d, y – MMM d, y G"}
+ }
+ yMd{
+ M{"M/d/y – M/d/y GGGGG"}
+ d{"M/d/y – M/d/y GGGGG"}
+ y{"M/d/y – M/d/y GGGGG"}
}
}
}
@@ -352,6 +538,19 @@
"{1}, {0}",
"{1}, {0}",
}
+ appendItems{
+ Day{"{0} ({2}: {1})"}
+ Day-Of-Week{"{0} {1}"}
+ Era{"{0} {1}"}
+ Hour{"{0} ({2}: {1})"}
+ Minute{"{0} ({2}: {1})"}
+ Month{"{0} ({2}: {1})"}
+ Quarter{"{0} ({2}: {1})"}
+ Second{"{0} ({2}: {1})"}
+ Timezone{"{0} {1}"}
+ Week{"{0} ({2}: {1})"}
+ Year{"{0} {1}"}
+ }
availableFormats{
EHm{"E HH:mm"}
EHms{"E HH:mm:ss"}
@@ -359,6 +558,10 @@
Ehm{"E h:mm a"}
Ehms{"E h:mm:ss a"}
Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E, MMM d, y G"}
+ GyMMMd{"MMM d, y G"}
+ H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
M{"L"}
@@ -368,6 +571,7 @@
MMMd{"MMM d"}
Md{"M/d"}
d{"d"}
+ h{"h a"}
hm{"h:mm a"}
hms{"h:mm:ss a"}
ms{"mm:ss"}
@@ -437,62 +641,21 @@
"Anno Domini",
}
}
- fields{
- day{
- dn{"Day"}
- relative{
- "-1"{"Yesterday"}
- "0"{"Today"}
- "1"{"Tomorrow"}
- }
- }
- dayperiod{
- dn{"AM/PM"}
- }
- era{
- dn{"Era"}
- }
- hour{
- dn{"Hour"}
- }
- minute{
- dn{"Minute"}
- }
- month{
- dn{"Month"}
- relative{
- "-1"{"Last month"}
- "0"{"This month"}
- "1"{"Next month"}
- }
- }
- second{
- dn{"Second"}
- }
- week{
- dn{"Week"}
- relative{
- "-1"{"Last week"}
- "0"{"This week"}
- "1"{"Next week"}
- }
- }
- weekday{
- dn{"Day of the Week"}
- }
- year{
- dn{"Year"}
- relative{
- "-1"{"Last year"}
- "0"{"This year"}
- "1"{"Next year"}
- }
- }
- zone{
- dn{"Time Zone"}
- }
- }
intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
M{
M{"M–M"}
}
@@ -541,13 +704,13 @@
y{"y–y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E, M/d/yy – E, M/d/yy"}
- d{"E, M/d/yy – E, M/d/yy"}
- y{"E, M/d/yy – E, M/d/yy"}
+ M{"E, M/d/y – E, M/d/y"}
+ d{"E, M/d/y – E, M/d/y"}
+ y{"E, M/d/y – E, M/d/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -568,9 +731,9 @@
y{"MMM d, y – MMM d, y"}
}
yMd{
- M{"M/d/yy – M/d/yy"}
- d{"M/d/yy – M/d/yy"}
- y{"M/d/yy – M/d/yy"}
+ M{"M/d/y – M/d/y"}
+ d{"M/d/y – M/d/y"}
+ y{"M/d/y – M/d/y"}
}
}
monthNames{
@@ -646,47 +809,18 @@
}
}
}
- islamic{
- DateTimePatterns{
- "h:mm:ss a zzzz",
- "h:mm:ss a z",
- "h:mm:ss a",
- "h:mm a",
- "EEEE, MMMM d, y G",
- "MMMM d, y G",
- "MMM d, y G",
- "M/d/yy G",
- "{1}, {0}",
- "{1} 'at' {0}",
- "{1} 'at' {0}",
- "{1}, {0}",
- "{1}, {0}",
+ hebrew{
+ eras{
+ abbreviated{
+ "AM",
+ }
}
- availableFormats{
- Ed{"d E"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E, M/d"}
- MMM{"LLL"}
- MMMEd{"E, MMM d"}
- MMMd{"MMM d"}
- Md{"M/d"}
- d{"d"}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yyyy{"y G"}
- yyyyM{"M/y G"}
- yyyyMEd{"E, M/d/y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E, MMM d, y G"}
- yyyyMMMd{"MMM d, y G"}
- yyyyMd{"M/d/y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
+ }
+ islamic{
+ eras{
+ abbreviated{
+ "AH",
+ }
}
}
japanese{
@@ -698,81 +832,20 @@
"EEEE, MMMM d, y G",
"MMMM d, y G",
"MMM d, y G",
- "M/d/yy GGGGG",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"d E"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E, M/d"}
- MMM{"LLL"}
- MMMEd{"E, MMM d"}
- MMMd{"MMM d"}
- Md{"M/d"}
- d{"d"}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yyyy{"y G"}
- yyyyM{"M/y GGGGG"}
- yyyyMEd{"E, M/d/y GGGGG"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E, MMM d, y G"}
- yyyyMMMd{"MMM d, y G"}
- yyyyMd{"M/d/y GGGGG"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
+ "M/d/y GGGGG",
+ "{1}, {0}",
+ "{1} 'at' {0}",
+ "{1} 'at' {0}",
+ "{1}, {0}",
+ "{1}, {0}",
}
}
roc{
- DateTimePatterns{
- "h:mm:ss a zzzz",
- "h:mm:ss a z",
- "h:mm:ss a",
- "h:mm a",
- "EEEE, MMMM d, y G",
- "MMMM d, y G",
- "MMM d, y G",
- "M/d/yy GGGGG",
- "{1}, {0}",
- "{1} 'at' {0}",
- "{1} 'at' {0}",
- "{1}, {0}",
- "{1}, {0}",
- }
- availableFormats{
- Ed{"d E"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E, M/d"}
- MMM{"LLL"}
- MMMEd{"E, MMM d"}
- MMMd{"MMM d"}
- Md{"M/d"}
- d{"d"}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yyyy{"y G"}
- yyyyM{"M/y GGGGG"}
- yyyyMEd{"E, M/d/y GGGGG"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E, MMM d, y G"}
- yyyyMMMd{"MMM d, y G"}
- yyyyMd{"M/d/y GGGGG"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
+ eras{
+ abbreviated{
+ "Before R.O.C.",
+ "Minguo",
+ }
}
}
}
@@ -782,6 +855,61 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Day"}
+ relative{
+ "-1"{"Yesterday"}
+ "0"{"Today"}
+ "1"{"Tomorrow"}
+ }
+ }
+ dayperiod{
+ dn{"AM/PM"}
+ }
+ era{
+ dn{"Era"}
+ }
+ hour{
+ dn{"Hour"}
+ }
+ minute{
+ dn{"Minute"}
+ }
+ month{
+ dn{"Month"}
+ relative{
+ "-1"{"Last month"}
+ "0"{"This month"}
+ "1"{"Next month"}
+ }
+ }
+ second{
+ dn{"Second"}
+ }
+ week{
+ dn{"Week"}
+ relative{
+ "-1"{"Last week"}
+ "0"{"This week"}
+ "1"{"Next week"}
+ }
+ }
+ weekday{
+ dn{"Day of the Week"}
+ }
+ year{
+ dn{"Year"}
+ relative{
+ "-1"{"Last year"}
+ "0"{"This year"}
+ "1"{"Next year"}
+ }
+ }
+ zone{
+ dn{"Time Zone"}
+ }
+ }
listPattern{
standard{
2{"{0} and {1}"}
diff --git a/data/locales/en_150.txt b/data/locales/en_150.txt
index f2ec74e..5837655 100755
--- a/data/locales/en_150.txt
+++ b/data/locales/en_150.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_150.xml
// *
@@ -19,8 +19,32 @@
}
}
}
- Version{"2.0.79.79"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH 'h' mm 'min' ss 's' zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMM y G",
+ "dd MMM y G",
+ "dd/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MEd{"E d/M"}
+ Md{"d/M"}
+ yMEd{"E, d/M/y"}
+ yMMMEd{"E d MMM y"}
+ yMd{"d/M/y"}
+ }
+ }
gregorian{
DateTimePatterns{
"HH 'h' mm 'min' ss 's' zzzz",
diff --git a/data/locales/en_AG.txt b/data/locales/en_AG.txt
index 363186c..60a77e1 100755
--- a/data/locales/en_AG.txt
+++ b/data/locales/en_AG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_AG.xml
// *
// ***************************************************************************
en_AG{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_AS.txt b/data/locales/en_AS.txt
index 48dd86c..eb8ad6e 100644
--- a/data/locales/en_AS.txt
+++ b/data/locales/en_AS.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_AS.xml
// *
// ***************************************************************************
en_AS{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_AU.txt b/data/locales/en_AU.txt
index 8b0707d..c289ef6 100644
--- a/data/locales/en_AU.txt
+++ b/data/locales/en_AU.txt
@@ -1,15 +1,129 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_AU.xml
// *
// ***************************************************************************
en_AU{
%%Parent{"en_GB"}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
+ chinese{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM U",
+ "d MMMM U",
+ "d MMM U",
+ "dd/MM/yy",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "dd/MM/y G",
+ "d/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MEd{"E, d/M"}
+ MMMEd{"E, d MMM"}
+ yMEd{"E, d/M/y"}
+ yMd{"d/M/y"}
+ }
+ intervalFormats{
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E, d/MM - E, d/MM"}
+ d{"E, d/MM - E, d/MM"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"E, d MMM - E, d MMM"}
+ d{"E, d - E, d MMM"}
+ }
+ MMMd{
+ M{"d MMM - d MMM"}
+ d{"d-d MMM"}
+ }
+ Md{
+ M{"d/MM - d/MM"}
+ d{"d/MM - d/MM"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a - h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h:mm a - h:mm a"}
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ a{"h:mm a - h:mm a v"}
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"h a - h a v"}
+ h{"h-h a v"}
+ }
+ yM{
+ M{"MM/y - MM/y"}
+ y{"MM/y - MM/y"}
+ }
+ yMEd{
+ M{"E, d/MM/y - E, d/MM/y"}
+ d{"E, d/MM/y - E, d/MM/y"}
+ y{"E, d/MM/y - E, d/MM/y"}
+ }
+ yMMM{
+ M{"MMM-MMM y"}
+ y{"MMM y - MMM y"}
+ }
+ yMMMEd{
+ M{"E, d MMM - E, d MMM y"}
+ d{"E, d - E, d MMM y"}
+ y{"E, d MMM y - E, d MMM y"}
+ }
+ yMMMd{
+ M{"d MMM - d MMM y"}
+ d{"d-d MMM y"}
+ y{"d MMM y - d MMM y"}
+ }
+ yMd{
+ M{"d/MM/y - d/MM/y"}
+ d{"d/MM/y - d/MM/y"}
+ y{"d/MM/y - d/MM/y"}
+ }
+ }
+ }
gregorian{
DateTimePatterns{
"h:mm:ss a zzzz",
@@ -18,7 +132,7 @@
"h:mm a",
"EEEE, d MMMM y",
"d MMMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"d/MM/yy",
"{1} {0}",
"{1} {0}",
@@ -78,13 +192,13 @@
h{"h-h a v"}
}
yM{
- M{"MM/yy - MM/yy"}
- y{"MM/yy - MM/yy"}
+ M{"MM/y - MM/y"}
+ y{"MM/y - MM/y"}
}
yMEd{
- M{"E, d/MM/yy - E, d/MM/yy"}
- d{"E, d/MM/yy - E, d/MM/yy"}
- y{"E, d/MM/yy - E, d/MM/yy"}
+ M{"E, d/MM/y - E, d/MM/y"}
+ d{"E, d/MM/y - E, d/MM/y"}
+ y{"E, d/MM/y - E, d/MM/y"}
}
yMMM{
M{"MMM-MMM y"}
@@ -101,11 +215,28 @@
y{"d MMM y - d MMM y"}
}
yMd{
- M{"d/MM/yy - d/MM/yy"}
- d{"d/MM/yy - d/MM/yy"}
- y{"d/MM/yy - d/MM/yy"}
+ M{"d/MM/y - d/MM/y"}
+ d{"d/MM/y - d/MM/y"}
+ y{"d/MM/y - d/MM/y"}
}
}
}
+ japanese{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "dd/MM/y G",
+ "d/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
}
}
diff --git a/data/locales/en_BB.txt b/data/locales/en_BB.txt
index da0b2bd..cacb54e 100755
--- a/data/locales/en_BB.txt
+++ b/data/locales/en_BB.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_BB.xml
// *
// ***************************************************************************
en_BB{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_BE.txt b/data/locales/en_BE.txt
index 1165325..ec3722d 100644
--- a/data/locales/en_BE.txt
+++ b/data/locales/en_BE.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_BE.xml
// *
@@ -19,8 +19,32 @@
}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH 'h' mm 'min' ss 's' zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMM y G",
+ "dd MMM y G",
+ "dd/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MEd{"E d/M"}
+ Md{"d/M"}
+ yMEd{"E, d/M/y"}
+ yMMMEd{"E d MMM y"}
+ yMd{"d/M/y"}
+ }
+ }
gregorian{
DateTimePatterns{
"HH 'h' mm 'min' ss 's' zzzz",
diff --git a/data/locales/en_BM.txt b/data/locales/en_BM.txt
index 177decd..ec1a0e6 100755
--- a/data/locales/en_BM.txt
+++ b/data/locales/en_BM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_BM.xml
// *
// ***************************************************************************
en_BM{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_BS.txt b/data/locales/en_BS.txt
index 622812b..5f4bed5 100755
--- a/data/locales/en_BS.txt
+++ b/data/locales/en_BS.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_BS.xml
// *
// ***************************************************************************
en_BS{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_BW.txt b/data/locales/en_BW.txt
index 9ec83f9..e302d56 100644
--- a/data/locales/en_BW.txt
+++ b/data/locales/en_BW.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_BW.xml
// *
@@ -14,8 +14,36 @@
}
}
}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE dd MMMM y G",
+ "dd MMMM y G",
+ "MMM d, y G",
+ "dd/MM/yy GGGGG",
+ "{1}, {0}",
+ "{1} 'at' {0}",
+ "{1} 'at' {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ }
+ availableFormats{
+ MEd{"E dd/MM"}
+ MMMEd{"E dd MMM"}
+ MMMd{"dd MMM"}
+ Md{"dd/MM"}
+ yM{"MM/y"}
+ yMEd{"E, dd/MM/y"}
+ yMMMEd{"E dd MMM y"}
+ yMMMd{"dd MMM y"}
+ yMd{"dd/MM/y"}
+ }
+ }
gregorian{
DateTimePatterns{
"h:mm:ss a zzzz",
@@ -37,11 +65,11 @@
MMMEd{"E dd MMM"}
MMMd{"dd MMM"}
Md{"dd/MM"}
- yM{"MM/yy"}
- yMEd{"E, dd/MM/yy"}
+ yM{"MM/y"}
+ yMEd{"E, dd/MM/y"}
yMMMEd{"E dd MMM y"}
yMMMd{"dd MMM y"}
- yMd{"dd/MM/yy"}
+ yMd{"dd/MM/y"}
}
}
}
diff --git a/data/locales/en_BZ.txt b/data/locales/en_BZ.txt
index 7356c8a..994ad1b 100644
--- a/data/locales/en_BZ.txt
+++ b/data/locales/en_BZ.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_BZ.xml
// *
@@ -18,8 +18,31 @@
279,
216,
}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, MMMM d, y G",
+ "MMMM d, y G",
+ "dd-MMM-y G",
+ "M/d/y GGGGG",
+ "{1}, {0}",
+ "{1} 'at' {0}",
+ "{1} 'at' {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ }
+ availableFormats{
+ MMMEd{"E dd MMM"}
+ MMMd{"dd MMM"}
+ yMMMEd{"E dd MMM y"}
+ yMMMd{"dd MMM y"}
+ }
+ }
gregorian{
DateTimePatterns{
"h:mm:ss a zzzz",
diff --git a/data/locales/en_CA.txt b/data/locales/en_CA.txt
index 66f9594..2849c84 100644
--- a/data/locales/en_CA.txt
+++ b/data/locales/en_CA.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_CA.xml
// *
@@ -11,42 +11,5 @@
279,
216,
}
- Version{"2.0.75.99"}
- calendar{
- gregorian{
- availableFormats{
- MMMMEd{"E, MMMM d"}
- MMMMd{"MMMM d"}
- MMdd{"MM/dd"}
- yyMMM{"MMM yy"}
- }
- intervalFormats{
- M{
- M{"M-M"}
- }
- d{
- d{"d-d"}
- }
- fallback{"{0} - {1}"}
- h{
- a{"h a - h a"}
- h{"h-h a"}
- }
- hm{
- a{"h:mm a - h:mm a"}
- h{"h:mm-h:mm a"}
- m{"h:mm-h:mm a"}
- }
- hmv{
- a{"h:mm a - h:mm a v"}
- h{"h:mm-h:mm a v"}
- m{"h:mm-h:mm a v"}
- }
- hv{
- a{"h a - h a v"}
- h{"h-h a v"}
- }
- }
- }
- }
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_CM.txt b/data/locales/en_CM.txt
index b216e4b..8c033ab 100755
--- a/data/locales/en_CM.txt
+++ b/data/locales/en_CM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_CM.xml
// *
// ***************************************************************************
en_CM{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_DM.txt b/data/locales/en_DM.txt
index 043ccaa..a2060e0 100755
--- a/data/locales/en_DM.txt
+++ b/data/locales/en_DM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_DM.xml
// *
// ***************************************************************************
en_DM{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_FJ.txt b/data/locales/en_FJ.txt
index 267d89b..0fbc5f3 100755
--- a/data/locales/en_FJ.txt
+++ b/data/locales/en_FJ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_FJ.xml
// *
// ***************************************************************************
en_FJ{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_FM.txt b/data/locales/en_FM.txt
index f081479..4b812ce 100755
--- a/data/locales/en_FM.txt
+++ b/data/locales/en_FM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_FM.xml
// *
// ***************************************************************************
en_FM{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_GB.txt b/data/locales/en_GB.txt
index a0922b3..dd4e62f 100644
--- a/data/locales/en_GB.txt
+++ b/data/locales/en_GB.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GB.xml
// *
@@ -14,40 +14,8 @@
}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
- buddhist{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE, d MMMM y G",
- "d MMMM y G",
- "d MMM y G",
- "dd/MM/y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- MEd{"E, d/M"}
- MMMEd{"E d MMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- yMEd{"E, d/M/y G"}
- yMMMEd{"E, d MMM y G"}
- yMMMd{"d MMM y G"}
- yyMMM{"MMM y G"}
- yyyyMM{"MM/y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMd{"d/M/y G"}
- }
- }
chinese{
DateTimePatterns{
"HH:mm:ss zzzz",
@@ -64,6 +32,135 @@
"{1} {0}",
"{1} {0}",
}
+ availableFormats{
+ Ed{"E d"}
+ Gy{"U"}
+ GyMMM{"MMM U"}
+ GyMMMEd{"E, d MMM U"}
+ GyMMMd{"d MMM U"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"LL"}
+ MEd{"E dd/MM"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ Md{"dd/MM"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"U"}
+ yMd{"dd/MM/y"}
+ yyyy{"U"}
+ yyyyM{"MM/y"}
+ yyyyMEd{"E, dd/MM/y"}
+ yyyyMMM{"MMM U"}
+ yyyyMMMEd{"E, d MMM U"}
+ yyyyMMMM{"MMMM U"}
+ yyyyMMMd{"d MMM U"}
+ yyyyMd{"dd/MM/y"}
+ yyyyQQQ{"QQQ U"}
+ yyyyQQQQ{"QQQQ U"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E dd/MM – E dd/MM"}
+ d{"E dd/MM – E dd/MM"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E d MMM – E d MMM"}
+ d{"E d – E d MMM"}
+ }
+ MMMd{
+ M{"d MMM – d MMM"}
+ d{"d–d MMM"}
+ }
+ Md{
+ M{"dd/MM – dd/MM"}
+ d{"dd/MM – dd/MM"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"U-U"}
+ }
+ yM{
+ M{"MM/y – MM/y"}
+ y{"MM/y – MM/y"}
+ }
+ yMEd{
+ M{"E, dd/MM/y – E, dd/MM/y"}
+ d{"E, dd/MM/y – E, dd/MM/y"}
+ y{"E, dd/MM/y – E, dd/MM/y"}
+ }
+ yMMM{
+ M{"MMM–MMM U"}
+ y{"MMM U – MMM U"}
+ }
+ yMMMEd{
+ M{"E, d MMM – E, d MMM U"}
+ d{"E, d – E, d MMM U"}
+ y{"E, d MMM U – E, d MMM U"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM U"}
+ y{"MMMM U – MMMM U"}
+ }
+ yMMMd{
+ M{"d MMM – d MMM U"}
+ d{"d–d MMM U"}
+ y{"d MMM U – d MMM U"}
+ }
+ yMd{
+ M{"dd/MM/y – dd/MM/y"}
+ d{"dd/MM/y – dd/MM/y"}
+ y{"dd/MM/y – dd/MM/y"}
+ }
+ }
monthNames{
format{
abbreviated{
@@ -155,6 +252,151 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E, d MMM y G"}
+ GyMMMd{"d MMM y G"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"LL"}
+ MEd{"E dd/MM"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ Md{"dd/MM"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y G"}
+ yyyy{"y G"}
+ yyyyM{"MM/y GGGGG"}
+ yyyyMEd{"E, dd/MM/y GGGGG"}
+ yyyyMMM{"MMM y G"}
+ yyyyMMMEd{"E, d MMM y G"}
+ yyyyMMMM{"MMMM y G"}
+ yyyyMMMd{"d MMM y G"}
+ yyyyMd{"dd/MM/y GGGGG"}
+ yyyyQQQ{"QQQ y G"}
+ yyyyQQQQ{"QQQQ y G"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E dd/MM – E dd/MM"}
+ d{"E dd/MM – E dd/MM"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E d MMM – E d MMM"}
+ d{"E d – E d MMM"}
+ }
+ MMMd{
+ M{"d MMM – d MMM"}
+ d{"d–d MMM"}
+ }
+ Md{
+ M{"dd/MM – dd/MM"}
+ d{"dd/MM – dd/MM"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y-y G"}
+ }
+ yM{
+ M{"MM/y – MM/y GGGGG"}
+ y{"MM/y – MM/y GGGGG"}
+ }
+ yMEd{
+ M{"E, dd/MM/y – E, dd/MM/y GGGGG"}
+ d{"E, dd/MM/y – E, dd/MM/y GGGGG"}
+ y{"E, dd/MM/y – E, dd/MM/y GGGGG"}
+ }
+ yMMM{
+ M{"MMM–MMM y G"}
+ y{"MMM y – MMM y G"}
+ }
+ yMMMEd{
+ M{"E, d MMM – E, d MMM y G"}
+ d{"E, d – E, d MMM y G"}
+ y{"E, d MMM y – E, d MMM y G"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y G"}
+ y{"MMMM y – MMMM y G"}
+ }
+ yMMMd{
+ M{"d MMM – d MMM y G"}
+ d{"d–d MMM y G"}
+ y{"d MMM y – d MMM y G"}
+ }
+ yMd{
+ M{"dd/MM/y – dd/MM/y GGGGG"}
+ d{"dd/MM/y – dd/MM/y GGGGG"}
+ y{"dd/MM/y – dd/MM/y GGGGG"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"am",
@@ -168,7 +410,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -176,11 +418,11 @@
"{1} {0}",
}
availableFormats{
- EHm{"E HH:mm"}
- EHms{"E HH:mm:ss"}
Ed{"E d"}
- Ehm{"E h:mm a"}
- Ehms{"E h:mm:ss a"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E, d MMM y G"}
+ GyMMMd{"d MMM y G"}
H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -199,21 +441,14 @@
ms{"mm:ss"}
y{"y"}
yM{"MM/y"}
- yMEd{"E, dd/MM/yyyy"}
+ yMEd{"E, dd/MM/y"}
yMMM{"MMM y"}
yMMMEd{"E, d MMM y"}
+ yMMMM{"MMMM y"}
yMMMd{"d MMM y"}
- yMd{"dd/MM/yyyy"}
+ yMd{"dd/MM/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMMM{"MMM yy"}
- yyyyMM{"MM/yyyy"}
- yyyyMMMM{"MMMM y"}
- }
- fields{
- dayperiod{
- dn{"am/pm"}
- }
}
intervalFormats{
H{
@@ -278,13 +513,13 @@
y{"y-y"}
}
yM{
- M{"MM/yyyy – MM/yyyy"}
- y{"MM/yyyy – MM/yyyy"}
+ M{"MM/y – MM/y"}
+ y{"MM/y – MM/y"}
}
yMEd{
- M{"E, dd/MM/yyyy – E, dd/MM/yyyy"}
- d{"E, dd/MM/yyyy – E, dd/MM/yyyy"}
- y{"E, dd/MM/yyyy – E, dd/MM/yyyy"}
+ M{"E, dd/MM/y – E, dd/MM/y"}
+ d{"E, dd/MM/y – E, dd/MM/y"}
+ y{"E, dd/MM/y – E, dd/MM/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -305,9 +540,9 @@
y{"d MMM y – d MMM y"}
}
yMd{
- M{"dd/MM/yyyy – dd/MM/yyyy"}
- d{"dd/MM/yyyy – dd/MM/yyyy"}
- y{"dd/MM/yyyy – dd/MM/yyyy"}
+ M{"dd/MM/y – dd/MM/y"}
+ d{"dd/MM/y – dd/MM/y"}
+ y{"dd/MM/y – dd/MM/y"}
}
}
}
@@ -408,38 +643,6 @@
}
}
}
- islamic{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE, d MMMM y G",
- "d MMMM y G",
- "d MMM y G",
- "dd/MM/y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- MEd{"E, d/M"}
- MMMEd{"E d MMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- yyMMM{"MMM y G"}
- yyyyMEd{"E, d/M/y G"}
- yyyyMM{"MM/y G"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"d/M/y G"}
- }
- }
japanese{
DateTimePatterns{
"HH:mm:ss zzzz",
@@ -456,53 +659,11 @@
"{1} {0}",
"{1} {0}",
}
- availableFormats{
- MEd{"E, d/M"}
- MMMEd{"E d MMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- yyMMM{"MMM y G"}
- yyyyMEd{"E, d/M/y GGGGG"}
- yyyyMM{"MM/y GGGGG"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"d/M/y GGGGG"}
- }
}
- roc{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE, d MMMM y G",
- "d MMMM y G",
- "d MMM y G",
- "dd/MM/y GGGGG",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- MEd{"E, d/M"}
- MMMEd{"E d MMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- yyMMM{"MMM y G"}
- yyyyMEd{"E, d/M/y GGGGG"}
- yyyyMM{"MM/y GGGGG"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"d/M/y GGGGG"}
- }
+ }
+ fields{
+ dayperiod{
+ dn{"am/pm"}
}
}
listPattern{
diff --git a/data/locales/en_GD.txt b/data/locales/en_GD.txt
index 4ddf53f..545ec69 100755
--- a/data/locales/en_GD.txt
+++ b/data/locales/en_GD.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GD.xml
// *
// ***************************************************************************
en_GD{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_GG.txt b/data/locales/en_GG.txt
index e4c35d7..a3a80aa 100755
--- a/data/locales/en_GG.txt
+++ b/data/locales/en_GG.txt
@@ -1,12 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GG.xml
// *
// ***************************************************************************
en_GG{
%%Parent{"en_GB"}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_GH.txt b/data/locales/en_GH.txt
index f924056..a77be16 100755
--- a/data/locales/en_GH.txt
+++ b/data/locales/en_GH.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GH.xml
// *
// ***************************************************************************
en_GH{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_GI.txt b/data/locales/en_GI.txt
index 1a8553e..6ad25fe 100755
--- a/data/locales/en_GI.txt
+++ b/data/locales/en_GI.txt
@@ -1,12 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GI.xml
// *
// ***************************************************************************
en_GI{
%%Parent{"en_GB"}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_GM.txt b/data/locales/en_GM.txt
index 4583bbb..d35ac32 100755
--- a/data/locales/en_GM.txt
+++ b/data/locales/en_GM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GM.xml
// *
// ***************************************************************************
en_GM{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_GU.txt b/data/locales/en_GU.txt
index 6eb96a6..f731632 100644
--- a/data/locales/en_GU.txt
+++ b/data/locales/en_GU.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GU.xml
// *
// ***************************************************************************
en_GU{
- Version{"2.0.61.44"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_GY.txt b/data/locales/en_GY.txt
index fa1e4fc..6be883e 100755
--- a/data/locales/en_GY.txt
+++ b/data/locales/en_GY.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GY.xml
// *
// ***************************************************************************
en_GY{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_HK.txt b/data/locales/en_HK.txt
index dd89b2c..2e3c287 100644
--- a/data/locales/en_HK.txt
+++ b/data/locales/en_HK.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_HK.xml
// *
@@ -15,7 +15,7 @@
}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
DateTimePatterns{
@@ -41,6 +41,64 @@
yMd{"d/M/y GGGGG"}
}
}
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM, y G",
+ "d MMMM, y G",
+ "d MMM, y G",
+ "d/M/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MMMEd{"E, d MMM"}
+ MMMMEd{"E, d MMMM"}
+ yMMMEd{"E, d MMM, y"}
+ yMMMd{"d MMM, y"}
+ yMd{"d/M/y"}
+ }
+ intervalFormats{
+ MEd{
+ M{"E, d/M – E, d/M"}
+ d{"E, d/M – E, d/M"}
+ }
+ MMMEd{
+ M{"E, d MMM – E, d MMM"}
+ d{"E, d MMM – E, d MMM"}
+ }
+ Md{
+ M{"d/M – d/M"}
+ d{"d/M – d/M"}
+ }
+ yMEd{
+ M{"E, d/M/y – E, d/M/y"}
+ d{"E, d/M/y – E, d/M/y"}
+ y{"E, d/M/y – E, d/M/y"}
+ }
+ yMMMEd{
+ M{"E, d MMM – E, d MMM, y"}
+ d{"E, d MMM – E, d MMM, y"}
+ y{"E, d MMM, y – E, d MMM, y"}
+ }
+ yMMMd{
+ M{"d MMM – d MMM, y"}
+ d{"d–d MMM, y"}
+ y{"d MMM, y – d MMM, y"}
+ }
+ yMd{
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
+ }
+ }
+ }
gregorian{
DateTimePatterns{
"h:mm:ss a zzzz",
@@ -64,20 +122,6 @@
yMMMd{"d MMM, y"}
yMd{"d/M/y"}
}
- fields{
- week{
- relative{
- "1"{"Next Week"}
- }
- }
- year{
- relative{
- "-1"{"Last Year"}
- "0"{"This Year"}
- "1"{"Next Year"}
- }
- }
- }
intervalFormats{
MEd{
M{"E, d/M – E, d/M"}
@@ -92,9 +136,9 @@
d{"d/M – d/M"}
}
yMEd{
- M{"E, d/M/yy – E, d/M/yy"}
- d{"E, d/M/yy – E, d/M/yy"}
- y{"E, d/M/yy – E, d/M/yy"}
+ M{"E, d/M/y – E, d/M/y"}
+ d{"E, d/M/y – E, d/M/y"}
+ y{"E, d/M/y – E, d/M/y"}
}
yMMMEd{
M{"E, d MMM – E, d MMM, y"}
@@ -107,9 +151,9 @@
y{"d MMM, y – d MMM, y"}
}
yMd{
- M{"d/M/yy – d/M/yy"}
- d{"d/M/yy – d/M/yy"}
- y{"d/M/yy – d/M/yy"}
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
}
}
}
@@ -160,7 +204,7 @@
"Daidō (806-810)",
"Kōnin (810-824)",
"Tenchō (824-834)",
- "Shōwa (834-848)",
+ "Jōwa (834-848)",
"Kajō (848-851)",
"Ninju (851-854)",
"Saiko (854-857)",
@@ -398,4 +442,18 @@
}
}
}
+ fields{
+ week{
+ relative{
+ "1"{"Next Week"}
+ }
+ }
+ year{
+ relative{
+ "-1"{"Last Year"}
+ "0"{"This Year"}
+ "1"{"Next Year"}
+ }
+ }
+ }
}
diff --git a/data/locales/en_IE.txt b/data/locales/en_IE.txt
index 10922b8..714c4b1 100644
--- a/data/locales/en_IE.txt
+++ b/data/locales/en_IE.txt
@@ -1,16 +1,16 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_IE.xml
// *
// ***************************************************************************
en_IE{
%%Parent{"en_GB"}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
+ generic{
AmPmMarkers{
"a.m.",
"p.m.",
@@ -20,10 +20,10 @@
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE d MMMM y",
- "d MMMM y",
- "d MMM y",
- "dd/MM/yyyy",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -33,9 +33,9 @@
availableFormats{
MEd{"E, d/M"}
Md{"d/M"}
- yMEd{"E, d/M/yyyy"}
+ yMEd{"E, d/M/y"}
yMMMEd{"E d MMM y"}
- yMd{"d/M/yyyy"}
+ yMd{"d/M/y"}
}
intervalFormats{
Hm{
@@ -80,13 +80,13 @@
m{"h:mm-h:mm a v"}
}
yM{
- M{"MM/yyyy - MM/yyyy"}
- y{"MM/yyyy - MM/yyyy"}
+ M{"MM/y - MM/y"}
+ y{"MM/y - MM/y"}
}
yMEd{
- M{"E dd/MM/yyyy - E dd/MM/yyyy"}
- d{"E dd/MM/yyyy - E dd/MM/yyyy"}
- y{"E dd/MM/yyyy - E dd/MM/yyyy"}
+ M{"E dd/MM/y - E dd/MM/y"}
+ d{"E dd/MM/y - E dd/MM/y"}
+ y{"E dd/MM/y - E dd/MM/y"}
}
yMMM{
M{"MMM-MMM y"}
@@ -103,9 +103,108 @@
y{"d MMM y - d MMM y"}
}
yMd{
- M{"dd/MM/yyyy - dd/MM/yyyy"}
- d{"dd/MM/yyyy - dd/MM/yyyy"}
- y{"dd/MM/yyyy - dd/MM/yyyy"}
+ M{"dd/MM/y - dd/MM/y"}
+ d{"dd/MM/y - dd/MM/y"}
+ y{"dd/MM/y - dd/MM/y"}
+ }
+ }
+ }
+ gregorian{
+ AmPmMarkers{
+ "a.m.",
+ "p.m.",
+ }
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y",
+ "d MMMM y",
+ "d MMM y",
+ "dd/MM/y",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MEd{"E, d/M"}
+ Md{"d/M"}
+ yMEd{"E, d/M/y"}
+ yMMMEd{"E d MMM y"}
+ yMd{"d/M/y"}
+ }
+ intervalFormats{
+ Hm{
+ m{"HH:mm-HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm-HH:mm v"}
+ m{"HH:mm-HH:mm v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E dd/MM - E dd/MM"}
+ d{"E dd/MM - E dd/MM"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"E d MMM - E d MMM"}
+ d{"E d - E d MMM"}
+ }
+ MMMd{
+ M{"d MMM - d MMM"}
+ d{"d-d MMM"}
+ }
+ Md{
+ M{"dd/MM - dd/MM"}
+ d{"dd/MM - dd/MM"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ hm{
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ yM{
+ M{"MM/y - MM/y"}
+ y{"MM/y - MM/y"}
+ }
+ yMEd{
+ M{"E dd/MM/y - E dd/MM/y"}
+ d{"E dd/MM/y - E dd/MM/y"}
+ y{"E dd/MM/y - E dd/MM/y"}
+ }
+ yMMM{
+ M{"MMM-MMM y"}
+ y{"MMM y - MMM y"}
+ }
+ yMMMEd{
+ M{"E d MMM - E d MMM y"}
+ d{"E d - E d MMM y"}
+ y{"E d MMM y - E d MMM y"}
+ }
+ yMMMd{
+ M{"d MMM - d MMM y"}
+ d{"d-d MMM y"}
+ y{"d MMM y - d MMM y"}
+ }
+ yMd{
+ M{"dd/MM/y - dd/MM/y"}
+ d{"dd/MM/y - dd/MM/y"}
+ y{"dd/MM/y - dd/MM/y"}
}
}
}
diff --git a/data/locales/en_IM.txt b/data/locales/en_IM.txt
index c7b54ec..7331668 100755
--- a/data/locales/en_IM.txt
+++ b/data/locales/en_IM.txt
@@ -1,12 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_IM.xml
// *
// ***************************************************************************
en_IM{
%%Parent{"en_GB"}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_IN.txt b/data/locales/en_IN.txt
index 7be85a5..c154029 100644
--- a/data/locales/en_IN.txt
+++ b/data/locales/en_IN.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_IN.xml
// *
@@ -17,8 +17,30 @@
}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "dd-MMM-y G",
+ "dd/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ yMEd{"E d/M/y"}
+ yMMMEd{"E d MMM, y"}
+ yMd{"d/M/y"}
+ }
+ }
gregorian{
DateTimePatterns{
"h:mm:ss a zzzz",
diff --git a/data/locales/en_JE.txt b/data/locales/en_JE.txt
index 98b67de..fad8089 100755
--- a/data/locales/en_JE.txt
+++ b/data/locales/en_JE.txt
@@ -1,12 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_JE.xml
// *
// ***************************************************************************
en_JE{
%%Parent{"en_GB"}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_JM.txt b/data/locales/en_JM.txt
index f1a0156..3912dcb 100644
--- a/data/locales/en_JM.txt
+++ b/data/locales/en_JM.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_JM.xml
// *
@@ -14,5 +14,5 @@
}
}
}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_KE.txt b/data/locales/en_KE.txt
index b94b8c7..8cfec7b 100755
--- a/data/locales/en_KE.txt
+++ b/data/locales/en_KE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_KE.xml
// *
// ***************************************************************************
en_KE{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_KI.txt b/data/locales/en_KI.txt
index e65e5e8..cb6aace 100755
--- a/data/locales/en_KI.txt
+++ b/data/locales/en_KI.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_KI.xml
// *
// ***************************************************************************
en_KI{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_KN.txt b/data/locales/en_KN.txt
index feffbaa..2689dc3 100755
--- a/data/locales/en_KN.txt
+++ b/data/locales/en_KN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_KN.xml
// *
// ***************************************************************************
en_KN{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_KY.txt b/data/locales/en_KY.txt
index 70c196c..c04f6a7 100755
--- a/data/locales/en_KY.txt
+++ b/data/locales/en_KY.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_KY.xml
// *
// ***************************************************************************
en_KY{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_LC.txt b/data/locales/en_LC.txt
index f58d01a..0045bb0 100755
--- a/data/locales/en_LC.txt
+++ b/data/locales/en_LC.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_LC.xml
// *
// ***************************************************************************
en_LC{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_LR.txt b/data/locales/en_LR.txt
index c5d0ead..4c63ba5 100755
--- a/data/locales/en_LR.txt
+++ b/data/locales/en_LR.txt
@@ -1,12 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_LR.xml
// *
// ***************************************************************************
en_LR{
MeasurementSystem:int{1}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_LS.txt b/data/locales/en_LS.txt
index 7d82370..39feb6c 100755
--- a/data/locales/en_LS.txt
+++ b/data/locales/en_LS.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_LS.xml
// *
// ***************************************************************************
en_LS{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_MG.txt b/data/locales/en_MG.txt
index 422f147..e148720 100755
--- a/data/locales/en_MG.txt
+++ b/data/locales/en_MG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_MG.xml
// *
// ***************************************************************************
en_MG{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_MH.txt b/data/locales/en_MH.txt
index 895ffac..789a45c 100644
--- a/data/locales/en_MH.txt
+++ b/data/locales/en_MH.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_MH.xml
// *
// ***************************************************************************
en_MH{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_MP.txt b/data/locales/en_MP.txt
index e0fda41..78de6fd 100644
--- a/data/locales/en_MP.txt
+++ b/data/locales/en_MP.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_MP.xml
// *
// ***************************************************************************
en_MP{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_MT.txt b/data/locales/en_MT.txt
index b450dd2..f3ff3f8 100644
--- a/data/locales/en_MT.txt
+++ b/data/locales/en_MT.txt
@@ -1,15 +1,38 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_MT.xml
// *
// ***************************************************************************
en_MT{
%%Parent{"en_GB"}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d MMMM y G",
+ "dd MMMM y G",
+ "dd MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MMMEd{"E, d MMM"}
+ MMMd{"dd MMM"}
+ yMMMEd{"E, dd MMM y"}
+ yMMMd{"dd MMM y"}
+ }
+ }
gregorian{
DateTimePatterns{
"HH:mm:ss zzzz",
@@ -19,7 +42,7 @@
"EEEE, d MMMM y",
"dd MMMM y",
"dd MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
diff --git a/data/locales/en_MU.txt b/data/locales/en_MU.txt
index 57dc5cc..3b46d82 100755
--- a/data/locales/en_MU.txt
+++ b/data/locales/en_MU.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_MU.xml
// *
// ***************************************************************************
en_MU{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_MW.txt b/data/locales/en_MW.txt
index 87b1c0a..1694312 100755
--- a/data/locales/en_MW.txt
+++ b/data/locales/en_MW.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_MW.xml
// *
// ***************************************************************************
en_MW{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_NA.txt b/data/locales/en_NA.txt
index 412f938..5f07abb 100644
--- a/data/locales/en_NA.txt
+++ b/data/locales/en_NA.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_NA.xml
// *
@@ -14,5 +14,5 @@
}
}
}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_NG.txt b/data/locales/en_NG.txt
index 85c5880..8e7079b 100755
--- a/data/locales/en_NG.txt
+++ b/data/locales/en_NG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_NG.xml
// *
// ***************************************************************************
en_NG{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_NH.txt b/data/locales/en_NH.txt
index 92d7383..0b45233 100755
--- a/data/locales/en_NH.txt
+++ b/data/locales/en_NH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/en_NZ.txt b/data/locales/en_NZ.txt
index 561d25d..ba03f55 100644
--- a/data/locales/en_NZ.txt
+++ b/data/locales/en_NZ.txt
@@ -1,25 +1,25 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_NZ.xml
// *
// ***************************************************************************
en_NZ{
%%Parent{"en_GB"}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
+ generic{
DateTimePatterns{
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
- "EEEE, d MMMM y",
- "d MMMM y",
- "d/MM/yyyy",
- "d/MM/yy",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d/MM/y G",
+ "d/MM/yy GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -29,7 +29,7 @@
availableFormats{
MMMEd{"E, d MMM"}
Md{"d/M"}
- yMd{"d/MM/yy"}
+ yMd{"d/MM/y"}
}
intervalFormats{
M{
@@ -77,13 +77,13 @@
h{"h-h a v"}
}
yM{
- M{"MM/yy - MM/yy"}
- y{"MM/yy - MM/yy"}
+ M{"MM/y - MM/y"}
+ y{"MM/y - MM/y"}
}
yMEd{
- M{"E, d/MM/yy - E, d/MM/yy"}
- d{"E, d/MM/yy - E, d/MM/yy"}
- y{"E, d/MM/yy - E, d/MM/yy"}
+ M{"E, d/MM/y - E, d/MM/y"}
+ d{"E, d/MM/y - E, d/MM/y"}
+ y{"E, d/MM/y - E, d/MM/y"}
}
yMMM{
M{"MMM-MMM y"}
@@ -100,9 +100,105 @@
y{"d MMM y - d MMM y"}
}
yMd{
- M{"d/MM/yy - d/MM/yy"}
- d{"d/MM/yy - d/MM/yy"}
- y{"d/MM/yy - d/MM/yy"}
+ M{"d/MM/y - d/MM/y"}
+ d{"d/MM/y - d/MM/y"}
+ y{"d/MM/y - d/MM/y"}
+ }
+ }
+ }
+ gregorian{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y",
+ "d MMMM y",
+ "d/MM/y",
+ "d/MM/yy",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MMMEd{"E, d MMM"}
+ Md{"d/M"}
+ yMd{"d/MM/y"}
+ }
+ intervalFormats{
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E, d/MM - E, d/MM"}
+ d{"E, d/MM - E, d/MM"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"E, d MMM - E, d MMM"}
+ d{"E, d - E, d MMM"}
+ }
+ MMMd{
+ M{"d MMM - d MMM"}
+ d{"d-d MMM"}
+ }
+ Md{
+ M{"d/MM - d/MM"}
+ d{"d/MM - d/MM"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a - h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h:mm a - h:mm a"}
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ a{"h:mm a - h:mm a v"}
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"h a - h a v"}
+ h{"h-h a v"}
+ }
+ yM{
+ M{"MM/y - MM/y"}
+ y{"MM/y - MM/y"}
+ }
+ yMEd{
+ M{"E, d/MM/y - E, d/MM/y"}
+ d{"E, d/MM/y - E, d/MM/y"}
+ y{"E, d/MM/y - E, d/MM/y"}
+ }
+ yMMM{
+ M{"MMM-MMM y"}
+ y{"MMM y - MMM y"}
+ }
+ yMMMEd{
+ M{"E, d MMM - E, d MMM y"}
+ d{"E, d - E, d MMM y"}
+ y{"E, d MMM y - E, d MMM y"}
+ }
+ yMMMd{
+ M{"d MMM - d MMM y"}
+ d{"d-d MMM y"}
+ y{"d MMM y - d MMM y"}
+ }
+ yMd{
+ M{"d/MM/y - d/MM/y"}
+ d{"d/MM/y - d/MM/y"}
+ y{"d/MM/y - d/MM/y"}
}
}
}
diff --git a/data/locales/en_PG.txt b/data/locales/en_PG.txt
index 7bba874..112c743 100755
--- a/data/locales/en_PG.txt
+++ b/data/locales/en_PG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_PG.xml
// *
// ***************************************************************************
en_PG{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_PH.txt b/data/locales/en_PH.txt
index d6d63e6..9599e92 100644
--- a/data/locales/en_PH.txt
+++ b/data/locales/en_PH.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_PH.xml
// *
@@ -11,5 +11,5 @@
279,
216,
}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_PK.txt b/data/locales/en_PK.txt
index 9017a21..898da80 100644
--- a/data/locales/en_PK.txt
+++ b/data/locales/en_PK.txt
@@ -1,15 +1,32 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_PK.xml
// *
// ***************************************************************************
en_PK{
%%Parent{"en_GB"}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "dd-MMM-y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
gregorian{
DateTimePatterns{
"h:mm:ss a zzzz",
@@ -19,7 +36,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"dd-MMM-y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
diff --git a/data/locales/en_PR.txt b/data/locales/en_PR.txt
index 788b3cd..7ffdf8e 100755
--- a/data/locales/en_PR.txt
+++ b/data/locales/en_PR.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_PR.xml
// *
@@ -11,5 +11,5 @@
279,
216,
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_PW.txt b/data/locales/en_PW.txt
index a78ef16..7ffc66a 100755
--- a/data/locales/en_PW.txt
+++ b/data/locales/en_PW.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_PW.xml
// *
// ***************************************************************************
en_PW{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_RH.txt b/data/locales/en_RH.txt
index 928f668..bc71849 100644
--- a/data/locales/en_RH.txt
+++ b/data/locales/en_RH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/en_SB.txt b/data/locales/en_SB.txt
index 6375734..800a502 100755
--- a/data/locales/en_SB.txt
+++ b/data/locales/en_SB.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_SB.xml
// *
// ***************************************************************************
en_SB{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_SC.txt b/data/locales/en_SC.txt
index 0d3fffe..99cdb4d 100755
--- a/data/locales/en_SC.txt
+++ b/data/locales/en_SC.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_SC.xml
// *
// ***************************************************************************
en_SC{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_SG.txt b/data/locales/en_SG.txt
index cbdb3f4..df1af4f 100644
--- a/data/locales/en_SG.txt
+++ b/data/locales/en_SG.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_SG.xml
// *
@@ -15,7 +15,7 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
DateTimePatterns{
@@ -39,6 +39,60 @@
yMMMEd{"E, d MMM, y G"}
}
}
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM, y G",
+ "d MMMM, y G",
+ "d MMM, y G",
+ "d/M/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MMMEd{"E, d MMM"}
+ }
+ intervalFormats{
+ MEd{
+ M{"E, d/M – E, d/M"}
+ d{"E, d/M – E, d/M"}
+ }
+ MMMEd{
+ M{"E, d MMM – E, d MMM"}
+ d{"E, d MMM – E, d MMM"}
+ }
+ MMMd{
+ M{"d MMM – d MMM"}
+ d{"d-d MMM"}
+ }
+ yMEd{
+ M{"E, d/M/y – E, d/M/y"}
+ d{"E, d/M/y – E, d/M/y"}
+ y{"E, d/M/y – E, d/M/y"}
+ }
+ yMMMEd{
+ M{"E, d MMM – E, d MMM, y"}
+ d{"E, d MMM – E, d MMM, y"}
+ y{"E, d MMM, y – E, d MMM, y"}
+ }
+ yMMMd{
+ M{"d MMM – d MMM, y"}
+ d{"d-d MMM, y"}
+ y{"d MMM, y – d MMM, y"}
+ }
+ yMd{
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
+ }
+ }
+ }
gregorian{
DateTimePatterns{
"h:mm:ss a zzzz",
@@ -72,9 +126,9 @@
d{"d-d MMM"}
}
yMEd{
- M{"E, d/M/yy – E, d/M/yy"}
- d{"E, d/M/yy – E, d/M/yy"}
- y{"E, d/M/yy – E, d/M/yy"}
+ M{"E, d/M/y – E, d/M/y"}
+ d{"E, d/M/y – E, d/M/y"}
+ y{"E, d/M/y – E, d/M/y"}
}
yMMMEd{
M{"E, d MMM – E, d MMM, y"}
@@ -87,9 +141,9 @@
y{"d MMM, y – d MMM, y"}
}
yMd{
- M{"d/M/yy – d/M/yy"}
- d{"d/M/yy – d/M/yy"}
- y{"d/M/yy – d/M/yy"}
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
}
}
}
diff --git a/data/locales/en_SL.txt b/data/locales/en_SL.txt
index c756357..109d299 100755
--- a/data/locales/en_SL.txt
+++ b/data/locales/en_SL.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_SL.xml
// *
// ***************************************************************************
en_SL{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_SS.txt b/data/locales/en_SS.txt
index a2693c3..0c9b492 100755
--- a/data/locales/en_SS.txt
+++ b/data/locales/en_SS.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_SS.xml
// *
// ***************************************************************************
en_SS{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_SZ.txt b/data/locales/en_SZ.txt
index 7da13a8..5a87704 100755
--- a/data/locales/en_SZ.txt
+++ b/data/locales/en_SZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_SZ.xml
// *
// ***************************************************************************
en_SZ{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_TC.txt b/data/locales/en_TC.txt
index 33eafc0..0df3885 100755
--- a/data/locales/en_TC.txt
+++ b/data/locales/en_TC.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_TC.xml
// *
// ***************************************************************************
en_TC{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_TO.txt b/data/locales/en_TO.txt
index 9738a8e..6dd8375 100755
--- a/data/locales/en_TO.txt
+++ b/data/locales/en_TO.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_TO.xml
// *
// ***************************************************************************
en_TO{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_TT.txt b/data/locales/en_TT.txt
index 3bdc66c..b87dbc8 100644
--- a/data/locales/en_TT.txt
+++ b/data/locales/en_TT.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_TT.xml
// *
@@ -14,5 +14,5 @@
}
}
}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_TZ.txt b/data/locales/en_TZ.txt
index 10e0b81..1ec8edc 100755
--- a/data/locales/en_TZ.txt
+++ b/data/locales/en_TZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_TZ.xml
// *
// ***************************************************************************
en_TZ{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_UG.txt b/data/locales/en_UG.txt
index 335d4c9..df7d736 100755
--- a/data/locales/en_UG.txt
+++ b/data/locales/en_UG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_UG.xml
// *
// ***************************************************************************
en_UG{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_UM.txt b/data/locales/en_UM.txt
index 944ccdb..040a193 100644
--- a/data/locales/en_UM.txt
+++ b/data/locales/en_UM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_UM.xml
// *
// ***************************************************************************
en_UM{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_US.txt b/data/locales/en_US.txt
index 3c76141..09bfddc 100644
--- a/data/locales/en_US.txt
+++ b/data/locales/en_US.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_US.xml
// *
@@ -12,5 +12,5 @@
279,
216,
}
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_US_POSIX.txt b/data/locales/en_US_POSIX.txt
index 26bbe64..9062c7f 100644
--- a/data/locales/en_US_POSIX.txt
+++ b/data/locales/en_US_POSIX.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_US_POSIX.xml
// *
@@ -24,5 +24,5 @@
}
}
}
- Version{"2.0.65.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_VC.txt b/data/locales/en_VC.txt
index 27b27ed..7f68fbf 100755
--- a/data/locales/en_VC.txt
+++ b/data/locales/en_VC.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_VC.xml
// *
// ***************************************************************************
en_VC{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_VG.txt b/data/locales/en_VG.txt
index 793cef2..4afa163 100755
--- a/data/locales/en_VG.txt
+++ b/data/locales/en_VG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_VG.xml
// *
// ***************************************************************************
en_VG{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_VI.txt b/data/locales/en_VI.txt
index fc3ec54..a4e3946 100644
--- a/data/locales/en_VI.txt
+++ b/data/locales/en_VI.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_VI.xml
// *
// ***************************************************************************
en_VI{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_VU.txt b/data/locales/en_VU.txt
index babce23..1b5ece1 100755
--- a/data/locales/en_VU.txt
+++ b/data/locales/en_VU.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_VU.xml
// *
// ***************************************************************************
en_VU{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_WS.txt b/data/locales/en_WS.txt
index b36d21f..35e7f21 100755
--- a/data/locales/en_WS.txt
+++ b/data/locales/en_WS.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_WS.xml
// *
// ***************************************************************************
en_WS{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_ZA.txt b/data/locales/en_ZA.txt
index 5255ff5..a2f3473 100644
--- a/data/locales/en_ZA.txt
+++ b/data/locales/en_ZA.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_ZA.xml
// *
@@ -19,18 +19,18 @@
}
}
}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
+ generic{
DateTimePatterns{
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
- "EEEE dd MMMM y",
- "dd MMMM y",
- "dd MMM y",
- "yyyy/MM/dd",
+ "EEEE dd MMMM y G",
+ "dd MMMM y G",
+ "dd MMM y G",
+ "GGGGG y/MM/dd",
"{1}, {0}",
"{1} 'at' {0}",
"{1} 'at' {0}",
@@ -42,10 +42,37 @@
MMMEd{"E dd MMM"}
MMMd{"dd MMM"}
Md{"MM/dd"}
- yMEd{"E, yyyy/MM/dd"}
+ yMEd{"E, y/MM/dd"}
yMMMEd{"E, dd MMM y"}
yMMMd{"dd MMM y"}
- yMd{"yyyy/MM/dd"}
+ yMd{"y/MM/dd"}
+ }
+ }
+ gregorian{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE dd MMMM y",
+ "dd MMMM y",
+ "dd MMM y",
+ "y/MM/dd",
+ "{1}, {0}",
+ "{1} 'at' {0}",
+ "{1} 'at' {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ }
+ availableFormats{
+ MEd{"E MM/dd"}
+ MMMEd{"E dd MMM"}
+ MMMd{"dd MMM"}
+ Md{"MM/dd"}
+ yMEd{"E, y/MM/dd"}
+ yMMMEd{"E, dd MMM y"}
+ yMMMd{"dd MMM y"}
+ yMd{"y/MM/dd"}
}
}
}
diff --git a/data/locales/en_ZM.txt b/data/locales/en_ZM.txt
index 685fb29..e245cc1 100755
--- a/data/locales/en_ZM.txt
+++ b/data/locales/en_ZM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_ZM.xml
// *
// ***************************************************************************
en_ZM{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/en_ZW.txt b/data/locales/en_ZW.txt
index 1845145..35f4b89 100644
--- a/data/locales/en_ZW.txt
+++ b/data/locales/en_ZW.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_ZW.xml
// *
@@ -14,8 +14,35 @@
}
}
}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE dd MMMM y G",
+ "dd MMMM y G",
+ "dd MMM,y G",
+ "d/M/y GGGGG",
+ "{1}, {0}",
+ "{1} 'at' {0}",
+ "{1} 'at' {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ }
+ availableFormats{
+ MEd{"E d/M"}
+ MMMEd{"E dd MMM"}
+ MMMd{"dd MMM"}
+ Md{"d/M"}
+ yMEd{"E, d/M/y"}
+ yMMMEd{"E, dd MMM, y"}
+ yMMMd{"dd MMM, y"}
+ yMd{"d/M/y"}
+ }
+ }
gregorian{
DateTimePatterns{
"h:mm:ss a zzzz",
@@ -25,7 +52,7 @@
"EEEE dd MMMM y",
"dd MMMM y",
"dd MMM,y",
- "d/M/yyyy",
+ "d/M/y",
"{1}, {0}",
"{1} 'at' {0}",
"{1} 'at' {0}",
diff --git a/data/locales/eo.txt b/data/locales/eo.txt
index 9a5d585..803d694 100644
--- a/data/locales/eo.txt
+++ b/data/locales/eo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/eo.xml
// *
@@ -24,8 +24,25 @@
}
}
}
- Version{"2.0.74.74"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "H-'a' 'horo' 'kaj' m:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d-'a' 'de' MMMM y G",
+ "G y-MMMM-dd",
+ "G y-MMM-dd",
+ "GGGGG yy-MM-dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
gregorian{
AmPmMarkers{
"atm",
diff --git a/data/locales/es.txt b/data/locales/es.txt
index 3fd1894..3090eb2 100644
--- a/data/locales/es.txt
+++ b/data/locales/es.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es.xml
// *
@@ -14,8 +14,8 @@
ExemplarCharacters{"[a á b c d e é f g h i í j k l m n ñ o ó p q r s t u ú ü v w x y z]"}
ExemplarCharactersIndex{"[A B C D E F G H I J K L M N Ñ O P Q R S T U V W X Y Z]"}
ExemplarCharactersPunctuation{
- "[\- ‐ – — , ; \: ! ¡ ? ¿ . … ' ‘ ’ \" “ ” « » ( ) \[ \] § @ * / \\ \& # † ‡ "
- "′ ″]"
+ "[\\- ‐ – — , ; \\: ! ¡ ? ¿ . … ' ‘ ’ \u0022 “ ” « » ( ) \\[ \\] § @ * / "
+ "\\\\ \\& # † ‡ ′ ″]"
}
LocaleScript{
"Latn",
@@ -146,58 +146,13 @@
}
}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.47"}
calendar{
buddhist{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE, d 'de' MMMM 'de' y G",
- "d 'de' MMMM 'de' y G",
- "dd/MM/y G",
- "dd/MM/y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E, d/M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMd{"d 'de' MMMM"}
- MMMd{"d MMM"}
- MMMdd{"dd-MMM"}
- MMd{"d/MM"}
- Md{"d/M"}
- d{"d"}
- h{"hh a"}
- hm{"hh:mm a"}
- hms{"hh:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yM{"M/y G"}
- yMEd{"E d/M/y G"}
- yMMM{"MMM y G"}
- yMMMEd{"E, d MMM y G"}
- yMMMM{"MMMM 'de' y G"}
- yMMMd{"d MMM y G"}
- yMd{"d/M/y G"}
- yQQQ{"QQQ y G"}
- yQQQQ{"QQQQ 'de' y G"}
- yyMM{"MM/y G"}
- yyMMM{"MMM-y G"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ 'de' y G"}
- yyyyMM{"MM/y G"}
+ eras{
+ abbreviated{
+ "BE",
+ }
}
}
chinese{
@@ -216,6 +171,181 @@
"{1} {0}",
"{1} {0}",
}
+ availableFormats{
+ Ed{"E d"}
+ Gy{"y"}
+ GyMMM{"M-y"}
+ GyMMMEd{"E, d-M-y"}
+ GyMMMd{"d-M-y"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d-M"}
+ MMM{"L"}
+ MMMEd{"E d-M"}
+ MMMd{"d-M"}
+ Md{"d-M"}
+ d{"d"}
+ h{"hh a"}
+ hm{"hh:mm a"}
+ hms{"hh:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yyyy{"y"}
+ yyyyM{"M-y"}
+ yyyyMEd{"E, d-M-y"}
+ yyyyMMM{"M-y"}
+ yyyyMMMEd{"E, d-M-y"}
+ yyyyMMMM{"M-y"}
+ yyyyMMMd{"d-M-y"}
+ yyyyMd{"d-M-y"}
+ yyyyQQQ{"QQQ y"}
+ yyyyQQQQ{"QQQQ y"}
+ }
+ }
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "dd/MM/y G",
+ "dd/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E, d 'de' MMMM 'de' y G"}
+ GyMMMd{"d MMM y G"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMMd{"d 'de' MMMM"}
+ MMMd{"d MMM"}
+ MMMdd{"dd-MMM"}
+ Md{"d/M"}
+ d{"d"}
+ h{"hh a"}
+ hm{"hh:mm a"}
+ hms{"hh:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y G"}
+ yyyy{"y G"}
+ yyyyM{"M/y GGGGG"}
+ yyyyMEd{"E, d/M/y GGGGG"}
+ yyyyMMM{"MMM y G"}
+ yyyyMMMEd{"E, d 'de' MMMM 'de' y G"}
+ yyyyMMMM{"MMMM 'de' y G"}
+ yyyyMMMd{"d MMM y G"}
+ yyyyMd{"d/M/y GGGGG"}
+ yyyyQQQ{"QQQ y G"}
+ yyyyQQQQ{"QQQQ 'de' y G"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm – HH:mm"}
+ m{"HH:mm – HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm – HH:mm v"}
+ m{"HH:mm – HH:mm v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E d/M – E d/M"}
+ d{"E d/M – E d/M"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E d MMM – E d MMM"}
+ d{"E d MMM – E d MMM"}
+ }
+ MMMd{
+ M{"d MMM – d MMM"}
+ d{"d–d MMM"}
+ }
+ Md{
+ M{"d/M – d/M"}
+ d{"d/M – d/M"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm – h:mm a"}
+ m{"h:mm – h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm – h:mm a v"}
+ m{"h:mm – h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y G"}
+ }
+ yM{
+ M{"M/y – M/y G"}
+ y{"M/y – M/y G"}
+ }
+ yMEd{
+ M{"E d/M/y – E d/M/y G"}
+ d{"E d/M/y – E d/M/y G"}
+ y{"E d/M/y – E d/M/y G"}
+ }
+ yMMM{
+ M{"MMM–MMM y G"}
+ y{"MMM y – MMM y G"}
+ }
+ yMMMEd{
+ M{"E d MMM – E d MMM y G"}
+ d{"E d MMM – E d MMM y G"}
+ y{"E d MMM y – E d MMM y G"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y G"}
+ y{"MMMM y – MMMM y G"}
+ }
+ yMMMd{
+ M{"d MMM – d MMM y G"}
+ d{"d–d MMM y G"}
+ y{"d MMM y – d MMM y G"}
+ }
+ yMd{
+ M{"d/M/y – d/M/y G"}
+ d{"d/M/y – d/M/y G"}
+ y{"d/M/y – d/M/y G"}
+ }
+ }
}
gregorian{
AmPmMarkers{
@@ -229,7 +359,7 @@
"HH:mm",
"EEEE, d 'de' MMMM 'de' y",
"d 'de' MMMM 'de' y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"dd/MM/yy",
"{1} {0}",
"{1} {0}",
@@ -239,6 +369,10 @@
}
availableFormats{
Ed{"E d"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E, d 'de' MMMM 'de' y G"}
+ GyMMMd{"d MMM y G"}
H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -260,6 +394,7 @@
y{"y"}
yM{"M/y"}
yMEd{"EEE, d/M/y"}
+ yMM{"MM/y"}
yMMM{"MMM y"}
yMMMEd{"EEE, d 'de' MMMM 'de' y"}
yMMMM{"MMMM 'de' y"}
@@ -267,9 +402,6 @@
yMd{"d/M/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ 'de' y"}
- yyMM{"MM/yy"}
- yyMMM{"MMM-yy"}
- yyyyMM{"MM/yyyy"}
}
dayNames{
format{
@@ -332,63 +464,6 @@
"anno Dómini",
}
}
- fields{
- day{
- dn{"día"}
- relative{
- "-1"{"ayer"}
- "-2"{"antes de ayer"}
- "0"{"hoy"}
- "1"{"mañana"}
- "2"{"pasado mañana"}
- }
- }
- dayperiod{
- dn{"periodo del día"}
- }
- era{
- dn{"era"}
- }
- hour{
- dn{"hora"}
- }
- minute{
- dn{"minuto"}
- }
- month{
- dn{"mes"}
- relative{
- "-1"{"el mes pasado"}
- "0"{"este mes"}
- "1"{"el próximo mes"}
- }
- }
- second{
- dn{"segundo"}
- }
- week{
- dn{"semana"}
- relative{
- "-1"{"la semana pasada"}
- "0"{"esta semana"}
- "1"{"la próxima semana"}
- }
- }
- weekday{
- dn{"día de la semana"}
- }
- year{
- dn{"año"}
- relative{
- "-1"{"el año pasado"}
- "0"{"este año"}
- "1"{"el próximo año"}
- }
- }
- zone{
- dn{"zona"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -449,13 +524,13 @@
y{"y–y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E d/M/yy – E d/M/yy"}
- d{"E d/M/yy – E d/M/yy"}
- y{"E d/M/yy – E d/M/yy"}
+ M{"E d/M/y – E d/M/y"}
+ d{"E d/M/y – E d/M/y"}
+ y{"E d/M/y – E d/M/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -476,9 +551,9 @@
y{"d MMM y – d MMM y"}
}
yMd{
- M{"d/M/yy – d/M/yy"}
- d{"d/M/yy – d/M/yy"}
- y{"d/M/yy – d/M/yy"}
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
}
}
monthNames{
@@ -580,55 +655,18 @@
}
}
}
- islamic{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE, d 'de' MMMM 'de' y G",
- "d 'de' MMMM 'de' y G",
- "dd/MM/y G",
- "dd/MM/y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
+ hebrew{
+ eras{
+ abbreviated{
+ "AM",
+ }
}
- availableFormats{
- Ed{"E d"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E, d/M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMd{"d 'de' MMMM"}
- MMMd{"d MMM"}
- MMMdd{"dd-MMM"}
- MMd{"d/MM"}
- Md{"d/M"}
- d{"d"}
- h{"hh a"}
- hm{"hh:mm a"}
- hms{"hh:mm:ss a"}
- ms{"mm:ss"}
- yMMMEd{"E d MMM y"}
- yyMM{"MM/y G"}
- yyMMM{"MMM-y G"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ 'de' y G"}
- yyyy{"y G"}
- yyyyM{"M/y G"}
- yyyyMEd{"E d/M/y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMM{"MMMM 'de' y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"d/M/y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ 'de' y G"}
+ }
+ islamic{
+ eras{
+ abbreviated{
+ "AH",
+ }
}
}
japanese{
@@ -640,101 +678,15 @@
"EEEE, d 'de' MMMM 'de' y G",
"d 'de' MMMM 'de' y G",
"dd/MM/y G",
- "dd/MM/y GGGGG",
+ "dd/MM/yy GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
- availableFormats{
- Ed{"E d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E, d/M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMd{"d 'de' MMMM"}
- MMMd{"d MMM"}
- MMMdd{"dd-MMM"}
- MMd{"d/MM"}
- Md{"d/M"}
- d{"d"}
- h{"hh a"}
- hm{"hh:mm a"}
- hms{"hh:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM/y GGGGG"}
- yyMMM{"MMM-y G"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ 'de' y G"}
- yyyy{"y G"}
- yyyyM{"M/y GGGGG"}
- yyyyMEd{"E d/M/y GGGGG"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMM{"MMMM 'de' y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"d/M/y GGGGG"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ 'de' y G"}
- }
}
roc{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE, d 'de' MMMM 'de' y G",
- "d 'de' MMMM 'de' y G",
- "dd/MM/y G",
- "dd/MM/y GGGGG",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E, d/M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMd{"d 'de' MMMM"}
- MMMd{"d MMM"}
- MMMdd{"dd-MMM"}
- MMd{"d/MM"}
- Md{"d/M"}
- d{"d"}
- h{"hh a"}
- hm{"hh:mm a"}
- hms{"hh:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM/y GGGGG"}
- yyMMM{"MMM-y G"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ 'de' y G"}
- yyyy{"y G"}
- yyyyM{"M/y GGGGG"}
- yyyyMEd{"E d/M/y GGGGG"}
- yyyyMM{"MM/y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMM{"MMMM 'de' y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"d/M/y GGGGG"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ 'de' y G"}
- }
eras{
abbreviated{
"antes de R.O.C.",
@@ -771,6 +723,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"día"}
+ relative{
+ "-1"{"ayer"}
+ "-2"{"antes de ayer"}
+ "0"{"hoy"}
+ "1"{"mañana"}
+ "2"{"pasado mañana"}
+ }
+ }
+ dayperiod{
+ dn{"periodo del día"}
+ }
+ era{
+ dn{"era"}
+ }
+ hour{
+ dn{"hora"}
+ }
+ minute{
+ dn{"minuto"}
+ }
+ month{
+ dn{"mes"}
+ relative{
+ "-1"{"el mes pasado"}
+ "0"{"este mes"}
+ "1"{"el próximo mes"}
+ }
+ }
+ second{
+ dn{"segundo"}
+ }
+ week{
+ dn{"semana"}
+ relative{
+ "-1"{"la semana pasada"}
+ "0"{"esta semana"}
+ "1"{"la próxima semana"}
+ }
+ }
+ weekday{
+ dn{"día de la semana"}
+ }
+ year{
+ dn{"año"}
+ relative{
+ "-1"{"el año pasado"}
+ "0"{"este año"}
+ "1"{"el próximo año"}
+ }
+ }
+ zone{
+ dn{"zona"}
+ }
+ }
listPattern{
standard{
2{"{0} y {1}"}
diff --git a/data/locales/es_419.txt b/data/locales/es_419.txt
index 139c59d..79514cd 100644
--- a/data/locales/es_419.txt
+++ b/data/locales/es_419.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_419.xml
// *
@@ -70,8 +70,13 @@
}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ availableFormats{
+ yMEd{"E d/M/y G"}
+ }
+ }
gregorian{
availableFormats{
yMEd{"E d/M/y"}
@@ -89,29 +94,6 @@
}
}
}
- fields{
- month{
- relative{
- "-1"{"El mes pasado"}
- "0"{"Este mes"}
- "1"{"Mes próximo"}
- }
- }
- week{
- relative{
- "-1"{"Semana pasada"}
- "0"{"Esta semana"}
- "1"{"Próxima semana"}
- }
- }
- year{
- relative{
- "-1"{"Año pasado"}
- "0"{"Este año"}
- "1"{"Año próximo"}
- }
- }
- }
quarters{
format{
narrow{
@@ -124,6 +106,29 @@
}
}
}
+ fields{
+ month{
+ relative{
+ "-1"{"El mes pasado"}
+ "0"{"Este mes"}
+ "1"{"Mes próximo"}
+ }
+ }
+ week{
+ relative{
+ "-1"{"Semana pasada"}
+ "0"{"Esta semana"}
+ "1"{"Próxima semana"}
+ }
+ }
+ year{
+ relative{
+ "-1"{"Año pasado"}
+ "0"{"Este año"}
+ "1"{"Año próximo"}
+ }
+ }
+ }
measurementSystemNames{
UK{"Reino Unido"}
}
diff --git a/data/locales/es_AR.txt b/data/locales/es_AR.txt
index 864f076..1b8e44d 100644
--- a/data/locales/es_AR.txt
+++ b/data/locales/es_AR.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_AR.xml
// *
@@ -16,8 +16,29 @@
}
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH'h'''mm:ss zzzz",
+ "H:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "dd/MM/y G",
+ "dd/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MEd{"E d-M"}
+ yM{"M-y"}
+ }
+ }
gregorian{
DateTimePatterns{
"HH'h'''mm:ss zzzz",
@@ -26,7 +47,7 @@
"HH:mm",
"EEEE, d 'de' MMMM 'de' y",
"d 'de' MMMM 'de' y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"dd/MM/yy",
"{1} {0}",
"{1} {0}",
@@ -36,7 +57,7 @@
}
availableFormats{
MEd{"E d-M"}
- yM{"M-yyyy"}
+ yM{"M-y"}
}
}
}
diff --git a/data/locales/es_BO.txt b/data/locales/es_BO.txt
index dde4e10..d866f5e 100644
--- a/data/locales/es_BO.txt
+++ b/data/locales/es_BO.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_BO.xml
// *
@@ -16,5 +16,5 @@
}
}
}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/es_CL.txt b/data/locales/es_CL.txt
index 613cebc..997bdf0 100644
--- a/data/locales/es_CL.txt
+++ b/data/locales/es_CL.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_CL.xml
// *
@@ -23,8 +23,32 @@
279,
216,
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "H:mm:ss z",
+ "H:mm:ss",
+ "H:mm",
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "dd-MM-y G",
+ "dd-MM-yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MEd{"E, dd-MM"}
+ Md{"dd-MM"}
+ yM{"MM-y"}
+ yMEd{"E dd-MM-y"}
+ yMd{"dd-MM-y"}
+ }
+ }
gregorian{
DateTimePatterns{
"HH:mm:ss zzzz",
@@ -33,7 +57,7 @@
"H:mm",
"EEEE, d 'de' MMMM 'de' y",
"d 'de' MMMM 'de' y",
- "dd-MM-yyyy",
+ "dd-MM-y",
"dd-MM-yy",
"{1} {0}",
"{1} {0}",
@@ -44,9 +68,9 @@
availableFormats{
MEd{"E, dd-MM"}
Md{"dd-MM"}
- yM{"MM-yy"}
- yMEd{"E dd-MM-yy"}
- yMd{"dd-MM-yy"}
+ yM{"MM-y"}
+ yMEd{"E dd-MM-y"}
+ yMd{"dd-MM-y"}
}
}
}
diff --git a/data/locales/es_CO.txt b/data/locales/es_CO.txt
index efa0e87..5908c32 100644
--- a/data/locales/es_CO.txt
+++ b/data/locales/es_CO.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_CO.xml
// *
@@ -20,8 +20,25 @@
279,
216,
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "H:mm:ss z",
+ "H:mm:ss",
+ "H:mm",
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "d/MM/y G",
+ "d/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
gregorian{
DateTimePatterns{
"HH:mm:ss zzzz",
@@ -30,7 +47,7 @@
"H:mm",
"EEEE, d 'de' MMMM 'de' y",
"d 'de' MMMM 'de' y",
- "d/MM/yyyy",
+ "d/MM/y",
"d/MM/yy",
"{1} {0}",
"{1} {0}",
diff --git a/data/locales/es_CR.txt b/data/locales/es_CR.txt
index 891f999..8effb9a 100644
--- a/data/locales/es_CR.txt
+++ b/data/locales/es_CR.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_CR.xml
// *
@@ -20,5 +20,5 @@
279,
216,
}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/es_CU.txt b/data/locales/es_CU.txt
index e0926e2..6358b92 100755
--- a/data/locales/es_CU.txt
+++ b/data/locales/es_CU.txt
@@ -1,12 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_CU.xml
// *
// ***************************************************************************
es_CU{
%%Parent{"es_419"}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/es_DO.txt b/data/locales/es_DO.txt
index 562d59a..8f8444e 100644
--- a/data/locales/es_DO.txt
+++ b/data/locales/es_DO.txt
@@ -1,12 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_DO.xml
// *
// ***************************************************************************
es_DO{
%%Parent{"es_419"}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/es_EA.txt b/data/locales/es_EA.txt
index c71ac2f..588b957 100755
--- a/data/locales/es_EA.txt
+++ b/data/locales/es_EA.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_EA.xml
// *
// ***************************************************************************
es_EA{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/es_EC.txt b/data/locales/es_EC.txt
index 196e07b..14c5ebc 100644
--- a/data/locales/es_EC.txt
+++ b/data/locales/es_EC.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_EC.xml
// *
@@ -19,8 +19,25 @@
}
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "H:mm:ss z",
+ "H:mm:ss",
+ "H:mm",
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "dd/MM/y G",
+ "dd/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
gregorian{
DateTimePatterns{
"HH:mm:ss zzzz",
@@ -29,7 +46,7 @@
"H:mm",
"EEEE, d 'de' MMMM 'de' y",
"d 'de' MMMM 'de' y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"dd/MM/yy",
"{1} {0}",
"{1} {0}",
diff --git a/data/locales/es_ES.txt b/data/locales/es_ES.txt
index ec28260..8da8c65 100644
--- a/data/locales/es_ES.txt
+++ b/data/locales/es_ES.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_ES.xml
// *
// ***************************************************************************
es_ES{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/es_GQ.txt b/data/locales/es_GQ.txt
index 7c4fa0b..d159f80 100755
--- a/data/locales/es_GQ.txt
+++ b/data/locales/es_GQ.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_GQ.xml
// *
@@ -14,5 +14,5 @@
}
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/es_GT.txt b/data/locales/es_GT.txt
index 4100b53..a73f914 100644
--- a/data/locales/es_GT.txt
+++ b/data/locales/es_GT.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_GT.xml
// *
@@ -12,8 +12,25 @@
279,
216,
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "d/MM/y G",
+ "d/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
gregorian{
DateTimePatterns{
"HH:mm:ss zzzz",
@@ -22,7 +39,7 @@
"HH:mm",
"EEEE, d 'de' MMMM 'de' y",
"d 'de' MMMM 'de' y",
- "d/MM/yyyy",
+ "d/MM/y",
"d/MM/yy",
"{1} {0}",
"{1} {0}",
diff --git a/data/locales/es_HN.txt b/data/locales/es_HN.txt
index 793a126..62d5c83 100644
--- a/data/locales/es_HN.txt
+++ b/data/locales/es_HN.txt
@@ -1,15 +1,32 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_HN.xml
// *
// ***************************************************************************
es_HN{
%%Parent{"es_419"}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE dd 'de' MMMM 'de' y G",
+ "dd 'de' MMMM 'de' y G",
+ "dd/MM/y G",
+ "dd/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
gregorian{
DateTimePatterns{
"HH:mm:ss zzzz",
@@ -18,7 +35,7 @@
"HH:mm",
"EEEE dd 'de' MMMM 'de' y",
"dd 'de' MMMM 'de' y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"dd/MM/yy",
"{1} {0}",
"{1} {0}",
diff --git a/data/locales/es_IC.txt b/data/locales/es_IC.txt
index c4d28e7..a56cad2 100755
--- a/data/locales/es_IC.txt
+++ b/data/locales/es_IC.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_IC.xml
// *
// ***************************************************************************
es_IC{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/es_MX.txt b/data/locales/es_MX.txt
index d698224..ec9ab1d 100644
--- a/data/locales/es_MX.txt
+++ b/data/locales/es_MX.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_MX.xml
// *
@@ -12,5 +12,5 @@
279,
216,
}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/es_NI.txt b/data/locales/es_NI.txt
index ad2b472..b159601 100644
--- a/data/locales/es_NI.txt
+++ b/data/locales/es_NI.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_NI.xml
// *
@@ -12,5 +12,5 @@
279,
216,
}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/es_PA.txt b/data/locales/es_PA.txt
index b829a6d..23d11ec 100644
--- a/data/locales/es_PA.txt
+++ b/data/locales/es_PA.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_PA.xml
// *
@@ -12,8 +12,32 @@
279,
216,
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "MM/dd/y G",
+ "MM/dd/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MEd{"E, MM/dd"}
+ Md{"MM/dd"}
+ yM{"MM/y"}
+ yMEd{"E MM/dd/y"}
+ yMd{"MM/dd/y"}
+ }
+ }
gregorian{
DateTimePatterns{
"HH:mm:ss zzzz",
@@ -22,7 +46,7 @@
"HH:mm",
"EEEE, d 'de' MMMM 'de' y",
"d 'de' MMMM 'de' y",
- "MM/dd/yyyy",
+ "MM/dd/y",
"MM/dd/yy",
"{1} {0}",
"{1} {0}",
@@ -33,9 +57,9 @@
availableFormats{
MEd{"E, MM/dd"}
Md{"MM/dd"}
- yM{"MM/yy"}
- yMEd{"E MM/dd/yy"}
- yMd{"MM/dd/yy"}
+ yM{"MM/y"}
+ yMEd{"E MM/dd/y"}
+ yMd{"MM/dd/y"}
}
}
}
diff --git a/data/locales/es_PE.txt b/data/locales/es_PE.txt
index fcd5ce9..7c5cbc1 100644
--- a/data/locales/es_PE.txt
+++ b/data/locales/es_PE.txt
@@ -1,15 +1,32 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_PE.xml
// *
// ***************************************************************************
es_PE{
%%Parent{"es_419"}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH'H'mm''ss'' zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "dd/MM/y G",
+ "d/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
gregorian{
DateTimePatterns{
"HH'H'mm''ss'' zzzz",
@@ -18,7 +35,7 @@
"HH:mm",
"EEEE, d 'de' MMMM 'de' y",
"d 'de' MMMM 'de' y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"d/MM/yy",
"{1} {0}",
"{1} {0}",
diff --git a/data/locales/es_PH.txt b/data/locales/es_PH.txt
index 11c8478..5734b11 100755
--- a/data/locales/es_PH.txt
+++ b/data/locales/es_PH.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_PH.xml
// *
@@ -11,5 +11,5 @@
279,
216,
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/es_PR.txt b/data/locales/es_PR.txt
index 8fc21eb..9c65226 100644
--- a/data/locales/es_PR.txt
+++ b/data/locales/es_PR.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_PR.xml
// *
@@ -12,8 +12,32 @@
279,
216,
}
- Version{"2.0.74.74"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "MM/dd/y G",
+ "MM/dd/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MEd{"E, MM/dd"}
+ Md{"MM/dd"}
+ yM{"MM/y"}
+ yMEd{"E MM/dd/y"}
+ yMd{"MM/dd/y"}
+ }
+ }
gregorian{
DateTimePatterns{
"h:mm:ss a zzzz",
@@ -22,7 +46,7 @@
"h:mm a",
"EEEE, d 'de' MMMM 'de' y",
"d 'de' MMMM 'de' y",
- "MM/dd/yyyy",
+ "MM/dd/y",
"MM/dd/yy",
"{1} {0}",
"{1} {0}",
@@ -33,9 +57,9 @@
availableFormats{
MEd{"E, MM/dd"}
Md{"MM/dd"}
- yM{"MM/yy"}
- yMEd{"E MM/dd/yy"}
- yMd{"MM/dd/yy"}
+ yM{"MM/y"}
+ yMEd{"E MM/dd/y"}
+ yMd{"MM/dd/y"}
}
}
}
diff --git a/data/locales/es_PY.txt b/data/locales/es_PY.txt
index 5e350e8..5d80456 100644
--- a/data/locales/es_PY.txt
+++ b/data/locales/es_PY.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_PY.xml
// *
@@ -19,5 +19,5 @@
}
}
}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/es_SV.txt b/data/locales/es_SV.txt
index 5b603d3..65d7b8b 100644
--- a/data/locales/es_SV.txt
+++ b/data/locales/es_SV.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_SV.xml
// *
@@ -12,5 +12,5 @@
279,
216,
}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/es_US.txt b/data/locales/es_US.txt
index f534576..a9ce161 100644
--- a/data/locales/es_US.txt
+++ b/data/locales/es_US.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_US.xml
// *
@@ -13,9 +13,46 @@
279,
216,
}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ AmPmMarkers{
+ "AM",
+ "PM",
+ }
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "MMM d, y G",
+ "M/d/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MEd{"E, MM/dd"}
+ MMMEd{"E, MMM d"}
+ MMMd{"MMM d"}
+ MMd{"MM/d"}
+ Md{"M/d"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMd{"MMM d, y"}
+ yMd{"M/d/y"}
+ }
+ }
gregorian{
+ AmPmMarkers{
+ "AM",
+ "PM",
+ }
DateTimePatterns{
"h:mm:ss a zzzz",
"h:mm:ss a z",
@@ -37,11 +74,11 @@
MMMd{"MMM d"}
MMd{"MM/d"}
Md{"M/d"}
- yM{"M/yy"}
- yMEd{"E, M/d/yy"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
yMMMEd{"E, MMM d, y"}
yMMMd{"MMM d, y"}
- yMd{"M/d/yy"}
+ yMd{"M/d/y"}
}
}
}
diff --git a/data/locales/es_UY.txt b/data/locales/es_UY.txt
index d8ca33a..ed714c6 100644
--- a/data/locales/es_UY.txt
+++ b/data/locales/es_UY.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_UY.xml
// *
@@ -19,5 +19,5 @@
}
}
}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/es_VE.txt b/data/locales/es_VE.txt
index 29d72d5..560c3ef 100644
--- a/data/locales/es_VE.txt
+++ b/data/locales/es_VE.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_VE.xml
// *
@@ -23,5 +23,5 @@
279,
216,
}
- Version{"2.0.77.27"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/et.txt b/data/locales/et.txt
index 366332a..acdda3e 100644
--- a/data/locales/et.txt
+++ b/data/locales/et.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/et.xml
// *
@@ -19,7 +19,7 @@
NumberElements{
latn{
patterns{
- currencyFormat{"#0.00¤;(#0.00¤)"}
+ currencyFormat{"#,##0.00 ¤;(#,##0.00 ¤)"}
decimalFormat{"#,##0.###"}
percentFormat{"#,##0%"}
scientificFormat{"#E0"}
@@ -142,8 +142,152 @@
}
}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.47"}
calendar{
+ generic{
+ DateTimePatterns{
+ "H:mm.ss zzzz",
+ "H:mm.ss z",
+ "H:mm.ss",
+ "H:mm",
+ "EEEE, d. MMMM y G",
+ "d. MMMM y G",
+ "dd.MM.y G",
+ "dd.MM.yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E, d"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"H:mm.ss"}
+ M{"M"}
+ MEd{"E, d.M"}
+ MMM{"MMMM"}
+ MMMEd{"E, d. MMM"}
+ MMMMEd{"E, d. MMMM"}
+ MMMMd{"d. MMMM"}
+ MMMd{"d. MMM"}
+ MMdd{"dd.MM"}
+ Md{"d.M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm.ss a"}
+ mmss{"mm.ss"}
+ ms{"mm.ss"}
+ y{"y"}
+ yM{"M.y"}
+ yMEd{"E, d.M y"}
+ yMM{"MM.y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, d. MMMM y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d. MMM y"}
+ yMd{"d.M.y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH.mm–HH.mm"}
+ m{"HH.mm–HH.mm"}
+ }
+ Hmv{
+ H{"HH.mm–HH.mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, dd.MM–E, dd.MM"}
+ d{"E, dd.MM–E, dd.MM"}
+ }
+ MMM{
+ M{"LLL–LLL"}
+ }
+ MMMEd{
+ M{"E, d. MMM–E, d. MMM"}
+ d{"E, d. MMM–E, d. MMM"}
+ }
+ MMMd{
+ M{"d. MMM–d. MMM"}
+ d{"d.–d. MMM"}
+ }
+ Md{
+ M{"dd.MM–dd.MM"}
+ d{"dd.MM–dd.MM"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0}–{1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"HH.mma–HH.mma v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"MM.y–MM.y"}
+ y{"MM.y–MM.y"}
+ }
+ yMEd{
+ M{"E, dd.MM.y–E, dd.MM.y"}
+ d{"E, dd.MM.y–E, dd.MM.y"}
+ y{"E, dd.MM.y–E, dd.MM.y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y–MMM y"}
+ }
+ yMMMEd{
+ M{"E, d. MMM–E, d. MMM y"}
+ d{"E, d. MMM–E, d. MMM y"}
+ y{"E, d. MMM y–E, d. MMM y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"d. MMM–d. MMM y"}
+ d{"d.–d. MMM y"}
+ y{"d. MMM y–d. MMM y"}
+ }
+ yMd{
+ M{"dd.MM.y–dd.MM.y"}
+ d{"dd.MM.y–dd.MM.y"}
+ y{"dd.MM.y–dd.MM.y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"AM",
@@ -156,7 +300,7 @@
"H:mm",
"EEEE, d. MMMM y",
"d. MMMM y",
- "dd.MM.yyyy",
+ "dd.MM.y",
"dd.MM.yy",
"{1} {0}",
"{1} {0}",
@@ -187,14 +331,14 @@
y{"y"}
yM{"M.y"}
yMEd{"E, d.M y"}
+ yMM{"MM.y"}
yMMM{"MMM y"}
yMMMEd{"E, d. MMMM y"}
+ yMMMM{"MMMM y"}
yMMMd{"d. MMM y"}
yMd{"d.M.y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyyyMM{"MM.yyyy"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -284,63 +428,6 @@
"meie aja järgi",
}
}
- fields{
- day{
- dn{"päev"}
- relative{
- "-1"{"eile"}
- "-2"{"üleeile"}
- "0"{"täna"}
- "1"{"homme"}
- "2"{"ülehomme"}
- }
- }
- dayperiod{
- dn{"enne/pärast lõunat"}
- }
- era{
- dn{"ajastu"}
- }
- hour{
- dn{"tund"}
- }
- minute{
- dn{"minut"}
- }
- month{
- dn{"kuu"}
- relative{
- "-1"{"Eelmine kuu"}
- "0"{"See kuu"}
- "1"{"Järgmine kuu"}
- }
- }
- second{
- dn{"sekund"}
- }
- week{
- dn{"nädal"}
- relative{
- "-1"{"Eelmine nädal"}
- "0"{"See nädal"}
- "1"{"Järgmine nädal"}
- }
- }
- weekday{
- dn{"nädalapäev"}
- }
- year{
- dn{"aasta"}
- relative{
- "-1"{"Eelmine aasta"}
- "0"{"Sel aastal"}
- "1"{"Järgmine aasta"}
- }
- }
- zone{
- dn{"vöönd"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -404,13 +491,13 @@
y{"y–y"}
}
yM{
- M{"MM.yy–MM.yy"}
- y{"MM.yy–MM.yy"}
+ M{"MM.y–MM.y"}
+ y{"MM.y–MM.y"}
}
yMEd{
- M{"E, dd.MM.yy–E, dd.MM.yy"}
- d{"E, dd.MM.yy–E, dd.MM.yy"}
- y{"E, dd.MM.yy–E, dd.MM.yy"}
+ M{"E, dd.MM.y–E, dd.MM.y"}
+ d{"E, dd.MM.y–E, dd.MM.y"}
+ y{"E, dd.MM.y–E, dd.MM.y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -431,9 +518,9 @@
y{"d. MMM y–d. MMM y"}
}
yMd{
- M{"dd.MM.yy–dd.MM.yy"}
- d{"dd.MM.yy–dd.MM.yy"}
- y{"dd.MM.yy–dd.MM.yy"}
+ M{"dd.MM.y–dd.MM.y"}
+ d{"dd.MM.y–dd.MM.y"}
+ y{"dd.MM.y–dd.MM.y"}
}
}
monthNames{
@@ -576,6 +663,63 @@
quotationEnd{"“"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"päev"}
+ relative{
+ "-1"{"eile"}
+ "-2"{"üleeile"}
+ "0"{"täna"}
+ "1"{"homme"}
+ "2"{"ülehomme"}
+ }
+ }
+ dayperiod{
+ dn{"enne/pärast lõunat"}
+ }
+ era{
+ dn{"ajastu"}
+ }
+ hour{
+ dn{"tund"}
+ }
+ minute{
+ dn{"minut"}
+ }
+ month{
+ dn{"kuu"}
+ relative{
+ "-1"{"Eelmine kuu"}
+ "0"{"See kuu"}
+ "1"{"Järgmine kuu"}
+ }
+ }
+ second{
+ dn{"sekund"}
+ }
+ week{
+ dn{"nädal"}
+ relative{
+ "-1"{"Eelmine nädal"}
+ "0"{"See nädal"}
+ "1"{"Järgmine nädal"}
+ }
+ }
+ weekday{
+ dn{"nädalapäev"}
+ }
+ year{
+ dn{"aasta"}
+ relative{
+ "-1"{"Eelmine aasta"}
+ "0"{"Sel aastal"}
+ "1"{"Järgmine aasta"}
+ }
+ }
+ zone{
+ dn{"vöönd"}
+ }
+ }
listPattern{
standard{
2{"{0} ja {1}"}
diff --git a/data/locales/et_EE.txt b/data/locales/et_EE.txt
index 31b9292..d4b9cc3 100644
--- a/data/locales/et_EE.txt
+++ b/data/locales/et_EE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/et_EE.xml
// *
// ***************************************************************************
et_EE{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/eu.txt b/data/locales/eu.txt
index fc6c42b..787f524 100644
--- a/data/locales/eu.txt
+++ b/data/locales/eu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/eu.xml
// *
@@ -145,7 +145,7 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
eras{
@@ -154,6 +154,143 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, G y MMMM dd",
+ "G y MMMM d",
+ "G y MMM d",
+ "GGGGG y-MM-dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"y-M"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMd{"MMM d, y"}
+ yMd{"y-M-d"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, M/d – E, M/d"}
+ d{"E, M/d – E, M/d"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E, MMM d – E, MMM d"}
+ d{"E, MMM d – E, MMM d"}
+ }
+ MMMd{
+ M{"MMM d – MMM d"}
+ d{"MMM d–d"}
+ }
+ Md{
+ M{"M/d – M/d"}
+ d{"M/d – M/d"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{":h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
+ }
+ yMEd{
+ M{"E, M/d/y – E, M/d/y"}
+ d{"E, M/d/y – E, M/d/y"}
+ y{"E, M/d/y – E, M/d/y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y – MMM y"}
+ }
+ yMMMEd{
+ M{"E, MMM d – E, MMM d, y"}
+ d{"E, MMM d – E, MMM d, y"}
+ y{"E, MMM d, y – E, MMM d, y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"MMM d – MMM d, y"}
+ d{"MMM d–d, y"}
+ y{"MMM d, y – MMM d, y"}
+ }
+ yMd{
+ M{"M/d/y – M/d/y"}
+ d{"M/d/y – M/d/y"}
+ y{"M/d/y – M/d/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"AM",
@@ -167,7 +304,7 @@
"EEEE, y MMMM dd",
"y MMMM d",
"y MMM d",
- "yyyy-MM-dd",
+ "y-MM-dd",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -265,63 +402,6 @@
"K.o.",
}
}
- fields{
- day{
- dn{"Eguna"}
- relative{
- "-1"{"Atzo"}
- "-2"{"Herenegun"}
- "0"{"Gaur"}
- "1"{"Bihar"}
- "2"{"Etzi"}
- }
- }
- dayperiod{
- dn{"AM//PM"}
- }
- era{
- dn{"Aroa"}
- }
- hour{
- dn{"Ordua"}
- }
- minute{
- dn{"Minutuak"}
- }
- month{
- dn{"Hilabetea"}
- relative{
- "-1"{"Aurreko hilabetea"}
- "0"{"Gauden hilabetea"}
- "1"{"Hurrengo hilabetea"}
- }
- }
- second{
- dn{"Segundoak"}
- }
- week{
- dn{"Astea"}
- relative{
- "-1"{"Aurreko astea"}
- "0"{"Aste hau"}
- "1"{"Hurrengo astea"}
- }
- }
- weekday{
- dn{"Asteguna"}
- }
- year{
- dn{"Urtea"}
- relative{
- "-1"{"Aurreko urtea"}
- "0"{"Aurten"}
- "1"{"Hurrengo urtea"}
- }
- }
- zone{
- dn{"Ordu-eremua"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -385,13 +465,13 @@
y{"y–y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E, M/d/yy – E, M/d/yy"}
- d{"E, M/d/yy – E, M/d/yy"}
- y{"E, M/d/yy – E, M/d/yy"}
+ M{"E, M/d/y – E, M/d/y"}
+ d{"E, M/d/y – E, M/d/y"}
+ y{"E, M/d/y – E, M/d/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -412,9 +492,9 @@
y{"MMM d, y – MMM d, y"}
}
yMd{
- M{"M/d/yy – M/d/yy"}
- d{"M/d/yy – M/d/yy"}
- y{"M/d/yy – M/d/yy"}
+ M{"M/d/y – M/d/y"}
+ d{"M/d/y – M/d/y"}
+ y{"M/d/y – M/d/y"}
}
}
monthNames{
@@ -511,6 +591,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Eguna"}
+ relative{
+ "-1"{"Atzo"}
+ "-2"{"Herenegun"}
+ "0"{"Gaur"}
+ "1"{"Bihar"}
+ "2"{"Etzi"}
+ }
+ }
+ dayperiod{
+ dn{"AM//PM"}
+ }
+ era{
+ dn{"Aroa"}
+ }
+ hour{
+ dn{"Ordua"}
+ }
+ minute{
+ dn{"Minutuak"}
+ }
+ month{
+ dn{"Hilabetea"}
+ relative{
+ "-1"{"Aurreko hilabetea"}
+ "0"{"Gauden hilabetea"}
+ "1"{"Hurrengo hilabetea"}
+ }
+ }
+ second{
+ dn{"Segundoak"}
+ }
+ week{
+ dn{"Astea"}
+ relative{
+ "-1"{"Aurreko astea"}
+ "0"{"Aste hau"}
+ "1"{"Hurrengo astea"}
+ }
+ }
+ weekday{
+ dn{"Asteguna"}
+ }
+ year{
+ dn{"Urtea"}
+ relative{
+ "-1"{"Aurreko urtea"}
+ "0"{"Aurten"}
+ "1"{"Hurrengo urtea"}
+ }
+ }
+ zone{
+ dn{"Ordu-eremua"}
+ }
+ }
listPattern{
standard{
2{"{0} eta {1}"}
diff --git a/data/locales/eu_ES.txt b/data/locales/eu_ES.txt
index ece640c..aefe542 100644
--- a/data/locales/eu_ES.txt
+++ b/data/locales/eu_ES.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/eu_ES.xml
// *
// ***************************************************************************
eu_ES{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ewo.txt b/data/locales/ewo.txt
index 4a758be..b77276d 100755
--- a/data/locales/ewo.txt
+++ b/data/locales/ewo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ewo.xml
// *
@@ -34,8 +34,49 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d/M/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"kíkíríg",
@@ -49,7 +90,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM y",
- "d/M/yyyy",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -123,46 +164,6 @@
"ámvus Yésus Kirís",
}
}
- fields{
- day{
- dn{"Amǒs"}
- relative{
- "-1"{"Angogé"}
- "0"{"Aná"}
- "1"{"Okírí"}
- }
- }
- dayperiod{
- dn{"Kírí / Ngəgógəle"}
- }
- era{
- dn{"Abǒg"}
- }
- hour{
- dn{"Awola"}
- }
- minute{
- dn{"Enútɛn"}
- }
- month{
- dn{"Ngɔn"}
- }
- second{
- dn{"Akábəga"}
- }
- week{
- dn{"Sɔ́ndɔ"}
- }
- weekday{
- dn{"Amǒs yá sɔ́ndɔ"}
- }
- year{
- dn{"M̀bú"}
- }
- zone{
- dn{"Nkɔŋ Awola"}
- }
- }
monthNames{
format{
abbreviated{
@@ -235,4 +236,44 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"Amǒs"}
+ relative{
+ "-1"{"Angogé"}
+ "0"{"Aná"}
+ "1"{"Okírí"}
+ }
+ }
+ dayperiod{
+ dn{"Kírí / Ngəgógəle"}
+ }
+ era{
+ dn{"Abǒg"}
+ }
+ hour{
+ dn{"Awola"}
+ }
+ minute{
+ dn{"Enútɛn"}
+ }
+ month{
+ dn{"Ngɔn"}
+ }
+ second{
+ dn{"Akábəga"}
+ }
+ week{
+ dn{"Sɔ́ndɔ"}
+ }
+ weekday{
+ dn{"Amǒs yá sɔ́ndɔ"}
+ }
+ year{
+ dn{"M̀bú"}
+ }
+ zone{
+ dn{"Nkɔŋ Awola"}
+ }
+ }
}
diff --git a/data/locales/ewo_CM.txt b/data/locales/ewo_CM.txt
index 86d80d5..efc7e5e 100755
--- a/data/locales/ewo_CM.txt
+++ b/data/locales/ewo_CM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ewo_CM.xml
// *
// ***************************************************************************
ewo_CM{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fa.txt b/data/locales/fa.txt
index 1600871..feedef7 100644
--- a/data/locales/fa.txt
+++ b/data/locales/fa.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fa.xml
// *
@@ -19,7 +19,7 @@
"ش ص ض ط ظ ع غ ف ق ک گ ل م ن و ه ة ی]"
}
ExemplarCharactersIndex{"[آ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن و ه ی]"}
- ExemplarCharactersPunctuation{"[\- ‐ ، ٫ ٬ ؛ \: ! ؟ . … « » ( ) \[ \] * / \\]"}
+ ExemplarCharactersPunctuation{"[\\- ‐ ، ٫ ٬ ؛ \\: ! ؟ . … « » ( ) \\[ \\] * / \\\\]"}
LocaleScript{
"Arab",
}
@@ -141,8 +141,158 @@
}
native{"arabext"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
calendar{
+ default{"persian"}
+ generic{
+ DateTimePatterns{
+ "H:mm:ss (zzzz)",
+ "H:mm:ss (z)",
+ "H:mm:ss",
+ "H:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "y/M/d G",
+ "{1}، {0}",
+ "{1}، ساعت {0}",
+ "{1}، ساعت {0}",
+ "{1}، {0}",
+ "{1}، {0}",
+ }
+ appendItems{
+ Day-Of-Week{"{1} {0}"}
+ }
+ availableFormats{
+ Ed{"E d"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E d MMM y G"}
+ GyMMMd{"d MMM y G"}
+ H{"H"}
+ HHmmZ{"HH:mm (Z)"}
+ Hm{"H:mm"}
+ Hms{"H:mm:ss"}
+ M{"L"}
+ MEd{"E M/d"}
+ MMM{"LLL"}
+ MMMEd{"E d LLL"}
+ MMMMEd{"E d LLLL"}
+ MMMMd{"d LLLL"}
+ MMMd{"d LLL"}
+ Md{"M/d"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y G"}
+ yyyy{"y G"}
+ yyyyM{"y/M G"}
+ yyyyMEd{"E y/M/d G"}
+ yyyyMMM{"MMM y G"}
+ yyyyMMMEd{"E d MMM y G"}
+ yyyyMMMd{"d MMM y G"}
+ yyyyMd{"y/M/d G"}
+ yyyyQQQ{"QQQQ y G"}
+ yyyyQQQQ{"QQQQ y G"}
+ }
+ intervalFormats{
+ H{
+ H{"H تا H"}
+ }
+ Hm{
+ H{"H:mm تا H:mm"}
+ m{"H:mm تا H:mm"}
+ }
+ Hmv{
+ H{"H:mm تا H:mm (v)"}
+ m{"H:mm تا H:mm (v)"}
+ }
+ Hv{
+ H{"H تا H (v)"}
+ }
+ M{
+ M{"M تا M"}
+ }
+ MEd{
+ M{"E M/d تا E M/d"}
+ d{"E M/d تا E M/d"}
+ }
+ MMM{
+ M{"LLL تا LLL"}
+ }
+ MMMEd{
+ M{"E d LLL تا E d LLL"}
+ d{"E d LLL تا E d LLL"}
+ }
+ MMMd{
+ M{"d LLL تا d LLL"}
+ d{"d تا d LLL"}
+ }
+ Md{
+ M{"M/d تا M/d"}
+ d{"M/d تا M/d"}
+ }
+ d{
+ d{"d تا d"}
+ }
+ fallback{"{0} تا {1}"}
+ h{
+ a{"h a تا h a"}
+ h{"h تا h a"}
+ }
+ hm{
+ a{"h:mm a تا h:mm a"}
+ h{"h:mm تا h:mm a"}
+ m{"h:mm تا h:mm a"}
+ }
+ hmv{
+ a{"h:mm a تا h:mm a (v)"}
+ h{"h:mm تا h:mm a (v)"}
+ m{"h:mm تا h:mm a (v)"}
+ }
+ hv{
+ a{"h a تا h a (v)"}
+ h{"h تا h a (v)"}
+ }
+ y{
+ y{"y تا y G"}
+ }
+ yM{
+ M{"y/M تا y/M G"}
+ y{"y/M تا y/M G"}
+ }
+ yMEd{
+ M{"E y/M/d تا E y/M/d G"}
+ d{"E y/M/d تا E y/M/d G"}
+ y{"E y/M/d تا E y/M/d G"}
+ }
+ yMMM{
+ M{"LLL تا MMM y G"}
+ y{"MMM y تا MMM y G"}
+ }
+ yMMMEd{
+ M{"E d LLL تا E d MMM y G"}
+ d{"E d LLL تا E d MMM y G"}
+ y{"E d MMM y تا E d MMM y G"}
+ }
+ yMMMM{
+ M{"LLLL تا MMMM y G"}
+ y{"MMMM y تا MMMM y G"}
+ }
+ yMMMd{
+ M{"d LLL تا d MMM y G"}
+ d{"d تا d MMM y G"}
+ y{"d MMM y تا d MMM y G"}
+ }
+ yMd{
+ M{"y/M/d تا y/M/d G"}
+ d{"y/M/d تا y/M/d G"}
+ y{"y/M/d تا y/M/d G"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"قبلازظهر",
@@ -156,7 +306,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM y",
- "yyyy/M/d",
+ "y/M/d",
"{1}، {0}",
"{1}، ساعت {0}",
"{1}، ساعت {0}",
@@ -168,7 +318,10 @@
}
availableFormats{
Ed{"E d"}
- GGGGyyyyMMMMd{"d MMMM y GGGG"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E d MMM y G"}
+ GyMMMd{"d MMM y G"}
H{"H"}
HHmmZ{"HH:mm (Z)"}
Hm{"H:mm"}
@@ -193,13 +346,11 @@
yMMM{"MMM y"}
yMMMEd{"E d MMM y"}
yMMMM{"MMMM y"}
+ yMMMMEEEEd{"EEEE d MMMM y"}
yMMMd{"d MMM y"}
yMd{"y/M/d"}
yQQQ{"QQQQ y"}
yQQQQ{"QQQQ y"}
- yyyyM{"yyyy/M"}
- yyyyMMMM{"MMMM yyyy"}
- yyyyMMMMEEEEd{"EEEE d MMMM yyyy"}
}
dayNames{
format{
@@ -293,63 +444,6 @@
"میلادی",
}
}
- fields{
- day{
- dn{"روز"}
- relative{
- "-1"{"دیروز"}
- "-2"{"پریروز"}
- "0"{"امروز"}
- "1"{"فردا"}
- "2"{"پسفردا"}
- }
- }
- dayperiod{
- dn{"قبل/بعدازظهر"}
- }
- era{
- dn{"دوره"}
- }
- hour{
- dn{"ساعت"}
- }
- minute{
- dn{"دقیقه"}
- }
- month{
- dn{"ماه"}
- relative{
- "-1"{"ماه گذشته"}
- "0"{"این ماه"}
- "1"{"ماه آینده"}
- }
- }
- second{
- dn{"ثانیه"}
- }
- week{
- dn{"هفته"}
- relative{
- "-1"{"هفتهٔ گذشته"}
- "0"{"این هفته"}
- "1"{"هفتهٔ آینده"}
- }
- }
- weekday{
- dn{"روز هفته"}
- }
- year{
- dn{"سال"}
- relative{
- "-1"{"سال گذشته"}
- "0"{"امسال"}
- "1"{"سال آینده"}
- }
- }
- zone{
- dn{"منطقهٔ زمانی"}
- }
- }
intervalFormats{
H{
H{"H تا H"}
@@ -413,13 +507,13 @@
y{"y تا y"}
}
yM{
- M{"yyyy/M تا yyyy/M"}
- y{"yyyy/M تا yyyy/M"}
+ M{"y/M تا y/M"}
+ y{"y/M تا y/M"}
}
yMEd{
- M{"E yyyy/M/d تا E yyyy/M/d"}
- d{"E yyyy/M/d تا E yyyy/M/d"}
- y{"E yyyy/M/d تا E yyyy/M/d"}
+ M{"E y/M/d تا E y/M/d"}
+ d{"E y/M/d تا E y/M/d"}
+ y{"E y/M/d تا E y/M/d"}
}
yMMM{
M{"LLL تا MMM y"}
@@ -440,9 +534,9 @@
y{"d MMM y تا d MMM y"}
}
yMd{
- M{"yyyy/M/d تا yyyy/M/d"}
- d{"yyyy/M/d تا yyyy/M/d"}
- y{"yyyy/M/d تا yyyy/M/d"}
+ M{"y/M/d تا y/M/d"}
+ d{"y/M/d تا y/M/d"}
+ y{"y/M/d تا y/M/d"}
}
}
monthNames{
@@ -690,7 +784,7 @@
"H:mm",
"EEEE d MMMM y GGGG",
"d MMMM y G",
- "yyyy/M/d G",
+ "y/M/d G",
"yy/M/d G",
"{1}، {0}",
"{1}، ساعت {0}",
@@ -700,6 +794,10 @@
}
availableFormats{
Ed{"E d"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E d MMM y G"}
+ GyMMMd{"d MMM y G"}
H{"H"}
Hm{"H:mm"}
Hms{"H:mm:ss"}
@@ -717,8 +815,8 @@
hms{"h:mm:ss a"}
ms{"mm:ss"}
y{"y"}
- yM{"yyyy/M"}
- yMEd{"E yyyy/M/d"}
+ yM{"y/M"}
+ yMEd{"E y/M/d"}
yMMM{"MMM y"}
yMMMEd{"E d MMM y"}
yMMMM{"MMMM y"}
@@ -931,9 +1029,65 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"روز"}
+ relative{
+ "-1"{"دیروز"}
+ "-2"{"پریروز"}
+ "0"{"امروز"}
+ "1"{"فردا"}
+ "2"{"پسفردا"}
+ }
+ }
+ dayperiod{
+ dn{"قبل/بعدازظهر"}
+ }
+ era{
+ dn{"دوره"}
+ }
+ hour{
+ dn{"ساعت"}
+ }
+ minute{
+ dn{"دقیقه"}
+ }
+ month{
+ dn{"ماه"}
+ relative{
+ "-1"{"ماه گذشته"}
+ "0"{"این ماه"}
+ "1"{"ماه آینده"}
+ }
+ }
+ second{
+ dn{"ثانیه"}
+ }
+ week{
+ dn{"هفته"}
+ relative{
+ "-1"{"هفتهٔ گذشته"}
+ "0"{"این هفته"}
+ "1"{"هفتهٔ آینده"}
+ }
+ }
+ weekday{
+ dn{"روز هفته"}
+ }
+ year{
+ dn{"سال"}
+ relative{
+ "-1"{"سال گذشته"}
+ "0"{"امسال"}
+ "1"{"سال آینده"}
+ }
+ }
+ zone{
+ dn{"منطقهٔ زمانی"}
+ }
+ }
layout{
characters{"right-to-left"}
- lines{"top-to-bottom"}
}
listPattern{
standard{
diff --git a/data/locales/fa_AF.txt b/data/locales/fa_AF.txt
index c77c555..c475761 100644
--- a/data/locales/fa_AF.txt
+++ b/data/locales/fa_AF.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fa_AF.xml
// *
@@ -15,7 +15,7 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
gregorian{
monthNames{
diff --git a/data/locales/fa_IR.txt b/data/locales/fa_IR.txt
index 8351702..c792d0e 100644
--- a/data/locales/fa_IR.txt
+++ b/data/locales/fa_IR.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fa_IR.xml
// *
// ***************************************************************************
fa_IR{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ff.txt b/data/locales/ff.txt
index b85c460..1ff8247 100755
--- a/data/locales/ff.txt
+++ b/data/locales/ff.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ff.xml
// *
@@ -27,22 +27,18 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
- AmPmMarkers{
- "subaka",
- "kikiiɗe",
- }
+ generic{
DateTimePatterns{
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE d MMMM y",
- "d MMMM y",
- "d MMM, y",
- "d/M/yyyy",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM, y G",
+ "d/M/y GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -64,16 +60,57 @@
y{"y"}
yM{"M/y"}
yMEd{"E d/M/y"}
+ yMM{"MM/y"}
yMMM{"MMM y"}
yMMMEd{"E d MMM y"}
yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"MM/y"}
- yyMMM{"MMM yy"}
- yyMMMEd{"E d MMM yy"}
- yyMMMd{"d MMM yy"}
- yyyyMMMM{"MMMM yyyy"}
+ }
+ }
+ gregorian{
+ AmPmMarkers{
+ "subaka",
+ "kikiiɗe",
+ }
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y",
+ "d MMMM y",
+ "d MMM, y",
+ "d/M/y",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ M{"M"}
+ MMM{"MMM"}
+ MMMEd{"E d MMM"}
+ MMMMEd{"E d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMMdd{"dd MMM"}
+ MMd{"d/MM"}
+ MMdd{"dd/MM"}
+ Md{"d/M"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMM{"MM/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
}
dayNames{
format{
@@ -118,46 +155,6 @@
"Caggal Iisa",
}
}
- fields{
- day{
- dn{"Ñalnde"}
- relative{
- "-1"{"Haŋki"}
- "0"{"Hannde"}
- "1"{"Jaŋngo"}
- }
- }
- dayperiod{
- dn{"Sahnga"}
- }
- era{
- dn{"Jamaanu"}
- }
- hour{
- dn{"Waktu"}
- }
- minute{
- dn{"Hoƴom"}
- }
- month{
- dn{"Lewru"}
- }
- second{
- dn{"Majaango"}
- }
- week{
- dn{"Yontere"}
- }
- weekday{
- dn{"Ñalɗi yontere"}
- }
- year{
- dn{"Hitaande"}
- }
- zone{
- dn{"Diiwaan waktu"}
- }
- }
monthNames{
format{
abbreviated{
@@ -230,4 +227,44 @@
quotationEnd{"”"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"Ñalnde"}
+ relative{
+ "-1"{"Haŋki"}
+ "0"{"Hannde"}
+ "1"{"Jaŋngo"}
+ }
+ }
+ dayperiod{
+ dn{"Sahnga"}
+ }
+ era{
+ dn{"Jamaanu"}
+ }
+ hour{
+ dn{"Waktu"}
+ }
+ minute{
+ dn{"Hoƴom"}
+ }
+ month{
+ dn{"Lewru"}
+ }
+ second{
+ dn{"Majaango"}
+ }
+ week{
+ dn{"Yontere"}
+ }
+ weekday{
+ dn{"Ñalɗi yontere"}
+ }
+ year{
+ dn{"Hitaande"}
+ }
+ zone{
+ dn{"Diiwaan waktu"}
+ }
+ }
}
diff --git a/data/locales/ff_SN.txt b/data/locales/ff_SN.txt
index 44c8c3a..1ae1bca 100755
--- a/data/locales/ff_SN.txt
+++ b/data/locales/ff_SN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ff_SN.xml
// *
// ***************************************************************************
ff_SN{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fi.txt b/data/locales/fi.txt
index 797cdfe..8bfec41 100644
--- a/data/locales/fi.txt
+++ b/data/locales/fi.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fi.xml
// *
@@ -142,57 +142,13 @@
}
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
calendar{
buddhist{
- DateTimePatterns{
- "H.mm.ss zzzz",
- "H.mm.ss z",
- "H.mm.ss",
- "H.mm",
- "cccc d. MMMM y G",
- "d. MMMM y G",
- "d.M.y G",
- "d.M.y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"ccc d."}
- Gy{"y G"}
- H{"H"}
- Hm{"H.mm"}
- Hms{"H.mm.ss"}
- M{"L"}
- MEd{"E d.M."}
- MMM{"LLL"}
- MMMEd{"E d. MMM"}
- MMMd{"d. MMM"}
- Md{"d.M."}
- d{"d"}
- hm{"h.mm a"}
- hms{"h.mm.ss a"}
- ms{"mm.ss"}
- y{"y G"}
- yM{"L.y G"}
- yMEd{"E d.M.y G"}
- yMMM{"LLLL y G"}
- yMMMEd{"E d. MMM y G"}
- yMMMMccccd{"cccc, d. MMMM y G"}
- yMMMd{"d. MMM y G"}
- yMd{"d.M.y G"}
- yQQQ{"QQQ y G"}
- yQQQQ{"QQQQ y G"}
- yyMM{"M.y G"}
- yyMMM{"LLLL y G"}
- yyQQQ{"QQQ y G"}
- yyyyM{"M.y G"}
- yyyyMEd{"E d.M.y G"}
- yyyyMMMM{"LLLL y G"}
- yyyyQQQQ{"QQQQ y G"}
+ eras{
+ abbreviated{
+ "BE",
+ }
}
}
chinese{
@@ -222,8 +178,161 @@
hm{"h.mm a"}
hms{"h.mm.ss a"}
ms{"mm.ss"}
- yMEd{"E d.M.y"}
- yMd{"d.M.y"}
+ y{"y"}
+ yyyy{"y"}
+ yyyyMEd{"E d.M.y"}
+ yyyyMMMEd{"E d.M.y"}
+ yyyyMMMd{"d.M.y"}
+ yyyyMd{"d.M.y"}
+ }
+ }
+ generic{
+ DateTimePatterns{
+ "H.mm.ss zzzz",
+ "H.mm.ss z",
+ "H.mm.ss",
+ "H.mm",
+ "cccc d. MMMM y G",
+ "d. MMMM y G",
+ "d.M.y G",
+ "d.M.y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d."}
+ Gy{"y G"}
+ GyMMM{"LLL y G"}
+ GyMMMEd{"E d. MMM y G"}
+ GyMMMd{"d. MMM y G"}
+ H{"H"}
+ Hm{"H.mm"}
+ Hms{"H.mm.ss"}
+ M{"L"}
+ MEd{"E d.M."}
+ MMM{"LLL"}
+ MMMEd{"ccc d. MMM"}
+ MMMd{"d. MMM"}
+ Md{"d.M."}
+ d{"d"}
+ h{"h a"}
+ hm{"h.mm a"}
+ hms{"h.mm.ss a"}
+ ms{"mm.ss"}
+ y{"y G"}
+ yyyy{"y G"}
+ yyyyM{"L.y G"}
+ yyyyMEd{"E d.M.y G"}
+ yyyyMM{"M.y G"}
+ yyyyMMM{"LLL y G"}
+ yyyyMMMEd{"E d. MMM y G"}
+ yyyyMMMM{"LLLL y G"}
+ yyyyMMMMccccd{"cccc d. MMMM y G"}
+ yyyyMMMd{"d. MMM y G"}
+ yyyyMd{"d.M.y G"}
+ yyyyQQQ{"QQQ y G"}
+ yyyyQQQQ{"QQQQ y G"}
+ }
+ intervalFormats{
+ H{
+ H{"H–H"}
+ }
+ Hm{
+ H{"H.mm–H.mm"}
+ m{"H.mm–H.mm"}
+ }
+ Hmv{
+ H{"H.mm–H.mm v"}
+ m{"H.mm–H.mm v"}
+ }
+ Hv{
+ H{"H–H v"}
+ }
+ M{
+ M{"L.–L."}
+ }
+ MEd{
+ M{"E d.M. – E d.M."}
+ d{"E d. – E d.M."}
+ }
+ MMM{
+ M{"LLL–LLLL"}
+ }
+ MMMEd{
+ M{"E d. MMMM – E d. MMMM"}
+ d{"E d. – E d. MMMM"}
+ }
+ MMMM{
+ M{"LLL–LLLL"}
+ }
+ MMMd{
+ M{"d. MMMM – d. MMMM"}
+ d{"d.–d. MMMM"}
+ }
+ Md{
+ M{"d.M.–d.M."}
+ d{"d.–d.M."}
+ }
+ d{
+ d{"d.–d."}
+ }
+ fallback{"{0}–{1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h.mm a – h.mm a"}
+ h{"h.mm–h.mm a"}
+ m{"h.mm–h.mm a"}
+ }
+ hmv{
+ a{"h.mm a – h.mm a v"}
+ h{"h.mm–h.mm a v"}
+ m{"h.mm–h.mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y G"}
+ }
+ yM{
+ M{"LLL–LLLL y G"}
+ y{"LLLL y – LLLL y G"}
+ }
+ yMEd{
+ M{"E d.M.y – E d.M.y G"}
+ d{"E d.M.y – E d.M.y G"}
+ y{"E d.M.y – E d.M.y G"}
+ }
+ yMMM{
+ M{"LLL–LLLL y G"}
+ y{"LLLL y – LLLL y G"}
+ }
+ yMMMEd{
+ M{"E d. MMMM – E d. MMMM y G"}
+ d{"E d. – E d. MMMM y G"}
+ y{"E d. MMMM y – E d. MMMM y G"}
+ }
+ yMMMM{
+ M{"LLL–LLLL y G"}
+ y{"LLLL y – LLLL y G"}
+ }
+ yMMMd{
+ M{"d. MMMM – d. MMMM y G"}
+ d{"d.–d. MMMM y G"}
+ y{"d. MMMM y – d. MMMM y G"}
+ }
+ yMd{
+ M{"d.M.–d.M.y G"}
+ d{"d.–d.M.y G"}
+ y{"d.M.y–d.M.y G"}
+ }
}
}
gregorian{
@@ -238,8 +347,8 @@
"H.mm",
"cccc d. MMMM y",
"d. MMMM y",
- "d.M.yyyy",
- "d.M.yyyy",
+ "d.M.y",
+ "d.M.y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -248,6 +357,10 @@
}
availableFormats{
Ed{"E d."}
+ Gy{"y G"}
+ GyMMM{"LLL y G"}
+ GyMMMEd{"E d. MMM y G"}
+ GyMMMd{"d. MMM y G"}
H{"H"}
Hm{"H.mm"}
Hms{"H.mm.ss"}
@@ -263,21 +376,17 @@
hms{"h.mm.ss a"}
ms{"mm.ss"}
y{"y"}
- yM{"L.yyyy"}
- yMEd{"E d.M.yyyy"}
+ yM{"L.y"}
+ yMEd{"E d.M.y"}
+ yMM{"M.y"}
yMMM{"LLL y"}
yMMMEd{"E d. MMM y"}
+ yMMMM{"LLLL y"}
yMMMMccccd{"cccc d. MMMM y"}
yMMMd{"d. MMM y"}
- yMd{"d.M.yyyy"}
+ yMd{"d.M.y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"M.yy"}
- yyMMM{"LLLL yy"}
- yyyyM{"M.yyyy"}
- yyyyMEd{"E d.M.yyyy"}
- yyyyMMMM{"LLLL y"}
- yyyyQQQQ{"QQQQ y"}
}
dayNames{
format{
@@ -371,63 +480,6 @@
"jälkeen Kristuksen syntymän",
}
}
- fields{
- day{
- dn{"päivä"}
- relative{
- "-1"{"eilen"}
- "-2"{"toissapäivänä"}
- "0"{"tänään"}
- "1"{"huomenna"}
- "2"{"ylihuomenna"}
- }
- }
- dayperiod{
- dn{"vuorokaudenaika"}
- }
- era{
- dn{"aikakausi"}
- }
- hour{
- dn{"tunti"}
- }
- minute{
- dn{"minuutti"}
- }
- month{
- dn{"kuukausi"}
- relative{
- "-1"{"viime kuussa"}
- "0"{"tässä kuussa"}
- "1"{"ensi kuussa"}
- }
- }
- second{
- dn{"sekunti"}
- }
- week{
- dn{"viikko"}
- relative{
- "-1"{"viime viikolla"}
- "0"{"tällä viikolla"}
- "1"{"ensi viikolla"}
- }
- }
- weekday{
- dn{"viikonpäivä"}
- }
- year{
- dn{"vuosi"}
- relative{
- "-1"{"viime vuonna"}
- "0"{"tänä vuonna"}
- "1"{"ensi vuonna"}
- }
- }
- zone{
- dn{"aikavyöhyke"}
- }
- }
intervalFormats{
H{
H{"H–H"}
@@ -498,9 +550,9 @@
y{"LLLL y – LLLL y"}
}
yMEd{
- M{"E d.M.yyyy – E d.M.yyyy"}
- d{"E d.M.yyyy – E d.M.yyyy"}
- y{"E d.M.yyyy – E d.M.yyyy"}
+ M{"E d.M.y – E d.M.y"}
+ d{"E d.M.y – E d.M.y"}
+ y{"E d.M.y – E d.M.y"}
}
yMMM{
M{"LLL–LLLL y"}
@@ -521,9 +573,9 @@
y{"d. MMMM y – d. MMMM y"}
}
yMd{
- M{"d.M.–d.M.yyyy"}
- d{"d.–d.M.yyyy"}
- y{"d.M.yyyy–d.M.yyyy"}
+ M{"d.M.–d.M.y"}
+ d{"d.–d.M.y"}
+ y{"d.M.y–d.M.y"}
}
}
monthNames{
@@ -732,51 +784,6 @@
}
}
islamic{
- DateTimePatterns{
- "H.mm.ss zzzz",
- "H.mm.ss z",
- "H.mm.ss",
- "H.mm",
- "cccc d. MMMM y G",
- "d. MMMM y G",
- "d.M.y G",
- "d.M.y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"ccc d."}
- Gy{"y G"}
- H{"H"}
- Hm{"H.mm"}
- Hms{"H.mm.ss"}
- M{"L"}
- MEd{"E d.M."}
- MMM{"LLL"}
- MMMEd{"E d. MMM"}
- MMMd{"d. MMM"}
- Md{"d.M."}
- d{"d"}
- hm{"h.mm a"}
- hms{"h.mm.ss a"}
- ms{"mm.ss"}
- y{"y G"}
- yyyy{"y G"}
- yyyyM{"M.y G"}
- yyyyMEd{"E d.M.y G"}
- yyyyMM{"M.y G"}
- yyyyMMM{"LLLL y G"}
- yyyyMMMEd{"E d. MMM y G"}
- yyyyMMMM{"LLLL y G"}
- yyyyMMMMccccd{"cccc, d. MMMM y G"}
- yyyyMMMd{"d. MMM y G"}
- yyyyMd{"d.M.y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
- }
monthNames{
format{
wide{
@@ -805,72 +812,20 @@
"cccc d. MMMM y G",
"d. MMMM y G",
"d.M.y G",
- "d.M.y G",
+ "d.M.y GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
- availableFormats{
- Ed{"ccc d."}
- Gy{"y G"}
- Hm{"H.mm"}
- Hms{"H.mm.ss"}
- MEd{"E d.M."}
- MMMEd{"E d. MMM"}
- MMMMd{"d. MMMM"}
- MMMd{"d. MMM"}
- Md{"d.M"}
- hm{"h.mm a"}
- hms{"h.mm.ss a"}
- ms{"mm.ss"}
- y{"y G"}
- yyyy{"y G"}
- yyyyM{"M.y G"}
- yyyyMEd{"E d.M.y G"}
- yyyyMMM{"LLLL yy G"}
- yyyyMMMEd{"E d. MMM yy G"}
- yyyyMMMd{"d. MMM yy G"}
- yyyyMd{"d.M.y G"}
- }
}
roc{
- DateTimePatterns{
- "H.mm.ss zzzz",
- "H.mm.ss z",
- "H.mm.ss",
- "H.mm",
- "cccc d. MMMM y G",
- "d. MMMM y G",
- "d.M.y G",
- "d.M.y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"ccc d."}
- Gy{"y G"}
- Hm{"H.mm"}
- Hms{"H.mm.ss"}
- MEd{"E d.M."}
- MMMEd{"E d. MMM"}
- MMMd{"d. MMM"}
- Md{"d.M."}
- hm{"h.mm a"}
- hms{"h.mm.ss a"}
- ms{"mm.ss"}
- y{"y G"}
- yyyy{"y G"}
- yyyyM{"M.y G"}
- yyyyMEd{"E d.M.y G"}
- yyyyMMM{"LLLL y G"}
- yyyyMMMEd{"E d. MMM y G"}
- yyyyMMMd{"d. MMM y G"}
- yyyyMd{"d.M.y G"}
+ eras{
+ abbreviated{
+ "Before R.O.C.",
+ "Minguo",
+ }
}
}
}
@@ -880,6 +835,63 @@
quotationEnd{"”"}
quotationStart{"”"}
}
+ fields{
+ day{
+ dn{"päivä"}
+ relative{
+ "-1"{"eilen"}
+ "-2"{"toissapäivänä"}
+ "0"{"tänään"}
+ "1"{"huomenna"}
+ "2"{"ylihuomenna"}
+ }
+ }
+ dayperiod{
+ dn{"vuorokaudenaika"}
+ }
+ era{
+ dn{"aikakausi"}
+ }
+ hour{
+ dn{"tunti"}
+ }
+ minute{
+ dn{"minuutti"}
+ }
+ month{
+ dn{"kuukausi"}
+ relative{
+ "-1"{"viime kuussa"}
+ "0"{"tässä kuussa"}
+ "1"{"ensi kuussa"}
+ }
+ }
+ second{
+ dn{"sekunti"}
+ }
+ week{
+ dn{"viikko"}
+ relative{
+ "-1"{"viime viikolla"}
+ "0"{"tällä viikolla"}
+ "1"{"ensi viikolla"}
+ }
+ }
+ weekday{
+ dn{"viikonpäivä"}
+ }
+ year{
+ dn{"vuosi"}
+ relative{
+ "-1"{"viime vuonna"}
+ "0"{"tänä vuonna"}
+ "1"{"ensi vuonna"}
+ }
+ }
+ zone{
+ dn{"aikavyöhyke"}
+ }
+ }
listPattern{
standard{
2{"{0} ja {1}"}
diff --git a/data/locales/fi_FI.txt b/data/locales/fi_FI.txt
index 0e63715..93c4c71 100644
--- a/data/locales/fi_FI.txt
+++ b/data/locales/fi_FI.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fi_FI.xml
// *
// ***************************************************************************
fi_FI{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fil.txt b/data/locales/fil.txt
index 99cb51e..8b6b054 100755
--- a/data/locales/fil.txt
+++ b/data/locales/fil.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fil.xml
// *
@@ -142,8 +142,150 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, MMMM dd y G",
+ "MMMM d, y G",
+ "MMM d, y G",
+ "M/d/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M-d"}
+ MMM{"LLL"}
+ MMMEd{"E MMM d"}
+ MMMMEd{"E MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M-d"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMM{"MM-y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"MMM d, y"}
+ yMd{"M/d/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"y QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, M/d – E, M/d"}
+ d{"E, M/d – E, M/d"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E, MMM d – E, MMM d"}
+ d{"E, MMM d – E, MMM d"}
+ }
+ MMMd{
+ M{"MMM d – MMM d"}
+ d{"MMM d–d"}
+ }
+ Md{
+ M{"M/d – M/d"}
+ d{"M/d – M/d"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
+ }
+ yMEd{
+ M{"E, M/d/y – E, M/d/y"}
+ d{"E, M/d/y – E, M/d/y"}
+ y{"E, M/d/y – E, M/d/y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y – MMM y"}
+ }
+ yMMMEd{
+ M{"E, MMM d – E, MMM d, y"}
+ d{"E, MMM d – E, MMM d, y"}
+ y{"E, MMM d, y – E, MMM d, y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"MMM d – MMM d, y"}
+ d{"MMM d–d, y"}
+ y{"MMM d, y – MMM d, y"}
+ }
+ yMd{
+ M{"M/d/y – M/d/y"}
+ d{"M/d/y – M/d/y"}
+ y{"M/d/y – M/d/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"AM",
@@ -185,6 +327,7 @@
y{"y"}
yM{"M/y"}
yMEd{"E, M/d/y"}
+ yMM{"MM-y"}
yMMM{"MMM y"}
yMMMEd{"E, MMM d, y"}
yMMMM{"MMMM y"}
@@ -192,8 +335,6 @@
yMd{"M/d/y"}
yQQQ{"QQQ y"}
yQQQQ{"y QQQQ"}
- yyMM{"MM-yy"}
- yyMMM{"MMM yy"}
}
dayNames{
format{
@@ -261,63 +402,6 @@
"AD",
}
}
- fields{
- day{
- dn{"Araw"}
- relative{
- "-1"{"Kahapon"}
- "-2"{"Araw bago ang kahapon"}
- "0"{"Ngayon"}
- "1"{"Bukas"}
- "2"{"Araw pagkatapos ng kahapon"}
- }
- }
- dayperiod{
- dn{"Dayperiod"}
- }
- era{
- dn{"Era"}
- }
- hour{
- dn{"Oras"}
- }
- minute{
- dn{"Minuto"}
- }
- month{
- dn{"Buwan"}
- relative{
- "-1"{"Nakaraang buwan"}
- "0"{"Ngayon buwang ito"}
- "1"{"Susunod na buwan"}
- }
- }
- second{
- dn{"Segundo"}
- }
- week{
- dn{"Linggo"}
- relative{
- "-1"{"Nakaraang Linggo"}
- "0"{"Sa linggong ito"}
- "1"{"Susunod na linggo"}
- }
- }
- weekday{
- dn{"Araw ng Linggo"}
- }
- year{
- dn{"Taon"}
- relative{
- "-1"{"Nakaraang taon"}
- "0"{"Sa taong ito"}
- "1"{"Susunod na taon"}
- }
- }
- zone{
- dn{"Zone"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -381,13 +465,13 @@
y{"y–y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E, M/d/yy – E, M/d/yy"}
- d{"E, M/d/yy – E, M/d/yy"}
- y{"E, M/d/yy – E, M/d/yy"}
+ M{"E, M/d/y – E, M/d/y"}
+ d{"E, M/d/y – E, M/d/y"}
+ y{"E, M/d/y – E, M/d/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -408,9 +492,9 @@
y{"MMM d, y – MMM d, y"}
}
yMd{
- M{"M/d/yy – M/d/yy"}
- d{"M/d/yy – M/d/yy"}
- y{"M/d/yy – M/d/yy"}
+ M{"M/d/y – M/d/y"}
+ d{"M/d/y – M/d/y"}
+ y{"M/d/y – M/d/y"}
}
}
monthNames{
@@ -511,6 +595,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Araw"}
+ relative{
+ "-1"{"Kahapon"}
+ "-2"{"Araw bago ang kahapon"}
+ "0"{"Ngayon"}
+ "1"{"Bukas"}
+ "2"{"Araw pagkatapos ng kahapon"}
+ }
+ }
+ dayperiod{
+ dn{"Dayperiod"}
+ }
+ era{
+ dn{"Era"}
+ }
+ hour{
+ dn{"Oras"}
+ }
+ minute{
+ dn{"Minuto"}
+ }
+ month{
+ dn{"Buwan"}
+ relative{
+ "-1"{"Nakaraang buwan"}
+ "0"{"Ngayon buwang ito"}
+ "1"{"Susunod na buwan"}
+ }
+ }
+ second{
+ dn{"Segundo"}
+ }
+ week{
+ dn{"Linggo"}
+ relative{
+ "-1"{"Nakaraang Linggo"}
+ "0"{"Sa linggong ito"}
+ "1"{"Susunod na linggo"}
+ }
+ }
+ weekday{
+ dn{"Araw ng Linggo"}
+ }
+ year{
+ dn{"Taon"}
+ relative{
+ "-1"{"Nakaraang taon"}
+ "0"{"Sa taong ito"}
+ "1"{"Susunod na taon"}
+ }
+ }
+ zone{
+ dn{"Zone"}
+ }
+ }
listPattern{
standard{
2{"{0} at {1}"}
diff --git a/data/locales/fil_PH.txt b/data/locales/fil_PH.txt
index 4926982..28e76d1 100755
--- a/data/locales/fil_PH.txt
+++ b/data/locales/fil_PH.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fil_PH.xml
// *
@@ -11,5 +11,5 @@
279,
216,
}
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fo.txt b/data/locales/fo.txt
index 14e7a42..ea9ee10 100644
--- a/data/locales/fo.txt
+++ b/data/locales/fo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fo.xml
// *
@@ -28,8 +28,25 @@
}
}
}
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE dd MMMM y G",
+ "d. MMM y G",
+ "dd-MM-y G",
+ "dd-MM-yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
gregorian{
DateTimePatterns{
"HH:mm:ss zzzz",
@@ -38,7 +55,7 @@
"HH:mm",
"EEEE dd MMMM y",
"d. MMM y",
- "dd-MM-yyyy",
+ "dd-MM-y",
"dd-MM-yy",
"{1} {0}",
"{1} {0}",
diff --git a/data/locales/fo_FO.txt b/data/locales/fo_FO.txt
index 94ded03..1a3c33c 100644
--- a/data/locales/fo_FO.txt
+++ b/data/locales/fo_FO.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fo_FO.xml
// *
// ***************************************************************************
fo_FO{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr.txt b/data/locales/fr.txt
index b685fb5..07fedba 100644
--- a/data/locales/fr.txt
+++ b/data/locales/fr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr.xml
// *
@@ -16,7 +16,7 @@
" x y ÿ z]"
}
ExemplarCharactersIndex{"[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]"}
- ExemplarCharactersPunctuation{"[\- ‐ – — , ; \: ! ? . … ’ \" “ ” « » ( ) \[ \] § @ * / \& # † ‡]"}
+ ExemplarCharactersPunctuation{"[\\- ‐ – — , ; \\: ! ? . … ’ \u0022 “ ” « » ( ) \\[ \\] § @ * / \\& # † ‡]"}
LocaleScript{
"Latn",
}
@@ -146,57 +146,9 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
calendar{
buddhist{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE d MMMM y G",
- "d MMMM y G",
- "d MMM, y G",
- "d/M/yyyy",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E d/M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMEd{"E d MMMM"}
- MMMd{"d MMM"}
- MMMdd{"dd MMM"}
- MMd{"d/MM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d"}
- ms{"mm:ss"}
- y{"y G"}
- yM{"M/y G"}
- yMEd{"E d/M/y G"}
- yMMM{"MMM y G"}
- yMMMEd{"E d MMM y G"}
- yMd{"d/M/y G"}
- yQQQ{"QQQ y G"}
- yQQQQ{"QQQQ y G"}
- yyMM{"MM/y G"}
- yyMMM{"MMM y G"}
- yyMMMEd{"E d MMM y G"}
- yyMMMd{"d MMM y G"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ y G"}
- yyyyMMMM{"MMMM y G"}
- }
eras{
abbreviated{
"ère b.",
@@ -226,6 +178,10 @@
"{1} {0}",
}
availableFormats{
+ Gy{"U"}
+ GyMMM{"MMM U"}
+ GyMMMEd{"E d MMM U"}
+ GyMMMd{"d MMM U"}
M{"L"}
MEd{"E d/M"}
MMM{"LLL"}
@@ -234,14 +190,16 @@
Md{"d/M"}
ms{"mm:ss"}
y{"U"}
- yM{"M/y"}
- yMEd{"E d/M/y"}
- yMMM{"MMM U"}
- yMMMEd{"E d MMM U"}
- yMMMd{"d MMM U"}
yMd{"d/M/y"}
- yQQQ{"QQQ U"}
- yQQQQ{"QQQQ U"}
+ yyyy{"U"}
+ yyyyM{"M/y"}
+ yyyyMEd{"E d/M/y"}
+ yyyyMMM{"MMM U"}
+ yyyyMMMEd{"E d MMM U"}
+ yyyyMMMd{"d MMM U"}
+ yyyyMd{"d/M/y"}
+ yyyyQQQ{"QQQ U"}
+ yyyyQQQQ{"QQQQ U"}
}
monthNames{
format{
@@ -276,6 +234,150 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E d MMM y G"}
+ GyMMMd{"d MMM y G"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y G"}
+ yyyy{"y G"}
+ yyyyM{"M/y GGGGG"}
+ yyyyMEd{"E d/M/y GGGGG"}
+ yyyyMMM{"MMM y G"}
+ yyyyMMMEd{"E d MMM y G"}
+ yyyyMMMM{"MMMM y G"}
+ yyyyMMMd{"d MMM y G"}
+ yyyyMd{"d/M/y GGGGG"}
+ yyyyQQQ{"QQQ y G"}
+ yyyyQQQQ{"QQQQ y G"}
+ }
+ intervalFormats{
+ H{
+ H{"HH – HH"}
+ }
+ Hm{
+ H{"HH:mm – HH:mm"}
+ m{"HH:mm – HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm – HH:mm v"}
+ m{"HH:mm – HH:mm v"}
+ }
+ Hv{
+ H{"HH – HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E dd/MM - E dd/MM"}
+ d{"E dd/MM - E dd/MM"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"'du' E d MMM 'au' E d MMM"}
+ d{"'du' E d 'au' E d MMM"}
+ }
+ MMMd{
+ M{"'du' d MMM 'au' d MMM"}
+ d{"d–d MMM"}
+ }
+ Md{
+ M{"dd/MM - dd/MM"}
+ d{"dd/MM - dd/MM"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h – h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm – h:mm a"}
+ m{"h:mm – h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm – h:mm a v"}
+ m{"h:mm – h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h – h a v"}
+ }
+ y{
+ y{"y-y G"}
+ }
+ yM{
+ M{"MM/y – MM/y G"}
+ y{"M/y – M/y G"}
+ }
+ yMEd{
+ M{"E dd/MM/y – E dd/MM/y G"}
+ d{"E dd/MM/y – E dd/MM/y G"}
+ y{"E dd/MM/y – E dd/MM/y G"}
+ }
+ yMMM{
+ M{"MMM–MMM y G"}
+ y{"MMM y – MMM y G"}
+ }
+ yMMMEd{
+ M{"E d MMM – E d MMM y G"}
+ d{"E d – E d MMM y G"}
+ y{"E d MMM y – E d MMM y G"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y G"}
+ y{"MMMM y – MMMM y G"}
+ }
+ yMMMd{
+ M{"d MMM – d MMM y G"}
+ d{"d–d MMM y G"}
+ y{"d MMM y – d MMM y G"}
+ }
+ yMd{
+ M{"d/M/y – d/M/y G"}
+ d{"d/M/y – d/M/y G"}
+ y{"dd/MM/y – dd/MM/y G"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"AM",
@@ -289,7 +391,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -298,6 +400,10 @@
}
availableFormats{
Ed{"E d"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E d MMM y G"}
+ GyMMMd{"d MMM y G"}
H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -305,11 +411,7 @@
MEd{"E d/M"}
MMM{"LLL"}
MMMEd{"E d MMM"}
- MMMMEd{"E d MMMM"}
MMMd{"d MMM"}
- MMMdd{"dd MMM"}
- MMd{"d/MM"}
- MMdd{"dd/MM"}
Md{"d/M"}
d{"d"}
h{"h a"}
@@ -317,19 +419,15 @@
hms{"h:mm:ss a"}
ms{"mm:ss"}
y{"y"}
- yM{"M/yyyy"}
- yMEd{"E d/M/yyyy"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
yMMM{"MMM y"}
yMMMEd{"E d MMM y"}
+ yMMMM{"MMMM y"}
yMMMd{"d MMM y"}
- yMd{"d/M/yyyy"}
+ yMd{"d/M/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"MM/yy"}
- yyMMM{"MMM yy"}
- yyMMMEd{"E d MMM yy"}
- yyMMMd{"d MMM yy"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -419,63 +517,6 @@
"après Jésus-Christ",
}
}
- fields{
- day{
- dn{"jour"}
- relative{
- "-1"{"hier"}
- "-2"{"avant-hier"}
- "0"{"aujourd’hui"}
- "1"{"demain"}
- "2"{"après-demain"}
- }
- }
- dayperiod{
- dn{"cadran"}
- }
- era{
- dn{"ère"}
- }
- hour{
- dn{"heure"}
- }
- minute{
- dn{"minute"}
- }
- month{
- dn{"mois"}
- relative{
- "-1"{"le mois dernier"}
- "0"{"ce mois-ci"}
- "1"{"le mois prochain"}
- }
- }
- second{
- dn{"seconde"}
- }
- week{
- dn{"semaine"}
- relative{
- "-1"{"la semaine dernière"}
- "0"{"cette semaine"}
- "1"{"la semaine prochaine"}
- }
- }
- weekday{
- dn{"jour de la semaine"}
- }
- year{
- dn{"année"}
- relative{
- "-1"{"l’année dernière"}
- "0"{"cette année"}
- "1"{"l’année prochaine"}
- }
- }
- zone{
- dn{"fuseau horaire"}
- }
- }
intervalFormats{
H{
H{"HH – HH"}
@@ -539,13 +580,13 @@
y{"y-y"}
}
yM{
- M{"MM/yy – MM/yy"}
- y{"M/yyyy – M/yyyy"}
+ M{"MM/y – MM/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E dd/MM/yy – E dd/MM/yy"}
- d{"E dd/MM/yy – E dd/MM/yy"}
- y{"E dd/MM/yyyy – E dd/MM/yyyy"}
+ M{"E dd/MM/y – E dd/MM/y"}
+ d{"E dd/MM/y – E dd/MM/y"}
+ y{"E dd/MM/y – E dd/MM/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -566,9 +607,9 @@
y{"d MMM y – d MMM y"}
}
yMd{
- M{"d/M/yy – d/M/yy"}
- d{"d/M/yy – d/M/yy"}
- y{"dd/MM/yyyy – dd/MM/yyyy"}
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"dd/MM/y – dd/MM/y"}
}
}
monthNames{
@@ -727,66 +768,6 @@
}
}
islamic{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE d MMMM y G",
- "d MMMM y G",
- "d MMM, y G",
- "d/M/y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E d"}
- Gy{"y G"}
- H{"HH"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E d/M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMEd{"E d MMMM"}
- MMMd{"d MMM"}
- MMMdd{"dd MMM"}
- MMd{"d/MM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d"}
- h{"h a"}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yM{"M/yyyy"}
- yMEd{"E d/M/yyyy"}
- yMMM{"MMM y"}
- yMMMEd{"E d MMM y"}
- yQQQ{"QQQ y"}
- yQQQQ{"QQQQ y"}
- yyMM{"MM/y G"}
- yyMMM{"MMM y G"}
- yyMMMEd{"E d MMM y G"}
- yyMMMd{"d MMM y G"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ y G"}
- yyyy{"y G"}
- yyyyM{"M/y G"}
- yyyyMEd{"E d/M/y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E d MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"d/M/y G"}
- yyyyQQQ{"'T'QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
- }
eras{
abbreviated{
"AH",
@@ -808,7 +789,6 @@
"dhou.q.",
"dhou.h.",
}
- default{"wide"}
narrow{
"1",
"2",
@@ -892,101 +872,16 @@
"HH:mm",
"EEEE d MMMM y G",
"d MMMM y G",
- "d MMM, y G",
- "d/M/y GGGGG",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
- availableFormats{
- Ed{"E d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E d/M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMEd{"E d MMMM"}
- MMMd{"d MMM"}
- MMMdd{"dd MMM"}
- MMd{"d/MM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM/y GGGGG"}
- yyMMM{"MMM y G"}
- yyMMMEd{"E d MMM y G"}
- yyMMMd{"d MMM y G"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ y G"}
- yyyy{"y G"}
- yyyyM{"M/y GGGGG"}
- yyyyMEd{"E d/M/y GGGGG"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E d MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"d/M/y GGGGG"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
- }
}
roc{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE d MMMM y G",
- "d MMMM y G",
- "d MMM, y G",
- "d/M/y GGGGG",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E d/M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMEd{"E d MMMM"}
- MMMd{"d MMM"}
- MMMdd{"dd MMM"}
- MMd{"d/MM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM/y GGGGG"}
- yyMMM{"MMM y G"}
- yyMMMEd{"E d MMM y G"}
- yyMMMd{"d MMM y G"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ y G"}
- yyyy{"y G"}
- yyyyM{"M/y GGGGG"}
- yyyyMEd{"E d/M/y GGGGG"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E d MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"d/M/y GGGGG"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
- }
eras{
abbreviated{
"avant RdC",
@@ -1019,6 +914,63 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"jour"}
+ relative{
+ "-1"{"hier"}
+ "-2"{"avant-hier"}
+ "0"{"aujourd’hui"}
+ "1"{"demain"}
+ "2"{"après-demain"}
+ }
+ }
+ dayperiod{
+ dn{"cadran"}
+ }
+ era{
+ dn{"ère"}
+ }
+ hour{
+ dn{"heure"}
+ }
+ minute{
+ dn{"minute"}
+ }
+ month{
+ dn{"mois"}
+ relative{
+ "-1"{"le mois dernier"}
+ "0"{"ce mois-ci"}
+ "1"{"le mois prochain"}
+ }
+ }
+ second{
+ dn{"seconde"}
+ }
+ week{
+ dn{"semaine"}
+ relative{
+ "-1"{"la semaine dernière"}
+ "0"{"cette semaine"}
+ "1"{"la semaine prochaine"}
+ }
+ }
+ weekday{
+ dn{"jour de la semaine"}
+ }
+ year{
+ dn{"année"}
+ relative{
+ "-1"{"l’année dernière"}
+ "0"{"cette année"}
+ "1"{"l’année prochaine"}
+ }
+ }
+ zone{
+ dn{"fuseau horaire"}
+ }
+ }
listPattern{
standard{
2{"{0} et {1}"}
diff --git a/data/locales/fr_BE.txt b/data/locales/fr_BE.txt
index d4b3473..9a8ac2f 100644
--- a/data/locales/fr_BE.txt
+++ b/data/locales/fr_BE.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_BE.xml
// *
@@ -14,8 +14,25 @@
}
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "H 'h' mm 'min' ss 's' zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
gregorian{
DateTimePatterns{
"H 'h' mm 'min' ss 's' zzzz",
diff --git a/data/locales/fr_BF.txt b/data/locales/fr_BF.txt
index 107bd5b..36ac4cc 100644
--- a/data/locales/fr_BF.txt
+++ b/data/locales/fr_BF.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_BF.xml
// *
// ***************************************************************************
fr_BF{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_BI.txt b/data/locales/fr_BI.txt
index bf2496c..4ee1977 100644
--- a/data/locales/fr_BI.txt
+++ b/data/locales/fr_BI.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_BI.xml
// *
// ***************************************************************************
fr_BI{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_BJ.txt b/data/locales/fr_BJ.txt
index 42a1317..6867ff3 100644
--- a/data/locales/fr_BJ.txt
+++ b/data/locales/fr_BJ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_BJ.xml
// *
// ***************************************************************************
fr_BJ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_BL.txt b/data/locales/fr_BL.txt
index dab81f6..c4012d1 100755
--- a/data/locales/fr_BL.txt
+++ b/data/locales/fr_BL.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_BL.xml
// *
// ***************************************************************************
fr_BL{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_CA.txt b/data/locales/fr_CA.txt
index 84ff012..7a2899a 100644
--- a/data/locales/fr_CA.txt
+++ b/data/locales/fr_CA.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_CA.xml
// *
@@ -11,8 +11,108 @@
279,
216,
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH 'h' mm 'min' ss 's' zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "G y-MM-dd",
+ "GGGGG yy-MM-dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MEd{"E M-d"}
+ MMd{"MM-d"}
+ MMdd{"MM-dd"}
+ Md{"M-d"}
+ yyyyM{"G y-MM"}
+ yyyyMEd{"E G y-MM-dd"}
+ yyyyMM{"G y-MM"}
+ yyyyMd{"G y-MM-dd"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ MEd{
+ M{"E MM-dd – E MM-dd"}
+ d{"E MM-dd – E MM-dd"}
+ }
+ Md{
+ M{"MM-dd – MM-dd"}
+ d{"MM-dd – MM-dd"}
+ }
+ d{
+ d{"d–d"}
+ }
+ h{
+ h{"h–h a"}
+ }
+ hm{
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ h{"h–h a v"}
+ }
+ y{
+ y{"G y–y"}
+ }
+ yM{
+ M{"G y-MM – y-MM"}
+ y{"G y-MM – y-MM"}
+ }
+ yMEd{
+ M{"'du' E y-MM-dd 'au' E y-MM-dd G"}
+ d{"'du' E y-MM-dd 'au' E y-MM-dd G"}
+ y{"'du' E y-MM-dd 'au' E y-MM-dd G"}
+ }
+ yMMM{
+ y{"'de' MMM y 'à' MMM y G"}
+ }
+ yMMMEd{
+ M{"'du' E d MMM 'au' E d MMM y G"}
+ d{"'du' E d 'au' E d MMM y G"}
+ y{"'du' E d MMM y 'au' E d MMM y G"}
+ }
+ yMMMM{
+ M{"MMMM – MMMM y G"}
+ }
+ yMMMd{
+ M{"'du' d MMM 'au' d MMM y G"}
+ y{"'du' d MMM y 'au' d MMM y G"}
+ }
+ yMd{
+ M{"G y-MM-dd – y-MM-dd"}
+ d{"G y-MM-dd – y-MM-dd"}
+ y{"G y-MM-dd – y-MM-dd"}
+ }
+ }
+ }
gregorian{
DateTimePatterns{
"HH 'h' mm 'min' ss 's' zzzz",
@@ -21,7 +121,7 @@
"HH:mm",
"EEEE d MMMM y",
"d MMMM y",
- "yyyy-MM-dd",
+ "y-MM-dd",
"yy-MM-dd",
"{1} {0}",
"{1} {0}",
@@ -34,33 +134,10 @@
MMd{"MM-d"}
MMdd{"MM-dd"}
Md{"M-d"}
- yM{"yyyy-MM"}
- yMEd{"E yyyy-MM-dd"}
- yMd{"yyyy-MM-dd"}
- yyMM{"yy-MM"}
- }
- fields{
- month{
- relative{
- "-1"{"Le mois dernier"}
- "0"{"Ce mois-ci"}
- "1"{"Le mois prochain"}
- }
- }
- week{
- relative{
- "-1"{"La semaine dernière"}
- "0"{"Cette semaine"}
- "1"{"La semaine prochaine"}
- }
- }
- year{
- relative{
- "-1"{"L'année dernière"}
- "0"{"Cette année"}
- "1"{"L'année prochaine"}
- }
- }
+ yM{"y-MM"}
+ yMEd{"E y-MM-dd"}
+ yMM{"y-MM"}
+ yMd{"y-MM-dd"}
}
intervalFormats{
H{
@@ -106,13 +183,13 @@
y{"y–y"}
}
yM{
- M{"yy-MM – yy-MM"}
- y{"yy-MM – yy-MM"}
+ M{"y-MM – y-MM"}
+ y{"y-MM – y-MM"}
}
yMEd{
- M{"'du' E yy-MM-dd 'au' E yy-MM-dd"}
- d{"'du' E yy-MM-dd 'au' E yy-MM-dd"}
- y{"'du' E yy-MM-dd 'au' E yy-MM-dd"}
+ M{"'du' E y-MM-dd 'au' E y-MM-dd"}
+ d{"'du' E y-MM-dd 'au' E y-MM-dd"}
+ y{"'du' E y-MM-dd 'au' E y-MM-dd"}
}
yMMM{
y{"'de' MMM y 'à' MMM y"}
@@ -130,9 +207,9 @@
y{"'du' d MMM y 'au' d MMM y"}
}
yMd{
- M{"yy-MM-dd – yy-MM-dd"}
- d{"yy-MM-dd – yy-MM-dd"}
- y{"yy-MM-dd – yy-MM-dd"}
+ M{"y-MM-dd – y-MM-dd"}
+ d{"y-MM-dd – y-MM-dd"}
+ y{"y-MM-dd – y-MM-dd"}
}
}
}
@@ -141,6 +218,29 @@
alternateQuotationEnd{"›"}
alternateQuotationStart{"‹"}
}
+ fields{
+ month{
+ relative{
+ "-1"{"Le mois dernier"}
+ "0"{"Ce mois-ci"}
+ "1"{"Le mois prochain"}
+ }
+ }
+ week{
+ relative{
+ "-1"{"La semaine dernière"}
+ "0"{"Cette semaine"}
+ "1"{"La semaine prochaine"}
+ }
+ }
+ year{
+ relative{
+ "-1"{"L'année dernière"}
+ "0"{"Cette année"}
+ "1"{"L'année prochaine"}
+ }
+ }
+ }
measurementSystemNames{
UK{"R-U"}
}
diff --git a/data/locales/fr_CD.txt b/data/locales/fr_CD.txt
index 0b6bd34..562c5e6 100644
--- a/data/locales/fr_CD.txt
+++ b/data/locales/fr_CD.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_CD.xml
// *
// ***************************************************************************
fr_CD{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_CF.txt b/data/locales/fr_CF.txt
index 0115372..07a9783 100755
--- a/data/locales/fr_CF.txt
+++ b/data/locales/fr_CF.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_CF.xml
// *
// ***************************************************************************
fr_CF{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_CG.txt b/data/locales/fr_CG.txt
index 95e6304..c1b6f84 100644
--- a/data/locales/fr_CG.txt
+++ b/data/locales/fr_CG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_CG.xml
// *
// ***************************************************************************
fr_CG{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_CH.txt b/data/locales/fr_CH.txt
index 3d962e6..e824ea0 100644
--- a/data/locales/fr_CH.txt
+++ b/data/locales/fr_CH.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_CH.xml
// *
@@ -18,8 +18,25 @@
}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH.mm:ss 'h' zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd.MM.yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
gregorian{
DateTimePatterns{
"HH.mm:ss 'h' zzzz",
diff --git a/data/locales/fr_CI.txt b/data/locales/fr_CI.txt
index 5636a5b..8e9ed55 100755
--- a/data/locales/fr_CI.txt
+++ b/data/locales/fr_CI.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_CI.xml
// *
// ***************************************************************************
fr_CI{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_CM.txt b/data/locales/fr_CM.txt
index 7ac7f0c..7801558 100755
--- a/data/locales/fr_CM.txt
+++ b/data/locales/fr_CM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_CM.xml
// *
// ***************************************************************************
fr_CM{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_DJ.txt b/data/locales/fr_DJ.txt
index 05f591d..6b3d571 100644
--- a/data/locales/fr_DJ.txt
+++ b/data/locales/fr_DJ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_DJ.xml
// *
// ***************************************************************************
fr_DJ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_DZ.txt b/data/locales/fr_DZ.txt
index f4109ad..592aebc 100755
--- a/data/locales/fr_DZ.txt
+++ b/data/locales/fr_DZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_DZ.xml
// *
// ***************************************************************************
fr_DZ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_FR.txt b/data/locales/fr_FR.txt
index 4a5fa75..a98897e 100644
--- a/data/locales/fr_FR.txt
+++ b/data/locales/fr_FR.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_FR.xml
// *
// ***************************************************************************
fr_FR{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_GA.txt b/data/locales/fr_GA.txt
index f401ec3..7b3ee2d 100644
--- a/data/locales/fr_GA.txt
+++ b/data/locales/fr_GA.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_GA.xml
// *
// ***************************************************************************
fr_GA{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_GF.txt b/data/locales/fr_GF.txt
index d0d2b52..191be55 100755
--- a/data/locales/fr_GF.txt
+++ b/data/locales/fr_GF.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_GF.xml
// *
// ***************************************************************************
fr_GF{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_GN.txt b/data/locales/fr_GN.txt
index d0ffa99..df955be 100755
--- a/data/locales/fr_GN.txt
+++ b/data/locales/fr_GN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_GN.xml
// *
// ***************************************************************************
fr_GN{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_GP.txt b/data/locales/fr_GP.txt
index 967c989..47250cf 100755
--- a/data/locales/fr_GP.txt
+++ b/data/locales/fr_GP.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_GP.xml
// *
// ***************************************************************************
fr_GP{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_GQ.txt b/data/locales/fr_GQ.txt
index ded7515..24072b4 100644
--- a/data/locales/fr_GQ.txt
+++ b/data/locales/fr_GQ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_GQ.xml
// *
// ***************************************************************************
fr_GQ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_HT.txt b/data/locales/fr_HT.txt
index 15b9932..7dd241b 100755
--- a/data/locales/fr_HT.txt
+++ b/data/locales/fr_HT.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_HT.xml
// *
// ***************************************************************************
fr_HT{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_KM.txt b/data/locales/fr_KM.txt
index 8ffbca9..82b20fd 100644
--- a/data/locales/fr_KM.txt
+++ b/data/locales/fr_KM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_KM.xml
// *
// ***************************************************************************
fr_KM{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_LU.txt b/data/locales/fr_LU.txt
index 124b47d..b7319fd 100644
--- a/data/locales/fr_LU.txt
+++ b/data/locales/fr_LU.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_LU.xml
// *
@@ -14,5 +14,5 @@
}
}
}
- Version{"2.0.57.19"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_MA.txt b/data/locales/fr_MA.txt
index bdaeafd..e9d4237 100755
--- a/data/locales/fr_MA.txt
+++ b/data/locales/fr_MA.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_MA.xml
// *
// ***************************************************************************
fr_MA{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_MC.txt b/data/locales/fr_MC.txt
index a2aa446..32397fd 100644
--- a/data/locales/fr_MC.txt
+++ b/data/locales/fr_MC.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_MC.xml
// *
// ***************************************************************************
fr_MC{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_MF.txt b/data/locales/fr_MF.txt
index 1754c7a..2cb1ab2 100755
--- a/data/locales/fr_MF.txt
+++ b/data/locales/fr_MF.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_MF.xml
// *
// ***************************************************************************
fr_MF{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_MG.txt b/data/locales/fr_MG.txt
index 9cfcd09..6688c6a 100755
--- a/data/locales/fr_MG.txt
+++ b/data/locales/fr_MG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_MG.xml
// *
// ***************************************************************************
fr_MG{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_ML.txt b/data/locales/fr_ML.txt
index 0197139..078616f 100755
--- a/data/locales/fr_ML.txt
+++ b/data/locales/fr_ML.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_ML.xml
// *
// ***************************************************************************
fr_ML{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_MQ.txt b/data/locales/fr_MQ.txt
index 1156cd1..0a49c8c 100755
--- a/data/locales/fr_MQ.txt
+++ b/data/locales/fr_MQ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_MQ.xml
// *
// ***************************************************************************
fr_MQ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_MR.txt b/data/locales/fr_MR.txt
index b3f74e0..c36e02d 100755
--- a/data/locales/fr_MR.txt
+++ b/data/locales/fr_MR.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_MR.xml
// *
// ***************************************************************************
fr_MR{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_MU.txt b/data/locales/fr_MU.txt
index 9fb190e..b364a61 100755
--- a/data/locales/fr_MU.txt
+++ b/data/locales/fr_MU.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_MU.xml
// *
// ***************************************************************************
fr_MU{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_NC.txt b/data/locales/fr_NC.txt
index c787c1c..be05942 100755
--- a/data/locales/fr_NC.txt
+++ b/data/locales/fr_NC.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_NC.xml
// *
// ***************************************************************************
fr_NC{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_NE.txt b/data/locales/fr_NE.txt
index 6edac76..46305db 100755
--- a/data/locales/fr_NE.txt
+++ b/data/locales/fr_NE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_NE.xml
// *
// ***************************************************************************
fr_NE{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_PF.txt b/data/locales/fr_PF.txt
index c3a48b4..f9548c2 100755
--- a/data/locales/fr_PF.txt
+++ b/data/locales/fr_PF.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_PF.xml
// *
// ***************************************************************************
fr_PF{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_RE.txt b/data/locales/fr_RE.txt
index 1691f80..d9fb9f5 100755
--- a/data/locales/fr_RE.txt
+++ b/data/locales/fr_RE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_RE.xml
// *
// ***************************************************************************
fr_RE{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_RW.txt b/data/locales/fr_RW.txt
index 7dc7f1d..f9de571 100644
--- a/data/locales/fr_RW.txt
+++ b/data/locales/fr_RW.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_RW.xml
// *
// ***************************************************************************
fr_RW{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_SC.txt b/data/locales/fr_SC.txt
index d48f4f4..66dec47 100755
--- a/data/locales/fr_SC.txt
+++ b/data/locales/fr_SC.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_SC.xml
// *
// ***************************************************************************
fr_SC{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_SN.txt b/data/locales/fr_SN.txt
index 0853580..ca8fea7 100755
--- a/data/locales/fr_SN.txt
+++ b/data/locales/fr_SN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_SN.xml
// *
// ***************************************************************************
fr_SN{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_SY.txt b/data/locales/fr_SY.txt
index b01085a..0d4cd1c 100755
--- a/data/locales/fr_SY.txt
+++ b/data/locales/fr_SY.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_SY.xml
// *
// ***************************************************************************
fr_SY{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_TD.txt b/data/locales/fr_TD.txt
index b0bfef6..dfb6042 100644
--- a/data/locales/fr_TD.txt
+++ b/data/locales/fr_TD.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_TD.xml
// *
// ***************************************************************************
fr_TD{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_TG.txt b/data/locales/fr_TG.txt
index f66b7b2..1678480 100644
--- a/data/locales/fr_TG.txt
+++ b/data/locales/fr_TG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_TG.xml
// *
// ***************************************************************************
fr_TG{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_TN.txt b/data/locales/fr_TN.txt
index a7984d0..4134845 100755
--- a/data/locales/fr_TN.txt
+++ b/data/locales/fr_TN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_TN.xml
// *
// ***************************************************************************
fr_TN{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_VU.txt b/data/locales/fr_VU.txt
index 53d9daf..9c29395 100755
--- a/data/locales/fr_VU.txt
+++ b/data/locales/fr_VU.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_VU.xml
// *
// ***************************************************************************
fr_VU{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/fr_YT.txt b/data/locales/fr_YT.txt
index 0c819aa..765e630 100755
--- a/data/locales/fr_YT.txt
+++ b/data/locales/fr_YT.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_YT.xml
// *
// ***************************************************************************
fr_YT{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ga.txt b/data/locales/ga.txt
index e26058c..d27de6e 100644
--- a/data/locales/ga.txt
+++ b/data/locales/ga.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ga.xml
// *
@@ -22,8 +22,25 @@
}
}
}
- Version{"2.0.77.27"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
gregorian{
AmPmMarkers{
"a.m.",
@@ -37,7 +54,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
diff --git a/data/locales/ga_IE.txt b/data/locales/ga_IE.txt
index fb1482b..39dd84e 100644
--- a/data/locales/ga_IE.txt
+++ b/data/locales/ga_IE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ga_IE.xml
// *
// ***************************************************************************
ga_IE{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/gl.txt b/data/locales/gl.txt
index 1aa2270..c627b51 100644
--- a/data/locales/gl.txt
+++ b/data/locales/gl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gl.xml
// *
@@ -142,8 +142,152 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE dd MMMM y G",
+ "dd MMMM y G",
+ "d MMM, y G",
+ "dd/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d-M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMMEd{"E d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMMdd{"dd MMMM"}
+ MMMd{"d MMM"}
+ MMdd{"dd/MM"}
+ Md{"d-M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M-y"}
+ yMEd{"E, d/M/y"}
+ yMM{"MM/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, d MMM, y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM, y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, d/M – E, d/M"}
+ d{"E, d/M – E, d/M"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E, d MMM – E, d MMM"}
+ d{"E, d MMM – E, d MMM"}
+ }
+ MMMd{
+ M{"d MMM – d MMM"}
+ d{"d–d MMM"}
+ }
+ Md{
+ M{"d/M – d/M"}
+ d{"d/M – d/M"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
+ }
+ yMEd{
+ M{"E, d/M/y – E, d/M/y"}
+ d{"E, d/M/y – E, d/M/y"}
+ y{"E, d/M/y – E, d/M/y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y – MMM y"}
+ }
+ yMMMEd{
+ M{"E, d MMM – E, d MMM, y"}
+ d{"E, d MMM – E, d MMM, y"}
+ y{"E, d MMM, y – E, d MMM, y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"d MMM – d MMM, y"}
+ d{"d–d MMM, y"}
+ y{"d MMM, y – d MMM, y"}
+ }
+ yMd{
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"a.m.",
@@ -185,8 +329,9 @@
hms{"h:mm:ss a"}
ms{"mm:ss"}
y{"y"}
- yM{"M-yyyy"}
+ yM{"M-y"}
yMEd{"E, d/M/y"}
+ yMM{"MM/y"}
yMMM{"MMM y"}
yMMMEd{"E, d MMM, y"}
yMMMM{"MMMM y"}
@@ -194,8 +339,6 @@
yMd{"d/M/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"MM/yy"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -258,63 +401,6 @@
"despois de Cristo",
}
}
- fields{
- day{
- dn{"Día"}
- relative{
- "-1"{"onte"}
- "-2"{"antonte"}
- "0"{"hoxe"}
- "1"{"mañá"}
- "2"{"pasadomañá"}
- }
- }
- dayperiod{
- dn{"a.m./p.m."}
- }
- era{
- dn{"Era"}
- }
- hour{
- dn{"Hora"}
- }
- minute{
- dn{"Minuto"}
- }
- month{
- dn{"Mes"}
- relative{
- "-1"{"Mes pasado"}
- "0"{"Este mes"}
- "1"{"Mes seguinte"}
- }
- }
- second{
- dn{"Segundo"}
- }
- week{
- dn{"Semana"}
- relative{
- "-1"{"Semana pasada"}
- "0"{"Esta semana"}
- "1"{"Semana seguinte"}
- }
- }
- weekday{
- dn{"Día da semana"}
- }
- year{
- dn{"Ano"}
- relative{
- "-1"{"Ano pasado"}
- "0"{"Este ano"}
- "1"{"Seguinte ano"}
- }
- }
- zone{
- dn{"Fuso horario"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -378,13 +464,13 @@
y{"y–y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E, d/M/yy – E, d/M/yy"}
- d{"E, d/M/yy – E, d/M/yy"}
- y{"E, d/M/yy – E, d/M/yy"}
+ M{"E, d/M/y – E, d/M/y"}
+ d{"E, d/M/y – E, d/M/y"}
+ y{"E, d/M/y – E, d/M/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -405,9 +491,9 @@
y{"d MMM, y – d MMM, y"}
}
yMd{
- M{"d/M/yy – d/M/yy"}
- d{"d/M/yy – d/M/yy"}
- y{"d/M/yy – d/M/yy"}
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
}
}
monthNames{
@@ -496,6 +582,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Día"}
+ relative{
+ "-1"{"onte"}
+ "-2"{"antonte"}
+ "0"{"hoxe"}
+ "1"{"mañá"}
+ "2"{"pasadomañá"}
+ }
+ }
+ dayperiod{
+ dn{"a.m./p.m."}
+ }
+ era{
+ dn{"Era"}
+ }
+ hour{
+ dn{"Hora"}
+ }
+ minute{
+ dn{"Minuto"}
+ }
+ month{
+ dn{"Mes"}
+ relative{
+ "-1"{"Mes pasado"}
+ "0"{"Este mes"}
+ "1"{"Mes seguinte"}
+ }
+ }
+ second{
+ dn{"Segundo"}
+ }
+ week{
+ dn{"Semana"}
+ relative{
+ "-1"{"Semana pasada"}
+ "0"{"Esta semana"}
+ "1"{"Semana seguinte"}
+ }
+ }
+ weekday{
+ dn{"Día da semana"}
+ }
+ year{
+ dn{"Ano"}
+ relative{
+ "-1"{"Ano pasado"}
+ "0"{"Este ano"}
+ "1"{"Seguinte ano"}
+ }
+ }
+ zone{
+ dn{"Fuso horario"}
+ }
+ }
listPattern{
standard{
2{"{0} e {1}"}
diff --git a/data/locales/gl_ES.txt b/data/locales/gl_ES.txt
index a47be78..25f1a51 100644
--- a/data/locales/gl_ES.txt
+++ b/data/locales/gl_ES.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gl_ES.xml
// *
// ***************************************************************************
gl_ES{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/gsw.txt b/data/locales/gsw.txt
index 26b7a6e..eacaa22 100644
--- a/data/locales/gsw.txt
+++ b/data/locales/gsw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gsw.xml
// *
@@ -37,7 +37,7 @@
}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
DateTimePatterns{
@@ -48,7 +48,7 @@
"EEEE d. MMMM y G",
"d. MMMM y G",
"d. MMM y G",
- "d.M.yyyy",
+ "d.M.y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -56,6 +56,152 @@
"{1} {0}",
}
}
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d. MMMM y G",
+ "d. MMMM y G",
+ "dd.MM.y G",
+ "dd.MM.yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d."}
+ H{"H"}
+ HHmm{"HH:mm"}
+ HHmmss{"HH:mm:ss"}
+ Hm{"H:mm"}
+ M{"L"}
+ MEd{"E, d.M."}
+ MMM{"LLL"}
+ MMMEd{"E d. MMM"}
+ MMMMEd{"E d. MMMM"}
+ MMMMd{"d. MMMM"}
+ MMMMdd{"dd. MMMM"}
+ MMMd{"d. MMM"}
+ MMd{"d.MM."}
+ MMdd{"dd.MM."}
+ Md{"d.M."}
+ d{"d"}
+ mmss{"mm:ss"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"y-M"}
+ yMEd{"E, y-M-d"}
+ yMM{"MM.y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, d. MMM y"}
+ yMMMM{"MMMM y"}
+ yMMdd{"dd.MM.y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH-HH"}
+ }
+ Hm{
+ H{"HH:mm-HH:mm"}
+ m{"HH:mm-HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm-HH:mm v"}
+ m{"HH:mm-HH:mm v"}
+ }
+ Hv{
+ H{"HH-HH v"}
+ }
+ M{
+ M{"M.-M."}
+ }
+ MEd{
+ M{"E, dd.MM. - E, dd.MM."}
+ d{"E, dd.MM. - E, dd.MM."}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"E, d. MMM - E, d. MMM"}
+ d{"E, d. - E, d. MMM"}
+ }
+ MMMM{
+ M{"LLLL-LLLL"}
+ }
+ MMMd{
+ M{"d. MMM - d. MMM"}
+ d{"d.-d. MMM"}
+ }
+ Md{
+ M{"dd.MM. - dd.MM."}
+ d{"dd.MM. - dd.MM."}
+ }
+ d{
+ d{"d.-d."}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a - h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h:mm a - h:mm a"}
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ a{"h:mm a - h:mm a v"}
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"h a - h a v"}
+ h{"h-h a v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"MM.y - MM.y"}
+ y{"MM.y - MM.y"}
+ }
+ yMEd{
+ M{"E, dd.MM.y - E, dd.MM.y"}
+ d{"E, dd.MM.y - E, dd.MM.y"}
+ y{"E, dd.MM.y - E, dd.MM.y"}
+ }
+ yMMM{
+ M{"MMM-MMM y"}
+ y{"MMM y - MMM y"}
+ }
+ yMMMEd{
+ M{"E, d. MMM - E, d. MMM y"}
+ d{"E, d. - E, d. MMM y"}
+ y{"E, d. MMM y - E, d. MMM y"}
+ }
+ yMMMM{
+ M{"MM – MM.y"}
+ y{"MM.y – MM.y"}
+ }
+ yMMMd{
+ M{"d. MMM - d. MMM y"}
+ d{"d.-d. MMM y"}
+ y{"d. MMM y - d. MMM y"}
+ }
+ yMd{
+ M{"dd.MM.y - dd.MM.y"}
+ d{"dd.MM.y - dd.MM.y"}
+ y{"dd.MM.y - dd.MM.y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"vorm.",
@@ -68,7 +214,7 @@
"HH:mm",
"EEEE, d. MMMM y",
"d. MMMM y",
- "dd.MM.yyyy",
+ "dd.MM.y",
"dd.MM.yy",
"{1} {0}",
"{1} {0}",
@@ -97,18 +243,15 @@
mmss{"mm:ss"}
ms{"mm:ss"}
y{"y"}
- yM{"yyyy-M"}
- yMEd{"E, yyyy-M-d"}
+ yM{"y-M"}
+ yMEd{"E, y-M-d"}
+ yMM{"MM.y"}
yMMM{"MMM y"}
yMMMEd{"E, d. MMM y"}
yMMMM{"MMMM y"}
+ yMMdd{"dd.MM.y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"MM.yy"}
- yyMMM{"MMM yy"}
- yyMMdd{"dd.MM.yy"}
- yyyy{"y"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -153,48 +296,6 @@
"n. Chr.",
}
}
- fields{
- day{
- dn{"Tag"}
- relative{
- "-1"{"geschter"}
- "-2"{"vorgeschter"}
- "0"{"hüt"}
- "1"{"moorn"}
- "2"{"übermoorn"}
- }
- }
- dayperiod{
- dn{"Tageshälfti"}
- }
- era{
- dn{"Epoche"}
- }
- hour{
- dn{"Schtund"}
- }
- minute{
- dn{"Minuute"}
- }
- month{
- dn{"Monet"}
- }
- second{
- dn{"Sekunde"}
- }
- week{
- dn{"Wuche"}
- }
- weekday{
- dn{"Wuchetag"}
- }
- year{
- dn{"Jaar"}
- }
- zone{
- dn{"Zone"}
- }
- }
intervalFormats{
H{
H{"HH-HH"}
@@ -261,13 +362,13 @@
y{"y-y"}
}
yM{
- M{"MM.yy - MM.yy"}
- y{"MM.yy - MM.yy"}
+ M{"MM.y - MM.y"}
+ y{"MM.y - MM.y"}
}
yMEd{
- M{"E, dd.MM.yy - E, dd.MM.yy"}
- d{"E, dd.MM.yy - E, dd.MM.yy"}
- y{"E, dd.MM.yy - E, dd.MM.yy"}
+ M{"E, dd.MM.y - E, dd.MM.y"}
+ d{"E, dd.MM.y - E, dd.MM.y"}
+ y{"E, dd.MM.y - E, dd.MM.y"}
}
yMMM{
M{"MMM-MMM y"}
@@ -279,8 +380,8 @@
y{"E, d. MMM y - E, d. MMM y"}
}
yMMMM{
- M{"MM – MM.yyyy"}
- y{"MM.yyyy – MM.yyyy"}
+ M{"MM – MM.y"}
+ y{"MM.y – MM.y"}
}
yMMMd{
M{"d. MMM - d. MMM y"}
@@ -288,9 +389,9 @@
y{"d. MMM y - d. MMM y"}
}
yMd{
- M{"dd.MM.yy - dd.MM.yy"}
- d{"dd.MM.yy - dd.MM.yy"}
- y{"dd.MM.yy - dd.MM.yy"}
+ M{"dd.MM.y - dd.MM.y"}
+ d{"dd.MM.y - dd.MM.y"}
+ y{"dd.MM.y - dd.MM.y"}
}
}
monthNames{
@@ -365,6 +466,48 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"Tag"}
+ relative{
+ "-1"{"geschter"}
+ "-2"{"vorgeschter"}
+ "0"{"hüt"}
+ "1"{"moorn"}
+ "2"{"übermoorn"}
+ }
+ }
+ dayperiod{
+ dn{"Tageshälfti"}
+ }
+ era{
+ dn{"Epoche"}
+ }
+ hour{
+ dn{"Schtund"}
+ }
+ minute{
+ dn{"Minuute"}
+ }
+ month{
+ dn{"Monet"}
+ }
+ second{
+ dn{"Sekunde"}
+ }
+ week{
+ dn{"Wuche"}
+ }
+ weekday{
+ dn{"Wuchetag"}
+ }
+ year{
+ dn{"Jaar"}
+ }
+ zone{
+ dn{"Zone"}
+ }
+ }
listPattern{
standard{
2{"{0} und {1}"}
diff --git a/data/locales/gsw_CH.txt b/data/locales/gsw_CH.txt
index 2af1fbc..add1ca6 100644
--- a/data/locales/gsw_CH.txt
+++ b/data/locales/gsw_CH.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gsw_CH.xml
// *
// ***************************************************************************
gsw_CH{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/gu.txt b/data/locales/gu.txt
index 56a3da2..8235d9b 100644
--- a/data/locales/gu.txt
+++ b/data/locales/gu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gu.xml
// *
@@ -151,8 +151,150 @@
}
native{"gujr"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
calendar{
+ generic{
+ DateTimePatterns{
+ "hh:mm:ss a zzzz",
+ "hh:mm:ss a z",
+ "hh:mm:ss a",
+ "hh:mm a",
+ "EEEE, d MMMM, y G",
+ "d MMMM, y G",
+ "d MMM, y G",
+ "d-MM-yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d/M"}
+ MMM{"LLL"}
+ MMMEd{"E, d MMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMdd{"dd-MM"}
+ Md{"d/M"}
+ d{"d"}
+ h{"h a"}
+ hm{"hh:mm a"}
+ hms{"hh:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMM{"MM-y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d, MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E,d/M-E,d/M"}
+ d{"E, d/M-E, d/M"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E, d MMM-E, d MMM"}
+ d{"E, d MMM-E, d MMM"}
+ }
+ MMMd{
+ M{"d MMM- d MMM"}
+ d{"MMM d–d"}
+ }
+ Md{
+ M{"d/M-d/M"}
+ d{"d/M-d/M"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
+ }
+ yMEd{
+ M{"E,d/M/y- E,d/M/y"}
+ d{"E,d/M/y- E,d/M/y"}
+ y{"E,d/M/y-E,d/M/y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y – MMM y"}
+ }
+ yMMMEd{
+ M{"E,d MMM-E,d MMM y"}
+ d{"E, d MMM-E, d MMM y"}
+ y{"E, d MMM y-E, d MMM y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"d MMM-d MMM y"}
+ d{"d-d MMM,y"}
+ y{"d MMM,y-d MMM,y"}
+ }
+ yMd{
+ M{"d/M/y-d/M/y"}
+ d{"d/M/y-d/M/y"}
+ y{"d/M/y-d/M/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"AM",
@@ -194,14 +336,14 @@
y{"y"}
yM{"M/y"}
yMEd{"E, M/d/y"}
+ yMM{"MM-y"}
yMMM{"MMM y"}
yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
yMMMd{"d, MMM y"}
yMd{"d/M/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyyyMM{"MM-yyyy"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -295,63 +437,6 @@
"ઇસવીસન",
}
}
- fields{
- day{
- dn{"દિવસ"}
- relative{
- "-1"{"ગઈકાલ"}
- "-2"{"ગઈકાસ પહેસાંનો દિવસ"}
- "0"{"આજ"}
- "1"{"આવતીકાલ"}
- "2"{"પરમ દિવસ"}
- }
- }
- dayperiod{
- dn{"AM/PM"}
- }
- era{
- dn{"યુગ"}
- }
- hour{
- dn{"કલાક"}
- }
- minute{
- dn{"મિનિટ"}
- }
- month{
- dn{"મહિનો"}
- relative{
- "-1"{"છેલ્લો મહિનો"}
- "0"{"આ મહિને"}
- "1"{"આગલો મહીનો"}
- }
- }
- second{
- dn{"ક્ષણ"}
- }
- week{
- dn{"અહવાડિયું"}
- relative{
- "-1"{"છેલ્લું અઠવાડિયું"}
- "0"{"આ અઠવાડિયે"}
- "1"{"આગલા અઠવાડિયે"}
- }
- }
- weekday{
- dn{"અઠવાડિયાનો દિવસ"}
- }
- year{
- dn{"વર્ષ"}
- relative{
- "-1"{"પાછલું વર્ષ"}
- "0"{"આ વર્ષ"}
- "1"{"આગલું વર્ષ"}
- }
- }
- zone{
- dn{"વિસ્તાર"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -415,13 +500,13 @@
y{"y–y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E,d/M/yy- E,d/M/yy"}
- d{"E,d/M/yy- E,d/M/yy"}
- y{"E,d/M/yy-E,d/M/yy"}
+ M{"E,d/M/y- E,d/M/y"}
+ d{"E,d/M/y- E,d/M/y"}
+ y{"E,d/M/y-E,d/M/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -442,9 +527,9 @@
y{"d MMM,y-d MMM,y"}
}
yMd{
- M{"d/M/yy-d/M/yy"}
- d{"d/M/yy-d/M/yy"}
- y{"d/M/yy-d/M/yy"}
+ M{"d/M/y-d/M/y"}
+ d{"d/M/y-d/M/y"}
+ y{"d/M/y-d/M/y"}
}
}
monthNames{
@@ -531,7 +616,7 @@
"જુલાઈ",
"ઑગસ્ટ",
"સપ્ટેમ્બર",
- "ઑક્ટ્બર",
+ "ઑક્ટોબર",
"નવેમ્બર",
"ડિસેમ્બર",
}
@@ -587,6 +672,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"દિવસ"}
+ relative{
+ "-1"{"ગઈકાલ"}
+ "-2"{"ગઈકાસ પહેસાંનો દિવસ"}
+ "0"{"આજ"}
+ "1"{"આવતીકાલ"}
+ "2"{"પરમ દિવસ"}
+ }
+ }
+ dayperiod{
+ dn{"AM/PM"}
+ }
+ era{
+ dn{"યુગ"}
+ }
+ hour{
+ dn{"કલાક"}
+ }
+ minute{
+ dn{"મિનિટ"}
+ }
+ month{
+ dn{"મહિનો"}
+ relative{
+ "-1"{"છેલ્લો મહિનો"}
+ "0"{"આ મહિને"}
+ "1"{"આગલો મહીનો"}
+ }
+ }
+ second{
+ dn{"ક્ષણ"}
+ }
+ week{
+ dn{"અહવાડિયું"}
+ relative{
+ "-1"{"છેલ્લું અઠવાડિયું"}
+ "0"{"આ અઠવાડિયે"}
+ "1"{"આગલા અઠવાડિયે"}
+ }
+ }
+ weekday{
+ dn{"અઠવાડિયાનો દિવસ"}
+ }
+ year{
+ dn{"વર્ષ"}
+ relative{
+ "-1"{"પાછલું વર્ષ"}
+ "0"{"આ વર્ષ"}
+ "1"{"આગલું વર્ષ"}
+ }
+ }
+ zone{
+ dn{"વિસ્તાર"}
+ }
+ }
listPattern{
standard{
2{"{0} અને {1}"}
diff --git a/data/locales/gu_IN.txt b/data/locales/gu_IN.txt
index c70dd80..e3a1e64 100644
--- a/data/locales/gu_IN.txt
+++ b/data/locales/gu_IN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gu_IN.xml
// *
// ***************************************************************************
gu_IN{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/guz.txt b/data/locales/guz.txt
index 85f074d..251bec2 100755
--- a/data/locales/guz.txt
+++ b/data/locales/guz.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/guz.xml
// *
@@ -23,8 +23,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"Ma/Mo",
@@ -38,7 +78,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -111,46 +151,6 @@
"Yeso kaiboirwe",
}
}
- fields{
- day{
- dn{"Rituko"}
- relative{
- "-1"{"Igoro"}
- "0"{"Rero"}
- "1"{"Mambia"}
- }
- }
- dayperiod{
- dn{"Mambia gose Morogoba"}
- }
- era{
- dn{"Ebiro"}
- }
- hour{
- dn{"Ensa"}
- }
- minute{
- dn{"Edakika"}
- }
- month{
- dn{"Omotienyi"}
- }
- second{
- dn{"Esekendi"}
- }
- week{
- dn{"Omokubio"}
- }
- weekday{
- dn{"Rituko r'ewiki"}
- }
- year{
- dn{"Omwaka"}
- }
- zone{
- dn{"Chinse 'chimo"}
- }
- }
monthNames{
format{
abbreviated{
@@ -223,4 +223,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Rituko"}
+ relative{
+ "-1"{"Igoro"}
+ "0"{"Rero"}
+ "1"{"Mambia"}
+ }
+ }
+ dayperiod{
+ dn{"Mambia gose Morogoba"}
+ }
+ era{
+ dn{"Ebiro"}
+ }
+ hour{
+ dn{"Ensa"}
+ }
+ minute{
+ dn{"Edakika"}
+ }
+ month{
+ dn{"Omotienyi"}
+ }
+ second{
+ dn{"Esekendi"}
+ }
+ week{
+ dn{"Omokubio"}
+ }
+ weekday{
+ dn{"Rituko r'ewiki"}
+ }
+ year{
+ dn{"Omwaka"}
+ }
+ zone{
+ dn{"Chinse 'chimo"}
+ }
+ }
}
diff --git a/data/locales/guz_KE.txt b/data/locales/guz_KE.txt
index 4c68739..2dfb9d6 100755
--- a/data/locales/guz_KE.txt
+++ b/data/locales/guz_KE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/guz_KE.xml
// *
// ***************************************************************************
guz_KE{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/gv.txt b/data/locales/gv.txt
index 6ee2aae..5e2ef2b 100644
--- a/data/locales/gv.txt
+++ b/data/locales/gv.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gv.xml
// *
@@ -21,7 +21,7 @@
}
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/data/locales/gv_GB.txt b/data/locales/gv_GB.txt
index 449fcef..2dbf32f 100644
--- a/data/locales/gv_GB.txt
+++ b/data/locales/gv_GB.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gv_GB.xml
// *
// ***************************************************************************
gv_GB{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ha.txt b/data/locales/ha.txt
index 00710fc..ee3a12b 100755
--- a/data/locales/ha.txt
+++ b/data/locales/ha.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ha.xml
// *
@@ -30,8 +30,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d MMMM, y G",
+ "d MMMM, y G",
+ "d MMM, y G",
+ "d/M/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
DateTimePatterns{
"HH:mm:ss zzzz",
@@ -114,46 +154,6 @@
"Bayan haihuwar annab",
}
}
- fields{
- day{
- dn{"Kwana"}
- relative{
- "-1"{"Jiya"}
- "0"{"Yau"}
- "1"{"Gobe"}
- }
- }
- dayperiod{
- dn{"Yini"}
- }
- era{
- dn{"Zamani"}
- }
- hour{
- dn{"Awa"}
- }
- minute{
- dn{"Minti"}
- }
- month{
- dn{"Wata"}
- }
- second{
- dn{"Daƙiƙa"}
- }
- week{
- dn{"Mako"}
- }
- weekday{
- dn{"Rana"}
- }
- year{
- dn{"Shekara"}
- }
- zone{
- dn{"Agogo"}
- }
- }
monthNames{
format{
abbreviated{
@@ -226,4 +226,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Kwana"}
+ relative{
+ "-1"{"Jiya"}
+ "0"{"Yau"}
+ "1"{"Gobe"}
+ }
+ }
+ dayperiod{
+ dn{"Yini"}
+ }
+ era{
+ dn{"Zamani"}
+ }
+ hour{
+ dn{"Awa"}
+ }
+ minute{
+ dn{"Minti"}
+ }
+ month{
+ dn{"Wata"}
+ }
+ second{
+ dn{"Daƙiƙa"}
+ }
+ week{
+ dn{"Mako"}
+ }
+ weekday{
+ dn{"Rana"}
+ }
+ year{
+ dn{"Shekara"}
+ }
+ zone{
+ dn{"Agogo"}
+ }
+ }
}
diff --git a/data/locales/ha_GH.txt b/data/locales/ha_GH.txt
index a414604..5a59b2e 100644
--- a/data/locales/ha_GH.txt
+++ b/data/locales/ha_GH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/ha_Latn.txt b/data/locales/ha_Latn.txt
index 065c5dc..c6b675d 100755
--- a/data/locales/ha_Latn.txt
+++ b/data/locales/ha_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ha_Latn.xml
// *
@@ -13,5 +13,5 @@
LocaleScript{
"Latn",
}
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ha_Latn_GH.txt b/data/locales/ha_Latn_GH.txt
index f81b76b..213b5fd 100644
--- a/data/locales/ha_Latn_GH.txt
+++ b/data/locales/ha_Latn_GH.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ha_Latn_GH.xml
// *
// ***************************************************************************
ha_Latn_GH{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ha_Latn_NE.txt b/data/locales/ha_Latn_NE.txt
index 332c17d..ee407da 100644
--- a/data/locales/ha_Latn_NE.txt
+++ b/data/locales/ha_Latn_NE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ha_Latn_NE.xml
// *
// ***************************************************************************
ha_Latn_NE{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ha_Latn_NG.txt b/data/locales/ha_Latn_NG.txt
index 9341581..099f5fb 100755
--- a/data/locales/ha_Latn_NG.txt
+++ b/data/locales/ha_Latn_NG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ha_Latn_NG.xml
// *
// ***************************************************************************
ha_Latn_NG{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ha_NE.txt b/data/locales/ha_NE.txt
index 5c06d78..f28adee 100644
--- a/data/locales/ha_NE.txt
+++ b/data/locales/ha_NE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/ha_NG.txt b/data/locales/ha_NG.txt
index 66e2170..1a5e209 100755
--- a/data/locales/ha_NG.txt
+++ b/data/locales/ha_NG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/haw.txt b/data/locales/haw.txt
index 5210d54..75f3a2f 100644
--- a/data/locales/haw.txt
+++ b/data/locales/haw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/haw.xml
// *
@@ -22,7 +22,7 @@
}
}
}
- Version{"2.0.74.85"}
+ Version{"2.0.82.45"}
calendar{
gregorian{
dayNames{
diff --git a/data/locales/haw_US.txt b/data/locales/haw_US.txt
index d529c4b..06e1934 100644
--- a/data/locales/haw_US.txt
+++ b/data/locales/haw_US.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/haw_US.xml
// *
@@ -12,5 +12,5 @@
279,
216,
}
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/he.txt b/data/locales/he.txt
index 0e981d4..b842fbb 100644
--- a/data/locales/he.txt
+++ b/data/locales/he.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/he.xml
// *
@@ -196,8 +196,155 @@
native{"latn"}
traditional{"hebr"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.47"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d בMMMM y G",
+ "d בMMMM y G",
+ "d בMMM y G",
+ "dd/MM/yy GGGGG",
+ "{1}, {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ }
+ availableFormats{
+ Ed{"E ה-d"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E, d בMMM y G"}
+ GyMMMd{"d בMMM y G"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d/M"}
+ MMM{"LLL"}
+ MMMEd{"E, d בMMM"}
+ MMMd{"d בMMM"}
+ Md{"d/M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y G"}
+ yyyy{"y G"}
+ yyyyM{"M.y G"}
+ yyyyMEd{"E, d/M/y G"}
+ yyyyMM{"MM/y G"}
+ yyyyMMM{"MMM y G"}
+ yyyyMMMEd{"E, d בMMM y G"}
+ yyyyMMMd{"d בMMM y G"}
+ yyyyMd{"d.M.y G"}
+ yyyyQQQ{"G y QQQ"}
+ yyyyQQQQ{"G y QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"EEEE dd/MM – EEEE dd/MM"}
+ d{"EEEE dd/MM – EEEE dd/MM"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"EEEE d MMM – EEEE d MMM"}
+ d{"EEEE d MMM – EEEE d MMM"}
+ }
+ MMMM{
+ M{"LLLL–LLLL"}
+ }
+ MMMd{
+ M{"d MMM – d MMM"}
+ d{"d–d MMM"}
+ }
+ Md{
+ M{"dd/MM – dd/MM"}
+ d{"dd/MM – dd/MM"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"MM/y – MM/y"}
+ y{"MM/y – MM/y"}
+ }
+ yMEd{
+ M{"EEEE dd/MM/y – EEEE dd/MM/y"}
+ d{"EEEE dd/MM/y – EEEE dd/MM/y"}
+ y{"EEEE dd/MM/y – EEEE dd/MM/y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y – MMM y"}
+ }
+ yMMMEd{
+ M{"EEEE d MMM – EEEE d MMM y"}
+ d{"EEEE d MMM – EEEE d MMM y"}
+ y{"EEEE d MMM y – EEEE d MMM y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y–MMMM y"}
+ }
+ yMMMd{
+ M{"d MMM – d MMM y"}
+ d{"d–d MMM y"}
+ y{"d MMM y – d MMM y"}
+ }
+ yMd{
+ M{"dd/MM/y – dd/MM/y"}
+ d{"dd/MM/y – dd/MM/y"}
+ y{"dd/MM/y – dd/MM/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"לפנה״צ",
@@ -210,7 +357,7 @@
"HH:mm",
"EEEE, d בMMMM y",
"d בMMMM y",
- "d בMMM yyyy",
+ "d בMMM y",
"dd/MM/yy",
"{1}, {0}",
"{1} {0}",
@@ -220,6 +367,10 @@
}
availableFormats{
Ed{"E ה-d"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E, d בMMM y G"}
+ GyMMMd{"d בMMM y G"}
H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -227,33 +378,24 @@
MEd{"E, d/M"}
MMM{"LLL"}
MMMEd{"E, d בMMM"}
- MMMMEd{"E, d בMMMM"}
- MMMMd{"d בMMMM"}
MMMd{"d בMMM"}
- MMdd{"dd/MM"}
Md{"d/M"}
d{"d"}
h{"h a"}
hm{"h:mm a"}
hms{"h:mm:ss a"}
- mmss{"mm:ss"}
ms{"mm:ss"}
y{"y"}
- yM{"M.yyyy"}
+ yM{"M.y"}
yMEd{"E, d/M/y"}
+ yMM{"MM/y"}
yMMM{"MMM y"}
yMMMEd{"E, d בMMM y"}
yMMMM{"MMMM y"}
yMMMd{"d בMMM y"}
- yMd{"d.M.yyyy"}
+ yMd{"d.M.y"}
yQQQ{"y QQQ"}
yQQQQ{"y QQQQ"}
- yyMM{"MM/yy"}
- yyMMM{"MMM yyyy"}
- yyQQQ{"QQQ yy"}
- yyyy{"y"}
- yyyyMM{"MM/yyyy"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -325,63 +467,6 @@
"לספירה",
}
}
- fields{
- day{
- dn{"יום"}
- relative{
- "-1"{"אתמול"}
- "-2"{"שלשום"}
- "0"{"היום"}
- "1"{"מחר"}
- "2"{"מחרתיים"}
- }
- }
- dayperiod{
- dn{"לפה״צ/אחה״צ"}
- }
- era{
- dn{"תקופה"}
- }
- hour{
- dn{"שעה"}
- }
- minute{
- dn{"דקה"}
- }
- month{
- dn{"חודש"}
- relative{
- "-1"{"חודש שעבר"}
- "0"{"החודש"}
- "1"{"חודש הבא"}
- }
- }
- second{
- dn{"שנייה"}
- }
- week{
- dn{"שבוע"}
- relative{
- "-1"{"שבוע שעבר"}
- "0"{"השבוע"}
- "1"{"שבוע הבא"}
- }
- }
- weekday{
- dn{"יום בשבוע"}
- }
- year{
- dn{"שנה"}
- relative{
- "-1"{"שנה שעברה"}
- "0"{"השנה"}
- "1"{"שנה הבאה"}
- }
- }
- zone{
- dn{"אזור"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -448,13 +533,13 @@
y{"y–y"}
}
yM{
- M{"MM/yy – MM/yy"}
- y{"MM/yy – MM/yy"}
+ M{"MM/y – MM/y"}
+ y{"MM/y – MM/y"}
}
yMEd{
- M{"EEEE dd/MM/yy – EEEE dd/MM/yy"}
- d{"EEEE dd/MM/yy – EEEE dd/MM/yy"}
- y{"EEEE dd/MM/yy – EEEE dd/MM/yy"}
+ M{"EEEE dd/MM/y – EEEE dd/MM/y"}
+ d{"EEEE dd/MM/y – EEEE dd/MM/y"}
+ y{"EEEE dd/MM/y – EEEE dd/MM/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -475,9 +560,9 @@
y{"d MMM y – d MMM y"}
}
yMd{
- M{"dd/MM/yy – dd/MM/yy"}
- d{"dd/MM/yy – dd/MM/yy"}
- y{"dd/MM/yy – dd/MM/yy"}
+ M{"dd/MM/y – dd/MM/y"}
+ d{"dd/MM/y – dd/MM/y"}
+ y{"dd/MM/y – dd/MM/y"}
}
}
monthNames{
@@ -610,6 +695,10 @@
"{1}, {0}",
}
availableFormats{
+ Gy{"y G"}
+ GyMMM{"MMMM y G"}
+ GyMMMEd{"E, d MMMM y G"}
+ GyMMMd{"d MMMM y G"}
M{"MMMM"}
MEd{"E, d בMMMM"}
MMM{"MMMM"}
@@ -618,13 +707,13 @@
MMMMd{"d בMMMM"}
MMMd{"d בMMMM"}
Md{"d בMMMM"}
- yM{"MMMM y"}
- yMEd{"E, d בMMMM y"}
- yMMM{"MMMM y"}
- yMMMEd{"E, d בMMMM y"}
- yMMMM{"MMMM y"}
- yMMMd{"d בMMMM y"}
- yMd{"d בMMMM y"}
+ yyyyM{"MMMM y"}
+ yyyyMEd{"E, d בMMMM y"}
+ yyyyMMM{"MMMM y"}
+ yyyyMMMEd{"E, d בMMMM y"}
+ yyyyMMMM{"MMMM y"}
+ yyyyMMMd{"d בMMMM y"}
+ yyyyMd{"d בMMMM y"}
}
eras{
abbreviated{
@@ -735,38 +824,32 @@
}
}
islamic{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE, d בMMMM y",
- "d בMMMM y",
- "d בMMM yyyy",
- "dd/MM/yy",
- "{1}, {0}",
- "{1} {0}",
- "{1} {0}",
- "{1}, {0}",
- "{1}, {0}",
- }
availableFormats{
+ Ed{"E ה-d"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E, d בMMM y G"}
+ GyMMMd{"d בMMM y G"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
MEd{"E, d/M"}
- MMMMEd{"E, d בMMMM"}
- MMMMd{"d בMMMM"}
+ MMMEd{"E, d בMMM"}
MMMd{"d בMMM"}
Md{"d/M"}
+ d{"d"}
h{"h a"}
hm{"h:mm a"}
hms{"h:mm:ss a"}
- yM{"M/yyyy"}
- yMEd{"E, d.M.yyyy"}
- yMMM{"MMM y"}
- yMMMEd{"E, d בMMM y"}
- yQQQ{"QQQ y"}
- yQQQQ{"QQQQ y"}
+ y{"y G"}
+ yyyy{"y G"}
+ yyyyM{"M/y"}
+ yyyyMEd{"E, d.M.y"}
+ yyyyMMM{"MMM y"}
+ yyyyMMMEd{"E, d בMMM y"}
+ yyyyMMMd{"d בMMM y"}
+ yyyyMd{"d.M.y G"}
+ yyyyQQQ{"QQQ y"}
+ yyyyQQQQ{"QQQQ y"}
}
eras{
abbreviated{
@@ -847,7 +930,7 @@
"Daidō (806-810)",
"Kōnin (810-824)",
"Tenchō (824-834)",
- "Shōwa (834-848)",
+ "Jōwa (834-848)",
"Kajō (848-851)",
"נינג׳ו",
"Saiko (854-857)",
@@ -1068,12 +1151,68 @@
delimiters{
alternateQuotationEnd{"'"}
alternateQuotationStart{"'"}
- quotationEnd{"\""}
- quotationStart{"\""}
+ quotationEnd{"\u0022"}
+ quotationStart{"\u0022"}
+ }
+ fields{
+ day{
+ dn{"יום"}
+ relative{
+ "-1"{"אתמול"}
+ "-2"{"שלשום"}
+ "0"{"היום"}
+ "1"{"מחר"}
+ "2"{"מחרתיים"}
+ }
+ }
+ dayperiod{
+ dn{"לפה״צ/אחה״צ"}
+ }
+ era{
+ dn{"תקופה"}
+ }
+ hour{
+ dn{"שעה"}
+ }
+ minute{
+ dn{"דקה"}
+ }
+ month{
+ dn{"חודש"}
+ relative{
+ "-1"{"חודש שעבר"}
+ "0"{"החודש"}
+ "1"{"חודש הבא"}
+ }
+ }
+ second{
+ dn{"שנייה"}
+ }
+ week{
+ dn{"שבוע"}
+ relative{
+ "-1"{"שבוע שעבר"}
+ "0"{"השבוע"}
+ "1"{"שבוע הבא"}
+ }
+ }
+ weekday{
+ dn{"יום בשבוע"}
+ }
+ year{
+ dn{"שנה"}
+ relative{
+ "-1"{"שנה שעברה"}
+ "0"{"השנה"}
+ "1"{"שנה הבאה"}
+ }
+ }
+ zone{
+ dn{"אזור"}
+ }
}
layout{
characters{"right-to-left"}
- lines{"top-to-bottom"}
}
listPattern{
standard{
diff --git a/data/locales/he_IL.txt b/data/locales/he_IL.txt
index 7336d5a..7e55176 100644
--- a/data/locales/he_IL.txt
+++ b/data/locales/he_IL.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/he_IL.xml
// *
// ***************************************************************************
he_IL{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/hi.txt b/data/locales/hi.txt
index 9ef83e8..72e2bd7 100644
--- a/data/locales/hi.txt
+++ b/data/locales/hi.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hi.xml
// *
@@ -151,7 +151,7 @@
}
native{"deva"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
ethiopic{
monthNames{
@@ -174,10 +174,155 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM Gy",
+ "d MMMM Gy",
+ "dd-MM-y G",
+ "d-M-y G",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ Gy{"Gy"}
+ GyMMM{"MMM Gy"}
+ GyMMMEd{"E, d MMM Gy"}
+ GyMMMd{"d MMM Gy"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d/M"}
+ MMM{"MMM"}
+ MMMEd{"E, d MMM"}
+ MMMd{"d MMM"}
+ MMdd{"dd-MM"}
+ Md{"d/M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"Gy"}
+ yyyy{"Gy"}
+ yyyyM{"M-y G"}
+ yyyyMEd{"E, d/M/y G"}
+ yyyyMMM{"MMM Gy"}
+ yyyyMMMEd{"E, d MMM Gy"}
+ yyyyMMMd{"d MMM Gy"}
+ yyyyMMdd{"dd-MM-y G"}
+ yyyyMd{"d/M/y G"}
+ yyyyQQQ{"QQQ Gy"}
+ yyyyQQQQ{"QQQQ Gy"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, d/M – E, d/M"}
+ d{"E, d/M – E, d/M"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E, d MMM – E, d MMM"}
+ d{"E, d MMM – E, d MMM"}
+ }
+ MMMd{
+ M{"d MMM – d MMM"}
+ d{"d MMM–d"}
+ }
+ Md{
+ M{"d/M – d/M"}
+ d{"d/M – d/M"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"Gy–y"}
+ }
+ yM{
+ M{"M/y – M/y G"}
+ y{"M/y – M/y G"}
+ }
+ yMEd{
+ M{"E, d/M/y – E, d/M/y G"}
+ d{"E, d/M/y – E, d/M/y G"}
+ y{"E, d/M/y – E, d/M/y G"}
+ }
+ yMMM{
+ M{"MMM–MMM Gy"}
+ y{"MMM Gy – MMM y"}
+ }
+ yMMMEd{
+ M{"E, d MMM – E, d MMM, Gy"}
+ d{"E, d MMM – E, d MMM, Gy"}
+ y{"E, d MMM, Gy – E, d MMM, y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM Gy"}
+ y{"MMMM Gy – MMMM y"}
+ }
+ yMMMd{
+ M{"d MMM – d MMM, Gy"}
+ d{"d MMM–d, Gy"}
+ y{"d MMM, Gy – d MMM, y"}
+ }
+ yMd{
+ M{"d/M/y – d/M/y G"}
+ d{"d/M/y – d/M/y G"}
+ y{"d/M/y – d/M/y G"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
- "पूर्वाह्न",
- "अपराह्न",
+ "am",
+ "pm",
}
DateTimePatterns{
"h:mm:ss a zzzz",
@@ -186,7 +331,7 @@
"h:mm a",
"EEEE, d MMMM y",
"d MMMM y",
- "dd-MM-yyyy",
+ "dd-MM-y",
"d-M-yy",
"{1} {0}",
"{1} {0}",
@@ -196,7 +341,10 @@
}
availableFormats{
Ed{"d E"}
- GGGGyMMMMEEEEdd{"EEEE,dd MMMM GGGGy"}
+ Gy{"Gy"}
+ GyMMM{"MMM Gy"}
+ GyMMMEd{"E, d MMM Gy"}
+ GyMMMd{"d MMM Gy"}
H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -218,17 +366,15 @@
y{"y"}
yM{"M-y"}
yMEd{"E, d/M/y"}
+ yMM{"MM-y"}
yMMM{"MMM y"}
yMMMEd{"E, d MMM y"}
+ yMMMM{"MMMM y"}
yMMMd{"d MMM, y"}
+ yMMdd{"dd-MM-y"}
yMd{"d/M/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMMMEd{"E, d MMM yy"}
- yyMMMd{"d MMM, yy"}
- yyMMdd{"dd-MM-yy"}
- yyyyMM{"MM-yyyy"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -287,63 +433,6 @@
"सन",
}
}
- fields{
- day{
- dn{"दिन"}
- relative{
- "-1"{"बीता कल"}
- "-2"{"बीता परसों"}
- "0"{"आज"}
- "1"{"कल"}
- "2"{"परसों"}
- }
- }
- dayperiod{
- dn{"समय अवधि"}
- }
- era{
- dn{"युग"}
- }
- hour{
- dn{"घंटा"}
- }
- minute{
- dn{"मिनट"}
- }
- month{
- dn{"मास"}
- relative{
- "-1"{"पिछला माह"}
- "0"{"इस माह"}
- "1"{"अगले माह"}
- }
- }
- second{
- dn{"सेकेंड"}
- }
- week{
- dn{"सप्ताह"}
- relative{
- "-1"{"पिछले सप्ताह"}
- "0"{"इस सप्ताह"}
- "1"{"अगले सप्ताह"}
- }
- }
- weekday{
- dn{"सप्ताह का दिन"}
- }
- year{
- dn{"वर्ष"}
- relative{
- "-1"{"पिछले वर्ष"}
- "0"{"इस वर्ष"}
- "1"{"अगले वर्ष"}
- }
- }
- zone{
- dn{"क्षेत्र"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -407,13 +496,13 @@
y{"y–y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E, d/M/yy – E, d/M/yy"}
- d{"E, d/M/yy – E, d/M/yy"}
- y{"E, d/M/yy – E, d/M/yy"}
+ M{"E, d/M/y – E, d/M/y"}
+ d{"E, d/M/y – E, d/M/y"}
+ y{"E, d/M/y – E, d/M/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -434,9 +523,9 @@
y{"d MMM, y – d MMM, y"}
}
yMd{
- M{"d/M/yy – d/M/yy"}
- d{"d/M/yy – d/M/yy"}
- y{"d/M/yy – d/M/yy"}
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
}
}
monthNames{
@@ -807,6 +896,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"दिन"}
+ relative{
+ "-1"{"बीता कल"}
+ "-2"{"बीता परसों"}
+ "0"{"आज"}
+ "1"{"कल"}
+ "2"{"परसों"}
+ }
+ }
+ dayperiod{
+ dn{"समय अवधि"}
+ }
+ era{
+ dn{"युग"}
+ }
+ hour{
+ dn{"घंटा"}
+ }
+ minute{
+ dn{"मिनट"}
+ }
+ month{
+ dn{"मास"}
+ relative{
+ "-1"{"पिछला माह"}
+ "0"{"इस माह"}
+ "1"{"अगले माह"}
+ }
+ }
+ second{
+ dn{"सेकेंड"}
+ }
+ week{
+ dn{"सप्ताह"}
+ relative{
+ "-1"{"पिछले सप्ताह"}
+ "0"{"इस सप्ताह"}
+ "1"{"अगले सप्ताह"}
+ }
+ }
+ weekday{
+ dn{"सप्ताह का दिन"}
+ }
+ year{
+ dn{"वर्ष"}
+ relative{
+ "-1"{"पिछले वर्ष"}
+ "0"{"इस वर्ष"}
+ "1"{"अगले वर्ष"}
+ }
+ }
+ zone{
+ dn{"क्षेत्र"}
+ }
+ }
listPattern{
standard{
2{"{0} और {1}"}
diff --git a/data/locales/hi_IN.txt b/data/locales/hi_IN.txt
index cca83f3..c22c380 100644
--- a/data/locales/hi_IN.txt
+++ b/data/locales/hi_IN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hi_IN.xml
// *
// ***************************************************************************
hi_IN{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/hr.txt b/data/locales/hr.txt
index bf6a8ca..20de3cf 100644
--- a/data/locales/hr.txt
+++ b/data/locales/hr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hr.xml
// *
@@ -16,7 +16,7 @@
"[A B C Č Ć D {DŽ} Đ E F G H I J K L {LJ} M N {NJ} O P Q R S Š T U V W X Y Z "
"Ž]"
}
- ExemplarCharactersPunctuation{"[‐ – — , ; \: ! ? . … ' ‘ ’ \" “ ” ( ) \[ \] @ * / ′ ″]"}
+ ExemplarCharactersPunctuation{"[‐ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] @ * / ′ ″]"}
LocaleScript{
"Latn",
}
@@ -194,23 +194,13 @@
}
}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE, d. MMMM y. G",
- "d. MMMM y. G",
- "d. M. y. G",
- "d.M.y.",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
+ eras{
+ abbreviated{
+ "BE",
+ }
}
}
chinese{
@@ -230,6 +220,153 @@
"{1} {0}",
}
}
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d. MMMM y. G",
+ "d. MMMM y. G",
+ "d. M. y. G",
+ "d.M.y. GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E, d."}
+ Gy{"y. G"}
+ GyMMM{"LLL y. G"}
+ GyMMMEd{"E, d. MMM y. G"}
+ GyMMMd{"d. MMM y. G"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L."}
+ MEd{"E, d. M."}
+ MMM{"LLL"}
+ MMMEd{"E, d. MMM"}
+ MMMMEd{"E, d. MMMM"}
+ MMMMd{"d. MMMM"}
+ MMMMdd{"dd. MMMM"}
+ MMMd{"d. MMM"}
+ Md{"d. M."}
+ d{"d."}
+ h{"hh a"}
+ hm{"hh:mm a"}
+ hms{"hh:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y. G"}
+ yyyy{"y. G"}
+ yyyyM{"M. y. G"}
+ yyyyMEd{"E, d. M. y. G"}
+ yyyyMMM{"LLL y. G"}
+ yyyyMMMEd{"E, d. MMM y. G"}
+ yyyyMMMM{"LLLL y. G"}
+ yyyyMMMd{"d. MMM y. G"}
+ yyyyMd{"d. M. y. G"}
+ yyyyQQQ{"QQQ y. G"}
+ yyyyQQQQ{"QQQQ y. G"}
+ }
+ intervalFormats{
+ H{
+ H{"HH - HH'h'"}
+ }
+ Hm{
+ H{"HH:mm-HH:mm"}
+ m{"HH:mm-HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm-HH:mm v"}
+ m{"HH:mm-HH:mm v"}
+ }
+ Hv{
+ H{"HH - HH 'h' v"}
+ }
+ M{
+ M{"MM. - MM."}
+ }
+ MEd{
+ M{"E, dd.MM. - E, dd.MM."}
+ d{"E, dd.MM. - E, dd.MM."}
+ }
+ MMM{
+ M{"LLL-LLL"}
+ }
+ MMMEd{
+ M{"E, dd. MMM - E, dd. MMM"}
+ d{"E, dd. - E, dd. MMM"}
+ }
+ MMMd{
+ M{"dd. MMM - dd. MMM"}
+ d{"dd. - dd. MMM"}
+ }
+ Md{
+ M{"dd.MM. - dd.MM."}
+ d{"dd.MM. - dd.MM."}
+ }
+ d{
+ d{"dd. - dd."}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a - h a"}
+ h{"h - h'h' a"}
+ }
+ hm{
+ a{"h:mm a - h:mm a"}
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ a{"h:mm a - h:mm a v"}
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"h a - h a v"}
+ h{"h - h 'h' a v"}
+ }
+ y{
+ y{"y. - y. G"}
+ }
+ yM{
+ M{"MM.y. - MM.y. G"}
+ y{"MM.y. - MM.y. G"}
+ }
+ yMEd{
+ M{"E, dd.MM.y. - E, dd.MM.y. G"}
+ d{"E, dd.MM.y. - E, dd.MM.y. G"}
+ y{"E, dd.MM.y. - E, dd.MM.y. G"}
+ }
+ yMMM{
+ M{"LLL-LLL y. G"}
+ y{"LLL y. - LLL y. G"}
+ }
+ yMMMEd{
+ M{"E, dd. MMM - E, dd. MMM y. G"}
+ d{"E, dd. - E, dd. MMM y. G"}
+ y{"E, dd. MMM y. - E, dd. MMM y. G"}
+ }
+ yMMMM{
+ M{"LLLL-LLLL y. G"}
+ y{"LLLL y. - LLLL y. G"}
+ }
+ yMMMd{
+ M{"dd. MMM - dd. MMM y. G"}
+ d{"dd. - dd. MMM y. G"}
+ y{"dd. MMM y. - dd. MMM y. G"}
+ }
+ yMd{
+ M{"dd.MM.y. - dd.MM.y. G"}
+ d{"dd.MM.y. - dd.MM.y. G"}
+ y{"dd.MM.y. - dd.MM.y. G"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"AM",
@@ -252,6 +389,10 @@
}
availableFormats{
Ed{"E, d."}
+ Gy{"y. G"}
+ GyMMM{"LLL y. G"}
+ GyMMMEd{"E, d. MMM y. G"}
+ GyMMMd{"d. MMM y. G"}
H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -271,8 +412,9 @@
hms{"hh:mm:ss a"}
ms{"mm:ss"}
y{"y."}
- yM{"M. yyyy."}
+ yM{"M. y."}
yMEd{"E, d. M. y."}
+ yMM{"MM. y."}
yMMM{"LLL y."}
yMMMEd{"E, d. MMM y."}
yMMMM{"LLLL y."}
@@ -280,9 +422,6 @@
yMd{"d. M. y."}
yQQQ{"QQQ y."}
yQQQQ{"QQQQ y."}
- yyMMMEd{"E, d. MMM yy."}
- yyyyMM{"MM. yyyy."}
- yyyyMMMM{"LLLL y."}
}
dayNames{
format{
@@ -376,63 +515,6 @@
"Poslije Krista",
}
}
- fields{
- day{
- dn{"dan"}
- relative{
- "-1"{"jučer"}
- "-2"{"prekjučer"}
- "0"{"danas"}
- "1"{"sutra"}
- "2"{"prekosutra"}
- }
- }
- dayperiod{
- dn{"dio dana"}
- }
- era{
- dn{"era"}
- }
- hour{
- dn{"sat"}
- }
- minute{
- dn{"minuta"}
- }
- month{
- dn{"mjesec"}
- relative{
- "-1"{"Prošli mjesec"}
- "0"{"Ovaj mjesec"}
- "1"{"Sljedeći mjesec"}
- }
- }
- second{
- dn{"sekunda"}
- }
- week{
- dn{"tjedan"}
- relative{
- "-1"{"Prošli tjedan"}
- "0"{"Ovaj tjedan"}
- "1"{"Sljedeći tjedan"}
- }
- }
- weekday{
- dn{"dan u tjednu"}
- }
- year{
- dn{"godina"}
- relative{
- "-1"{"Prošla godina"}
- "0"{"Ova godina"}
- "1"{"Sljedeća godina"}
- }
- }
- zone{
- dn{"vremenska zona"}
- }
- }
intervalFormats{
H{
H{"HH - HH'h'"}
@@ -496,13 +578,13 @@
y{"y. - y."}
}
yM{
- M{"MM.yyyy. - MM.yyyy."}
- y{"MM.yyyy. - MM.yyyy."}
+ M{"MM.y. - MM.y."}
+ y{"MM.y. - MM.y."}
}
yMEd{
- M{"E, dd.MM.yyyy. - E, dd.MM.yyyy."}
- d{"E, dd.MM.yyyy. - E, dd.MM.yyyy."}
- y{"E, dd.MM.yyyy. - E, dd.MM.yyyy."}
+ M{"E, dd.MM.y. - E, dd.MM.y."}
+ d{"E, dd.MM.y. - E, dd.MM.y."}
+ y{"E, dd.MM.y. - E, dd.MM.y."}
}
yMMM{
M{"LLL-LLL y."}
@@ -523,9 +605,9 @@
y{"dd. MMM y. - dd. MMM y."}
}
yMd{
- M{"dd.MM.yyyy. - dd.MM.yyyy."}
- d{"dd.MM.yyyy. - dd.MM.yyyy."}
- y{"dd.MM.yyyy. - dd.MM.yyyy."}
+ M{"dd.MM.y. - dd.MM.y."}
+ d{"dd.MM.y. - dd.MM.y."}
+ y{"dd.MM.y. - dd.MM.y."}
}
}
monthNames{
@@ -661,77 +743,39 @@
}
}
}
- japanese{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE, d. MMMM y. G",
- "d. MMMM y. G",
- "d. M. y. G",
- "d.M.y. G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
+ hebrew{
+ eras{
+ abbreviated{
+ "AM",
+ }
}
+ }
+ islamic{
+ eras{
+ abbreviated{
+ "AH",
+ }
+ }
+ }
+ japanese{
availableFormats{
Ed{"E, d."}
- Gy{"yy. GGG"}
+ Gy{"y. GGG"}
MEd{"E, d. M."}
MMMEd{"E, d. MMM"}
MMMMd{"d. MMMM"}
Md{"d. M."}
- y{"yy. GGG"}
- yyyy{"yy. GGG"}
- yyyyM{"M. y. GGGGG"}
- yyyyMEd{"E, d. M. y. GGGGG"}
- yyyyMMM{"LLL y. GGGGG"}
- yyyyMMMEd{"E, d. MMM y. GGGGG"}
- yyyyMMMd{"d. MMM y. GGGGG"}
- yyyyMd{"d. M. y. GGGGG"}
- yyyyQQQ{"QQQ y. GGGGG"}
+ y{"y. GGG"}
+ yM{"M. y. GGGGG"}
+ yMEd{"E, d. M. y. GGGGG"}
+ yMMM{"LLL y. GGGGG"}
+ yMMMEd{"E, d. MMM y. GGGGG"}
+ yMMMd{"d. MMM y. GGGGG"}
+ yMd{"d. M. y. GGGGG"}
+ yQQQ{"QQQ y. GGGGG"}
}
}
roc{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE, d. MMMM y. G",
- "d. MMMM y. G",
- "d. M. y. G",
- "d.M.y. G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E, d."}
- Gy{"y. G"}
- M{"L."}
- MEd{"E, d. M."}
- MMM{"LLL"}
- MMMEd{"E, d. MMM"}
- MMMd{"d. MMM"}
- Md{"d. M."}
- d{"d."}
- y{"y. G"}
- yyyy{"y. G"}
- yyyyM{"M. y. G"}
- yyyyMEd{"E, d. M. y. G"}
- yyyyMMM{"LLL y. G"}
- yyyyMMMEd{"E, d. MMM y. G"}
- yyyyMMMd{"d. MMM y. G"}
- yyyyMd{"d. M. y. G"}
- yyyyQQQ{"QQQ y. G"}
- yyyyQQQQ{"QQQQ y. G"}
- }
eras{
abbreviated{
"prije R.O.C.",
@@ -768,6 +812,63 @@
quotationEnd{"“"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"dan"}
+ relative{
+ "-1"{"jučer"}
+ "-2"{"prekjučer"}
+ "0"{"danas"}
+ "1"{"sutra"}
+ "2"{"prekosutra"}
+ }
+ }
+ dayperiod{
+ dn{"dio dana"}
+ }
+ era{
+ dn{"era"}
+ }
+ hour{
+ dn{"sat"}
+ }
+ minute{
+ dn{"minuta"}
+ }
+ month{
+ dn{"mjesec"}
+ relative{
+ "-1"{"Prošli mjesec"}
+ "0"{"Ovaj mjesec"}
+ "1"{"Sljedeći mjesec"}
+ }
+ }
+ second{
+ dn{"sekunda"}
+ }
+ week{
+ dn{"tjedan"}
+ relative{
+ "-1"{"Prošli tjedan"}
+ "0"{"Ovaj tjedan"}
+ "1"{"Sljedeći tjedan"}
+ }
+ }
+ weekday{
+ dn{"dan u tjednu"}
+ }
+ year{
+ dn{"godina"}
+ relative{
+ "-1"{"Prošla godina"}
+ "0"{"Ova godina"}
+ "1"{"Sljedeća godina"}
+ }
+ }
+ zone{
+ dn{"vremenska zona"}
+ }
+ }
listPattern{
standard{
2{"{0} i {1}"}
diff --git a/data/locales/hr_BA.txt b/data/locales/hr_BA.txt
index 138d26d..1bb74a9 100755
--- a/data/locales/hr_BA.txt
+++ b/data/locales/hr_BA.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hr_BA.xml
// *
// ***************************************************************************
hr_BA{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/hr_HR.txt b/data/locales/hr_HR.txt
index 2249622..fbf7643 100644
--- a/data/locales/hr_HR.txt
+++ b/data/locales/hr_HR.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hr_HR.xml
// *
// ***************************************************************************
hr_HR{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/hu.txt b/data/locales/hu.txt
index 3008233..8917a74 100644
--- a/data/locales/hu.txt
+++ b/data/locales/hu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hu.xml
// *
@@ -20,7 +20,10 @@
"[A Á B C {CS} D {DZ} {DZS} E É F G {GY} H I Í J K L {LY} M N {NY} O Ó Ö Ő P "
"Q R S {SZ} T {TY} U Ú Ü Ű V W X Y Z {ZS}]"
}
- ExemplarCharactersPunctuation{"[\- – , ; \: ! ? . … ' ’ \" ” „ « » ( ) \[ \] \{ \} 〈 〉 § @ * / \& # ⸓ ~]"}
+ ExemplarCharactersPunctuation{
+ "[\\- – , ; \\: ! ? . … ' ’ \u0022 ” „ « » ( ) \\[ \\] \\{ \\} 〈 〉 § @ * / "
+ "\\& # ⸓ ~]"
+ }
LocaleScript{
"Latn",
}
@@ -126,15 +129,9 @@
}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.47"}
calendar{
buddhist{
- availableFormats{
- Md{"M.d."}
- h{"a h"}
- hm{"a h:mm"}
- hms{"a h:mm:ss"}
- }
eras{
abbreviated{
"BK",
@@ -341,6 +338,151 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "H:mm:ss zzzz",
+ "H:mm:ss z",
+ "H:mm:ss",
+ "H:mm",
+ "G y. MMMM d., EEEE",
+ "G y. MMMM d.",
+ "G y.MM.dd.",
+ "GGGGG y.MM.dd.",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d., E"}
+ Gy{"G y"}
+ GyMMM{"G y. MMM"}
+ GyMMMEd{"G y. MMM d., E"}
+ GyMMMd{"G y. MMM d."}
+ H{"H"}
+ Hm{"H:mm"}
+ Hms{"H:mm:ss"}
+ M{"L"}
+ MEd{"M. d., E"}
+ MMM{"LLL"}
+ MMMEd{"MMM d., E"}
+ MMMMd{"MMMM d."}
+ MMMd{"MMM d."}
+ Md{"M. d."}
+ d{"d"}
+ h{"a h"}
+ hm{"a h:mm"}
+ hms{"a h:mm:ss"}
+ ms{"mm:ss"}
+ y{"G y"}
+ yyyy{"G y"}
+ yyyyM{"G y.M."}
+ yyyyMEd{"G y.MM.dd., E"}
+ yyyyMMM{"G y. MMM"}
+ yyyyMMMEd{"G y. MMM d., E"}
+ yyyyMMMM{"G y. MMMM"}
+ yyyyMMMd{"G y. MMM d."}
+ yyyyMd{"G y.MM.dd."}
+ yyyyQQQ{"G y. QQQ"}
+ yyyyQQQQ{"G y. QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"H-H"}
+ }
+ Hm{
+ H{"H:mm-H:mm"}
+ m{"H:mm-H:mm"}
+ }
+ Hmv{
+ H{"H:mm-H:mm v"}
+ m{"H:mm-H:mm v"}
+ }
+ Hv{
+ H{"H-H v"}
+ }
+ M{
+ M{"M-M."}
+ }
+ MEd{
+ M{"MM.dd., E - MM.dd., E"}
+ d{"MM.dd., E - MM.dd., E"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"MMM d., E - MMM d., E"}
+ d{"MMM d., E - d., E"}
+ }
+ MMMd{
+ M{"MMM d. - MMM d."}
+ d{"MMM d-d."}
+ }
+ Md{
+ M{"MM.dd. - MM.dd."}
+ d{"MM.dd-dd."}
+ }
+ d{
+ d{"d-d."}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"a h – a h"}
+ h{"a h–h"}
+ }
+ hm{
+ a{"a h:mm – a h:mm"}
+ h{"a h:mm–h:mm"}
+ m{"a h:mm–h:mm"}
+ }
+ hmv{
+ a{"a h:mm – a h:mm v"}
+ h{"a h:mm–h:mm v"}
+ m{"a h:mm–h:mm v"}
+ }
+ hv{
+ a{"a h – a h v"}
+ h{"a h–h v"}
+ }
+ y{
+ y{"G y-y"}
+ }
+ yM{
+ M{"G y.MM-MM."}
+ y{"G y.MM. - y.MM."}
+ }
+ yMEd{
+ M{"G y.MM.dd., E - MM.dd., E"}
+ d{"G y.MM.dd., E - dd., E"}
+ y{"G y.MM.dd., E - y.MM.dd., E"}
+ }
+ yMMM{
+ M{"G y. MMM-MMM"}
+ y{"G y. MMM - y. MMM"}
+ }
+ yMMMEd{
+ M{"G y. MMM d., E - MMM d., E"}
+ d{"G y. MMM d., E - d., E"}
+ y{"G y. MMM d., E - y. MMM d., E"}
+ }
+ yMMMM{
+ M{"G y. MMMM-MMMM"}
+ y{"G y. MMMM - y. MMMM"}
+ }
+ yMMMd{
+ M{"G y. MMM d. - MMM d."}
+ d{"G y. MMM d-d."}
+ y{"G y. MMM d. - y. MMM d."}
+ }
+ yMd{
+ M{"G y.MM.dd. - MM.dd."}
+ d{"G y.MM.dd-dd."}
+ y{"G y.MM.dd. - y.MM.dd."}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"de.",
@@ -353,8 +495,8 @@
"H:mm",
"y. MMMM d., EEEE",
"y. MMMM d.",
- "yyyy.MM.dd.",
- "yyyy.MM.dd.",
+ "y.MM.dd.",
+ "y.MM.dd.",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -363,6 +505,10 @@
}
availableFormats{
Ed{"d., E"}
+ Gy{"G y"}
+ GyMMM{"G y. MMM"}
+ GyMMMEd{"G y. MMM d., E"}
+ GyMMMd{"G y. MMM d."}
H{"H"}
Hm{"H:mm"}
Hms{"H:mm:ss"}
@@ -372,7 +518,6 @@
MMMEd{"MMM d., E"}
MMMMd{"MMMM d."}
MMMd{"MMM d."}
- MMdd{"MM.dd."}
Md{"M. d."}
d{"d"}
h{"a h"}
@@ -381,16 +526,14 @@
mmss{"mm:ss"}
ms{"mm:ss"}
yM{"y.M."}
- yMEd{"yyyy.MM.dd., E"}
+ yMEd{"y.MM.dd., E"}
yMMM{"y. MMM"}
yMMMEd{"y. MMM d., E"}
+ yMMMM{"y. MMMM"}
yMMMd{"y. MMM d."}
- yMd{"yyyy.MM.dd."}
+ yMd{"y.MM.dd."}
yQQQ{"y. QQQ"}
yQQQQ{"y. QQQQ"}
- yyQQQ{"yy/QQQ"}
- yyyyMM{"yyyy.MM"}
- yyyyMMMM{"y. MMMM"}
}
dayNames{
format{
@@ -475,63 +618,6 @@
"időszámításunk szerint",
}
}
- fields{
- day{
- dn{"nap"}
- relative{
- "-1"{"tegnap"}
- "-2"{"tegnapelőtt"}
- "0"{"ma"}
- "1"{"holnap"}
- "2"{"holnapután"}
- }
- }
- dayperiod{
- dn{"napszak"}
- }
- era{
- dn{"éra"}
- }
- hour{
- dn{"óra"}
- }
- minute{
- dn{"perc"}
- }
- month{
- dn{"hónap"}
- relative{
- "-1"{"Előző hónap"}
- "0"{"Ez a hónap"}
- "1"{"Következő hónap"}
- }
- }
- second{
- dn{"másodperc"}
- }
- week{
- dn{"hét"}
- relative{
- "-1"{"Előző hét"}
- "0"{"Ez a hét"}
- "1"{"Következő hét"}
- }
- }
- weekday{
- dn{"hét napja"}
- }
- year{
- dn{"év"}
- relative{
- "-1"{"Előző év"}
- "0"{"Ez az év"}
- "1"{"Következő év"}
- }
- }
- zone{
- dn{"időzóna"}
- }
- }
intervalFormats{
H{
H{"H-H"}
@@ -595,13 +681,13 @@
y{"y-y"}
}
yM{
- M{"yyyy.MM-MM."}
- y{"yyyy.MM. - yyyy.MM."}
+ M{"y.MM-MM."}
+ y{"y.MM. - y.MM."}
}
yMEd{
- M{"yyyy.MM.dd., E - MM.dd., E"}
- d{"yyyy.MM.dd., E - dd., E"}
- y{"yyyy.MM.dd., E - yyyy.MM.dd., E"}
+ M{"y.MM.dd., E - MM.dd., E"}
+ d{"y.MM.dd., E - dd., E"}
+ y{"y.MM.dd., E - y.MM.dd., E"}
}
yMMM{
M{"y. MMM-MMM"}
@@ -622,9 +708,9 @@
y{"y. MMM d. - y. MMM d."}
}
yMd{
- M{"yyyy.MM.dd. - MM.dd."}
- d{"yyyy.MM.dd-dd."}
- y{"yyyy.MM.dd. - yyyy.MM.dd."}
+ M{"y.MM.dd. - MM.dd."}
+ d{"y.MM.dd-dd."}
+ y{"y.MM.dd. - y.MM.dd."}
}
}
monthNames{
@@ -902,45 +988,6 @@
}
}
islamic{
- DateTimePatterns{
- "H:mm:ss zzzz",
- "H:mm:ss z",
- "H:mm:ss",
- "H:mm",
- "y. MMMM d., EEEE",
- "y. MMMM d.",
- "yyyy.MM.dd.",
- "yyyy.MM.dd.",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"d E"}
- H{"HH"}
- Hm{"H:mm"}
- Hms{"H:mm:ss"}
- M{"L"}
- MEd{"M. d., E"}
- MMMEd{"MMM. d., E"}
- MMMMd{"MMMM d."}
- MMMd{"MMM d."}
- Md{"M. d."}
- d{"d"}
- h{"a h"}
- hm{"a h:mm"}
- hms{"a h:mm:ss"}
- ms{"mm:ss"}
- y{"y"}
- yM{"y-M"}
- yMEd{"yyyy.MM.dd., E"}
- yMMM{"y MMM"}
- yMMMEd{"y. MMM d., E"}
- yQQQ{"y QQQ"}
- yQQQQ{"y QQQQ"}
- }
eras{
abbreviated{
"MF",
@@ -1010,9 +1057,20 @@
}
}
japanese{
- availableFormats{
- hm{"a h:mm"}
- hms{"a h:mm:ss"}
+ DateTimePatterns{
+ "H:mm:ss zzzz",
+ "H:mm:ss z",
+ "H:mm:ss",
+ "H:mm",
+ "G y. MMMM d., EEEE",
+ "G y. MMMM d.",
+ "G y.MM.dd.",
+ "GGGGG y.MM.dd.",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
}
}
persian{
@@ -1080,11 +1138,6 @@
}
}
roc{
- availableFormats{
- h{"a h"}
- hm{"a h:mm"}
- hms{"a h:mm:ss"}
- }
eras{
abbreviated{
"R.O.C. előtt",
@@ -1099,6 +1152,63 @@
quotationEnd{"”"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"nap"}
+ relative{
+ "-1"{"tegnap"}
+ "-2"{"tegnapelőtt"}
+ "0"{"ma"}
+ "1"{"holnap"}
+ "2"{"holnapután"}
+ }
+ }
+ dayperiod{
+ dn{"napszak"}
+ }
+ era{
+ dn{"éra"}
+ }
+ hour{
+ dn{"óra"}
+ }
+ minute{
+ dn{"perc"}
+ }
+ month{
+ dn{"hónap"}
+ relative{
+ "-1"{"Előző hónap"}
+ "0"{"Ez a hónap"}
+ "1"{"Következő hónap"}
+ }
+ }
+ second{
+ dn{"másodperc"}
+ }
+ week{
+ dn{"hét"}
+ relative{
+ "-1"{"Előző hét"}
+ "0"{"Ez a hét"}
+ "1"{"Következő hét"}
+ }
+ }
+ weekday{
+ dn{"hét napja"}
+ }
+ year{
+ dn{"év"}
+ relative{
+ "-1"{"Előző év"}
+ "0"{"Ez az év"}
+ "1"{"Következő év"}
+ }
+ }
+ zone{
+ dn{"időzóna"}
+ }
+ }
listPattern{
standard{
2{"{0} és {1}"}
diff --git a/data/locales/hu_HU.txt b/data/locales/hu_HU.txt
index 13cae42..b21186e 100644
--- a/data/locales/hu_HU.txt
+++ b/data/locales/hu_HU.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hu_HU.xml
// *
// ***************************************************************************
hu_HU{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/hy.txt b/data/locales/hy.txt
index 96e5d39..17c85a1 100644
--- a/data/locales/hy.txt
+++ b/data/locales/hy.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hy.xml
// *
@@ -10,10 +10,12 @@
* ICU <specials> source: <path>/xml/main/hy.xml
*/
hy{
+ AuxExemplarCharacters{"[]"}
ExemplarCharacters{
- "[֊ ՝ ՜ ՞ ՚ ՛ ՟ ա բ գ դ ե զ է ը թ ժ ի լ խ ծ կ հ ձ ղ ճ մ յ ն շ ո չ պ ջ ռ ս վ տ"
- " ր ց ւ փ ք և օ ֆ]"
+ "[ա բ գ դ ե զ է ը թ ժ ի լ խ ծ կ հ ձ ղ ճ մ յ ն շ ո չ պ ջ ռ ս վ տ ր ց ւ փ ք և օ"
+ " ֆ]"
}
+ ExemplarCharactersPunctuation{"[֊ ՝ ՜ ՞ « » ՚ ՛ ՟]"}
LocaleScript{
"Armn",
}
@@ -24,97 +26,747 @@
currencyFormat{"#0.00 ¤"}
decimalFormat{"#0.###"}
percentFormat{"#0%"}
+ scientificFormat{"#E0"}
+ }
+ patternsLong{
+ decimalFormat{
+ 1000{
+ one{"0 հազար"}
+ other{"0 հազար"}
+ }
+ 10000{
+ one{"00 հազար"}
+ other{"00 հազար"}
+ }
+ 100000{
+ one{"000 հազար"}
+ other{"000 հազար"}
+ }
+ 1000000{
+ one{"0 միլիոն"}
+ other{"0 միլիոն"}
+ }
+ 10000000{
+ one{"00 միլիոն"}
+ other{"00 միլիոն"}
+ }
+ 100000000{
+ one{"000 միլիոն"}
+ other{"000 միլիոն"}
+ }
+ 1000000000{
+ one{"0 միլիարդ"}
+ other{"0 միլիարդ"}
+ }
+ 10000000000{
+ one{"00 բիլիոն"}
+ other{"00 բիլիոն"}
+ }
+ 100000000000{
+ one{"000 բիլիոն"}
+ other{"000 բիլիոն"}
+ }
+ 1000000000000{
+ one{"0 տրիլիոն"}
+ other{"0 տրիլիոն"}
+ }
+ 10000000000000{
+ one{"00 տրիլիոն"}
+ other{"00 տրիլիոն"}
+ }
+ 100000000000000{
+ one{"000 տրիլիոն"}
+ other{"000 տրիլիոն"}
+ }
+ }
+ }
+ patternsShort{
+ decimalFormat{
+ 1000{
+ one{"0K"}
+ other{"0K"}
+ }
+ 10000{
+ one{"00K"}
+ other{"00K"}
+ }
+ 100000{
+ one{"000K"}
+ other{"000K"}
+ }
+ 1000000{
+ one{"0M"}
+ other{"0M"}
+ }
+ 10000000{
+ one{"00M"}
+ other{"00M"}
+ }
+ 100000000{
+ one{"000M"}
+ other{"000M"}
+ }
+ 1000000000{
+ one{"0G"}
+ other{"0G"}
+ }
+ 10000000000{
+ one{"00G"}
+ other{"00G"}
+ }
+ 100000000000{
+ one{"000G"}
+ other{"000G"}
+ }
+ 1000000000000{
+ one{"0T"}
+ other{"0T"}
+ }
+ 10000000000000{
+ one{"00T"}
+ other{"00T"}
+ }
+ 100000000000000{
+ one{"000T"}
+ other{"000T"}
+ }
+ }
}
symbols{
decimal{","}
+ exponential{"E"}
group{"."}
+ infinity{"∞"}
+ list{";"}
+ minusSign{"-"}
+ nan{"NaN"}
+ perMille{"‰"}
+ percentSign{"%"}
+ plusSign{"+"}
}
}
native{"latn"}
traditional{"armn"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.51"}
calendar{
+ generic{
+ DateTimePatterns{
+ "H:mm:ss, zzzz",
+ "H:mm:ss, z",
+ "H:mm:ss",
+ "H:mm",
+ "d MMMM, y թ. G, EEEE",
+ "dd MMMM, y թ. G",
+ "dd MMM, y թ. G",
+ "dd.MM.yy GGGGG",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ }
+ availableFormats{
+ Ed{"d, ccc"}
+ H{"H"}
+ Hm{"H:mm"}
+ Hms{"H:mm:ss"}
+ M{"L"}
+ MEd{"dd.MM, E"}
+ MMM{"LLL"}
+ MMMEd{"d MMM, E"}
+ MMMd{"d MMM"}
+ Md{"dd.MM"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"MM.y"}
+ yMEd{"d.MM.y թ., E"}
+ yMMM{"y թ. LLL"}
+ yMMMEd{"d MMM, y թ., E"}
+ yMMMd{"d MMM, y թ."}
+ yMd{"dd.MM.y"}
+ yQQQ{"y թ, QQQ"}
+ yQQQQ{"y թ, QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"H-H"}
+ }
+ Hm{
+ H{"H:mm-H:mm"}
+ m{"H:mm-H:mm"}
+ }
+ Hmv{
+ H{"H:mm-H:mm v"}
+ m{"H:mm-H:mm v"}
+ }
+ Hv{
+ H{"H-H v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E, dd.MM - E, dd.MM"}
+ d{"E, dd.MM - E, dd.MM"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"E, MMM dd - E, MMM dd"}
+ d{"E, MMM dd - E, MMM dd"}
+ }
+ MMMd{
+ M{"MMM dd - MMM dd"}
+ d{"MMM dd-dd"}
+ }
+ Md{
+ M{"dd.MM - dd.MM"}
+ d{"dd.MM - dd.MM"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h-h a v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"MM.y - MM.y"}
+ y{"MM.y - MM.y"}
+ }
+ yMEd{
+ M{"ccc, dd.MM.y - ccc, dd.MM.y"}
+ d{"ccc, dd.MM.y - ccc, dd.MM.y"}
+ y{"ccc, dd.MM.y - ccc, dd.MM.y"}
+ }
+ yMMM{
+ M{"MMM-MMM y թ."}
+ y{"MMM y - MMM y թ."}
+ }
+ yMMMEd{
+ M{"E, d MMM - E, d MMM, y թ."}
+ d{"E, d MMM - E, d MMM, y թ."}
+ y{"E, d MMM, y - E, d MMM, y թ."}
+ }
+ yMMMM{
+ M{"y թ. MMM – MMM"}
+ y{"MMM y - MMM y թ"}
+ }
+ yMMMd{
+ M{"dd MMM - dd MMM, y թ."}
+ d{"dd-dd MMM, y թ."}
+ y{"dd MMM, y - dd MMM, y թ."}
+ }
+ yMd{
+ M{"dd.MM.y - dd.MM.y"}
+ d{"dd.MM.y - dd.MM.y"}
+ y{"dd.MM.y - dd.MM.y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
- "Առ․",
- "Կե․",
+ "կեսօրից առաջ",
+ "կեսօրից հետո",
}
DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE, MMMM d, y",
- "MMMM dd, y",
- "MMM d, y",
- "MM/dd/yy",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
+ "H:mm:ss, zzzz",
+ "H:mm:ss, z",
+ "H:mm:ss",
+ "H:mm",
+ "d MMMM, y թ., EEEE",
+ "dd MMMM, y թ.",
+ "dd MMM, y թ.",
+ "dd.MM.yy",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ }
+ availableFormats{
+ Ed{"d, ccc"}
+ H{"H"}
+ Hm{"H:mm"}
+ Hms{"H:mm:ss"}
+ M{"L"}
+ MEd{"dd.MM, E"}
+ MMM{"LLL"}
+ MMMEd{"d MMM, E"}
+ MMMd{"d MMM"}
+ Md{"dd.MM"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"MM.y"}
+ yMEd{"d.MM.y թ., E"}
+ yMMM{"y թ. LLL"}
+ yMMMEd{"d MMM, y թ., E"}
+ yMMMd{"d MMM, y թ."}
+ yMd{"dd.MM.y"}
+ yQQQ{"y թ, QQQ"}
+ yQQQQ{"y թ, QQQQ"}
}
dayNames{
format{
abbreviated{
- "Կիր",
- "Երկ",
- "Երք",
- "Չոր",
- "Հնգ",
- "Ուր",
- "Շաբ",
+ "կիր",
+ "երկ",
+ "երք",
+ "չոր",
+ "հնգ",
+ "ուր",
+ "շաբ",
+ }
+ narrow{
+ "Կ",
+ "Ե",
+ "Ե",
+ "Չ",
+ "Հ",
+ "Ու",
+ "Շ",
+ }
+ short{
+ "կիր",
+ "երկ",
+ "երք",
+ "չոր",
+ "հնգ",
+ "ուր",
+ "շաբ",
}
wide{
- "Կիրակի",
- "Երկուշաբթի",
- "Երեքշաբթի",
- "Չորեքշաբթի",
- "Հինգշաբթի",
- "Ուրբաթ",
- "Շաբաթ",
+ "կիրակի",
+ "երկուշաբթի",
+ "երեքշաբթի",
+ "չորեքշաբթի",
+ "հինգշաբթի",
+ "ուրբաթ",
+ "շաբաթ",
+ }
+ }
+ stand-alone{
+ narrow{
+ "Կ",
+ "Ե",
+ "Ե",
+ "Չ",
+ "Հ",
+ "Ու",
+ "Շ",
}
}
}
eras{
abbreviated{
- "Մ․Թ․Ա․",
- "Մ․Թ․",
+ "մ.թ.ա.",
+ "մ.թ.",
+ }
+ }
+ intervalFormats{
+ H{
+ H{"H-H"}
+ }
+ Hm{
+ H{"H:mm-H:mm"}
+ m{"H:mm-H:mm"}
+ }
+ Hmv{
+ H{"H:mm-H:mm v"}
+ m{"H:mm-H:mm v"}
+ }
+ Hv{
+ H{"H-H v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E, dd.MM - E, dd.MM"}
+ d{"E, dd.MM - E, dd.MM"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"E, MMM dd - E, MMM dd"}
+ d{"E, MMM dd - E, MMM dd"}
+ }
+ MMMd{
+ M{"MMM dd - MMM dd"}
+ d{"MMM dd-dd"}
+ }
+ Md{
+ M{"dd.MM - dd.MM"}
+ d{"dd.MM - dd.MM"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h-h a v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"MM.y - MM.y"}
+ y{"MM.y - MM.y"}
+ }
+ yMEd{
+ M{"ccc, dd.MM.y - ccc, dd.MM.y"}
+ d{"ccc, dd.MM.y - ccc, dd.MM.y"}
+ y{"ccc, dd.MM.y - ccc, dd.MM.y"}
+ }
+ yMMM{
+ M{"MMM-MMM y թ."}
+ y{"MMM y - MMM y թ."}
+ }
+ yMMMEd{
+ M{"E, d MMM - E, d MMM, y թ."}
+ d{"E, d MMM - E, d MMM, y թ."}
+ y{"E, d MMM, y - E, d MMM, y թ."}
+ }
+ yMMMM{
+ M{"y թ. MMM – MMM"}
+ y{"MMM y - MMM y թ"}
+ }
+ yMMMd{
+ M{"dd MMM - dd MMM, y թ."}
+ d{"dd-dd MMM, y թ."}
+ y{"dd MMM, y - dd MMM, y թ."}
+ }
+ yMd{
+ M{"dd.MM.y - dd.MM.y"}
+ d{"dd.MM.y - dd.MM.y"}
+ y{"dd.MM.y - dd.MM.y"}
}
}
monthNames{
format{
abbreviated{
- "Հնվ",
- "Փտվ",
- "Մրտ",
- "Ապր",
- "Մյս",
- "Հնս",
- "Հլս",
- "Օգս",
- "Սեպ",
- "Հոկ",
- "Նոյ",
- "Դեկ",
+ "հնվ",
+ "փտվ",
+ "մրտ",
+ "ապր",
+ "մյս",
+ "հնս",
+ "հլս",
+ "օգս",
+ "սեպ",
+ "հոկ",
+ "նոյ",
+ "դեկ",
+ }
+ narrow{
+ "Հ",
+ "Փ",
+ "Մ",
+ "Ա",
+ "Մ",
+ "Հ",
+ "Հ",
+ "Օ",
+ "Ս",
+ "Հ",
+ "Ն",
+ "Դ",
}
wide{
- "Հունվար",
- "Փետրվար",
- "Մարտ",
- "Ապրիլ",
- "Մայիս",
- "Հունիս",
- "Հուլիս",
- "Օգոստոս",
- "Սեպտեմբեր",
- "Հոկտեմբեր",
- "Նոյեմբեր",
- "Դեկտեմբեր",
+ "հունվարի",
+ "փետրվարի",
+ "մարտի",
+ "ապրիլի",
+ "մայիսի",
+ "հունիսի",
+ "հուլիսի",
+ "օգոստոսի",
+ "սեպտեմբերի",
+ "հոկտեմբերի",
+ "նոյեմբերի",
+ "դեկտեմբերի",
+ }
+ }
+ stand-alone{
+ narrow{
+ "Հ",
+ "Փ",
+ "Մ",
+ "Ա",
+ "Մ",
+ "Հ",
+ "Հ",
+ "Օ",
+ "Ս",
+ "Հ",
+ "Ն",
+ "Դ",
}
}
}
+ quarters{
+ format{
+ abbreviated{
+ "1-ին եռմս.",
+ "2-րդ եռմս.",
+ "3-րդ եռմս.",
+ "4-րդ եռմս.",
+ }
+ narrow{
+ "1",
+ "2",
+ "3",
+ "4",
+ }
+ wide{
+ "1-ին եռամսյակ",
+ "2-րդ եռամսյակ",
+ "3-րդ եռամսյակ",
+ "4-րդ եռամսյակ",
+ }
+ }
+ stand-alone{
+ abbreviated{
+ "1-ին եռմս.",
+ "2-րդ եռմս.",
+ "3-րդ եռմս.",
+ "4-րդ եռմս.",
+ }
+ narrow{
+ "1",
+ "2",
+ "3",
+ "4",
+ }
+ wide{
+ "1-ին եռամսյակ",
+ "2-րդ եռամսյակ",
+ "3-րդ եռամսյակ",
+ "4-րդ եռամսյակ",
+ }
+ }
+ }
+ }
+ }
+ delimiters{
+ alternateQuotationEnd{"»"}
+ alternateQuotationStart{"«"}
+ quotationEnd{"»"}
+ quotationStart{"«"}
+ }
+ fields{
+ day{
+ dn{"Օր"}
+ relative{
+ "-1"{"Երեկ"}
+ "-2"{"Երեկ չէ առաջի օրը"}
+ "0"{"Այսօր"}
+ "1"{"Վաղը"}
+ "2"{"Վաղը չէ մյուս օրը"}
+ }
+ }
+ dayperiod{
+ dn{"ԿԱ/ԿՀ"}
+ }
+ era{
+ dn{"Թվարկություն"}
+ }
+ hour{
+ dn{"Ժամ"}
+ }
+ minute{
+ dn{"Րոպե"}
+ }
+ month{
+ dn{"Ամիս"}
+ }
+ second{
+ dn{"Վայրկյան"}
+ }
+ week{
+ dn{"Շաբաթ"}
+ }
+ weekday{
+ dn{"Շաբաթվա օր"}
+ }
+ year{
+ dn{"Տարի"}
+ }
+ zone{
+ dn{"Ժամային գոտի"}
+ }
+ }
+ listPattern{
+ standard{
+ 2{"{0} և {1}"}
+ end{"{0} և {1}"}
+ middle{"{0}, {1}"}
+ start{"{0}, {1}"}
+ }
+ }
+ measurementSystemNames{
+ UK{"Անգլիական"}
+ US{"Ամերիկյան"}
+ metric{"Մետրիկ"}
+ }
+ units{
+ day{
+ one{"{0} օր"}
+ other{"{0} օր"}
+ }
+ day-future{
+ one{"{0} օր անց"}
+ other{"{0} օր անց"}
+ }
+ day-past{
+ one{"{0} օր առաջ"}
+ other{"{0} օր առաջ"}
+ }
+ hour{
+ one{"{0} ժամ"}
+ other{"{0} ժամ"}
+ }
+ hour-future{
+ one{"{0} ժամ անց"}
+ other{"{0} ժամ անց"}
+ }
+ hour-past{
+ one{"{0} ժամ առաջ"}
+ other{"{0} ժամ առաջ"}
+ }
+ minute{
+ one{"{0} րոպե"}
+ other{"{0} րոպե"}
+ }
+ minute-future{
+ one{"{0} րոպե անց"}
+ other{"{0} րոպե անց"}
+ }
+ minute-past{
+ one{"{0} րոպե առաջ"}
+ other{"{0} րոպե առաջ"}
+ }
+ month{
+ one{"{0} ամիս"}
+ other{"{0} ամիս"}
+ }
+ month-future{
+ one{"{0} ամիս անց"}
+ other{"{0} ամիս անց"}
+ }
+ month-past{
+ one{"{0} ամիս առաջ"}
+ other{"{0} ամիս առաջ"}
+ }
+ second{
+ one{"{0} վայրկյան"}
+ other{"{0} վայրկյան"}
+ }
+ second-future{
+ one{"{0} վայրկյան անց"}
+ other{"{0} վայրկյան անց"}
+ }
+ second-past{
+ one{"{0} վայրկյան առաջ"}
+ other{"{0} վայրկյան առաջ"}
+ }
+ week{
+ one{"{0} շաբաթ"}
+ other{"{0} շաբաթ"}
+ }
+ week-future{
+ one{"{0} շաբաթ անց"}
+ other{"{0} շաբաթ անց"}
+ }
+ week-past{
+ one{"{0} շաբաթ առաջ"}
+ other{"{0} շաբաթ առաջ"}
+ }
+ year{
+ one{"{0} տարի"}
+ other{"{0} տարի"}
+ }
+ year-future{
+ one{"{0} տարի անց"}
+ other{"{0} տարի անց"}
+ }
+ year-past{
+ one{"{0} տարի առաջ"}
+ other{"{0} տարի առաջ"}
+ }
+ }
+ unitsShort{
+ day{
+ one{"{0} օր"}
+ other{"{0} օր"}
+ }
+ hour{
+ one{"{0} ժ."}
+ other{"{0} ժամ"}
+ }
+ minute{
+ one{"{0} ր."}
+ other{"{0} ր."}
+ }
+ month{
+ one{"{0} ամս"}
+ other{"{0} ամս"}
+ }
+ second{
+ one{"{0} վրկ"}
+ other{"{0} վրկ"}
+ }
+ week{
+ one{"{0} շբթ."}
+ other{"{0} շբթ."}
+ }
+ year{
+ one{"{0} տ."}
+ other{"{0} տ."}
}
}
}
diff --git a/data/locales/hy_AM.txt b/data/locales/hy_AM.txt
index 0ef0f12..1a1be21 100644
--- a/data/locales/hy_AM.txt
+++ b/data/locales/hy_AM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hy_AM.xml
// *
// ***************************************************************************
hy_AM{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/id.txt b/data/locales/id.txt
index 3450774..d3aed27 100644
--- a/data/locales/id.txt
+++ b/data/locales/id.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/id.xml
// *
@@ -13,7 +13,7 @@
AuxExemplarCharacters{"[å q x z]"}
ExemplarCharacters{"[a b c d e f g h i j k l m n o p q r s t u v w x y z]"}
ExemplarCharactersIndex{"[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]"}
- ExemplarCharactersPunctuation{"[‐ – — , ; \: ! ? . … ' ‘ ’ “ ” ( ) \[ \] /]"}
+ ExemplarCharactersPunctuation{"[‐ – — , ; \\: ! ? . … ' ‘ ’ “ ” ( ) \\[ \\] /]"}
LocaleScript{
"Latn",
}
@@ -119,51 +119,9 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
calendar{
buddhist{
- DateTimePatterns{
- "HH.mm.ss zzzz",
- "HH.mm.ss z",
- "HH.mm.ss",
- "HH.mm",
- "EEEE, dd MMMM y G",
- "d MMMM y G",
- "d MMM y G",
- "dd/MM/y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E, d"}
- H{"HH"}
- Hm{"HH.mm"}
- Hms{"HH.mm.ss"}
- M{"L"}
- MEd{"E, d-M"}
- MMM{"LLL"}
- MMMEd{"E, d MMM"}
- MMMMEd{"E, d MMMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- Md{"d-M"}
- d{"d"}
- h{"h a"}
- hm{"h.mm a"}
- hms{"h.mm.ss a"}
- ms{"mm.ss"}
- y{"G y"}
- yM{"M/y G"}
- yMEd{"E, d/M/y G"}
- yMMM{"MMM y G"}
- yMMMEd{"E, d MMM y G"}
- yMMMd{"d MMM y G"}
- yQQQ{"GGGGG y QQQ"}
- yQQQQ{"G y QQQQ"}
- }
eras{
abbreviated{
"BE",
@@ -577,6 +535,151 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "HH.mm.ss zzzz",
+ "HH.mm.ss z",
+ "HH.mm.ss",
+ "HH.mm",
+ "EEEE, dd MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E, d"}
+ Gy{"G y"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E, d MMM y G"}
+ GyMMMd{"d MMM y G"}
+ H{"HH"}
+ Hm{"HH.mm"}
+ Hms{"HH.mm.ss"}
+ M{"L"}
+ MEd{"E, d/M"}
+ MMM{"LLL"}
+ MMMEd{"E, d MMM"}
+ MMMMEd{"E, d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h.mm a"}
+ hms{"h.mm.ss a"}
+ ms{"mm.ss"}
+ y{"G y"}
+ yyyy{"G y"}
+ yyyyM{"M/y G"}
+ yyyyMEd{"E, d/M/y G"}
+ yyyyMMM{"MMM y G"}
+ yyyyMMMEd{"E, d MMM y G"}
+ yyyyMMMd{"d MMM y G"}
+ yyyyMd{"d/M/y G"}
+ yyyyQQQ{"GGGGG y QQQ"}
+ yyyyQQQQ{"G y QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH.mm–HH.mm"}
+ m{"HH.mm–HH.mm"}
+ }
+ Hmv{
+ H{"HH.mm–HH.mm v"}
+ m{"HH.mm–HH.mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, d/M – E, d/M"}
+ d{"E, d/M – E, d/M"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E, d MMM – E, d MMM"}
+ d{"E, d MMM – E, d MMM"}
+ }
+ MMMd{
+ M{"d MMM – d MMM"}
+ d{"d–d MMM"}
+ }
+ Md{
+ M{"d/M – d/M"}
+ d{"d/M – d/M"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h.mm a – h.mm a"}
+ h{"h.mm–h.mm a"}
+ m{"h.mm–h.mm a"}
+ }
+ hmv{
+ a{"h.mm a – h.mm a v"}
+ h{"h.mm–h.mm a v"}
+ m{"h.mm–h.mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"G y-y"}
+ }
+ yM{
+ M{"M/y – M/y G"}
+ y{"M/y – M/y G"}
+ }
+ yMEd{
+ M{"E, d/M/y – E, d/M/y G"}
+ d{"E, d/M/y – E, d/M/y G"}
+ y{"E, d/M/y – E, d/M/y G"}
+ }
+ yMMM{
+ M{"MMM–MMM y G"}
+ y{"MMM y – MMM y G"}
+ }
+ yMMMEd{
+ M{"E, d MMM – E, d MMM y G"}
+ d{"E, d MMM – E, d MMM y G"}
+ y{"E, d MMM y – E, d MMM y G"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y G"}
+ y{"MMMM y – MMMM y G"}
+ }
+ yMMMd{
+ M{"d MMM – d MMM y G"}
+ d{"d-d MMM y G"}
+ y{"d MMM y – d MMM y G"}
+ }
+ yMd{
+ M{"d/M/y – d/M/y G"}
+ d{"d/M/y – d/M/y G"}
+ y{"d/M/y – d/M/y G"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"AM",
@@ -587,9 +690,9 @@
"HH.mm.ss z",
"HH.mm.ss",
"HH.mm",
- "EEEE, dd MMMM yyyy",
- "d MMMM yyyy",
- "d MMM yyyy",
+ "EEEE, dd MMMM y",
+ "d MMMM y",
+ "d MMM y",
"dd/MM/yy",
"{1} {0}",
"{1} {0}",
@@ -599,6 +702,10 @@
}
availableFormats{
Ed{"E, d"}
+ Gy{"G y"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E, d MMM y G"}
+ GyMMMd{"d MMM y G"}
H{"HH"}
Hm{"HH.mm"}
Hms{"HH.mm.ss"}
@@ -717,63 +824,6 @@
"M",
}
}
- fields{
- day{
- dn{"Hari"}
- relative{
- "-1"{"Kemarin"}
- "-2"{"Kemarin lusa"}
- "0"{"Hari Ini"}
- "1"{"Besok"}
- "2"{"Lusa"}
- }
- }
- dayperiod{
- dn{"Siang/Malam"}
- }
- era{
- dn{"Era"}
- }
- hour{
- dn{"Jam"}
- }
- minute{
- dn{"Menit"}
- }
- month{
- dn{"Bulan"}
- relative{
- "-1"{"Bulan lalu"}
- "0"{"Bulan ini"}
- "1"{"Bulan berikutnya"}
- }
- }
- second{
- dn{"Detik"}
- }
- week{
- dn{"Minggu"}
- relative{
- "-1"{"Minggu lalu"}
- "0"{"Minggu ini"}
- "1"{"Minggu berikutnya"}
- }
- }
- weekday{
- dn{"Hari dalam Seminggu"}
- }
- year{
- dn{"Tahun"}
- relative{
- "-1"{"Tahun lalu"}
- "0"{"Tahun ini"}
- "1"{"Tahun depan"}
- }
- }
- zone{
- dn{"Zona Waktu"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -837,13 +887,13 @@
y{"y-y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E, d/M/yy – E, d/M/yy"}
- d{"E, d/M/yy – E, d/M/yy"}
- y{"E, d/M/yy – E, d/M/yy"}
+ M{"E, d/M/y – E, d/M/y"}
+ d{"E, d/M/y – E, d/M/y"}
+ y{"E, d/M/y – E, d/M/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -864,9 +914,9 @@
y{"d MMM y – d MMM y"}
}
yMd{
- M{"d/M/yy – d/M/yy"}
- d{"d/M/yy – d/M/yy"}
- y{"d/M/yy – d/M/yy"}
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
}
}
monthNames{
@@ -1177,53 +1227,6 @@
}
}
islamic{
- DateTimePatterns{
- "HH.mm.ss zzzz",
- "HH.mm.ss z",
- "HH.mm.ss",
- "HH.mm",
- "EEEE, dd MMMM y G",
- "d MMMM y G",
- "d MMM y G",
- "dd/MM/y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E, d"}
- Gy{"y G"}
- H{"HH"}
- Hm{"HH.mm"}
- Hms{"HH.mm.ss"}
- M{"L"}
- MEd{"E, d-M"}
- MMM{"LLL"}
- MMMEd{"E, d MMM"}
- MMMMEd{"E, d MMMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- Md{"d-M"}
- d{"d"}
- h{"h a"}
- hm{"h.mm a"}
- hms{"h.mm.ss a"}
- ms{"mm.ss"}
- y{"y G"}
- yM{"M/y"}
- yMEd{"E, d/M/y"}
- yMMM{"MMM y"}
- yMMMEd{"E, d MMM y"}
- yQQQ{"QQQ y"}
- yQQQQ{"QQQQ y"}
- yyyyM{"M/y G"}
- yyyyMEd{"E, d/M/y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMd{"d MMM y G"}
- }
eras{
abbreviated{
"AH",
@@ -1321,46 +1324,6 @@
}
}
japanese{
- DateTimePatterns{
- "HH.mm.ss zzzz",
- "HH.mm.ss z",
- "HH.mm.ss",
- "HH.mm",
- "EEEE, dd MMMM y G",
- "d MMMM y G",
- "d MMM y G",
- "dd/MM/y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E, d"}
- H{"HH"}
- Hm{"HH.mm"}
- Hms{"HH.mm.ss"}
- M{"L"}
- MEd{"E, d-M"}
- MMM{"LLL"}
- MMMEd{"E, d MMM"}
- MMMMEd{"E, d MMMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- Md{"d-M"}
- d{"d"}
- h{"h a"}
- hm{"h.mm a"}
- hms{"h.mm.ss a"}
- ms{"mm.ss"}
- y{"G y"}
- yyyyM{"M/y G"}
- yyyyMEd{"E, d/M/y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMd{"d MMM y G"}
- }
eras{
abbreviated{
"Taika (645-650)",
@@ -1385,7 +1348,7 @@
"Daidō (806-810)",
"Kōnin (810-824)",
"Tenchō (824-834)",
- "Shōwa (834-848)",
+ "Jōwa (834-848)",
"Kajō (848-851)",
"Ninju (851-854)",
"Saiko (854-857)",
@@ -1700,46 +1663,6 @@
}
}
roc{
- DateTimePatterns{
- "HH.mm.ss zzzz",
- "HH.mm.ss z",
- "HH.mm.ss",
- "HH.mm",
- "EEEE, dd MMMM y G",
- "d MMMM y G",
- "d MMM y G",
- "dd/MM/y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E, d"}
- H{"HH"}
- Hm{"HH.mm"}
- Hms{"HH.mm.ss"}
- M{"L"}
- MEd{"E, d-M"}
- MMM{"LLL"}
- MMMEd{"E, d MMM"}
- MMMMEd{"E, d MMMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- Md{"d-M"}
- d{"d"}
- h{"h a"}
- hm{"h.mm a"}
- hms{"h.mm.ss a"}
- ms{"mm.ss"}
- y{"G y"}
- yyyyM{"M/y G"}
- yyyyMEd{"E, d/M/y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMd{"d MMM y G"}
- }
eras{
abbreviated{
"Sebelum R.O.C.",
@@ -1754,6 +1677,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Hari"}
+ relative{
+ "-1"{"Kemarin"}
+ "-2"{"Kemarin lusa"}
+ "0"{"Hari Ini"}
+ "1"{"Besok"}
+ "2"{"Lusa"}
+ }
+ }
+ dayperiod{
+ dn{"Siang/Malam"}
+ }
+ era{
+ dn{"Era"}
+ }
+ hour{
+ dn{"Jam"}
+ }
+ minute{
+ dn{"Menit"}
+ }
+ month{
+ dn{"Bulan"}
+ relative{
+ "-1"{"Bulan lalu"}
+ "0"{"Bulan ini"}
+ "1"{"Bulan berikutnya"}
+ }
+ }
+ second{
+ dn{"Detik"}
+ }
+ week{
+ dn{"Minggu"}
+ relative{
+ "-1"{"Minggu lalu"}
+ "0"{"Minggu ini"}
+ "1"{"Minggu berikutnya"}
+ }
+ }
+ weekday{
+ dn{"Hari dalam Seminggu"}
+ }
+ year{
+ dn{"Tahun"}
+ relative{
+ "-1"{"Tahun lalu"}
+ "0"{"Tahun ini"}
+ "1"{"Tahun depan"}
+ }
+ }
+ zone{
+ dn{"Zona Waktu"}
+ }
+ }
listPattern{
standard{
2{"{0} dan {1}"}
diff --git a/data/locales/id_ID.txt b/data/locales/id_ID.txt
index 6c99e52..d490c65 100644
--- a/data/locales/id_ID.txt
+++ b/data/locales/id_ID.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/id_ID.xml
// *
// ***************************************************************************
id_ID{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ig.txt b/data/locales/ig.txt
index 13f9764..9a4dee6 100755
--- a/data/locales/ig.txt
+++ b/data/locales/ig.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ig.xml
// *
@@ -25,8 +25,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"A.M.",
@@ -40,7 +80,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -102,46 +142,6 @@
"Afọ Kristi",
}
}
- fields{
- day{
- dn{"Ụbọchị"}
- relative{
- "-1"{"Nnyaafụ"}
- "0"{"Taata"}
- "1"{"Echi"}
- }
- }
- dayperiod{
- dn{"N'ụtụtụ/N'anyasị"}
- }
- era{
- dn{"Agba"}
- }
- hour{
- dn{"Elekere"}
- }
- minute{
- dn{"Nkeji"}
- }
- month{
- dn{"Ọnwa"}
- }
- second{
- dn{"Nkejinta"}
- }
- week{
- dn{"Izu"}
- }
- weekday{
- dn{"Ụbọchị izu"}
- }
- year{
- dn{"Afọ"}
- }
- zone{
- dn{"Mpaghara oge"}
- }
- }
monthNames{
format{
abbreviated{
@@ -198,4 +198,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Ụbọchị"}
+ relative{
+ "-1"{"Nnyaafụ"}
+ "0"{"Taata"}
+ "1"{"Echi"}
+ }
+ }
+ dayperiod{
+ dn{"N'ụtụtụ/N'anyasị"}
+ }
+ era{
+ dn{"Agba"}
+ }
+ hour{
+ dn{"Elekere"}
+ }
+ minute{
+ dn{"Nkeji"}
+ }
+ month{
+ dn{"Ọnwa"}
+ }
+ second{
+ dn{"Nkejinta"}
+ }
+ week{
+ dn{"Izu"}
+ }
+ weekday{
+ dn{"Ụbọchị izu"}
+ }
+ year{
+ dn{"Afọ"}
+ }
+ zone{
+ dn{"Mpaghara oge"}
+ }
+ }
}
diff --git a/data/locales/ig_NG.txt b/data/locales/ig_NG.txt
index 2b29bcd..75f846a 100755
--- a/data/locales/ig_NG.txt
+++ b/data/locales/ig_NG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ig_NG.xml
// *
// ***************************************************************************
ig_NG{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ii.txt b/data/locales/ii.txt
index 736e3c2..d1dc79c 100755
--- a/data/locales/ii.txt
+++ b/data/locales/ii.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ii.xml
// *
@@ -22,7 +22,7 @@
}
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
calendar{
gregorian{
AmPmMarkers{
@@ -68,48 +68,6 @@
"ꃅꋊꊂ",
}
}
- fields{
- day{
- dn{"ꑍ"}
- relative{
- "-1"{"ꀋꅔꉈ"}
- "-2"{"ꎴꂿꋍꑍ"}
- "0"{"ꀃꑍ"}
- "1"{"ꃆꏂꑍ"}
- "2"{"ꌕꀿꑍ"}
- }
- }
- dayperiod{
- dn{"ꎸꄑ/ꁯꋒ"}
- }
- era{
- dn{"ꃅꋊ"}
- }
- hour{
- dn{"ꄮꈉ"}
- }
- minute{
- dn{"ꃏ"}
- }
- month{
- dn{"ꆪ"}
- }
- second{
- dn{"ꇙ"}
- }
- week{
- dn{"ꑭꆏ"}
- }
- weekday{
- dn{"ꆏꑍ"}
- }
- year{
- dn{"ꈎ"}
- }
- zone{
- dn{"ꃅꄷꄮꈉ"}
- }
- }
monthNames{
format{
wide{
@@ -140,6 +98,48 @@
}
}
}
+ fields{
+ day{
+ dn{"ꑍ"}
+ relative{
+ "-1"{"ꀋꅔꉈ"}
+ "-2"{"ꎴꂿꋍꑍ"}
+ "0"{"ꀃꑍ"}
+ "1"{"ꃆꏂꑍ"}
+ "2"{"ꌕꀿꑍ"}
+ }
+ }
+ dayperiod{
+ dn{"ꎸꄑ/ꁯꋒ"}
+ }
+ era{
+ dn{"ꃅꋊ"}
+ }
+ hour{
+ dn{"ꄮꈉ"}
+ }
+ minute{
+ dn{"ꃏ"}
+ }
+ month{
+ dn{"ꆪ"}
+ }
+ second{
+ dn{"ꇙ"}
+ }
+ week{
+ dn{"ꑭꆏ"}
+ }
+ weekday{
+ dn{"ꆏꑍ"}
+ }
+ year{
+ dn{"ꈎ"}
+ }
+ zone{
+ dn{"ꃅꄷꄮꈉ"}
+ }
+ }
measurementSystemNames{
US{"ꂰꇩ"}
metric{"ꂰꌬꌠ"}
diff --git a/data/locales/ii_CN.txt b/data/locales/ii_CN.txt
index 00a70cb..33fa73d 100755
--- a/data/locales/ii_CN.txt
+++ b/data/locales/ii_CN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ii_CN.xml
// *
// ***************************************************************************
ii_CN{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/in.txt b/data/locales/in.txt
index cb3e2e0..2a3360a 100644
--- a/data/locales/in.txt
+++ b/data/locales/in.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/in_ID.txt b/data/locales/in_ID.txt
index d22885f..bc2b4af 100755
--- a/data/locales/in_ID.txt
+++ b/data/locales/in_ID.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/is.txt b/data/locales/is.txt
index ba4fc1d..e7bb2c8 100644
--- a/data/locales/is.txt
+++ b/data/locales/is.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/is.xml
// *
@@ -142,22 +142,18 @@
}
}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
- AmPmMarkers{
- "f.h.",
- "e.h.",
- }
+ generic{
DateTimePatterns{
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE, d. MMMM y",
- "d. MMMM y",
- "d.M.yyyy",
- "d.M.yyyy",
+ "EEEE, d. MMMM y G",
+ "d. MMMM y G",
+ "d.M.y G",
+ "d.M.y GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -183,7 +179,7 @@
hms{"h:mm:ss a"}
ms{"mm:ss"}
y{"y"}
- yM{"M. yyyy"}
+ yM{"M. y"}
yMEd{"E d/M/y"}
yMMM{"MMM y"}
yMMMEd{"E d. MMM y"}
@@ -192,8 +188,154 @@
yMd{"d/M/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyyyM{"M.yyyy"}
- yyyyMMMM{"MMMM y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, d.M – E, d.M"}
+ d{"E, d.M – E, d.M"}
+ }
+ MMM{
+ M{"LLL–LLL"}
+ }
+ MMMEd{
+ M{"E, d. MMM – E, d. MMM"}
+ d{"E, d. – E, d. MMM"}
+ }
+ MMMM{
+ M{"LLLL–LLLL"}
+ }
+ MMMd{
+ M{"d. MMM – d. MMM"}
+ d{"d.–d. MMM"}
+ }
+ Md{
+ M{"d.M–d.M"}
+ d{"d.M–d.M"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"M.y – M.y"}
+ y{"M.y – M.y"}
+ }
+ yMEd{
+ M{"E, d.M.y – E, d.M.y"}
+ d{"E, d.M.y – E, d.M.y"}
+ y{"E, d.M.y – E, d.M.y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y – MMM y"}
+ }
+ yMMMEd{
+ M{"E, d. MMM – E, d. MMM y"}
+ d{"E, d. – E, d. MMM y"}
+ y{"E, d. MMM y – E, d. MMM y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"d. MMM – d. MMM y"}
+ d{"d.–d. MMM y"}
+ y{"d. MMM y – d. MMM y"}
+ }
+ yMd{
+ M{"d.M.y – d.M.y"}
+ d{"d.M.y – d.M.y"}
+ y{"d.M.y – d.M.y"}
+ }
+ }
+ }
+ gregorian{
+ AmPmMarkers{
+ "f.h.",
+ "e.h.",
+ }
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d. MMMM y",
+ "d. MMMM y",
+ "d.M.y",
+ "d.M.y",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"e d."}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L."}
+ MEd{"E d.M."}
+ MMM{"LLL"}
+ MMMEd{"E d. MMM"}
+ MMMMEd{"E d. MMMM"}
+ MMMMd{"d. MMMM"}
+ MMMd{"d. MMM"}
+ Md{"d.M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M. y"}
+ yMEd{"E d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d. MMM y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM, y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
}
dayNames{
format{
@@ -265,63 +407,6 @@
"e.k.",
}
}
- fields{
- day{
- dn{"dagur"}
- relative{
- "-1"{"í gær"}
- "-2"{"fyrir tveimur dögum"}
- "0"{"í dag"}
- "1"{"á morgun"}
- "2"{"eftir tvo daga"}
- }
- }
- dayperiod{
- dn{"f.h./e.h."}
- }
- era{
- dn{"tímabil"}
- }
- hour{
- dn{"klukkustund"}
- }
- minute{
- dn{"mínúta"}
- }
- month{
- dn{"mánuður"}
- relative{
- "-1"{"Í síðasta mánuði"}
- "0"{"Í þessum mánuði"}
- "1"{"Í næsta mánuði"}
- }
- }
- second{
- dn{"sekúnda"}
- }
- week{
- dn{"vika"}
- relative{
- "-1"{"Í síðustu viku"}
- "0"{"Í þessari viku"}
- "1"{"Í næstu viku"}
- }
- }
- weekday{
- dn{"vikudagur"}
- }
- year{
- dn{"ár"}
- relative{
- "-1"{"Á síðasta ári"}
- "0"{"Á þessu ári"}
- "1"{"Á næsta ári"}
- }
- }
- zone{
- dn{"svæði"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -388,13 +473,13 @@
y{"y–y"}
}
yM{
- M{"M.yyyy – M.yyyy"}
- y{"M.yyyy – M.yyyy"}
+ M{"M.y – M.y"}
+ y{"M.y – M.y"}
}
yMEd{
- M{"E, d.M.yyyy – E, d.M.yyyy"}
- d{"E, d.M.yyyy – E, d.M.yyyy"}
- y{"E, d.M.yyyy – E, d.M.yyyy"}
+ M{"E, d.M.y – E, d.M.y"}
+ d{"E, d.M.y – E, d.M.y"}
+ y{"E, d.M.y – E, d.M.y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -415,9 +500,9 @@
y{"d. MMM y – d. MMM y"}
}
yMd{
- M{"d.M.yyyy – d.M.yyyy"}
- d{"d.M.yyyy – d.M.yyyy"}
- y{"d.M.yyyy – d.M.yyyy"}
+ M{"d.M.y – d.M.y"}
+ d{"d.M.y – d.M.y"}
+ y{"d.M.y – d.M.y"}
}
}
monthNames{
@@ -532,6 +617,63 @@
quotationEnd{"“"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"dagur"}
+ relative{
+ "-1"{"í gær"}
+ "-2"{"fyrir tveimur dögum"}
+ "0"{"í dag"}
+ "1"{"á morgun"}
+ "2"{"eftir tvo daga"}
+ }
+ }
+ dayperiod{
+ dn{"f.h./e.h."}
+ }
+ era{
+ dn{"tímabil"}
+ }
+ hour{
+ dn{"klukkustund"}
+ }
+ minute{
+ dn{"mínúta"}
+ }
+ month{
+ dn{"mánuður"}
+ relative{
+ "-1"{"Í síðasta mánuði"}
+ "0"{"Í þessum mánuði"}
+ "1"{"Í næsta mánuði"}
+ }
+ }
+ second{
+ dn{"sekúnda"}
+ }
+ week{
+ dn{"vika"}
+ relative{
+ "-1"{"Í síðustu viku"}
+ "0"{"Í þessari viku"}
+ "1"{"Í næstu viku"}
+ }
+ }
+ weekday{
+ dn{"vikudagur"}
+ }
+ year{
+ dn{"ár"}
+ relative{
+ "-1"{"Á síðasta ári"}
+ "0"{"Á þessu ári"}
+ "1"{"Á næsta ári"}
+ }
+ }
+ zone{
+ dn{"svæði"}
+ }
+ }
listPattern{
standard{
2{"{0} og {1}"}
diff --git a/data/locales/is_IS.txt b/data/locales/is_IS.txt
index f1050e4..6b1bc0f 100644
--- a/data/locales/is_IS.txt
+++ b/data/locales/is_IS.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/is_IS.xml
// *
// ***************************************************************************
is_IS{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/it.txt b/data/locales/it.txt
index 26381e6..2e0d88c 100644
--- a/data/locales/it.txt
+++ b/data/locales/it.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/it.xml
// *
@@ -13,7 +13,7 @@
AuxExemplarCharacters{"[á â å ä ã æ ç ê ë í î ï ñ ô ö õ ø œ ß ú û ü ÿ]"}
ExemplarCharacters{"[a à b c d e é è f g h i ì j k l m n o ó ò p q r s t u ù v w x y z]"}
ExemplarCharactersIndex{"[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]"}
- ExemplarCharactersPunctuation{"[\- — , ; \: ! ? . … “ ” ( ) \[ \] \{ \} @ /]"}
+ ExemplarCharactersPunctuation{"[\\- — , ; \\: ! ? . … “ ” ( ) \\[ \\] \\{ \\} @ /]"}
LocaleScript{
"Latn",
}
@@ -143,9 +143,33 @@
}
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
+ eras{
+ abbreviated{
+ "EB",
+ }
+ }
+ }
+ chinese{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM U",
+ "dd MMMM U",
+ "dd/MMM U",
+ "dd/MM/yy",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
+ generic{
DateTimePatterns{
"HH:mm:ss zzzz",
"HH:mm:ss z",
@@ -154,7 +178,7 @@
"EEEE d MMMM y G",
"dd MMMM y G",
"dd/MMM/y G",
- "dd/MM/y G",
+ "dd/MM/yy GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -164,15 +188,17 @@
availableFormats{
Ed{"E d"}
Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E d MMM y G"}
+ GyMMMd{"d MMM y G"}
+ H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
M{"L"}
MEd{"E d/M"}
MMM{"LLL"}
MMMEd{"E d MMM"}
- MMMMdd{"dd MMMM"}
MMMd{"d MMM"}
- MMdd{"dd/MM"}
Md{"d/M"}
d{"d"}
h{"hh a"}
@@ -180,22 +206,110 @@
hms{"hh:mm:ss a"}
ms{"mm:ss"}
y{"y G"}
- yM{"M/y G"}
- yMEd{"E, d/M/y G"}
- yMMM{"MMM y G"}
- yMMMEd{"E d MMM y G"}
- yMMMd{"d MMM y G"}
- yMd{"d/M/y G"}
- yQQQ{"QQQ y G"}
- yQQQQ{"QQQQ y G"}
- yyMM{"MM/y G"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ y G"}
+ yyyy{"y G"}
+ yyyyM{"M/y GGGGG"}
+ yyyyMEd{"E d/M/y GGGGG"}
+ yyyyMMM{"MMM y G"}
+ yyyyMMMEd{"E d MMM y G"}
yyyyMMMM{"MMMM y G"}
+ yyyyMMMd{"d MMM y G"}
+ yyyyMd{"d/M/y GGGGG"}
+ yyyyQQQ{"QQQ y G"}
+ yyyyQQQQ{"QQQQ y G"}
}
- eras{
- abbreviated{
- "EB",
+ intervalFormats{
+ H{
+ H{"HH-HH"}
+ }
+ Hm{
+ H{"HH:mm-HH:mm"}
+ m{"HH:mm-HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm-HH:mm v"}
+ m{"HH:mm-HH:mm v"}
+ }
+ Hv{
+ H{"HH-HH v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E dd/MM - E dd/MM"}
+ d{"E dd/MM - E dd/MM"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"E dd MMM - E dd MMM"}
+ d{"E dd - E dd MMM"}
+ }
+ MMMd{
+ M{"dd MMM - dd MMM"}
+ d{"dd-dd MMM"}
+ }
+ Md{
+ M{"dd/MM - dd/MM"}
+ d{"dd/MM - dd/MM"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a - h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h:mm a - h:mm a"}
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ a{"h:mm a - h:mm a v"}
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"h a - h a v"}
+ h{"h-h a v"}
+ }
+ y{
+ y{"y-y G"}
+ }
+ yM{
+ M{"MM/y - MM/y G"}
+ y{"MM/y - MM/y G"}
+ }
+ yMEd{
+ M{"E dd/MM/y - E dd/MM/y G"}
+ d{"E dd/MM/y - E dd/MM/y G"}
+ y{"E dd/MM/y - E dd/MM/y G"}
+ }
+ yMMM{
+ M{"MMM-MMM y G"}
+ y{"MMM y - MMM y G"}
+ }
+ yMMMEd{
+ M{"E d MMM - E d MMM y G"}
+ d{"E d - E d MMM y G"}
+ y{"E d MMM y - E d MMM y G"}
+ }
+ yMMMM{
+ M{"MMMM-MMMM y G"}
+ y{"MMMM y - MMMM y G"}
+ }
+ yMMMd{
+ M{"dd MMM - dd MMM y G"}
+ d{"dd-dd MMM y G"}
+ y{"dd MMM y - dd MMM y G"}
+ }
+ yMd{
+ M{"dd/MM/y - dd/MM/y G"}
+ d{"dd/MM/y - dd/MM/y G"}
+ y{"dd/MM/y - dd/MM/y G"}
}
}
}
@@ -221,6 +335,10 @@
}
availableFormats{
Ed{"E d"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E d MMM y G"}
+ GyMMMd{"d MMM y G"}
H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -228,9 +346,7 @@
MEd{"E d/M"}
MMM{"LLL"}
MMMEd{"E d MMM"}
- MMMMdd{"dd MMMM"}
MMMd{"d MMM"}
- MMdd{"dd/MM"}
Md{"d/M"}
d{"d"}
h{"hh a"}
@@ -242,13 +358,11 @@
yMEd{"E d/M/y"}
yMMM{"MMM y"}
yMMMEd{"E d MMM y"}
+ yMMMM{"MMMM y"}
yMMMd{"d MMM y"}
yMd{"d/M/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"MM/yy"}
- yyQQQQ{"QQQQ yy"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -320,63 +434,6 @@
"d.C",
}
}
- fields{
- day{
- dn{"giorno"}
- relative{
- "-1"{"ieri"}
- "-2"{"l'altro ieri"}
- "0"{"oggi"}
- "1"{"domani"}
- "2"{"dopodomani"}
- }
- }
- dayperiod{
- dn{"periodo del giorno"}
- }
- era{
- dn{"era"}
- }
- hour{
- dn{"ora"}
- }
- minute{
- dn{"minuto"}
- }
- month{
- dn{"mese"}
- relative{
- "-1"{"Mese scorso"}
- "0"{"Questo mese"}
- "1"{"Mese prossimo"}
- }
- }
- second{
- dn{"secondo"}
- }
- week{
- dn{"settimana"}
- relative{
- "-1"{"Settimana scorsa"}
- "0"{"Questa settimana"}
- "1"{"Settimana prossima"}
- }
- }
- weekday{
- dn{"giorno della settimana"}
- }
- year{
- dn{"anno"}
- relative{
- "-1"{"Anno scorso"}
- "0"{"Questo anno"}
- "1"{"Anno prossimo"}
- }
- }
- zone{
- dn{"zona"}
- }
- }
intervalFormats{
H{
H{"HH-HH"}
@@ -440,13 +497,13 @@
y{"y-y"}
}
yM{
- M{"MM/yy - MM/yy"}
- y{"MM/yy - MM/yy"}
+ M{"MM/y - MM/y"}
+ y{"MM/y - MM/y"}
}
yMEd{
- M{"E dd/MM/yy - E dd/MM/yy"}
- d{"E dd/MM/yy - E dd/MM/yy"}
- y{"E dd/MM/yy - E dd/MM/yy"}
+ M{"E dd/MM/y - E dd/MM/y"}
+ d{"E dd/MM/y - E dd/MM/y"}
+ y{"E dd/MM/y - E dd/MM/y"}
}
yMMM{
M{"MMM-MMM y"}
@@ -467,9 +524,9 @@
y{"dd MMM y - dd MMM y"}
}
yMd{
- M{"dd/MM/yy - dd/MM/yy"}
- d{"dd/MM/yy - dd/MM/yy"}
- y{"dd/MM/yy - dd/MM/yy"}
+ M{"dd/MM/y - dd/MM/y"}
+ d{"dd/MM/y - dd/MM/y"}
+ y{"dd/MM/y - dd/MM/y"}
}
}
monthNames{
@@ -605,54 +662,18 @@
}
}
}
- islamic{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE d MMMM y G",
- "dd MMMM y G",
- "dd/MMM/y G",
- "dd/MM/y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
+ hebrew{
+ eras{
+ abbreviated{
+ "AM",
+ }
}
- availableFormats{
- Ed{"E d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E d/M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMdd{"dd MMMM"}
- MMMd{"d MMM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d"}
- h{"hh a"}
- hm{"hh:mm a"}
- hms{"hh:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yQQQ{"QQQ y G"}
- yQQQQ{"QQQQ y G"}
- yyMM{"MM/y G"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ y G"}
- yyyy{"y G"}
- yyyyM{"M/y G"}
- yyyyMEd{"E, d/M/y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E d MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"d/M/y G"}
+ }
+ islamic{
+ eras{
+ abbreviated{
+ "AH",
+ }
}
}
japanese{
@@ -664,95 +685,20 @@
"EEEE d MMMM y G",
"dd MMMM y G",
"dd/MMM/y G",
- "dd/MM/y G",
+ "dd/MM/yy GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
- availableFormats{
- Ed{"E d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E d/M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMdd{"dd MMMM"}
- MMMd{"d MMM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d"}
- h{"hh a"}
- hm{"hh:mm a"}
- hms{"hh:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yQQQ{"QQQ y G"}
- yQQQQ{"QQQQ y G"}
- yyMM{"MM/y G"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ y G"}
- yyyy{"y G"}
- yyyyM{"M/y G"}
- yyyyMEd{"E, d/M/y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E d MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"d/M/y G"}
- }
}
roc{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE d MMMM y G",
- "dd MMMM y G",
- "dd/MMM/y G",
- "dd/MM/y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E d/M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMdd{"dd MMMM"}
- MMMd{"d MMM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d"}
- h{"hh a"}
- hm{"hh:mm a"}
- hms{"hh:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yQQQ{"QQQ y G"}
- yQQQQ{"QQQQ y G"}
- yyMM{"MM/y G"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ y G"}
- yyyy{"y G"}
- yyyyM{"M/y G"}
- yyyyMEd{"E, d/M/y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E d MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"d/M/y G"}
+ eras{
+ abbreviated{
+ "Prima della R.O.C.",
+ "Minguo",
+ }
}
}
}
@@ -784,6 +730,63 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"giorno"}
+ relative{
+ "-1"{"ieri"}
+ "-2"{"l'altro ieri"}
+ "0"{"oggi"}
+ "1"{"domani"}
+ "2"{"dopodomani"}
+ }
+ }
+ dayperiod{
+ dn{"periodo del giorno"}
+ }
+ era{
+ dn{"era"}
+ }
+ hour{
+ dn{"ora"}
+ }
+ minute{
+ dn{"minuto"}
+ }
+ month{
+ dn{"mese"}
+ relative{
+ "-1"{"Mese scorso"}
+ "0"{"Questo mese"}
+ "1"{"Mese prossimo"}
+ }
+ }
+ second{
+ dn{"secondo"}
+ }
+ week{
+ dn{"settimana"}
+ relative{
+ "-1"{"Settimana scorsa"}
+ "0"{"Questa settimana"}
+ "1"{"Settimana prossima"}
+ }
+ }
+ weekday{
+ dn{"giorno della settimana"}
+ }
+ year{
+ dn{"anno"}
+ relative{
+ "-1"{"Anno scorso"}
+ "0"{"Questo anno"}
+ "1"{"Anno prossimo"}
+ }
+ }
+ zone{
+ dn{"zona"}
+ }
+ }
listPattern{
standard{
2{"{0} e {1}"}
diff --git a/data/locales/it_CH.txt b/data/locales/it_CH.txt
index e8a539b..368a797 100644
--- a/data/locales/it_CH.txt
+++ b/data/locales/it_CH.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/it_CH.xml
// *
@@ -18,8 +18,25 @@
}
}
}
- Version{"2.0.74.64"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH.mm:ss 'h' zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d-MMM-y G",
+ "dd.MM.yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
gregorian{
DateTimePatterns{
"HH.mm:ss 'h' zzzz",
diff --git a/data/locales/it_IT.txt b/data/locales/it_IT.txt
index 86e5a57..5b7c470 100644
--- a/data/locales/it_IT.txt
+++ b/data/locales/it_IT.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/it_IT.xml
// *
// ***************************************************************************
it_IT{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/it_SM.txt b/data/locales/it_SM.txt
index 4237d5b..5dc070b 100755
--- a/data/locales/it_SM.txt
+++ b/data/locales/it_SM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/it_SM.xml
// *
// ***************************************************************************
it_SM{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/iw.txt b/data/locales/iw.txt
index c10c184..8352a34 100644
--- a/data/locales/iw.txt
+++ b/data/locales/iw.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/iw_IL.txt b/data/locales/iw_IL.txt
index 6963f2d..5a4954b 100644
--- a/data/locales/iw_IL.txt
+++ b/data/locales/iw_IL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/ja.txt b/data/locales/ja.txt
index e48b88a..81ff619 100644
--- a/data/locales/ja.txt
+++ b/data/locales/ja.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ja.xml
// *
@@ -69,9 +69,9 @@
}
ExemplarCharactersIndex{"[あ か さ た な は ま や ら わ]"}
ExemplarCharactersPunctuation{
- "[‾ _＿ \-－ ‐ — ― 〜 ・ ･ ,， 、､ ;； \:： !！ ?？ .． ‥ … 。｡ ＇＼ ‘ ’ \"＂ “ ” (（ )） \[［ "
- "\]］ \{｛ \}｝ 〈 〉 《 》 「｢ 」｣ 『 』 【 】 〔 〕 ‖ § ¶ @＠ *＊ /／ \\ \&＆ #＃ %％ ‰ † ‡ ′ ″ "
- "〃 ※]"
+ "[‾ _＿ \\-－ ‐ — ― 〜 ・ ･ ,， 、､ ;； \\:： !！ ?？ .． ‥ … 。｡ ＇＼ ‘ ’ \u0022＂ “ ” (（ )"
+ "） \\[［ \\]］ \\{｛ \\}｝ 〈 〉 《 》 「｢ 」｣ 『 』 【 】 〔 〕 ‖ § ¶ @＠ *＊ /／ \\\\ \\&＆ #＃ "
+ "%％ ‰ † ‡ ′ ″ 〃 ※]"
}
LocaleScript{
"Kana",
@@ -184,7 +184,7 @@
native{"latn"}
traditional{"jpan"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
calendar{
buddhist{
DateTimePatterns{
@@ -205,18 +205,22 @@
availableFormats{
EEEEd{"d日EEEE"}
Ed{"d日(E)"}
- GGGGyMd{"GGGGy年M月d日"}
- Gy{"Gy年"}
+ Gy{"GGGGy年"}
+ GyMMM{"GGGGy年M月"}
+ GyMMMEEEEd{"GGGGy年M月d日EEEE"}
+ GyMMMEd{"GGGGy年M月d日(E)"}
+ GyMMMd{"GGGGy年M月d日"}
+ GyMd{"GGGGy年M月d日"}
H{"H時"}
Hm{"H:mm"}
Hms{"H:mm:ss"}
M{"M月"}
+ MEEEEd{"M/dEEEE"}
MEd{"M/d(E)"}
MMM{"M月"}
MMMEEEEd{"M月d日EEEE"}
MMMEd{"M月d日(E)"}
MMMd{"M月d日"}
- MMdd{"MM/dd"}
Md{"M/d"}
d{"d日"}
h{"aK時"}
@@ -224,22 +228,18 @@
hms{"aK:mm:ss"}
ms{"mm:ss"}
y{"GGGGy年"}
- yM{"GGGGy年M月"}
- yMEd{"GGGGy年M/d(E)"}
- yMMM{"GGGGy年M月"}
- yMMMEEEEd{"GGGGy年M月d日EEEE"}
- yMMMEd{"GGGGy年M月d日(E)"}
- yQQQ{"GGGGy QQQ"}
- yQQQQ{"GGGGy第Q四半期"}
yyyy{"GGGGy年"}
- yyyyMEd{"Gy/M/d(E)"}
+ yyyyM{"GGGGy年M月"}
+ yyyyMEEEEd{"GGGGy年M/dEEEE"}
+ yyyyMEd{"GGGGy年M/d(E)"}
yyyyMM{"Gy/MM"}
yyyyMMM{"GGGGy年M月"}
yyyyMMMEEEEd{"GGGGy年M月d日EEEE"}
yyyyMMMEd{"GGGGy年M月d日(E)"}
yyyyMMMd{"GGGGy年M月d日"}
yyyyMd{"Gy/M/d"}
- yyyyQQQ{"Gy/QQQ"}
+ yyyyQQQ{"GGGGy QQQ"}
+ yyyyQQQQ{"GGGGy第Q四半期"}
}
eras{
abbreviated{
@@ -278,24 +278,38 @@
availableFormats{
EEEEd{"d日EEEE"}
Ed{"d日(E)"}
+ Gy{"U年"}
+ GyMMM{"U年MMM"}
+ GyMMMEEEEd{"U年MMMd日EEEE"}
+ GyMMMEd{"U年MMMd日(E)"}
+ GyMMMd{"U年MMMd日"}
+ H{"H時"}
+ Hm{"H:mm"}
+ Hms{"H:mm:ss"}
M{"MMM"}
+ MEEEEd{"M/dEEEE"}
MEd{"M/d(E)"}
MMMEEEEd{"MMMd日EEEE"}
MMMEd{"MMMd日(E)"}
MMMd{"MMMd日"}
Md{"M/d"}
d{"d日"}
+ h{"aK時"}
+ hm{"aK:mm"}
+ hms{"aK:mm:ss"}
y{"U年"}
- yM{"U年M月"}
- yMEEEEd{"U年M月d日EEEE"}
- yMEd{"U年M月d日(E)"}
- yMMM{"U年MMM"}
- yMMMEEEEd{"U年MMMd日EEEE"}
- yMMMEd{"U年MMMd日(E)"}
- yMMMd{"U年MMMd日"}
yMd{"U年M月d日"}
- yQQQ{"U/QQQ"}
- yQQQQ{"UQQQQ"}
+ yyyy{"U年"}
+ yyyyM{"U年M月"}
+ yyyyMEEEEd{"U年M月d日EEEE"}
+ yyyyMEd{"U年M月d日(E)"}
+ yyyyMMM{"U年MMM"}
+ yyyyMMMEEEEd{"U年MMMd日EEEE"}
+ yyyyMMMEd{"U年MMMd日(E)"}
+ yyyyMMMd{"U年MMMd日"}
+ yyyyMd{"U年M月d日"}
+ yyyyQQQ{"U/QQQ"}
+ yyyyQQQQ{"UQQQQ"}
}
cyclicNameSets{
dayParts{
@@ -761,6 +775,158 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "H時mm分ss秒 zzzz",
+ "H:mm:ss z",
+ "H:mm:ss",
+ "H:mm",
+ "Gy年M月d日EEEE",
+ "Gy年M月d日",
+ "Gy/MM/dd",
+ "Gy/MM/dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ EEEEd{"d日EEEE"}
+ Ed{"d日(E)"}
+ Gy{"Gy年"}
+ GyMMM{"Gy年M月"}
+ GyMMMEEEEd{"Gy年M月d日EEEE"}
+ GyMMMEd{"Gy年M月d日(E)"}
+ GyMMMd{"Gy年M月d日"}
+ H{"H時"}
+ Hm{"H:mm"}
+ Hms{"H:mm:ss"}
+ M{"M月"}
+ MEEEEd{"M/dEEEE"}
+ MEd{"M/d(E)"}
+ MMM{"M月"}
+ MMMEEEEd{"M月d日EEEE"}
+ MMMEd{"M月d日(E)"}
+ MMMd{"M月d日"}
+ Md{"M/d"}
+ d{"d日"}
+ h{"aK時"}
+ hm{"aK:mm"}
+ hms{"aK:mm:ss"}
+ ms{"mm:ss"}
+ y{"Gy年"}
+ yyyy{"Gy年"}
+ yyyyM{"Gy/M"}
+ yyyyMEEEEd{"Gy/M/dEEEE"}
+ yyyyMEd{"Gy/M/d(E)"}
+ yyyyMMM{"Gy年M月"}
+ yyyyMMMEEEEd{"Gy年M月d日EEEE"}
+ yyyyMMMEd{"Gy年M月d日(E)"}
+ yyyyMMMd{"Gy年M月d日"}
+ yyyyMd{"Gy/M/d"}
+ yyyyQQQ{"Gy/QQQ"}
+ yyyyQQQQ{"GyQQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"H時～H時"}
+ }
+ Hm{
+ H{"H時mm分～H時mm分"}
+ m{"H時mm分～H時mm分"}
+ }
+ Hmv{
+ H{"H時mm分～H時mm分(v)"}
+ m{"H時mm分～H時mm分(v)"}
+ }
+ Hv{
+ H{"H時～H時(v)"}
+ }
+ M{
+ M{"M月～M月"}
+ }
+ MEd{
+ M{"MM/dd(E)～MM/dd(E)"}
+ d{"MM/dd(E)～MM/dd(E)"}
+ }
+ MMM{
+ M{"M月～M月"}
+ }
+ MMMEd{
+ M{"M月d日(E)～M月d日(E)"}
+ d{"M月d日(E)～d日(E)"}
+ }
+ MMMM{
+ M{"M月～M月"}
+ }
+ MMMd{
+ M{"M月d日～M月d日"}
+ d{"M月d日～d日"}
+ }
+ Md{
+ M{"MM/dd～MM/dd"}
+ d{"MM/dd～MM/dd"}
+ }
+ d{
+ d{"d日～d日"}
+ }
+ fallback{"{0}～{1}"}
+ h{
+ a{"aK時～aK時"}
+ h{"aK時～K時"}
+ }
+ hm{
+ a{"aK時mm分～aK時mm分"}
+ h{"aK時mm分～K時mm分"}
+ m{"aK時mm分～K時mm分"}
+ }
+ hmv{
+ a{"aK時mm分～aK時mm分(v)"}
+ h{"aK時mm分～K時mm分(v)"}
+ m{"aK時mm分～K時mm分(v)"}
+ }
+ hv{
+ a{"aK時～aK時(v)"}
+ h{"aK時～K時(v)"}
+ }
+ y{
+ y{"Gy年～y年"}
+ }
+ yM{
+ M{"Gy/MM～y/MM"}
+ y{"Gy/MM～y/MM"}
+ }
+ yMEd{
+ M{"Gy/MM/dd(E)～y/MM/dd(E)"}
+ d{"Gy/MM/dd(E)～y/MM/dd(E)"}
+ y{"Gy/MM/dd(E)～y/MM/dd(E)"}
+ }
+ yMMM{
+ M{"Gy年M月～M月"}
+ y{"Gy年M月～y年M月"}
+ }
+ yMMMEd{
+ M{"Gy年M月d日(E)～M月d日(E)"}
+ d{"Gy年M月d日(E)～d日(E)"}
+ y{"Gy年M月d日(E)～y年M月d日(E)"}
+ }
+ yMMMM{
+ M{"Gy年M月～M月"}
+ y{"Gy年M月～y年M月"}
+ }
+ yMMMd{
+ M{"Gy年M月d日～M月d日"}
+ d{"Gy年M月d日～d日"}
+ y{"Gy年M月d日～y年M月d日"}
+ }
+ yMd{
+ M{"Gy/MM/dd～y/MM/dd"}
+ d{"Gy/MM/dd～y/MM/dd"}
+ y{"Gy/MM/dd～y/MM/dd"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"午前",
@@ -773,8 +939,8 @@
"H:mm",
"y年M月d日EEEE",
"y年M月d日",
- "yyyy/MM/dd",
- "yyyy/MM/dd",
+ "y/MM/dd",
+ "y/MM/dd",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -784,17 +950,21 @@
availableFormats{
EEEEd{"d日EEEE"}
Ed{"d日(E)"}
- GGGGyMd{"GGGGy年M月d日"}
+ Gy{"Gy年"}
+ GyMMM{"Gy年M月"}
+ GyMMMEEEEd{"Gy年M月d日EEEE"}
+ GyMMMEd{"Gy年M月d日(E)"}
+ GyMMMd{"Gy年M月d日"}
H{"H時"}
Hm{"H:mm"}
Hms{"H:mm:ss"}
M{"M月"}
+ MEEEEd{"M/dEEEE"}
MEd{"M/d(E)"}
MMM{"M月"}
MMMEEEEd{"M月d日EEEE"}
MMMEd{"M月d日(E)"}
MMMd{"M月d日"}
- MMdd{"MM/dd"}
Md{"M/d"}
d{"d日"}
h{"aK時"}
@@ -803,7 +973,9 @@
ms{"mm:ss"}
y{"y年"}
yM{"y/M"}
+ yMEEEEd{"y/M/dEEEE"}
yMEd{"y/M/d(E)"}
+ yMM{"y/MM"}
yMMM{"y年M月"}
yMMMEEEEd{"y年M月d日EEEE"}
yMMMEd{"y年M月d日(E)"}
@@ -811,9 +983,6 @@
yMd{"y/M/d"}
yQQQ{"y/QQQ"}
yQQQQ{"yQQQQ"}
- yyMMM{"y年M月"}
- yyyy{"y年"}
- yyyyMM{"yyyy/MM"}
}
dayNames{
format{
@@ -868,8 +1037,8 @@
}
eras{
abbreviated{
- "BC",
- "AD",
+ "紀元前",
+ "西暦",
}
narrow{
"BC",
@@ -880,63 +1049,6 @@
"西暦",
}
}
- fields{
- day{
- dn{"日"}
- relative{
- "-1"{"昨日"}
- "-2"{"一昨日"}
- "0"{"今日"}
- "1"{"明日"}
- "2"{"明後日"}
- }
- }
- dayperiod{
- dn{"午前/午後"}
- }
- era{
- dn{"時代"}
- }
- hour{
- dn{"時"}
- }
- minute{
- dn{"分"}
- }
- month{
- dn{"月"}
- relative{
- "-1"{"先月"}
- "0"{"今月"}
- "1"{"翌月"}
- }
- }
- second{
- dn{"秒"}
- }
- week{
- dn{"週"}
- relative{
- "-1"{"先週"}
- "0"{"今週"}
- "1"{"翌週"}
- }
- }
- weekday{
- dn{"曜日"}
- }
- year{
- dn{"年"}
- relative{
- "-1"{"昨年"}
- "0"{"今年"}
- "1"{"翌年"}
- }
- }
- zone{
- dn{"タイムゾーン"}
- }
- }
intervalFormats{
H{
H{"H時～H時"}
@@ -1003,13 +1115,13 @@
y{"y年～y年"}
}
yM{
- M{"yy/MM～yy/MM"}
- y{"yy/MM～yy/MM"}
+ M{"y/MM～y/MM"}
+ y{"y/MM～y/MM"}
}
yMEd{
- M{"yy/MM/dd(E)～yy/MM/dd(E)"}
- d{"yy/MM/dd(E)～yy/MM/dd(E)"}
- y{"yy/MM/dd(E)～yy/MM/dd(E)"}
+ M{"y/MM/dd(E)～y/MM/dd(E)"}
+ d{"y/MM/dd(E)～y/MM/dd(E)"}
+ y{"y/MM/dd(E)～y/MM/dd(E)"}
}
yMMM{
M{"y年M月～M月"}
@@ -1030,9 +1142,9 @@
y{"y年M月d日～y年M月d日"}
}
yMd{
- M{"yy/MM/dd～yy/MM/dd"}
- d{"yy/MM/dd～yy/MM/dd"}
- y{"yy/MM/dd～yy/MM/dd"}
+ M{"y/MM/dd～y/MM/dd"}
+ d{"y/MM/dd～y/MM/dd"}
+ y{"y/MM/dd～y/MM/dd"}
}
}
monthNames{
@@ -1429,12 +1541,18 @@
EEEEd{"d日EEEE"}
Ed{"d日(E)"}
Gy{"Gy年"}
+ GyMMM{"Gy年M月"}
+ GyMMMEEEEd{"Gy年M月d日EEEE"}
+ GyMMMEd{"Gy年M月d日(E)"}
+ GyMMMd{"Gy年M月d日"}
H{"H時"}
Hm{"H:mm"}
Hms{"H:mm:ss"}
M{"M月"}
+ MEEEEd{"M/dEEEE"}
MEd{"M/d(E)"}
MMM{"M月"}
+ MMMEEEEd{"M月d日EEEE"}
MMMEd{"M月d日(E)"}
MMMd{"M月d日"}
Md{"M/d"}
@@ -1445,8 +1563,9 @@
ms{"mm:ss"}
y{"Gy年"}
yyyy{"Gy年"}
+ yyyyMEEEEd{"Gy/M/dEEEE"}
yyyyMEd{"Gy/M/d(E)"}
- yyyyMM{"Gyy/MM"}
+ yyyyMM{"Gy/MM"}
yyyyMMM{"Gy年M月"}
yyyyMMMEEEEd{"Gy年M月d日EEEE"}
yyyyMMMEd{"Gy年M月d日(E)"}
@@ -2032,52 +2151,6 @@
}
}
roc{
- DateTimePatterns{
- "H時mm分ss秒 zzzz",
- "H:mm:ss z",
- "H:mm:ss",
- "H:mm",
- "Gy年M月d日EEEE",
- "Gy年M月d日",
- "Gy/MM/dd",
- "Gy/MM/dd",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- EEEEd{"d日EEEE"}
- Ed{"d日(E)"}
- Gy{"Gy年"}
- H{"H時"}
- Hm{"H:mm"}
- Hms{"H:mm:ss"}
- M{"M月"}
- MEd{"M/d(E)"}
- MMM{"M月"}
- MMMEEEEd{"M月d日EEEE"}
- MMMEd{"M月d日(E)"}
- MMMd{"M月d日"}
- Md{"M/d"}
- d{"d日"}
- h{"aK時"}
- hm{"aK:mm"}
- hms{"aK:mm:ss"}
- ms{"mm:ss"}
- y{"Gy年"}
- yyyy{"Gy年"}
- yyyyMEd{"Gy/M/d(E)"}
- yyyyMM{"Gy/MM"}
- yyyyMMM{"Gy年M月"}
- yyyyMMMEEEEd{"Gy年M月d日EEEE"}
- yyyyMMMEd{"Gy年M月d日(E)"}
- yyyyMMMd{"Gy年M月d日"}
- yyyyMd{"Gy/M/d"}
- yyyyQQQ{"Gy/QQQ"}
- yyyyQQQQ{"GyQQQQ"}
- }
eras{
abbreviated{
"民国前",
@@ -2092,6 +2165,63 @@
quotationEnd{"」"}
quotationStart{"「"}
}
+ fields{
+ day{
+ dn{"日"}
+ relative{
+ "-1"{"昨日"}
+ "-2"{"一昨日"}
+ "0"{"今日"}
+ "1"{"明日"}
+ "2"{"明後日"}
+ }
+ }
+ dayperiod{
+ dn{"午前/午後"}
+ }
+ era{
+ dn{"時代"}
+ }
+ hour{
+ dn{"時"}
+ }
+ minute{
+ dn{"分"}
+ }
+ month{
+ dn{"月"}
+ relative{
+ "-1"{"先月"}
+ "0"{"今月"}
+ "1"{"翌月"}
+ }
+ }
+ second{
+ dn{"秒"}
+ }
+ week{
+ dn{"週"}
+ relative{
+ "-1"{"先週"}
+ "0"{"今週"}
+ "1"{"翌週"}
+ }
+ }
+ weekday{
+ dn{"曜日"}
+ }
+ year{
+ dn{"年"}
+ relative{
+ "-1"{"昨年"}
+ "0"{"今年"}
+ "1"{"翌年"}
+ }
+ }
+ zone{
+ dn{"タイムゾーン"}
+ }
+ }
listPattern{
standard{
2{"{0}、{1}"}
diff --git a/data/locales/ja_JP.txt b/data/locales/ja_JP.txt
index 38fc77f..5659584 100644
--- a/data/locales/ja_JP.txt
+++ b/data/locales/ja_JP.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ja_JP.xml
// *
// ***************************************************************************
ja_JP{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ja_JP_TRADITIONAL.txt b/data/locales/ja_JP_TRADITIONAL.txt
index ca942f1..e95c34a 100644
--- a/data/locales/ja_JP_TRADITIONAL.txt
+++ b/data/locales/ja_JP_TRADITIONAL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/jgo.txt b/data/locales/jgo.txt
index 2f1980e..e247dd5 100755
--- a/data/locales/jgo.txt
+++ b/data/locales/jgo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/jgo.xml
// *
@@ -21,7 +21,7 @@
"[A B C D Ɛ F G H I J K L M N Ŋ Ɔ P {Pf} S {Sh} T {Ts} U Ʉ {Ʉ\u0308} V W Ẅ Y "
"Z Ꞌ]"
}
- ExemplarCharactersPunctuation{"[\- , ; \: ! ? . ‹ › « »]"}
+ ExemplarCharactersPunctuation{"[\\- , ; \\: ! ? . ‹ › « »]"}
LocaleScript{
"Latn",
}
@@ -49,8 +49,34 @@
}
native{"latn"}
}
- Version{"2.0.77.53"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, G y MMMM dd",
+ "G y MMMM d",
+ "G y MMM d",
+ "GGGGG y-MM-dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ MEd{"E, d.M"}
+ Md{"d.M"}
+ yMd{"M.d.y"}
+ }
+ intervalFormats{
+ fallback{"{0} – {1}"}
+ }
+ }
gregorian{
AmPmMarkers{
"mba’mba’",
@@ -64,7 +90,7 @@
"EEEE, y MMMM dd",
"y MMMM d",
"y MMM d",
- "yyyy-MM-dd",
+ "y-MM-dd",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -143,13 +169,6 @@
"tsɛttsɛt mɛŋgu’ mi ɛ́ fúnɛ Kɛlísɛtɔ tɔ́ mɔ́",
}
}
- fields{
- day{
- relative{
- "0"{"lɔꞋɔ"}
- }
- }
- }
intervalFormats{
fallback{"{0} – {1}"}
}
@@ -251,9 +270,12 @@
quotationEnd{"»"}
quotationStart{"«"}
}
- layout{
- characters{"left-to-right"}
- lines{"top-to-bottom"}
+ fields{
+ day{
+ relative{
+ "0"{"lɔꞋɔ"}
+ }
+ }
}
listPattern{
standard{
diff --git a/data/locales/jgo_CM.txt b/data/locales/jgo_CM.txt
index a209d8b..a23f3d3 100755
--- a/data/locales/jgo_CM.txt
+++ b/data/locales/jgo_CM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/jgo_CM.xml
// *
// ***************************************************************************
jgo_CM{
- Version{"2.0.75.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/jmc.txt b/data/locales/jmc.txt
index c3756e2..9d036f9 100755
--- a/data/locales/jmc.txt
+++ b/data/locales/jmc.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/jmc.xml
// *
@@ -23,8 +23,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"utuko",
@@ -38,7 +78,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -111,43 +151,6 @@
"Baada ya Kristu",
}
}
- fields{
- day{
- dn{"Mfiri"}
- relative{
- "-1"{"Ukou"}
- "0"{"Inu"}
- "1"{"Ngama"}
- }
- }
- dayperiod{
- dn{"Mfiri o siku"}
- }
- era{
- dn{"Kacha"}
- }
- hour{
- dn{"Saa"}
- }
- minute{
- dn{"Dakyika"}
- }
- month{
- dn{"Mori"}
- }
- second{
- dn{"Sekunde"}
- }
- week{
- dn{"Wiikyi"}
- }
- year{
- dn{"Maka"}
- }
- zone{
- dn{"Mfiri o saa"}
- }
- }
monthNames{
format{
abbreviated{
@@ -220,4 +223,41 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Mfiri"}
+ relative{
+ "-1"{"Ukou"}
+ "0"{"Inu"}
+ "1"{"Ngama"}
+ }
+ }
+ dayperiod{
+ dn{"Mfiri o siku"}
+ }
+ era{
+ dn{"Kacha"}
+ }
+ hour{
+ dn{"Saa"}
+ }
+ minute{
+ dn{"Dakyika"}
+ }
+ month{
+ dn{"Mori"}
+ }
+ second{
+ dn{"Sekunde"}
+ }
+ week{
+ dn{"Wiikyi"}
+ }
+ year{
+ dn{"Maka"}
+ }
+ zone{
+ dn{"Mfiri o saa"}
+ }
+ }
}
diff --git a/data/locales/jmc_TZ.txt b/data/locales/jmc_TZ.txt
index eae26be..5bfc398 100755
--- a/data/locales/jmc_TZ.txt
+++ b/data/locales/jmc_TZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/jmc_TZ.xml
// *
// ***************************************************************************
jmc_TZ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ka.txt b/data/locales/ka.txt
index 6d1b51b..c82c905 100644
--- a/data/locales/ka.txt
+++ b/data/locales/ka.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ka.xml
// *
@@ -11,14 +11,15 @@
*/
ka{
AuxExemplarCharacters{
- "[ⴀ ⴁ ⴂ ⴃ ⴄ ⴅ ⴆ ⴡ ⴇ ⴈ ⴉ ⴊ ⴋ ⴌ ⴢ ⴍ ⴎ ⴏ ⴐ ⴑ ⴒ ⴣ ⴓ ⴔ ⴕ ⴖ ⴗ ⴘ ⴙ ⴚ ⴛ ⴜ ⴝ ⴞ ⴤ ⴟ ⴠ ⴥ"
- "]"
+ "[ჱ ჲ ჳ ჴ ჵ ჶ ჷ ჸ ჹ ჺ ⴀ ⴁ ⴂ ⴃ ⴄ ⴅ ⴆ ⴡ ⴇ ⴈ ⴉ ⴊ ⴋ ⴌ ⴢ ⴍ ⴎ ⴏ ⴐ ⴑ ⴒ ⴣ ⴓ ⴔ ⴕ ⴖ ⴗ ⴘ"
+ " ⴙ ⴚ ⴛ ⴜ ⴝ ⴞ ⴤ ⴟ ⴠ ⴥ]"
}
- ExemplarCharacters{
- "[ა ბ გ დ ე ვ ზ ჱ თ ი კ ლ მ ნ ჲ ო პ ჟ რ ს ტ ჳ უ ფ ქ ღ ყ შ ჩ ც ძ წ ჭ ხ ჴ ჯ ჰ ჵ"
- " ჶ ჷ ჸ ჹ ჺ]"
- }
+ ExemplarCharacters{"[ა ბ გ დ ე ვ ზ თ ი კ ლ მ ნ ო პ ჟ რ ს ტ უ ფ ქ ღ ყ შ ჩ ც ძ წ ჭ ხ ჯ ჰ]"}
ExemplarCharactersIndex{"[ა ბ გ დ ე ვ ზ თ ი კ ლ მ ნ ო პ ჟ რ ს ტ უ ფ ქ ღ ყ შ ჩ ც ძ წ ჭ ხ ჯ ჰ]"}
+ ExemplarCharactersPunctuation{
+ "[\\- ‐ – — , ; \\: ! ? . … ჻ ' ‘ ‚ “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& #"
+ " † ‡ ′ ″ №]"
+ }
LocaleScript{
"Geor",
}
@@ -29,11 +30,92 @@
currencyFormat{"#,##0.00 ¤"}
decimalFormat{"#,##0.###"}
percentFormat{"#,##0 %"}
+ scientificFormat{"#E0"}
+ }
+ patternsLong{
+ decimalFormat{
+ 1000{
+ other{"0 ათასი"}
+ }
+ 10000{
+ other{"00 ათასი"}
+ }
+ 100000{
+ other{"000 ათასი"}
+ }
+ 1000000{
+ other{"0 მილიონი"}
+ }
+ 10000000{
+ other{"00 მილიონი"}
+ }
+ 100000000{
+ other{"000 მილიონი"}
+ }
+ 1000000000{
+ other{"0 მილიარდი"}
+ }
+ 10000000000{
+ other{"00 მილიარდი"}
+ }
+ 100000000000{
+ other{"000 მილიარდი"}
+ }
+ 1000000000000{
+ other{"0 ტრილიონი"}
+ }
+ 10000000000000{
+ other{"00 ტრილიონი"}
+ }
+ 100000000000000{
+ other{"000 ტრილიონი"}
+ }
+ }
+ }
+ patternsShort{
+ decimalFormat{
+ 1000{
+ other{"0 ათ'.'"}
+ }
+ 10000{
+ other{"00 ათ'.'"}
+ }
+ 100000{
+ other{"000 ათ'.'"}
+ }
+ 1000000{
+ other{"0 მლნ'.'"}
+ }
+ 10000000{
+ other{"00 მლნ'.'"}
+ }
+ 100000000{
+ other{"000 მლნ'.'"}
+ }
+ 1000000000{
+ other{"0 მლრდ'.'"}
+ }
+ 10000000000{
+ other{"00 მლრდ'.'"}
+ }
+ 100000000000{
+ other{"000 მლრ'.'"}
+ }
+ 1000000000000{
+ other{"0 ტრლ'.'"}
+ }
+ 10000000000000{
+ other{"00 ტრლ'.'"}
+ }
+ 100000000000000{
+ other{"000 ტრლ'.'"}
+ }
+ }
}
symbols{
decimal{","}
exponential{"E"}
- group{"."}
+ group{" "}
infinity{"∞"}
list{";"}
minusSign{"-"}
@@ -46,15 +128,190 @@
native{"latn"}
traditional{"geor"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.61"}
calendar{
- gregorian{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, dd MMMM, y G",
+ "d MMMM, y G",
+ "d MMM, y G",
+ "dd.MM.yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1}, {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
availableFormats{
+ Ed{"d E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d.M"}
+ MMM{"LLL"}
+ MMMEd{"E, d MMM"}
MMMd{"d MMM"}
- Md{"d.M."}
+ Md{"d.M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
yM{"M.y"}
yMEd{"E, d.M.y"}
- yMMMEd{"E, d MMM y"}
+ yMMM{"MMM, y"}
+ yMMMEd{"E, d MMM, y"}
+ yMMMd{"d MMM, y"}
+ yMd{"d.M.y"}
+ yQQQ{"QQQ, y"}
+ yQQQQ{"QQQQ, y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, dd.MM. - E, dd.MM."}
+ d{"E, dd.MM. - E, dd.MM."}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"E, d MMM - E, d MMM"}
+ d{"E, d - E, d MMM"}
+ }
+ MMMd{
+ M{"d MMM - d MMM"}
+ d{"d-d MMM"}
+ }
+ Md{
+ M{"dd.MM. - dd.MM."}
+ d{"dd.MM. - dd.MM."}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"MM.y - MM.y"}
+ y{"MM.y - MM.y"}
+ }
+ yMEd{
+ M{"E, dd.MM.y - E, dd.MM.y"}
+ d{"E, dd.MM.y - E, dd.MM.y"}
+ y{"E, dd.MM.y - E, dd.MM.y"}
+ }
+ yMMM{
+ M{"MMM-MMM y"}
+ y{"MMM y - MMM y"}
+ }
+ yMMMEd{
+ M{"E, d MMM - E, d MMM, y"}
+ d{"E, d - E, d MMM y"}
+ y{"E, d MMM, y - E, d MMM, y"}
+ }
+ yMMMM{
+ M{"MM - MM.y"}
+ y{"MM.y - MM.y"}
+ }
+ yMMMd{
+ M{"dd MM - dd MM, y"}
+ y{"dd MMM, y - d MMM, y"}
+ }
+ yMd{
+ M{"dd.MM.y - dd.MM.y"}
+ d{"dd.MM.y - dd.MM.y"}
+ y{"dd.MM.y - dd.MM.y"}
+ }
+ }
+ }
+ gregorian{
+ AmPmMarkers{
+ "AM",
+ "PM",
+ }
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, dd MMMM, y",
+ "d MMMM, y",
+ "d MMM, y",
+ "dd.MM.yy",
+ "{1} {0}",
+ "{1} {0}",
+ "{1}, {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d.M"}
+ MMM{"LLL"}
+ MMMEd{"E, d MMM"}
+ MMMd{"d MMM"}
+ Md{"d.M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M.y"}
+ yMEd{"E, d.M.y"}
+ yMMM{"MMM, y"}
+ yMMMEd{"E, d MMM, y"}
+ yMMMd{"d MMM, y"}
+ yMd{"d.M.y"}
+ yQQQ{"QQQ, y"}
+ yQQQQ{"QQQQ, y"}
}
dayNames{
format{
@@ -76,6 +333,15 @@
"პ",
"შ",
}
+ short{
+ "კვ",
+ "ორ",
+ "სმ",
+ "ოთ",
+ "ხთ",
+ "პრ",
+ "შბ",
+ }
wide{
"კვირა",
"ორშაბათი",
@@ -105,6 +371,15 @@
"პ",
"შ",
}
+ short{
+ "კვ",
+ "ორ",
+ "სმ",
+ "ოთ",
+ "ხთ",
+ "პრ",
+ "შბ",
+ }
wide{
"კვირა",
"ორშაბათი",
@@ -118,53 +393,35 @@
}
eras{
abbreviated{
+ "ძვ. წ.",
+ "ახ. წ.",
+ }
+ narrow{
"ჩვენს წელთაღრიცხვამდე",
"ჩვენი წელთაღრიცხვით",
}
- }
- fields{
- day{
- dn{"დღე"}
- relative{
- "-1"{"გუშინ"}
- "0"{"დღეს"}
- "1"{"ხვალ"}
- }
- }
- dayperiod{
- dn{"AM/PM"}
- }
- era{
- dn{"ერა"}
- }
- hour{
- dn{"საათი"}
- }
- minute{
- dn{"წუთი"}
- }
- month{
- dn{"თვე"}
- }
- second{
- dn{"წამი"}
- }
- week{
- dn{"კვირა"}
- }
- weekday{
- dn{"კვირის დღე"}
- }
- year{
- dn{"წელი"}
- }
- zone{
- dn{"სასაათო სარტყელი"}
+ wide{
+ "ძველი წელთაღრიცხვით",
+ "ახალი წელთაღრიცხვით",
}
}
intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
M{
- M{"M.-M."}
+ M{"M–M"}
}
MEd{
M{"E, dd.MM. - E, dd.MM."}
@@ -185,32 +442,61 @@
M{"dd.MM. - dd.MM."}
d{"dd.MM. - dd.MM."}
}
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
yM{
- M{"MM.yy - MM.yy"}
- y{"MM.yy - MM.yy"}
+ M{"MM.y - MM.y"}
+ y{"MM.y - MM.y"}
}
yMEd{
- M{"E, dd.MM.yy - E, dd.MM.yy"}
- d{"E, dd.MM.yy - E, dd.MM.yy"}
- y{"E, dd.MM.yy - E, dd.MM.yy"}
+ M{"E, dd.MM.y - E, dd.MM.y"}
+ d{"E, dd.MM.y - E, dd.MM.y"}
+ y{"E, dd.MM.y - E, dd.MM.y"}
}
yMMM{
M{"MMM-MMM y"}
y{"MMM y - MMM y"}
}
yMMMEd{
- M{"E, d MMM - E, d MMM y"}
+ M{"E, d MMM - E, d MMM, y"}
d{"E, d - E, d MMM y"}
- y{"E, d MMM y - E, d MMM y"}
+ y{"E, d MMM, y - E, d MMM, y"}
}
yMMMM{
- M{"MM – MM.yyyy"}
- y{"MM.yyyy – MM.yyyy"}
+ M{"MM - MM.y"}
+ y{"MM.y - MM.y"}
+ }
+ yMMMd{
+ M{"dd MM - dd MM, y"}
+ y{"dd MMM, y - d MMM, y"}
}
yMd{
- M{"dd.MM.yy - dd.MM.yy"}
- d{"dd.MM.yy - dd.MM.yy"}
- y{"dd.MM.yy - dd.MM.yy"}
+ M{"dd.MM.y - dd.MM.y"}
+ d{"dd.MM.y - dd.MM.y"}
+ y{"dd.MM.y - dd.MM.y"}
}
}
monthNames{
@@ -250,7 +536,7 @@
"აპრილი",
"მაისი",
"ივნისი",
- "ივლის",
+ "ივლისი",
"აგვისტო",
"სექტემბერი",
"ოქტომბერი",
@@ -294,7 +580,7 @@
"აპრილი",
"მაისი",
"ივნისი",
- "ივლის",
+ "ივლისი",
"აგვისტო",
"სექტემბერი",
"ოქტომბერი",
@@ -311,53 +597,195 @@
"III კვ.",
"IV კვ.",
}
+ narrow{
+ "1",
+ "2",
+ "3",
+ "4",
+ }
wide{
- "1-ლი კვარტალი",
- "მე-2 კვარტალი",
- "მე-3 კვარტალი",
- "მე-4 კვარტალი",
+ "I კვარტალი",
+ "II კვარტალი",
+ "III კვარტალი",
+ "IV კვარტალი",
+ }
+ }
+ stand-alone{
+ abbreviated{
+ "I კვ.",
+ "II კვ.",
+ "III კვ.",
+ "IV კვ.",
+ }
+ narrow{
+ "1",
+ "2",
+ "3",
+ "4",
+ }
+ wide{
+ "I კვარტალი",
+ "II კვარტალი",
+ "III კვარტალი",
+ "IV კვარტალი",
}
}
}
}
+ islamic{
+ availableFormats{
+ MMMd{"d MMM"}
+ Md{"d.M."}
+ yM{"M.y"}
+ yMEd{"E, d.M.y"}
+ yMMMEd{"E, d MMM y"}
+ }
+ }
}
delimiters{
- alternateQuotationEnd{"‘"}
- alternateQuotationStart{"‚"}
+ alternateQuotationEnd{"“"}
+ alternateQuotationStart{"„"}
quotationEnd{"“"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"დღე"}
+ relative{
+ "-1"{"გუშინ"}
+ "-2"{"გუშინწინ"}
+ "0"{"დღეს"}
+ "1"{"ხვალ"}
+ "2"{"ზეგ"}
+ }
+ }
+ dayperiod{
+ dn{"დღის ნახევარი"}
+ }
+ era{
+ dn{"ეპოქა"}
+ }
+ hour{
+ dn{"საათი"}
+ }
+ minute{
+ dn{"წუთი"}
+ }
+ month{
+ dn{"თვე"}
+ }
+ second{
+ dn{"წამი"}
+ }
+ week{
+ dn{"კვირა"}
+ }
+ weekday{
+ dn{"კვირის დღე"}
+ }
+ year{
+ dn{"წელი"}
+ }
+ zone{
+ dn{"დროის სარტყელი"}
+ }
+ }
listPattern{
standard{
2{"{0} და {1}"}
end{"{0} და {1}"}
+ middle{"{0}, {1}"}
+ start{"{0}, {1}"}
}
}
measurementSystemNames{
- US{"ანგლო-ამერიკული"}
+ UK{"ბრიტანული"}
+ US{"ამერიკული"}
metric{"მეტრული"}
}
units{
day{
other{"{0} დღე"}
}
+ day-future{
+ other{"{0} დღეში"}
+ }
+ day-past{
+ other{"{0} დღის წინ"}
+ }
hour{
other{"{0} საათი"}
}
+ hour-future{
+ other{"{0} საათში"}
+ }
+ hour-past{
+ other{"{0} საათის წინ"}
+ }
minute{
other{"{0} წუთი"}
}
+ minute-future{
+ other{"{0} წუთში"}
+ }
+ minute-past{
+ other{"{0} წუთის წინ"}
+ }
+ month{
+ other{"{0} თვე"}
+ }
+ month-future{
+ other{"{0} თვეში"}
+ }
+ month-past{
+ other{"{0} თვის წინ"}
+ }
+ second{
+ other{"{0} წამი"}
+ }
+ second-future{
+ other{"{0} წამში"}
+ }
+ second-past{
+ other{"{0} წამის წინ"}
+ }
+ week{
+ other{"{0} კვირა"}
+ }
+ week-future{
+ other{"{0} კვირაში"}
+ }
+ week-past{
+ other{"{0} კვირის წინ"}
+ }
+ year{
+ other{"{0} წელი"}
+ }
+ year-future{
+ other{"{0} წელიწადში"}
+ }
+ year-past{
+ other{"{0} წლის წინ"}
+ }
+ }
+ unitsShort{
+ day{
+ other{"{0} დღე"}
+ }
+ minute{
+ other{"{0} წთ"}
+ }
month{
other{"{0} თვე"}
}
second{
- other{"{0} წამი"}
+ other{"{0} წმ"}
}
week{
- other{"{0} კვირა"}
+ other{"{0} კვრ"}
}
year{
- other{"{0} წელი"}
+ other{"{0} წ"}
}
}
}
diff --git a/data/locales/ka_GE.txt b/data/locales/ka_GE.txt
index 92bd274..e01a407 100644
--- a/data/locales/ka_GE.txt
+++ b/data/locales/ka_GE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ka_GE.xml
// *
// ***************************************************************************
ka_GE{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/kab.txt b/data/locales/kab.txt
index 8de2de4..8993e97 100755
--- a/data/locales/kab.txt
+++ b/data/locales/kab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kab.xml
// *
@@ -27,22 +27,18 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
- AmPmMarkers{
- "n tufat",
- "n tmeddit",
- }
+ generic{
DateTimePatterns{
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE d MMMM y",
- "d MMMM y",
- "d MMM, y",
- "d/M/yyyy",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM, y G",
+ "d/M/y GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -64,16 +60,57 @@
y{"y"}
yM{"M/y"}
yMEd{"E d/M/y"}
+ yMM{"MM/y"}
yMMM{"MMM y"}
yMMMEd{"E d MMM y"}
yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"MM/y"}
- yyMMM{"MMM yy"}
- yyMMMEd{"E d MMM yy"}
- yyMMMd{"d MMM yy"}
- yyyyMMMM{"MMMM yyyy"}
+ }
+ }
+ gregorian{
+ AmPmMarkers{
+ "n tufat",
+ "n tmeddit",
+ }
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y",
+ "d MMMM y",
+ "d MMM, y",
+ "d/M/y",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ M{"M"}
+ MMM{"MMM"}
+ MMMEd{"E d MMM"}
+ MMMMEd{"E d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMMdd{"dd MMM"}
+ MMd{"d/MM"}
+ MMdd{"dd/MM"}
+ Md{"d/M"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMM{"MM/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
}
dayNames{
format{
@@ -118,46 +155,6 @@
"seld talalit n Ɛisa",
}
}
- fields{
- day{
- dn{"Ass"}
- relative{
- "-1"{"Iḍelli"}
- "0"{"Ass-a"}
- "1"{"Azekka"}
- }
- }
- dayperiod{
- dn{"n tufat / n tmeddit"}
- }
- era{
- dn{"Tallit"}
- }
- hour{
- dn{"Tamert"}
- }
- minute{
- dn{"Tamrect"}
- }
- month{
- dn{"Aggur"}
- }
- second{
- dn{"Tasint"}
- }
- week{
- dn{"Ddurt"}
- }
- weekday{
- dn{"Ussan n ddurt"}
- }
- year{
- dn{"Aseggas"}
- }
- zone{
- dn{"Aseglem asergan"}
- }
- }
monthNames{
format{
abbreviated{
@@ -230,4 +227,44 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"Ass"}
+ relative{
+ "-1"{"Iḍelli"}
+ "0"{"Ass-a"}
+ "1"{"Azekka"}
+ }
+ }
+ dayperiod{
+ dn{"n tufat / n tmeddit"}
+ }
+ era{
+ dn{"Tallit"}
+ }
+ hour{
+ dn{"Tamert"}
+ }
+ minute{
+ dn{"Tamrect"}
+ }
+ month{
+ dn{"Aggur"}
+ }
+ second{
+ dn{"Tasint"}
+ }
+ week{
+ dn{"Ddurt"}
+ }
+ weekday{
+ dn{"Ussan n ddurt"}
+ }
+ year{
+ dn{"Aseggas"}
+ }
+ zone{
+ dn{"Aseglem asergan"}
+ }
+ }
}
diff --git a/data/locales/kab_DZ.txt b/data/locales/kab_DZ.txt
index a1e11a4..ba3bc12 100755
--- a/data/locales/kab_DZ.txt
+++ b/data/locales/kab_DZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kab_DZ.xml
// *
// ***************************************************************************
kab_DZ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/kam.txt b/data/locales/kam.txt
index 7edb3ae..3699feb 100755
--- a/data/locales/kam.txt
+++ b/data/locales/kam.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kam.xml
// *
@@ -22,8 +22,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"Ĩyakwakya",
@@ -37,7 +77,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -110,46 +150,6 @@
"Ĩtina wa Yesũ",
}
}
- fields{
- day{
- dn{"Mũthenya"}
- relative{
- "-1"{"Ĩyoo"}
- "0"{"Ũmũnthĩ"}
- "1"{"Ũnĩ"}
- }
- }
- dayperiod{
- dn{"Ĩyakwakya/Ĩyawĩoo"}
- }
- era{
- dn{"Ĩvinda"}
- }
- hour{
- dn{"Saa"}
- }
- minute{
- dn{"Ndatĩka"}
- }
- month{
- dn{"Mwai"}
- }
- second{
- dn{"sekondi"}
- }
- week{
- dn{"Kyumwa"}
- }
- weekday{
- dn{"Kyumwanĩ"}
- }
- year{
- dn{"Mwaka"}
- }
- zone{
- dn{"Kĩsio kya ĩsaa"}
- }
- }
monthNames{
format{
abbreviated{
@@ -222,4 +222,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Mũthenya"}
+ relative{
+ "-1"{"Ĩyoo"}
+ "0"{"Ũmũnthĩ"}
+ "1"{"Ũnĩ"}
+ }
+ }
+ dayperiod{
+ dn{"Ĩyakwakya/Ĩyawĩoo"}
+ }
+ era{
+ dn{"Ĩvinda"}
+ }
+ hour{
+ dn{"Saa"}
+ }
+ minute{
+ dn{"Ndatĩka"}
+ }
+ month{
+ dn{"Mwai"}
+ }
+ second{
+ dn{"sekondi"}
+ }
+ week{
+ dn{"Kyumwa"}
+ }
+ weekday{
+ dn{"Kyumwanĩ"}
+ }
+ year{
+ dn{"Mwaka"}
+ }
+ zone{
+ dn{"Kĩsio kya ĩsaa"}
+ }
+ }
}
diff --git a/data/locales/kam_KE.txt b/data/locales/kam_KE.txt
index 24e90be..aad7c8d 100755
--- a/data/locales/kam_KE.txt
+++ b/data/locales/kam_KE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kam_KE.xml
// *
// ***************************************************************************
kam_KE{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/kde.txt b/data/locales/kde.txt
index 37fb755..c8369a5 100755
--- a/data/locales/kde.txt
+++ b/data/locales/kde.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kde.xml
// *
@@ -22,8 +22,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"Muhi",
@@ -37,7 +77,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -110,46 +150,6 @@
"Nankuida Yesu",
}
}
- fields{
- day{
- dn{"Lihiku"}
- relative{
- "-1"{"Lido"}
- "0"{"Nelo"}
- "1"{"Nundu"}
- }
- }
- dayperiod{
- dn{"Muhi/Chilo"}
- }
- era{
- dn{"Mahiku"}
- }
- hour{
- dn{"Saa"}
- }
- minute{
- dn{"Dakika"}
- }
- month{
- dn{"Mwedi"}
- }
- second{
- dn{"Sekunde"}
- }
- week{
- dn{"Lijuma"}
- }
- weekday{
- dn{"Disiku dya lijuma"}
- }
- year{
- dn{"Mwaka"}
- }
- zone{
- dn{"Npanda wa muda"}
- }
- }
monthNames{
format{
abbreviated{
@@ -222,4 +222,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Lihiku"}
+ relative{
+ "-1"{"Lido"}
+ "0"{"Nelo"}
+ "1"{"Nundu"}
+ }
+ }
+ dayperiod{
+ dn{"Muhi/Chilo"}
+ }
+ era{
+ dn{"Mahiku"}
+ }
+ hour{
+ dn{"Saa"}
+ }
+ minute{
+ dn{"Dakika"}
+ }
+ month{
+ dn{"Mwedi"}
+ }
+ second{
+ dn{"Sekunde"}
+ }
+ week{
+ dn{"Lijuma"}
+ }
+ weekday{
+ dn{"Disiku dya lijuma"}
+ }
+ year{
+ dn{"Mwaka"}
+ }
+ zone{
+ dn{"Npanda wa muda"}
+ }
+ }
}
diff --git a/data/locales/kde_TZ.txt b/data/locales/kde_TZ.txt
index 265d58a..7aac7cd 100755
--- a/data/locales/kde_TZ.txt
+++ b/data/locales/kde_TZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kde_TZ.xml
// *
// ***************************************************************************
kde_TZ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/kea.txt b/data/locales/kea.txt
index 831d189..db8c578 100755
--- a/data/locales/kea.txt
+++ b/data/locales/kea.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kea.xml
// *
@@ -72,22 +72,18 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
- AmPmMarkers{
- "am",
- "pm",
- }
+ generic{
DateTimePatterns{
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE, d 'di' MMMM 'di' y",
- "d 'di' MMMM 'di' y",
- "d 'di' MMM 'di' y",
- "d/M/yyyy",
+ "EEEE, d 'di' MMMM 'di' y G",
+ "d 'di' MMMM 'di' y G",
+ "d 'di' MMM 'di' y G",
+ "d/M/y GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -119,6 +115,7 @@
y{"y"}
yM{"MM/y"}
yMEd{"E, dd/MM/y"}
+ yMM{"MM/y"}
yMMM{"MMM 'di' y"}
yMMMEd{"E, d 'di' MMM 'di' y"}
yMMMM{"MMMM 'di' y"}
@@ -126,12 +123,156 @@
yMd{"dd/MM/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"MM/yy"}
- yyMMM{"MMM yy"}
- yyMMMEd{"E, d 'de' MMM 'de' yy"}
- yyMMMd{"d 'de' MMM 'de' yy"}
- yyyyMM{"MM/yyyy"}
- yyyyMMM{"MMM 'de' yyyy"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, dd/MM – E, dd/MM"}
+ d{"E, dd/MM – E, dd/MM"}
+ }
+ MMM{
+ M{"LLL–LLL"}
+ }
+ MMMEd{
+ M{"E, dd/MM – E, dd/MM"}
+ d{"E, dd/MM – E, dd/MM"}
+ }
+ MMMd{
+ M{"dd/MM – dd/MM"}
+ d{"d–d MMM"}
+ }
+ Md{
+ M{"dd/MM – dd/MM"}
+ d{"dd/MM – dd/MM"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"MM/y – MM/y"}
+ y{"MM/y – MM/y"}
+ }
+ yMEd{
+ M{"E, dd/MM/y – E, dd/MM/y"}
+ d{"E, dd/MM/y – E, dd/MM/y"}
+ y{"E, dd/MM/y – E, dd/MM/y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y – MMM y"}
+ }
+ yMMMEd{
+ M{"E, d MMM – E, d MMM y"}
+ d{"E, d MMM – E, d MMM y"}
+ y{"E, d MMM y – E, d MMM y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"d MMM – d MMM y"}
+ d{"d–d MMM y"}
+ y{"d MMM y – d MMM y"}
+ }
+ yMd{
+ M{"dd/MM/y – dd/MM/y"}
+ d{"dd/MM/y – dd/MM/y"}
+ y{"dd/MM/y – dd/MM/y"}
+ }
+ }
+ }
+ gregorian{
+ AmPmMarkers{
+ "am",
+ "pm",
+ }
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d 'di' MMMM 'di' y",
+ "d 'di' MMMM 'di' y",
+ "d 'di' MMM 'di' y",
+ "d/M/y",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E, d"}
+ H{"HH"}
+ HHmm{"HH:mm"}
+ HHmmss{"HH:mm:ss"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, dd/MM"}
+ MMM{"LLL"}
+ MMMEd{"E, d MMM"}
+ MMMMEd{"E, d 'di' MMMM"}
+ MMMMd{"d 'di' MMMM"}
+ MMMd{"d MMM"}
+ MMdd{"dd/MM"}
+ Md{"dd/MM"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ mmss{"mm:ss"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"MM/y"}
+ yMEd{"E, dd/MM/y"}
+ yMM{"MM/y"}
+ yMMM{"MMM 'di' y"}
+ yMMMEd{"E, d 'di' MMM 'di' y"}
+ yMMMM{"MMMM 'di' y"}
+ yMMMd{"d MMM y"}
+ yMd{"dd/MM/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
}
dayNames{
format{
@@ -221,46 +362,6 @@
"Dispos di Kristu",
}
}
- fields{
- day{
- dn{"Dia"}
- relative{
- "-1"{"Onti"}
- "0"{"Oji"}
- "1"{"Manha"}
- }
- }
- dayperiod{
- dn{"am/pm"}
- }
- era{
- dn{"Era"}
- }
- hour{
- dn{"Ora"}
- }
- minute{
- dn{"Minutu"}
- }
- month{
- dn{"Mes"}
- }
- second{
- dn{"Sigundu"}
- }
- week{
- dn{"Simana"}
- }
- weekday{
- dn{"Dia di simana"}
- }
- year{
- dn{"Anu"}
- }
- zone{
- dn{"Ora lokal"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -324,13 +425,13 @@
y{"y–y"}
}
yM{
- M{"MM/yyyy – MM/yyyy"}
- y{"MM/yyyy – MM/yyyy"}
+ M{"MM/y – MM/y"}
+ y{"MM/y – MM/y"}
}
yMEd{
- M{"E, dd/MM/yyyy – E, dd/MM/yyyy"}
- d{"E, dd/MM/yyyy – E, dd/MM/yyyy"}
- y{"E, dd/MM/yyyy – E, dd/MM/yyyy"}
+ M{"E, dd/MM/y – E, dd/MM/y"}
+ d{"E, dd/MM/y – E, dd/MM/y"}
+ y{"E, dd/MM/y – E, dd/MM/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -351,9 +452,9 @@
y{"d MMM y – d MMM y"}
}
yMd{
- M{"dd/MM/yyyy – dd/MM/yyyy"}
- d{"dd/MM/yyyy – dd/MM/yyyy"}
- y{"dd/MM/yyyy – dd/MM/yyyy"}
+ M{"dd/MM/y – dd/MM/y"}
+ d{"dd/MM/y – dd/MM/y"}
+ y{"dd/MM/y – dd/MM/y"}
}
}
monthNames{
@@ -496,6 +597,46 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Dia"}
+ relative{
+ "-1"{"Onti"}
+ "0"{"Oji"}
+ "1"{"Manha"}
+ }
+ }
+ dayperiod{
+ dn{"am/pm"}
+ }
+ era{
+ dn{"Era"}
+ }
+ hour{
+ dn{"Ora"}
+ }
+ minute{
+ dn{"Minutu"}
+ }
+ month{
+ dn{"Mes"}
+ }
+ second{
+ dn{"Sigundu"}
+ }
+ week{
+ dn{"Simana"}
+ }
+ weekday{
+ dn{"Dia di simana"}
+ }
+ year{
+ dn{"Anu"}
+ }
+ zone{
+ dn{"Ora lokal"}
+ }
+ }
listPattern{
standard{
2{"{0} y {1}"}
diff --git a/data/locales/kea_CV.txt b/data/locales/kea_CV.txt
index 5d0dd69..d3240bf 100755
--- a/data/locales/kea_CV.txt
+++ b/data/locales/kea_CV.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kea_CV.xml
// *
// ***************************************************************************
kea_CV{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/khq.txt b/data/locales/khq.txt
index 76fc3b5..a46c347 100755
--- a/data/locales/khq.txt
+++ b/data/locales/khq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/khq.xml
// *
@@ -26,22 +26,18 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
- AmPmMarkers{
- "Adduha",
- "Aluula",
- }
+ generic{
DateTimePatterns{
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE d MMMM y",
- "d MMMM y",
- "d MMM, y",
- "d/M/yyyy",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM, y G",
+ "d/M/y GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -63,16 +59,57 @@
y{"y"}
yM{"M/y"}
yMEd{"E d/M/y"}
+ yMM{"MM/y"}
yMMM{"MMM y"}
yMMMEd{"E d MMM y"}
yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"MM/yy"}
- yyMMM{"MMM yy"}
- yyMMMEd{"E d MMM yy"}
- yyMMMd{"d MMM yy"}
- yyyyMMMM{"MMMM yyyy"}
+ }
+ }
+ gregorian{
+ AmPmMarkers{
+ "Adduha",
+ "Aluula",
+ }
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y",
+ "d MMMM y",
+ "d MMM, y",
+ "d/M/y",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ M{"M"}
+ MMM{"MMM"}
+ MMMEd{"E d MMM"}
+ MMMMEd{"E d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMMdd{"dd MMM"}
+ MMd{"d/MM"}
+ MMdd{"dd/MM"}
+ Md{"d/M"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMM{"MM/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
}
dayNames{
format{
@@ -117,43 +154,6 @@
"Isaa jamanoo",
}
}
- fields{
- day{
- dn{"Jaari"}
- relative{
- "-1"{"Bi"}
- "0"{"Hõo"}
- "1"{"Suba"}
- }
- }
- dayperiod{
- dn{"Adduha wala Aluula"}
- }
- era{
- dn{"Zaman"}
- }
- hour{
- dn{"Guuru"}
- }
- minute{
- dn{"Miniti"}
- }
- month{
- dn{"Handu"}
- }
- second{
- dn{"Miti"}
- }
- week{
- dn{"Hebu"}
- }
- year{
- dn{"Jiiri"}
- }
- zone{
- dn{"Leerazuu"}
- }
- }
monthNames{
format{
abbreviated{
@@ -226,4 +226,41 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Jaari"}
+ relative{
+ "-1"{"Bi"}
+ "0"{"Hõo"}
+ "1"{"Suba"}
+ }
+ }
+ dayperiod{
+ dn{"Adduha wala Aluula"}
+ }
+ era{
+ dn{"Zaman"}
+ }
+ hour{
+ dn{"Guuru"}
+ }
+ minute{
+ dn{"Miniti"}
+ }
+ month{
+ dn{"Handu"}
+ }
+ second{
+ dn{"Miti"}
+ }
+ week{
+ dn{"Hebu"}
+ }
+ year{
+ dn{"Jiiri"}
+ }
+ zone{
+ dn{"Leerazuu"}
+ }
+ }
}
diff --git a/data/locales/khq_ML.txt b/data/locales/khq_ML.txt
index 6379394..0309c74 100755
--- a/data/locales/khq_ML.txt
+++ b/data/locales/khq_ML.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/khq_ML.xml
// *
// ***************************************************************************
khq_ML{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ki.txt b/data/locales/ki.txt
index 10b2c13..cdd96cc 100755
--- a/data/locales/ki.txt
+++ b/data/locales/ki.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ki.xml
// *
@@ -23,8 +23,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"Kiroko",
@@ -38,7 +78,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -111,43 +151,6 @@
"Thutha wa Kristo",
}
}
- fields{
- day{
- dn{"Mũthenya"}
- relative{
- "-1"{"Ira"}
- "0"{"Ũmũthĩ"}
- "1"{"Rũciũ"}
- }
- }
- era{
- dn{"Kĩhinda"}
- }
- hour{
- dn{"Ithaa"}
- }
- minute{
- dn{"Ndagĩka"}
- }
- month{
- dn{"Mweri"}
- }
- second{
- dn{"Sekunde"}
- }
- week{
- dn{"Kiumia"}
- }
- weekday{
- dn{"Mũthenya kiumia-inĩ"}
- }
- year{
- dn{"Mwaka"}
- }
- zone{
- dn{"Mũcooro wa mathaa"}
- }
- }
monthNames{
format{
abbreviated{
@@ -220,4 +223,41 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Mũthenya"}
+ relative{
+ "-1"{"Ira"}
+ "0"{"Ũmũthĩ"}
+ "1"{"Rũciũ"}
+ }
+ }
+ era{
+ dn{"Kĩhinda"}
+ }
+ hour{
+ dn{"Ithaa"}
+ }
+ minute{
+ dn{"Ndagĩka"}
+ }
+ month{
+ dn{"Mweri"}
+ }
+ second{
+ dn{"Sekunde"}
+ }
+ week{
+ dn{"Kiumia"}
+ }
+ weekday{
+ dn{"Mũthenya kiumia-inĩ"}
+ }
+ year{
+ dn{"Mwaka"}
+ }
+ zone{
+ dn{"Mũcooro wa mathaa"}
+ }
+ }
}
diff --git a/data/locales/ki_KE.txt b/data/locales/ki_KE.txt
index 7603ff1..150ad1d 100755
--- a/data/locales/ki_KE.txt
+++ b/data/locales/ki_KE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ki_KE.xml
// *
// ***************************************************************************
ki_KE{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/kk.txt b/data/locales/kk.txt
index 66a592b..92d740e 100644
--- a/data/locales/kk.txt
+++ b/data/locales/kk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kk.xml
// *
@@ -85,8 +85,112 @@
}
}
}
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d MMMM y 'ж'. G",
+ "d MMMM y 'ж'. G",
+ "dd.MM.y G",
+ "dd.MM.yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ intervalFormats{
+ H{
+ H{"HH-HH"}
+ }
+ Hm{
+ H{"HH:mm-HH:mm"}
+ m{"HH:mm-HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm-HH:mm v"}
+ m{"HH:mm-HH:mm v"}
+ }
+ Hv{
+ H{"HH-HH v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E, dd.MM - E, dd.MM"}
+ d{"E, dd.MM - E, dd.MM"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"E, d MMM - E, d MMM"}
+ d{"E, d - E, d MMM"}
+ }
+ MMMd{
+ M{"d MMM - d MMM"}
+ d{"d-d MMM"}
+ }
+ Md{
+ M{"dd.MM - dd.MM"}
+ d{"dd.MM - dd.MM"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ h{"h-h a"}
+ }
+ hm{
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ h{"h-h a v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"MM.y - MM.y"}
+ y{"MM.y - MM.y"}
+ }
+ yMEd{
+ M{"E, dd.MM.y - E, dd.MM.y"}
+ d{"E, dd.MM.y - E, dd.MM.y"}
+ y{"E, dd.MM.y - E, dd.MM.y"}
+ }
+ yMMM{
+ M{"MMM-MMM y 'ж'."}
+ y{"MMM y 'ж'. - MMM y 'ж'."}
+ }
+ yMMMEd{
+ M{"E, d MMM - E, d MMM y 'ж'."}
+ d{"E, d - E, d MMM y 'ж'."}
+ y{"E, d MMM y 'ж'. - E, d MMM y 'ж'."}
+ }
+ yMMMd{
+ M{"d MMM - d MMM y 'ж'."}
+ d{"d-d MMM y 'ж'."}
+ y{"d MMM y 'ж'. - d MMM y 'ж'."}
+ }
+ yMd{
+ M{"dd.MM.y - dd.MM.y"}
+ d{"dd.MM.y - dd.MM.y"}
+ y{"dd.MM.y - dd.MM.y"}
+ }
+ }
+ }
gregorian{
DateTimePatterns{
"HH:mm:ss zzzz",
@@ -95,7 +199,7 @@
"HH:mm",
"EEEE, d MMMM y 'ж'.",
"d MMMM y 'ж'.",
- "dd.MM.yyyy",
+ "dd.MM.y",
"dd.MM.yy",
"{1} {0}",
"{1} {0}",
@@ -184,13 +288,13 @@
y{"y-y"}
}
yM{
- M{"MM.yy - MM.yy"}
- y{"MM.yy - MM.yy"}
+ M{"MM.y - MM.y"}
+ y{"MM.y - MM.y"}
}
yMEd{
- M{"E, dd.MM.yy - E, dd.MM.yy"}
- d{"E, dd.MM.yy - E, dd.MM.yy"}
- y{"E, dd.MM.yy - E, dd.MM.yy"}
+ M{"E, dd.MM.y - E, dd.MM.y"}
+ d{"E, dd.MM.y - E, dd.MM.y"}
+ y{"E, dd.MM.y - E, dd.MM.y"}
}
yMMM{
M{"MMM-MMM y 'ж'."}
@@ -207,9 +311,9 @@
y{"d MMM y 'ж'. - d MMM y 'ж'."}
}
yMd{
- M{"dd.MM.yy - dd.MM.yy"}
- d{"dd.MM.yy - dd.MM.yy"}
- y{"dd.MM.yy - dd.MM.yy"}
+ M{"dd.MM.y - dd.MM.y"}
+ d{"dd.MM.y - dd.MM.y"}
+ y{"dd.MM.y - dd.MM.y"}
}
}
monthNames{
diff --git a/data/locales/kk_Cyrl.txt b/data/locales/kk_Cyrl.txt
index 7de82d8..328519b 100755
--- a/data/locales/kk_Cyrl.txt
+++ b/data/locales/kk_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kk_Cyrl.xml
// *
@@ -13,5 +13,5 @@
LocaleScript{
"Cyrl",
}
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/kk_Cyrl_KZ.txt b/data/locales/kk_Cyrl_KZ.txt
index f72fa0a..598cd45 100755
--- a/data/locales/kk_Cyrl_KZ.txt
+++ b/data/locales/kk_Cyrl_KZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kk_Cyrl_KZ.xml
// *
// ***************************************************************************
kk_Cyrl_KZ{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/kk_KZ.txt b/data/locales/kk_KZ.txt
index 6702eea..f94bda6 100644
--- a/data/locales/kk_KZ.txt
+++ b/data/locales/kk_KZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/kl.txt b/data/locales/kl.txt
index 521e83d..a9fd3a4 100644
--- a/data/locales/kl.txt
+++ b/data/locales/kl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kl.xml
// *
@@ -29,7 +29,7 @@
}
}
}
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
calendar{
gregorian{
dayNames{
diff --git a/data/locales/kl_GL.txt b/data/locales/kl_GL.txt
index 344d4b7..489a5f7 100644
--- a/data/locales/kl_GL.txt
+++ b/data/locales/kl_GL.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kl_GL.xml
// *
// ***************************************************************************
kl_GL{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/kln.txt b/data/locales/kln.txt
index 1af6f78..95cb903 100755
--- a/data/locales/kln.txt
+++ b/data/locales/kln.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kln.xml
// *
@@ -23,8 +23,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"Beet",
@@ -38,7 +78,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -111,46 +151,6 @@
"Kokakesich Jesu",
}
}
- fields{
- day{
- dn{"Betut"}
- relative{
- "-1"{"Amut"}
- "0"{"Raini"}
- "1"{"Mutai"}
- }
- }
- dayperiod{
- dn{"BE/KE"}
- }
- era{
- dn{"Ibinta"}
- }
- hour{
- dn{"Sait"}
- }
- minute{
- dn{"Minitit"}
- }
- month{
- dn{"Arawet"}
- }
- second{
- dn{"Sekondit"}
- }
- week{
- dn{"Wikit"}
- }
- weekday{
- dn{"Betutab wikit"}
- }
- year{
- dn{"Kenyit"}
- }
- zone{
- dn{"Saitab sonit"}
- }
- }
monthNames{
format{
abbreviated{
@@ -223,4 +223,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Betut"}
+ relative{
+ "-1"{"Amut"}
+ "0"{"Raini"}
+ "1"{"Mutai"}
+ }
+ }
+ dayperiod{
+ dn{"BE/KE"}
+ }
+ era{
+ dn{"Ibinta"}
+ }
+ hour{
+ dn{"Sait"}
+ }
+ minute{
+ dn{"Minitit"}
+ }
+ month{
+ dn{"Arawet"}
+ }
+ second{
+ dn{"Sekondit"}
+ }
+ week{
+ dn{"Wikit"}
+ }
+ weekday{
+ dn{"Betutab wikit"}
+ }
+ year{
+ dn{"Kenyit"}
+ }
+ zone{
+ dn{"Saitab sonit"}
+ }
+ }
}
diff --git a/data/locales/kln_KE.txt b/data/locales/kln_KE.txt
index bc8fabe..1c44e77 100755
--- a/data/locales/kln_KE.txt
+++ b/data/locales/kln_KE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kln_KE.xml
// *
// ***************************************************************************
kln_KE{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/km.txt b/data/locales/km.txt
index 24ab5e1..23f1ca9 100644
--- a/data/locales/km.txt
+++ b/data/locales/km.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/km.xml
// *
@@ -17,7 +17,7 @@
" ឧ {ឧក} ឩ ឯ ឰ ឱ ឳ ា \u17B7 \u17B8 \u17B9 \u17BA \u17BB \u17BC \u17BD ើ ឿ ៀ េ"
" ែ ៃ ោ ៅ \u17C6 ះ \u17D2]"
}
- ExemplarCharactersPunctuation{"[\- , ៖ ! ? . ។ ៕ ‘ ’ \" “ ” ( ) \[ \] \{ \} ៙ ៚]"}
+ ExemplarCharactersPunctuation{"[\\- , ៖ ! ? . ។ ៕ ‘ ’ \u0022 “ ” ( ) \\[ \\] \\{ \\} ៙ ៚]"}
LocaleScript{
"Khmr",
}
@@ -125,8 +125,146 @@
}
native{"khmr"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM, y G",
+ "d MMM y G",
+ "d/M/y GGGGG",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M-d"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMd{"d MMM"}
+ Md{"M-d"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M-y"}
+ yMEd{"E, d-M-y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, d MMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d-M-y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"H-H"}
+ }
+ Hm{
+ H{"H:mm-H:mm"}
+ m{"H:mm-H:mm"}
+ }
+ Hmv{
+ H{"H:mm-H:mm v"}
+ m{"H:mm-H:mm v"}
+ }
+ Hv{
+ H{"H-H v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E, d/M - E, d/M"}
+ d{"E, d/M– E, d/M"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"E, d MMM - E, d MMM"}
+ d{"E, d MMM - E, d MMM"}
+ }
+ MMMd{
+ M{"d MMM - d MMM"}
+ d{"d-d MMM"}
+ }
+ Md{
+ M{"d/M - d/M"}
+ d{"d/M– d/M"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h-h a v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"M/y - M/y"}
+ y{"M/y - M/y"}
+ }
+ yMEd{
+ M{"E, d/M/y - E, d/M/y"}
+ d{"E, d/M/y - E, d/M/y"}
+ y{"E, d/M/y - E, d/M/y"}
+ }
+ yMMM{
+ M{"MM – MM-y"}
+ y{"MM-y – MM-y"}
+ }
+ yMMMEd{
+ M{"E, dd MMM y - E, dd MMM y"}
+ d{"E, dd MMM y - E, dd MMM y"}
+ y{"E, dd-MM-y – E, dd MMM y"}
+ }
+ yMMMM{
+ M{"MM – MM y"}
+ y{"MM-y – MM-y"}
+ }
+ yMMMd{
+ M{"d MMM y – d MMM"}
+ d{"d-d MMM y"}
+ y{"d MMM y - d MMM y"}
+ }
+ yMd{
+ M{"d/M/y - d/M/y"}
+ d{"d/M/y - d/M/y"}
+ y{"d/M/y - d/M/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"ព្រឹក",
@@ -140,7 +278,7 @@
"EEEE, d MMMM y",
"d MMMM, y",
"d MMM y",
- "d/M/yyyy",
+ "d/M/y",
"{1}, {0}",
"{1}, {0}",
"{1}, {0}",
@@ -261,45 +399,6 @@
"គ្រិស្តសករាជ",
}
}
- fields{
- day{
- dn{"ថ្ងៃ"}
- relative{
- "-1"{"ម្សិលមិញ"}
- "-2"{"ម្សិលម៉្ងៃ"}
- "0"{"ថ្ងៃនេះ"}
- "1"{"ថ្ងៃស្អែក"}
- "2"{"ខានស្អែក"}
- }
- }
- dayperiod{
- dn{"ព្រឹក/ល្ងាច"}
- }
- era{
- dn{"សករាជ"}
- }
- hour{
- dn{"ម៉ោង"}
- }
- minute{
- dn{"នាទី"}
- }
- month{
- dn{"ខែ"}
- }
- second{
- dn{"វិនាទី"}
- }
- week{
- dn{"សប្ដាហ៍"}
- }
- weekday{
- dn{"ថ្ងៃនៃសប្ដាហ៍"}
- }
- year{
- dn{"ឆ្នាំ"}
- }
- }
intervalFormats{
H{
H{"H-H"}
@@ -363,26 +462,26 @@
y{"y-y"}
}
yM{
- M{"M/yyyy - M/yyyy"}
- y{"M/yyyy - M/yyyy"}
+ M{"M/y - M/y"}
+ y{"M/y - M/y"}
}
yMEd{
- M{"E, d/M/yyyy - E, d/M/yyyy"}
- d{"E, d/M/yyyy - E, d/M/yyyy"}
- y{"E, d/M/yyyy - E, d/M/yyyy"}
+ M{"E, d/M/y - E, d/M/y"}
+ d{"E, d/M/y - E, d/M/y"}
+ y{"E, d/M/y - E, d/M/y"}
}
yMMM{
- M{"MM – MM-yyyy"}
- y{"MM-yyyy – MM-yyyy"}
+ M{"MM – MM-y"}
+ y{"MM-y – MM-y"}
}
yMMMEd{
M{"E, dd MMM y - E, dd MMM y"}
d{"E, dd MMM y - E, dd MMM y"}
- y{"E, dd-MM-yyyy – E, dd MMM y"}
+ y{"E, dd-MM-y – E, dd MMM y"}
}
yMMMM{
- M{"MM – MM yyyy"}
- y{"MM-yyyy – MM-yyyy"}
+ M{"MM – MM y"}
+ y{"MM-y – MM-y"}
}
yMMMd{
M{"d MMM y – d MMM"}
@@ -390,9 +489,9 @@
y{"d MMM y - d MMM y"}
}
yMd{
- M{"d/M/yyyy - d/M/yyyy"}
- d{"d/M/yyyy - d/M/yyyy"}
- y{"d/M/yyyy - d/M/yyyy"}
+ M{"d/M/y - d/M/y"}
+ d{"d/M/y - d/M/y"}
+ y{"d/M/y - d/M/y"}
}
}
monthNames{
@@ -535,6 +634,45 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"ថ្ងៃ"}
+ relative{
+ "-1"{"ម្សិលមិញ"}
+ "-2"{"ម្សិលម៉្ងៃ"}
+ "0"{"ថ្ងៃនេះ"}
+ "1"{"ថ្ងៃស្អែក"}
+ "2"{"ខានស្អែក"}
+ }
+ }
+ dayperiod{
+ dn{"ព្រឹក/ល្ងាច"}
+ }
+ era{
+ dn{"សករាជ"}
+ }
+ hour{
+ dn{"ម៉ោង"}
+ }
+ minute{
+ dn{"នាទី"}
+ }
+ month{
+ dn{"ខែ"}
+ }
+ second{
+ dn{"វិនាទី"}
+ }
+ week{
+ dn{"សប្ដាហ៍"}
+ }
+ weekday{
+ dn{"ថ្ងៃនៃសប្ដាហ៍"}
+ }
+ year{
+ dn{"ឆ្នាំ"}
+ }
+ }
listPattern{
standard{
2{"{0} និង {1}"}
diff --git a/data/locales/km_KH.txt b/data/locales/km_KH.txt
index 6a52f7d..927daa8 100644
--- a/data/locales/km_KH.txt
+++ b/data/locales/km_KH.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/km_KH.xml
// *
// ***************************************************************************
km_KH{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/kn.txt b/data/locales/kn.txt
index 6f5eca3..a66bfa3 100644
--- a/data/locales/kn.txt
+++ b/data/locales/kn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kn.xml
// *
@@ -127,8 +127,150 @@
}
native{"knda"}
}
- Version{"2.0.78.40"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "hh:mm:ss a zzzz",
+ "hh:mm:ss a z",
+ "hh:mm:ss a",
+ "hh:mm a",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d-M-yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d/M"}
+ MMM{"LLL"}
+ MMMEd{"E, d MMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMdd{"dd-MM"}
+ Md{"d/M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMM{"MM-y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d, MMM, y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E,d/M-E.d/M"}
+ d{"E,d/M-E.d/M"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E, d MMM - E, d MMM"}
+ d{"E,d MMM - E,d MMM"}
+ }
+ MMMd{
+ M{"d MMM - d MMM"}
+ d{"d –d MMM"}
+ }
+ Md{
+ M{"d/M – d/M"}
+ d{"d/M - d/M"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h-h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
+ }
+ yMEd{
+ M{"E, d/M/y - E, d/M/y"}
+ d{"E, d/M/y - E, d/M/y"}
+ y{"E, d/M/y - E, d/M/y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y - MMM y"}
+ }
+ yMMMEd{
+ M{"E,d MMM - E,d MMM, y"}
+ d{"E,d MMM - E,d MMM, y"}
+ y{"E,d MMM, y - E,d MMM, y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"d MMM - d MMM, y"}
+ d{"d, MMM –d y"}
+ y{"d, MMM, y - d, MMM, y"}
+ }
+ yMd{
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"AM",
@@ -170,14 +312,14 @@
y{"y"}
yM{"M/y"}
yMEd{"E, M/d/y"}
+ yMM{"MM-y"}
yMMM{"MMM y"}
yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
yMMMd{"d, MMM, y"}
yMd{"d/M/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyyyMM{"MM-yyyy"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -240,63 +382,6 @@
"ಕ್ರಿಸ್ತ ಶಕ",
}
}
- fields{
- day{
- dn{"ದಿನ"}
- relative{
- "-1"{"ನಿನ್ನೆ"}
- "-2"{"ಮೊನ್ನೆ"}
- "0"{"ಇಂದು"}
- "1"{"ನಾಳೆ"}
- "2"{"ನಾಡಿದ್ದು"}
- }
- }
- dayperiod{
- dn{"ಪೂರ್ವಾಹ್ನ/ಅಪರಾಹ್ನ"}
- }
- era{
- dn{"ಯುಗ"}
- }
- hour{
- dn{"ಗಂಟೆ"}
- }
- minute{
- dn{"ನಿಮಿಷ"}
- }
- month{
- dn{"ತಿಂಗಳು"}
- relative{
- "-1"{"ಕಳೆದ ತಿಂಗಳು"}
- "0"{"ಈ ತಿಂಗಳು"}
- "1"{"ಮುಂದಿನ ತಿಂಗಳು"}
- }
- }
- second{
- dn{"ಸೆಕೆಂಡ್"}
- }
- week{
- dn{"ವಾರ"}
- relative{
- "-1"{"ಕೊನೆಯ ವಾರ"}
- "0"{"ಈ ವಾರ"}
- "1"{"ಮುಂದಿನ ವಾರ"}
- }
- }
- weekday{
- dn{"ವಾರದ ದಿನ"}
- }
- year{
- dn{"ವರ್ಷ"}
- relative{
- "-1"{"ಕೊನೆಯ ವರ್ಷ"}
- "0"{"ಈ ವರ್ಷ"}
- "1"{"ಮುಂದಿನ ವರ್ಷ"}
- }
- }
- zone{
- dn{"ಸಮಯ ವಲಯ:"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -360,13 +445,13 @@
y{"y–y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E, d/M/yy - E, d/M/yy"}
- d{"E, d/M/yy - E, d/M/yy"}
- y{"E, d/M/yy - E, d/M/yy"}
+ M{"E, d/M/y - E, d/M/y"}
+ d{"E, d/M/y - E, d/M/y"}
+ y{"E, d/M/y - E, d/M/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -387,9 +472,9 @@
y{"d, MMM, y - d, MMM, y"}
}
yMd{
- M{"d/M/yy – d/M/yy"}
- d{"d/M/yy – d/M/yy"}
- y{"d/M/yy – d/M/yy"}
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
}
}
monthNames{
@@ -504,6 +589,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"ದಿನ"}
+ relative{
+ "-1"{"ನಿನ್ನೆ"}
+ "-2"{"ಮೊನ್ನೆ"}
+ "0"{"ಇಂದು"}
+ "1"{"ನಾಳೆ"}
+ "2"{"ನಾಡಿದ್ದು"}
+ }
+ }
+ dayperiod{
+ dn{"ಪೂರ್ವಾಹ್ನ/ಅಪರಾಹ್ನ"}
+ }
+ era{
+ dn{"ಯುಗ"}
+ }
+ hour{
+ dn{"ಗಂಟೆ"}
+ }
+ minute{
+ dn{"ನಿಮಿಷ"}
+ }
+ month{
+ dn{"ತಿಂಗಳು"}
+ relative{
+ "-1"{"ಕಳೆದ ತಿಂಗಳು"}
+ "0"{"ಈ ತಿಂಗಳು"}
+ "1"{"ಮುಂದಿನ ತಿಂಗಳು"}
+ }
+ }
+ second{
+ dn{"ಸೆಕೆಂಡ್"}
+ }
+ week{
+ dn{"ವಾರ"}
+ relative{
+ "-1"{"ಕೊನೆಯ ವಾರ"}
+ "0"{"ಈ ವಾರ"}
+ "1"{"ಮುಂದಿನ ವಾರ"}
+ }
+ }
+ weekday{
+ dn{"ವಾರದ ದಿನ"}
+ }
+ year{
+ dn{"ವರ್ಷ"}
+ relative{
+ "-1"{"ಕೊನೆಯ ವರ್ಷ"}
+ "0"{"ಈ ವರ್ಷ"}
+ "1"{"ಮುಂದಿನ ವರ್ಷ"}
+ }
+ }
+ zone{
+ dn{"ಸಮಯ ವಲಯ:"}
+ }
+ }
listPattern{
standard{
2{"{0} ಮತ್ತು {1}"}
diff --git a/data/locales/kn_IN.txt b/data/locales/kn_IN.txt
index 5c3f7a5..db5f6a4 100644
--- a/data/locales/kn_IN.txt
+++ b/data/locales/kn_IN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kn_IN.xml
// *
// ***************************************************************************
kn_IN{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ko.txt b/data/locales/ko.txt
index 56b7175..f93c478 100644
--- a/data/locales/ko.txt
+++ b/data/locales/ko.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ko.xml
// *
@@ -11,35 +11,34 @@
*/
ko{
AuxExemplarCharacters{
- "[丘 串 乃 久 乖 九 乞 乫 乾 亂 亘 交 京 仇 今 介 件 价 企 伋 伎 伽 佳 佶 侃 來 侊 供 係 俓 俱 個 倞 倦 倨 假 偈 健"
- " 傀 傑 傾 僅 僑 價 儆 儉 儺 光 克 兢 內 公 共 其 具 兼 冀 冠 凱 刊 刮 券 刻 剋 剛 劇 劍 劒 功 加 劤 劫 勁 勍 勘 勤"
- " 勸 勻 勾 匡 匣 區 南 卦 却 卵 卷 卿 厥 去 及 口 句 叩 叫 可 各 吉 君 告 呱 呵 咎 咬 哥 哭 啓 喀 喇 喝 喫 喬 嗜 嘉"
- " 嘔 器 囊 困 固 圈 國 圭 圻 均 坎 坑 坤 坰 坵 垢 基 埼 堀 堅 堈 堪 堺 塊 塏 境 墾 壙 壞 夔 奇 奈 奎 契 奸 妓 妗 姑"
- " 姜 姦 娘 娜 嫁 嬌 孔 季 孤 宏 官 客 宮 家 寄 寇 寡 寬 尻 局 居 屆 屈 岐 岡 岬 崎 崑 崗 嵌 嵐 嶇 嶠 工 巧 巨 己 巾"
- " 干 幹 幾 庚 庫 康 廊 廐 廓 廣 建 弓 强 彊 徑 忌 急 怪 怯 恐 恝 恪 恭 悸 愆 感 愧 愷 愾 慊 慣 慤 慨 慶 慷 憩 憬 憾"
- " 懃 懇 懦 懶 懼 戈 戒 戟 戡 扱 技 抉 拉 拏 拐 拒 拘 括 拮 拱 拳 拷 拿 捏 据 捲 捺 掘 掛 控 揀 揆 揭 擊 擎 擒 據 擧"
- " 攪 攷 改 攻 故 敎 救 敢 敬 敲 斛 斤 旗 旣 昆 昑 景 晷 暇 暖 暠 暻 曠 曲 更 曷 朗 朞 期 机 杆 杞 杰 枏 果 枯 架 枸"
- " 柑 柩 柬 柯 校 根 格 桀 桂 桔 桿 梏 梗 械 梱 棄 棋 棍 棘 棨 棺 楗 楠 極 槁 構 槐 槨 槪 槻 槿 樂 橄 橋 橘 機 檄 檎"
- " 檢 櫃 欄 權 欺 款 歌 歐 歸 殼 毆 毬 氣 求 江 汨 汲 決 汽 沂 沽 洛 洸 浪 涇 淃 淇 減 渠 渴 湳 溝 溪 滑 滾 漑 潔 潰"
- " 澗 激 濫 灌 灸 炅 炚 炬 烙 烱 煖 爛 牽 犬 狂 狗 狡 狼 獗 玖 玘 珂 珏 珖 珙 珞 珪 球 琦 琨 琪 琯 琴 瑾 璂 璟 璣 璥"
- " 瓊 瓘 瓜 甄 甘 甲 男 畇 界 畸 畺 畿 疆 疥 疳 痂 痙 痼 癎 癩 癸 皆 皎 皐 盖 監 看 眷 睾 瞰 瞼 瞿 矜 矩 矯 硅 硬 碁"
- " 碣 磎 磬 磯 磵 祁 祇 祈 祛 祺 禁 禽 科 稈 稼 稽 稿 穀 究 穹 空 窘 窟 窮 窺 竅 竟 竭 競 竿 筋 筐 筠 箇 箕 箝 管 簡"
- " 粳 糠 系 糾 紀 納 紘 級 紺 絅 結 絞 給 絳 絹 絿 經 綱 綺 緊 繫 繭 繼 缺 罐 罫 羅 羈 羌 羔 群 羹 翹 考 耆 耉 耕 耭"
- " 耿 肌 肝 股 肩 肯 肱 胛 胱 脚 脛 腔 腱 膈 膏 膠 臘 臼 舅 舊 舡 艮 艱 芎 芥 芩 芹 苛 苟 苦 苽 茄 莖 菅 菊 菌 菓 菫"
- " 菰 落 葛 葵 蓋 蕎 蕨 薑 藁 藍 藿 蘭 蘿 虔 蚣 蛟 蝎 螺 蠟 蠱 街 衢 衲 衾 衿 袈 袞 袴 裙 裸 褐 襁 襟 襤 見 規 覡 覲"
- " 覺 觀 角 計 記 訣 訶 詭 誇 誡 誥 課 諫 諾 謙 講 謳 謹 譏 警 譴 谷 谿 豈 貢 貫 貴 賈 購 赳 起 跏 距 跨 踞 蹇 蹶 躬"
- " 軀 車 軌 軍 軻 較 輕 轎 轟 辜 近 迦 迲 适 逑 逕 逵 過 遣 遽 邏 那 邯 邱 郊 郎 郡 郭 酪 醵 金 鈐 鈞 鉀 鉅 鉗 鉤 銶"
- " 鋸 鋼 錡 錤 錦 錮 鍋 鍵 鎌 鎧 鏡 鑑 鑒 鑛 開 間 閘 閣 閨 闕 關 降 階 隔 隙 雇 難 鞏 鞠 鞨 鞫 頃 頸 顆 顧 飢 餃 館"
- " 饉 饋 饑 駒 駕 駱 騎 騏 騫 驅 驕 驚 驥 骨 高 鬼 魁 鮫 鯤 鯨 鱇 鳩 鵑 鵠 鷄 鷗 鸞 麒 麴 黔 鼓 龕 龜]"
+ "[ᄀ-ᄒ ᅡ-ᅵ ᆨ-ᇂ 丘 串 乃 久 乖 九 乞 乫 乾 亂 亘 交 京 仇 今 介 件 价 企 伋 伎 伽 佳 佶 侃 來 侊 供 係 俓 俱 個"
+ " 倞 倦 倨 假 偈 健 傀 傑 傾 僅 僑 價 儆 儉 儺 光 克 兢 內 公 共 其 具 兼 冀 冠 凱 刊 刮 券 刻 剋 剛 劇 劍 劒 功 加"
+ " 劤 劫 勁 勍 勘 勤 勸 勻 勾 匡 匣 區 南 卦 却 卵 卷 卿 厥 去 及 口 句 叩 叫 可 各 吉 君 告 呱 呵 咎 咬 哥 哭 啓 喀"
+ " 喇 喝 喫 喬 嗜 嘉 嘔 器 囊 困 固 圈 國 圭 圻 均 坎 坑 坤 坰 坵 垢 基 埼 堀 堅 堈 堪 堺 塊 塏 境 墾 壙 壞 夔 奇 奈"
+ " 奎 契 奸 妓 妗 姑 姜 姦 娘 娜 嫁 嬌 孔 季 孤 宏 官 客 宮 家 寄 寇 寡 寬 尻 局 居 屆 屈 岐 岡 岬 崎 崑 崗 嵌 嵐 嶇"
+ " 嶠 工 巧 巨 己 巾 干 幹 幾 庚 庫 康 廊 廐 廓 廣 建 弓 强 彊 徑 忌 急 怪 怯 恐 恝 恪 恭 悸 愆 感 愧 愷 愾 慊 慣 慤"
+ " 慨 慶 慷 憩 憬 憾 懃 懇 懦 懶 懼 戈 戒 戟 戡 扱 技 抉 拉 拏 拐 拒 拘 括 拮 拱 拳 拷 拿 捏 据 捲 捺 掘 掛 控 揀 揆"
+ " 揭 擊 擎 擒 據 擧 攪 攷 改 攻 故 敎 救 敢 敬 敲 斛 斤 旗 旣 昆 昑 景 晷 暇 暖 暠 暻 曠 曲 更 曷 朗 朞 期 机 杆 杞"
+ " 杰 枏 果 枯 架 枸 柑 柩 柬 柯 校 根 格 桀 桂 桔 桿 梏 梗 械 梱 棄 棋 棍 棘 棨 棺 楗 楠 極 槁 構 槐 槨 槪 槻 槿 樂"
+ " 橄 橋 橘 機 檄 檎 檢 櫃 欄 權 欺 款 歌 歐 歸 殼 毆 毬 氣 求 江 汨 汲 決 汽 沂 沽 洛 洸 浪 涇 淃 淇 減 渠 渴 湳 溝"
+ " 溪 滑 滾 漑 潔 潰 澗 激 濫 灌 灸 炅 炚 炬 烙 烱 煖 爛 牽 犬 狂 狗 狡 狼 獗 玖 玘 珂 珏 珖 珙 珞 珪 球 琦 琨 琪 琯"
+ " 琴 瑾 璂 璟 璣 璥 瓊 瓘 瓜 甄 甘 甲 男 畇 界 畸 畺 畿 疆 疥 疳 痂 痙 痼 癎 癩 癸 皆 皎 皐 盖 監 看 眷 睾 瞰 瞼 瞿"
+ " 矜 矩 矯 硅 硬 碁 碣 磎 磬 磯 磵 祁 祇 祈 祛 祺 禁 禽 科 稈 稼 稽 稿 穀 究 穹 空 窘 窟 窮 窺 竅 竟 竭 競 竿 筋 筐"
+ " 筠 箇 箕 箝 管 簡 粳 糠 系 糾 紀 納 紘 級 紺 絅 結 絞 給 絳 絹 絿 經 綱 綺 緊 繫 繭 繼 缺 罐 罫 羅 羈 羌 羔 群 羹"
+ " 翹 考 耆 耉 耕 耭 耿 肌 肝 股 肩 肯 肱 胛 胱 脚 脛 腔 腱 膈 膏 膠 臘 臼 舅 舊 舡 艮 艱 芎 芥 芩 芹 苛 苟 苦 苽 茄"
+ " 莖 菅 菊 菌 菓 菫 菰 落 葛 葵 蓋 蕎 蕨 薑 藁 藍 藿 蘭 蘿 虔 蚣 蛟 蝎 螺 蠟 蠱 街 衢 衲 衾 衿 袈 袞 袴 裙 裸 褐 襁"
+ " 襟 襤 見 規 覡 覲 覺 觀 角 計 記 訣 訶 詭 誇 誡 誥 課 諫 諾 謙 講 謳 謹 譏 警 譴 谷 谿 豈 貢 貫 貴 賈 購 赳 起 跏"
+ " 距 跨 踞 蹇 蹶 躬 軀 車 軌 軍 軻 較 輕 轎 轟 辜 近 迦 迲 适 逑 逕 逵 過 遣 遽 邏 那 邯 邱 郊 郎 郡 郭 酪 醵 金 鈐"
+ " 鈞 鉀 鉅 鉗 鉤 銶 鋸 鋼 錡 錤 錦 錮 鍋 鍵 鎌 鎧 鏡 鑑 鑒 鑛 開 間 閘 閣 閨 闕 關 降 階 隔 隙 雇 難 鞏 鞠 鞨 鞫 頃"
+ " 頸 顆 顧 飢 餃 館 饉 饋 饑 駒 駕 駱 騎 騏 騫 驅 驕 驚 驥 骨 高 鬼 魁 鮫 鯤 鯨 鱇 鳩 鵑 鵠 鷄 鷗 鸞 麒 麴 黔 鼓 龕"
+ " 龜]"
}
ExemplarCharacters{"[가-힣]"}
- // BEGIN android-changed -- CLDR ticket#5521
ExemplarCharactersIndex{"[ㄱ ㄴ ㄷ ㄹ ㅁ ㅂ ㅅ ㅇ ㅈ ㅊ ㅋ ㅌ ㅍ ㅎ]"}
- // END android-changed
ExemplarCharactersPunctuation{
- "[‾ _ ＿ \- － ‐ — ― 〜 ・ , ， 、 ; ； \: ： ! ！ ¡ ? ？ ¿ . ． ‥ … 。 · ＇ ‘ ’ \" ＂ “ ” "
- "( （ ) ） \[ ［ \] ］ \{ ｛ \} ｝ 〈 〉 《 》 「 」 『 』 【 】 〔 〕 § ¶ @ ＠ * ＊ / ／ \\ ＼ \& "
- "＆ # ＃ % ％ ‰ † ‡ ′ ″ 〃 ※]"
+ "[‾ _ ＿ \\- － ‐ — ― 〜 ・ , ， 、 ; ； \\: ： ! ！ ¡ ? ？ ¿ . ． ‥ … 。 · ＇ ‘ ’ \u0022 "
+ "＂ “ ” ( （ ) ） \\[ ［ \\] ］ \\{ ｛ \\} ｝ 〈 〉 《 》 「 」 『 』 【 】 〔 〕 § ¶ @ ＠ * ＊ / "
+ "／ \\\\ ＼ \\& ＆ # ＃ % ％ ‰ † ‡ ′ ″ 〃 ※]"
}
LocaleScript{
"Hang",
@@ -147,61 +146,9 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
calendar{
buddhist{
- DateTimePatterns{
- "a h시 m분 s초 zzzz",
- "a h시 m분 s초 z",
- "a h:mm:ss",
- "a h:mm",
- "G y년 M월 d일 EEEE",
- "G y년 M월 d일",
- "G y. M. d",
- "G y. M. d",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- EEEEd{"d일 EEEE"}
- Ed{"d일 (E)"}
- Gy{"G y년"}
- H{"H시"}
- HHmmss{"HH:mm:ss"}
- Hm{"HH:mm"}
- Hms{"H시 m분 s초"}
- M{"M월"}
- MEEEEd{"M. d. EEEE"}
- MEd{"M. d. (E)"}
- MMM{"LLL"}
- MMMEd{"MMM d일 (E)"}
- MMMd{"MMM d일"}
- MMdd{"MM. dd"}
- Md{"M. d."}
- d{"d일"}
- h{"a h시"}
- hm{"a h:mm"}
- hms{"a h:mm:ss"}
- mmss{"mm:ss"}
- ms{"mm:ss"}
- y{"G y년"}
- yM{"G y. M."}
- yMEd{"G y. M. d. (E)"}
- yMMM{"G y년 MMM"}
- yMMMEEEEd{"G y년 MMM d일 EEEE"}
- yMMMEd{"G y년 MMM d일 (E)"}
- yMMMd{"G y년 MMM d일"}
- yMd{"G y. M. d."}
- yQQQ{"G y년 QQQ"}
- yQQQQ{"G y년 QQQQ"}
- yyMM{"G yy. M."}
- yyMMM{"G y년 MMM"}
- yyQQQ{"G y년 QQQ"}
- yyyyMM{"G y. MM"}
- }
eras{
abbreviated{
"불기",
@@ -227,12 +174,18 @@
availableFormats{
EEEEd{"d일 EEEE"}
Ed{"d일 (E)"}
+ Gy{"U년"}
+ GyMMM{"U년 MMM"}
+ GyMMMEEEEd{"U년 MMM d일 EEEE"}
+ GyMMMEd{"U년 MMM d일 (E)"}
+ GyMMMd{"U년 MMM d일"}
H{"H시"}
Hms{"H시 m분 s초"}
M{"M월"}
MEEEEd{"M. d. EEEE"}
MEd{"M. d. (E)"}
MMM{"LLL"}
+ MMMEEEEd{"MMM d일 EEEE"}
MMMEd{"MMM d일 (E)"}
MMMd{"MMM d일"}
Md{"M. d."}
@@ -241,15 +194,18 @@
hm{"a h:mm"}
hms{"a h:mm:ss"}
y{"U년"}
- yM{"U. M."}
- yMEd{"U. M. d. (E)"}
- yMMM{"U년 MMM"}
- yMMMEEEEd{"U년 MMM d일 EEEE"}
- yMMMEd{"U년 MMM d일 (E)"}
- yMMMd{"U년 MMM d일"}
yMd{"U. M. d."}
- yQQQ{"U년 QQQ"}
- yQQQQ{"U년 QQQQ"}
+ yyyy{"U년"}
+ yyyyM{"U. M."}
+ yyyyMEEEEd{"U. M. d. EEEE"}
+ yyyyMEd{"U. M. d. (E)"}
+ yyyyMMM{"U년 MMM"}
+ yyyyMMMEEEEd{"U년 MMM d일 EEEE"}
+ yyyyMMMEd{"U년 MMM d일 (E)"}
+ yyyyMMMd{"U년 MMM d일"}
+ yyyyMd{"U. M. d."}
+ yyyyQQQ{"U년 QQQ"}
+ yyyyQQQQ{"U년 QQQQ"}
}
cyclicNameSets{
years{
@@ -320,6 +276,168 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "a h시 m분 s초 zzzz",
+ "a h시 m분 s초 z",
+ "a h:mm:ss",
+ "a h:mm",
+ "G y년 M월 d일 EEEE",
+ "G y년 M월 d일",
+ "G y. M. d.",
+ "G y. M. d.",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ EEEEd{"d일 EEEE"}
+ Ed{"d일 (E)"}
+ Gy{"G y년"}
+ GyMMM{"G y년 MMM"}
+ GyMMMEEEEd{"G y년 MMM d일 EEEE"}
+ GyMMMEd{"G y년 MMM d일 (E)"}
+ GyMMMd{"G y년 MMM d일"}
+ H{"H시"}
+ HHmmss{"HH:mm:ss"}
+ Hm{"HH:mm"}
+ Hms{"H시 m분 s초"}
+ M{"M월"}
+ MEEEEd{"M. d. EEEE"}
+ MEd{"M. d. (E)"}
+ MMM{"LLL"}
+ MMMEEEEd{"MMM d일 EEEE"}
+ MMMEd{"MMM d일 (E)"}
+ MMMd{"MMM d일"}
+ Md{"M. d."}
+ d{"d일"}
+ h{"a h시"}
+ hm{"a h:mm"}
+ hms{"a h:mm:ss"}
+ ms{"mm:ss"}
+ y{"G y년"}
+ yyyy{"G y년"}
+ yyyyM{"G y. M."}
+ yyyyMEEEEd{"G y. M. d. EEEE"}
+ yyyyMEd{"G y. M. d. (E)"}
+ yyyyMMM{"G y년 MMM"}
+ yyyyMMMEEEEd{"G y년 MMM d일 EEEE"}
+ yyyyMMMEd{"G y년 MMM d일 (E)"}
+ yyyyMMMd{"G y년 MMM d일"}
+ yyyyMd{"G y. M. d."}
+ yyyyQQQ{"G y년 QQQ"}
+ yyyyQQQQ{"G y년 QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"HH ~ HH시"}
+ }
+ Hm{
+ H{"HH:mm ~ HH:mm"}
+ m{"HH:mm ~ HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm ~ HH:mm v"}
+ m{"HH:mm ~ HH:mm v"}
+ }
+ Hv{
+ H{"HH ~ HH시 v"}
+ }
+ M{
+ M{"M월 ~ M월"}
+ }
+ MEd{
+ M{"M. d (E) ~ M. d (E)"}
+ d{"M. d (E) ~ M. d (E)"}
+ }
+ MMM{
+ M{"MMM ~ MMM"}
+ }
+ MMMEEEEd{
+ M{"M월 d일 EEEE ~ M월 d일 EEEE"}
+ d{"M월 d일 EEEE ~ d일 EEEE"}
+ }
+ MMMEd{
+ M{"M월 d일 (E) ~ M월 d일 (E)"}
+ d{"M월 d일 (E) ~ d일 (E)"}
+ }
+ MMMM{
+ M{"LLLL-LLLL"}
+ }
+ MMMd{
+ M{"M월 d일 ~ M월 d일"}
+ d{"M월 d일 ~ d일"}
+ }
+ Md{
+ M{"M. d ~ M. d"}
+ d{"M. d ~ M. d"}
+ }
+ d{
+ d{"d일 ~ d일"}
+ }
+ fallback{"{0} ~ {1}"}
+ h{
+ a{"a h시 ~ a h시"}
+ h{"a h시 ~ h시"}
+ }
+ hm{
+ a{"a h:mm ~ a h:mm"}
+ h{"a h:mm~h:mm"}
+ m{"a h:mm~h:mm"}
+ }
+ hmv{
+ a{"a h:mm ~ a h:mm v"}
+ h{"a h:mm~h:mm v"}
+ m{"a h:mm~h:mm v"}
+ }
+ hv{
+ a{"a h시 ~ a h시(v)"}
+ h{"a h시 ~ h시(v)"}
+ }
+ y{
+ y{"G y년 ~ y년"}
+ }
+ yM{
+ M{"G y. M ~ y. M"}
+ y{"G y. M ~ y. M"}
+ }
+ yMEd{
+ M{"G y. M. d. (E) ~ y. M. d. (E)"}
+ d{"G y. M. d. (E) ~ y. M. d. (E)"}
+ y{"G y. M. d. (E) ~ y. M. d. (E)"}
+ }
+ yMMM{
+ M{"G y년 M월~M월"}
+ y{"G y년 M월 ~ y년 M월"}
+ }
+ yMMMEEEEd{
+ M{"G y년 M월 d일 EEEE ~ M월 d일 EEEE"}
+ d{"G y년 M월 d일 EEEE ~ d일 EEEE"}
+ y{"G y년 M월 d일 EEEE ~ y년 M월 d일 EEEE"}
+ }
+ yMMMEd{
+ M{"G y년 M월 d일 (E) ~ M월 d일 (E)"}
+ d{"G y년 M월 d일 (E) ~ d일 (E)"}
+ y{"G y년 M월 d일 (E) ~ y년 M월 d일 (E)"}
+ }
+ yMMMM{
+ M{"G y년 MM월 ~ MM월"}
+ y{"G y년 MM월 ~ y년 MM월"}
+ }
+ yMMMd{
+ M{"G y년 M월 d일 ~ M월 d일"}
+ d{"G y년 M월 d일~d일"}
+ y{"G y년 M월 d일 ~ y년 M월 d일"}
+ }
+ yMd{
+ M{"G y. M. d. ~ y. M. d."}
+ d{"G y. M. d. ~ y. M. d."}
+ y{"G y. M. d. ~ y. M. d."}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"오전",
@@ -332,7 +450,7 @@
"a h:mm",
"y년 M월 d일 EEEE",
"y년 M월 d일",
- "yyyy. M. d.",
+ "y. M. d.",
"yy. M. d.",
"{1} {0}",
"{1} {0}",
@@ -343,6 +461,11 @@
availableFormats{
EEEEd{"d일 EEEE"}
Ed{"d일 (E)"}
+ Gy{"G y년"}
+ GyMMM{"G y년 MMM"}
+ GyMMMEEEEd{"G y년 MMM d일 EEEE"}
+ GyMMMEd{"G y년 MMM d일 (E)"}
+ GyMMMd{"G y년 MMM d일"}
H{"H시"}
HHmmss{"HH:mm:ss"}
Hm{"HH:mm"}
@@ -351,9 +474,9 @@
MEEEEd{"M. d. EEEE"}
MEd{"M. d. (E)"}
MMM{"LLL"}
+ MMMEEEEd{"MMM d일 EEEE"}
MMMEd{"MMM d일 (E)"}
MMMd{"MMM d일"}
- MMdd{"MM. dd"}
Md{"M. d."}
d{"d일"}
h{"a h시"}
@@ -362,18 +485,17 @@
mmss{"mm:ss"}
ms{"mm:ss"}
y{"y년"}
- yM{"yyyy. M."}
- yMEd{"yyyy. M. d. (E)"}
+ yM{"y. M."}
+ yMEEEEd{"y. M. d. EEEE"}
+ yMEd{"y. M. d. (E)"}
+ yMM{"y. M."}
yMMM{"y년 MMM"}
yMMMEEEEd{"y년 MMM d일 EEEE"}
yMMMEd{"y년 MMM d일 (E)"}
yMMMd{"y년 MMM d일"}
- yMd{"yyyy. M. d."}
+ yMd{"y. M. d."}
yQQQ{"y년 QQQ"}
yQQQQ{"y년 QQQQ"}
- yyMM{"yy. M."}
- yyMMM{"yy년 MMM"}
- yyyyMM{"yyyy. MM"}
}
dayNames{
format{
@@ -436,63 +558,6 @@
"서력기원",
}
}
- fields{
- day{
- dn{"일"}
- relative{
- "-1"{"어제"}
- "-2"{"그저께"}
- "0"{"오늘"}
- "1"{"내일"}
- "2"{"모레"}
- }
- }
- dayperiod{
- dn{"오전/오후"}
- }
- era{
- dn{"연호"}
- }
- hour{
- dn{"시"}
- }
- minute{
- dn{"분"}
- }
- month{
- dn{"월"}
- relative{
- "-1"{"지난달"}
- "0"{"이번 달"}
- "1"{"다음 달"}
- }
- }
- second{
- dn{"초"}
- }
- week{
- dn{"주"}
- relative{
- "-1"{"지난주"}
- "0"{"이번 주"}
- "1"{"다음 주"}
- }
- }
- weekday{
- dn{"요일"}
- }
- year{
- dn{"년"}
- relative{
- "-1"{"지난해"}
- "0"{"올해"}
- "1"{"내년"}
- }
- }
- zone{
- dn{"시간대"}
- }
- }
intervalFormats{
H{
H{"HH ~ HH시"}
@@ -559,13 +624,13 @@
y{"y년 ~ y년"}
}
yM{
- M{"yyyy. M ~ yyyy. M"}
- y{"yyyy. M ~ yyyy. M"}
+ M{"y. M ~ y. M"}
+ y{"y. M ~ y. M"}
}
yMEd{
- M{"yy. M. d. (E) ~ yy. M. d. (E)"}
- d{"yy. M. d. (E) ~ yy. M. d. (E)"}
- y{"yy. M. d. (E) ~ yy. M. d. (E)"}
+ M{"y. M. d. (E) ~ y. M. d. (E)"}
+ d{"y. M. d. (E) ~ y. M. d. (E)"}
+ y{"y. M. d. (E) ~ y. M. d. (E)"}
}
yMMM{
M{"y년 M월~M월"}
@@ -591,9 +656,9 @@
y{"y년 M월 d일 ~ y년 M월 d일"}
}
yMd{
- M{"yy. M. d. ~ yy. M. d."}
- d{"yy. M. d. ~ yy. M. d."}
- y{"yy. M. d. ~ yy. M. d."}
+ M{"y. M. d. ~ y. M. d."}
+ d{"y. M. d. ~ y. M. d."}
+ y{"y. M. d. ~ y. M. d."}
}
}
monthNames{
@@ -661,59 +726,21 @@
}
}
}
+ hebrew{
+ eras{
+ abbreviated{
+ "AM",
+ }
+ }
+ }
+ islamic{
+ eras{
+ abbreviated{
+ "AH",
+ }
+ }
+ }
japanese{
- DateTimePatterns{
- "a h시 m분 s초 zzzz",
- "a h시 m분 s초 z",
- "a h:mm:ss",
- "a h:mm",
- "G y년 M월 d일 EEEE",
- "G y년 M월 d일",
- "G y. M. d",
- "G y. M. d",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- EEEEd{"d일 EEEE"}
- Ed{"d일 (E)"}
- Gy{"G yy년"}
- H{"H시"}
- HHmmss{"HH:mm:ss"}
- Hm{"HH:mm"}
- Hms{"H시 m분 s초"}
- M{"M월"}
- MEEEEd{"M. d. EEEE"}
- MEd{"M. d. (E)"}
- MMM{"LLL"}
- MMMEd{"MMM d일 (E)"}
- MMMd{"MMM d일"}
- MMdd{"MM. dd"}
- Md{"M. d."}
- d{"d일"}
- h{"a h시"}
- hm{"a h:mm"}
- hms{"a h:mm:ss"}
- mmss{"mm:ss"}
- ms{"mm:ss"}
- y{"G yy년"}
- yyMM{"G yy. M."}
- yyMMM{"G yy년 MMM"}
- yyQQQ{"G yy년 QQQ"}
- yyyy{"G yy년"}
- yyyyM{"G y. M."}
- yyyyMEd{"G y. M. d. (E)"}
- yyyyMM{"G y. MM"}
- yyyyMMM{"G y년 MMM"}
- yyyyMMMEEEEd{"G y년 MMM d일 EEEE"}
- yyyyMMMEd{"G y년 MMM d일 (E)"}
- yyyyMMMd{"G yy년 MMM d일"}
- yyyyQQQ{"G yy년 QQQ"}
- yyyyQQQQ{"G y년 QQQQ"}
- }
eras{
abbreviated{
"다이카 (645 ~ 650)",
@@ -956,57 +983,6 @@
}
}
roc{
- DateTimePatterns{
- "a h시 m분 s초 zzzz",
- "a h시 m분 s초 z",
- "a h:mm:ss",
- "a h:mm",
- "G y년 M월 d일 EEEE",
- "G y년 M월 d일",
- "G y. M. d",
- "G y. M. d",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- EEEEd{"d일 EEEE"}
- Ed{"d일 (E)"}
- H{"H시"}
- HHmmss{"HH:mm:ss"}
- Hm{"HH:mm"}
- Hms{"H시 m분 s초"}
- M{"M월"}
- MEEEEd{"M. d. EEEE"}
- MEd{"M. d. (E)"}
- MMM{"LLL"}
- MMMEd{"MMM d일 (E)"}
- MMMd{"MMM d일"}
- MMdd{"MM. dd"}
- Md{"M. d."}
- d{"d일"}
- h{"a h시"}
- hm{"a h:mm"}
- hms{"a h:mm:ss"}
- mmss{"mm:ss"}
- ms{"mm:ss"}
- yyMM{"G yy. M."}
- yyMMM{"G yy년 MMM"}
- yyQQQ{"G y년 QQQ"}
- yyyy{"G yy년"}
- yyyyM{"G y. M."}
- yyyyMEd{"G y. M. d. (E)"}
- yyyyMM{"G y. MM"}
- yyyyMMM{"G y년 MMM"}
- yyyyMMMEEEEd{"G y년 MMM d일 EEEE"}
- yyyyMMMEd{"G y년 MMM d일 (E)"}
- yyyyMMMd{"G yy년 MMM d일"}
- yyyyMd{"G y. M. d."}
- yyyyQQQ{"G y년 QQQ"}
- yyyyQQQQ{"G y년 QQQQ"}
- }
eras{
abbreviated{
"중화민국전",
@@ -1021,6 +997,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"일"}
+ relative{
+ "-1"{"어제"}
+ "-2"{"그저께"}
+ "0"{"오늘"}
+ "1"{"내일"}
+ "2"{"모레"}
+ }
+ }
+ dayperiod{
+ dn{"오전/오후"}
+ }
+ era{
+ dn{"연호"}
+ }
+ hour{
+ dn{"시"}
+ }
+ minute{
+ dn{"분"}
+ }
+ month{
+ dn{"월"}
+ relative{
+ "-1"{"지난달"}
+ "0"{"이번 달"}
+ "1"{"다음 달"}
+ }
+ }
+ second{
+ dn{"초"}
+ }
+ week{
+ dn{"주"}
+ relative{
+ "-1"{"지난주"}
+ "0"{"이번 주"}
+ "1"{"다음 주"}
+ }
+ }
+ weekday{
+ dn{"요일"}
+ }
+ year{
+ dn{"년"}
+ relative{
+ "-1"{"지난해"}
+ "0"{"올해"}
+ "1"{"내년"}
+ }
+ }
+ zone{
+ dn{"시간대"}
+ }
+ }
listPattern{
standard{
2{"{0} 및 {1}"}
diff --git a/data/locales/ko_KP.txt b/data/locales/ko_KP.txt
index 2a8b119..fb28e1c 100755
--- a/data/locales/ko_KP.txt
+++ b/data/locales/ko_KP.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ko_KP.xml
// *
// ***************************************************************************
ko_KP{
- Version{"2.0.76.82"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ko_KR.txt b/data/locales/ko_KR.txt
index 49ca991..0883212 100644
--- a/data/locales/ko_KR.txt
+++ b/data/locales/ko_KR.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ko_KR.xml
// *
// ***************************************************************************
ko_KR{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/kok.txt b/data/locales/kok.txt
index 1314fee..43afd74 100644
--- a/data/locales/kok.txt
+++ b/data/locales/kok.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kok.xml
// *
@@ -31,7 +31,7 @@
}
native{"deva"}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/data/locales/kok_IN.txt b/data/locales/kok_IN.txt
index b4a6945..b7bd381 100644
--- a/data/locales/kok_IN.txt
+++ b/data/locales/kok_IN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kok_IN.xml
// *
// ***************************************************************************
kok_IN{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ks.txt b/data/locales/ks.txt
index 1049e56..e29df4b 100755
--- a/data/locales/ks.txt
+++ b/data/locales/ks.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ks.xml
// *
@@ -42,17 +42,58 @@
}
native{"arabext"}
}
- Version{"2.0.78.55"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, MMMM d, y G",
+ "MMMM d, y G",
+ "MMM d, y G",
+ "M/d/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ GGGGyMMMMEEEEdd{"EEEE,dd MMMM GGGGy"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"d-MMM"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"EEE, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"EEE, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
DateTimePatterns{
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
- "EEEE, MMMM d, yyyy",
- "MMMM d, yyyy",
- "MMM d, yyyy",
+ "EEEE, MMMM d, y",
+ "MMMM d, y",
+ "MMM d, y",
"M/d/yy",
"{1} {0}",
"{1} {0}",
@@ -75,12 +116,12 @@
d{"d"}
hm{"h:mm a"}
ms{"mm:ss"}
- y{"yyyy"}
- yM{"M/yyyy"}
- yMEd{"EEE, M/d/yyyy"}
- yMMM{"MMM yyyy"}
- yMMMEd{"EEE, MMM d, yyyy"}
- yMMMM{"MMMM yyyy"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"EEE, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"EEE, MMM d, y"}
+ yMMMM{"MMMM y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
}
@@ -127,46 +168,6 @@
"عیٖسوی سنہٕ",
}
}
- fields{
- day{
- dn{"دۄہ"}
- relative{
- "-1"{"راتھ"}
- "0"{"اَز"}
- "1"{"پگاہ"}
- }
- }
- dayperiod{
- dn{"صبح/رات"}
- }
- era{
- dn{"دور"}
- }
- hour{
- dn{"گٲنٛٹہٕ"}
- }
- minute{
- dn{"مِنَٹ"}
- }
- month{
- dn{"رٮ۪تھ"}
- }
- second{
- dn{"سٮ۪کَنڑ"}
- }
- week{
- dn{"ہفتہٕ"}
- }
- weekday{
- dn{"ہفتُک دۄہ"}
- }
- year{
- dn{"ؤری"}
- }
- zone{
- dn{"زون"}
- }
- }
monthNames{
format{
wide{
@@ -239,9 +240,48 @@
}
}
}
+ fields{
+ day{
+ dn{"دۄہ"}
+ relative{
+ "-1"{"راتھ"}
+ "0"{"اَز"}
+ "1"{"پگاہ"}
+ }
+ }
+ dayperiod{
+ dn{"صبح/رات"}
+ }
+ era{
+ dn{"دور"}
+ }
+ hour{
+ dn{"گٲنٛٹہٕ"}
+ }
+ minute{
+ dn{"مِنَٹ"}
+ }
+ month{
+ dn{"رٮ۪تھ"}
+ }
+ second{
+ dn{"سٮ۪کَنڑ"}
+ }
+ week{
+ dn{"ہفتہٕ"}
+ }
+ weekday{
+ dn{"ہفتُک دۄہ"}
+ }
+ year{
+ dn{"ؤری"}
+ }
+ zone{
+ dn{"زون"}
+ }
+ }
layout{
characters{"right-to-left"}
- lines{"top-to-bottom"}
}
measurementSystemNames{
US{"یوٗ ایس"}
diff --git a/data/locales/ks_Arab.txt b/data/locales/ks_Arab.txt
index d173498..c789e3a 100755
--- a/data/locales/ks_Arab.txt
+++ b/data/locales/ks_Arab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ks_Arab.xml
// *
@@ -13,5 +13,5 @@
LocaleScript{
"Arab",
}
- Version{"2.0.75.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ks_Arab_IN.txt b/data/locales/ks_Arab_IN.txt
index 8ad9adc..9b0f200 100755
--- a/data/locales/ks_Arab_IN.txt
+++ b/data/locales/ks_Arab_IN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ks_Arab_IN.xml
// *
// ***************************************************************************
ks_Arab_IN{
- Version{"2.0.75.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ks_IN.txt b/data/locales/ks_IN.txt
index 558e1ea..fa6550f 100755
--- a/data/locales/ks_IN.txt
+++ b/data/locales/ks_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/ksb.txt b/data/locales/ksb.txt
index 2c78a0e..066e551 100755
--- a/data/locales/ksb.txt
+++ b/data/locales/ksb.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ksb.xml
// *
@@ -23,8 +23,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"makeo",
@@ -38,7 +78,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -111,46 +151,6 @@
"Baada ya Klisto",
}
}
- fields{
- day{
- dn{"Siku"}
- relative{
- "-1"{"Ghuo"}
- "0"{"Evi eo"}
- "1"{"Keloi"}
- }
- }
- dayperiod{
- dn{"Namshii"}
- }
- era{
- dn{"Mishi"}
- }
- hour{
- dn{"Saa"}
- }
- minute{
- dn{"Dakika"}
- }
- month{
- dn{"Ng'ezi"}
- }
- second{
- dn{"Sekunde"}
- }
- week{
- dn{"Niki"}
- }
- weekday{
- dn{"Mwesiku za wiki"}
- }
- year{
- dn{"Ng'waka"}
- }
- zone{
- dn{"Majila"}
- }
- }
monthNames{
format{
abbreviated{
@@ -223,4 +223,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Siku"}
+ relative{
+ "-1"{"Ghuo"}
+ "0"{"Evi eo"}
+ "1"{"Keloi"}
+ }
+ }
+ dayperiod{
+ dn{"Namshii"}
+ }
+ era{
+ dn{"Mishi"}
+ }
+ hour{
+ dn{"Saa"}
+ }
+ minute{
+ dn{"Dakika"}
+ }
+ month{
+ dn{"Ng'ezi"}
+ }
+ second{
+ dn{"Sekunde"}
+ }
+ week{
+ dn{"Niki"}
+ }
+ weekday{
+ dn{"Mwesiku za wiki"}
+ }
+ year{
+ dn{"Ng'waka"}
+ }
+ zone{
+ dn{"Majila"}
+ }
+ }
}
diff --git a/data/locales/ksb_TZ.txt b/data/locales/ksb_TZ.txt
index 73f7e4f..fafb2be 100755
--- a/data/locales/ksb_TZ.txt
+++ b/data/locales/ksb_TZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ksb_TZ.xml
// *
// ***************************************************************************
ksb_TZ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ksf.txt b/data/locales/ksf.txt
index ac88755..7a17dfa 100755
--- a/data/locales/ksf.txt
+++ b/data/locales/ksf.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ksf.xml
// *
@@ -31,8 +31,49 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d/M/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"sárúwá",
@@ -46,7 +87,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM y",
- "d/M/yyyy",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -120,46 +161,6 @@
"cámɛɛn kǝ kǝbɔpka Y",
}
}
- fields{
- day{
- dn{"Ŋwós"}
- relative{
- "-1"{"Rinkɔɔ́"}
- "0"{"Gɛ́ɛnǝ"}
- "1"{"Ridúrǝ́"}
- }
- }
- dayperiod{
- dn{"Sárúwá / Cɛɛ́nko"}
- }
- era{
- dn{"Byámɛɛn"}
- }
- hour{
- dn{"Cámɛɛn"}
- }
- minute{
- dn{"Mǝnít"}
- }
- month{
- dn{"Ŋwíí"}
- }
- second{
- dn{"Háu"}
- }
- week{
- dn{"Sɔ́ndǝ"}
- }
- weekday{
- dn{"Mǝrú mǝ sɔ́ndǝ"}
- }
- year{
- dn{"Bǝk"}
- }
- zone{
- dn{"Wáas"}
- }
- }
monthNames{
format{
abbreviated{
@@ -216,4 +217,44 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"Ŋwós"}
+ relative{
+ "-1"{"Rinkɔɔ́"}
+ "0"{"Gɛ́ɛnǝ"}
+ "1"{"Ridúrǝ́"}
+ }
+ }
+ dayperiod{
+ dn{"Sárúwá / Cɛɛ́nko"}
+ }
+ era{
+ dn{"Byámɛɛn"}
+ }
+ hour{
+ dn{"Cámɛɛn"}
+ }
+ minute{
+ dn{"Mǝnít"}
+ }
+ month{
+ dn{"Ŋwíí"}
+ }
+ second{
+ dn{"Háu"}
+ }
+ week{
+ dn{"Sɔ́ndǝ"}
+ }
+ weekday{
+ dn{"Mǝrú mǝ sɔ́ndǝ"}
+ }
+ year{
+ dn{"Bǝk"}
+ }
+ zone{
+ dn{"Wáas"}
+ }
+ }
}
diff --git a/data/locales/ksf_CM.txt b/data/locales/ksf_CM.txt
index f9f1a3e..99a352f 100755
--- a/data/locales/ksf_CM.txt
+++ b/data/locales/ksf_CM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ksf_CM.xml
// *
// ***************************************************************************
ksf_CM{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/kw.txt b/data/locales/kw.txt
index da75d73..a87e1ff 100644
--- a/data/locales/kw.txt
+++ b/data/locales/kw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kw.xml
// *
@@ -21,7 +21,7 @@
}
}
}
- Version{"2.0.74.74"}
+ Version{"2.0.82.45"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/data/locales/kw_GB.txt b/data/locales/kw_GB.txt
index 63aa0b5..e11ee1e 100644
--- a/data/locales/kw_GB.txt
+++ b/data/locales/kw_GB.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kw_GB.xml
// *
// ***************************************************************************
kw_GB{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/lag.txt b/data/locales/lag.txt
index f232f8b..7533978 100755
--- a/data/locales/lag.txt
+++ b/data/locales/lag.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lag.xml
// *
@@ -15,8 +15,48 @@
LocaleScript{
"Latn",
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"TOO",
@@ -30,7 +70,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -103,46 +143,6 @@
"Kɨrɨsitʉ akavyaalwe",
}
}
- fields{
- day{
- dn{"Sikʉ"}
- relative{
- "-1"{"Niijo"}
- "0"{"Isikʉ"}
- "1"{"Lamʉtoondo"}
- }
- }
- dayperiod{
- dn{"Mpɨɨndɨ ja sikʉ"}
- }
- era{
- dn{"Mpɨɨndɨ"}
- }
- hour{
- dn{"Sáa"}
- }
- minute{
- dn{"Dakíka"}
- }
- month{
- dn{"Mweéri"}
- }
- second{
- dn{"Sekúunde"}
- }
- week{
- dn{"Wíiki"}
- }
- weekday{
- dn{"Sikʉ ya júma"}
- }
- year{
- dn{"Mwaáka"}
- }
- zone{
- dn{"Mpɨɨndɨ ja mɨɨtʉ"}
- }
- }
monthNames{
format{
abbreviated{
@@ -215,4 +215,44 @@
quotationEnd{"”"}
quotationStart{"”"}
}
+ fields{
+ day{
+ dn{"Sikʉ"}
+ relative{
+ "-1"{"Niijo"}
+ "0"{"Isikʉ"}
+ "1"{"Lamʉtoondo"}
+ }
+ }
+ dayperiod{
+ dn{"Mpɨɨndɨ ja sikʉ"}
+ }
+ era{
+ dn{"Mpɨɨndɨ"}
+ }
+ hour{
+ dn{"Sáa"}
+ }
+ minute{
+ dn{"Dakíka"}
+ }
+ month{
+ dn{"Mweéri"}
+ }
+ second{
+ dn{"Sekúunde"}
+ }
+ week{
+ dn{"Wíiki"}
+ }
+ weekday{
+ dn{"Sikʉ ya júma"}
+ }
+ year{
+ dn{"Mwaáka"}
+ }
+ zone{
+ dn{"Mpɨɨndɨ ja mɨɨtʉ"}
+ }
+ }
}
diff --git a/data/locales/lag_TZ.txt b/data/locales/lag_TZ.txt
index 9348a8c..05c5982 100755
--- a/data/locales/lag_TZ.txt
+++ b/data/locales/lag_TZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lag_TZ.xml
// *
// ***************************************************************************
lag_TZ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/lg.txt b/data/locales/lg.txt
index 6db5309..3ff3891 100755
--- a/data/locales/lg.txt
+++ b/data/locales/lg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lg.xml
// *
@@ -23,8 +23,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
DateTimePatterns{
"h:mm:ss a zzzz",
@@ -34,7 +74,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -107,46 +147,6 @@
"Bukya Kulisito Azaal",
}
}
- fields{
- day{
- dn{"Lunaku"}
- relative{
- "-1"{"Ggulo"}
- "0"{"Lwaleero"}
- "1"{"Nkya"}
- }
- }
- dayperiod{
- dn{"AM/PM"}
- }
- era{
- dn{"Mulembe"}
- }
- hour{
- dn{"Saawa"}
- }
- minute{
- dn{"Dakiika"}
- }
- month{
- dn{"Mwezi"}
- }
- second{
- dn{"Kasikonda"}
- }
- week{
- dn{"Sabbiiti"}
- }
- weekday{
- dn{"Lunaku lw'omu sabbiiti"}
- }
- year{
- dn{"Mwaka"}
- }
- zone{
- dn{"Ssaawa za:"}
- }
- }
monthNames{
format{
abbreviated{
@@ -219,4 +219,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Lunaku"}
+ relative{
+ "-1"{"Ggulo"}
+ "0"{"Lwaleero"}
+ "1"{"Nkya"}
+ }
+ }
+ dayperiod{
+ dn{"AM/PM"}
+ }
+ era{
+ dn{"Mulembe"}
+ }
+ hour{
+ dn{"Saawa"}
+ }
+ minute{
+ dn{"Dakiika"}
+ }
+ month{
+ dn{"Mwezi"}
+ }
+ second{
+ dn{"Kasikonda"}
+ }
+ week{
+ dn{"Sabbiiti"}
+ }
+ weekday{
+ dn{"Lunaku lw'omu sabbiiti"}
+ }
+ year{
+ dn{"Mwaka"}
+ }
+ zone{
+ dn{"Ssaawa za:"}
+ }
+ }
}
diff --git a/data/locales/lg_UG.txt b/data/locales/lg_UG.txt
index fff7b6a..d7877e5 100755
--- a/data/locales/lg_UG.txt
+++ b/data/locales/lg_UG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lg_UG.xml
// *
// ***************************************************************************
lg_UG{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ln.txt b/data/locales/ln.txt
index db01aac..d9306dd 100755
--- a/data/locales/ln.txt
+++ b/data/locales/ln.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ln.xml
// *
@@ -35,8 +35,49 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d/M/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"ntɔ́ngɔ́",
@@ -50,7 +91,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM y",
- "d/M/yyyy",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -124,46 +165,6 @@
"Nsima ya Yézu Krís",
}
}
- fields{
- day{
- dn{"Mokɔlɔ"}
- relative{
- "-1"{"Lóbi elékí"}
- "0"{"Lɛlɔ́"}
- "1"{"Lóbi ekoyâ"}
- }
- }
- dayperiod{
- dn{"Eleko ya mokɔlɔ"}
- }
- era{
- dn{"Ntángo"}
- }
- hour{
- dn{"Ngonga"}
- }
- minute{
- dn{"Monúti"}
- }
- month{
- dn{"Sánzá"}
- }
- second{
- dn{"Sɛkɔ́ndɛ"}
- }
- week{
- dn{"Pɔ́sɔ"}
- }
- weekday{
- dn{"Mokɔlɔ ya pɔ́sɔ"}
- }
- year{
- dn{"Mobú"}
- }
- zone{
- dn{"Ntáká ya ngonga"}
- }
- }
monthNames{
format{
abbreviated{
@@ -236,4 +237,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Mokɔlɔ"}
+ relative{
+ "-1"{"Lóbi elékí"}
+ "0"{"Lɛlɔ́"}
+ "1"{"Lóbi ekoyâ"}
+ }
+ }
+ dayperiod{
+ dn{"Eleko ya mokɔlɔ"}
+ }
+ era{
+ dn{"Ntángo"}
+ }
+ hour{
+ dn{"Ngonga"}
+ }
+ minute{
+ dn{"Monúti"}
+ }
+ month{
+ dn{"Sánzá"}
+ }
+ second{
+ dn{"Sɛkɔ́ndɛ"}
+ }
+ week{
+ dn{"Pɔ́sɔ"}
+ }
+ weekday{
+ dn{"Mokɔlɔ ya pɔ́sɔ"}
+ }
+ year{
+ dn{"Mobú"}
+ }
+ zone{
+ dn{"Ntáká ya ngonga"}
+ }
+ }
}
diff --git a/data/locales/ln_AO.txt b/data/locales/ln_AO.txt
index 21891f2..b9d0aa0 100755
--- a/data/locales/ln_AO.txt
+++ b/data/locales/ln_AO.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ln_AO.xml
// *
// ***************************************************************************
ln_AO{
- Version{"2.0.74.90"}
+ Version{"2.0.82.68"}
}
diff --git a/data/locales/ln_CD.txt b/data/locales/ln_CD.txt
index eb1eaa7..fcd936c 100755
--- a/data/locales/ln_CD.txt
+++ b/data/locales/ln_CD.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ln_CD.xml
// *
// ***************************************************************************
ln_CD{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ln_CF.txt b/data/locales/ln_CF.txt
index ced1bb3..518aaef 100755
--- a/data/locales/ln_CF.txt
+++ b/data/locales/ln_CF.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ln_CF.xml
// *
// ***************************************************************************
ln_CF{
- Version{"2.0.74.90"}
+ Version{"2.0.82.68"}
}
diff --git a/data/locales/ln_CG.txt b/data/locales/ln_CG.txt
index a59fea9..baffb94 100755
--- a/data/locales/ln_CG.txt
+++ b/data/locales/ln_CG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ln_CG.xml
// *
// ***************************************************************************
ln_CG{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/lo.txt b/data/locales/lo.txt
index fc1b549..2e94f09 100755
--- a/data/locales/lo.txt
+++ b/data/locales/lo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lo.xml
// *
@@ -209,7 +209,7 @@
}
native{"laoo"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
calendar{
buddhist{
DateTimePatterns{
@@ -219,8 +219,8 @@
"H:mm",
"EEEE, G y MMMM dd",
"G y MMMM d",
- "G y MMM d",
- "GGGGG yyyy-MM-dd",
+ "d MMM y G",
+ "d/M/y GGGGG",
"{1}, {0}",
"{1}, {0}",
"{1}, {0}",
@@ -238,11 +238,11 @@
"U MMMM d",
"U MMM d",
"y-M-d",
- "{1}, {0}",
- "{1}, {0}",
- "{1}, {0}",
- "{1}, {0}",
- "{1}, {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
}
cyclicNameSets{
dayParts{
@@ -635,6 +635,144 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "H ໂມງ m ນາທີ ss ວິນາທີ zzzz",
+ "H ໂມງ m ນາທີ ss ວິນາທີ z",
+ "H:mm:ss",
+ "H:mm",
+ "EEEEທີ d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d/M/y GGGGG",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M-d"}
+ MMM{"LLL"}
+ MMMEd{"E MMM d"}
+ MMMd{"MMM d"}
+ Md{"M-d"}
+ d{"d"}
+ h{"h ໂມງa"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"y-M"}
+ yMEd{"E, y-M-d"}
+ yMMM{"y MMM"}
+ yMMMEd{"E, y MMM d"}
+ yMMMd{"y MMM d"}
+ yMd{"y-M-d"}
+ yQQQ{"y QQQ"}
+ yQQQQ{"y QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, MM-dd – E, MM-dd"}
+ d{"E, MM-dd – E, MM-dd"}
+ }
+ MMM{
+ M{"LLL–LLL"}
+ }
+ MMMEd{
+ M{"E, MM-d – E, MM-d"}
+ d{"E, MM-d – E, MM-d"}
+ }
+ MMMd{
+ M{"MM-d – MM-d"}
+ d{"MM-d – d"}
+ }
+ Md{
+ M{"MM-dd – MM-dd"}
+ d{"MM-dd – dd"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"y-MM – MM"}
+ y{"y-MM – y-MM"}
+ }
+ yMEd{
+ M{"E, y-MM-dd – E, y-MM-dd"}
+ d{"E, y-MM-dd – E, y-MM-dd"}
+ y{"E, y-MM-dd – E, y-MM-dd"}
+ }
+ yMMM{
+ M{"y-MM – MM"}
+ y{"y-MM – y-MM"}
+ }
+ yMMMEd{
+ M{"E, y-MM-dd – E, y-MM-dd"}
+ d{"E, y-MM-dd – E, y-MM-dd"}
+ y{"E, y-MM-dd – E, y-MM-dd"}
+ }
+ yMMMM{
+ M{"y-MM – MM"}
+ y{"y-MM – y-MM"}
+ }
+ yMMMd{
+ M{"y-MM-dd – MM-d"}
+ d{"y-MM-d – d"}
+ y{"y-MM-dd – y-MM-dd"}
+ }
+ yMd{
+ M{"y-MM-dd – MM-dd"}
+ d{"y-MM-dd – dd"}
+ y{"y-MM-dd – y-MM-dd"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"ກ່ອນທ່ຽງ",
@@ -648,7 +786,7 @@
"EEEEທີ d MMMM G y",
"d MMMM y",
"d MMM y",
- "d/M/yyyy",
+ "d/M/y",
"{1}, {0}",
"{1}, {0}",
"{1}, {0}",
@@ -765,48 +903,6 @@
"ຄ.ສ.",
}
}
- fields{
- day{
- dn{"ມື້"}
- relative{
- "-1"{"ວານນີ້"}
- "-2"{"ມື້ກ່ອນ"}
- "0"{"ມື້ນີ້"}
- "1"{"ມື້ອື່ນ"}
- "2"{"ມື້ຮື"}
- }
- }
- dayperiod{
- dn{"ເຊົ້າ/ແລງ"}
- }
- era{
- dn{"ສະໄໝ"}
- }
- hour{
- dn{"ຊົ່ວໂມງ"}
- }
- minute{
- dn{"ນາທີ"}
- }
- month{
- dn{"ເດືອນ"}
- }
- second{
- dn{"ວິນາທີ"}
- }
- week{
- dn{"ອາທິດ"}
- }
- weekday{
- dn{"ມື້ຂອງອາທິດ"}
- }
- year{
- dn{"ປີ"}
- }
- zone{
- dn{"ເວລາຕາມເຂດ"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -870,36 +966,36 @@
y{"y–y"}
}
yM{
- M{"yyyy-MM – MM"}
- y{"yyyy-MM – yyyy-MM"}
+ M{"y-MM – MM"}
+ y{"y-MM – y-MM"}
}
yMEd{
- M{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
- d{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
- y{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
+ M{"E, y-MM-dd – E, y-MM-dd"}
+ d{"E, y-MM-dd – E, y-MM-dd"}
+ y{"E, y-MM-dd – E, y-MM-dd"}
}
yMMM{
- M{"yyyy-MM – MM"}
- y{"yyyy-MM – yyyy-MM"}
+ M{"y-MM – MM"}
+ y{"y-MM – y-MM"}
}
yMMMEd{
- M{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
- d{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
- y{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
+ M{"E, y-MM-dd – E, y-MM-dd"}
+ d{"E, y-MM-dd – E, y-MM-dd"}
+ y{"E, y-MM-dd – E, y-MM-dd"}
}
yMMMM{
- M{"yyyy-MM – MM"}
- y{"yyyy-MM – yyyy-MM"}
+ M{"y-MM – MM"}
+ y{"y-MM – y-MM"}
}
yMMMd{
- M{"yyyy-MM-dd – MM-d"}
- d{"yyyy-MM-d – d"}
- y{"yyyy-MM-dd – yyyy-MM-dd"}
+ M{"y-MM-dd – MM-d"}
+ d{"y-MM-d – d"}
+ y{"y-MM-dd – y-MM-dd"}
}
yMd{
- M{"yyyy-MM-dd – MM-dd"}
- d{"yyyy-MM-dd – dd"}
- y{"yyyy-MM-dd – yyyy-MM-dd"}
+ M{"y-MM-dd – MM-dd"}
+ d{"y-MM-dd – dd"}
+ y{"y-MM-dd – y-MM-dd"}
}
}
monthNames{
@@ -1218,7 +1314,7 @@
"EEEE, y MMMM dd",
"y MMMM d",
"y MMM d",
- "yyyy-MM-dd",
+ "y-MM-dd",
"{1}, {0}",
"{1}, {0}",
"{1}, {0}",
@@ -1241,7 +1337,7 @@
hms{"H:mm:ss"}
ms{"mm:ss"}
y{"y"}
- yM{"M/yyyy"}
+ yM{"M/y"}
yMEd{"E M/d/y"}
yMMM{"MMM y"}
yMMMEd{"E,MMM d,y"}
@@ -1698,6 +1794,48 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"ມື້"}
+ relative{
+ "-1"{"ວານນີ້"}
+ "-2"{"ມື້ກ່ອນ"}
+ "0"{"ມື້ນີ້"}
+ "1"{"ມື້ອື່ນ"}
+ "2"{"ມື້ຮື"}
+ }
+ }
+ dayperiod{
+ dn{"ເຊົ້າ/ແລງ"}
+ }
+ era{
+ dn{"ສະໄໝ"}
+ }
+ hour{
+ dn{"ຊົ່ວໂມງ"}
+ }
+ minute{
+ dn{"ນາທີ"}
+ }
+ month{
+ dn{"ເດືອນ"}
+ }
+ second{
+ dn{"ວິນາທີ"}
+ }
+ week{
+ dn{"ອາທິດ"}
+ }
+ weekday{
+ dn{"ມື້ຂອງອາທິດ"}
+ }
+ year{
+ dn{"ປີ"}
+ }
+ zone{
+ dn{"ເວລາຕາມເຂດ"}
+ }
+ }
measurementSystemNames{
metric{"ເມຕິກ"}
}
diff --git a/data/locales/lo_LA.txt b/data/locales/lo_LA.txt
index cdc68ea..4191c17 100755
--- a/data/locales/lo_LA.txt
+++ b/data/locales/lo_LA.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lo_LA.xml
// *
// ***************************************************************************
lo_LA{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/lt.txt b/data/locales/lt.txt
index b9fc615..e71f4e1 100644
--- a/data/locales/lt.txt
+++ b/data/locales/lt.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lt.xml
// *
@@ -27,7 +27,7 @@
patterns{
currencyFormat{"#,##0.00 ¤"}
decimalFormat{"#,##0.###"}
- percentFormat{"#,##0%"}
+ percentFormat{"#,##0 %"}
scientificFormat{"#E0"}
}
patternsLong{
@@ -172,7 +172,7 @@
}
}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.57"}
calendar{
buddhist{
DateTimePatterns{
@@ -181,9 +181,9 @@
"HH:mm:ss",
"HH:mm",
"y G, MMMM d, EEEE",
- "G y MMMM d",
+ "G y 'm'. MMMM d 'd'.",
"G y MMM d",
- "GGGGG yyyy-MM-dd",
+ "GGGGG y-MM-dd",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -329,20 +329,16 @@
}
}
}
- gregorian{
- AmPmMarkers{
- "priešpiet",
- "popiet",
- }
+ generic{
DateTimePatterns{
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "y 'm'. MMMM d 'd'., EEEE",
- "y 'm'. MMMM d 'd'.",
- "y MMM d",
- "yyyy-MM-dd",
+ "G y 'm'. MMMM d 'd'., EEEE",
+ "G y 'm'. MMMM d 'd'.",
+ "G y MMM d",
+ "GGGGG y-MM-dd",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -370,14 +366,158 @@
y{"y"}
yM{"y-MM"}
yMEd{"E, y-MM-d"}
+ yMM{"y.MM"}
yMMM{"MMM, y"}
yMMMEd{"E, MMM d, y"}
yMMMd{"y MMM d"}
yMd{"y-M-d"}
yQQQ{"y QQQ"}
yQQQQ{"y QQQQ"}
- yyQQQ{"QQQ yy"}
- yyyyMM{"yyyy.MM"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"MM-dd, E – MM-dd, E"}
+ d{"MM-dd, E – MM-dd, E"}
+ }
+ MMM{
+ M{"LLL–LLL"}
+ }
+ MMMEd{
+ M{"MMM d 'd'. E. - MMM d 'd'. E."}
+ d{"MMM d 'd'. E. – d 'd'. E."}
+ }
+ MMMd{
+ M{"MMM d 'd'.– MMM d 'd'."}
+ d{"MMM. d 'd'.–d 'd'"}
+ }
+ Md{
+ M{"MM-dd – MM-dd"}
+ d{"MM-dd – MM-dd"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"H–H"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"hh:mm a–hh:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"hh:mm a–hh:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"H–H v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"y-MM – y-MM"}
+ y{"y-MM – y-MM"}
+ }
+ yMEd{
+ M{"y-MM-dd E. – y-MM-dd E."}
+ d{"y-MM-dd E. – y-MM-dd E."}
+ y{"y-MM-dd E. – y-MM-dd E."}
+ }
+ yMMM{
+ M{"y 'm'. MMM-MMM"}
+ y{"y-MM – y-MM"}
+ }
+ yMMMEd{
+ M{"y-MM-dd E. – y-MM-dd E."}
+ d{"y-MM-dd E. – y-MM-dd E."}
+ y{"y-MM-dd E. – y-MM-dd E."}
+ }
+ yMMMM{
+ M{"y-MM– MM"}
+ y{"MMMM, y–MMMM, y"}
+ }
+ yMMMd{
+ M{"y-MM-dd – MM-d"}
+ d{"y 'm'. MMM d 'd'.–d 'd'."}
+ y{"y-MM-dd – y-MM-dd"}
+ }
+ yMd{
+ M{"y-MM-dd– y-MM-dd"}
+ d{"y-MM-dd–y-MM-dd"}
+ y{"y-MM-dd – y-MM-dd"}
+ }
+ }
+ }
+ gregorian{
+ AmPmMarkers{
+ "priešpiet",
+ "popiet",
+ }
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "y 'm'. MMMM d 'd'., EEEE",
+ "y 'm'. MMMM d 'd'.",
+ "y MMM d",
+ "y-MM-dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E, d"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"LL"}
+ MEd{"M-d, E"}
+ MMM{"LLL"}
+ MMMEd{"MMM d, E"}
+ MMMd{"MMM d"}
+ MMMdd{"MMM-dd"}
+ MMdd{"MM.dd"}
+ Md{"MM-d"}
+ d{"d"}
+ h{"hh a"}
+ hm{"hh:mm a"}
+ hms{"hh:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"y-MM"}
+ yMEd{"E, y-MM-d"}
+ yMM{"y.MM"}
+ yMMM{"MMM, y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMd{"y MMM d"}
+ yMd{"y-M-d"}
+ yQQQ{"y QQQ"}
+ yQQQQ{"y QQQQ"}
}
dayNames{
format{
@@ -471,63 +611,6 @@
"po Kristaus",
}
}
- fields{
- day{
- dn{"diena"}
- relative{
- "-1"{"vakar"}
- "-2"{"užvakar"}
- "0"{"šiandien"}
- "1"{"rytoj"}
- "2"{"poryt"}
- }
- }
- dayperiod{
- dn{"iki pietų / po pietų"}
- }
- era{
- dn{"era"}
- }
- hour{
- dn{"valanda"}
- }
- minute{
- dn{"minutė"}
- }
- month{
- dn{"mėnuo"}
- relative{
- "-1"{"praėjusį mėnesį"}
- "0"{"šį mėnesį"}
- "1"{"kitą mėnesį"}
- }
- }
- second{
- dn{"sekundė"}
- }
- week{
- dn{"savaitė"}
- relative{
- "-1"{"praėjusią savaitę"}
- "0"{"šią savaitę"}
- "1"{"kitą savaitę"}
- }
- }
- weekday{
- dn{"savaitės diena"}
- }
- year{
- dn{"metai"}
- relative{
- "-1"{"praėjusiais metais"}
- "0"{"šiais metais"}
- "1"{"kitais metais"}
- }
- }
- zone{
- dn{"laiko juosta"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -591,36 +674,36 @@
y{"y–y"}
}
yM{
- M{"yyyy-MM – yyyy-MM"}
- y{"yyyy-MM – yyyy-MM"}
+ M{"y-MM – y-MM"}
+ y{"y-MM – y-MM"}
}
yMEd{
- M{"yyyy-MM-dd E. – yyyy-MM-dd E."}
- d{"yyyy-MM-dd E. – yyyy-MM-dd E."}
- y{"yyyy-MM-dd E. – yyyy-MM-dd E."}
+ M{"y-MM-dd E. – y-MM-dd E."}
+ d{"y-MM-dd E. – y-MM-dd E."}
+ y{"y-MM-dd E. – y-MM-dd E."}
}
yMMM{
M{"y 'm'. MMM-MMM"}
- y{"yyyy-MM – yyyy-MM"}
+ y{"y-MM – y-MM"}
}
yMMMEd{
- M{"yyyy-MM-dd E. – yyyy-MM-dd E."}
- d{"yyyy-MM-dd E. – yyyy-MM-dd E."}
- y{"yyyy-MM-dd E. – yyyy-MM-dd E."}
+ M{"y-MM-dd E. – y-MM-dd E."}
+ d{"y-MM-dd E. – y-MM-dd E."}
+ y{"y-MM-dd E. – y-MM-dd E."}
}
yMMMM{
- M{"yyyy-MM– MM"}
+ M{"y-MM– MM"}
y{"MMMM, y–MMMM, y"}
}
yMMMd{
- M{"yyyy-MM-dd – MM-d"}
+ M{"y-MM-dd – MM-d"}
d{"y 'm'. MMM d 'd'.–d 'd'."}
- y{"yyyy-MM-dd – yyyy-MM-dd"}
+ y{"y-MM-dd – y-MM-dd"}
}
yMd{
- M{"yyyy-MM-dd– yyyy-MM-dd"}
- d{"yyyy-MM-dd–yyyy-MM-dd"}
- y{"yyyy-MM-dd – yyyy-MM-dd"}
+ M{"y-MM-dd– y-MM-dd"}
+ d{"y-MM-dd–y-MM-dd"}
+ y{"y-MM-dd – y-MM-dd"}
}
}
monthNames{
@@ -763,6 +846,63 @@
quotationEnd{"“"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"diena"}
+ relative{
+ "-1"{"vakar"}
+ "-2"{"užvakar"}
+ "0"{"šiandien"}
+ "1"{"rytoj"}
+ "2"{"poryt"}
+ }
+ }
+ dayperiod{
+ dn{"iki pietų / po pietų"}
+ }
+ era{
+ dn{"era"}
+ }
+ hour{
+ dn{"valanda"}
+ }
+ minute{
+ dn{"minutė"}
+ }
+ month{
+ dn{"mėnuo"}
+ relative{
+ "-1"{"praėjusį mėnesį"}
+ "0"{"šį mėnesį"}
+ "1"{"kitą mėnesį"}
+ }
+ }
+ second{
+ dn{"sekundė"}
+ }
+ week{
+ dn{"savaitė"}
+ relative{
+ "-1"{"praėjusią savaitę"}
+ "0"{"šią savaitę"}
+ "1"{"kitą savaitę"}
+ }
+ }
+ weekday{
+ dn{"savaitės diena"}
+ }
+ year{
+ dn{"metai"}
+ relative{
+ "-1"{"praėjusiais metais"}
+ "0"{"šiais metais"}
+ "1"{"kitais metais"}
+ }
+ }
+ zone{
+ dn{"laiko juosta"}
+ }
+ }
listPattern{
standard{
2{"{0} ir {1}"}
diff --git a/data/locales/lt_LT.txt b/data/locales/lt_LT.txt
index a7875fc..11e14c6 100644
--- a/data/locales/lt_LT.txt
+++ b/data/locales/lt_LT.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lt_LT.xml
// *
// ***************************************************************************
lt_LT{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/lu.txt b/data/locales/lu.txt
index 97012af..e678a23 100755
--- a/data/locales/lu.txt
+++ b/data/locales/lu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lu.xml
// *
@@ -31,8 +31,49 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d/M/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"Dinda",
@@ -46,7 +87,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM y",
- "d/M/yyyy",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -120,46 +161,6 @@
"Kunyima kwa Yezu Kli",
}
}
- fields{
- day{
- dn{"Dituku"}
- relative{
- "-1"{"Makelela"}
- "0"{"Lelu"}
- "1"{"Malaba"}
- }
- }
- dayperiod{
- dn{"Mutantshi wa diba"}
- }
- era{
- dn{"Tshipungu"}
- }
- hour{
- dn{"Diba"}
- }
- minute{
- dn{"Kasunsu"}
- }
- month{
- dn{"Ngondo"}
- }
- second{
- dn{"Kasunsukusu"}
- }
- week{
- dn{"Lubingu"}
- }
- weekday{
- dn{"Dituku dia lubingu"}
- }
- year{
- dn{"Tshidimu"}
- }
- zone{
- dn{"Nzeepu"}
- }
- }
monthNames{
format{
abbreviated{
@@ -232,4 +233,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Dituku"}
+ relative{
+ "-1"{"Makelela"}
+ "0"{"Lelu"}
+ "1"{"Malaba"}
+ }
+ }
+ dayperiod{
+ dn{"Mutantshi wa diba"}
+ }
+ era{
+ dn{"Tshipungu"}
+ }
+ hour{
+ dn{"Diba"}
+ }
+ minute{
+ dn{"Kasunsu"}
+ }
+ month{
+ dn{"Ngondo"}
+ }
+ second{
+ dn{"Kasunsukusu"}
+ }
+ week{
+ dn{"Lubingu"}
+ }
+ weekday{
+ dn{"Dituku dia lubingu"}
+ }
+ year{
+ dn{"Tshidimu"}
+ }
+ zone{
+ dn{"Nzeepu"}
+ }
+ }
}
diff --git a/data/locales/lu_CD.txt b/data/locales/lu_CD.txt
index 716976f..aa9cd62 100755
--- a/data/locales/lu_CD.txt
+++ b/data/locales/lu_CD.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lu_CD.xml
// *
// ***************************************************************************
lu_CD{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/luo.txt b/data/locales/luo.txt
index 918ba8f..44a3335 100755
--- a/data/locales/luo.txt
+++ b/data/locales/luo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/luo.xml
// *
@@ -23,8 +23,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"OD",
@@ -38,7 +78,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -111,46 +151,6 @@
"Ka Kristo osebiro",
}
}
- fields{
- day{
- dn{"chieng'"}
- relative{
- "-1"{"nyoro"}
- "0"{"kawuono"}
- "1"{"kiny"}
- }
- }
- dayperiod{
- dn{"odieochieng'/otieno"}
- }
- era{
- dn{"ndalo"}
- }
- hour{
- dn{"saa"}
- }
- minute{
- dn{"dakika"}
- }
- month{
- dn{"dwe"}
- }
- second{
- dn{"nyiriri mar saa"}
- }
- week{
- dn{"juma"}
- }
- weekday{
- dn{"ndalo mar juma"}
- }
- year{
- dn{"higa"}
- }
- zone{
- dn{"kar saa"}
- }
- }
monthNames{
format{
abbreviated{
@@ -223,4 +223,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"chieng'"}
+ relative{
+ "-1"{"nyoro"}
+ "0"{"kawuono"}
+ "1"{"kiny"}
+ }
+ }
+ dayperiod{
+ dn{"odieochieng'/otieno"}
+ }
+ era{
+ dn{"ndalo"}
+ }
+ hour{
+ dn{"saa"}
+ }
+ minute{
+ dn{"dakika"}
+ }
+ month{
+ dn{"dwe"}
+ }
+ second{
+ dn{"nyiriri mar saa"}
+ }
+ week{
+ dn{"juma"}
+ }
+ weekday{
+ dn{"ndalo mar juma"}
+ }
+ year{
+ dn{"higa"}
+ }
+ zone{
+ dn{"kar saa"}
+ }
+ }
}
diff --git a/data/locales/luo_KE.txt b/data/locales/luo_KE.txt
index 80d2911..e7ca179 100755
--- a/data/locales/luo_KE.txt
+++ b/data/locales/luo_KE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/luo_KE.xml
// *
// ***************************************************************************
luo_KE{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/luy.txt b/data/locales/luy.txt
index f7df1eb..5b7bf44 100755
--- a/data/locales/luy.txt
+++ b/data/locales/luy.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/luy.xml
// *
@@ -22,8 +22,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"a.m.",
@@ -37,7 +77,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -110,46 +150,6 @@
"Muhiga Kuvita Kuuza",
}
}
- fields{
- day{
- dn{"Ridiku"}
- relative{
- "-1"{"Mgorova"}
- "0"{"Lero"}
- "1"{"Mgamba"}
- }
- }
- dayperiod{
- dn{"Vuche/Vwira"}
- }
- era{
- dn{"Rimenya"}
- }
- hour{
- dn{"Isaa"}
- }
- minute{
- dn{"Idagika"}
- }
- month{
- dn{"Mweri"}
- }
- second{
- dn{"Sekunde"}
- }
- week{
- dn{"Risiza"}
- }
- weekday{
- dn{"Mrisiza"}
- }
- year{
- dn{"Muhiga"}
- }
- zone{
- dn{"Havundu"}
- }
- }
monthNames{
format{
abbreviated{
@@ -222,6 +222,46 @@
quotationEnd{"“"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"Ridiku"}
+ relative{
+ "-1"{"Mgorova"}
+ "0"{"Lero"}
+ "1"{"Mgamba"}
+ }
+ }
+ dayperiod{
+ dn{"Vuche/Vwira"}
+ }
+ era{
+ dn{"Rimenya"}
+ }
+ hour{
+ dn{"Isaa"}
+ }
+ minute{
+ dn{"Idagika"}
+ }
+ month{
+ dn{"Mweri"}
+ }
+ second{
+ dn{"Sekunde"}
+ }
+ week{
+ dn{"Risiza"}
+ }
+ weekday{
+ dn{"Mrisiza"}
+ }
+ year{
+ dn{"Muhiga"}
+ }
+ zone{
+ dn{"Havundu"}
+ }
+ }
measurementSystemNames{
metric{"Metric"}
}
diff --git a/data/locales/luy_KE.txt b/data/locales/luy_KE.txt
index 04b7850..9f71137 100755
--- a/data/locales/luy_KE.txt
+++ b/data/locales/luy_KE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/luy_KE.xml
// *
// ***************************************************************************
luy_KE{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/lv.txt b/data/locales/lv.txt
index 8cca717..ba74df3 100644
--- a/data/locales/lv.txt
+++ b/data/locales/lv.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lv.xml
// *
@@ -13,7 +13,10 @@
AuxExemplarCharacters{"[q w x y]"}
ExemplarCharacters{"[a ā b c č d e ē f g ģ h i ī j k ķ l ļ m n ņ o p r s š t u ū v z ž]"}
ExemplarCharactersIndex{"[A B C Č D E F G Ģ H I J K Ķ L Ļ M N Ņ O P Q R S Š T U V W X Y Z Ž]"}
- ExemplarCharactersPunctuation{"[\- ‐ – — , ; \: ! ? . … ' ‘ ’ ‚ \" “ ” „ ( ) \[ \] § @ * / \& # † ‡ ′ ″]"}
+ ExemplarCharactersPunctuation{
+ "[\\- ‐ – — , ; \\: ! ? . … ' ‘ ’ ‚ \u0022 “ ” „ ( ) \\[ \\] § @ * / \\& # † "
+ "‡ ′ ″]"
+ }
LocaleScript{
"Latn",
}
@@ -167,8 +170,150 @@
}
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, G y. 'gada' d. MMMM",
+ "G y. 'gada' d. MMMM",
+ "G y. 'gada' d. MMM",
+ "dd.MM.yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E, d."}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, dd.MM."}
+ MMM{"LLL"}
+ MMMEd{"E, d. MMM"}
+ MMMMEd{"E, d. MMMM"}
+ MMMMd{"d. MMMM"}
+ MMMd{"d. MMM"}
+ Md{"dd.MM."}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ mmss{"mm:ss"}
+ ms{"mm:ss"}
+ y{"y. 'g'."}
+ yM{"MM.y."}
+ yMEd{"E, d.M.y."}
+ yMMM{"y. 'g'. MMM"}
+ yMMMEd{"E, y. 'g'. d. MMM"}
+ yMMMM{"y. 'g'. MMMM"}
+ yMMMd{"y. 'g'. d. MMM"}
+ yMd{"d.M.y."}
+ yQQQ{"QQQ y"}
+ yQQQQ{"y QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"MM.–MM."}
+ }
+ MEd{
+ M{"E, dd.MM – E, dd.MM"}
+ d{"E, dd.MM – E, dd.MM"}
+ }
+ MMM{
+ M{"LLL–LLL"}
+ }
+ MMMEd{
+ M{"E, d. MMM – E, d. MMM"}
+ d{"E, d. MMM – E, d. MMM"}
+ }
+ MMMd{
+ M{"d. MMM – d. MMM"}
+ d{"d.–d. MMM"}
+ }
+ Md{
+ M{"dd.MM–dd.MM"}
+ d{"dd.MM.–dd.MM."}
+ }
+ d{
+ d{"d.–d."}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y.–y."}
+ }
+ yM{
+ M{"MM.y.–MM.y."}
+ y{"MM.y.–MM.y."}
+ }
+ yMEd{
+ M{"E, dd.MM.y. – E, dd.MM.y."}
+ d{"E, dd.MM.y. – E, dd.MM.y."}
+ y{"E, dd.MM.y. – E, dd.MM.y."}
+ }
+ yMMM{
+ M{"y. 'gada' MMM–MMM"}
+ y{"y. 'gada' MMM – y. 'gada' MMM"}
+ }
+ yMMMEd{
+ M{"E, y. 'gada' d. MMM – E, y. 'gada' d. MMM"}
+ d{"E, y. 'gada' d. MMM – E, y. 'gada' d. MMM"}
+ y{"E, y. 'gada' d. MMM – E, y. 'gada' d. MMM"}
+ }
+ yMMMM{
+ M{"MM.y.–MM.y."}
+ y{"MM.y.–MM.y."}
+ }
+ yMMMd{
+ M{"y. 'gada' d. MMM – d. MMM"}
+ d{"y. 'gada' d.–d. MMM"}
+ y{"y. 'gada' d. MMM – y. 'gada' d. MMM"}
+ }
+ yMd{
+ M{"dd.MM.y.–dd.MM.y."}
+ d{"dd.MM.y.–dd.MM.y."}
+ y{"dd.MM.y.–dd.MM.y."}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"priekšpusdienā",
@@ -209,16 +354,15 @@
mmss{"mm:ss"}
ms{"mm:ss"}
y{"y. 'g'."}
- yM{"MM.yyyy."}
+ yM{"MM.y."}
yMEd{"E, d.M.y."}
- yMMM{"yyyy. 'g'. MMM"}
+ yMMM{"y. 'g'. MMM"}
yMMMEd{"E, y. 'g'. d. MMM"}
yMMMM{"y. 'g'. MMMM"}
yMMMd{"y. 'g'. d. MMM"}
yMd{"d.M.y."}
yQQQ{"QQQ y"}
yQQQQ{"y QQQQ"}
- yyyy{"y. 'g'."}
}
dayNames{
format{
@@ -308,63 +452,6 @@
"mūsu ērā",
}
}
- fields{
- day{
- dn{"Diena"}
- relative{
- "-1"{"vakar"}
- "-2"{"aizvakar"}
- "0"{"šodien"}
- "1"{"rīt"}
- "2"{"parīt"}
- }
- }
- dayperiod{
- dn{"Pirmspusd./pēcpusd."}
- }
- era{
- dn{"Ēra"}
- }
- hour{
- dn{"Stundas"}
- }
- minute{
- dn{"Minūtes"}
- }
- month{
- dn{"Mēnesis"}
- relative{
- "-1"{"Pagājušajā mēnesī"}
- "0"{"Šomēnes"}
- "1"{"Nākammēnes"}
- }
- }
- second{
- dn{"Sekundes"}
- }
- week{
- dn{"Nedēļa"}
- relative{
- "-1"{"Pagājušajā nedēļā"}
- "0"{"Šonedēļ"}
- "1"{"Nākamnedēļ"}
- }
- }
- weekday{
- dn{"Nedēļas diena"}
- }
- year{
- dn{"Gads"}
- relative{
- "-1"{"Pagājušajā gadā"}
- "0"{"Šogad"}
- "1"{"Nākamgad"}
- }
- }
- zone{
- dn{"Laika josla"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -428,13 +515,13 @@
y{"y.–y."}
}
yM{
- M{"MM.yyyy.–MM.yyyy."}
- y{"MM.yyyy.–MM.yyyy."}
+ M{"MM.y.–MM.y."}
+ y{"MM.y.–MM.y."}
}
yMEd{
- M{"E, dd.MM.yy. – E, dd.MM.yy."}
- d{"E, dd.MM.yy. – E, dd.MM.yy."}
- y{"E, dd.MM.yy. – E, dd.MM.yy."}
+ M{"E, dd.MM.y. – E, dd.MM.y."}
+ d{"E, dd.MM.y. – E, dd.MM.y."}
+ y{"E, dd.MM.y. – E, dd.MM.y."}
}
yMMM{
M{"y. 'gada' MMM–MMM"}
@@ -446,8 +533,8 @@
y{"E, y. 'gada' d. MMM – E, y. 'gada' d. MMM"}
}
yMMMM{
- M{"MM.yyyy.–MM.yyyy."}
- y{"MM.yyyy.–MM.yyyy."}
+ M{"MM.y.–MM.y."}
+ y{"MM.y.–MM.y."}
}
yMMMd{
M{"y. 'gada' d. MMM – d. MMM"}
@@ -455,9 +542,9 @@
y{"y. 'gada' d. MMM – y. 'gada' d. MMM"}
}
yMd{
- M{"dd.MM.yy.–dd.MM.yy."}
- d{"dd.MM.yyyy.–dd.MM.yyyy."}
- y{"dd.MM.yy.–dd.MM.yy."}
+ M{"dd.MM.y.–dd.MM.y."}
+ d{"dd.MM.y.–dd.MM.y."}
+ y{"dd.MM.y.–dd.MM.y."}
}
}
monthNames{
@@ -642,6 +729,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Diena"}
+ relative{
+ "-1"{"vakar"}
+ "-2"{"aizvakar"}
+ "0"{"šodien"}
+ "1"{"rīt"}
+ "2"{"parīt"}
+ }
+ }
+ dayperiod{
+ dn{"Pirmspusd./pēcpusd."}
+ }
+ era{
+ dn{"Ēra"}
+ }
+ hour{
+ dn{"Stundas"}
+ }
+ minute{
+ dn{"Minūtes"}
+ }
+ month{
+ dn{"Mēnesis"}
+ relative{
+ "-1"{"Pagājušajā mēnesī"}
+ "0"{"Šomēnes"}
+ "1"{"Nākammēnes"}
+ }
+ }
+ second{
+ dn{"Sekundes"}
+ }
+ week{
+ dn{"Nedēļa"}
+ relative{
+ "-1"{"Pagājušajā nedēļā"}
+ "0"{"Šonedēļ"}
+ "1"{"Nākamnedēļ"}
+ }
+ }
+ weekday{
+ dn{"Nedēļas diena"}
+ }
+ year{
+ dn{"Gads"}
+ relative{
+ "-1"{"Pagājušajā gadā"}
+ "0"{"Šogad"}
+ "1"{"Nākamgad"}
+ }
+ }
+ zone{
+ dn{"Laika josla"}
+ }
+ }
listPattern{
standard{
2{"{0} un {1}"}
diff --git a/data/locales/lv_LV.txt b/data/locales/lv_LV.txt
index cd9dc1e..25821fc 100644
--- a/data/locales/lv_LV.txt
+++ b/data/locales/lv_LV.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lv_LV.xml
// *
// ***************************************************************************
lv_LV{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/mas.txt b/data/locales/mas.txt
index ee8ffc5..96ddb29 100755
--- a/data/locales/mas.txt
+++ b/data/locales/mas.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mas.xml
// *
@@ -26,8 +26,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"Ɛnkakɛnyá",
@@ -41,7 +81,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -114,46 +154,6 @@
"Eínō Yɛ́sʉ",
}
}
- fields{
- day{
- dn{"Ɛnkɔlɔ́ŋ"}
- relative{
- "-1"{"Ŋolé"}
- "0"{"Táatá"}
- "1"{"Tááisérè"}
- }
- }
- dayperiod{
- dn{"Ɛnkakɛnyá/Ɛndámâ"}
- }
- era{
- dn{"Ɛnkátá"}
- }
- hour{
- dn{"Ɛ́sáâ"}
- }
- minute{
- dn{"Oldákikaè"}
- }
- month{
- dn{"Ɔlápà"}
- }
- second{
- dn{"Sekunde"}
- }
- week{
- dn{"Ewíkî"}
- }
- weekday{
- dn{"Ɛnkɔ́lɔŋ ewíkî"}
- }
- year{
- dn{"Ɔlárì"}
- }
- zone{
- dn{"Ɛ́sáâ o inkuapí"}
- }
- }
monthNames{
format{
abbreviated{
@@ -210,6 +210,46 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Ɛnkɔlɔ́ŋ"}
+ relative{
+ "-1"{"Ŋolé"}
+ "0"{"Táatá"}
+ "1"{"Tááisérè"}
+ }
+ }
+ dayperiod{
+ dn{"Ɛnkakɛnyá/Ɛndámâ"}
+ }
+ era{
+ dn{"Ɛnkátá"}
+ }
+ hour{
+ dn{"Ɛ́sáâ"}
+ }
+ minute{
+ dn{"Oldákikaè"}
+ }
+ month{
+ dn{"Ɔlápà"}
+ }
+ second{
+ dn{"Sekunde"}
+ }
+ week{
+ dn{"Ewíkî"}
+ }
+ weekday{
+ dn{"Ɛnkɔ́lɔŋ ewíkî"}
+ }
+ year{
+ dn{"Ɔlárì"}
+ }
+ zone{
+ dn{"Ɛ́sáâ o inkuapí"}
+ }
+ }
measurementSystemNames{
metric{"Metric"}
}
diff --git a/data/locales/mas_KE.txt b/data/locales/mas_KE.txt
index 28c417e..0283289 100755
--- a/data/locales/mas_KE.txt
+++ b/data/locales/mas_KE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mas_KE.xml
// *
// ***************************************************************************
mas_KE{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/mas_TZ.txt b/data/locales/mas_TZ.txt
index c9a2989..6ef358f 100755
--- a/data/locales/mas_TZ.txt
+++ b/data/locales/mas_TZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mas_TZ.xml
// *
// ***************************************************************************
mas_TZ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/mer.txt b/data/locales/mer.txt
index 5fd3c27..5d53dd7 100755
--- a/data/locales/mer.txt
+++ b/data/locales/mer.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mer.xml
// *
@@ -22,8 +22,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"RŨ",
@@ -37,7 +77,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -110,46 +150,6 @@
"Nyuma ya Kristũ",
}
}
- fields{
- day{
- dn{"Ntukũ"}
- relative{
- "-1"{"Ĩgoro"}
- "0"{"Narua"}
- "1"{"Rũjũ"}
- }
- }
- dayperiod{
- dn{"Mũthenya"}
- }
- era{
- dn{"Ĩgita"}
- }
- hour{
- dn{"Ĩthaa"}
- }
- minute{
- dn{"Ndagika"}
- }
- month{
- dn{"Mweri"}
- }
- second{
- dn{"Sekondi"}
- }
- week{
- dn{"Kiumia"}
- }
- weekday{
- dn{"Ntukũ ya ngũgĩ"}
- }
- year{
- dn{"Mwaka"}
- }
- zone{
- dn{"Gũntũ kwa thaa"}
- }
- }
monthNames{
format{
abbreviated{
@@ -216,4 +216,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Ntukũ"}
+ relative{
+ "-1"{"Ĩgoro"}
+ "0"{"Narua"}
+ "1"{"Rũjũ"}
+ }
+ }
+ dayperiod{
+ dn{"Mũthenya"}
+ }
+ era{
+ dn{"Ĩgita"}
+ }
+ hour{
+ dn{"Ĩthaa"}
+ }
+ minute{
+ dn{"Ndagika"}
+ }
+ month{
+ dn{"Mweri"}
+ }
+ second{
+ dn{"Sekondi"}
+ }
+ week{
+ dn{"Kiumia"}
+ }
+ weekday{
+ dn{"Ntukũ ya ngũgĩ"}
+ }
+ year{
+ dn{"Mwaka"}
+ }
+ zone{
+ dn{"Gũntũ kwa thaa"}
+ }
+ }
}
diff --git a/data/locales/mer_KE.txt b/data/locales/mer_KE.txt
index af2c61a..67241e3 100755
--- a/data/locales/mer_KE.txt
+++ b/data/locales/mer_KE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mer_KE.xml
// *
// ***************************************************************************
mer_KE{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/mfe.txt b/data/locales/mfe.txt
index 63938b8..177d451 100755
--- a/data/locales/mfe.txt
+++ b/data/locales/mfe.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mfe.xml
// *
@@ -22,18 +22,18 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
+ generic{
DateTimePatterns{
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE d MMMM y",
- "d MMMM y",
- "d MMM, y",
- "d/M/yyyy",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM, y G",
+ "d/M/y GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -55,15 +55,53 @@
y{"y"}
yM{"M/y"}
yMEd{"E d/M/y"}
+ yMM{"MM/y"}
yMMM{"MMM y"}
yMMMEd{"E d MMM y"}
yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"MM/yy"}
- yyMMM{"MMM yy"}
- yyMMMEd{"E d MMM yy"}
- yyMMMd{"d MMM yy"}
+ }
+ }
+ gregorian{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y",
+ "d MMMM y",
+ "d MMM, y",
+ "d/M/y",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ M{"M"}
+ MMM{"MMM"}
+ MMMEd{"E d MMM"}
+ MMMMEd{"E d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMMdd{"dd MMM"}
+ MMd{"d/MM"}
+ MMdd{"dd/MM"}
+ Md{"d/M"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMM{"MM/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
}
dayNames{
format{
@@ -108,46 +146,6 @@
"apre Zezi-Krist",
}
}
- fields{
- day{
- dn{"Zour"}
- relative{
- "-1"{"Yer"}
- "0"{"Zordi"}
- "1"{"Demin"}
- }
- }
- dayperiod{
- dn{"Peryod dan lazourne"}
- }
- era{
- dn{"Lepok"}
- }
- hour{
- dn{"Ler"}
- }
- minute{
- dn{"Minit"}
- }
- month{
- dn{"Mwa"}
- }
- second{
- dn{"Segonn"}
- }
- week{
- dn{"Semenn"}
- }
- weekday{
- dn{"Zour lasemenn"}
- }
- year{
- dn{"Lane"}
- }
- zone{
- dn{"Peryod letan"}
- }
- }
monthNames{
format{
abbreviated{
@@ -220,4 +218,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Zour"}
+ relative{
+ "-1"{"Yer"}
+ "0"{"Zordi"}
+ "1"{"Demin"}
+ }
+ }
+ dayperiod{
+ dn{"Peryod dan lazourne"}
+ }
+ era{
+ dn{"Lepok"}
+ }
+ hour{
+ dn{"Ler"}
+ }
+ minute{
+ dn{"Minit"}
+ }
+ month{
+ dn{"Mwa"}
+ }
+ second{
+ dn{"Segonn"}
+ }
+ week{
+ dn{"Semenn"}
+ }
+ weekday{
+ dn{"Zour lasemenn"}
+ }
+ year{
+ dn{"Lane"}
+ }
+ zone{
+ dn{"Peryod letan"}
+ }
+ }
}
diff --git a/data/locales/mfe_MU.txt b/data/locales/mfe_MU.txt
index 3d47726..55dadc0 100755
--- a/data/locales/mfe_MU.txt
+++ b/data/locales/mfe_MU.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mfe_MU.xml
// *
// ***************************************************************************
mfe_MU{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/mg.txt b/data/locales/mg.txt
index 48e613e..5cbda84 100755
--- a/data/locales/mg.txt
+++ b/data/locales/mg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mg.xml
// *
@@ -23,18 +23,18 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
+ generic{
DateTimePatterns{
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE d MMMM y",
- "d MMMM y",
- "d MMM, y",
- "d/M/yyyy",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM, y G",
+ "d/M/y GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -57,15 +57,54 @@
y{"y"}
yM{"M/y"}
yMEd{"E d/M/y"}
+ yMM{"MM/y"}
yMMM{"MMM y"}
yMMMEd{"E d MMM y"}
yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"MM/yy"}
- yyMMM{"MMM yy"}
- yyMMMEd{"E d MMM yy"}
- yyMMMd{"d MMM yy"}
+ }
+ }
+ gregorian{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y",
+ "d MMMM y",
+ "d MMM, y",
+ "d/M/y",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ M{"M"}
+ MEd{"E d/M"}
+ MMM{"MMM"}
+ MMMEd{"E d MMM"}
+ MMMMEd{"E d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMMdd{"dd MMM"}
+ MMd{"d/MM"}
+ MMdd{"dd/MM"}
+ Md{"d/M"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMM{"MM/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
}
dayNames{
format{
@@ -110,40 +149,6 @@
"Aorian'i JK",
}
}
- fields{
- day{
- dn{"Andro"}
- relative{
- "-1"{"Omaly"}
- "0"{"Anio"}
- "1"{"Rahampitso"}
- }
- }
- dayperiod{
- dn{"AM/PM"}
- }
- era{
- dn{"Era"}
- }
- hour{
- dn{"Ora"}
- }
- minute{
- dn{"Minitra"}
- }
- month{
- dn{"Volana"}
- }
- second{
- dn{"Segondra"}
- }
- week{
- dn{"Herinandro"}
- }
- year{
- dn{"Taona"}
- }
- }
monthNames{
format{
abbreviated{
@@ -216,4 +221,38 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"Andro"}
+ relative{
+ "-1"{"Omaly"}
+ "0"{"Anio"}
+ "1"{"Rahampitso"}
+ }
+ }
+ dayperiod{
+ dn{"AM/PM"}
+ }
+ era{
+ dn{"Era"}
+ }
+ hour{
+ dn{"Ora"}
+ }
+ minute{
+ dn{"Minitra"}
+ }
+ month{
+ dn{"Volana"}
+ }
+ second{
+ dn{"Segondra"}
+ }
+ week{
+ dn{"Herinandro"}
+ }
+ year{
+ dn{"Taona"}
+ }
+ }
}
diff --git a/data/locales/mg_MG.txt b/data/locales/mg_MG.txt
index 95fb925..00ccbf2 100755
--- a/data/locales/mg_MG.txt
+++ b/data/locales/mg_MG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mg_MG.xml
// *
// ***************************************************************************
mg_MG{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/mgh.txt b/data/locales/mgh.txt
index 9176506..353af24 100755
--- a/data/locales/mgh.txt
+++ b/data/locales/mgh.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mgh.xml
// *
@@ -24,8 +24,49 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMd{"MMM d"}
+ Md{"d/M"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMd{"MMM d, y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"wichishu",
@@ -39,7 +80,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -113,40 +154,6 @@
"Yopia yesu",
}
}
- fields{
- day{
- dn{"nihuku"}
- relative{
- "-1"{"n'chana"}
- "0"{"lel'lo"}
- "1"{"me'llo"}
- }
- }
- era{
- dn{"kal'lai"}
- }
- hour{
- dn{"isaa"}
- }
- minute{
- dn{"idakika"}
- }
- month{
- dn{"mweri"}
- }
- second{
- dn{"isekunde"}
- }
- week{
- dn{"iwiki mocha"}
- }
- weekday{
- dn{"nihuku no mwisho wa wiki"}
- }
- year{
- dn{"yaka"}
- }
- }
monthNames{
format{
abbreviated{
@@ -197,4 +204,38 @@
}
}
}
+ fields{
+ day{
+ dn{"nihuku"}
+ relative{
+ "-1"{"n'chana"}
+ "0"{"lel'lo"}
+ "1"{"me'llo"}
+ }
+ }
+ era{
+ dn{"kal'lai"}
+ }
+ hour{
+ dn{"isaa"}
+ }
+ minute{
+ dn{"idakika"}
+ }
+ month{
+ dn{"mweri"}
+ }
+ second{
+ dn{"isekunde"}
+ }
+ week{
+ dn{"iwiki mocha"}
+ }
+ weekday{
+ dn{"nihuku no mwisho wa wiki"}
+ }
+ year{
+ dn{"yaka"}
+ }
+ }
}
diff --git a/data/locales/mgh_MZ.txt b/data/locales/mgh_MZ.txt
index 7d6e8a2..209baa0 100755
--- a/data/locales/mgh_MZ.txt
+++ b/data/locales/mgh_MZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mgh_MZ.xml
// *
// ***************************************************************************
mgh_MZ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/mgo.txt b/data/locales/mgo.txt
index 088c27e..67e66cf 100755
--- a/data/locales/mgo.txt
+++ b/data/locales/mgo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mgo.xml
// *
@@ -16,7 +16,7 @@
" u ù w y z ʼ]"
}
ExemplarCharactersIndex{"[A B {CH} D E Ə F G {GH} I J K M N Ŋ O Ɔ P R S T U W Y Z ʼ]"}
- ExemplarCharactersPunctuation{"[, ; \: ! ? . ' ‘ ’ \" “ ”]"}
+ ExemplarCharactersPunctuation{"[, ; \\: ! ? . ' ‘ ’ \u0022 “ ”]"}
LocaleScript{
"Latn",
}
@@ -44,8 +44,31 @@
}
native{"latn"}
}
- Version{"2.0.77.53"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, G y MMMM dd",
+ "G y MMMM d",
+ "G y MMM d",
+ "GGGGG y-MM-dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ d{"d"}
+ }
+ intervalFormats{
+ fallback{"{0} – {1}"}
+ }
+ }
gregorian{
AmPmMarkers{
"AM",
@@ -59,7 +82,7 @@
"EEEE, y MMMM dd",
"y MMMM d",
"y MMM d",
- "yyyy-MM-dd",
+ "y-MM-dd",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -153,47 +176,6 @@
"CE",
}
}
- fields{
- day{
- dn{"anəg"}
- relative{
- "-1"{"ikwiri"}
- "0"{"tèchɔ̀ŋ"}
- "1"{"isu"}
- "2"{"isu ywi"}
- }
- }
- dayperiod{
- dn{"Dayperiod"}
- }
- era{
- dn{"Era"}
- }
- hour{
- dn{"Hour"}
- }
- minute{
- dn{"Minute"}
- }
- month{
- dn{"iməg"}
- }
- second{
- dn{"Second"}
- }
- week{
- dn{"nkap"}
- }
- weekday{
- dn{"anəg agu nkap"}
- }
- year{
- dn{"fituʼ"}
- }
- zone{
- dn{"Zone"}
- }
- }
intervalFormats{
fallback{"{0} – {1}"}
}
@@ -295,9 +277,46 @@
quotationEnd{"”"}
quotationStart{"“"}
}
- layout{
- characters{"left-to-right"}
- lines{"top-to-bottom"}
+ fields{
+ day{
+ dn{"anəg"}
+ relative{
+ "-1"{"ikwiri"}
+ "0"{"tèchɔ̀ŋ"}
+ "1"{"isu"}
+ "2"{"isu ywi"}
+ }
+ }
+ dayperiod{
+ dn{"Dayperiod"}
+ }
+ era{
+ dn{"Era"}
+ }
+ hour{
+ dn{"Hour"}
+ }
+ minute{
+ dn{"Minute"}
+ }
+ month{
+ dn{"iməg"}
+ }
+ second{
+ dn{"Second"}
+ }
+ week{
+ dn{"nkap"}
+ }
+ weekday{
+ dn{"anəg agu nkap"}
+ }
+ year{
+ dn{"fituʼ"}
+ }
+ zone{
+ dn{"Zone"}
+ }
}
units{
day{
diff --git a/data/locales/mgo_CM.txt b/data/locales/mgo_CM.txt
index 029e5c5..916768f 100755
--- a/data/locales/mgo_CM.txt
+++ b/data/locales/mgo_CM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mgo_CM.xml
// *
// ***************************************************************************
mgo_CM{
- Version{"2.0.75.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/mk.txt b/data/locales/mk.txt
index 776a922..cdc7940 100644
--- a/data/locales/mk.txt
+++ b/data/locales/mk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mk.xml
// *
@@ -142,8 +142,154 @@
}
}
}
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, dd MMMM y G",
+ "dd MMMM y G",
+ "dd.M.y G",
+ "dd.M.yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M-d"}
+ MMM{"LLL"}
+ MMMEd{"E MMM d"}
+ MMMMEd{"E MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMMdd{"dd MMMM"}
+ MMMd{"MMM d"}
+ Md{"M-d"}
+ Mdd{"dd.M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"y-M"}
+ yMEd{"E, y-M-d"}
+ yMMM{"y MMM"}
+ yMMMEd{"E, y MMM d"}
+ yMMMM{"y MMMM"}
+ yMMMd{"y MMM d"}
+ yMd{"d-M-y"}
+ yQQQ{"y QQQ"}
+ yQQQQ{"y QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"HH-HH"}
+ }
+ Hm{
+ H{"HH:mm-HH:mm"}
+ m{"HH:mm-HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm-HH:mm v"}
+ m{"HH:mm-HH:mm v"}
+ }
+ Hv{
+ H{"HH-HH v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E, dd.M - E, dd.M"}
+ d{"E, dd.M - E, dd.M"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"E, dd MMM - E, dd MMM"}
+ d{"E, dd - E, dd MMM"}
+ }
+ MMMM{
+ M{"LLLL–LLLL"}
+ }
+ MMMd{
+ M{"dd MMM - dd MMM"}
+ d{"dd-dd MMM"}
+ }
+ Md{
+ M{"dd.M - dd.M"}
+ d{"dd.M - dd.M"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h-h a v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"M.y - M.y"}
+ y{"M.y - M.y"}
+ }
+ yMEd{
+ M{"E, dd.M.y - E, dd.M.y"}
+ d{"E, dd.M.y - E, dd.M.y"}
+ y{"E, dd.M.y - E, dd.M.y"}
+ }
+ yMMM{
+ M{"MMM-MMM y"}
+ y{"MMM y - MMM y"}
+ }
+ yMMMEd{
+ M{"E, dd MMM - E, dd MMM y"}
+ d{"E, dd - E, dd MMM y"}
+ y{"E, dd MMM y - E, dd MMM y"}
+ }
+ yMMMM{
+ M{"y-MM – MM"}
+ y{"y-MM – y-MM"}
+ }
+ yMMMd{
+ M{"dd MMM - dd MMM y"}
+ d{"dd-dd MMM y"}
+ y{"dd MMM y - dd MMM y"}
+ }
+ yMd{
+ M{"dd.M.y - dd.M.y"}
+ d{"dd.M.y - dd.M.y"}
+ y{"dd.M.y - dd.M.y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"претпладне",
@@ -156,7 +302,7 @@
"HH:mm",
"EEEE, dd MMMM y",
"dd MMMM y",
- "dd.M.yyyy",
+ "dd.M.y",
"dd.M.yy",
"{1} {0}",
"{1} {0}",
@@ -194,9 +340,6 @@
yMd{"d-M-y"}
yQQQ{"y QQQ"}
yQQQQ{"y QQQQ"}
- yyQQQ{"QQQ yy"}
- yyyyM{"M.yyyy"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -264,48 +407,6 @@
"ае.",
}
}
- fields{
- day{
- dn{"ден"}
- relative{
- "-1"{"Вчера"}
- "-2"{"завчера"}
- "0"{"Денес"}
- "1"{"Утре"}
- "2"{"задутре"}
- }
- }
- dayperiod{
- dn{"претпладне/попладне"}
- }
- era{
- dn{"Ера"}
- }
- hour{
- dn{"Час"}
- }
- minute{
- dn{"Минута"}
- }
- month{
- dn{"Месец"}
- }
- second{
- dn{"Секунда"}
- }
- week{
- dn{"Недела"}
- }
- weekday{
- dn{"Ден во неделата"}
- }
- year{
- dn{"година"}
- }
- zone{
- dn{"зона"}
- }
- }
intervalFormats{
H{
H{"HH-HH"}
@@ -372,13 +473,13 @@
y{"y-y"}
}
yM{
- M{"M.yy - M.yy"}
- y{"M.yy - M.yy"}
+ M{"M.y - M.y"}
+ y{"M.y - M.y"}
}
yMEd{
- M{"E, dd.M.yy - E, dd.M.yy"}
- d{"E, dd.M.yy - E, dd.M.yy"}
- y{"E, dd.M.yy - E, dd.M.yy"}
+ M{"E, dd.M.y - E, dd.M.y"}
+ d{"E, dd.M.y - E, dd.M.y"}
+ y{"E, dd.M.y - E, dd.M.y"}
}
yMMM{
M{"MMM-MMM y"}
@@ -390,8 +491,8 @@
y{"E, dd MMM y - E, dd MMM y"}
}
yMMMM{
- M{"yyyy-MM – MM"}
- y{"yyyy-MM – yyyy-MM"}
+ M{"y-MM – MM"}
+ y{"y-MM – y-MM"}
}
yMMMd{
M{"dd MMM - dd MMM y"}
@@ -399,9 +500,9 @@
y{"dd MMM y - dd MMM y"}
}
yMd{
- M{"dd.M.yy - dd.M.yy"}
- d{"dd.M.yy - dd.M.yy"}
- y{"dd.M.yy - dd.M.yy"}
+ M{"dd.M.y - dd.M.y"}
+ d{"dd.M.y - dd.M.y"}
+ y{"dd.M.y - dd.M.y"}
}
}
monthNames{
@@ -496,6 +597,48 @@
quotationEnd{"“"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"ден"}
+ relative{
+ "-1"{"Вчера"}
+ "-2"{"завчера"}
+ "0"{"Денес"}
+ "1"{"Утре"}
+ "2"{"задутре"}
+ }
+ }
+ dayperiod{
+ dn{"претпладне/попладне"}
+ }
+ era{
+ dn{"Ера"}
+ }
+ hour{
+ dn{"Час"}
+ }
+ minute{
+ dn{"Минута"}
+ }
+ month{
+ dn{"Месец"}
+ }
+ second{
+ dn{"Секунда"}
+ }
+ week{
+ dn{"Недела"}
+ }
+ weekday{
+ dn{"Ден во неделата"}
+ }
+ year{
+ dn{"година"}
+ }
+ zone{
+ dn{"зона"}
+ }
+ }
listPattern{
standard{
2{"{0}, {1}"}
diff --git a/data/locales/mk_MK.txt b/data/locales/mk_MK.txt
index 94659f8..6594db8 100644
--- a/data/locales/mk_MK.txt
+++ b/data/locales/mk_MK.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mk_MK.xml
// *
// ***************************************************************************
mk_MK{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ml.txt b/data/locales/ml.txt
index 1bd171f..731d511 100644
--- a/data/locales/ml.txt
+++ b/data/locales/ml.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ml.xml
// *
@@ -149,10 +149,170 @@
plusSign{"+"}
}
}
+ mlym{
+ symbols{
+ decimal{"."}
+ exponential{"E"}
+ group{","}
+ infinity{"∞"}
+ list{";"}
+ minusSign{"-"}
+ nan{"സംഖ്യയല്ല"}
+ perMille{"‰"}
+ percentSign{"%"}
+ plusSign{"+"}
+ }
+ }
native{"mlym"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "G y, MMMM d, EEEE",
+ "G y, MMMM d",
+ "G y, MMM d",
+ "dd/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"M/d, E"}
+ MMM{"LLL"}
+ MMMEd{"MMM d, E"}
+ MMMMEd{"MMMM d, E"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ MMdd{"dd-MM"}
+ Md{"d/M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M-y"}
+ yMEd{"d-M-y, E"}
+ yMM{"MM-y"}
+ yMMM{"y MMM"}
+ yMMMEd{"y MMM d, E"}
+ yMMMM{"y MMMM"}
+ yMMMd{"y MMM d"}
+ yMd{"d/M/y"}
+ yQQQ{"y QQQ"}
+ yQQQQ{"y QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"d/M, E - d/M, E"}
+ d{"d/M, E - d/M, E"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"MMM d, E - MMM d, E"}
+ d{"MMM d, E - MMM d, E"}
+ }
+ MMMM{
+ M{"LLLL-LLLL"}
+ }
+ MMMd{
+ M{"MMM d - MMM d"}
+ d{"MMM d-d"}
+ }
+ Md{
+ M{"d/M - d/M"}
+ d{"d/M - d/M"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
+ }
+ yMEd{
+ M{"d/M/y, E - d/M/y, E"}
+ d{"d/M/y, E - d/M/y, E"}
+ y{"d/M/y, E - d/M/y, E"}
+ }
+ yMMM{
+ M{"y MMM-MMM"}
+ y{"y MMM - y MMM"}
+ }
+ yMMMEd{
+ M{"y MMM d, E - MMM d, E"}
+ d{"y, MMM d, E - d, E"}
+ y{"y MMM d, E - y MMM d, E"}
+ }
+ yMMMM{
+ M{"y-MM – MM"}
+ y{"y-MM – y-MM"}
+ }
+ yMMMd{
+ M{"y MMM d - MMM d"}
+ d{"y MMM d-d"}
+ y{"y MMM d - y MMM d"}
+ }
+ yMd{
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"AM",
@@ -194,7 +354,8 @@
ms{"mm:ss"}
y{"y"}
yM{"M-y"}
- yMEd{"d-M-yyyy, E"}
+ yMEd{"d-M-y, E"}
+ yMM{"MM-y"}
yMMM{"y MMM"}
yMMMEd{"y MMM d, E"}
yMMMM{"y MMMM"}
@@ -202,9 +363,6 @@
yMd{"d/M/y"}
yQQQ{"y QQQ"}
yQQQQ{"y QQQQ"}
- yyQQQ{"QQQ yy"}
- yyyyMM{"MM-yyyy"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -267,63 +425,6 @@
"ക്രിസ്തുവിന് പിൻപ്",
}
}
- fields{
- day{
- dn{"ദിവസം"}
- relative{
- "-1"{"ഇന്നലെ"}
- "-2"{"മിനിഞ്ഞാന്ന്"}
- "0"{"ഇന്ന്"}
- "1"{"നാളെ"}
- "2"{"മറ്റന്നാൾ"}
- }
- }
- dayperiod{
- dn{"am/pm"}
- }
- era{
- dn{"കാലഘട്ടം"}
- }
- hour{
- dn{"മണിക്കൂർ"}
- }
- minute{
- dn{"മിനിട്ട്"}
- }
- month{
- dn{"മാസം"}
- relative{
- "-1"{"കഴിഞ്ഞ മാസം"}
- "0"{"ഈ മാസം"}
- "1"{"അടുത്ത മാസം"}
- }
- }
- second{
- dn{"സെക്കൻറ്"}
- }
- week{
- dn{"ആഴ്ച"}
- relative{
- "-1"{"കഴിഞ്ഞ ആഴ്ച"}
- "0"{"ഈ ആഴ്ച"}
- "1"{"അടുത്ത ആഴ്ച"}
- }
- }
- weekday{
- dn{"ആഴ്ചയിലെ ദിവസം"}
- }
- year{
- dn{"വർഷം"}
- relative{
- "-1"{"കഴിഞ്ഞ വർഷം"}
- "0"{"ഈ വർഷം"}
- "1"{"അടുത്തവർഷം"}
- }
- }
- zone{
- dn{"മേഖല"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -390,13 +491,13 @@
y{"y-y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"d/M/yy, E - d/M/yy, E"}
- d{"d/M/yy, E - d/M/yy, E"}
- y{"d/M/yy, E - d/M/yy, E"}
+ M{"d/M/y, E - d/M/y, E"}
+ d{"d/M/y, E - d/M/y, E"}
+ y{"d/M/y, E - d/M/y, E"}
}
yMMM{
M{"y MMM-MMM"}
@@ -408,8 +509,8 @@
y{"y MMM d, E - y MMM d, E"}
}
yMMMM{
- M{"yyyy-MM – MM"}
- y{"yyyy-MM – yyyy-MM"}
+ M{"y-MM – MM"}
+ y{"y-MM – y-MM"}
}
yMMMd{
M{"y MMM d - MMM d"}
@@ -417,9 +518,9 @@
y{"y MMM d - y MMM d"}
}
yMd{
- M{"d/M/yy – d/M/yy"}
- d{"d/M/yy – d/M/yy"}
- y{"d/M/yy – d/M/yy"}
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
}
}
monthNames{
@@ -624,6 +725,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"ദിവസം"}
+ relative{
+ "-1"{"ഇന്നലെ"}
+ "-2"{"മിനിഞ്ഞാന്ന്"}
+ "0"{"ഇന്ന്"}
+ "1"{"നാളെ"}
+ "2"{"മറ്റന്നാൾ"}
+ }
+ }
+ dayperiod{
+ dn{"am/pm"}
+ }
+ era{
+ dn{"കാലഘട്ടം"}
+ }
+ hour{
+ dn{"മണിക്കൂർ"}
+ }
+ minute{
+ dn{"മിനിട്ട്"}
+ }
+ month{
+ dn{"മാസം"}
+ relative{
+ "-1"{"കഴിഞ്ഞ മാസം"}
+ "0"{"ഈ മാസം"}
+ "1"{"അടുത്ത മാസം"}
+ }
+ }
+ second{
+ dn{"സെക്കൻറ്"}
+ }
+ week{
+ dn{"ആഴ്ച"}
+ relative{
+ "-1"{"കഴിഞ്ഞ ആഴ്ച"}
+ "0"{"ഈ ആഴ്ച"}
+ "1"{"അടുത്ത ആഴ്ച"}
+ }
+ }
+ weekday{
+ dn{"ആഴ്ചയിലെ ദിവസം"}
+ }
+ year{
+ dn{"വർഷം"}
+ relative{
+ "-1"{"കഴിഞ്ഞ വർഷം"}
+ "0"{"ഈ വർഷം"}
+ "1"{"അടുത്തവർഷം"}
+ }
+ }
+ zone{
+ dn{"മേഖല"}
+ }
+ }
listPattern{
standard{
2{"{0} കൂടാതെ {1}"}
diff --git a/data/locales/ml_IN.txt b/data/locales/ml_IN.txt
index 9228012..02dc8c3 100644
--- a/data/locales/ml_IN.txt
+++ b/data/locales/ml_IN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ml_IN.xml
// *
// ***************************************************************************
ml_IN{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/mn.txt b/data/locales/mn.txt
new file mode 100755
index 0000000..8d363f7
--- /dev/null
+++ b/data/locales/mn.txt
@@ -0,0 +1,828 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/mn.xml
+// *
+// ***************************************************************************
+/**
+ * ICU <specials> source: <path>/xml/main/mn.xml
+ */
+mn{
+ AuxExemplarCharacters{"[ә җ ӊ һ]"}
+ ExemplarCharacters{"[а б в г д е ё ж з и й к л м н о ө п р с т у ү ф х ц ч ш щ ъ ы ь э ю я]"}
+ ExemplarCharactersPunctuation{
+ "[\\- ‐ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ "
+ "″]"
+ }
+ LocaleScript{
+ "Cyrl",
+ }
+ NumberElements{
+ latn{
+ patterns{
+ currencyFormat{"¤ #,##0.00"}
+ decimalFormat{"#,##0.###"}
+ percentFormat{"#,##0%"}
+ scientificFormat{"#E0"}
+ }
+ patternsLong{
+ decimalFormat{
+ 1000{
+ one{"0 мянга"}
+ other{"0 мянга"}
+ }
+ 10000{
+ one{"00 мянга"}
+ other{"00 мянга"}
+ }
+ 100000{
+ one{"000 мянга"}
+ other{"000 мянга"}
+ }
+ 1000000{
+ one{"0 сая"}
+ other{"0 сая"}
+ }
+ 10000000{
+ one{"00 сая"}
+ other{"00 сая"}
+ }
+ 100000000{
+ one{"000 сая"}
+ other{"000 сая"}
+ }
+ 1000000000{
+ one{"0 тэрбум"}
+ other{"0 тэрбум"}
+ }
+ 10000000000{
+ one{"00 тэрбум"}
+ other{"00 тэрбум"}
+ }
+ 100000000000{
+ one{"000 тэрбум"}
+ other{"000 тэрбум"}
+ }
+ 1000000000000{
+ one{"0 их наяд"}
+ other{"0 их наяд"}
+ }
+ 10000000000000{
+ one{"00 их наяд"}
+ other{"00 их наяд"}
+ }
+ 100000000000000{
+ one{"000 их наяд"}
+ other{"000 их наяд"}
+ }
+ }
+ }
+ patternsShort{
+ decimalFormat{
+ 1000{
+ one{"0 мянга"}
+ other{"0 мянга"}
+ }
+ 10000{
+ one{"00 мянга"}
+ other{"00 мянга"}
+ }
+ 100000{
+ one{"000 мянга"}
+ other{"000 мянга"}
+ }
+ 1000000{
+ one{"0 сая"}
+ other{"0 сая"}
+ }
+ 10000000{
+ one{"00 сая"}
+ other{"00 сая"}
+ }
+ 100000000{
+ one{"000 сая"}
+ other{"000 сая"}
+ }
+ 1000000000{
+ one{"0 тэрбум"}
+ other{"0 тэрбум"}
+ }
+ 10000000000{
+ one{"00 тэрбум"}
+ other{"00 тэрбум"}
+ }
+ 100000000000{
+ one{"000B"}
+ other{"000B"}
+ }
+ 1000000000000{
+ one{"0 их наяд"}
+ other{"0 их наяд"}
+ }
+ 10000000000000{
+ one{"00T"}
+ other{"00T"}
+ }
+ 100000000000000{
+ one{"000T"}
+ other{"000T"}
+ }
+ }
+ }
+ symbols{
+ decimal{","}
+ exponential{"E"}
+ group{" "}
+ infinity{"∞"}
+ list{";"}
+ minusSign{"-"}
+ nan{"NaN"}
+ perMille{"‰"}
+ percentSign{"%"}
+ plusSign{"+"}
+ }
+ }
+ }
+ Version{"2.0.82.51"}
+ calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, G y 'оны' MMM 'сарын' dd",
+ "G y 'оны' MMM 'сарын' d",
+ "G y MMM d",
+ "GGGGG y-MM-dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1}, {0}",
+ }
+ availableFormats{
+ Ed{"dd E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M-d"}
+ MMM{"LLL"}
+ MMMEd{"E MMM d"}
+ MMMd{"MMM d"}
+ Md{"M-d"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"y-M"}
+ yMEd{"E, y-M-d"}
+ yMMM{"y MMM"}
+ yMMMEd{"E, y MMM d"}
+ yMMMd{"y MMM d"}
+ yMd{"y-M-d"}
+ yQQQ{"y QQQ"}
+ yQQQQ{"y 'оны' QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, MM/dd - E, MM/dd"}
+ d{"E, MM/dd - E, MM/dd"}
+ }
+ MMM{
+ M{"LLL–LLL"}
+ }
+ MMMEd{
+ M{"E, MM/dd - E, MM/dd"}
+ d{"E, MM/dd - E, MM/dd"}
+ }
+ MMMd{
+ M{"MM/d - MM/d"}
+ d{"MM/d-d"}
+ }
+ Md{
+ M{"MM/dd-MM/dd"}
+ d{"MM/dd-MM/dd"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"y/MM-MM"}
+ y{"y/MM - y/MM"}
+ }
+ yMEd{
+ M{"E, y/MM/dd – E, y/MM/dd"}
+ d{"E, y/MM/dd – E, y/MM/dd"}
+ y{"E, y/MM/dd – E, y/MM/dd"}
+ }
+ yMMM{
+ M{"y/MM-MM"}
+ y{"y/MM - y/MM"}
+ }
+ yMMMEd{
+ M{"E, y/MM/dd – E, y/MM/dd"}
+ d{"E, y/MM/dd – E, y/MM/dd"}
+ y{"E, y/MM/dd – E, y/MM/dd"}
+ }
+ yMMMM{
+ M{"y 'оны' MM-MM-'р' 'сар'"}
+ y{"y/MM -y/MM"}
+ }
+ yMMMd{
+ M{"y/MM/dd - MM/dd"}
+ d{"y/MM/d-d"}
+ y{"y/MM/dd - y/MM/dd"}
+ }
+ yMd{
+ M{"y/MM/dd -MM/dd"}
+ d{"y/MM/dd-dd"}
+ y{"y/MM/dd - y/MM/dd"}
+ }
+ }
+ }
+ gregorian{
+ AmPmMarkers{
+ "ҮӨ",
+ "ҮХ",
+ }
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, y 'оны' MMM 'сарын' dd",
+ "y 'оны' MMM 'сарын' d",
+ "y MMM d",
+ "y-MM-dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1}, {0}",
+ }
+ availableFormats{
+ Ed{"dd E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M-d"}
+ MMM{"LLL"}
+ MMMEd{"E MMM d"}
+ MMMd{"MMM d"}
+ Md{"M-d"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"y-M"}
+ yMEd{"E, y-M-d"}
+ yMMM{"y MMM"}
+ yMMMEd{"E, y MMM d"}
+ yMMMd{"y MMM d"}
+ yMd{"y-M-d"}
+ yQQQ{"y QQQ"}
+ yQQQQ{"y 'оны' QQQQ"}
+ }
+ dayNames{
+ format{
+ abbreviated{
+ "Ня",
+ "Да",
+ "Мя",
+ "Лх",
+ "Пү",
+ "Ба",
+ "Бя",
+ }
+ narrow{
+ "1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ }
+ short{
+ "Ня",
+ "Да",
+ "Мя",
+ "Лх",
+ "Пү",
+ "Ба",
+ "Бя",
+ }
+ wide{
+ "ням",
+ "даваа",
+ "мягмар",
+ "лхагва",
+ "пүрэв",
+ "баасан",
+ "бямба",
+ }
+ }
+ stand-alone{
+ abbreviated{
+ "Ня",
+ "Да",
+ "Мя",
+ "Лх",
+ "Пү",
+ "Ба",
+ "Бя",
+ }
+ narrow{
+ "1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ }
+ short{
+ "Ня",
+ "Да",
+ "Мя",
+ "Лх",
+ "Пү",
+ "Ба",
+ "Бя",
+ }
+ wide{
+ "ням",
+ "даваа",
+ "мягмар",
+ "лхагва",
+ "пүрэв",
+ "баасан",
+ "бямба",
+ }
+ }
+ }
+ eras{
+ abbreviated{
+ "МЭӨ",
+ "МЭ",
+ }
+ narrow{
+ "м.э.ө",
+ "м.э.",
+ }
+ wide{
+ "манай эриний өмнөх",
+ "манай эриний",
+ }
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, MM/dd - E, MM/dd"}
+ d{"E, MM/dd - E, MM/dd"}
+ }
+ MMM{
+ M{"LLL–LLL"}
+ }
+ MMMEd{
+ M{"E, MM/dd - E, MM/dd"}
+ d{"E, MM/dd - E, MM/dd"}
+ }
+ MMMd{
+ M{"MM/d - MM/d"}
+ d{"MM/d-d"}
+ }
+ Md{
+ M{"MM/dd-MM/dd"}
+ d{"MM/dd-MM/dd"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"y/MM-MM"}
+ y{"y/MM - y/MM"}
+ }
+ yMEd{
+ M{"E, y/MM/dd – E, y/MM/dd"}
+ d{"E, y/MM/dd – E, y/MM/dd"}
+ y{"E, y/MM/dd – E, y/MM/dd"}
+ }
+ yMMM{
+ M{"y/MM-MM"}
+ y{"y/MM - y/MM"}
+ }
+ yMMMEd{
+ M{"E, y/MM/dd – E, y/MM/dd"}
+ d{"E, y/MM/dd – E, y/MM/dd"}
+ y{"E, y/MM/dd – E, y/MM/dd"}
+ }
+ yMMMM{
+ M{"y 'оны' MM-MM-'р' 'сар'"}
+ y{"y/MM -y/MM"}
+ }
+ yMMMd{
+ M{"y/MM/dd - MM/dd"}
+ d{"y/MM/d-d"}
+ y{"y/MM/dd - y/MM/dd"}
+ }
+ yMd{
+ M{"y/MM/dd -MM/dd"}
+ d{"y/MM/dd-dd"}
+ y{"y/MM/dd - y/MM/dd"}
+ }
+ }
+ monthNames{
+ format{
+ abbreviated{
+ "хул",
+ "үхэ",
+ "бар",
+ "туу",
+ "луу",
+ "мог",
+ "мор",
+ "хон",
+ "бич",
+ "тах",
+ "нох",
+ "гах",
+ }
+ narrow{
+ "1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+ "11",
+ "12",
+ }
+ wide{
+ "Хулгана",
+ "Үхэр",
+ "Бар",
+ "Туулай",
+ "Луу",
+ "Могой",
+ "Морь",
+ "Хонь",
+ "Бич",
+ "Тахиа",
+ "Нохой",
+ "Гахай",
+ }
+ }
+ stand-alone{
+ abbreviated{
+ "хул",
+ "үхэ",
+ "бар",
+ "туу",
+ "луу",
+ "мог",
+ "мор",
+ "хон",
+ "бич",
+ "тах",
+ "нох",
+ "гах",
+ }
+ narrow{
+ "1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+ "11",
+ "12",
+ }
+ wide{
+ "Хулгана",
+ "Үхэр",
+ "Бар",
+ "Туулай",
+ "Луу",
+ "Могой",
+ "Морь",
+ "Хонь",
+ "Бич",
+ "Тахиа",
+ "Нохой",
+ "Гахай",
+ }
+ }
+ }
+ quarters{
+ format{
+ abbreviated{
+ "У1",
+ "У2",
+ "У3",
+ "У4",
+ }
+ narrow{
+ "1",
+ "2",
+ "3",
+ "4",
+ }
+ wide{
+ "1-р улирал",
+ "2-р улирал",
+ "3-р улирал",
+ "4-р улирал",
+ }
+ }
+ stand-alone{
+ abbreviated{
+ "У1",
+ "У2",
+ "У3",
+ "У4",
+ }
+ narrow{
+ "1",
+ "2",
+ "3",
+ "4",
+ }
+ wide{
+ "1-р улирал",
+ "2-р улирал",
+ "3-р улирал",
+ "4-р улирал",
+ }
+ }
+ }
+ }
+ }
+ delimiters{
+ alternateQuotationEnd{"”"}
+ alternateQuotationStart{"“"}
+ quotationEnd{"’"}
+ quotationStart{"‘"}
+ }
+ fields{
+ day{
+ dn{"Өдөр"}
+ relative{
+ "-1"{"Өчигдөр"}
+ "-2"{"Уржигдар"}
+ "0"{"Өнөөдөр"}
+ "1"{"Маргааш"}
+ "2"{"Нөгөөдөр"}
+ }
+ }
+ dayperiod{
+ dn{"Өдрийн цаг"}
+ }
+ era{
+ dn{"Эрин"}
+ }
+ hour{
+ dn{"Цаг"}
+ }
+ minute{
+ dn{"Минут"}
+ }
+ month{
+ dn{"Сар"}
+ }
+ second{
+ dn{"Хором"}
+ }
+ week{
+ dn{"Долоо хоног"}
+ }
+ weekday{
+ dn{"Гариг"}
+ }
+ year{
+ dn{"Жил"}
+ }
+ zone{
+ dn{"Бүс"}
+ }
+ }
+ listPattern{
+ standard{
+ 2{"{0}, {1}"}
+ end{"{0}, {1}"}
+ middle{"{0}, {1}"}
+ start{"{0}, {1}"}
+ }
+ }
+ measurementSystemNames{
+ UK{"Их Британийн"}
+ US{"АНУ-ын"}
+ metric{"метрийн"}
+ }
+ units{
+ day{
+ one{"{0} өдөр"}
+ other{"{0} өдөр"}
+ }
+ day-future{
+ one{"{0} өдөрт"}
+ other{"{0} өдөрт"}
+ }
+ day-past{
+ one{"{0} өдрийн өмнө"}
+ other{"{0} өдрийн өмнө"}
+ }
+ hour{
+ one{"{0} цаг"}
+ other{"{0} цаг"}
+ }
+ hour-future{
+ one{"{0} цагт"}
+ other{"{0} цагт"}
+ }
+ hour-past{
+ one{"{0} цагийн өмнө"}
+ other{"{0} цагийн өмнө"}
+ }
+ minute{
+ one{"{0} минут"}
+ other{"{0} минут"}
+ }
+ minute-future{
+ one{"{0} минутанд"}
+ other{"{0} минутанд"}
+ }
+ minute-past{
+ one{"{0} минутын өмнө"}
+ other{"{0} минутын өмнө"}
+ }
+ month{
+ one{"{0} сар"}
+ other{"{0} сар"}
+ }
+ month-future{
+ one{"{0} сард"}
+ other{"{0} сард"}
+ }
+ month-past{
+ one{"{0} сарын өмнө"}
+ other{"{0} сарын өмнө"}
+ }
+ second{
+ one{"{0} хором"}
+ other{"{0} хором"}
+ }
+ second-future{
+ one{"{0} хоромд"}
+ other{"{0} хоромд"}
+ }
+ second-past{
+ one{"{0} хормын өмнө"}
+ other{"{0} хормын өмнө"}
+ }
+ week{
+ one{"{0} долоо хоног"}
+ other{"{0} долоо хоног"}
+ }
+ week-future{
+ one{"{0} долоо хоногт"}
+ other{"{0} долоо хоногт"}
+ }
+ year{
+ one{"{0} жил"}
+ other{"{0} жил"}
+ }
+ year-future{
+ one{"{0} жилд"}
+ other{"{0} жилд"}
+ }
+ year-past{
+ one{"{0} жилийн өмнө"}
+ other{"{0} жилийн өмнө"}
+ }
+ }
+ unitsShort{
+ day{
+ one{"{0} өдөр"}
+ other{"{0} өдөр"}
+ }
+ hour{
+ one{"{0} цаг"}
+ other{"{0} цаг"}
+ }
+ minute{
+ one{"{0} мин"}
+ other{"{0} мин"}
+ }
+ month{
+ one{"{0} сар"}
+ other{"{0} сар"}
+ }
+ second{
+ one{"{0} хором"}
+ other{"{0} хором"}
+ }
+ week{
+ one{"{0} долоо хоног"}
+ other{"{0} долоо хоног"}
+ }
+ year{
+ one{"{0} жил"}
+ other{"{0} жил"}
+ }
+ }
+}
diff --git a/data/locales/mn_Cyrl.txt b/data/locales/mn_Cyrl.txt
new file mode 100755
index 0000000..9f0bc2a
--- /dev/null
+++ b/data/locales/mn_Cyrl.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/mn_Cyrl.xml
+// *
+// ***************************************************************************
+/**
+ * ICU <specials> source: <path>/xml/main/mn_Cyrl.xml
+ */
+mn_Cyrl{
+ LocaleScript{
+ "Cyrl",
+ }
+ Version{"2.0.82.45"}
+}
diff --git a/data/locales/mn_Cyrl_MN.txt b/data/locales/mn_Cyrl_MN.txt
new file mode 100755
index 0000000..d4f528b
--- /dev/null
+++ b/data/locales/mn_Cyrl_MN.txt
@@ -0,0 +1,11 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/mn_Cyrl_MN.xml
+// *
+// ***************************************************************************
+mn_Cyrl_MN{
+ Version{"2.0.82.45"}
+}
diff --git a/data/coll/hi__DIRECT.txt b/data/locales/mn_MN.txt
old mode 100644
new mode 100755
similarity index 73%
copy from data/coll/hi__DIRECT.txt
copy to data/locales/mn_MN.txt
index fd5973f..cf689b7
--- a/data/coll/hi__DIRECT.txt
+++ b/data/locales/mn_MN.txt
@@ -1,13 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
-hi__DIRECT{
- collations{
- default{"direct"}
- }
+mn_MN{
+ "%%ALIAS"{"mn_Cyrl_MN"}
}
diff --git a/data/locales/mo.txt b/data/locales/mo.txt
index ef3bdd7..55f72d2 100755
--- a/data/locales/mo.txt
+++ b/data/locales/mo.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/mr.txt b/data/locales/mr.txt
index 5cc6eda..b0c1d7e 100644
--- a/data/locales/mr.txt
+++ b/data/locales/mr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mr.xml
// *
@@ -24,7 +24,7 @@
"Deva",
}
NumberElements{
- default{"latn"}
+ default{"deva"}
latn{
patterns{
currencyFormat{"¤#,##0.00;(¤#,##0.00)"}
@@ -151,8 +151,150 @@
}
native{"deva"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h-mm-ss a zzzz",
+ "h-mm-ss a z",
+ "h-mm-ss a",
+ "h-mm a",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d-M-yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ H{"HH"}
+ Hm{"H-mm"}
+ Hms{"H-mm-ss"}
+ M{"M"}
+ MEd{"E, d/M"}
+ MMM{"LLL"}
+ MMMEd{"E, d MMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMdd{"dd-MM"}
+ Md{"d/M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMM{"MM-y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, d/M - E, d/M"}
+ d{"E, d/M - E, d/M"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E, d MMM - E, d MMM"}
+ d{"E, d MMM - E, d MMM"}
+ }
+ MMMd{
+ M{"d MMM - d MMM"}
+ d{"d-d MMM"}
+ }
+ Md{
+ M{"d/M - d/M"}
+ d{"d/M - d/M"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
+ }
+ yMEd{
+ M{"E, d/M/y - E, d/M/y"}
+ d{"E, d/M/y - E, d/M/y"}
+ y{"E, d/M/y - E, d/M/y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y - MMM y"}
+ }
+ yMMMEd{
+ M{"E, d MMM - E, d MMM y"}
+ d{"E, d MMM y - E, d MMM y"}
+ y{"E, d MMM y - E, d MMM y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"d MMM - d MMM y"}
+ d{"d-d MMM y"}
+ y{"d MMM y - d MMM y"}
+ }
+ yMd{
+ M{"d/M/y - d/M/y"}
+ d{"d/M/y - d/M/y"}
+ y{"d/M/y - d/M/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"AM",
@@ -194,14 +336,14 @@
y{"y"}
yM{"M/y"}
yMEd{"E, M/d/y"}
+ yMM{"MM-y"}
yMMM{"MMM y"}
yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
yMMMd{"d MMM y"}
yMd{"d/M/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyyyMM{"MM-yyyy"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -282,61 +424,6 @@
"ईसवीसन",
}
}
- fields{
- day{
- dn{"दिवस"}
- relative{
- "-1"{"काल"}
- "0"{"आज"}
- "1"{"उद्या"}
- }
- }
- dayperiod{
- dn{"AM/PM"}
- }
- era{
- dn{"युग"}
- }
- hour{
- dn{"तास"}
- }
- minute{
- dn{"मिनिट"}
- }
- month{
- dn{"महिना"}
- relative{
- "-1"{"मागील महिना"}
- "0"{"हा महिना"}
- "1"{"पुढील महिना"}
- }
- }
- second{
- dn{"सेकंद"}
- }
- week{
- dn{"आठव़डा"}
- relative{
- "-1"{"मागील आठवडा"}
- "0"{"हा आठवडा"}
- "1"{"पुढील आठवडा"}
- }
- }
- weekday{
- dn{"आठवड्याचा दिवस"}
- }
- year{
- dn{"वर्ष"}
- relative{
- "-1"{"मागील वर्ष"}
- "0"{"या वर्षी"}
- "1"{"पुढील वर्ष"}
- }
- }
- zone{
- dn{"झोन"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -400,13 +487,13 @@
y{"y–y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E, d/M/yy - E, d/M/yy"}
- d{"E, d/M/yy - E, d/M/yy"}
- y{"E, d/M/yy - E, d/M/yy"}
+ M{"E, d/M/y - E, d/M/y"}
+ d{"E, d/M/y - E, d/M/y"}
+ y{"E, d/M/y - E, d/M/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -427,9 +514,9 @@
y{"d MMM y - d MMM y"}
}
yMd{
- M{"d/M/yy - d/M/yy"}
- d{"d/M/yy - d/M/yy"}
- y{"d/M/yy - d/M/yy"}
+ M{"d/M/y - d/M/y"}
+ d{"d/M/y - d/M/y"}
+ y{"d/M/y - d/M/y"}
}
}
monthNames{
@@ -552,6 +639,61 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"दिवस"}
+ relative{
+ "-1"{"काल"}
+ "0"{"आज"}
+ "1"{"उद्या"}
+ }
+ }
+ dayperiod{
+ dn{"AM/PM"}
+ }
+ era{
+ dn{"युग"}
+ }
+ hour{
+ dn{"तास"}
+ }
+ minute{
+ dn{"मिनिट"}
+ }
+ month{
+ dn{"महिना"}
+ relative{
+ "-1"{"मागील महिना"}
+ "0"{"हा महिना"}
+ "1"{"पुढील महिना"}
+ }
+ }
+ second{
+ dn{"सेकंद"}
+ }
+ week{
+ dn{"आठव़डा"}
+ relative{
+ "-1"{"मागील आठवडा"}
+ "0"{"हा आठवडा"}
+ "1"{"पुढील आठवडा"}
+ }
+ }
+ weekday{
+ dn{"आठवड्याचा दिवस"}
+ }
+ year{
+ dn{"वर्ष"}
+ relative{
+ "-1"{"मागील वर्ष"}
+ "0"{"या वर्षी"}
+ "1"{"पुढील वर्ष"}
+ }
+ }
+ zone{
+ dn{"झोन"}
+ }
+ }
listPattern{
standard{
2{"{0} आणि {1}"}
diff --git a/data/locales/mr_IN.txt b/data/locales/mr_IN.txt
index 1d21cd5..13fc3c9 100644
--- a/data/locales/mr_IN.txt
+++ b/data/locales/mr_IN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mr_IN.xml
// *
// ***************************************************************************
mr_IN{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ms.txt b/data/locales/ms.txt
index 2131290..9d58e6a 100644
--- a/data/locales/ms.txt
+++ b/data/locales/ms.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ms.xml
// *
@@ -121,7 +121,7 @@
}
}
}
- Version{"2.0.78.20"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
DateTimePatterns{
@@ -260,6 +260,147 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "dd/MM/y G",
+ "d/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hmm{"H:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d-M"}
+ MMM{"LLL"}
+ MMMEd{"E, d MMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMdd{"dd/MM"}
+ Md{"d-M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M-y"}
+ yMEd{"E, d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, d MMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, d/M – E, d/M"}
+ d{"E, d/M – E, d/M"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E, d MMM – E, d MMM"}
+ d{"E, d MMM – E, d MMM"}
+ }
+ MMMd{
+ M{"d MMM – d MMM"}
+ d{"d–d MMM"}
+ }
+ Md{
+ M{"d/M – d/M"}
+ d{"d/M – d/M"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
+ }
+ yMEd{
+ M{"E, d/M/y – E, d/M/y"}
+ d{"E, d/M/y – E, d/M/y"}
+ y{"E, d/M/y – E, d/M/y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y – MMM y"}
+ }
+ yMMMEd{
+ M{"E, d MMM – E, d MMM, y"}
+ d{"E, d MMM – E, d MMM, y"}
+ y{"E, d MMM y – E, d MMM y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"d MMM – d MMM, y"}
+ d{"d–d MMM y"}
+ y{"d MMM y – d MMM y"}
+ }
+ yMd{
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"PG",
@@ -272,7 +413,7 @@
"h:mm a",
"EEEE, d MMMM y",
"d MMMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"d/MM/yy",
"{1} {0}",
"{1} {0}",
@@ -393,63 +534,6 @@
"TM",
}
}
- fields{
- day{
- dn{"Hari"}
- relative{
- "-1"{"Semalam"}
- "-2"{"Hari sebelum semalam"}
- "0"{"Hari ini"}
- "1"{"Esok"}
- "2"{"Hari selepas esok"}
- }
- }
- dayperiod{
- dn{"PG/PTG"}
- }
- era{
- dn{"Era"}
- }
- hour{
- dn{"Jam"}
- }
- minute{
- dn{"Minit"}
- }
- month{
- dn{"Bulan"}
- relative{
- "-1"{"Bulan lalu"}
- "0"{"Bulan ini"}
- "1"{"Bulan seterusnya"}
- }
- }
- second{
- dn{"Kedua"}
- }
- week{
- dn{"Minggu"}
- relative{
- "-1"{"Minggu lepas"}
- "0"{"Minggu ini"}
- "1"{"Minggu seterusnya"}
- }
- }
- weekday{
- dn{"Hari dalam Minggu"}
- }
- year{
- dn{"Tahun"}
- relative{
- "-1"{"Tahun lepas"}
- "0"{"Tahun ini"}
- "1"{"Tahun depan"}
- }
- }
- zone{
- dn{"Zon Waktu"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -513,13 +597,13 @@
y{"y–y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E, d/M/yy – E, d/M/yy"}
- d{"E, d/M/yy – E, d/M/yy"}
- y{"E, d/M/yy – E, d/M/yy"}
+ M{"E, d/M/y – E, d/M/y"}
+ d{"E, d/M/y – E, d/M/y"}
+ y{"E, d/M/y – E, d/M/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -540,9 +624,9 @@
y{"d MMM y – d MMM y"}
}
yMd{
- M{"d/M/yy – d/M/yy"}
- d{"d/M/yy – d/M/yy"}
- y{"d/M/yy – d/M/yy"}
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
}
}
monthNames{
@@ -701,11 +785,11 @@
MMMMd{"d MMMM"}
MMMd{"d MMM"}
Md{"d/M"}
- yyyyM{"M/y G"}
- yyyyMEd{"E, d/M/y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMd{"d MMM y G"}
+ yM{"M/y G"}
+ yMEd{"E, d/M/y G"}
+ yMMM{"MMM y G"}
+ yMMMEd{"E, d MMM y G"}
+ yMMMd{"d MMM y G"}
}
}
japanese{
@@ -731,11 +815,11 @@
MMMMd{"d MMMM"}
MMMd{"d MMM"}
Md{"d/M"}
- yyyyM{"M/y G"}
- yyyyMEd{"E, d/M/y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMd{"d MMM y G"}
+ yM{"M/y G"}
+ yMEd{"E, d/M/y G"}
+ yMMM{"MMM y G"}
+ yMMMEd{"E, d MMM y G"}
+ yMMMd{"d MMM y G"}
}
}
roc{
@@ -761,11 +845,11 @@
MMMMd{"d MMMM"}
MMMd{"d MMM"}
Md{"d/M"}
- yyyyM{"M/y G"}
- yyyyMEd{"E, d/M/y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMd{"d MMM y G"}
+ yM{"M/y G"}
+ yMEd{"E, d/M/y G"}
+ yMMM{"MMM y G"}
+ yMMMEd{"E, d MMM y G"}
+ yMMMd{"d MMM y G"}
}
}
}
@@ -775,6 +859,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Hari"}
+ relative{
+ "-1"{"Semalam"}
+ "-2"{"Hari sebelum semalam"}
+ "0"{"Hari ini"}
+ "1"{"Esok"}
+ "2"{"Hari selepas esok"}
+ }
+ }
+ dayperiod{
+ dn{"PG/PTG"}
+ }
+ era{
+ dn{"Era"}
+ }
+ hour{
+ dn{"Jam"}
+ }
+ minute{
+ dn{"Minit"}
+ }
+ month{
+ dn{"Bulan"}
+ relative{
+ "-1"{"Bulan lalu"}
+ "0"{"Bulan ini"}
+ "1"{"Bulan seterusnya"}
+ }
+ }
+ second{
+ dn{"Kedua"}
+ }
+ week{
+ dn{"Minggu"}
+ relative{
+ "-1"{"Minggu lepas"}
+ "0"{"Minggu ini"}
+ "1"{"Minggu seterusnya"}
+ }
+ }
+ weekday{
+ dn{"Hari dalam Minggu"}
+ }
+ year{
+ dn{"Tahun"}
+ relative{
+ "-1"{"Tahun lepas"}
+ "0"{"Tahun ini"}
+ "1"{"Tahun depan"}
+ }
+ }
+ zone{
+ dn{"Zon Waktu"}
+ }
+ }
listPattern{
standard{
2{"{0} dan {1}"}
diff --git a/data/locales/ms_BN.txt b/data/locales/ms_BN.txt
index c50c6e2..3f5c08a 100644
--- a/data/locales/ms_BN.txt
+++ b/data/locales/ms_BN.txt
@@ -1,41 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
-// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/common/main/ms_BN.xml
+// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
+// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
ms_BN{
- NumberElements{
- latn{
- patterns{
- currencyFormat{"¤ #,##0.00"}
- }
- symbols{
- decimal{","}
- group{"."}
- }
- }
- }
- Version{"2.0.74.65"}
- calendar{
- gregorian{
- DateTimePatterns{
- "h:mm:ss a zzzz",
- "h:mm:ss a z",
- "h:mm:ss a",
- "h:mm a",
- "dd MMMM y",
- "d MMMM y",
- "dd/MM/yyyy",
- "d/MM/yy",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- }
- }
+ "%%ALIAS"{"ms_Latn_BN"}
}
diff --git a/data/locales/ms_Latn.txt b/data/locales/ms_Latn.txt
new file mode 100644
index 0000000..a092fdc
--- /dev/null
+++ b/data/locales/ms_Latn.txt
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/ms_Latn.xml
+// *
+// ***************************************************************************
+/**
+ * ICU <specials> source: <path>/xml/main/ms_Latn.xml
+ */
+ms_Latn{
+ LocaleScript{
+ "Latn",
+ }
+ Version{"2.0.82.68"}
+}
diff --git a/data/locales/ms_Latn_BN.txt b/data/locales/ms_Latn_BN.txt
new file mode 100644
index 0000000..d069c55
--- /dev/null
+++ b/data/locales/ms_Latn_BN.txt
@@ -0,0 +1,58 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/ms_Latn_BN.xml
+// *
+// ***************************************************************************
+ms_Latn_BN{
+ NumberElements{
+ latn{
+ patterns{
+ currencyFormat{"¤ #,##0.00"}
+ }
+ symbols{
+ decimal{","}
+ group{"."}
+ }
+ }
+ }
+ Version{"2.0.82.68"}
+ calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "dd MMMM y G",
+ "d MMMM y G",
+ "dd/MM/y G",
+ "d/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
+ gregorian{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "dd MMMM y",
+ "d MMMM y",
+ "dd/MM/y",
+ "d/MM/yy",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
+ }
+}
diff --git a/data/locales/ms_Latn_MY.txt b/data/locales/ms_Latn_MY.txt
new file mode 100644
index 0000000..4ba5ee7
--- /dev/null
+++ b/data/locales/ms_Latn_MY.txt
@@ -0,0 +1,11 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/ms_Latn_MY.xml
+// *
+// ***************************************************************************
+ms_Latn_MY{
+ Version{"2.0.82.68"}
+}
diff --git a/data/locales/ms_Latn_SG.txt b/data/locales/ms_Latn_SG.txt
new file mode 100644
index 0000000..dd4922c
--- /dev/null
+++ b/data/locales/ms_Latn_SG.txt
@@ -0,0 +1,11 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/ms_Latn_SG.xml
+// *
+// ***************************************************************************
+ms_Latn_SG{
+ Version{"2.0.82.68"}
+}
diff --git a/data/locales/ms_MY.txt b/data/locales/ms_MY.txt
index 9313f4c..c926ea92 100644
--- a/data/locales/ms_MY.txt
+++ b/data/locales/ms_MY.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
-// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/common/main/ms_MY.xml
+// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
+// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
ms_MY{
- Version{"2.0.41.23"}
+ "%%ALIAS"{"ms_Latn_MY"}
}
diff --git a/data/locales/ms_SG.txt b/data/locales/ms_SG.txt
index 3144f21..841c737 100755
--- a/data/locales/ms_SG.txt
+++ b/data/locales/ms_SG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
-// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/common/main/ms_SG.xml
+// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
+// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
ms_SG{
- Version{"2.0.74.65"}
+ "%%ALIAS"{"ms_Latn_SG"}
}
diff --git a/data/locales/mt.txt b/data/locales/mt.txt
index ce95a48..10d2379 100644
--- a/data/locales/mt.txt
+++ b/data/locales/mt.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mt.xml
// *
@@ -13,7 +13,7 @@
AuxExemplarCharacters{"[c y]"}
ExemplarCharacters{"[a à b ċ d e è f ġ g {għ} h ħ i ì j k l m n o ò p q r s t u ù v w x ż z]"}
ExemplarCharactersIndex{"[A B Ċ C D E F Ġ G {GĦ} H Ħ I {IE} J K L M N O P Q R S T U V W X Y Ż Z]"}
- ExemplarCharactersPunctuation{"[\- , ; \: ! ? . ' ‘ ’ \" “ ” ( ) \[ \] \{ \}]"}
+ ExemplarCharactersPunctuation{"[\\- , ; \\: ! ? . ' ‘ ’ \u0022 “ ” ( ) \\[ \\] \\{ \\}]"}
LocaleScript{
"Latn",
}
@@ -28,8 +28,25 @@
}
}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d 'ta'’ MMMM y G",
+ "d 'ta'’ MMMM y G",
+ "dd MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
gregorian{
AmPmMarkers{
"QN",
@@ -43,7 +60,7 @@
"EEEE, d 'ta'’ MMMM y",
"d 'ta'’ MMMM y",
"dd MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -93,43 +110,6 @@
"Wara Kristu",
}
}
- fields{
- day{
- dn{"Jum"}
- relative{
- "-1"{"Lbieraħ"}
- "0"{"Illum"}
- "1"{"Għada"}
- }
- }
- era{
- dn{"Epoka"}
- }
- hour{
- dn{"Siegħa"}
- }
- minute{
- dn{"Minuta"}
- }
- month{
- dn{"Xahar"}
- }
- second{
- dn{"Sekonda"}
- }
- week{
- dn{"Ġimgħa"}
- }
- weekday{
- dn{"Jum tal-Ġimgħa"}
- }
- year{
- dn{"Sena"}
- }
- zone{
- dn{"Żona"}
- }
- }
monthNames{
format{
abbreviated{
@@ -196,6 +176,43 @@
}
}
}
+ fields{
+ day{
+ dn{"Jum"}
+ relative{
+ "-1"{"Lbieraħ"}
+ "0"{"Illum"}
+ "1"{"Għada"}
+ }
+ }
+ era{
+ dn{"Epoka"}
+ }
+ hour{
+ dn{"Siegħa"}
+ }
+ minute{
+ dn{"Minuta"}
+ }
+ month{
+ dn{"Xahar"}
+ }
+ second{
+ dn{"Sekonda"}
+ }
+ week{
+ dn{"Ġimgħa"}
+ }
+ weekday{
+ dn{"Jum tal-Ġimgħa"}
+ }
+ year{
+ dn{"Sena"}
+ }
+ zone{
+ dn{"Żona"}
+ }
+ }
measurementSystemNames{
metric{"Metriku"}
}
diff --git a/data/locales/mt_MT.txt b/data/locales/mt_MT.txt
index 6ce864b..3b6a748 100644
--- a/data/locales/mt_MT.txt
+++ b/data/locales/mt_MT.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mt_MT.xml
// *
// ***************************************************************************
mt_MT{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/mua.txt b/data/locales/mua.txt
index 5d1da2f..c1c42a3 100755
--- a/data/locales/mua.txt
+++ b/data/locales/mua.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mua.xml
// *
@@ -29,8 +29,49 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d/M/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"comme",
@@ -44,7 +85,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM y",
- "d/M/yyyy",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -118,43 +159,6 @@
"Pel Kristu",
}
}
- fields{
- day{
- dn{"Zah'nane/ Comme"}
- relative{
- "-1"{"Tǝsoo"}
- "0"{"Tǝ'nahko"}
- "1"{"Tǝ'nane"}
- }
- }
- era{
- dn{"Syii ma tãa"}
- }
- hour{
- dn{"Cok comme"}
- }
- minute{
- dn{"Cok comme ma laŋne"}
- }
- month{
- dn{"Fĩi"}
- }
- second{
- dn{"Cok comme ma laŋ tǝ biŋ"}
- }
- week{
- dn{"Luma"}
- }
- weekday{
- dn{"Kǝsyil luma"}
- }
- year{
- dn{"Syii"}
- }
- zone{
- dn{"Waŋ cok comme"}
- }
- }
monthNames{
format{
abbreviated{
@@ -227,4 +231,41 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"Zah'nane/ Comme"}
+ relative{
+ "-1"{"Tǝsoo"}
+ "0"{"Tǝ'nahko"}
+ "1"{"Tǝ'nane"}
+ }
+ }
+ era{
+ dn{"Syii ma tãa"}
+ }
+ hour{
+ dn{"Cok comme"}
+ }
+ minute{
+ dn{"Cok comme ma laŋne"}
+ }
+ month{
+ dn{"Fĩi"}
+ }
+ second{
+ dn{"Cok comme ma laŋ tǝ biŋ"}
+ }
+ week{
+ dn{"Luma"}
+ }
+ weekday{
+ dn{"Kǝsyil luma"}
+ }
+ year{
+ dn{"Syii"}
+ }
+ zone{
+ dn{"Waŋ cok comme"}
+ }
+ }
}
diff --git a/data/locales/mua_CM.txt b/data/locales/mua_CM.txt
index 15121bb..8ae4029 100755
--- a/data/locales/mua_CM.txt
+++ b/data/locales/mua_CM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mua_CM.xml
// *
// ***************************************************************************
mua_CM{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/my.txt b/data/locales/my.txt
index 1dde296..29eaadb 100644
--- a/data/locales/my.txt
+++ b/data/locales/my.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/my.xml
// *
@@ -42,8 +42,139 @@
}
native{"mymr"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, G y MMMM dd",
+ "G y MMMM d",
+ "G y MMM d",
+ "GGGGG yy/MM/dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E, d"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"y/M"}
+ yMEd{"E, y/M/d"}
+ yMMM{"y MMM"}
+ yMMMEd{"E, y MMM d"}
+ yMMMM{"y MMMM"}
+ yQQQ{"y QQQ"}
+ yQQQQ{"y QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"HH-HH"}
+ }
+ Hm{
+ H{"HH:mm-HH:mm"}
+ m{"HH:mm-HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm-HH:mm v"}
+ m{"HH:mm-HH:mm v"}
+ }
+ Hv{
+ H{"HH-HH v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"EEEE၊ M/d – EEEE၊ M/d"}
+ d{"EEEE၊ M/d – EEEE၊ M/d"}
+ }
+ MMM{
+ M{"MMM – MMM"}
+ }
+ MMMEd{
+ M{"MMM d၊ EEEE – MMM d၊ EEEE"}
+ d{"MMM d၊ EEEE – MMM d၊ EEEE"}
+ }
+ MMMd{
+ M{"MMM d – MMM d"}
+ d{"MMM d – MMM d"}
+ }
+ Md{
+ M{"M/d – M/d"}
+ d{"M/d – M/d"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a - h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h:mm a - h:mm a"}
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ a{"h:mm a - h:mm a v"}
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"h a - h a v"}
+ h{"h-h a v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"y/M – y/M"}
+ y{"y/M – y/M"}
+ }
+ yMEd{
+ M{"EEEE၊ y/M/d – EEEE၊ y/M/d"}
+ d{"EEEE၊ y/M/d – EEEE၊ y/M/d"}
+ y{"EEEE၊ y/M/d – EEEE၊ y/M/d"}
+ }
+ yMMM{
+ M{"y MMM – y MMM"}
+ y{"y MMM – y MMM"}
+ }
+ yMMMEd{
+ M{"y၊ MMM d၊ EEEE – MMM d၊ EEEE"}
+ d{"y၊ MMM d၊ EEEE – MMM d၊ EEEE"}
+ y{"y၊ MMM d၊ EEEE – y၊ MMM d၊ EEEE"}
+ }
+ yMMMd{
+ M{"y၊ MMM d – MMM d"}
+ y{"y MMM d – y MMM d"}
+ }
+ yMd{
+ M{"y/M/d – y/M/d"}
+ d{"y/M/d – y/M/d"}
+ y{"y/M/d – y/M/d"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"နံနက်",
@@ -80,14 +211,13 @@
d{"d"}
ms{"mm:ss"}
y{"y"}
- yM{"yy/M"}
- yMEd{"E, yy/M/d"}
+ yM{"y/M"}
+ yMEd{"E, y/M/d"}
yMMM{"y MMM"}
yMMMEd{"E, y MMM d"}
yMMMM{"y MMMM"}
yQQQ{"y QQQ"}
yQQQQ{"y QQQQ"}
- yyQQQ{"QQQ yy"}
}
dayNames{
format{
@@ -132,42 +262,6 @@
"ခရစ်တော် ပေါ်ထွန်းပြီးကာလ",
}
}
- fields{
- day{
- dn{"ရက်"}
- relative{
- "-1"{"မနေ့က"}
- "-2"{"တနေ့က"}
- "0"{"ယနေ့"}
- "1"{"မနက်ဖြန်"}
- "2"{"သဘက်ခါ"}
- }
- }
- era{
- dn{"ခေတ်"}
- }
- hour{
- dn{"နာရီ"}
- }
- minute{
- dn{"မိနစ်"}
- }
- month{
- dn{"လ"}
- }
- second{
- dn{"စက္ကန့်"}
- }
- week{
- dn{"ပတ်"}
- }
- weekday{
- dn{"နေ့"}
- }
- year{
- dn{"နှစ်"}
- }
- }
intervalFormats{
H{
H{"HH-HH"}
@@ -231,13 +325,13 @@
y{"y-y"}
}
yM{
- M{"yy/M – yy/M"}
- y{"yy/M – yy/M"}
+ M{"y/M – y/M"}
+ y{"y/M – y/M"}
}
yMEd{
- M{"EEEE၊ yy/M/d – EEEE၊ yy/M/d"}
- d{"EEEE၊ yy/M/d – EEEE၊ yy/M/d"}
- y{"EEEE၊ yy/M/d – EEEE၊ yy/M/d"}
+ M{"EEEE၊ y/M/d – EEEE၊ y/M/d"}
+ d{"EEEE၊ y/M/d – EEEE၊ y/M/d"}
+ y{"EEEE၊ y/M/d – EEEE၊ y/M/d"}
}
yMMM{
M{"y MMM – y MMM"}
@@ -253,9 +347,9 @@
y{"y MMM d – y MMM d"}
}
yMd{
- M{"yy/M/d – yy/M/d"}
- d{"yy/M/d – yy/M/d"}
- y{"yy/M/d – yy/M/d"}
+ M{"y/M/d – y/M/d"}
+ d{"y/M/d – y/M/d"}
+ y{"y/M/d – y/M/d"}
}
}
monthNames{
@@ -338,6 +432,42 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"ရက်"}
+ relative{
+ "-1"{"မနေ့က"}
+ "-2"{"တနေ့က"}
+ "0"{"ယနေ့"}
+ "1"{"မနက်ဖြန်"}
+ "2"{"သဘက်ခါ"}
+ }
+ }
+ era{
+ dn{"ခေတ်"}
+ }
+ hour{
+ dn{"နာရီ"}
+ }
+ minute{
+ dn{"မိနစ်"}
+ }
+ month{
+ dn{"လ"}
+ }
+ second{
+ dn{"စက္ကန့်"}
+ }
+ week{
+ dn{"ပတ်"}
+ }
+ weekday{
+ dn{"နေ့"}
+ }
+ year{
+ dn{"နှစ်"}
+ }
+ }
measurementSystemNames{
US{"အမေရိကန်စနစ်"}
metric{"မက်ထရစ်စနစ်"}
diff --git a/data/locales/my_MM.txt b/data/locales/my_MM.txt
index 6e2faef..1cd4481 100644
--- a/data/locales/my_MM.txt
+++ b/data/locales/my_MM.txt
@@ -1,12 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/my_MM.xml
// *
// ***************************************************************************
my_MM{
MeasurementSystem:int{1}
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/naq.txt b/data/locales/naq.txt
index a636333..c80e532 100755
--- a/data/locales/naq.txt
+++ b/data/locales/naq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/naq.xml
// *
@@ -23,8 +23,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"ǁgoagas",
@@ -38,7 +78,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -111,44 +151,6 @@
"Xristub khaoǃgâ",
}
}
- fields{
- day{
- dn{"Tsees"}
- relative{
- "0"{"Neetsee"}
- }
- }
- dayperiod{
- dn{"ǁgoas/ǃuis"}
- }
- era{
- dn{"ǁAeǃgâs"}
- }
- hour{
- dn{"Iiri"}
- }
- minute{
- dn{"Haib"}
- }
- month{
- dn{"ǁKhâb"}
- }
- second{
- dn{"ǀGâub"}
- }
- week{
- dn{"Wekheb"}
- }
- weekday{
- dn{"Wekheb tsees"}
- }
- year{
- dn{"Kurib"}
- }
- zone{
- dn{"ǁAeb ǀharib"}
- }
- }
monthNames{
format{
abbreviated{
@@ -221,4 +223,42 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Tsees"}
+ relative{
+ "0"{"Neetsee"}
+ }
+ }
+ dayperiod{
+ dn{"ǁgoas/ǃuis"}
+ }
+ era{
+ dn{"ǁAeǃgâs"}
+ }
+ hour{
+ dn{"Iiri"}
+ }
+ minute{
+ dn{"Haib"}
+ }
+ month{
+ dn{"ǁKhâb"}
+ }
+ second{
+ dn{"ǀGâub"}
+ }
+ week{
+ dn{"Wekheb"}
+ }
+ weekday{
+ dn{"Wekheb tsees"}
+ }
+ year{
+ dn{"Kurib"}
+ }
+ zone{
+ dn{"ǁAeb ǀharib"}
+ }
+ }
}
diff --git a/data/locales/naq_NA.txt b/data/locales/naq_NA.txt
index 5a44923..d90119f 100755
--- a/data/locales/naq_NA.txt
+++ b/data/locales/naq_NA.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/naq_NA.xml
// *
// ***************************************************************************
naq_NA{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/nb.txt b/data/locales/nb.txt
index e798423..8f89bf0 100644
--- a/data/locales/nb.txt
+++ b/data/locales/nb.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nb.xml
// *
@@ -13,7 +13,7 @@
AuxExemplarCharacters{"[á ǎ ã č ç đ è ê í ń ñ ŋ š ŧ ü ž ä ö]"}
ExemplarCharacters{"[a à b c d e é f g h i j k l m n o ó ò ô p q r s t u v w x y z æ ø å]"}
ExemplarCharactersIndex{"[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Æ Ø Å]"}
- ExemplarCharactersPunctuation{"[\- – , ; \: ! ? . ' \" « » ( ) \[ \] \{ \} § @ * / \\]"}
+ ExemplarCharactersPunctuation{"[\\- – , ; \\: ! ? . ' \u0022 « » ( ) \\[ \\] \\{ \\} § @ * / \\\\]"}
LocaleScript{
"Latn",
}
@@ -143,9 +143,16 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
calendar{
buddhist{
+ eras{
+ abbreviated{
+ "BE",
+ }
+ }
+ }
+ generic{
DateTimePatterns{
"'kl'. HH:mm:ss zzzz",
"HH:mm:ss z",
@@ -154,7 +161,7 @@
"EEEE d. MMMM y G",
"d. MMMM y G",
"d. MMM y G",
- "d.M yyyy",
+ "d.M y G",
"{0} {1}",
"{0} {1}",
"{0} {1}",
@@ -164,6 +171,10 @@
availableFormats{
Ed{"E d."}
Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E d. MMM y G"}
+ GyMMMd{"d. MMM y G"}
+ H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
M{"L"}
@@ -171,26 +182,120 @@
MMM{"LLL"}
MMMEd{"E d. MMM"}
MMMd{"d. MMM"}
- MMdd{"dd.MM"}
+ MMdd{"d.M."}
Md{"d.M."}
d{"d."}
+ h{"h a"}
hm{"h:mm a"}
hms{"h:mm:ss a"}
ms{"mm:ss"}
y{"y G"}
- yM{"M y G"}
- yMEd{"E d.M.y G"}
- yMMM{"MMM y G"}
- yMMMEd{"E d. MMM y G"}
- yMMMd{"d. MMM y G"}
- yMd{"d.M.y G"}
- yQQQ{"QQQ y G"}
- yQQQQ{"QQQQ y G"}
- yyMM{"MM.y G"}
- yyMMM{"MMM y G"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ y G"}
+ yyyy{"y G"}
+ yyyyM{"M y G"}
+ yyyyMEd{"E d.MM.y G"}
+ yyyyMM{"MM.y G"}
+ yyyyMMM{"MMM y G"}
+ yyyyMMMEd{"E d. MMM y G"}
yyyyMMMM{"MMMM y G"}
+ yyyyMMMd{"d. MMM y G"}
+ yyyyMd{"d.M.y G"}
+ yyyyQQQ{"QQQ y G"}
+ yyyyQQQQ{"QQQQ y G"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M.–M."}
+ }
+ MEd{
+ M{"E dd.MM.–E dd.MM."}
+ d{"E dd.MM.–E dd.MM."}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E d. MMM–E d. MMM"}
+ d{"E d.–E d. MMM"}
+ }
+ MMMd{
+ M{"d. MMM–d. MMM"}
+ d{"d.–d. MMM"}
+ }
+ Md{
+ M{"dd.MM.–dd.MM."}
+ d{"dd.MM.–dd.MM."}
+ }
+ d{
+ d{"d.–d."}
+ }
+ fallback{"{0}–{1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y G"}
+ }
+ yM{
+ M{"MM.y–MM.y G"}
+ y{"MM.y–MM.y G"}
+ }
+ yMEd{
+ M{"E dd.MM.y–E dd.MM.y G"}
+ d{"E dd.MM.y–E dd.MM.y G"}
+ y{"E dd.MM.y–E dd.MM.y G"}
+ }
+ yMMM{
+ M{"MMM–MMM y G"}
+ y{"MMM y–MMM y G"}
+ }
+ yMMMEd{
+ M{"E d. MMM–E d. MMM y G"}
+ d{"E d.–E d. MMM y G"}
+ y{"E d. MMM y–E d. MMM y G"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y G"}
+ y{"MMMM y–MMMM y G"}
+ }
+ yMMMd{
+ M{"d. MMM–d. MMM y G"}
+ d{"d.–d. MMM y G"}
+ y{"d. MMM y–d. MMM y G"}
+ }
+ yMd{
+ M{"dd.MM.y–dd.MM.y G"}
+ d{"dd.MM.y–dd.MM.y G"}
+ y{"dd.MM.y–dd.MM.y G"}
+ }
}
}
gregorian{
@@ -207,14 +312,18 @@
"d. MMMM y",
"d. MMM y",
"dd.MM.yy",
- "{0} {1}",
- "{0} {1}",
- "{0} {1}",
- "{0} {1}",
- "{0} {1}",
+ "{1}, {0}",
+ "{1} {0}",
+ "{1} 'kl.' {0}",
+ "{1}, {0}",
+ "{1}, {0}",
}
availableFormats{
Ed{"E d."}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E d. MMM y G"}
+ GyMMMd{"d. MMM y G"}
H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -233,15 +342,14 @@
y{"y"}
yM{"M y"}
yMEd{"E d.MM.y"}
+ yMM{"MM.y"}
yMMM{"MMM y"}
yMMMEd{"E d. MMM y"}
+ yMMMM{"MMMM y"}
yMMMd{"d. MMM y"}
- yMd{"d.M.yyyy"}
+ yMd{"d.M.y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"MM.yy"}
- yyMMM{"MMM yy"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -335,63 +443,6 @@
"e.Kr.",
}
}
- fields{
- day{
- dn{"dag"}
- relative{
- "-1"{"i går"}
- "-2"{"i forgårs"}
- "0"{"i dag"}
- "1"{"i morgen"}
- "2"{"i overmorgen"}
- }
- }
- dayperiod{
- dn{"AM/PM"}
- }
- era{
- dn{"tidsalder"}
- }
- hour{
- dn{"time"}
- }
- minute{
- dn{"minutt"}
- }
- month{
- dn{"måned"}
- relative{
- "-1"{"Sist måned"}
- "0"{"Denne måneden"}
- "1"{"Neste måned"}
- }
- }
- second{
- dn{"sekund"}
- }
- week{
- dn{"uke"}
- relative{
- "-1"{"Sist uke"}
- "0"{"Denne uken"}
- "1"{"Neste uke"}
- }
- }
- weekday{
- dn{"ukedag"}
- }
- year{
- dn{"år"}
- relative{
- "-1"{"I fjor"}
- "0"{"Dette året"}
- "1"{"Neste år"}
- }
- }
- zone{
- dn{"sone"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -455,13 +506,13 @@
y{"y–y"}
}
yM{
- M{"MM.yy–MM.yy"}
- y{"MM.yy–MM.yy"}
+ M{"MM.y–MM.y"}
+ y{"MM.y–MM.y"}
}
yMEd{
- M{"E dd.MM.yy–E dd.MM.yy"}
- d{"E dd.MM.yy–E dd.MM.yy"}
- y{"E dd.MM.yy–E dd.MM.yy"}
+ M{"E dd.MM.y–E dd.MM.y"}
+ d{"E dd.MM.y–E dd.MM.y"}
+ y{"E dd.MM.y–E dd.MM.y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -482,9 +533,9 @@
y{"d. MMM y–d. MMM y"}
}
yMd{
- M{"dd.MM.yy–dd.MM.yy"}
- d{"dd.MM.yy–dd.MM.yy"}
- y{"dd.MM.yy–dd.MM.yy"}
+ M{"dd.MM.y–dd.MM.y"}
+ d{"dd.MM.y–dd.MM.y"}
+ y{"dd.MM.y–dd.MM.y"}
}
}
monthNames{
@@ -620,53 +671,18 @@
}
}
}
- islamic{
- DateTimePatterns{
- "'kl'. HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE d. MMMM y G",
- "d. MMMM y G",
- "d. MMM y G",
- "d.M y G",
- "{0} {1}",
- "{0} {1}",
- "{0} {1}",
- "{0} {1}",
- "{0} {1}",
+ hebrew{
+ eras{
+ abbreviated{
+ "AM",
+ }
}
- availableFormats{
- Ed{"E d."}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E d.M"}
- MMM{"LLL"}
- MMMEd{"E d. MMM"}
- MMMd{"d. MMM"}
- MMdd{"dd.MM"}
- Md{"d.M."}
- d{"d."}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM.y G"}
- yyMMM{"MMM y G"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ y G"}
- yyyy{"y G"}
- yyyyM{"M y G"}
- yyyyMEd{"E d.M.y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E d. MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d. MMM y G"}
- yyyyMd{"d.M.y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
+ }
+ islamic{
+ eras{
+ abbreviated{
+ "AH",
+ }
}
}
japanese{
@@ -679,92 +695,19 @@
"d. MMMM y G",
"d. MMM y G",
"d.M y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E d."}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E d.M"}
- MMM{"LLL"}
- MMMEd{"E d. MMM"}
- MMMd{"d. MMM"}
- MMdd{"dd.MM"}
- Md{"d.M."}
- d{"d."}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM.y G"}
- yyMMM{"MMM y G"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ y G"}
- yyyy{"y G"}
- yyyyM{"M y G"}
- yyyyMEd{"E d.M.y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E d. MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d. MMM y G"}
- yyyyMd{"d.M.y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
+ "{0} {1}",
+ "{0} {1}",
+ "{0} {1}",
+ "{0} {1}",
+ "{0} {1}",
}
}
roc{
- DateTimePatterns{
- "'kl'. HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE d. MMMM y G",
- "d. MMMM y G",
- "d. MMM y G",
- "d.M y G",
- "{0} {1}",
- "{0} {1}",
- "{0} {1}",
- "{0} {1}",
- "{0} {1}",
- }
- availableFormats{
- Ed{"E d."}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E d.M"}
- MMM{"LLL"}
- MMMEd{"E d. MMM"}
- MMMd{"d. MMM"}
- MMdd{"dd.MM"}
- Md{"d.M."}
- d{"d."}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM.y G"}
- yyMMM{"MMM y G"}
- yyQQQ{"QQQ y G"}
- yyQQQQ{"QQQQ y G"}
- yyyy{"y G"}
- yyyyM{"M y G"}
- yyyyMEd{"E d.M.y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E d. MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d. MMM y G"}
- yyyyMd{"d.M.y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
+ eras{
+ abbreviated{
+ "Before R.O.C.",
+ "Minguo",
+ }
}
}
}
@@ -774,6 +717,63 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"dag"}
+ relative{
+ "-1"{"i går"}
+ "-2"{"i forgårs"}
+ "0"{"i dag"}
+ "1"{"i morgen"}
+ "2"{"i overmorgen"}
+ }
+ }
+ dayperiod{
+ dn{"AM/PM"}
+ }
+ era{
+ dn{"tidsalder"}
+ }
+ hour{
+ dn{"time"}
+ }
+ minute{
+ dn{"minutt"}
+ }
+ month{
+ dn{"måned"}
+ relative{
+ "-1"{"Sist måned"}
+ "0"{"Denne måneden"}
+ "1"{"Neste måned"}
+ }
+ }
+ second{
+ dn{"sekund"}
+ }
+ week{
+ dn{"uke"}
+ relative{
+ "-1"{"Sist uke"}
+ "0"{"Denne uken"}
+ "1"{"Neste uke"}
+ }
+ }
+ weekday{
+ dn{"ukedag"}
+ }
+ year{
+ dn{"år"}
+ relative{
+ "-1"{"I fjor"}
+ "0"{"Dette året"}
+ "1"{"Neste år"}
+ }
+ }
+ zone{
+ dn{"sone"}
+ }
+ }
listPattern{
standard{
2{"{0} og {1}"}
diff --git a/data/locales/nb_NO.txt b/data/locales/nb_NO.txt
index 6091975..fe0e4ea 100644
--- a/data/locales/nb_NO.txt
+++ b/data/locales/nb_NO.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nb_NO.xml
// *
// ***************************************************************************
nb_NO{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/nd.txt b/data/locales/nd.txt
index 0f6b1df..8a9a658 100755
--- a/data/locales/nd.txt
+++ b/data/locales/nd.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nd.xml
// *
@@ -23,8 +23,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
DateTimePatterns{
"h:mm:ss a zzzz",
@@ -34,7 +74,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -107,40 +147,6 @@
"Ukristo ebuyile",
}
}
- fields{
- day{
- dn{"Ilanga"}
- relative{
- "-1"{"Izolo"}
- "0"{"Lamuhla"}
- "1"{"Kusasa"}
- }
- }
- hour{
- dn{"Ihola"}
- }
- minute{
- dn{"Umuzuzu"}
- }
- month{
- dn{"Inyangacale"}
- }
- second{
- dn{"Isekendi"}
- }
- week{
- dn{"Iviki"}
- }
- weekday{
- dn{"Ilanga leviki"}
- }
- year{
- dn{"Umnyaka"}
- }
- zone{
- dn{"Isikhathi"}
- }
- }
monthNames{
format{
abbreviated{
@@ -213,4 +219,38 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Ilanga"}
+ relative{
+ "-1"{"Izolo"}
+ "0"{"Lamuhla"}
+ "1"{"Kusasa"}
+ }
+ }
+ hour{
+ dn{"Ihola"}
+ }
+ minute{
+ dn{"Umuzuzu"}
+ }
+ month{
+ dn{"Inyangacale"}
+ }
+ second{
+ dn{"Isekendi"}
+ }
+ week{
+ dn{"Iviki"}
+ }
+ weekday{
+ dn{"Ilanga leviki"}
+ }
+ year{
+ dn{"Umnyaka"}
+ }
+ zone{
+ dn{"Isikhathi"}
+ }
+ }
}
diff --git a/data/locales/nd_ZW.txt b/data/locales/nd_ZW.txt
index 6892b1b..f09dd02 100755
--- a/data/locales/nd_ZW.txt
+++ b/data/locales/nd_ZW.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nd_ZW.xml
// *
// ***************************************************************************
nd_ZW{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ne.txt b/data/locales/ne.txt
index 79dcb46..0bb2c68 100755
--- a/data/locales/ne.txt
+++ b/data/locales/ne.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ne.xml
// *
@@ -20,7 +20,7 @@
"Deva",
}
NumberElements{
- default{"latn"}
+ default{"deva"}
latn{
symbols{
decimal{"."}
@@ -31,7 +31,7 @@
}
native{"deva"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
calendar{
gregorian{
AmPmMarkers{
@@ -122,47 +122,6 @@
"सन्",
}
}
- fields{
- day{
- dn{"बार"}
- relative{
- "-1"{"हिजो"}
- "-2"{"अस्ति"}
- "0"{"आज"}
- "1"{"भोलि"}
- }
- }
- dayperiod{
- dn{"पूर्व मध्यान्ह/उत्तर मध्यान्ह"}
- }
- era{
- dn{"काल"}
- }
- hour{
- dn{"घण्टा"}
- }
- minute{
- dn{"मिनेट"}
- }
- month{
- dn{"महिना"}
- }
- second{
- dn{"दोस्रो"}
- }
- week{
- dn{"हप्ता"}
- }
- weekday{
- dn{"हप्ताको बार"}
- }
- year{
- dn{"बर्ष"}
- }
- zone{
- dn{"क्षेत्र"}
- }
- }
monthNames{
format{
abbreviated{
@@ -303,6 +262,47 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"बार"}
+ relative{
+ "-1"{"हिजो"}
+ "-2"{"अस्ति"}
+ "0"{"आज"}
+ "1"{"भोलि"}
+ }
+ }
+ dayperiod{
+ dn{"पूर्व मध्यान्ह/उत्तर मध्यान्ह"}
+ }
+ era{
+ dn{"काल"}
+ }
+ hour{
+ dn{"घण्टा"}
+ }
+ minute{
+ dn{"मिनेट"}
+ }
+ month{
+ dn{"महिना"}
+ }
+ second{
+ dn{"दोस्रो"}
+ }
+ week{
+ dn{"हप्ता"}
+ }
+ weekday{
+ dn{"हप्ताको बार"}
+ }
+ year{
+ dn{"बर्ष"}
+ }
+ zone{
+ dn{"क्षेत्र"}
+ }
+ }
measurementSystemNames{
UK{"युके"}
US{"युएस्"}
diff --git a/data/locales/ne_IN.txt b/data/locales/ne_IN.txt
index 6890f16..227f6b3 100755
--- a/data/locales/ne_IN.txt
+++ b/data/locales/ne_IN.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ne_IN.xml
// *
// ***************************************************************************
ne_IN{
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
gregorian{
AmPmMarkers{
@@ -27,35 +27,6 @@
}
}
}
- fields{
- day{
- dn{"वार"}
- relative{
- "2"{"पर्सि"}
- }
- }
- dayperiod{
- dn{"पूर्वाह्न / अपराह्न"}
- }
- era{
- dn{"युग"}
- }
- second{
- dn{"सेकेन्ड"}
- }
- week{
- dn{"साता"}
- }
- weekday{
- dn{"हप्ताको वार"}
- }
- year{
- dn{"वर्ष"}
- }
- zone{
- dn{"अञ्चल"}
- }
- }
monthNames{
format{
wide{
@@ -106,6 +77,35 @@
}
}
}
+ fields{
+ day{
+ dn{"वार"}
+ relative{
+ "2"{"पर्सि"}
+ }
+ }
+ dayperiod{
+ dn{"पूर्वाह्न / अपराह्न"}
+ }
+ era{
+ dn{"युग"}
+ }
+ second{
+ dn{"सेकेन्ड"}
+ }
+ week{
+ dn{"साता"}
+ }
+ weekday{
+ dn{"हप्ताको वार"}
+ }
+ year{
+ dn{"वर्ष"}
+ }
+ zone{
+ dn{"अञ्चल"}
+ }
+ }
measurementSystemNames{
US{"अमेरिकेली"}
}
diff --git a/data/locales/ne_NP.txt b/data/locales/ne_NP.txt
index 9f64e65..b61c241 100755
--- a/data/locales/ne_NP.txt
+++ b/data/locales/ne_NP.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ne_NP.xml
// *
// ***************************************************************************
ne_NP{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/nl.txt b/data/locales/nl.txt
index fa67642..34f1176 100644
--- a/data/locales/nl.txt
+++ b/data/locales/nl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nl.xml
// *
@@ -16,7 +16,10 @@
"z]"
}
ExemplarCharactersIndex{"[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]"}
- ExemplarCharactersPunctuation{"[\- ‐ – — , ; \: ! ? . … ' ‘ ’ \" “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]"}
+ ExemplarCharactersPunctuation{
+ "[\\- ‐ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ "
+ "″]"
+ }
LocaleScript{
"Latn",
}
@@ -146,9 +149,66 @@
}
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
+ eras{
+ abbreviated{
+ "BE",
+ }
+ }
+ }
+ chinese{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM U",
+ "d MMMM U",
+ "d MMM U",
+ "dd-MM-yy",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Gy{"U"}
+ GyMMM{"MMM U"}
+ GyMMMEd{"E d MMM U"}
+ GyMMMd{"d MMM U"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E d-M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ Md{"d-M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"U"}
+ yyyy{"U"}
+ yyyyM{"M-y"}
+ yyyyMEd{"E d-M-y"}
+ yyyyMMM{"MMM U"}
+ yyyyMMMEd{"E d MMM U"}
+ yyyyMMMM{"MMMM U"}
+ yyyyMMMd{"d MMM U"}
+ yyyyMd{"d-M-y"}
+ yyyyQQQ{"QQQ U"}
+ yyyyQQQQ{"QQQQ U"}
+ }
+ }
+ generic{
DateTimePatterns{
"HH:mm:ss zzzz",
"HH:mm:ss z",
@@ -157,7 +217,7 @@
"EEEE d MMMM y G",
"d MMMM y G",
"d MMM y G",
- "dd-MM-yy G",
+ "dd-MM-yy GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -167,30 +227,133 @@
availableFormats{
Ed{"E d"}
Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E d MMM y G"}
+ GyMMMd{"d MMM y G"}
+ H{"HH"}
Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
M{"L"}
MEd{"E d-M"}
MMM{"LLL"}
MMMEd{"E d MMM"}
MMMMd{"d MMMM"}
MMMd{"d MMM"}
- MMd{"d-MM"}
- MMdd{"dd-MM"}
Md{"d-M"}
d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
ms{"mm:ss"}
y{"y G"}
- yM{"M-y G"}
- yMEd{"E d-M-y G"}
- yMMM{"MMM y G"}
- yMMMEd{"E d MMM y G"}
- yMMMd{"d MMM y G"}
- yMd{"d-M-y G"}
- yQQQ{"QQQ y G"}
- yQQQQ{"QQQQ y G"}
- yyMM{"MM-yy G"}
- yyMMM{"MMM yy G"}
+ yyyy{"y G"}
+ yyyyM{"M-y GGGGG"}
+ yyyyMEd{"E d-M-y GGGGG"}
+ yyyyMMM{"MMM y G"}
+ yyyyMMMEd{"E d MMM y G"}
yyyyMMMM{"MMMM y G"}
+ yyyyMMMd{"d MMM y G"}
+ yyyyMd{"d-M-y GGGGG"}
+ yyyyQQQ{"QQQ y G"}
+ yyyyQQQQ{"QQQQ y G"}
+ }
+ intervalFormats{
+ H{
+ H{"HH-HH"}
+ }
+ Hm{
+ H{"HH:mm-HH:mm"}
+ m{"HH:mm-HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm-HH:mm v"}
+ m{"HH:mm-HH:mm v"}
+ }
+ Hv{
+ H{"HH-HH v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E dd-MM - E dd-MM"}
+ d{"E dd-MM - E dd-MM"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"E d MMM - E d MMM"}
+ d{"E d - E d MMM"}
+ }
+ MMMM{
+ M{"MMMM–MMMM"}
+ }
+ MMMd{
+ M{"d MMM - d MMM"}
+ d{"d-d MMM"}
+ }
+ Md{
+ M{"dd-MM - dd-MM"}
+ d{"dd-MM - dd-MM"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a - h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h:mm a - h:mm a"}
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ a{"h:mm a - h:mm a v"}
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"h a - h a v"}
+ h{"h-h a v"}
+ }
+ y{
+ y{"y-y G"}
+ }
+ yM{
+ M{"MM-y - MM-y G"}
+ y{"MM-y - MM-y G"}
+ }
+ yMEd{
+ M{"E dd-MM-y - E dd-MM-y G"}
+ d{"E dd-MM-y - E dd-MM-y G"}
+ y{"E dd-MM-y - E dd-MM-y G"}
+ }
+ yMMM{
+ M{"MMM-MMM y G"}
+ y{"MMM y - MMM y G"}
+ }
+ yMMMEd{
+ M{"E d MMM - E d MMM y G"}
+ d{"E d - E d MMM y G"}
+ y{"E d MMM y - E d MMM y G"}
+ }
+ yMMMM{
+ M{"MMMM-MMMM y G"}
+ y{"MMMM y - MMMM y G"}
+ }
+ yMMMd{
+ M{"d MMM - d MMM y G"}
+ d{"d-d MMM y G"}
+ y{"d MMM y - d MMM y G"}
+ }
+ yMd{
+ M{"dd-MM-y - dd-MM-y G"}
+ d{"dd-MM-y - dd-MM-y G"}
+ y{"dd-MM-y - dd-MM-y G"}
+ }
}
}
gregorian{
@@ -215,6 +378,10 @@
}
availableFormats{
Ed{"E d"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E d MMM y G"}
+ GyMMMd{"d MMM y G"}
H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -224,8 +391,6 @@
MMMEd{"E d MMM"}
MMMMd{"d MMMM"}
MMMd{"d MMM"}
- MMd{"d-MM"}
- MMdd{"dd-MM"}
Md{"d-M"}
d{"d"}
h{"h a"}
@@ -237,13 +402,11 @@
yMEd{"E d-M-y"}
yMMM{"MMM y"}
yMMMEd{"E d MMM y"}
+ yMMMM{"MMMM y"}
yMMMd{"d MMM y"}
yMd{"d-M-y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"MM-yy"}
- yyMMM{"MMM yy"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -333,63 +496,6 @@
"na Christus",
}
}
- fields{
- day{
- dn{"Dag"}
- relative{
- "-1"{"Gisteren"}
- "-2"{"Eergisteren"}
- "0"{"Vandaag"}
- "1"{"Morgen"}
- "2"{"Overmorgen"}
- }
- }
- dayperiod{
- dn{"AM/PM"}
- }
- era{
- dn{"Tijdperk"}
- }
- hour{
- dn{"Uur"}
- }
- minute{
- dn{"Minuut"}
- }
- month{
- dn{"Maand"}
- relative{
- "-1"{"Vorige maand"}
- "0"{"Deze maand"}
- "1"{"Volgende maand"}
- }
- }
- second{
- dn{"Seconde"}
- }
- week{
- dn{"week"}
- relative{
- "-1"{"Vorige week"}
- "0"{"Deze week"}
- "1"{"Volgende week"}
- }
- }
- weekday{
- dn{"Dag van de week"}
- }
- year{
- dn{"Jaar"}
- relative{
- "-1"{"Vorig jaar"}
- "0"{"Dit jaar"}
- "1"{"Volgend jaar"}
- }
- }
- zone{
- dn{"Zone"}
- }
- }
intervalFormats{
H{
H{"HH-HH"}
@@ -456,13 +562,13 @@
y{"y-y"}
}
yM{
- M{"MM-yy - MM-yy"}
- y{"MM-yy - MM-yy"}
+ M{"MM-y - MM-y"}
+ y{"MM-y - MM-y"}
}
yMEd{
- M{"E dd-MM-yy - E dd-MM-yy"}
- d{"E dd-MM-yy - E dd-MM-yy"}
- y{"E dd-MM-yy - E dd-MM-yy"}
+ M{"E dd-MM-y - E dd-MM-y"}
+ d{"E dd-MM-y - E dd-MM-y"}
+ y{"E dd-MM-y - E dd-MM-y"}
}
yMMM{
M{"MMM-MMM y"}
@@ -483,9 +589,9 @@
y{"d MMM y - d MMM y"}
}
yMd{
- M{"dd-MM-yy - dd-MM-yy"}
- d{"dd-MM-yy - dd-MM-yy"}
- y{"dd-MM-yy - dd-MM-yy"}
+ M{"dd-MM-y - dd-MM-y"}
+ d{"dd-MM-y - dd-MM-y"}
+ y{"dd-MM-y - dd-MM-y"}
}
}
monthNames{
@@ -644,57 +750,12 @@
}
}
islamic{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE d MMMM y G",
- "d MMMM y G",
- "d MMM y G",
- "dd-MM-yy G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E d"}
- Hm{"HH:mm"}
- M{"L"}
- MEd{"E d-M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- MMd{"d-MM"}
- MMdd{"dd-MM"}
- Md{"d-M"}
- d{"d"}
- ms{"mm:ss"}
- yyMM{"MM-yy G"}
- yyMMM{"MMM yy G"}
- yyQQQ{"QQQ yy G"}
- yyQQQQ{"QQQQ yy G"}
- yyyy{"y G"}
- yyyyM{"M-y G"}
- yyyyMEd{"E d-M-y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E d MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"d-M-y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
- }
eras{
abbreviated{
"Saʻna Hizjria",
}
}
monthNames{
- default{"format"}
format{
abbreviated{
"Moeh.",
@@ -710,7 +771,6 @@
"Doe al k.",
"Doe al h.",
}
- default{"wide"}
wide{
"Moeharram",
"Safar",
@@ -760,84 +820,13 @@
"{1} {0}",
"{1} {0}",
}
- availableFormats{
- Ed{"E d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- M{"L"}
- MEd{"E d-M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- MMd{"d-MM"}
- MMdd{"dd-MM"}
- Md{"d-M"}
- d{"d"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM-yy GGGGG"}
- yyMMM{"MMM yy G"}
- yyQQQ{"QQQ yy G"}
- yyQQQQ{"QQQQ yy G"}
- yyyy{"y G"}
- yyyyM{"M-y GGGGG"}
- yyyyMEd{"E d-M-y GGGGG"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E d MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"d-M-y GGGGG"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
- }
}
roc{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE d MMMM y G",
- "d MMMM y G",
- "d MMM y G",
- "dd-MM-yy GGGGG",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- M{"L"}
- MEd{"E d-M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- MMd{"d-MM"}
- MMdd{"dd-MM"}
- Md{"d-M"}
- d{"d"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM-yy GGGGG"}
- yyMMM{"MMM yy G"}
- yyQQQ{"QQQ yy G"}
- yyQQQQ{"QQQQ yy G"}
- yyyy{"y G"}
- yyyyM{"M-y GGGGG"}
- yyyyMEd{"E d-M-y GGGGG"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E d MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"d-M-y GGGGG"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
+ eras{
+ abbreviated{
+ "Before R.O.C.",
+ "Minguo",
+ }
}
}
}
@@ -865,6 +854,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Dag"}
+ relative{
+ "-1"{"Gisteren"}
+ "-2"{"Eergisteren"}
+ "0"{"Vandaag"}
+ "1"{"Morgen"}
+ "2"{"Overmorgen"}
+ }
+ }
+ dayperiod{
+ dn{"AM/PM"}
+ }
+ era{
+ dn{"Tijdperk"}
+ }
+ hour{
+ dn{"Uur"}
+ }
+ minute{
+ dn{"Minuut"}
+ }
+ month{
+ dn{"Maand"}
+ relative{
+ "-1"{"Vorige maand"}
+ "0"{"Deze maand"}
+ "1"{"Volgende maand"}
+ }
+ }
+ second{
+ dn{"Seconde"}
+ }
+ week{
+ dn{"week"}
+ relative{
+ "-1"{"Vorige week"}
+ "0"{"Deze week"}
+ "1"{"Volgende week"}
+ }
+ }
+ weekday{
+ dn{"Dag van de week"}
+ }
+ year{
+ dn{"Jaar"}
+ relative{
+ "-1"{"Vorig jaar"}
+ "0"{"Dit jaar"}
+ "1"{"Volgend jaar"}
+ }
+ }
+ zone{
+ dn{"Zone"}
+ }
+ }
listPattern{
standard{
2{"{0} en {1}"}
diff --git a/data/locales/nl_AW.txt b/data/locales/nl_AW.txt
index 3d64bf4..56f720a 100755
--- a/data/locales/nl_AW.txt
+++ b/data/locales/nl_AW.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nl_AW.xml
// *
// ***************************************************************************
nl_AW{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/nl_BE.txt b/data/locales/nl_BE.txt
index 6c95c8d..1964daa 100644
--- a/data/locales/nl_BE.txt
+++ b/data/locales/nl_BE.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nl_BE.xml
// *
@@ -14,8 +14,25 @@
}
}
}
- Version{"2.0.77.28"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d-MMM-y G",
+ "d/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
gregorian{
DateTimePatterns{
"HH:mm:ss zzzz",
diff --git a/data/locales/nl_CW.txt b/data/locales/nl_CW.txt
index 98d4bed..9bc7696 100644
--- a/data/locales/nl_CW.txt
+++ b/data/locales/nl_CW.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nl_CW.xml
// *
// ***************************************************************************
nl_CW{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/nl_NL.txt b/data/locales/nl_NL.txt
index af114d2..370325e 100644
--- a/data/locales/nl_NL.txt
+++ b/data/locales/nl_NL.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nl_NL.xml
// *
// ***************************************************************************
nl_NL{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/nl_SR.txt b/data/locales/nl_SR.txt
index 0097fbb..39c42d6 100755
--- a/data/locales/nl_SR.txt
+++ b/data/locales/nl_SR.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nl_SR.xml
// *
// ***************************************************************************
nl_SR{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/nl_SX.txt b/data/locales/nl_SX.txt
index 4693149..0f63248 100644
--- a/data/locales/nl_SX.txt
+++ b/data/locales/nl_SX.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nl_SX.xml
// *
// ***************************************************************************
nl_SX{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/nmg.txt b/data/locales/nmg.txt
index cf8eb03..b0bea92 100755
--- a/data/locales/nmg.txt
+++ b/data/locales/nmg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nmg.xml
// *
@@ -33,8 +33,49 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d/M/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"maná",
@@ -48,7 +89,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM y",
- "d/M/yyyy",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -122,43 +163,6 @@
"Pfiɛ Burī",
}
}
- fields{
- day{
- dn{"Duö"}
- relative{
- "-1"{"Nakugú"}
- "0"{"Dɔl"}
- "1"{"Namáná"}
- }
- }
- dayperiod{
- dn{"Máná, Muó, Kugú, Bvul"}
- }
- era{
- dn{"Pīl/Lahlɛ̄"}
- }
- hour{
- dn{"Wulā"}
- }
- minute{
- dn{"Mpálâ"}
- }
- month{
- dn{"Ngwɛn"}
- }
- second{
- dn{"Nyiɛl"}
- }
- week{
- dn{"Sɔ́ndɔ"}
- }
- year{
- dn{"Mbvu"}
- }
- zone{
- dn{"Nkɛ̌l wulā"}
- }
- }
monthNames{
format{
abbreviated{
@@ -215,4 +219,41 @@
quotationEnd{"”"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"Duö"}
+ relative{
+ "-1"{"Nakugú"}
+ "0"{"Dɔl"}
+ "1"{"Namáná"}
+ }
+ }
+ dayperiod{
+ dn{"Máná, Muó, Kugú, Bvul"}
+ }
+ era{
+ dn{"Pīl/Lahlɛ̄"}
+ }
+ hour{
+ dn{"Wulā"}
+ }
+ minute{
+ dn{"Mpálâ"}
+ }
+ month{
+ dn{"Ngwɛn"}
+ }
+ second{
+ dn{"Nyiɛl"}
+ }
+ week{
+ dn{"Sɔ́ndɔ"}
+ }
+ year{
+ dn{"Mbvu"}
+ }
+ zone{
+ dn{"Nkɛ̌l wulā"}
+ }
+ }
}
diff --git a/data/locales/nmg_CM.txt b/data/locales/nmg_CM.txt
index 35dd886..60a660f 100755
--- a/data/locales/nmg_CM.txt
+++ b/data/locales/nmg_CM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nmg_CM.xml
// *
// ***************************************************************************
nmg_CM{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/nn.txt b/data/locales/nn.txt
index f74e34a..a55a7ce 100644
--- a/data/locales/nn.txt
+++ b/data/locales/nn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nn.xml
// *
@@ -38,8 +38,135 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
calendar{
+ generic{
+ DateTimePatterns{
+ "'kl'. HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d. MMMM y G",
+ "d. MMMM y G",
+ "d. MMM y G",
+ "dd.MM.yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d."}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ MEd{"E d.M"}
+ MMMEd{"E d. MMM"}
+ MMMMd{"d. MMMM"}
+ MMMd{"d. MMM"}
+ MMdd{"d.M."}
+ Md{"d.M."}
+ d{"d."}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ yM{"M y"}
+ yMEd{"E d.M.y"}
+ yMM{"MM.y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d. MMM y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d. MMM y"}
+ yMd{"d.M.y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ M{
+ M{"M.–M."}
+ }
+ MEd{
+ M{"E dd.MM.–E dd.MM."}
+ d{"E dd.MM.–E dd.MM."}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E d. MMM–E d. MMM"}
+ d{"E d.–E d. MMM"}
+ }
+ MMMd{
+ M{"d. MMM–d. MMM"}
+ d{"d.–d. MMM"}
+ }
+ Md{
+ M{"dd.MM–dd.MM"}
+ d{"dd.MM–dd.MM"}
+ }
+ d{
+ d{"d.–d."}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ h{"h–h a"}
+ }
+ hm{
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"MM.y–MM.y"}
+ y{"MM.y–MM.y"}
+ }
+ yMEd{
+ M{"E dd.MM.y–E dd.MM.y"}
+ d{"E dd.MM.y–E dd.MM.y"}
+ y{"E dd.MM.y–E dd.MM.y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y–MMM y"}
+ }
+ yMMMEd{
+ M{"E d. MMM–E d. MMM y"}
+ d{"E d.–E d. MMM y"}
+ y{"E d. MMM y–E d. MMM"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y–MMMM y"}
+ }
+ yMMMd{
+ M{"d. MMM–d. MMM y"}
+ d{"d.–d. MMM y"}
+ y{"d. MMM y–d. MMM y"}
+ }
+ yMd{
+ M{"dd.MM.y–dd.MM.y"}
+ d{"dd.MM.y–dd.MM.y"}
+ y{"dd.MM.y–dd.MM.y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"formiddag",
@@ -75,15 +202,15 @@
hms{"h:mm:ss a"}
ms{"mm:ss"}
yM{"M y"}
- yMEd{"E d.M.yyyy"}
+ yMEd{"E d.M.y"}
+ yMM{"MM.y"}
yMMM{"MMM y"}
yMMMEd{"E d. MMM y"}
+ yMMMM{"MMMM y"}
yMMMd{"d. MMM y"}
- yMd{"d.M.yyyy"}
+ yMd{"d.M.y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"MM.yy"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -128,48 +255,6 @@
"e.Kr.",
}
}
- fields{
- day{
- dn{"dag"}
- relative{
- "-1"{"i går"}
- "-2"{"i forgårs"}
- "0"{"i dag"}
- "1"{"i morgon"}
- "2"{"i overmorgon"}
- }
- }
- dayperiod{
- dn{"f.m./e.m.-val"}
- }
- era{
- dn{"æra"}
- }
- hour{
- dn{"time"}
- }
- minute{
- dn{"minutt"}
- }
- month{
- dn{"månad"}
- }
- second{
- dn{"sekund"}
- }
- week{
- dn{"veke"}
- }
- weekday{
- dn{"vekedag"}
- }
- year{
- dn{"år"}
- }
- zone{
- dn{"sone"}
- }
- }
intervalFormats{
Hm{
H{"HH:mm–HH:mm"}
@@ -223,13 +308,13 @@
y{"y–y"}
}
yM{
- M{"MM.yy–MM.yy"}
- y{"MM.yy–MM.yy"}
+ M{"MM.y–MM.y"}
+ y{"MM.y–MM.y"}
}
yMEd{
- M{"E dd.MM.yy–E dd.MM.yy"}
- d{"E dd.MM.yy–E dd.MM.yy"}
- y{"E dd.MM.yy–E dd.MM.yy"}
+ M{"E dd.MM.y–E dd.MM.y"}
+ d{"E dd.MM.y–E dd.MM.y"}
+ y{"E dd.MM.y–E dd.MM.y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -250,9 +335,9 @@
y{"d. MMM y–d. MMM y"}
}
yMd{
- M{"dd.MM.yy–dd.MM.yy"}
- d{"dd.MM.yy–dd.MM.yy"}
- y{"dd.MM.yy–dd.MM.yy"}
+ M{"dd.MM.y–dd.MM.y"}
+ d{"dd.MM.y–dd.MM.y"}
+ y{"dd.MM.y–dd.MM.y"}
}
}
monthNames{
@@ -327,6 +412,48 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"dag"}
+ relative{
+ "-1"{"i går"}
+ "-2"{"i forgårs"}
+ "0"{"i dag"}
+ "1"{"i morgon"}
+ "2"{"i overmorgon"}
+ }
+ }
+ dayperiod{
+ dn{"f.m./e.m.-val"}
+ }
+ era{
+ dn{"æra"}
+ }
+ hour{
+ dn{"time"}
+ }
+ minute{
+ dn{"minutt"}
+ }
+ month{
+ dn{"månad"}
+ }
+ second{
+ dn{"sekund"}
+ }
+ week{
+ dn{"veke"}
+ }
+ weekday{
+ dn{"vekedag"}
+ }
+ year{
+ dn{"år"}
+ }
+ zone{
+ dn{"sone"}
+ }
+ }
listPattern{
standard{
2{"{0} og {1}"}
diff --git a/data/locales/nn_NO.txt b/data/locales/nn_NO.txt
index 0e813b6..dd71020 100644
--- a/data/locales/nn_NO.txt
+++ b/data/locales/nn_NO.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nn_NO.xml
// *
// ***************************************************************************
nn_NO{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/no.txt b/data/locales/no.txt
index 49a17b2..6dc26b5 100644
--- a/data/locales/no.txt
+++ b/data/locales/no.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/no_NO.txt b/data/locales/no_NO.txt
index 4b958f6..408deef 100644
--- a/data/locales/no_NO.txt
+++ b/data/locales/no_NO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/no_NO_NY.txt b/data/locales/no_NO_NY.txt
index 61d8107..38940c7c 100644
--- a/data/locales/no_NO_NY.txt
+++ b/data/locales/no_NO_NY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/nus.txt b/data/locales/nus.txt
index 7788d6e..6e5f0fc 100755
--- a/data/locales/nus.txt
+++ b/data/locales/nus.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nus.xml
// *
@@ -32,8 +32,49 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "zzzz h:mm:ss a",
+ "z h:mm:ss a",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E، d-M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E، d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E، d MMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"RW",
@@ -47,7 +88,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM y",
- "d/MM/yyyy",
+ "d/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -121,40 +162,6 @@
"Ɛ ca Yecu dap",
}
}
- fields{
- day{
- dn{"Cäŋ"}
- relative{
- "-1"{"Pan"}
- "0"{"Walɛ"}
- "1"{"Ruun"}
- }
- }
- era{
- dn{"Gua̱a̱th Ruëc"}
- }
- hour{
- dn{"Thaak"}
- }
- minute{
- dn{"Minit"}
- }
- month{
- dn{"Pay"}
- }
- second{
- dn{"Thɛkɛni"}
- }
- week{
- dn{"Jiɔk"}
- }
- weekday{
- dn{"Ni̱n jokä"}
- }
- year{
- dn{"Ruɔ̱n"}
- }
- }
monthNames{
format{
abbreviated{
@@ -227,4 +234,38 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Cäŋ"}
+ relative{
+ "-1"{"Pan"}
+ "0"{"Walɛ"}
+ "1"{"Ruun"}
+ }
+ }
+ era{
+ dn{"Gua̱a̱th Ruëc"}
+ }
+ hour{
+ dn{"Thaak"}
+ }
+ minute{
+ dn{"Minit"}
+ }
+ month{
+ dn{"Pay"}
+ }
+ second{
+ dn{"Thɛkɛni"}
+ }
+ week{
+ dn{"Jiɔk"}
+ }
+ weekday{
+ dn{"Ni̱n jokä"}
+ }
+ year{
+ dn{"Ruɔ̱n"}
+ }
+ }
}
diff --git a/data/locales/nus_SD.txt b/data/locales/nus_SD.txt
index 7973336..20c73c6 100755
--- a/data/locales/nus_SD.txt
+++ b/data/locales/nus_SD.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nus_SD.xml
// *
// ***************************************************************************
nus_SD{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/nyn.txt b/data/locales/nyn.txt
index cf89ce6..6addef5 100755
--- a/data/locales/nyn.txt
+++ b/data/locales/nyn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nyn.xml
// *
@@ -22,8 +22,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
DateTimePatterns{
"h:mm:ss a zzzz",
@@ -33,7 +73,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -106,46 +146,6 @@
"Kurisito Yaijire",
}
}
- fields{
- day{
- dn{"Eizooba"}
- relative{
- "-1"{"Nyomwabazyo"}
- "0"{"Erizooba"}
- "1"{"Nyenkyakare"}
- }
- }
- dayperiod{
- dn{"Nyomushana/nyekiro"}
- }
- era{
- dn{"Obunaku"}
- }
- hour{
- dn{"Shaaha"}
- }
- minute{
- dn{"Edakiika"}
- }
- month{
- dn{"Omwezi"}
- }
- second{
- dn{"Obucweka/Esekendi"}
- }
- week{
- dn{"Esande"}
- }
- weekday{
- dn{"Eizooba ry'okukora"}
- }
- year{
- dn{"Omwaka"}
- }
- zone{
- dn{"Eshaaha za"}
- }
- }
monthNames{
format{
abbreviated{
@@ -218,4 +218,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Eizooba"}
+ relative{
+ "-1"{"Nyomwabazyo"}
+ "0"{"Erizooba"}
+ "1"{"Nyenkyakare"}
+ }
+ }
+ dayperiod{
+ dn{"Nyomushana/nyekiro"}
+ }
+ era{
+ dn{"Obunaku"}
+ }
+ hour{
+ dn{"Shaaha"}
+ }
+ minute{
+ dn{"Edakiika"}
+ }
+ month{
+ dn{"Omwezi"}
+ }
+ second{
+ dn{"Obucweka/Esekendi"}
+ }
+ week{
+ dn{"Esande"}
+ }
+ weekday{
+ dn{"Eizooba ry'okukora"}
+ }
+ year{
+ dn{"Omwaka"}
+ }
+ zone{
+ dn{"Eshaaha za"}
+ }
+ }
}
diff --git a/data/locales/nyn_UG.txt b/data/locales/nyn_UG.txt
index b356abd..61c775d 100755
--- a/data/locales/nyn_UG.txt
+++ b/data/locales/nyn_UG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nyn_UG.xml
// *
// ***************************************************************************
nyn_UG{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/om.txt b/data/locales/om.txt
index 86e55fe..ed415f7 100644
--- a/data/locales/om.txt
+++ b/data/locales/om.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/om.xml
// *
@@ -25,8 +25,32 @@
native{"latn"}
traditional{"ethi"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, MMMM d, y G",
+ "dd MMMM y G",
+ "dd-MMM-y G",
+ "dd/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MMMMdd{"dd MMMM"}
+ MMdd{"dd/MM"}
+ yMM{"MM/y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"WD",
@@ -50,9 +74,9 @@
availableFormats{
MMMMdd{"dd MMMM"}
MMdd{"dd/MM"}
- yyMM{"MM/yy"}
- yyQQQ{"QQQ yy"}
- yyyyMMMM{"MMMM y"}
+ yMM{"MM/y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
}
dayNames{
format{
diff --git a/data/locales/om_ET.txt b/data/locales/om_ET.txt
index cbcb353..72af403 100644
--- a/data/locales/om_ET.txt
+++ b/data/locales/om_ET.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/om_ET.xml
// *
// ***************************************************************************
om_ET{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/om_KE.txt b/data/locales/om_KE.txt
index 6ab9caa..f9ca586 100644
--- a/data/locales/om_KE.txt
+++ b/data/locales/om_KE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/om_KE.xml
// *
// ***************************************************************************
om_KE{
- Version{"2.0.57.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/or.txt b/data/locales/or.txt
index df84a4f..6595324 100644
--- a/data/locales/or.txt
+++ b/data/locales/or.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/or.xml
// *
@@ -38,8 +38,32 @@
}
native{"orya"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d-M-yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MMMMd{"MMMM d"}
+ MMdd{"dd-MM"}
+ yMM{"MM-y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"am",
@@ -63,9 +87,9 @@
availableFormats{
MMMMd{"MMMM d"}
MMdd{"dd-MM"}
- yyQQQ{"QQQ yy"}
- yyyyMM{"MM-yyyy"}
- yyyyMMMM{"MMMM y"}
+ yMM{"MM-y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
}
dayNames{
format{
diff --git a/data/locales/or_IN.txt b/data/locales/or_IN.txt
index e41f2aa..4bba4e5 100644
--- a/data/locales/or_IN.txt
+++ b/data/locales/or_IN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/or_IN.xml
// *
// ***************************************************************************
or_IN{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/pa.txt b/data/locales/pa.txt
index 6541ce1..da447d7 100644
--- a/data/locales/pa.txt
+++ b/data/locales/pa.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pa.xml
// *
@@ -31,8 +31,32 @@
}
native{"guru"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, dd MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ HHmmss{"HH:mm:ss"}
+ Md{"d/M"}
+ mmss{"mm:ss"}
+ yMMM{"MMM y"}
+ yQQQ{"QQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"ਪੂਰਵ ਦੁਪਹਿਰ",
@@ -46,7 +70,7 @@
"EEEE, dd MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -57,8 +81,8 @@
HHmmss{"HH:mm:ss"}
Md{"d/M"}
mmss{"mm:ss"}
- yyMMM{"MMM yy"}
- yyQQQ{"QQQ yy"}
+ yMMM{"MMM y"}
+ yQQQ{"QQQ y"}
}
dayNames{
format{
@@ -108,43 +132,6 @@
"ਸਾਲ",
}
}
- fields{
- day{
- dn{"ਦਿਨ"}
- relative{
- "-1"{"ਲੰਘਿਆਂ ਕੱਲ"}
- "0"{"ਅੱਜ"}
- "1"{"ਭਲਕੇ"}
- }
- }
- era{
- dn{"ਯੁੱਗ"}
- }
- hour{
- dn{"ਘੰਟਾ"}
- }
- minute{
- dn{"ਮਿੰਟ"}
- }
- month{
- dn{"ਮਹੀਨਾ"}
- }
- second{
- dn{"ਸਕਿੰਡ"}
- }
- week{
- dn{"ਹਫ਼ਤਾ"}
- }
- weekday{
- dn{"ਹਫ਼ਤੇ ਦਾ ਦਿਨ"}
- }
- year{
- dn{"ਸਾਲ"}
- }
- zone{
- dn{"ਖੇਤਰ"}
- }
- }
monthNames{
format{
wide{
@@ -213,6 +200,43 @@
}
}
}
+ fields{
+ day{
+ dn{"ਦਿਨ"}
+ relative{
+ "-1"{"ਲੰਘਿਆਂ ਕੱਲ"}
+ "0"{"ਅੱਜ"}
+ "1"{"ਭਲਕੇ"}
+ }
+ }
+ era{
+ dn{"ਯੁੱਗ"}
+ }
+ hour{
+ dn{"ਘੰਟਾ"}
+ }
+ minute{
+ dn{"ਮਿੰਟ"}
+ }
+ month{
+ dn{"ਮਹੀਨਾ"}
+ }
+ second{
+ dn{"ਸਕਿੰਡ"}
+ }
+ week{
+ dn{"ਹਫ਼ਤਾ"}
+ }
+ weekday{
+ dn{"ਹਫ਼ਤੇ ਦਾ ਦਿਨ"}
+ }
+ year{
+ dn{"ਸਾਲ"}
+ }
+ zone{
+ dn{"ਖੇਤਰ"}
+ }
+ }
measurementSystemNames{
US{"ਯੂ. ਐੱਸ."}
metric{"ਮੀਟਰਿਕ"}
diff --git a/data/locales/pa_Arab.txt b/data/locales/pa_Arab.txt
index 86f1f88..afecff2 100755
--- a/data/locales/pa_Arab.txt
+++ b/data/locales/pa_Arab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pa_Arab.xml
// *
@@ -23,18 +23,18 @@
default{"arabext"}
native{"arabext"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
+ generic{
DateTimePatterns{
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
- "EEEE, dd MMMM y",
- "d MMMM y",
- "d MMM y",
- "dd/MM/yyyy",
+ "EEEE, dd MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -45,8 +45,32 @@
HHmmss{"HH:mm:ss"}
Md{"d/M"}
mmss{"mm:ss"}
- yyMMM{"MMM yy"}
- yyQQQ{"QQQ yy"}
+ yMMM{"MMM y"}
+ yQQQ{"QQQ y"}
+ }
+ }
+ gregorian{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, dd MMMM y",
+ "d MMMM y",
+ "d MMM y",
+ "dd/MM/y",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ HHmmss{"HH:mm:ss"}
+ Md{"d/M"}
+ mmss{"mm:ss"}
+ yMMM{"MMM y"}
+ yQQQ{"QQQ y"}
}
dayNames{
format{
@@ -67,32 +91,6 @@
"سں",
}
}
- fields{
- day{
- dn{"دئن"}
- }
- hour{
- dn{"گھنٹا"}
- }
- minute{
- dn{"منٹ"}
- }
- month{
- dn{"مہينا"}
- }
- week{
- dn{"ہفتہ"}
- }
- weekday{
- dn{"ہفتے دا دن"}
- }
- year{
- dn{"ورھا"}
- }
- zone{
- dn{"ٹپہ"}
- }
- }
monthNames{
format{
wide{
@@ -123,8 +121,33 @@
}
}
}
+ fields{
+ day{
+ dn{"دئن"}
+ }
+ hour{
+ dn{"گھنٹا"}
+ }
+ minute{
+ dn{"منٹ"}
+ }
+ month{
+ dn{"مہينا"}
+ }
+ week{
+ dn{"ہفتہ"}
+ }
+ weekday{
+ dn{"ہفتے دا دن"}
+ }
+ year{
+ dn{"ورھا"}
+ }
+ zone{
+ dn{"ٹپہ"}
+ }
+ }
layout{
characters{"right-to-left"}
- lines{"top-to-bottom"}
}
}
diff --git a/data/locales/pa_Arab_PK.txt b/data/locales/pa_Arab_PK.txt
index ed1351f..1b41cba 100755
--- a/data/locales/pa_Arab_PK.txt
+++ b/data/locales/pa_Arab_PK.txt
@@ -1,11 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pa_Arab_PK.xml
// *
// ***************************************************************************
pa_Arab_PK{
- Version{"2.0.73.97"}
+ %%Parent{"pa_Arab"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/pa_Guru.txt b/data/locales/pa_Guru.txt
index b975d47..d482da5 100644
--- a/data/locales/pa_Guru.txt
+++ b/data/locales/pa_Guru.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pa_Guru.xml
// *
@@ -13,5 +13,5 @@
LocaleScript{
"Guru",
}
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/pa_Guru_IN.txt b/data/locales/pa_Guru_IN.txt
index 543ac0b..029d8d9 100644
--- a/data/locales/pa_Guru_IN.txt
+++ b/data/locales/pa_Guru_IN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pa_Guru_IN.xml
// *
// ***************************************************************************
pa_Guru_IN{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/pa_IN.txt b/data/locales/pa_IN.txt
index f8f230a..8a52933 100644
--- a/data/locales/pa_IN.txt
+++ b/data/locales/pa_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/pa_PK.txt b/data/locales/pa_PK.txt
index 22fb56e..8478504 100755
--- a/data/locales/pa_PK.txt
+++ b/data/locales/pa_PK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/pl.txt b/data/locales/pl.txt
index be77e51..471c51b 100644
--- a/data/locales/pl.txt
+++ b/data/locales/pl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pl.xml
// *
@@ -14,8 +14,8 @@
ExemplarCharacters{"[a ą b c ć d e ę f g h i j k l ł m n ń o ó p r s ś t u w y z ź ż]"}
ExemplarCharactersIndex{"[A Ą B C Ć D E Ę F G H I J K L Ł M N Ń O Ó P Q R S Ś T U V W X Y Z Ź Ż]"}
ExemplarCharactersPunctuation{
- "[\- ‐ – — , ; \: ! ? . … ' \" ” „ « » ( ) \[ \] \{ \} § @ * / \& # % † ‡ ′ ″"
- " ° ~]"
+ "[\\- ‐ – — , ; \\: ! ? . … ' \u0022 ” „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& "
+ "# % † ‡ ′ ″ ° ~]"
}
LocaleScript{
"Latn",
@@ -194,58 +194,31 @@
}
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
+ eras{
+ abbreviated{
+ "BE",
+ }
+ }
+ }
+ chinese{
DateTimePatterns{
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE, d MMMM, y G",
- "d MMMM, y G",
- "d MMM y G",
- "dd.MM.yyyy G",
- "{1}, {0}",
+ "EEEE, d MMMM U",
+ "d MMMM U",
+ "d MMM U",
+ "dd.MM.y",
"{1} {0}",
"{1} {0}",
- "{1}, {0}",
- "{1}, {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
}
- availableFormats{
- Ed{"E, d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E, d.MM"}
- MMM{"LLL"}
- MMMEd{"E, d MMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- MMdd{"d.MM"}
- Md{"d.MM"}
- d{"d"}
- h{"hh a"}
- hm{"hh:mm a"}
- hms{"hh:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yM{"MM.yyyy G"}
- yMEd{"E, d.MM.yyyy G"}
- yMMM{"LLL y G"}
- yMMMEd{"E, d MMM y G"}
- yMMMM{"LLLL y G"}
- yMMMd{"d MMM y G"}
- yMd{"d.MM.yyyy G"}
- yQQQ{"G y QQQ"}
- yQQQQ{"G y QQQQ"}
- yyMMM{"LLL y G"}
- yyyyMM{"MM.yyyy G"}
- yyyyMMMM{"LLLL y G"}
- }
- }
- chinese{
monthNames{
format{
abbreviated{
@@ -445,6 +418,153 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd.MM.y G",
+ "{1}, {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ }
+ availableFormats{
+ Ed{"E, d"}
+ Gy{"y G"}
+ GyMMM{"LLL y G"}
+ GyMMMEd{"E, d MMM y G"}
+ GyMMMd{"d MMM y G"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d.MM"}
+ MMM{"LLL"}
+ MMMEd{"E, d MMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMdd{"d.MM"}
+ Md{"d.MM"}
+ d{"d"}
+ h{"hh a"}
+ hm{"hh:mm a"}
+ hms{"hh:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y G"}
+ yyyy{"y G"}
+ yyyyM{"MM.y G"}
+ yyyyMEd{"E, d.MM.y G"}
+ yyyyMM{"MM.y G"}
+ yyyyMMM{"LLL y G"}
+ yyyyMMMEd{"E, d MMM y G"}
+ yyyyMMMM{"LLLL y G"}
+ yyyyMMMd{"d MMM y G"}
+ yyyyMd{"d.MM.y G"}
+ yyyyQQQ{"QQQ y G"}
+ yyyyQQQQ{"QQQQ y G"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"MM-MM"}
+ }
+ MEd{
+ M{"E, dd.MM – E, dd.MM"}
+ d{"E, dd.MM – E, dd.MM"}
+ }
+ MMM{
+ M{"LLL–LLL"}
+ }
+ MMMEd{
+ M{"E, d MMM - E, d MMM"}
+ d{"E, d MMM – E, d MMM"}
+ }
+ MMMd{
+ M{"d MMM - d MMM"}
+ d{"d-d MMM"}
+ }
+ Md{
+ M{"dd.MM–dd.MM"}
+ d{"dd.MM–dd.MM"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y G"}
+ }
+ yM{
+ M{"MM.y - MM.y G"}
+ y{"MM.y - MM.y G"}
+ }
+ yMEd{
+ M{"E, dd.MM.y - E, dd.MM.y G"}
+ d{"E, dd.MM.y - E, dd.MM.y G"}
+ y{"E, dd.MM.y - E, dd.MM.y G"}
+ }
+ yMMM{
+ M{"LLL-LLL y G"}
+ y{"LLL y - LLL y G"}
+ }
+ yMMMEd{
+ M{"E, d MMM - E, d MMM y G"}
+ d{"E, d - E, d MMM y G"}
+ y{"E, d MMM y - E, d MMM y G"}
+ }
+ yMMMM{
+ M{"LLLL-LLLL y G"}
+ y{"LLLL y - LLLL y G"}
+ }
+ yMMMd{
+ M{"d MMM - d MMM y G"}
+ d{"d-d MMM y G"}
+ y{"d MMM y - d MMM y G"}
+ }
+ yMd{
+ M{"dd.MM-dd.MM.y G"}
+ d{"dd-dd.MM.y G"}
+ y{"dd.MM.y-dd.MM.y G"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"AM",
@@ -458,7 +578,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd.MM.yyyy",
+ "dd.MM.y",
"{1}, {0}",
"{1} {0}",
"{1} {0}",
@@ -484,18 +604,16 @@
hms{"hh:mm:ss a"}
ms{"mm:ss"}
y{"y"}
- yM{"MM.yyyy"}
- yMEd{"E, d.MM.yyyy"}
+ yM{"MM.y"}
+ yMEd{"E, d.MM.y"}
+ yMM{"MM.y"}
yMMM{"LLL y"}
yMMMEd{"E, d MMM y"}
yMMMM{"LLLL y"}
yMMMd{"d MMM y"}
- yMd{"d.MM.yyyy"}
+ yMd{"d.MM.y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMMM{"LLLL yy"}
- yyyyMM{"MM.yyyy"}
- yyyyMMMM{"LLLL y"}
}
dayNames{
format{
@@ -585,63 +703,6 @@
"n.e.",
}
}
- fields{
- day{
- dn{"Dzień"}
- relative{
- "-1"{"Wczoraj"}
- "-2"{"Przedwczoraj"}
- "0"{"Dzisiaj"}
- "1"{"Jutro"}
- "2"{"Pojutrze"}
- }
- }
- dayperiod{
- dn{"Dayperiod"}
- }
- era{
- dn{"Era"}
- }
- hour{
- dn{"Godzina"}
- }
- minute{
- dn{"Minuta"}
- }
- month{
- dn{"Miesiąc"}
- relative{
- "-1"{"Zeszły miesiąc"}
- "0"{"Bieżący miesiąc"}
- "1"{"Przyszły miesiąc"}
- }
- }
- second{
- dn{"Sekunda"}
- }
- week{
- dn{"Tydzień"}
- relative{
- "-1"{"Zeszły tydzień"}
- "0"{"Bieżący tydzień"}
- "1"{"Przyszły tydzień"}
- }
- }
- weekday{
- dn{"Dzień tygodnia"}
- }
- year{
- dn{"Rok"}
- relative{
- "-1"{"Zeszły rok"}
- "0"{"Bieżący rok"}
- "1"{"Przyszły rok"}
- }
- }
- zone{
- dn{"Strefa"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -705,13 +766,13 @@
y{"y–y"}
}
yM{
- M{"MM.yyyy - MM.yyyy"}
- y{"MM.yyyy - MM.yyyy"}
+ M{"MM.y - MM.y"}
+ y{"MM.y - MM.y"}
}
yMEd{
- M{"E, dd.MM.yyyy - E, dd.MM.yyyy"}
- d{"E, dd.MM.yyyy - E, dd.MM.yyyy"}
- y{"E, dd.MM.yyyy - E, dd.MM.yyyy"}
+ M{"E, dd.MM.y - E, dd.MM.y"}
+ d{"E, dd.MM.y - E, dd.MM.y"}
+ y{"E, dd.MM.y - E, dd.MM.y"}
}
yMMM{
M{"LLL-LLL y"}
@@ -732,9 +793,9 @@
y{"d MMM y - d MMM y"}
}
yMd{
- M{"dd.MM-dd.MM.yyyy"}
- d{"dd-dd.MM.yyyy"}
- y{"dd.MM.yyyy-dd.MM.yyyy"}
+ M{"dd.MM-dd.MM.y"}
+ d{"dd-dd.MM.y"}
+ y{"dd.MM.y-dd.MM.y"}
}
}
monthNames{
@@ -1007,59 +1068,6 @@
}
}
islamic{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE, d MMMM, y G",
- "d MMMM, y G",
- "d MMM y G",
- "dd.MM.yyyy G",
- "{1}, {0}",
- "{1} {0}",
- "{1} {0}",
- "{1}, {0}",
- "{1}, {0}",
- }
- availableFormats{
- Ed{"E, d"}
- Gy{"y G"}
- H{"HH"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E, d.MM"}
- MMM{"LLL"}
- MMMEd{"E, d MMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- MMdd{"d.MM"}
- Md{"d.MM"}
- d{"d"}
- h{"hh a"}
- hm{"hh:mm a"}
- hms{"hh:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yM{"MM.yyyy"}
- yMEd{"E, d.MM.yyyy"}
- yMMM{"LLL y"}
- yMMMEd{"E, d MMM y"}
- yMMMM{"LLLL y"}
- yQQQ{"G y QQQ"}
- yQQQQ{"G y QQQQ"}
- yyMMM{"LLL yy G"}
- yyyy{"y G"}
- yyyyMEd{"E, dd.MM.yyyy G"}
- yyyyMM{"MM.yyyy G"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMM{"LLLL y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"dd.MM.yyyy G"}
- yyyyQQQ{"G y QQQ"}
- yyyyQQQQ{"G y QQQQ"}
- }
monthNames{
format{
abbreviated{
@@ -1143,46 +1151,15 @@
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE, d MMMM, y G",
- "d MMMM, y G",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
"d MMM y G",
- "dd.MM.yyyy G",
+ "dd.MM.y G",
+ "{1}, {0}",
"{1} {0}",
"{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E, d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E, d.MM"}
- MMM{"LLL"}
- MMMEd{"E, d MMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- MMdd{"dd.MM"}
- Md{"d.MM"}
- d{"d"}
- h{"hh a"}
- hm{"hh:mm a"}
- hms{"hh:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yyMMM{"LLL yy G"}
- yyyy{"y G"}
- yyyyM{"M.y G"}
- yyyyMEd{"E, dd.MM.y G"}
- yyyyMM{"MM.y G"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMM{"LLLL y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"dd.MM.y G"}
- yyyyQQQ{"G y QQQ"}
- yyyyQQQQ{"G y QQQQ"}
+ "{1}, {0}",
+ "{1}, {0}",
}
}
persian{
@@ -1264,53 +1241,6 @@
}
}
roc{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE, d MMMM, y G",
- "d MMMM, y G",
- "d MMM y G",
- "dd.MM.yyyy G",
- "{1}, {0}",
- "{1} {0}",
- "{1} {0}",
- "{1}, {0}",
- "{1}, {0}",
- }
- availableFormats{
- Ed{"E, d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E, d.MM"}
- MMM{"LLL"}
- MMMEd{"E, d MMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- MMdd{"dd.MM"}
- Md{"d.MM"}
- d{"d"}
- h{"hh a"}
- hm{"hh:mm a"}
- hms{"hh:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM/y G"}
- yyMMM{"LLL y G"}
- yyyy{"y G"}
- yyyyM{"M.y G"}
- yyyyMEd{"E, d.MM.y G"}
- yyyyMM{"MM.yyyy G"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMM{"LLLL y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"d.MM.y G"}
- yyyyQQQ{"G y QQQ"}
- yyyyQQQQ{"G y QQQQ"}
- }
eras{
abbreviated{
"Przed ROC",
@@ -1325,6 +1255,63 @@
quotationEnd{"”"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"Dzień"}
+ relative{
+ "-1"{"Wczoraj"}
+ "-2"{"Przedwczoraj"}
+ "0"{"Dzisiaj"}
+ "1"{"Jutro"}
+ "2"{"Pojutrze"}
+ }
+ }
+ dayperiod{
+ dn{"Dayperiod"}
+ }
+ era{
+ dn{"Era"}
+ }
+ hour{
+ dn{"Godzina"}
+ }
+ minute{
+ dn{"Minuta"}
+ }
+ month{
+ dn{"Miesiąc"}
+ relative{
+ "-1"{"Zeszły miesiąc"}
+ "0"{"Bieżący miesiąc"}
+ "1"{"Przyszły miesiąc"}
+ }
+ }
+ second{
+ dn{"Sekunda"}
+ }
+ week{
+ dn{"Tydzień"}
+ relative{
+ "-1"{"Zeszły tydzień"}
+ "0"{"Bieżący tydzień"}
+ "1"{"Przyszły tydzień"}
+ }
+ }
+ weekday{
+ dn{"Dzień tygodnia"}
+ }
+ year{
+ dn{"Rok"}
+ relative{
+ "-1"{"Zeszły rok"}
+ "0"{"Bieżący rok"}
+ "1"{"Przyszły rok"}
+ }
+ }
+ zone{
+ dn{"Strefa"}
+ }
+ }
listPattern{
standard{
2{"{0} i {1}"}
diff --git a/data/locales/pl_PL.txt b/data/locales/pl_PL.txt
index 598a7b3..e375716 100644
--- a/data/locales/pl_PL.txt
+++ b/data/locales/pl_PL.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pl_PL.xml
// *
// ***************************************************************************
pl_PL{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/pool.res b/data/locales/pool.res
index 46fdc08..bf2ce0f 100644
--- a/data/locales/pool.res
+++ b/data/locales/pool.res
Binary files differ
diff --git a/data/locales/ps.txt b/data/locales/ps.txt
index 9f57b7b..8a4cf71 100644
--- a/data/locales/ps.txt
+++ b/data/locales/ps.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ps.xml
// *
@@ -43,8 +43,31 @@
}
native{"arabext"}
}
- Version{"2.0.75.94"}
+ Version{"2.0.82.45"}
calendar{
+ default{"persian"}
+ generic{
+ DateTimePatterns{
+ "H:mm:ss (zzzz)",
+ "H:mm:ss (z)",
+ "H:mm:ss",
+ "H:mm",
+ "EEEE د G y د MMMM d",
+ "د G y د MMMM d",
+ "d MMM y G",
+ "GGGGG y/M/d",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ H{"H"}
+ Hm{"H:mm"}
+ Hms{"H:mm:ss"}
+ }
+ }
gregorian{
AmPmMarkers{
"غ.م.",
@@ -58,7 +81,7 @@
"EEEE د y د MMMM d",
"د y د MMMM d",
"d MMM y",
- "yyyy/M/d",
+ "y/M/d",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -131,6 +154,5 @@
}
layout{
characters{"right-to-left"}
- lines{"top-to-bottom"}
}
}
diff --git a/data/locales/ps_AF.txt b/data/locales/ps_AF.txt
index ff3cd78..31b4348 100644
--- a/data/locales/ps_AF.txt
+++ b/data/locales/ps_AF.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ps_AF.xml
// *
// ***************************************************************************
ps_AF{
- Version{"2.0.73.97"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/pt.txt b/data/locales/pt.txt
index baf8031..d38b156 100644
--- a/data/locales/pt.txt
+++ b/data/locales/pt.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt.xml
// *
@@ -147,57 +147,31 @@
}
native{"latn"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
calendar{
buddhist{
+ eras{
+ abbreviated{
+ "BE",
+ }
+ }
+ }
+ chinese{
DateTimePatterns{
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE, d 'de' MMMM 'de' y G",
- "d 'de' MMMM 'de' y G",
- "dd/MM/yyyy G",
- "d/M/yyyy",
+ "EEEE, d 'de' MMMM 'de' U",
+ "d 'de' MMMM 'de' U",
+ "dd/MM U",
+ "dd/MM/yy",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
- availableFormats{
- Ed{"E, d"}
- HHmm{"HH:mm"}
- HHmmss{"HH:mm:ss"}
- Hm{"HH:mm"}
- M{"L"}
- MEd{"E, dd/MM"}
- MMM{"LLL"}
- MMMEd{"E, d 'de' MMM"}
- MMMd{"d 'de' MMM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d"}
- ms{"mm:ss"}
- y{"y G"}
- yM{"MM/y G"}
- yMEd{"E, dd/MM/yyyy G"}
- yMMM{"MMM 'de' y G"}
- yMMMEd{"E, d 'de' MMM 'de' y G"}
- yMMMd{"d 'de' MMM 'de' y G"}
- yMd{"dd/MM/yyyy G"}
- yQQQ{"G y QQQ"}
- yQQQQ{"G y QQQQ"}
- yyMM{"MM/yy G"}
- yyMMM{"MMM 'de' yy G"}
- yyMMMEd{"E, d 'de' MMM 'de' yy G"}
- yyMMMd{"d 'de' MMM 'de' yy G"}
- yyQQQ{"QQQ yy G"}
- yyyyMM{"MM/y G"}
- yyyyMMM{"MMM 'de' y G"}
- }
- }
- chinese{
monthNames{
format{
abbreviated{
@@ -397,6 +371,149 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "dd/MM/y G",
+ "dd/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E, d"}
+ Gy{"y G"}
+ GyMMM{"MMM 'de' y G"}
+ GyMMMEd{"E, d 'de' MMM 'de' y G"}
+ GyMMMd{"d 'de' MMM 'de' y G"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, dd/MM"}
+ MMM{"LLL"}
+ MMMEd{"E, d 'de' MMM"}
+ MMMd{"d 'de' MMM"}
+ Md{"d/M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y G"}
+ yyyy{"y G"}
+ yyyyM{"MM/y GGGGG"}
+ yyyyMEd{"E, dd/MM/y GGGGG"}
+ yyyyMMM{"MMM 'de' y G"}
+ yyyyMMMEd{"E, d 'de' MMM 'de' y G"}
+ yyyyMMMd{"d 'de' MMM 'de' y G"}
+ yyyyMd{"dd/MM/y GGGGG"}
+ yyyyQQQ{"G y QQQ"}
+ yyyyQQQQ{"G y QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"HH'h' - HH'h'"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH - HH v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E, dd/MM - E, dd/MM"}
+ d{"E, dd/MM - E, dd/MM"}
+ }
+ MMM{
+ M{"MMM - MMM"}
+ }
+ MMMEd{
+ M{"E, d 'de' MMM - E, d 'de' MMM"}
+ d{"E, d - E, d 'de' MMM"}
+ }
+ MMMd{
+ M{"d 'de' MMM - d 'de' MMM"}
+ d{"d-d 'de' MMM"}
+ }
+ Md{
+ M{"dd/MM - dd/MM"}
+ d{"dd/MM - dd/MM"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h'h' a - h'h' a"}
+ h{"h'h' - h'h' a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a - h a v"}
+ h{"h - h a v"}
+ }
+ y{
+ y{"y - y G"}
+ }
+ yM{
+ M{"MM/y - MM/y G"}
+ y{"MM/y - MM/y G"}
+ }
+ yMEd{
+ M{"E, dd/MM/y - E, dd/MM/y G"}
+ d{"E, dd/MM/y - E, dd/MM/y G"}
+ y{"E, dd/MM/y - E, dd/MM/y G"}
+ }
+ yMMM{
+ M{"MMM-MMM 'de' y G"}
+ y{"MMM 'de' y - MMM 'de' y G"}
+ }
+ yMMMEd{
+ M{"E, d 'de' MMM - E, d 'de' MMM 'de' y G"}
+ d{"E, d - E, d 'de' MMM 'de' y G"}
+ y{"E, d 'de' MMM 'de' y - E, d 'de' MMM 'de' y G"}
+ }
+ yMMMM{
+ M{"MMMM-MMMM 'de' y G"}
+ y{"MMMM 'de' y - MMMM 'de' y G"}
+ }
+ yMMMd{
+ M{"d 'de' MMM - d 'de' MMM 'de' y G"}
+ d{"d-d 'de' MMM 'de' y"}
+ y{"d 'de' MMM 'de' y - d 'de' MMM 'de' y G"}
+ }
+ yMd{
+ M{"dd/MM/y - dd/MM/y G"}
+ d{"dd/MM/y - dd/MM/y G"}
+ y{"dd/MM/y - dd/MM/y G"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"AM",
@@ -409,7 +526,7 @@
"HH:mm",
"EEEE, d 'de' MMMM 'de' y",
"d 'de' MMMM 'de' y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"dd/MM/yy",
"{1} {0}",
"{1} {0}",
@@ -419,6 +536,10 @@
}
availableFormats{
Ed{"E, d"}
+ Gy{"y G"}
+ GyMMM{"MMM 'de' y G"}
+ GyMMMEd{"E, d 'de' MMM 'de' y G"}
+ GyMMMd{"d 'de' MMM 'de' y G"}
H{"HH"}
HHmm{"HH:mm"}
HHmmss{"HH:mm:ss"}
@@ -437,21 +558,15 @@
hms{"h:mm:ss a"}
ms{"mm:ss"}
y{"y"}
- yM{"MM/yyyy"}
- yMEd{"E, dd/MM/yyyy"}
+ yM{"MM/y"}
+ yMEd{"E, dd/MM/y"}
+ yMM{"MM/y"}
yMMM{"MMM 'de' y"}
yMMMEd{"E, d 'de' MMM 'de' y"}
yMMMd{"d 'de' MMM 'de' y"}
- yMd{"dd/MM/yyyy"}
+ yMd{"dd/MM/y"}
yQQQ{"y QQQ"}
yQQQQ{"y QQQQ"}
- yyMM{"MM/yy"}
- yyMMM{"MMM 'de' yy"}
- yyMMMEd{"E, d 'de' MMM 'de' yy"}
- yyMMMd{"d 'de' MMM 'de' yy"}
- yyQQQ{"QQQ yy"}
- yyyyMM{"MM/yyyy"}
- yyyyMMM{"MMM 'de' y"}
}
dayNames{
format{
@@ -541,63 +656,6 @@
"Ano do Senhor",
}
}
- fields{
- day{
- dn{"Dia"}
- relative{
- "-1"{"Ontem"}
- "-2"{"Anteontem"}
- "0"{"Hoje"}
- "1"{"Amanhã"}
- "2"{"Depois de amanhã"}
- }
- }
- dayperiod{
- dn{"Período do dia"}
- }
- era{
- dn{"Era"}
- }
- hour{
- dn{"Hora"}
- }
- minute{
- dn{"Minuto"}
- }
- month{
- dn{"Mês"}
- relative{
- "-1"{"Mês passado"}
- "0"{"Este mês"}
- "1"{"Próximo mês"}
- }
- }
- second{
- dn{"Segundo"}
- }
- week{
- dn{"Semana"}
- relative{
- "-1"{"Semana passada"}
- "0"{"Esta semana"}
- "1"{"Próxima semana"}
- }
- }
- weekday{
- dn{"Dia da semana"}
- }
- year{
- dn{"Ano"}
- relative{
- "-1"{"Ano passado"}
- "0"{"Este ano"}
- "1"{"Próximo ano"}
- }
- }
- zone{
- dn{"Fuso"}
- }
- }
intervalFormats{
H{
H{"HH'h' - HH'h'"}
@@ -661,13 +719,13 @@
y{"y - y"}
}
yM{
- M{"MM/yy - MM/yy"}
- y{"MM/yy - MM/yy"}
+ M{"MM/y - MM/y"}
+ y{"MM/y - MM/y"}
}
yMEd{
- M{"E, dd/MM/yy - E, dd/MM/yy"}
- d{"E, dd/MM/yy - E, dd/MM/yy"}
- y{"E, dd/MM/yy - E, dd/MM/yy"}
+ M{"E, dd/MM/y - E, dd/MM/y"}
+ d{"E, dd/MM/y - E, dd/MM/y"}
+ y{"E, dd/MM/y - E, dd/MM/y"}
}
yMMM{
M{"MMM-MMM 'de' y"}
@@ -688,9 +746,9 @@
y{"d 'de' MMM 'de' y - d 'de' MMM 'de' y"}
}
yMd{
- M{"dd/MM/yy - dd/MM/yy"}
- d{"dd/MM/yy - dd/MM/yy"}
- y{"dd/MM/yy - dd/MM/yy"}
+ M{"dd/MM/y - dd/MM/y"}
+ d{"dd/MM/y - dd/MM/y"}
+ y{"dd/MM/y - dd/MM/y"}
}
}
monthNames{
@@ -963,63 +1021,10 @@
}
}
islamic{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE, d 'de' MMMM 'de' y G",
- "d 'de' MMMM 'de' y G",
- "dd/MM/yyyy G",
- "d/M/yyyy",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E, d"}
- Gy{"y G"}
- H{"HH"}
- HHmm{"HH'h'mm"}
- HHmmss{"HH'h'mm'min'ss's'"}
- Hm{"HH'h'mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E, dd/MM"}
- MMM{"LLL"}
- MMMEd{"E, d 'de' MMM"}
- MMMd{"d 'de' MMM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d"}
- h{"h a"}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yM{"MM/yyyy"}
- yMEd{"E, dd/MM/yyyy"}
- yMMM{"MMM 'de' y"}
- yMMMEd{"E, d 'de' MMM 'de' y"}
- yQQQ{"G y QQQ"}
- yQQQQ{"G y QQQQ"}
- yyMM{"MM/yy G"}
- yyMMM{"MMM 'de' yy G"}
- yyMMMEd{"E, d 'de' MMM 'de' yy G"}
- yyMMMd{"d 'de' MMM 'de' yy G"}
- yyQQQ{"QQQ yy G"}
- yyyy{"y G"}
- yyyyM{"MM/y G"}
- yyyyMEd{"E, dd/MM/yyyy G"}
- yyyyMM{"MM/y G"}
- yyyyMMM{"MMM 'de' y G"}
- yyyyMMMEd{"E, d 'de' MMM 'de' y G"}
- yyyyMMMd{"d 'de' MMM 'de' y G"}
- yyyyMd{"dd/MM/yyyy G"}
- yyyyQQQ{"G y QQQ"}
- yyyyQQQQ{"G y QQQQ"}
+ eras{
+ abbreviated{
+ "AH",
+ }
}
}
japanese{
@@ -1028,48 +1033,16 @@
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE, d MMMM y G",
+ "EEEE, d 'de' MMMM 'de' y G",
"d 'de' MMMM 'de' y G",
- "d MMM y G",
- "d/M/yy",
+ "dd/MM/y G",
+ "dd/MM/yy GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
- availableFormats{
- Ed{"E, d"}
- Gy{"y G"}
- HHmm{"HH:mm"}
- HHmmss{"HH:mm:ss"}
- Hm{"HH:mm"}
- M{"L"}
- MEd{"E, dd/MM"}
- MMM{"LLL"}
- MMMEd{"E, d 'de' MMM"}
- MMMd{"d 'de' MMM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM/yy G"}
- yyMMM{"MMM 'de' yy G"}
- yyMMMEd{"E, d 'de' MMM 'de' yy G"}
- yyMMMd{"d 'de' MMM 'de' yy G"}
- yyQQQ{"QQQ yy G"}
- yyyy{"y G"}
- yyyyM{"MM/y G"}
- yyyyMEd{"E, dd/MM/yyyy G"}
- yyyyMM{"MM/y G"}
- yyyyMMM{"MMM 'de' y G"}
- yyyyMMMEd{"E, d 'de' MMM 'de' y G"}
- yyyyMMMd{"d 'de' MMM 'de' y G"}
- yyyyMd{"dd/MM/yyyy G"}
- yyyyQQQ{"G y QQQ"}
- yyyyQQQQ{"G y QQQQ"}
- }
}
persian{
monthNames{
@@ -1136,53 +1109,6 @@
}
}
roc{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE, d 'de' MMMM 'de' y G",
- "d 'de' MMMM 'de' y G",
- "dd/MM/yyyy G",
- "d/M/yyyy",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E, d"}
- Gy{"y G"}
- HHmm{"HH:mm"}
- HHmmss{"HH:mm:ss"}
- Hm{"HH:mm"}
- M{"L"}
- MEd{"E, dd/MM"}
- MMM{"LLL"}
- MMMEd{"E, d 'de' MMM"}
- MMMd{"d 'de' MMM"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM/yy G"}
- yyMMM{"MMM 'de' yy G"}
- yyMMMEd{"E, d 'de' MMM 'de' yy G"}
- yyMMMd{"d 'de' MMM 'de' yy G"}
- yyQQQ{"QQQ yy G"}
- yyyy{"y G"}
- yyyyM{"MM/y G"}
- yyyyMEd{"E, dd/MM/yyyy G"}
- yyyyMM{"MM/y G"}
- yyyyMMM{"MMM 'de' y G"}
- yyyyMMMEd{"E, d 'de' MMM 'de' y G"}
- yyyyMMMd{"d 'de' MMM 'de' y G"}
- yyyyMd{"dd/MM/yyyy G"}
- yyyyQQQ{"G y QQQ"}
- yyyyQQQQ{"G y QQQQ"}
- }
eras{
abbreviated{
"Antes de R.O.C.",
@@ -1211,6 +1137,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Dia"}
+ relative{
+ "-1"{"Ontem"}
+ "-2"{"Anteontem"}
+ "0"{"Hoje"}
+ "1"{"Amanhã"}
+ "2"{"Depois de amanhã"}
+ }
+ }
+ dayperiod{
+ dn{"Período do dia"}
+ }
+ era{
+ dn{"Era"}
+ }
+ hour{
+ dn{"Hora"}
+ }
+ minute{
+ dn{"Minuto"}
+ }
+ month{
+ dn{"Mês"}
+ relative{
+ "-1"{"Mês passado"}
+ "0"{"Este mês"}
+ "1"{"Próximo mês"}
+ }
+ }
+ second{
+ dn{"Segundo"}
+ }
+ week{
+ dn{"Semana"}
+ relative{
+ "-1"{"Semana passada"}
+ "0"{"Esta semana"}
+ "1"{"Próxima semana"}
+ }
+ }
+ weekday{
+ dn{"Dia da semana"}
+ }
+ year{
+ dn{"Ano"}
+ relative{
+ "-1"{"Ano passado"}
+ "0"{"Este ano"}
+ "1"{"Próximo ano"}
+ }
+ }
+ zone{
+ dn{"Fuso"}
+ }
+ }
listPattern{
standard{
2{"{0} e {1}"}
diff --git a/data/locales/pt_AO.txt b/data/locales/pt_AO.txt
index f8f778a..07ec97d 100755
--- a/data/locales/pt_AO.txt
+++ b/data/locales/pt_AO.txt
@@ -1,12 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_AO.xml
// *
// ***************************************************************************
pt_AO{
%%Parent{"pt_PT"}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/pt_BR.txt b/data/locales/pt_BR.txt
index acdd64b..ffe4cf6 100644
--- a/data/locales/pt_BR.txt
+++ b/data/locales/pt_BR.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_BR.xml
// *
// ***************************************************************************
pt_BR{
- Version{"2.0.56.63"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/pt_CV.txt b/data/locales/pt_CV.txt
index 187448d..b62d5fa 100755
--- a/data/locales/pt_CV.txt
+++ b/data/locales/pt_CV.txt
@@ -1,12 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_CV.xml
// *
// ***************************************************************************
pt_CV{
%%Parent{"pt_PT"}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/pt_GW.txt b/data/locales/pt_GW.txt
index 32f7bb8..b746970 100755
--- a/data/locales/pt_GW.txt
+++ b/data/locales/pt_GW.txt
@@ -1,12 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_GW.xml
// *
// ***************************************************************************
pt_GW{
%%Parent{"pt_PT"}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/pt_MO.txt b/data/locales/pt_MO.txt
index 4cb965c..d218a0a 100755
--- a/data/locales/pt_MO.txt
+++ b/data/locales/pt_MO.txt
@@ -1,12 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_MO.xml
// *
// ***************************************************************************
pt_MO{
%%Parent{"pt_PT"}
- Version{"2.0.74.87"}
+ Version{"2.0.82.68"}
}
diff --git a/data/locales/pt_MZ.txt b/data/locales/pt_MZ.txt
index cef46fc..dfb7ce5 100755
--- a/data/locales/pt_MZ.txt
+++ b/data/locales/pt_MZ.txt
@@ -1,12 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_MZ.xml
// *
// ***************************************************************************
pt_MZ{
%%Parent{"pt_PT"}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/pt_PT.txt b/data/locales/pt_PT.txt
index db184aa..8712cd8 100644
--- a/data/locales/pt_PT.txt
+++ b/data/locales/pt_PT.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_PT.xml
// *
@@ -122,7 +122,7 @@
}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.51"}
calendar{
buddhist{
DateTimePatterns{
@@ -132,17 +132,60 @@
"HH:mm",
"EEEE, d 'de' MMMM 'de' y G",
"d 'de' MMMM 'de' y G",
- "dd/MM/yyyy G",
+ "dd/MM/y G",
"d/M/y G",
"{1}, {0}",
- "{1} às {0}",
- "{1} às {0}",
+ "{1} 'às' {0}",
+ "{1} 'às' {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ }
+ }
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "dd/MM/y G",
+ "d/M/y G",
+ "{1}, {0}",
+ "{1} 'às' {0}",
+ "{1} 'às' {0}",
"{1}, {0}",
"{1}, {0}",
}
availableFormats{
- yQQQ{"QQQQ 'de' y G"}
- yQQQQ{"QQQQ 'de' y G"}
+ MMMEd{"E, d/MM"}
+ MMMMEd{"E, d 'de' MMMM"}
+ MMMMd{"d 'de' MMMM"}
+ MMMd{"d/MM"}
+ yyyyMMM{"MM/y G"}
+ yyyyMMMEEEEd{"EEEE, d/MM/y"}
+ yyyyMMMEd{"E, d/MM/y G"}
+ yyyyMMMM{"MMMM 'de' y G"}
+ yyyyMMMMEd{"E, d 'de' MMMM 'de' y G"}
+ yyyyMMMMd{"d 'de' MMMM 'de' y G"}
+ yyyyMMMd{"d/MM/y G"}
+ yyyyQQQ{"QQQQ 'de' y G"}
+ yyyyQQQQ{"QQQQ 'de' y G"}
+ }
+ intervalFormats{
+ MMM{
+ M{"MMM-MMM"}
+ }
+ h{
+ a{"h a - h a"}
+ h{"h-h a"}
+ }
+ hm{
+ h{"h:mm - h:mm a"}
+ }
+ y{
+ y{"y-y G"}
+ }
}
}
gregorian{
@@ -157,11 +200,11 @@
"HH:mm",
"EEEE, d 'de' MMMM 'de' y",
"d 'de' MMMM 'de' y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"dd/MM/yy",
"{1}, {0}",
- "{1} às {0}",
- "{1} às {0}",
+ "{1} 'às' {0}",
+ "{1} 'às' {0}",
"{1}, {0}",
"{1}, {0}",
}
@@ -171,6 +214,7 @@
MMMMd{"d 'de' MMMM"}
MMMd{"d/MM"}
yMMM{"MM/y"}
+ yMMMEEEEd{"EEEE, d/MM/y"}
yMMMEd{"E, d/MM/y"}
yMMMM{"MMMM 'de' y"}
yMMMMEd{"E, d 'de' MMMM 'de' y"}
@@ -178,9 +222,6 @@
yMMMd{"d/MM/y"}
yQQQ{"QQQQ 'de' y"}
yQQQQ{"QQQQ 'de' y"}
- yyMMM{"MM/yy"}
- yyMMMEd{"E, d/MM/yy"}
- yyMMMd{"d/MM/yy"}
}
dayNames{
format{
@@ -215,11 +256,6 @@
}
}
}
- fields{
- zone{
- dn{"Fuso horário"}
- }
- }
intervalFormats{
MMM{
M{"MMM-MMM"}
@@ -308,6 +344,23 @@
}
}
}
+ hebrew{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "dd/MM/y G",
+ "d/M/y G",
+ "{1}, {0}",
+ "{1} 'às' {0}",
+ "{1} 'às' {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ }
+ }
islamic{
DateTimePatterns{
"HH:mm:ss zzzz",
@@ -316,18 +369,14 @@
"HH:mm",
"EEEE, d 'de' MMMM 'de' y G",
"d 'de' MMMM 'de' y G",
- "dd/MM/yyyy G",
+ "dd/MM/y G",
"d/M/y G",
"{1}, {0}",
- "{1} às {0}",
- "{1} às {0}",
+ "{1} 'às' {0}",
+ "{1} 'às' {0}",
"{1}, {0}",
"{1}, {0}",
}
- availableFormats{
- yQQQ{"QQQQ 'de' y G"}
- yQQQQ{"QQQQ 'de' y G"}
- }
}
japanese{
DateTimePatterns{
@@ -337,17 +386,13 @@
"HH:mm",
"EEEE, d 'de' MMMM 'de' y G",
"d 'de' MMMM 'de' y G",
- "dd/MM/yyyy G",
+ "dd/MM/y G",
"d/M/y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- yQQQ{"QQQQ 'de' y G"}
- yQQQQ{"QQQQ 'de' y G"}
+ "{1}, {0}",
+ "{1} 'às' {0}",
+ "{1} 'às' {0}",
+ "{1}, {0}",
+ "{1}, {0}",
}
}
roc{
@@ -358,18 +403,14 @@
"HH:mm",
"EEEE, d 'de' MMMM 'de' y G",
"d 'de' MMMM 'de' y G",
- "dd/MM/yyyy G",
+ "dd/MM/y G",
"d/M/y G",
"{1}, {0}",
- "{1} às {0}",
- "{1} às {0}",
+ "{1} 'às' {0}",
+ "{1} 'às' {0}",
"{1}, {0}",
"{1}, {0}",
}
- availableFormats{
- yQQQ{"QQQQ 'de' y G"}
- yQQQQ{"QQQQ 'de' y G"}
- }
}
}
delimiters{
@@ -378,6 +419,11 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ zone{
+ dn{"Fuso horário"}
+ }
+ }
measurementSystemNames{
US{"Estados Unidos"}
metric{"Métrico"}
diff --git a/data/locales/pt_ST.txt b/data/locales/pt_ST.txt
index 974030d..86424cd 100755
--- a/data/locales/pt_ST.txt
+++ b/data/locales/pt_ST.txt
@@ -1,12 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_ST.xml
// *
// ***************************************************************************
pt_ST{
%%Parent{"pt_PT"}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/pt_TL.txt b/data/locales/pt_TL.txt
index f709486..b0c885e 100755
--- a/data/locales/pt_TL.txt
+++ b/data/locales/pt_TL.txt
@@ -1,12 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_TL.xml
// *
// ***************************************************************************
pt_TL{
%%Parent{"pt_PT"}
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/resfiles.mk b/data/locales/resfiles.mk
index a16b435..8c7d879 100644
--- a/data/locales/resfiles.mk
+++ b/data/locales/resfiles.mk
@@ -1,6 +1,6 @@
-# * Copyright (C) 1998-2012, International Business Machines
+# * Copyright (C) 1998-2013, International Business Machines
# * Corporation and others. All Rights Reserved.
-GENRB_CLDR_VERSION = 22.1.1
+GENRB_CLDR_VERSION = 23
# A list of txt's to build
# Note:
#
@@ -29,13 +29,14 @@
GENRB_SYNTHETIC_ALIAS = az_AZ.txt bs_BA.txt en_NH.txt en_RH.txt\
ha_GH.txt ha_NE.txt ha_NG.txt in.txt in_ID.txt\
iw.txt iw_IL.txt ja_JP_TRADITIONAL.txt kk_KZ.txt ks_IN.txt\
- mo.txt no.txt no_NO.txt no_NO_NY.txt pa_IN.txt\
- pa_PK.txt sh.txt sh_BA.txt sh_CS.txt sh_YU.txt\
- shi_MA.txt sr_BA.txt sr_CS.txt sr_Cyrl_CS.txt sr_Cyrl_YU.txt\
- sr_Latn_CS.txt sr_Latn_YU.txt sr_ME.txt sr_RS.txt sr_YU.txt\
- th_TH_TRADITIONAL.txt tl.txt tl_PH.txt tzm_MA.txt uz_AF.txt\
- uz_UZ.txt vai_LR.txt zh_CN.txt zh_HK.txt zh_MO.txt\
- zh_SG.txt zh_TW.txt
+ mn_MN.txt mo.txt ms_BN.txt ms_MY.txt ms_SG.txt\
+ no.txt no_NO.txt no_NO_NY.txt pa_IN.txt pa_PK.txt\
+ sh.txt sh_BA.txt sh_CS.txt sh_YU.txt shi_MA.txt\
+ sr_BA.txt sr_CS.txt sr_Cyrl_CS.txt sr_Cyrl_YU.txt sr_Latn_CS.txt\
+ sr_Latn_YU.txt sr_ME.txt sr_RS.txt sr_YU.txt th_TH_TRADITIONAL.txt\
+ tl.txt tl_PH.txt tzm_MA.txt uz_AF.txt uz_UZ.txt\
+ vai_LR.txt zh_CN.txt zh_HK.txt zh_MO.txt zh_SG.txt\
+ zh_TW.txt
# All aliases (to not be included under 'installed'), but not including root.
@@ -123,43 +124,44 @@
mas_TZ.txt mer.txt mer_KE.txt mfe.txt mfe_MU.txt\
mg.txt mg_MG.txt mgh.txt mgh_MZ.txt mgo.txt\
mgo_CM.txt mk.txt mk_MK.txt ml.txt ml_IN.txt\
- mr.txt mr_IN.txt ms.txt ms_BN.txt ms_MY.txt\
- ms_SG.txt mt.txt mt_MT.txt mua.txt mua_CM.txt\
- my.txt my_MM.txt naq.txt naq_NA.txt nb.txt\
- nb_NO.txt nd.txt nd_ZW.txt ne.txt ne_IN.txt\
- ne_NP.txt nl.txt nl_AW.txt nl_BE.txt nl_CW.txt\
- nl_NL.txt nl_SR.txt nl_SX.txt nmg.txt nmg_CM.txt\
- nn.txt nn_NO.txt nus.txt nus_SD.txt nyn.txt\
- nyn_UG.txt om.txt om_ET.txt om_KE.txt or.txt\
- or_IN.txt pa.txt pa_Arab.txt pa_Arab_PK.txt pa_Guru.txt\
- pa_Guru_IN.txt pl.txt pl_PL.txt ps.txt ps_AF.txt\
- pt.txt pt_AO.txt pt_BR.txt pt_CV.txt pt_GW.txt\
- pt_MO.txt pt_MZ.txt pt_PT.txt pt_ST.txt pt_TL.txt\
- rm.txt rm_CH.txt rn.txt rn_BI.txt ro.txt\
- ro_MD.txt ro_RO.txt rof.txt rof_TZ.txt ru.txt\
- ru_BY.txt ru_KG.txt ru_KZ.txt ru_MD.txt ru_RU.txt\
- ru_UA.txt rw.txt rw_RW.txt rwk.txt rwk_TZ.txt\
- saq.txt saq_KE.txt sbp.txt sbp_TZ.txt seh.txt\
- seh_MZ.txt ses.txt ses_ML.txt sg.txt sg_CF.txt\
- shi.txt shi_Latn.txt shi_Latn_MA.txt shi_Tfng.txt shi_Tfng_MA.txt\
- si.txt si_LK.txt sk.txt sk_SK.txt sl.txt\
- sl_SI.txt sn.txt sn_ZW.txt so.txt so_DJ.txt\
- so_ET.txt so_KE.txt so_SO.txt sq.txt sq_AL.txt\
- sq_MK.txt sr.txt sr_Cyrl.txt sr_Cyrl_BA.txt sr_Cyrl_ME.txt\
- sr_Cyrl_RS.txt sr_Latn.txt sr_Latn_BA.txt sr_Latn_ME.txt sr_Latn_RS.txt\
- sv.txt sv_AX.txt sv_FI.txt sv_SE.txt sw.txt\
- sw_KE.txt sw_TZ.txt sw_UG.txt swc.txt swc_CD.txt\
- ta.txt ta_IN.txt ta_LK.txt ta_MY.txt ta_SG.txt\
- te.txt te_IN.txt teo.txt teo_KE.txt teo_UG.txt\
- th.txt th_TH.txt ti.txt ti_ER.txt ti_ET.txt\
- to.txt to_TO.txt tr.txt tr_CY.txt tr_TR.txt\
- twq.txt twq_NE.txt tzm.txt tzm_Latn.txt tzm_Latn_MA.txt\
- uk.txt uk_UA.txt ur.txt ur_IN.txt ur_PK.txt\
- uz.txt uz_Arab.txt uz_Arab_AF.txt uz_Cyrl.txt uz_Cyrl_UZ.txt\
- uz_Latn.txt uz_Latn_UZ.txt vai.txt vai_Latn.txt vai_Latn_LR.txt\
- vai_Vaii.txt vai_Vaii_LR.txt vi.txt vi_VN.txt vun.txt\
- vun_TZ.txt xog.txt xog_UG.txt yav.txt yav_CM.txt\
- yo.txt yo_NG.txt zh.txt zh_Hans.txt zh_Hans_CN.txt\
- zh_Hans_HK.txt zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt zh_Hant_HK.txt\
- zh_Hant_MO.txt zh_Hant_TW.txt zu.txt zu_ZA.txt
+ mn.txt mn_Cyrl.txt mn_Cyrl_MN.txt mr.txt mr_IN.txt\
+ ms.txt ms_Latn.txt ms_Latn_BN.txt ms_Latn_MY.txt ms_Latn_SG.txt\
+ mt.txt mt_MT.txt mua.txt mua_CM.txt my.txt\
+ my_MM.txt naq.txt naq_NA.txt nb.txt nb_NO.txt\
+ nd.txt nd_ZW.txt ne.txt ne_IN.txt ne_NP.txt\
+ nl.txt nl_AW.txt nl_BE.txt nl_CW.txt nl_NL.txt\
+ nl_SR.txt nl_SX.txt nmg.txt nmg_CM.txt nn.txt\
+ nn_NO.txt nus.txt nus_SD.txt nyn.txt nyn_UG.txt\
+ om.txt om_ET.txt om_KE.txt or.txt or_IN.txt\
+ pa.txt pa_Arab.txt pa_Arab_PK.txt pa_Guru.txt pa_Guru_IN.txt\
+ pl.txt pl_PL.txt ps.txt ps_AF.txt pt.txt\
+ pt_AO.txt pt_BR.txt pt_CV.txt pt_GW.txt pt_MO.txt\
+ pt_MZ.txt pt_PT.txt pt_ST.txt pt_TL.txt rm.txt\
+ rm_CH.txt rn.txt rn_BI.txt ro.txt ro_MD.txt\
+ ro_RO.txt rof.txt rof_TZ.txt ru.txt ru_BY.txt\
+ ru_KG.txt ru_KZ.txt ru_MD.txt ru_RU.txt ru_UA.txt\
+ rw.txt rw_RW.txt rwk.txt rwk_TZ.txt saq.txt\
+ saq_KE.txt sbp.txt sbp_TZ.txt seh.txt seh_MZ.txt\
+ ses.txt ses_ML.txt sg.txt sg_CF.txt shi.txt\
+ shi_Latn.txt shi_Latn_MA.txt shi_Tfng.txt shi_Tfng_MA.txt si.txt\
+ si_LK.txt sk.txt sk_SK.txt sl.txt sl_SI.txt\
+ sn.txt sn_ZW.txt so.txt so_DJ.txt so_ET.txt\
+ so_KE.txt so_SO.txt sq.txt sq_AL.txt sq_MK.txt\
+ sr.txt sr_Cyrl.txt sr_Cyrl_BA.txt sr_Cyrl_ME.txt sr_Cyrl_RS.txt\
+ sr_Latn.txt sr_Latn_BA.txt sr_Latn_ME.txt sr_Latn_RS.txt sv.txt\
+ sv_AX.txt sv_FI.txt sv_SE.txt sw.txt sw_KE.txt\
+ sw_TZ.txt sw_UG.txt swc.txt swc_CD.txt ta.txt\
+ ta_IN.txt ta_LK.txt ta_MY.txt ta_SG.txt te.txt\
+ te_IN.txt teo.txt teo_KE.txt teo_UG.txt th.txt\
+ th_TH.txt ti.txt ti_ER.txt ti_ET.txt to.txt\
+ to_TO.txt tr.txt tr_CY.txt tr_TR.txt twq.txt\
+ twq_NE.txt tzm.txt tzm_Latn.txt tzm_Latn_MA.txt uk.txt\
+ uk_UA.txt ur.txt ur_IN.txt ur_PK.txt uz.txt\
+ uz_Arab.txt uz_Arab_AF.txt uz_Cyrl.txt uz_Cyrl_UZ.txt uz_Latn.txt\
+ uz_Latn_UZ.txt vai.txt vai_Latn.txt vai_Latn_LR.txt vai_Vaii.txt\
+ vai_Vaii_LR.txt vi.txt vi_VN.txt vun.txt vun_TZ.txt\
+ xog.txt xog_UG.txt yav.txt yav_CM.txt yo.txt\
+ yo_NG.txt zh.txt zh_Hans.txt zh_Hans_CN.txt zh_Hans_HK.txt\
+ zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt zh_Hant_HK.txt zh_Hant_MO.txt\
+ zh_Hant_TW.txt zu.txt zu_ZA.txt
diff --git a/data/locales/rm.txt b/data/locales/rm.txt
index 760dd70..2fa899b 100644
--- a/data/locales/rm.txt
+++ b/data/locales/rm.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rm.xml
// *
@@ -38,8 +38,137 @@
}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, 'ils' d 'da' MMMM y G",
+ "d 'da' MMMM y G",
+ "dd-MM-y G",
+ "dd-MM-yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d."}
+ H{"H"}
+ HHmm{"HH:mm"}
+ HHmmss{"HH:mm:ss"}
+ Hm{"H:mm"}
+ M{"L"}
+ MEd{"E, d.M."}
+ MMM{"LLL"}
+ MMMEd{"E d. MMM"}
+ MMMMEd{"E d. MMMM"}
+ MMMMd{"d. MMMM"}
+ MMMMdd{"dd. MMMM"}
+ MMMd{"d. MMM"}
+ MMd{"d.MM."}
+ MMdd{"dd.MM."}
+ Md{"d.M."}
+ d{"d"}
+ mmss{"mm:ss"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"y-M"}
+ yMEd{"E, y-M-d"}
+ yMM{"MM.y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, d. MMM y"}
+ yMMMM{"MMMM y"}
+ yMMdd{"dd.MM.y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ M{
+ M{"M.-M."}
+ }
+ MEd{
+ M{"E, dd.MM. - E, dd.MM."}
+ d{"E, dd.MM. - E, dd.MM."}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"E, d. MMM - E, d. MMM"}
+ d{"E, d. - E, d. MMM"}
+ }
+ MMMd{
+ M{"d. MMM - d. MMM"}
+ d{"d.-d. MMM"}
+ }
+ Md{
+ M{"dd.MM. - dd.MM."}
+ d{"dd.MM. - dd.MM."}
+ }
+ d{
+ d{"d.-d."}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"HH-HH"}
+ h{"HH-HH"}
+ }
+ hm{
+ a{"HH:mm-HH:mm"}
+ h{"HH:mm-HH:mm"}
+ m{"HH:mm-HH:mm"}
+ }
+ hmv{
+ a{"HH:mm-HH:mm v"}
+ h{"HH:mm-HH:mm v"}
+ m{"HH:mm-HH:mm v"}
+ }
+ hv{
+ a{"HH-HH v"}
+ h{"HH-HH v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"MM.y - MM.y"}
+ y{"MM.y - MM.y"}
+ }
+ yMEd{
+ M{"E, dd.MM.y - E, dd.MM.y"}
+ d{"E, dd.MM.y - E, dd.MM.y"}
+ y{"E, dd.MM.y - E, dd.MM.y"}
+ }
+ yMMM{
+ M{"MMM-MMM y"}
+ y{"MMM y - MMM y"}
+ }
+ yMMMEd{
+ M{"E, d. MMM - E, d. MMM y"}
+ d{"E, d. - E, d. MMM y"}
+ y{"E, d. MMM y - E, d. MMM y"}
+ }
+ yMMMM{
+ M{"MM – MM.y"}
+ y{"MM.y – MM.y"}
+ }
+ yMMMd{
+ M{"d. MMM - d. MMM y"}
+ d{"d.-d. MMM y"}
+ y{"d. MMM y - d. MMM y"}
+ }
+ yMd{
+ M{"dd.MM.y - dd.MM.y"}
+ d{"dd.MM.y - dd.MM.y"}
+ y{"dd.MM.y - dd.MM.y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"am",
@@ -52,7 +181,7 @@
"HH:mm",
"EEEE, 'ils' d 'da' MMMM y",
"d 'da' MMMM y",
- "dd-MM-yyyy",
+ "dd-MM-y",
"dd-MM-yy",
"{1} {0}",
"{1} {0}",
@@ -81,18 +210,15 @@
mmss{"mm:ss"}
ms{"mm:ss"}
y{"y"}
- yM{"yyyy-M"}
- yMEd{"E, yyyy-M-d"}
+ yM{"y-M"}
+ yMEd{"E, y-M-d"}
+ yMM{"MM.y"}
yMMM{"MMM y"}
yMMMEd{"E, d. MMM y"}
yMMMM{"MMMM y"}
+ yMMdd{"dd.MM.y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"MM.yy"}
- yyMMM{"MMM yy"}
- yyMMdd{"dd.MM.yy"}
- yyyy{"y"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -137,48 +263,6 @@
"suenter Cristus",
}
}
- fields{
- day{
- dn{"Tag"}
- relative{
- "-1"{"ier"}
- "-2"{"stersas"}
- "0"{"oz"}
- "1"{"damaun"}
- "2"{"puschmaun"}
- }
- }
- dayperiod{
- dn{"mesadad dal di"}
- }
- era{
- dn{"epoca"}
- }
- hour{
- dn{"ura"}
- }
- minute{
- dn{"minuta"}
- }
- month{
- dn{"mais"}
- }
- second{
- dn{"secunda"}
- }
- week{
- dn{"emna"}
- }
- weekday{
- dn{"di da l'emna"}
- }
- year{
- dn{"onn"}
- }
- zone{
- dn{"zona d'urari"}
- }
- }
intervalFormats{
M{
M{"M.-M."}
@@ -228,13 +312,13 @@
y{"y-y"}
}
yM{
- M{"MM.yy - MM.yy"}
- y{"MM.yy - MM.yy"}
+ M{"MM.y - MM.y"}
+ y{"MM.y - MM.y"}
}
yMEd{
- M{"E, dd.MM.yy - E, dd.MM.yy"}
- d{"E, dd.MM.yy - E, dd.MM.yy"}
- y{"E, dd.MM.yy - E, dd.MM.yy"}
+ M{"E, dd.MM.y - E, dd.MM.y"}
+ d{"E, dd.MM.y - E, dd.MM.y"}
+ y{"E, dd.MM.y - E, dd.MM.y"}
}
yMMM{
M{"MMM-MMM y"}
@@ -246,8 +330,8 @@
y{"E, d. MMM y - E, d. MMM y"}
}
yMMMM{
- M{"MM – MM.yyyy"}
- y{"MM.yyyy – MM.yyyy"}
+ M{"MM – MM.y"}
+ y{"MM.y – MM.y"}
}
yMMMd{
M{"d. MMM - d. MMM y"}
@@ -255,9 +339,9 @@
y{"d. MMM y - d. MMM y"}
}
yMd{
- M{"dd.MM.yy - dd.MM.yy"}
- d{"dd.MM.yy - dd.MM.yy"}
- y{"dd.MM.yy - dd.MM.yy"}
+ M{"dd.MM.y - dd.MM.y"}
+ d{"dd.MM.y - dd.MM.y"}
+ y{"dd.MM.y - dd.MM.y"}
}
}
monthNames{
@@ -326,6 +410,48 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"Tag"}
+ relative{
+ "-1"{"ier"}
+ "-2"{"stersas"}
+ "0"{"oz"}
+ "1"{"damaun"}
+ "2"{"puschmaun"}
+ }
+ }
+ dayperiod{
+ dn{"mesadad dal di"}
+ }
+ era{
+ dn{"epoca"}
+ }
+ hour{
+ dn{"ura"}
+ }
+ minute{
+ dn{"minuta"}
+ }
+ month{
+ dn{"mais"}
+ }
+ second{
+ dn{"secunda"}
+ }
+ week{
+ dn{"emna"}
+ }
+ weekday{
+ dn{"di da l'emna"}
+ }
+ year{
+ dn{"onn"}
+ }
+ zone{
+ dn{"zona d'urari"}
+ }
+ }
measurementSystemNames{
US{"unitads americans"}
metric{"unitads metrics"}
diff --git a/data/locales/rm_CH.txt b/data/locales/rm_CH.txt
index 605f05d..991cb05 100755
--- a/data/locales/rm_CH.txt
+++ b/data/locales/rm_CH.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rm_CH.xml
// *
// ***************************************************************************
rm_CH{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/rn.txt b/data/locales/rn.txt
index 7794764..ce80528 100755
--- a/data/locales/rn.txt
+++ b/data/locales/rn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rn.xml
// *
@@ -28,8 +28,49 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d/M/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"Z.MU.",
@@ -43,7 +84,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM y",
- "d/M/yyyy",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -106,46 +147,6 @@
"Nyuma ya Yezu",
}
}
- fields{
- day{
- dn{"Umusi"}
- relative{
- "-1"{"Ejo (haheze)"}
- "0"{"Uyu musi"}
- "1"{"Ejo (hazoza)"}
- }
- }
- dayperiod{
- dn{"M.s/N.s"}
- }
- era{
- dn{"Igihe"}
- }
- hour{
- dn{"Isaha"}
- }
- minute{
- dn{"Umunota"}
- }
- month{
- dn{"Ukwezi"}
- }
- second{
- dn{"Isegonda"}
- }
- week{
- dn{"Indwi, Iyinga"}
- }
- weekday{
- dn{"Iminsi y'iyinga"}
- }
- year{
- dn{"Umwaka"}
- }
- zone{
- dn{"Isaha yo mukarere"}
- }
- }
monthNames{
format{
abbreviated{
@@ -202,4 +203,44 @@
quotationEnd{"”"}
quotationStart{"”"}
}
+ fields{
+ day{
+ dn{"Umusi"}
+ relative{
+ "-1"{"Ejo (haheze)"}
+ "0"{"Uyu musi"}
+ "1"{"Ejo (hazoza)"}
+ }
+ }
+ dayperiod{
+ dn{"M.s/N.s"}
+ }
+ era{
+ dn{"Igihe"}
+ }
+ hour{
+ dn{"Isaha"}
+ }
+ minute{
+ dn{"Umunota"}
+ }
+ month{
+ dn{"Ukwezi"}
+ }
+ second{
+ dn{"Isegonda"}
+ }
+ week{
+ dn{"Indwi, Iyinga"}
+ }
+ weekday{
+ dn{"Iminsi y'iyinga"}
+ }
+ year{
+ dn{"Umwaka"}
+ }
+ zone{
+ dn{"Isaha yo mukarere"}
+ }
+ }
}
diff --git a/data/locales/rn_BI.txt b/data/locales/rn_BI.txt
index 05911be..399d8a2 100755
--- a/data/locales/rn_BI.txt
+++ b/data/locales/rn_BI.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rn_BI.xml
// *
// ***************************************************************************
rn_BI{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ro.txt b/data/locales/ro.txt
index 861768f..e3c271b 100644
--- a/data/locales/ro.txt
+++ b/data/locales/ro.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ro.xml
// *
@@ -13,7 +13,7 @@
AuxExemplarCharacters{"[á à å ä ç é è ê ë ñ ö q ş ţ ü w y]"}
ExemplarCharacters{"[a ă â b c d e f g h i î j k l m n o p r s ș t ț u v x z]"}
ExemplarCharactersIndex{"[A Ă Â B C D E F G H I Î J K L M N O P Q R S Ș T Ț U V W X Y Z]"}
- ExemplarCharactersPunctuation{"[\- ‐ – — , ; \: ! ? . … ' ‘ \" “ ” „ « » ( ) \[ \] @ * /]"}
+ ExemplarCharactersPunctuation{"[\\- ‐ – — , ; \\: ! ? . … ' ‘ \u0022 “ ” „ « » ( ) \\[ \\] @ * /]"}
LocaleScript{
"Latn",
}
@@ -167,7 +167,7 @@
}
}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
DateTimePatterns{
@@ -178,7 +178,7 @@
"EEEE, d MMMM, y G",
"d MMMM y G",
"d MMM y G",
- "d/M/yyyy",
+ "d/M/y",
"{1}, {0}",
"{1}, {0}",
"{1}, {0}",
@@ -262,20 +262,16 @@
}
}
}
- gregorian{
- AmPmMarkers{
- "AM",
- "PM",
- }
+ generic{
DateTimePatterns{
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE, d MMMM y",
- "d MMMM y",
- "dd.MM.yyyy",
- "dd.MM.yyyy",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "dd.MM.y G",
+ "dd.MM.y GGGGG",
"{1}, {0}",
"{1}, {0}",
"{1}, {0}",
@@ -301,19 +297,162 @@
hms{"h:mm:ss a"}
ms{"mm:ss"}
y{"y"}
- yM{"MM.yyyy"}
- yMEd{"E, dd.MM.yyyy"}
+ yM{"MM.y"}
+ yMEd{"E, dd.MM.y"}
+ yMM{"MM.y"}
yMMM{"MMM y"}
yMMMEd{"E, d MMM y"}
yMMMM{"MMMM y"}
yMMMd{"d MMM y"}
- yMd{"dd.MM.yyyy"}
+ yMd{"dd.MM.y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"MM.yy"}
- yyMMM{"MMM yy"}
- yyyyMM{"MM.yyyy"}
- yyyyMMMM{"MMMM y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH-HH"}
+ }
+ Hm{
+ H{"HH:mm-HH:mm"}
+ m{"HH:mm-HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm-HH:mm v"}
+ m{"HH:mm-HH:mm v"}
+ }
+ Hv{
+ H{"HH-HH v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E, dd.MM - E, dd.MM"}
+ d{"E, dd.MM - E, dd.MM"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"E, d MMM - E, d MMM"}
+ d{"E, d MMM - E, d MMM"}
+ }
+ MMMd{
+ M{"d MMM - d MMM"}
+ d{"d-d MMM"}
+ }
+ Md{
+ M{"dd.MM - dd.MM"}
+ d{"dd.MM - dd.MM"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a - h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h:mm a - h:mm a"}
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ a{"h:mm a - h:mm a v"}
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"h a - h a v"}
+ h{"h-h a v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"MM.y - MM.y"}
+ y{"MM.y - MM.y"}
+ }
+ yMEd{
+ M{"E, dd.MM.y - E, dd.MM.y"}
+ d{"E, dd.MM.y - E, dd.MM.y"}
+ y{"E, dd.MM.y - E, dd.MM.y"}
+ }
+ yMMM{
+ M{"MMM-MMM y"}
+ y{"MMM y - MMM y"}
+ }
+ yMMMEd{
+ M{"E, d MMM - E, d MMM y"}
+ d{"E, d MMM - E, d MMM y"}
+ y{"E, d MMM y - E, d MMM y"}
+ }
+ yMMMM{
+ M{"MMMM-MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"d MMM - d MMM y"}
+ d{"d-d MMM y"}
+ y{"d MMM y - d MMM y"}
+ }
+ yMd{
+ M{"dd.MM.y - dd.MM.y"}
+ d{"dd.MM.y - dd.MM.y"}
+ y{"dd.MM.y - dd.MM.y"}
+ }
+ }
+ }
+ gregorian{
+ AmPmMarkers{
+ "AM",
+ "PM",
+ }
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d MMMM y",
+ "d MMMM y",
+ "dd.MM.y",
+ "dd.MM.y",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, dd.MM"}
+ MMM{"LLL"}
+ MMMEd{"E, d MMM"}
+ MMMMEd{"E, d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMdd{"dd.MM"}
+ Md{"dd.MM"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"MM.y"}
+ yMEd{"E, dd.MM.y"}
+ yMM{"MM.y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, d MMM y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"dd.MM.y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
}
dayNames{
format{
@@ -403,63 +542,6 @@
"după Hristos",
}
}
- fields{
- day{
- dn{"zi"}
- relative{
- "-1"{"ieri"}
- "-2"{"alaltăieri"}
- "0"{"azi"}
- "1"{"mâine"}
- "2"{"poimâine"}
- }
- }
- dayperiod{
- dn{"perioada zilei"}
- }
- era{
- dn{"eră"}
- }
- hour{
- dn{"oră"}
- }
- minute{
- dn{"minut"}
- }
- month{
- dn{"lună"}
- relative{
- "-1"{"Luna trecută"}
- "0"{"Luna aceasta"}
- "1"{"Luna viitoare"}
- }
- }
- second{
- dn{"secundă"}
- }
- week{
- dn{"săptămână"}
- relative{
- "-1"{"Săptămâna trecută"}
- "0"{"Săptămâna aceasta"}
- "1"{"Săptămâna viitoare"}
- }
- }
- weekday{
- dn{"zi a săptămânii"}
- }
- year{
- dn{"an"}
- relative{
- "-1"{"Anul trecut"}
- "0"{"Anul acesta"}
- "1"{"Anul viitor"}
- }
- }
- zone{
- dn{"zonă"}
- }
- }
intervalFormats{
H{
H{"HH-HH"}
@@ -523,13 +605,13 @@
y{"y-y"}
}
yM{
- M{"MM.yyyy - MM.yyyy"}
- y{"MM.yyyy - MM.yyyy"}
+ M{"MM.y - MM.y"}
+ y{"MM.y - MM.y"}
}
yMEd{
- M{"E, dd.MM.yyyy - E, dd.MM.yyyy"}
- d{"E, dd.MM.yyyy - E, dd.MM.yyyy"}
- y{"E, dd.MM.yyyy - E, dd.MM.yyyy"}
+ M{"E, dd.MM.y - E, dd.MM.y"}
+ d{"E, dd.MM.y - E, dd.MM.y"}
+ y{"E, dd.MM.y - E, dd.MM.y"}
}
yMMM{
M{"MMM-MMM y"}
@@ -550,9 +632,9 @@
y{"d MMM y - d MMM y"}
}
yMd{
- M{"dd.MM.yyyy - dd.MM.yyyy"}
- d{"dd.MM.yyyy - dd.MM.yyyy"}
- y{"dd.MM.yyyy - dd.MM.yyyy"}
+ M{"dd.MM.y - dd.MM.y"}
+ d{"dd.MM.y - dd.MM.y"}
+ y{"dd.MM.y - dd.MM.y"}
}
}
monthNames{
@@ -762,7 +844,7 @@
}
islamic{
availableFormats{
- yMEd{"E, dd.MM.yyyy"}
+ yMEd{"E, dd.MM.y"}
}
}
}
@@ -772,6 +854,63 @@
quotationEnd{"”"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"zi"}
+ relative{
+ "-1"{"ieri"}
+ "-2"{"alaltăieri"}
+ "0"{"azi"}
+ "1"{"mâine"}
+ "2"{"poimâine"}
+ }
+ }
+ dayperiod{
+ dn{"perioada zilei"}
+ }
+ era{
+ dn{"eră"}
+ }
+ hour{
+ dn{"oră"}
+ }
+ minute{
+ dn{"minut"}
+ }
+ month{
+ dn{"lună"}
+ relative{
+ "-1"{"Luna trecută"}
+ "0"{"Luna aceasta"}
+ "1"{"Luna viitoare"}
+ }
+ }
+ second{
+ dn{"secundă"}
+ }
+ week{
+ dn{"săptămână"}
+ relative{
+ "-1"{"Săptămâna trecută"}
+ "0"{"Săptămâna aceasta"}
+ "1"{"Săptămâna viitoare"}
+ }
+ }
+ weekday{
+ dn{"zi a săptămânii"}
+ }
+ year{
+ dn{"an"}
+ relative{
+ "-1"{"Anul trecut"}
+ "0"{"Anul acesta"}
+ "1"{"Anul viitor"}
+ }
+ }
+ zone{
+ dn{"zonă"}
+ }
+ }
listPattern{
standard{
2{"{0} şi {1}"}
diff --git a/data/locales/ro_MD.txt b/data/locales/ro_MD.txt
index 2a4b0fe..95b19ca 100644
--- a/data/locales/ro_MD.txt
+++ b/data/locales/ro_MD.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ro_MD.xml
// *
// ***************************************************************************
ro_MD{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ro_RO.txt b/data/locales/ro_RO.txt
index 73e076c..f5edfb9 100644
--- a/data/locales/ro_RO.txt
+++ b/data/locales/ro_RO.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ro_RO.xml
// *
// ***************************************************************************
ro_RO{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/rof.txt b/data/locales/rof.txt
index a7c1c34..696c3d6 100755
--- a/data/locales/rof.txt
+++ b/data/locales/rof.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rof.xml
// *
@@ -23,8 +23,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"kang'ama",
@@ -38,7 +78,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -111,46 +151,6 @@
"Baada ya Mayesu",
}
}
- fields{
- day{
- dn{"Mfiri"}
- relative{
- "-1"{"Hiyo"}
- "0"{"Linu"}
- "1"{"Ng'ama"}
- }
- }
- dayperiod{
- dn{"Nkwaya"}
- }
- era{
- dn{"Kacha"}
- }
- hour{
- dn{"Isaa"}
- }
- minute{
- dn{"Dakika"}
- }
- month{
- dn{"Mweri"}
- }
- second{
- dn{"Sekunde"}
- }
- week{
- dn{"Iwiki"}
- }
- weekday{
- dn{"Mfiri a iwiki"}
- }
- year{
- dn{"Muaka"}
- }
- zone{
- dn{"Mfiri o saa"}
- }
- }
monthNames{
format{
abbreviated{
@@ -223,4 +223,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Mfiri"}
+ relative{
+ "-1"{"Hiyo"}
+ "0"{"Linu"}
+ "1"{"Ng'ama"}
+ }
+ }
+ dayperiod{
+ dn{"Nkwaya"}
+ }
+ era{
+ dn{"Kacha"}
+ }
+ hour{
+ dn{"Isaa"}
+ }
+ minute{
+ dn{"Dakika"}
+ }
+ month{
+ dn{"Mweri"}
+ }
+ second{
+ dn{"Sekunde"}
+ }
+ week{
+ dn{"Iwiki"}
+ }
+ weekday{
+ dn{"Mfiri a iwiki"}
+ }
+ year{
+ dn{"Muaka"}
+ }
+ zone{
+ dn{"Mfiri o saa"}
+ }
+ }
}
diff --git a/data/locales/rof_TZ.txt b/data/locales/rof_TZ.txt
index 8eb744f..47f1551 100755
--- a/data/locales/rof_TZ.txt
+++ b/data/locales/rof_TZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rof_TZ.xml
// *
// ***************************************************************************
rof_TZ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/root.txt b/data/locales/root.txt
index 542f554..ea0eb27 100644
--- a/data/locales/root.txt
+++ b/data/locales/root.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/root.xml
// *
@@ -12,7 +12,7 @@
root{
AuxExemplarCharacters{"[]"}
ExemplarCharacters{"[]"}
- ExemplarCharactersPunctuation{"[\- , ; \: ! ? . ( ) \[ \] \{ \}]"}
+ ExemplarCharactersPunctuation{"[\\- , ; \\: ! ? . ( ) \\[ \\] \\{ \\}]"}
LocaleScript{
"Zyyy",
}
@@ -113,65 +113,13 @@
297,
210,
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE, G y MMMM dd",
- "G y MMMM d",
- "G y MMM d",
- "GGGGG yyyy-MM-dd",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- appendItems{
- Day{"{0} ({2}: {1})"}
- Day-Of-Week{"{0} {1}"}
- Era{"{0} {1}"}
- Hour{"{0} ({2}: {1})"}
- Minute{"{0} ({2}: {1})"}
- Month{"{0} ({2}: {1})"}
- Quarter{"{0} ({2}: {1})"}
- Second{"{0} ({2}: {1})"}
- Timezone{"{0} {1}"}
- Week{"{0} ({2}: {1})"}
- Year{"{0} {1}"}
- }
- availableFormats{
- Ed{"d E"}
- Gy{"G y"}
- H{"HH"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E, M-d"}
- MMM{"LLL"}
- MMMEd{"E MMM d"}
- MMMd{"MMM d"}
- Md{"M-d"}
- d{"d"}
- h{"h a"}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- ms{"mm:ss"}
- y{"G y"}
- yM{"GGGGG yyyy-MM"}
- yMEd{"E, GGGGG yyyy-MM-dd"}
- yMMM{"G y MMM"}
- yMMMEd{"E, G y MMM d"}
- yMMMd{"G y MMM d"}
- yMd{"GGGGG yyyy-MM-dd"}
- yQQQ{"GGGGG y QQQ"}
- yQQQQ{"G y QQQQ"}
- }
+ DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+ appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+ availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
eras{
abbreviated{
@@ -180,7 +128,7 @@
narrow:alias{"/LOCALE/calendar/buddhist/eras/abbreviated"}
wide:alias{"/LOCALE/calendar/buddhist/eras/abbreviated"}
}
- intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
+ intervalFormats:alias{"/LOCALE/calendar/generic/intervalFormats"}
monthNames:alias{"/LOCALE/calendar/gregorian/monthNames"}
quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
}
@@ -191,10 +139,10 @@
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE, U MMMM dd",
+ "U MMMM d, EEEE",
"U MMMM d",
"U MMM d",
- "y-M-d",
+ "y-MM-dd",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -204,7 +152,7 @@
appendItems{
Day{"{0} ({2}: {1})"}
Day-Of-Week{"{0} {1}"}
- Era{"{0} {1}"}
+ Era{"{1} {0}"}
Hour{"{0} ({2}: {1})"}
Minute{"{0} ({2}: {1})"}
Month{"{0} ({2}: {1})"}
@@ -212,33 +160,39 @@
Second{"{0} ({2}: {1})"}
Timezone{"{0} {1}"}
Week{"{0} ({2}: {1})"}
- Year{"{0} {1}"}
+ Year{"{1} {0}"}
}
availableFormats{
- Ed{"d E"}
+ Ed{"d, E"}
+ Gy{"U"}
+ GyMMM{"U MMM"}
+ GyMMMEd{"U MMM d, E"}
+ GyMMMd{"U MMM d"}
H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
M{"L"}
- MEd{"E, M-d"}
+ MEd{"MM-dd, E"}
MMM{"LLL"}
- MMMEd{"E MMM d"}
+ MMMEd{"MMM d, E"}
MMMd{"MMM d"}
- Md{"M-d"}
+ Md{"MM-dd"}
d{"d"}
h{"h a"}
hm{"h:mm a"}
hms{"h:mm:ss a"}
ms{"mm:ss"}
y{"U"}
- yM{"y-M"}
- yMEd{"E, y-M-d"}
- yMMM{"U MMM"}
- yMMMEd{"E, U MMM d"}
- yMMMd{"U MMM d"}
- yMd{"y-M-d"}
- yQQQ{"U QQQ"}
- yQQQQ{"U QQQQ"}
+ yMd{"y-MM-dd"}
+ yyyy{"U"}
+ yyyyM{"y-MM"}
+ yyyyMEd{"y-MM-dd, E"}
+ yyyyMMM{"U MMM"}
+ yyyyMMMEd{"U MMM d, E"}
+ yyyyMMMd{"U MMM d"}
+ yyyyMd{"y-MM-dd"}
+ yyyyQQQ{"U QQQ"}
+ yyyyQQQQ{"U QQQQ"}
}
cyclicNameSets{
dayParts{
@@ -355,26 +309,26 @@
H{"HH–HH v"}
}
M{
- M{"M–M"}
+ M{"MM–MM"}
}
MEd{
- M{"E, MM-dd – E, MM-dd"}
- d{"E, MM-dd – E, MM-dd"}
+ M{"MM-dd, E – MM-dd, E"}
+ d{"MM-dd, E – MM-dd, E"}
}
MMM{
M{"LLL–LLL"}
}
MMMEd{
- M{"E, MM-d – E, MM-d"}
- d{"E, MM-d – E, MM-d"}
+ M{"MMM d, E – MMM d, E"}
+ d{"MMM d, E – MMM d, E"}
}
MMMd{
- M{"MM-d – MM-d"}
- d{"MM-d – d"}
+ M{"MMM d – MMM d"}
+ d{"MMM d–d"}
}
Md{
M{"MM-dd – MM-dd"}
- d{"MM-dd – dd"}
+ d{"MM-dd – MM-dd"}
}
d{
d{"d–d"}
@@ -399,46 +353,44 @@
h{"h–h a v"}
}
y{
- y{"y–y"}
+ y{"U–U"}
}
yM{
- M{"y-MM – MM"}
+ M{"y-MM – y-MM"}
y{"y-MM – y-MM"}
}
yMEd{
- M{"E, y-MM-dd – E, y-MM-dd"}
- d{"E, y-MM-dd – E, y-MM-dd"}
- y{"E, y-MM-dd – E, y-MM-dd"}
+ M{"y-MM-dd, E – y-MM-dd, E"}
+ d{"y-MM-dd, E – y-MM-dd, E"}
+ y{"y-MM-dd, E – y-MM-dd, E"}
}
yMMM{
- M{"U MMM – MMM"}
+ M{"U MMM–MMM"}
y{"U MMM – U MMM"}
}
yMMMEd{
- M{"E, U MMM-d – E, U MMM-d"}
- d{"E, U MMM-d – E, U MMM-d"}
- y{"E, U MMM-d – E, U MMM-d"}
+ M{"U MMM d, E – MMM d, E"}
+ d{"U MMM d, E – MMM d, E"}
+ y{"U MMM d, E – U MMM d, E"}
}
yMMMM{
- M{"U MMMM – MMMM"}
+ M{"U MMMM–MMMM"}
y{"U MMMM – U MMMM"}
}
yMMMd{
- M{"U MMM-d – MMM-d"}
- d{"U MMM-d – d"}
- y{"U MMM-d – U MMM-d"}
+ M{"U MMM d – MMM d"}
+ d{"U MMM d–d"}
+ y{"U MMM d – U MMM d"}
}
yMd{
- M{"y-MM-dd – MM-dd"}
- d{"y-MM-dd – dd"}
+ M{"y-MM-dd – y-MM-dd"}
+ d{"y-MM-dd – y-MM-dd"}
y{"y-MM-dd – y-MM-dd"}
}
}
monthNames{
- default{"format"}
format{
abbreviated:alias{"/LOCALE/calendar/chinese/monthNames/format/wide"}
- default{"wide"}
narrow:alias{"/LOCALE/calendar/chinese/monthNames/stand-alone/narrow"}
wide{
"1",
@@ -499,9 +451,9 @@
}
coptic{
AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
- DateTimePatterns:alias{"/LOCALE/calendar/gregorian/DateTimePatterns"}
- appendItems:alias{"/LOCALE/calendar/gregorian/appendItems"}
- availableFormats:alias{"/LOCALE/calendar/gregorian/availableFormats"}
+ DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+ appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+ availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
eras{
abbreviated{
@@ -511,12 +463,10 @@
narrow:alias{"/LOCALE/calendar/coptic/eras/abbreviated"}
wide:alias{"/LOCALE/calendar/coptic/eras/abbreviated"}
}
- intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
+ intervalFormats:alias{"/LOCALE/calendar/generic/intervalFormats"}
monthNames{
- default{"format"}
format{
abbreviated:alias{"/LOCALE/calendar/coptic/monthNames/format/wide"}
- default{"wide"}
narrow:alias{"/LOCALE/calendar/coptic/monthNames/stand-alone/narrow"}
wide{
"Tout",
@@ -571,9 +521,9 @@
default{"gregorian"}
ethiopic{
AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
- DateTimePatterns:alias{"/LOCALE/calendar/gregorian/DateTimePatterns"}
- appendItems:alias{"/LOCALE/calendar/gregorian/appendItems"}
- availableFormats:alias{"/LOCALE/calendar/gregorian/availableFormats"}
+ DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+ appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+ availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
eras{
abbreviated{
@@ -583,12 +533,10 @@
narrow:alias{"/LOCALE/calendar/ethiopic/eras/abbreviated"}
wide:alias{"/LOCALE/calendar/ethiopic/eras/abbreviated"}
}
- intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
+ intervalFormats:alias{"/LOCALE/calendar/generic/intervalFormats"}
monthNames{
- default{"format"}
format{
abbreviated:alias{"/LOCALE/calendar/ethiopic/monthNames/format/wide"}
- default{"wide"}
narrow:alias{"/LOCALE/calendar/ethiopic/monthNames/stand-alone/narrow"}
wide{
"Meskerem",
@@ -629,11 +577,11 @@
quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
}
ethiopic-amete-alem{
- AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
- DateTimePatterns:alias{"/LOCALE/calendar/gregorian/DateTimePatterns"}
- appendItems:alias{"/LOCALE/calendar/gregorian/appendItems"}
- availableFormats:alias{"/LOCALE/calendar/gregorian/availableFormats"}
- dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
+ AmPmMarkers:alias{"/LOCALE/calendar/ethiopic/AmPmMarkers"}
+ DateTimePatterns:alias{"/LOCALE/calendar/ethiopic/DateTimePatterns"}
+ appendItems:alias{"/LOCALE/calendar/ethiopic/appendItems"}
+ availableFormats:alias{"/LOCALE/calendar/ethiopic/availableFormats"}
+ dayNames:alias{"/LOCALE/calendar/ethiopic/dayNames"}
eras{
abbreviated{
"ERA0",
@@ -641,24 +589,21 @@
narrow:alias{"/LOCALE/calendar/ethiopic-amete-alem/eras/abbreviated"}
wide:alias{"/LOCALE/calendar/ethiopic-amete-alem/eras/abbreviated"}
}
- intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
+ intervalFormats:alias{"/LOCALE/calendar/ethiopic/intervalFormats"}
monthNames:alias{"/LOCALE/calendar/ethiopic/monthNames"}
- quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
+ quarters:alias{"/LOCALE/calendar/ethiopic/quarters"}
}
- gregorian{
- AmPmMarkers{
- "AM",
- "PM",
- }
+ generic{
+ AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
DateTimePatterns{
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE, y MMMM dd",
- "y MMMM d",
- "y MMM d",
- "yyyy-MM-dd",
+ "G y MMMM d, EEEE",
+ "G y MMMM d",
+ "G y MMM d",
+ "GGGGG y-MM-dd",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -668,7 +613,7 @@
appendItems{
Day{"{0} ({2}: {1})"}
Day-Of-Week{"{0} {1}"}
- Era{"{0} {1}"}
+ Era{"{1} {0}"}
Hour{"{0} ({2}: {1})"}
Minute{"{0} ({2}: {1})"}
Month{"{0} ({2}: {1})"}
@@ -676,113 +621,47 @@
Second{"{0} ({2}: {1})"}
Timezone{"{0} {1}"}
Week{"{0} ({2}: {1})"}
- Year{"{0} {1}"}
+ Year{"{1} {0}"}
}
availableFormats{
- Ed{"d E"}
+ Ed{"d, E"}
+ Gy{"G y"}
+ GyMMM{"G y MMM"}
+ GyMMMEd{"G y MMM d, E"}
+ GyMMMd{"G y MMM d"}
H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
M{"L"}
- MEd{"E, M-d"}
+ MEd{"MM-dd, E"}
MMM{"LLL"}
- MMMEd{"E MMM d"}
+ MMMEd{"MMM d, E"}
MMMd{"MMM d"}
- Md{"M-d"}
+ Md{"MM-dd"}
d{"d"}
h{"h a"}
hm{"h:mm a"}
hms{"h:mm:ss a"}
ms{"mm:ss"}
- y{"y"}
- yM{"y-M"}
- yMEd{"E, y-M-d"}
- yMMM{"y MMM"}
- yMMMEd{"E, y MMM d"}
- yMMMd{"y MMM d"}
- yMd{"y-M-d"}
- yQQQ{"y QQQ"}
- yQQQQ{"y QQQQ"}
+ y{"G y"}
+ yyyy{"G y"}
+ yyyyM{"GGGGG y-MM"}
+ yyyyMEd{"GGGGG y-MM-dd, E"}
+ yyyyMMM{"G y MMM"}
+ yyyyMMMEd{"G y MMM d, E"}
+ yyyyMMMd{"G y MMM d"}
+ yyyyMd{"GGGGG y-MM-dd"}
+ yyyyQQQ{"G y QQQ"}
+ yyyyQQQQ{"G y QQQQ"}
}
- dayNames{
- default{"format"}
- format{
- abbreviated:alias{"/LOCALE/calendar/gregorian/dayNames/format/wide"}
- default{"wide"}
- narrow:alias{"/LOCALE/calendar/gregorian/dayNames/stand-alone/narrow"}
- short:alias{"/LOCALE/calendar/gregorian/dayNames/format/abbreviated"}
- wide{
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7",
- }
- }
- stand-alone{
- abbreviated:alias{"/LOCALE/calendar/gregorian/dayNames/format/abbreviated"}
- narrow{
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7",
- }
- short:alias{"/LOCALE/calendar/gregorian/dayNames/format/short"}
- wide:alias{"/LOCALE/calendar/gregorian/dayNames/format/wide"}
- }
- }
+ dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
eras{
abbreviated{
- "BCE",
- "CE",
+ "ERA0",
+ "ERA1",
}
- narrow:alias{"/LOCALE/calendar/gregorian/eras/abbreviated"}
- wide:alias{"/LOCALE/calendar/gregorian/eras/abbreviated"}
- }
- fields{
- day{
- dn{"Day"}
- relative{
- "-1"{"Yesterday"}
- "0"{"Today"}
- "1"{"Tomorrow"}
- }
- }
- dayperiod{
- dn{"Dayperiod"}
- }
- era{
- dn{"Era"}
- }
- hour{
- dn{"Hour"}
- }
- minute{
- dn{"Minute"}
- }
- month{
- dn{"Month"}
- }
- second{
- dn{"Second"}
- }
- week{
- dn{"Week"}
- }
- weekday{
- dn{"Day of the Week"}
- }
- year{
- dn{"Year"}
- }
- zone{
- dn{"Zone"}
- }
+ narrow:alias{"/LOCALE/calendar/generic/eras/abbreviated"}
+ wide:alias{"/LOCALE/calendar/generic/eras/abbreviated"}
}
intervalFormats{
H{
@@ -800,26 +679,262 @@
H{"HH–HH v"}
}
M{
- M{"M–M"}
+ M{"MM–MM"}
}
MEd{
- M{"E, MM-dd – E, MM-dd"}
- d{"E, MM-dd – E, MM-dd"}
+ M{"MM-dd, E – MM-dd, E"}
+ d{"MM-dd, E – MM-dd, E"}
}
MMM{
M{"LLL–LLL"}
}
MMMEd{
- M{"E, MM-d – E, MM-d"}
- d{"E, MM-d – E, MM-d"}
+ M{"MMM d, E – MMM d, E"}
+ d{"MMM d, E – MMM d, E"}
}
MMMd{
- M{"MM-d – MM-d"}
- d{"MM-d – d"}
+ M{"MMM d – MMM d"}
+ d{"MMM d–d"}
}
Md{
M{"MM-dd – MM-dd"}
- d{"MM-dd – dd"}
+ d{"MM-dd – MM-dd"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"G y–y"}
+ }
+ yM{
+ M{"GGGGG y-MM – y-MM"}
+ y{"GGGGG y-MM – y-MM"}
+ }
+ yMEd{
+ M{"GGGGG y-MM-dd, E – y-MM-dd, E"}
+ d{"GGGGG y-MM-dd, E – y-MM-dd, E"}
+ y{"GGGGG y-MM-dd, E – y-MM-dd, E"}
+ }
+ yMMM{
+ M{"G y MMM–MMM"}
+ y{"G y MMM – y MMM"}
+ }
+ yMMMEd{
+ M{"G y MMM d, E – MMM d, E"}
+ d{"G y MMM d, E – MMM d, E"}
+ y{"G y MMM d, E – y MMM d, E"}
+ }
+ yMMMM{
+ M{"G y MMMM–MMMM"}
+ y{"G y MMMM – y MMMM"}
+ }
+ yMMMd{
+ M{"G y MMM d – MMM d"}
+ d{"G y MMM d–d"}
+ y{"G y MMM d – y MMM d"}
+ }
+ yMd{
+ M{"GGGGG y-MM-dd – y-MM-dd"}
+ d{"GGGGG y-MM-dd – y-MM-dd"}
+ y{"GGGGG y-MM-dd – y-MM-dd"}
+ }
+ }
+ monthNames{
+ format{
+ abbreviated:alias{"/LOCALE/calendar/generic/monthNames/format/wide"}
+ narrow:alias{"/LOCALE/calendar/generic/monthNames/stand-alone/narrow"}
+ wide{
+ "1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+ "11",
+ "12",
+ }
+ }
+ stand-alone{
+ abbreviated:alias{"/LOCALE/calendar/generic/monthNames/format/abbreviated"}
+ narrow{
+ "1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+ "11",
+ "12",
+ }
+ wide:alias{"/LOCALE/calendar/generic/monthNames/format/wide"}
+ }
+ }
+ quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
+ }
+ gregorian{
+ AmPmMarkers{
+ "AM",
+ "PM",
+ }
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "y MMMM d, EEEE",
+ "y MMMM d",
+ "y MMM d",
+ "y-MM-dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ appendItems{
+ Day{"{0} ({2}: {1})"}
+ Day-Of-Week{"{0} {1}"}
+ Era{"{1} {0}"}
+ Hour{"{0} ({2}: {1})"}
+ Minute{"{0} ({2}: {1})"}
+ Month{"{0} ({2}: {1})"}
+ Quarter{"{0} ({2}: {1})"}
+ Second{"{0} ({2}: {1})"}
+ Timezone{"{0} {1}"}
+ Week{"{0} ({2}: {1})"}
+ Year{"{1} {0}"}
+ }
+ availableFormats{
+ Ed{"d, E"}
+ Gy{"G y"}
+ GyMMM{"G y MMM"}
+ GyMMMEd{"G y MMM d, E"}
+ GyMMMd{"G y MMM d"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"MM-dd, E"}
+ MMM{"LLL"}
+ MMMEd{"MMM d, E"}
+ MMMd{"MMM d"}
+ Md{"MM-dd"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"y-MM"}
+ yMEd{"y-MM-dd, E"}
+ yMMM{"y MMM"}
+ yMMMEd{"y MMM d, E"}
+ yMMMd{"y MMM d"}
+ yMd{"y-MM-dd"}
+ yQQQ{"y QQQ"}
+ yQQQQ{"y QQQQ"}
+ }
+ dayNames{
+ format{
+ abbreviated:alias{"/LOCALE/calendar/gregorian/dayNames/format/wide"}
+ narrow:alias{"/LOCALE/calendar/gregorian/dayNames/stand-alone/narrow"}
+ short:alias{"/LOCALE/calendar/gregorian/dayNames/format/abbreviated"}
+ wide{
+ "Sun",
+ "Mon",
+ "Tue",
+ "Wed",
+ "Thu",
+ "Fri",
+ "Sat",
+ }
+ }
+ stand-alone{
+ abbreviated:alias{"/LOCALE/calendar/gregorian/dayNames/format/abbreviated"}
+ narrow{
+ "S",
+ "M",
+ "T",
+ "W",
+ "T",
+ "F",
+ "S",
+ }
+ short:alias{"/LOCALE/calendar/gregorian/dayNames/format/short"}
+ wide:alias{"/LOCALE/calendar/gregorian/dayNames/format/wide"}
+ }
+ }
+ eras{
+ abbreviated{
+ "BCE",
+ "CE",
+ }
+ narrow:alias{"/LOCALE/calendar/gregorian/eras/abbreviated"}
+ wide:alias{"/LOCALE/calendar/gregorian/eras/abbreviated"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"MM–MM"}
+ }
+ MEd{
+ M{"MM-dd, E – MM-dd, E"}
+ d{"MM-dd, E – MM-dd, E"}
+ }
+ MMM{
+ M{"LLL–LLL"}
+ }
+ MMMEd{
+ M{"MMM d, E – MMM d, E"}
+ d{"MMM d, E – MMM d, E"}
+ }
+ MMMd{
+ M{"MMM d – MMM d"}
+ d{"MMM d–d"}
+ }
+ Md{
+ M{"MM-dd – MM-dd"}
+ d{"MM-dd – MM-dd"}
}
d{
d{"d–d"}
@@ -847,43 +962,41 @@
y{"y–y"}
}
yM{
- M{"yyyy-MM – MM"}
- y{"yyyy-MM – yyyy-MM"}
+ M{"y-MM – y-MM"}
+ y{"y-MM – y-MM"}
}
yMEd{
- M{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
- d{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
- y{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
+ M{"y-MM-dd, E – y-MM-dd, E"}
+ d{"y-MM-dd, E – y-MM-dd, E"}
+ y{"y-MM-dd, E – y-MM-dd, E"}
}
yMMM{
- M{"yyyy-MM – MM"}
- y{"yyyy-MM – yyyy-MM"}
+ M{"y MMM–MMM"}
+ y{"y MMM – y MMM"}
}
yMMMEd{
- M{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
- d{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
- y{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
+ M{"y MMM d, E – MMM d, E"}
+ d{"y MMM d, E – MMM d, E"}
+ y{"y MMM d, E – y MMM d, E"}
}
yMMMM{
- M{"yyyy-MM – MM"}
- y{"yyyy-MM – yyyy-MM"}
+ M{"y MMMM–MMMM"}
+ y{"y MMMM – y MMMM"}
}
yMMMd{
- M{"yyyy-MM-dd – MM-d"}
- d{"yyyy-MM-d – d"}
- y{"yyyy-MM-dd – yyyy-MM-dd"}
+ M{"y MMM d – MMM d"}
+ d{"y MMM d–d"}
+ y{"y MMM d – y MMM d"}
}
yMd{
- M{"yyyy-MM-dd – MM-dd"}
- d{"yyyy-MM-dd – dd"}
- y{"yyyy-MM-dd – yyyy-MM-dd"}
+ M{"y-MM-dd – y-MM-dd"}
+ d{"y-MM-dd – y-MM-dd"}
+ y{"y-MM-dd – y-MM-dd"}
}
}
monthNames{
- default{"format"}
format{
abbreviated:alias{"/LOCALE/calendar/gregorian/monthNames/format/wide"}
- default{"wide"}
narrow:alias{"/LOCALE/calendar/gregorian/monthNames/stand-alone/narrow"}
wide{
"1",
@@ -944,9 +1057,9 @@
}
hebrew{
AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
- DateTimePatterns:alias{"/LOCALE/calendar/gregorian/DateTimePatterns"}
- appendItems:alias{"/LOCALE/calendar/gregorian/appendItems"}
- availableFormats:alias{"/LOCALE/calendar/gregorian/availableFormats"}
+ DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+ appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+ availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
eras{
abbreviated{
@@ -955,27 +1068,11 @@
narrow:alias{"/LOCALE/calendar/hebrew/eras/abbreviated"}
wide:alias{"/LOCALE/calendar/hebrew/eras/abbreviated"}
}
- intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
+ intervalFormats:alias{"/LOCALE/calendar/generic/intervalFormats"}
monthNames{
- default{"format"}
format{
abbreviated:alias{"/LOCALE/calendar/hebrew/monthNames/format/wide"}
- default{"wide"}
- narrow{
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7",
- "8",
- "9",
- "10",
- "11",
- "12",
- "13",
- }
+ narrow:alias{"/LOCALE/calendar/hebrew/monthNames/stand-alone/narrow"}
wide{
"Tishri",
"Heshvan",
@@ -995,7 +1092,21 @@
}
stand-alone{
abbreviated:alias{"/LOCALE/calendar/hebrew/monthNames/format/abbreviated"}
- narrow:alias{"/LOCALE/calendar/hebrew/monthNames/format/narrow"}
+ narrow{
+ "1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+ "11",
+ "12",
+ "13",
+ }
wide:alias{"/LOCALE/calendar/hebrew/monthNames/format/wide"}
}
}
@@ -1003,9 +1114,9 @@
}
indian{
AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
- DateTimePatterns:alias{"/LOCALE/calendar/gregorian/DateTimePatterns"}
- appendItems:alias{"/LOCALE/calendar/gregorian/appendItems"}
- availableFormats:alias{"/LOCALE/calendar/gregorian/availableFormats"}
+ DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+ appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+ availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
eras{
abbreviated{
@@ -1014,12 +1125,10 @@
narrow:alias{"/LOCALE/calendar/indian/eras/abbreviated"}
wide:alias{"/LOCALE/calendar/indian/eras/abbreviated"}
}
- intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
+ intervalFormats:alias{"/LOCALE/calendar/generic/intervalFormats"}
monthNames{
- default{"format"}
format{
abbreviated:alias{"/LOCALE/calendar/indian/monthNames/format/wide"}
- default{"wide"}
narrow:alias{"/LOCALE/calendar/indian/monthNames/stand-alone/narrow"}
wide{
"Chaitra",
@@ -1059,9 +1168,9 @@
}
islamic{
AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
- DateTimePatterns:alias{"/LOCALE/calendar/gregorian/DateTimePatterns"}
- appendItems:alias{"/LOCALE/calendar/gregorian/appendItems"}
- availableFormats:alias{"/LOCALE/calendar/gregorian/availableFormats"}
+ DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+ appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+ availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
eras{
abbreviated{
@@ -1070,9 +1179,8 @@
narrow:alias{"/LOCALE/calendar/islamic/eras/abbreviated"}
wide:alias{"/LOCALE/calendar/islamic/eras/abbreviated"}
}
- intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
+ intervalFormats:alias{"/LOCALE/calendar/generic/intervalFormats"}
monthNames{
- default{"format"}
format{
abbreviated{
"Muh.",
@@ -1088,7 +1196,6 @@
"Dhuʻl-Q.",
"Dhuʻl-H.",
}
- default{"wide"}
narrow:alias{"/LOCALE/calendar/islamic/monthNames/stand-alone/narrow"}
wide{
"Muharram",
@@ -1139,62 +1246,9 @@
}
japanese{
AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE, G y MMMM dd",
- "G y MMMM d",
- "G y MMM d",
- "GGGGG yy-MM-dd",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- appendItems{
- Day{"{0} ({2}: {1})"}
- Day-Of-Week{"{0} {1}"}
- Era{"{0} {1}"}
- Hour{"{0} ({2}: {1})"}
- Minute{"{0} ({2}: {1})"}
- Month{"{0} ({2}: {1})"}
- Quarter{"{0} ({2}: {1})"}
- Second{"{0} ({2}: {1})"}
- Timezone{"{0} {1}"}
- Week{"{0} ({2}: {1})"}
- Year{"{0} {1}"}
- }
- availableFormats{
- Ed{"d E"}
- Gy{"G y"}
- H{"HH"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E, M-d"}
- MMM{"LLL"}
- MMMEd{"E MMM d"}
- MMMd{"MMM d"}
- Md{"M-d"}
- d{"d"}
- h{"h a"}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- ms{"mm:ss"}
- y{"G y"}
- yyyy{"G y"}
- yyyyM{"GGGGG yy-MM"}
- yyyyMEd{"E, GGGGG yy-MM-dd"}
- yyyyMMM{"G y MMM"}
- yyyyMMMEd{"E, G y MMM d"}
- yyyyMMMd{"G y MMM d"}
- yyyyMd{"GGGGG yy-MM-dd"}
- yyyyQQQ{"GGGGG y QQQ"}
- yyyyQQQQ{"G y QQQQ"}
- }
+ DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+ appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+ availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
eras{
abbreviated{
@@ -1220,7 +1274,7 @@
"Daidō (806-810)",
"Kōnin (810-824)",
"Tenchō (824-834)",
- "Shōwa (834-848)",
+ "Jōwa (834-848)",
"Kajō (848-851)",
"Ninju (851-854)",
"Saiko (854-857)",
@@ -1458,7 +1512,7 @@
"Daidō (806-810)",
"Kōnin (810-824)",
"Tenchō (824-834)",
- "Shōwa (834-848)",
+ "Jōwa (834-848)",
"Kajō (848-851)",
"Ninju (851-854)",
"Saiko (854-857)",
@@ -1675,14 +1729,15 @@
}
wide:alias{"/LOCALE/calendar/japanese/eras/abbreviated"}
}
+ intervalFormats:alias{"/LOCALE/calendar/generic/intervalFormats"}
monthNames:alias{"/LOCALE/calendar/gregorian/monthNames"}
quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
}
persian{
AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
- DateTimePatterns:alias{"/LOCALE/calendar/gregorian/DateTimePatterns"}
- appendItems:alias{"/LOCALE/calendar/gregorian/appendItems"}
- availableFormats:alias{"/LOCALE/calendar/gregorian/availableFormats"}
+ DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+ appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+ availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
eras{
abbreviated{
@@ -1691,12 +1746,10 @@
narrow:alias{"/LOCALE/calendar/persian/eras/abbreviated"}
wide:alias{"/LOCALE/calendar/persian/eras/abbreviated"}
}
- intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
+ intervalFormats:alias{"/LOCALE/calendar/generic/intervalFormats"}
monthNames{
- default{"format"}
format{
abbreviated:alias{"/LOCALE/calendar/persian/monthNames/format/wide"}
- default{"wide"}
narrow:alias{"/LOCALE/calendar/persian/monthNames/stand-alone/narrow"}
wide{
"Farvardin",
@@ -1736,62 +1789,9 @@
}
roc{
AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE, G y MMMM dd",
- "G y MMMM d",
- "G y MMM d",
- "GGGGG yyy-MM-dd",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- appendItems{
- Day{"{0} ({2}: {1})"}
- Day-Of-Week{"{0} {1}"}
- Era{"{0} {1}"}
- Hour{"{0} ({2}: {1})"}
- Minute{"{0} ({2}: {1})"}
- Month{"{0} ({2}: {1})"}
- Quarter{"{0} ({2}: {1})"}
- Second{"{0} ({2}: {1})"}
- Timezone{"{0} {1}"}
- Week{"{0} ({2}: {1})"}
- Year{"{0} {1}"}
- }
- availableFormats{
- Ed{"d E"}
- Gy{"G y"}
- H{"HH"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E, M-d"}
- MMM{"LLL"}
- MMMEd{"E MMM d"}
- MMMd{"MMM d"}
- Md{"M-d"}
- d{"d"}
- h{"h a"}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- ms{"mm:ss"}
- y{"G y"}
- yyyy{"G y"}
- yyyyM{"GGGGG yyy-MM"}
- yyyyMEd{"E, GGGGG yyy-MM-dd"}
- yyyyMMM{"G y MMM"}
- yyyyMMMEd{"E, G y MMM d"}
- yyyyMMMd{"G y MMM d"}
- yyyyMd{"GGGGG yyy-MM-dd"}
- yyyyQQQ{"GGGGG y QQQ"}
- yyyyQQQQ{"G y QQQQ"}
- }
+ DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+ appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+ availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
eras{
abbreviated{
@@ -1801,7 +1801,7 @@
narrow:alias{"/LOCALE/calendar/roc/eras/abbreviated"}
wide:alias{"/LOCALE/calendar/roc/eras/abbreviated"}
}
- intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
+ intervalFormats:alias{"/LOCALE/calendar/generic/intervalFormats"}
monthNames:alias{"/LOCALE/calendar/gregorian/monthNames"}
quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
}
@@ -1812,6 +1812,46 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Day"}
+ relative{
+ "-1"{"Yesterday"}
+ "0"{"Today"}
+ "1"{"Tomorrow"}
+ }
+ }
+ dayperiod{
+ dn{"Dayperiod"}
+ }
+ era{
+ dn{"Era"}
+ }
+ hour{
+ dn{"Hour"}
+ }
+ minute{
+ dn{"Minute"}
+ }
+ month{
+ dn{"Month"}
+ }
+ second{
+ dn{"Second"}
+ }
+ week{
+ dn{"Week"}
+ }
+ weekday{
+ dn{"Day of the Week"}
+ }
+ year{
+ dn{"Year"}
+ }
+ zone{
+ dn{"Zone"}
+ }
+ }
layout{
characters{"left-to-right"}
lines{"top-to-bottom"}
diff --git a/data/locales/ru.txt b/data/locales/ru.txt
index 282f79e..258d701 100644
--- a/data/locales/ru.txt
+++ b/data/locales/ru.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ru.xml
// *
@@ -10,10 +10,16 @@
* ICU <specials> source: <path>/xml/main/ru.xml
*/
ru{
- AuxExemplarCharacters{"[]"}
+ AuxExemplarCharacters{
+ "[{а\u0301} {е\u0301} {и\u0301} {о\u0301} {у\u0301} {ы\u0301} {э\u0301} {ю"
+ "\u0301} {я\u0301}]"
+ }
ExemplarCharacters{"[а б в г д е ё ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я]"}
ExemplarCharactersIndex{"[А Б В Г Д Е Ё Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ы Э Ю Я]"}
- ExemplarCharactersPunctuation{"[\- ‐ – — , ; \: ! ? . … ' ‘ ‚ \" “ „ « » ( ) \[ \] \{ \} § @ * / \& #]"}
+ ExemplarCharactersPunctuation{
+ "[\\- ‐ – — , ; \\: ! ? . … ' ‘ ‚ \u0022 “ „ « » ( ) \\[ \\] \\{ \\} § @ * / "
+ "\\& #]"
+ }
LocaleScript{
"Cyrl",
}
@@ -191,28 +197,38 @@
}
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
+ eras{
+ abbreviated{
+ "BE",
+ }
+ }
+ }
+ chinese{
DateTimePatterns{
"H:mm:ss zzzz",
"H:mm:ss z",
"H:mm:ss",
"H:mm",
- "EEEE, d MMMM y 'г'. G",
- "d MMMM y 'г'. G",
- "dd.MM.yyyy G",
- "dd.MM.yy G",
- "{1}, {0}",
- "{1}, {0}",
- "{1}, {0}",
- "{1}, {0}",
- "{1}, {0}",
+ "EEEE, d MMMM U",
+ "d MMMM U",
+ "dd.MM U",
+ "dd.MM.y",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
}
availableFormats{
E{"ccc"}
Ed{"E, d"}
- Gy{"y G"}
+ Gy{"U"}
+ GyMMM{"LLL U"}
+ GyMMMEd{"E, d MMM U"}
+ GyMMMd{"d MMM U"}
H{"H"}
Hm{"H:mm"}
Hms{"H:mm:ss"}
@@ -221,29 +237,24 @@
MMM{"LLL"}
MMMEd{"ccc, d MMM"}
MMMd{"d MMM"}
- MMdd{"dd.MM"}
Md{"dd.MM"}
d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
ms{"mm:ss"}
- y{"y G"}
- yM{"MM.y G"}
- yMEd{"E, dd.MM.y G"}
- yMMM{"LLL y G"}
- yMMMEd{"E, d MMM y G"}
- yMMMd{"d MMM y G"}
- yMd{"dd.MM.y G"}
- yQQQ{"QQQ y G"}
- yyMM{"MM.yy G"}
- yyMMM{"LLL yy G"}
- yyMMMEd{"E, d MMM yy G"}
- yyyy{"y G"}
- yyyyLLLL{"LLLL y G"}
- yyyyMM{"MM.yyyy G"}
- yyyyMMMM{"LLLL y G"}
- yyyyQQQQ{"QQQQ y 'г'. G"}
+ y{"U"}
+ yyyy{"U"}
+ yyyyM{"MM.y"}
+ yyyyMEd{"E, dd.MM.y"}
+ yyyyMMM{"LLL U"}
+ yyyyMMMEd{"E, d MMM U"}
+ yyyyMMMM{"LLLL U"}
+ yyyyMMMd{"d MMM U"}
+ yyyyMd{"dd.MM.y"}
+ yyyyQQQ{"QQQ U"}
+ yyyyQQQQ{"QQQQ U"}
}
- }
- chinese{
monthNames{
format{
abbreviated{
@@ -473,6 +484,154 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "H:mm:ss zzzz",
+ "H:mm:ss z",
+ "H:mm:ss",
+ "H:mm",
+ "EEEE, d MMMM y 'г'. G",
+ "d MMMM y 'г'. G",
+ "dd.MM.y G",
+ "dd.MM.y G",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ }
+ availableFormats{
+ E{"ccc"}
+ Ed{"E, d"}
+ Gy{"y G"}
+ GyMMM{"LLL y G"}
+ GyMMMEd{"E, d MMM y G"}
+ GyMMMd{"d MMM y G"}
+ H{"H"}
+ Hm{"H:mm"}
+ Hms{"H:mm:ss"}
+ M{"L"}
+ MEd{"E, dd.MM"}
+ MMM{"LLL"}
+ MMMEd{"ccc, d MMM"}
+ MMMd{"d MMM"}
+ Md{"dd.MM"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y G"}
+ yyyy{"y G"}
+ yyyyM{"MM.y G"}
+ yyyyMEd{"E, dd.MM.y G"}
+ yyyyMMM{"LLL y G"}
+ yyyyMMMEd{"E, d MMM y G"}
+ yyyyMMMM{"LLLL y G"}
+ yyyyMMMd{"d MMM y G"}
+ yyyyMd{"dd.MM.y G"}
+ yyyyQQQ{"QQQ y G"}
+ yyyyQQQQ{"QQQQ y 'г'. G"}
+ }
+ intervalFormats{
+ H{
+ H{"H-H"}
+ }
+ Hm{
+ H{"H:mm-H:mm"}
+ m{"H:mm-H:mm"}
+ }
+ Hmv{
+ H{"H:mm-H:mm v"}
+ m{"H:mm-H:mm v"}
+ }
+ Hv{
+ H{"H-H v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E, dd.MM - E, dd.MM"}
+ d{"E, dd.MM - E, dd.MM"}
+ }
+ MMM{
+ M{"LLL-MMM"}
+ }
+ MMMEd{
+ M{"ccc, d MMM - ccc, d MMM"}
+ d{"ccc, d - E, d MMM"}
+ }
+ MMMM{
+ M{"LLLL-LLLL"}
+ }
+ MMMd{
+ M{"d MMM - d MMM"}
+ d{"d-d MMM"}
+ }
+ Md{
+ M{"dd.MM - dd.MM"}
+ d{"dd.MM - dd.MM"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a - h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h:mm a - h:mm a"}
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ a{"h:mm a - h:mm a v"}
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"h a - h a v"}
+ h{"h-h a v"}
+ }
+ y{
+ y{"y-y G"}
+ }
+ yM{
+ M{"MM.y - MM.y G"}
+ y{"MM.y - MM.y G"}
+ }
+ yMEd{
+ M{"ccc, dd.MM.y - ccc, dd.MM.y G"}
+ d{"ccc, dd.MM.y - ccc, dd.MM.y G"}
+ y{"ccc, dd.MM.y - ccc, dd.MM.y G"}
+ }
+ yMMM{
+ M{"LLL-LLL y 'г'. G"}
+ y{"LLL y - LLL y 'г'. G"}
+ }
+ yMMMEd{
+ M{"ccc, d MMM - ccc, d MMM y 'г'. G"}
+ d{"ccc, d - ccc, d MMM y 'г'. G"}
+ y{"ccc, d MMM y - ccc, d MMM y 'г'. G"}
+ }
+ yMMMM{
+ M{"LLLL-LLLL y 'г'. G"}
+ y{"LLLL y - LLLL y 'г'. G"}
+ }
+ yMMMd{
+ M{"d MMM - d MMM y 'г'. G"}
+ d{"d-d MMM y 'г'. G"}
+ y{"d MMM y - d MMM y 'г'. G"}
+ }
+ yMd{
+ M{"dd.MM.y - dd.MM.y G"}
+ d{"dd.MM.y - dd.MM.y G"}
+ y{"dd.MM.y - dd.MM.y G"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"до полудня",
@@ -496,6 +655,10 @@
availableFormats{
E{"ccc"}
Ed{"ccc, d"}
+ Gy{"y G"}
+ GyMMM{"LLL y G"}
+ GyMMMEd{"E, d MMM y G"}
+ GyMMMd{"d MMM y 'г'. G"}
H{"H"}
Hm{"H:mm"}
Hms{"H:mm:ss"}
@@ -512,22 +675,17 @@
hms{"h:mm:ss a"}
ms{"mm:ss"}
y{"y"}
+ yLLLL{"LLLL y"}
yM{"MM.y"}
yMEd{"ccc, d.MM.y 'г'."}
+ yMM{"MM.y"}
yMMM{"LLL y"}
yMMMEd{"E, d MMM y"}
+ yMMMM{"LLLL y"}
yMMMd{"d MMM y 'г'."}
yMd{"dd.MM.y"}
yQQQ{"QQQ y 'г'."}
- yyMM{"MM.yy"}
- yyMMM{"LLL yy"}
- yyMMMEd{"E, d MMM yy"}
- yyQQQ{"QQQ yy"}
- yyyy{"y"}
- yyyyLLLL{"LLLL y"}
- yyyyMM{"MM.yyyy"}
- yyyyMMMM{"LLLL y"}
- yyyyQQQQ{"QQQQ y 'г'."}
+ yQQQQ{"QQQQ y 'г'."}
}
dayNames{
format{
@@ -621,63 +779,6 @@
"н.э.",
}
}
- fields{
- day{
- dn{"День"}
- relative{
- "-1"{"Вчера"}
- "-2"{"Позавчера"}
- "0"{"Сегодня"}
- "1"{"Завтра"}
- "2"{"Послезавтра"}
- }
- }
- dayperiod{
- dn{"ДП/ПП"}
- }
- era{
- dn{"Эра"}
- }
- hour{
- dn{"Час"}
- }
- minute{
- dn{"Минута"}
- }
- month{
- dn{"Месяц"}
- relative{
- "-1"{"В прошлом месяце"}
- "0"{"В этом месяце"}
- "1"{"В следующем месяце"}
- }
- }
- second{
- dn{"Секунда"}
- }
- week{
- dn{"Неделя"}
- relative{
- "-1"{"На прошлой неделе"}
- "0"{"На этой неделе"}
- "1"{"На следующей неделе"}
- }
- }
- weekday{
- dn{"День недели"}
- }
- year{
- dn{"Год"}
- relative{
- "-1"{"В прошлом году"}
- "0"{"В этом году"}
- "1"{"В следующем году"}
- }
- }
- zone{
- dn{"Часовой пояс"}
- }
- }
intervalFormats{
H{
H{"H-H"}
@@ -744,13 +845,13 @@
y{"y-y"}
}
yM{
- M{"MM.yy - MM.yy"}
- y{"MM.yy - MM.yy"}
+ M{"MM.y - MM.y"}
+ y{"MM.y - MM.y"}
}
yMEd{
- M{"ccc, dd.MM.yy - ccc, dd.MM.yy"}
- d{"ccc, dd.MM.yy - ccc, dd.MM.yy"}
- y{"ccc, dd.MM.yy - ccc, dd.MM.yy"}
+ M{"ccc, dd.MM.y - ccc, dd.MM.y"}
+ d{"ccc, dd.MM.y - ccc, dd.MM.y"}
+ y{"ccc, dd.MM.y - ccc, dd.MM.y"}
}
yMMM{
M{"LLL-LLL y 'г'."}
@@ -771,9 +872,9 @@
y{"d MMM y - d MMM y 'г'."}
}
yMd{
- M{"dd.MM.yy - dd.MM.yy"}
- d{"dd.MM.yy - dd.MM.yy"}
- y{"dd.MM.yy - dd.MM.yy"}
+ M{"dd.MM.y - dd.MM.y"}
+ d{"dd.MM.y - dd.MM.y"}
+ y{"dd.MM.y - dd.MM.y"}
}
}
monthNames{
@@ -1054,55 +1155,6 @@
}
}
islamic{
- DateTimePatterns{
- "H:mm:ss zzzz",
- "H:mm:ss z",
- "H:mm:ss",
- "H:mm",
- "EEEE, d MMMM y 'г'. G",
- "d MMMM y 'г'. G",
- "dd.MM.yyyy G",
- "dd.MM.yy G",
- "{1}, {0}",
- "{1}, {0}",
- "{1}, {0}",
- "{1}, {0}",
- "{1}, {0}",
- }
- availableFormats{
- E{"ccc"}
- Ed{"E, d"}
- Gy{"y G"}
- H{"H"}
- Hm{"H:mm"}
- Hms{"H:mm:ss"}
- M{"L"}
- MEd{"E, dd.MM"}
- MMM{"LLL"}
- MMMEd{"ccc, d MMM"}
- MMMd{"d MMM"}
- MMdd{"dd.MM"}
- Md{"dd.MM"}
- d{"d"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM.yy G"}
- yyMMM{"LLL yy G"}
- yyMMMEd{"E, d MMM yy G"}
- yyQQQ{"QQQ yy G"}
- yyyy{"y G"}
- yyyyLLLL{"LLLL y G"}
- yyyyM{"MM.y G"}
- yyyyMEd{"E, dd.MM.y G"}
- yyyyMM{"MM.yyyy G"}
- yyyyMMM{"LLL y G"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMM{"LLLL y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"dd.MM.y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y 'г'. G"}
- }
monthNames{
format{
abbreviated{
@@ -1181,55 +1233,6 @@
}
}
japanese{
- DateTimePatterns{
- "H:mm:ss zzzz",
- "H:mm:ss z",
- "H:mm:ss",
- "H:mm",
- "EEEE, d MMMM y 'г'. G",
- "d MMMM y 'г'. G",
- "dd.MM.yyyy G",
- "dd.MM.yy G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- E{"ccc"}
- Ed{"E, d"}
- Gy{"y G"}
- H{"H"}
- Hm{"H:mm"}
- Hms{"H:mm:ss"}
- M{"L"}
- MEd{"E, dd.MM"}
- MMM{"LLL"}
- MMMEd{"ccc, d MMM"}
- MMMd{"d MMM"}
- MMdd{"dd.MM"}
- Md{"dd.MM"}
- d{"d"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM.yy G"}
- yyMMM{"LLL yy G"}
- yyMMMEd{"E, d MMM yy G"}
- yyQQQ{"QQQ yy G"}
- yyyy{"y G"}
- yyyyLLLL{"LLLL y G"}
- yyyyM{"MM.y G"}
- yyyyMEd{"E, dd.MM.y G"}
- yyyyMM{"MM.yyyy G"}
- yyyyMMM{"LLL y G"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMM{"LLLL y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"dd.MM.y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y 'г'. G"}
- }
eras{
abbreviated{
"Эпоха Тайка (645-650)",
@@ -1550,54 +1553,11 @@
}
}
roc{
- DateTimePatterns{
- "H:mm:ss zzzz",
- "H:mm:ss z",
- "H:mm:ss",
- "H:mm",
- "EEEE, d MMMM y 'г'. G",
- "d MMMM y 'г'. G",
- "dd.MM.yyyy G",
- "dd.MM.yy G",
- "{1}, {0}",
- "{1}, {0}",
- "{1}, {0}",
- "{1}, {0}",
- "{1}, {0}",
- }
- availableFormats{
- E{"ccc"}
- Ed{"E, d"}
- Gy{"y G"}
- H{"H"}
- Hm{"H:mm"}
- Hms{"H:mm:ss"}
- M{"L"}
- MEd{"E, dd.MM"}
- MMM{"LLL"}
- MMMEd{"ccc, d MMM"}
- MMMd{"d MMM"}
- MMdd{"dd.MM"}
- Md{"dd.MM"}
- d{"d"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM.yy G"}
- yyMMM{"LLL yy G"}
- yyMMMEd{"E, d MMM yy G"}
- yyQQQ{"QQQ yy G"}
- yyyy{"y G"}
- yyyyLLLL{"LLLL y G"}
- yyyyM{"MM.y G"}
- yyyyMEd{"E, dd.MM.y G"}
- yyyyMM{"MM.yyyy G"}
- yyyyMMM{"LLL y G"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMM{"LLLL y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"dd.MM.y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y 'г'. G"}
+ eras{
+ abbreviated{
+ "Before R.O.C.",
+ "Minguo",
+ }
}
}
}
@@ -1649,6 +1609,63 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"День"}
+ relative{
+ "-1"{"Вчера"}
+ "-2"{"Позавчера"}
+ "0"{"Сегодня"}
+ "1"{"Завтра"}
+ "2"{"Послезавтра"}
+ }
+ }
+ dayperiod{
+ dn{"ДП/ПП"}
+ }
+ era{
+ dn{"Эра"}
+ }
+ hour{
+ dn{"Час"}
+ }
+ minute{
+ dn{"Минута"}
+ }
+ month{
+ dn{"Месяц"}
+ relative{
+ "-1"{"В прошлом месяце"}
+ "0"{"В этом месяце"}
+ "1"{"В следующем месяце"}
+ }
+ }
+ second{
+ dn{"Секунда"}
+ }
+ week{
+ dn{"Неделя"}
+ relative{
+ "-1"{"На прошлой неделе"}
+ "0"{"На этой неделе"}
+ "1"{"На следующей неделе"}
+ }
+ }
+ weekday{
+ dn{"День недели"}
+ }
+ year{
+ dn{"Год"}
+ relative{
+ "-1"{"В прошлом году"}
+ "0"{"В этом году"}
+ "1"{"В следующем году"}
+ }
+ }
+ zone{
+ dn{"Часовой пояс"}
+ }
+ }
listPattern{
standard{
2{"{0} и {1}"}
diff --git a/data/locales/ru_BY.txt b/data/locales/ru_BY.txt
index 437f7b5..91261bf 100755
--- a/data/locales/ru_BY.txt
+++ b/data/locales/ru_BY.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ru_BY.xml
// *
// ***************************************************************************
ru_BY{
- Version{"2.0.74.65"}
+ Version{"2.0.82.50"}
}
diff --git a/data/locales/ru_KG.txt b/data/locales/ru_KG.txt
index 2c9701a..f257bfb 100755
--- a/data/locales/ru_KG.txt
+++ b/data/locales/ru_KG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ru_KG.xml
// *
// ***************************************************************************
ru_KG{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ru_KZ.txt b/data/locales/ru_KZ.txt
index 830f00c..83d4ee7 100755
--- a/data/locales/ru_KZ.txt
+++ b/data/locales/ru_KZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ru_KZ.xml
// *
// ***************************************************************************
ru_KZ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ru_MD.txt b/data/locales/ru_MD.txt
index ac2503b..b90fa21 100755
--- a/data/locales/ru_MD.txt
+++ b/data/locales/ru_MD.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ru_MD.xml
// *
// ***************************************************************************
ru_MD{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ru_RU.txt b/data/locales/ru_RU.txt
index 1cd83b9..66fd01f 100644
--- a/data/locales/ru_RU.txt
+++ b/data/locales/ru_RU.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ru_RU.xml
// *
// ***************************************************************************
ru_RU{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ru_UA.txt b/data/locales/ru_UA.txt
index b8bfab5..4754219 100644
--- a/data/locales/ru_UA.txt
+++ b/data/locales/ru_UA.txt
@@ -1,14 +1,31 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ru_UA.xml
// *
// ***************************************************************************
ru_UA{
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d MMMM y 'г'. G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd.MM.y G",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ }
+ }
gregorian{
DateTimePatterns{
"HH:mm:ss zzzz",
diff --git a/data/locales/rw.txt b/data/locales/rw.txt
index 1e606de..0a25d88 100755
--- a/data/locales/rw.txt
+++ b/data/locales/rw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rw.xml
// *
@@ -23,8 +23,25 @@
}
}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, G y MMMM dd",
+ "G y MMMM d",
+ "G y MMM d",
+ "GGGGG yy/MM/dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
gregorian{
DateTimePatterns{
"HH:mm:ss zzzz",
diff --git a/data/locales/rw_RW.txt b/data/locales/rw_RW.txt
index 5809607..7b1af92 100755
--- a/data/locales/rw_RW.txt
+++ b/data/locales/rw_RW.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rw_RW.xml
// *
// ***************************************************************************
rw_RW{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/rwk.txt b/data/locales/rwk.txt
index 9bc31a1..e24d3f9 100755
--- a/data/locales/rwk.txt
+++ b/data/locales/rwk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rwk.xml
// *
@@ -23,8 +23,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"utuko",
@@ -38,7 +78,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -111,43 +151,6 @@
"Baada ya Kristu",
}
}
- fields{
- day{
- dn{"Mfiri"}
- relative{
- "-1"{"Ukou"}
- "0"{"Inu"}
- "1"{"Ngama"}
- }
- }
- dayperiod{
- dn{"Mfiri o siku"}
- }
- era{
- dn{"Kacha"}
- }
- hour{
- dn{"Saa"}
- }
- minute{
- dn{"Dakyika"}
- }
- month{
- dn{"Mori"}
- }
- second{
- dn{"Sekunde"}
- }
- week{
- dn{"Wiikyi"}
- }
- year{
- dn{"Maka"}
- }
- zone{
- dn{"Mfiri o saa"}
- }
- }
monthNames{
format{
abbreviated{
@@ -220,4 +223,41 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Mfiri"}
+ relative{
+ "-1"{"Ukou"}
+ "0"{"Inu"}
+ "1"{"Ngama"}
+ }
+ }
+ dayperiod{
+ dn{"Mfiri o siku"}
+ }
+ era{
+ dn{"Kacha"}
+ }
+ hour{
+ dn{"Saa"}
+ }
+ minute{
+ dn{"Dakyika"}
+ }
+ month{
+ dn{"Mori"}
+ }
+ second{
+ dn{"Sekunde"}
+ }
+ week{
+ dn{"Wiikyi"}
+ }
+ year{
+ dn{"Maka"}
+ }
+ zone{
+ dn{"Mfiri o saa"}
+ }
+ }
}
diff --git a/data/locales/rwk_TZ.txt b/data/locales/rwk_TZ.txt
index c6c04a4..d627abc 100755
--- a/data/locales/rwk_TZ.txt
+++ b/data/locales/rwk_TZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rwk_TZ.xml
// *
// ***************************************************************************
rwk_TZ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/saq.txt b/data/locales/saq.txt
index 9eb888a..fab4dff 100755
--- a/data/locales/saq.txt
+++ b/data/locales/saq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/saq.xml
// *
@@ -23,8 +23,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"Tesiran",
@@ -38,7 +78,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -111,43 +151,6 @@
"Baada ya Christo",
}
}
- fields{
- day{
- dn{"Mpari"}
- relative{
- "-1"{"Ng'ole"}
- "0"{"Duo"}
- "1"{"Taisere"}
- }
- }
- dayperiod{
- dn{"TS/TP"}
- }
- era{
- dn{"Nyamata"}
- }
- hour{
- dn{"Saai"}
- }
- minute{
- dn{"Idakika"}
- }
- month{
- dn{"Lapa"}
- }
- second{
- dn{"Isekondi"}
- }
- week{
- dn{"Saipa napo"}
- }
- year{
- dn{"Lari"}
- }
- zone{
- dn{"Majira ya saa"}
- }
- }
monthNames{
format{
abbreviated{
@@ -220,4 +223,41 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Mpari"}
+ relative{
+ "-1"{"Ng'ole"}
+ "0"{"Duo"}
+ "1"{"Taisere"}
+ }
+ }
+ dayperiod{
+ dn{"TS/TP"}
+ }
+ era{
+ dn{"Nyamata"}
+ }
+ hour{
+ dn{"Saai"}
+ }
+ minute{
+ dn{"Idakika"}
+ }
+ month{
+ dn{"Lapa"}
+ }
+ second{
+ dn{"Isekondi"}
+ }
+ week{
+ dn{"Saipa napo"}
+ }
+ year{
+ dn{"Lari"}
+ }
+ zone{
+ dn{"Majira ya saa"}
+ }
+ }
}
diff --git a/data/locales/saq_KE.txt b/data/locales/saq_KE.txt
index 35fdaef..9cd312a 100755
--- a/data/locales/saq_KE.txt
+++ b/data/locales/saq_KE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/saq_KE.xml
// *
// ***************************************************************************
saq_KE{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/sbp.txt b/data/locales/sbp.txt
index 58eaf85..4742307 100755
--- a/data/locales/sbp.txt
+++ b/data/locales/sbp.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sbp.xml
// *
@@ -29,8 +29,49 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMd{"MMM d y"}
+ yMd{"M/d/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"Lwamilawu",
@@ -44,7 +85,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -118,46 +159,6 @@
"Pamwandi ya Kilisto",
}
}
- fields{
- day{
- dn{"Lusiku"}
- relative{
- "-1"{"Imehe"}
- "0"{"Ineng'uni"}
- "1"{"Pamulaawu"}
- }
- }
- dayperiod{
- dn{"Uluhaavi lwa lusiku"}
- }
- era{
- dn{"Uluhaavi lwa"}
- }
- hour{
- dn{"Ilisala"}
- }
- minute{
- dn{"Idakika"}
- }
- month{
- dn{"Mwesi"}
- }
- second{
- dn{"Isekunde"}
- }
- week{
- dn{"Ilijuma"}
- }
- weekday{
- dn{"Ulusiku lwa Lijuma"}
- }
- year{
- dn{"Mwakha"}
- }
- zone{
- dn{"Uluhaavi lwa lisaa"}
- }
- }
monthNames{
format{
abbreviated{
@@ -214,4 +215,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Lusiku"}
+ relative{
+ "-1"{"Imehe"}
+ "0"{"Ineng'uni"}
+ "1"{"Pamulaawu"}
+ }
+ }
+ dayperiod{
+ dn{"Uluhaavi lwa lusiku"}
+ }
+ era{
+ dn{"Uluhaavi lwa"}
+ }
+ hour{
+ dn{"Ilisala"}
+ }
+ minute{
+ dn{"Idakika"}
+ }
+ month{
+ dn{"Mwesi"}
+ }
+ second{
+ dn{"Isekunde"}
+ }
+ week{
+ dn{"Ilijuma"}
+ }
+ weekday{
+ dn{"Ulusiku lwa Lijuma"}
+ }
+ year{
+ dn{"Mwakha"}
+ }
+ zone{
+ dn{"Uluhaavi lwa lisaa"}
+ }
+ }
}
diff --git a/data/locales/sbp_TZ.txt b/data/locales/sbp_TZ.txt
index 300c833..028302f 100755
--- a/data/locales/sbp_TZ.txt
+++ b/data/locales/sbp_TZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sbp_TZ.xml
// *
// ***************************************************************************
sbp_TZ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/seh.txt b/data/locales/seh.txt
index e4e7fc8..fd8f904 100755
--- a/data/locales/seh.txt
+++ b/data/locales/seh.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/seh.xml
// *
@@ -29,18 +29,18 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
+ generic{
DateTimePatterns{
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE, d 'de' MMMM 'de' y",
- "d 'de' MMMM 'de' y",
- "d 'de' MMM 'de' y",
- "d/M/yyyy",
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "d 'de' MMM 'de' y G",
+ "d/M/y GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -66,16 +66,57 @@
y{"y"}
yM{"MM/y"}
yMEd{"E, dd/MM/y"}
+ yMM{"MM/y"}
yMMM{"MMM 'de' y"}
yMMMEd{"E, d 'de' MMM 'de' y"}
yMMMM{"MMMM 'de' y"}
+ yMMMd{"d 'de' MMM 'de' y"}
yQQQ{"y QQQ"}
yQQQQ{"y QQQQ"}
- yyMM{"MM/yy"}
- yyMMM{"MMM yy"}
- yyMMMEd{"E, d 'de' MMM 'de' yy"}
- yyMMMd{"d 'de' MMM 'de' yy"}
- yyQQQ{"QQQ yy"}
+ }
+ }
+ gregorian{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d 'de' MMMM 'de' y",
+ "d 'de' MMMM 'de' y",
+ "d 'de' MMM 'de' y",
+ "d/M/y",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ HHmm{"HH:mm"}
+ HHmmss{"HH:mm:ss"}
+ Hm{"H:mm"}
+ M{"L"}
+ MEd{"E, dd/MM"}
+ MMM{"LLL"}
+ MMMEd{"E, d MMM"}
+ MMMMEd{"E, d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMdd{"dd/MM"}
+ Md{"d/M"}
+ d{"d"}
+ mmss{"mm:ss"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"MM/y"}
+ yMEd{"E, dd/MM/y"}
+ yMM{"MM/y"}
+ yMMM{"MMM 'de' y"}
+ yMMMEd{"E, d 'de' MMM 'de' y"}
+ yMMMM{"MMMM 'de' y"}
+ yMMMd{"d 'de' MMM 'de' y"}
+ yQQQ{"y QQQ"}
+ yQQQQ{"y QQQQ"}
}
dayNames{
format{
@@ -120,31 +161,6 @@
"Anno Domini",
}
}
- fields{
- day{
- dn{"Ntsiku"}
- relative{
- "-1"{"Zuro"}
- "0"{"Lero"}
- "1"{"Manguana"}
- }
- }
- hour{
- dn{"Hora"}
- }
- minute{
- dn{"Minuto"}
- }
- month{
- dn{"Mwezi"}
- }
- second{
- dn{"Segundo"}
- }
- year{
- dn{"Chaka"}
- }
- }
monthNames{
format{
abbreviated{
@@ -201,4 +217,29 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Ntsiku"}
+ relative{
+ "-1"{"Zuro"}
+ "0"{"Lero"}
+ "1"{"Manguana"}
+ }
+ }
+ hour{
+ dn{"Hora"}
+ }
+ minute{
+ dn{"Minuto"}
+ }
+ month{
+ dn{"Mwezi"}
+ }
+ second{
+ dn{"Segundo"}
+ }
+ year{
+ dn{"Chaka"}
+ }
+ }
}
diff --git a/data/locales/seh_MZ.txt b/data/locales/seh_MZ.txt
index a427c38..6cf435f 100755
--- a/data/locales/seh_MZ.txt
+++ b/data/locales/seh_MZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/seh_MZ.xml
// *
// ***************************************************************************
seh_MZ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ses.txt b/data/locales/ses.txt
index b65e9f7..c0cf790 100755
--- a/data/locales/ses.txt
+++ b/data/locales/ses.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ses.xml
// *
@@ -26,22 +26,18 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
- AmPmMarkers{
- "Adduha",
- "Aluula",
- }
+ generic{
DateTimePatterns{
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "EEEE d MMMM y",
- "d MMMM y",
- "d MMM, y",
- "d/M/yyyy",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM, y G",
+ "d/M/y GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -63,16 +59,57 @@
y{"y"}
yM{"M/y"}
yMEd{"E d/M/y"}
+ yMM{"MM/y"}
yMMM{"MMM y"}
yMMMEd{"E d MMM y"}
yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyMM{"MM/yy"}
- yyMMM{"MMM yy"}
- yyMMMEd{"E d MMM yy"}
- yyMMMd{"d MMM yy"}
- yyyyMMMM{"MMMM yyyy"}
+ }
+ }
+ gregorian{
+ AmPmMarkers{
+ "Adduha",
+ "Aluula",
+ }
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y",
+ "d MMMM y",
+ "d MMM, y",
+ "d/M/y",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ M{"M"}
+ MMM{"MMM"}
+ MMMEd{"E d MMM"}
+ MMMMEd{"E d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMMdd{"dd MMM"}
+ MMd{"d/MM"}
+ MMdd{"dd/MM"}
+ Md{"d/M"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMM{"MM/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
}
dayNames{
format{
@@ -117,43 +154,6 @@
"Isaa zamanoo",
}
}
- fields{
- day{
- dn{"Zaari"}
- relative{
- "-1"{"Bi"}
- "0"{"Hõo"}
- "1"{"Suba"}
- }
- }
- dayperiod{
- dn{"Adduha wala Aluula"}
- }
- era{
- dn{"Zaman"}
- }
- hour{
- dn{"Guuru"}
- }
- minute{
- dn{"Miniti"}
- }
- month{
- dn{"Handu"}
- }
- second{
- dn{"Miti"}
- }
- week{
- dn{"Hebu"}
- }
- year{
- dn{"Jiiri"}
- }
- zone{
- dn{"Leerazuu"}
- }
- }
monthNames{
format{
abbreviated{
@@ -226,4 +226,41 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Zaari"}
+ relative{
+ "-1"{"Bi"}
+ "0"{"Hõo"}
+ "1"{"Suba"}
+ }
+ }
+ dayperiod{
+ dn{"Adduha wala Aluula"}
+ }
+ era{
+ dn{"Zaman"}
+ }
+ hour{
+ dn{"Guuru"}
+ }
+ minute{
+ dn{"Miniti"}
+ }
+ month{
+ dn{"Handu"}
+ }
+ second{
+ dn{"Miti"}
+ }
+ week{
+ dn{"Hebu"}
+ }
+ year{
+ dn{"Jiiri"}
+ }
+ zone{
+ dn{"Leerazuu"}
+ }
+ }
}
diff --git a/data/locales/ses_ML.txt b/data/locales/ses_ML.txt
index d7a6cf1..b781239 100755
--- a/data/locales/ses_ML.txt
+++ b/data/locales/ses_ML.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ses_ML.xml
// *
// ***************************************************************************
ses_ML{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/sg.txt b/data/locales/sg.txt
index 2aead34..2a98cd7 100755
--- a/data/locales/sg.txt
+++ b/data/locales/sg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sg.xml
// *
@@ -27,8 +27,46 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM, y G",
+ "d/M/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ M{"M"}
+ MMM{"MMM"}
+ MMMEd{"E d MMM"}
+ MMMMEd{"E d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMMdd{"dd MMM"}
+ MMd{"d/MM"}
+ MMdd{"dd/MM"}
+ Md{"d/M"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"ND",
@@ -42,7 +80,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM, y",
- "d/M/yyyy",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -113,46 +151,6 @@
"Na pekô tî Krîstu",
}
}
- fields{
- day{
- dn{"Lâ"}
- relative{
- "-1"{"Bîrï"}
- "0"{"Lâsô"}
- "1"{"Kêkerêke"}
- }
- }
- dayperiod{
- dn{"Na lâ"}
- }
- era{
- dn{"Kùotângo"}
- }
- hour{
- dn{"Ngbonga"}
- }
- minute{
- dn{"Ndurü ngbonga"}
- }
- month{
- dn{"Nze"}
- }
- second{
- dn{"Nzîna ngbonga"}
- }
- week{
- dn{"Dimâsi"}
- }
- weekday{
- dn{"Bïkua"}
- }
- year{
- dn{"Ngû"}
- }
- zone{
- dn{"Zukangbonga"}
- }
- }
monthNames{
format{
abbreviated{
@@ -225,4 +223,44 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"Lâ"}
+ relative{
+ "-1"{"Bîrï"}
+ "0"{"Lâsô"}
+ "1"{"Kêkerêke"}
+ }
+ }
+ dayperiod{
+ dn{"Na lâ"}
+ }
+ era{
+ dn{"Kùotângo"}
+ }
+ hour{
+ dn{"Ngbonga"}
+ }
+ minute{
+ dn{"Ndurü ngbonga"}
+ }
+ month{
+ dn{"Nze"}
+ }
+ second{
+ dn{"Nzîna ngbonga"}
+ }
+ week{
+ dn{"Dimâsi"}
+ }
+ weekday{
+ dn{"Bïkua"}
+ }
+ year{
+ dn{"Ngû"}
+ }
+ zone{
+ dn{"Zukangbonga"}
+ }
+ }
}
diff --git a/data/locales/sg_CF.txt b/data/locales/sg_CF.txt
index 6ef0925..eb9c156 100755
--- a/data/locales/sg_CF.txt
+++ b/data/locales/sg_CF.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sg_CF.xml
// *
// ***************************************************************************
sg_CF{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/sh.txt b/data/locales/sh.txt
index 3f0a236..1433f43 100644
--- a/data/locales/sh.txt
+++ b/data/locales/sh.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/sh_BA.txt b/data/locales/sh_BA.txt
index af5634f..82a1a16 100644
--- a/data/locales/sh_BA.txt
+++ b/data/locales/sh_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/sh_CS.txt b/data/locales/sh_CS.txt
index 2adfb4a..8967fc8 100644
--- a/data/locales/sh_CS.txt
+++ b/data/locales/sh_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/sh_YU.txt b/data/locales/sh_YU.txt
index 516cdf3..85f7ad6 100644
--- a/data/locales/sh_YU.txt
+++ b/data/locales/sh_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/shi.txt b/data/locales/shi.txt
index a939a48..4a2ff89 100755
--- a/data/locales/shi.txt
+++ b/data/locales/shi.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/shi.xml
// *
@@ -26,8 +26,46 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM, y G",
+ "d/M/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ M{"M"}
+ MMM{"MMM"}
+ MMMEd{"E d MMM"}
+ MMMMEd{"E d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMMdd{"dd MMM"}
+ MMd{"d/MM"}
+ MMdd{"dd/MM"}
+ Md{"d/M"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"ⵜⵉⴼⴰⵡⵜ",
@@ -41,7 +79,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM, y",
- "d/M/yyyy",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -101,46 +139,6 @@
"ⴷⴼⴼⵉⵔ ⵏ ⵄⵉⵙⴰ",
}
}
- fields{
- day{
- dn{"ⴰⵙⵙ"}
- relative{
- "-1"{"ⵉⴹⵍⵍⵉ"}
- "0"{"ⴰⵙⵙⴰ"}
- "1"{"ⴰⵙⴽⴽⴰ"}
- }
- }
- dayperiod{
- dn{"ⵜⵉⵣⵉ ⴳ ⵡⴰⵙⵙ: ⵜⵉⴼⴰⵡⵜ/ⵜⴰⴷⴳⴳⵯⴰⵜ"}
- }
- era{
- dn{"ⵜⴰⵙⵓⵜ"}
- }
- hour{
- dn{"ⵜⴰⵙⵔⴰⴳⵜ"}
- }
- minute{
- dn{"ⵜⵓⵙⴷⵉⴷⵜ"}
- }
- month{
- dn{"ⴰⵢⵢⵓⵔ"}
- }
- second{
- dn{"ⵜⴰⵙⵉⵏⵜ"}
- }
- week{
- dn{"ⵉⵎⴰⵍⴰⵙⵙ"}
- }
- weekday{
- dn{"ⴰⵙⵙ ⴳ ⵉⵎⴰⵍⴰⵙⵙ"}
- }
- year{
- dn{"ⴰⵙⴳⴳⵯⴰⵙ"}
- }
- zone{
- dn{"ⴰⴽⵓⴷ ⵏ ⵓⴳⵎⵎⴰⴹ"}
- }
- }
monthNames{
format{
abbreviated{
@@ -213,4 +211,44 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"ⴰⵙⵙ"}
+ relative{
+ "-1"{"ⵉⴹⵍⵍⵉ"}
+ "0"{"ⴰⵙⵙⴰ"}
+ "1"{"ⴰⵙⴽⴽⴰ"}
+ }
+ }
+ dayperiod{
+ dn{"ⵜⵉⵣⵉ ⴳ ⵡⴰⵙⵙ: ⵜⵉⴼⴰⵡⵜ/ⵜⴰⴷⴳⴳⵯⴰⵜ"}
+ }
+ era{
+ dn{"ⵜⴰⵙⵓⵜ"}
+ }
+ hour{
+ dn{"ⵜⴰⵙⵔⴰⴳⵜ"}
+ }
+ minute{
+ dn{"ⵜⵓⵙⴷⵉⴷⵜ"}
+ }
+ month{
+ dn{"ⴰⵢⵢⵓⵔ"}
+ }
+ second{
+ dn{"ⵜⴰⵙⵉⵏⵜ"}
+ }
+ week{
+ dn{"ⵉⵎⴰⵍⴰⵙⵙ"}
+ }
+ weekday{
+ dn{"ⴰⵙⵙ ⴳ ⵉⵎⴰⵍⴰⵙⵙ"}
+ }
+ year{
+ dn{"ⴰⵙⴳⴳⵯⴰⵙ"}
+ }
+ zone{
+ dn{"ⴰⴽⵓⴷ ⵏ ⵓⴳⵎⵎⴰⴹ"}
+ }
+ }
}
diff --git a/data/locales/shi_Latn.txt b/data/locales/shi_Latn.txt
index 3078070..61e0aea 100755
--- a/data/locales/shi_Latn.txt
+++ b/data/locales/shi_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/shi_Latn.xml
// *
@@ -28,8 +28,46 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM, y G",
+ "d/M/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ M{"M"}
+ MMM{"MMM"}
+ MMMEd{"E d MMM"}
+ MMMMEd{"E d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMMdd{"dd MMM"}
+ MMd{"d/MM"}
+ MMdd{"dd/MM"}
+ Md{"d/M"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"tifawt",
@@ -43,7 +81,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM, y",
- "d/M/yyyy",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -103,46 +141,6 @@
"dffir n ɛisa",
}
}
- fields{
- day{
- dn{"ass"}
- relative{
- "-1"{"iḍlli"}
- "0"{"assa"}
- "1"{"askka"}
- }
- }
- dayperiod{
- dn{"tizi g wass: tifawt / tadggʷat"}
- }
- era{
- dn{"tasut"}
- }
- hour{
- dn{"tasragt"}
- }
- minute{
- dn{"tusdidt"}
- }
- month{
- dn{"ayyur"}
- }
- second{
- dn{"tasint"}
- }
- week{
- dn{"imalass"}
- }
- weekday{
- dn{"ass g imalass"}
- }
- year{
- dn{"asggʷas"}
- }
- zone{
- dn{"akud n ugmmaḍ"}
- }
- }
monthNames{
format{
abbreviated{
@@ -215,4 +213,44 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"ass"}
+ relative{
+ "-1"{"iḍlli"}
+ "0"{"assa"}
+ "1"{"askka"}
+ }
+ }
+ dayperiod{
+ dn{"tizi g wass: tifawt / tadggʷat"}
+ }
+ era{
+ dn{"tasut"}
+ }
+ hour{
+ dn{"tasragt"}
+ }
+ minute{
+ dn{"tusdidt"}
+ }
+ month{
+ dn{"ayyur"}
+ }
+ second{
+ dn{"tasint"}
+ }
+ week{
+ dn{"imalass"}
+ }
+ weekday{
+ dn{"ass g imalass"}
+ }
+ year{
+ dn{"asggʷas"}
+ }
+ zone{
+ dn{"akud n ugmmaḍ"}
+ }
+ }
}
diff --git a/data/locales/shi_Latn_MA.txt b/data/locales/shi_Latn_MA.txt
index 1edb0da..465a1de 100755
--- a/data/locales/shi_Latn_MA.txt
+++ b/data/locales/shi_Latn_MA.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/shi_Latn_MA.xml
// *
// ***************************************************************************
shi_Latn_MA{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/shi_MA.txt b/data/locales/shi_MA.txt
index 91d13a9..084cfbe 100755
--- a/data/locales/shi_MA.txt
+++ b/data/locales/shi_MA.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
shi_MA{
- "%%ALIAS"{"shi_Latn_MA"}
+ "%%ALIAS"{"shi_Tfng_MA"}
}
diff --git a/data/locales/shi_Tfng.txt b/data/locales/shi_Tfng.txt
index 8ae9df4..eab1ca3 100755
--- a/data/locales/shi_Tfng.txt
+++ b/data/locales/shi_Tfng.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/shi_Tfng.xml
// *
@@ -13,5 +13,5 @@
LocaleScript{
"Tfng",
}
- Version{"2.0.75.56"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/shi_Tfng_MA.txt b/data/locales/shi_Tfng_MA.txt
index 5df4666..66a6a90 100755
--- a/data/locales/shi_Tfng_MA.txt
+++ b/data/locales/shi_Tfng_MA.txt
@@ -1,11 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/shi_Tfng_MA.xml
// *
// ***************************************************************************
shi_Tfng_MA{
- Version{"2.0.74.65"}
+ %%Parent{"shi_Tfng"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/si.txt b/data/locales/si.txt
index 5e5d520..a5c8665 100755
--- a/data/locales/si.txt
+++ b/data/locales/si.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/si.xml
// *
@@ -32,8 +32,146 @@
}
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "a HH:mm:ss zzzz",
+ "a h:mm:ss z",
+ "a h.mm.ss",
+ "a h.mm",
+ "G y MMMM d, EEEE",
+ "G y MMMM d",
+ "G y MMM d",
+ "GGGGG y/MM/dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"M-d, E"}
+ MMM{"LLL"}
+ MMMEd{"MMM d E"}
+ MMMd{"MMM d"}
+ Md{"M-d"}
+ d{"d"}
+ h{"a h"}
+ hm{"a h.mm"}
+ hms{"a h.mm.ss"}
+ ms{"mm.ss"}
+ y{"y"}
+ yM{"y-M"}
+ yMEd{"y-M-d, E"}
+ yMMM{"y MMM"}
+ yMMMEd{"y MMM d, E"}
+ yMMMd{"y MMM d"}
+ yMd{"y-M-d"}
+ yQQQ{"y QQQ"}
+ yQQQQ{"y QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HHmm-HHmm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, M-d – E, M-d"}
+ d{"E, M-d – E, M-d"}
+ }
+ MMM{
+ M{"LLL–LLL"}
+ }
+ MMMEd{
+ M{"MMM-dd, E – MMM-dd, E"}
+ d{"MMM-d, E – MMM-d, E"}
+ }
+ MMMd{
+ M{"MMM d - MMM d"}
+ d{"MMM d-d"}
+ }
+ Md{
+ M{"M-d - M-d"}
+ d{"M-d - M-d"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"a h - a h"}
+ h{"a h-h"}
+ }
+ hm{
+ a{"a h:mm - a h:mm"}
+ h{"a h.mm - h.mm"}
+ m{"a h.mm - h.mm"}
+ }
+ hmv{
+ a{"a h.mm - a hhh.mm v"}
+ h{"a h.mm - h.mm v"}
+ m{"a h:mm - h.mm v"}
+ }
+ hv{
+ a{"a h - a h v"}
+ h{"a h - h vv"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"M-y - M-y"}
+ y{"M-y - M-y"}
+ }
+ yMEd{
+ M{"E, M-d-y - E, M-d-y"}
+ d{"E, y-MM-dd – E, y-MM-dd"}
+ y{"M-d-y, E - M-d-y, E"}
+ }
+ yMMM{
+ M{"y MMM–MMM"}
+ y{"y MMM - y MMM"}
+ }
+ yMMMEd{
+ M{"y MMM d, E - y MMM d, E"}
+ d{"y MMM d, E - y MMM d, E"}
+ y{"y MMM d, E - y MMM d, E"}
+ }
+ yMMMM{
+ M{"y MMMM - MMMM"}
+ y{"y MMMM - y MMMM"}
+ }
+ yMMMd{
+ M{"y MMM d - MMM d"}
+ d{"y MMM d - d"}
+ y{"y MMM d - y MMM d"}
+ }
+ yMd{
+ M{"M-d-y - M-d-y"}
+ d{"M-d-y - M-d-y"}
+ y{"M-d-y - M-d-y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"පෙ.ව.",
@@ -47,7 +185,7 @@
"y MMMM d, EEEE",
"y MMMM d",
"y MMM d",
- "yyyy/MM/dd",
+ "y/MM/dd",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -168,48 +306,6 @@
"ක්රිස්තු වර්ෂ",
}
}
- fields{
- day{
- dn{"දිනය"}
- relative{
- "-1"{"ඊයෙ"}
- "-2"{"පෙරේදා"}
- "0"{"අද"}
- "1"{"හෙට"}
- "2"{"අනිද්දා"}
- }
- }
- dayperiod{
- dn{"දිවා කාලය"}
- }
- era{
- dn{"යුගය"}
- }
- hour{
- dn{"පැය"}
- }
- minute{
- dn{"මිනිස්තුව"}
- }
- month{
- dn{"මාසය"}
- }
- second{
- dn{"තප්පරය"}
- }
- week{
- dn{"සතිය"}
- }
- weekday{
- dn{"සතියේ දිනය"}
- }
- year{
- dn{"වර්ෂ"}
- }
- zone{
- dn{"වේලා කලාපය"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -273,13 +369,13 @@
y{"y–y"}
}
yM{
- M{"M-yy - M-yy"}
- y{"M-yy - M-yy"}
+ M{"M-y - M-y"}
+ y{"M-y - M-y"}
}
yMEd{
- M{"E, M-d-yy - E, M-d-yy"}
- d{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
- y{"M-d-yy, E - M-d-yy, E"}
+ M{"E, M-d-y - E, M-d-y"}
+ d{"E, y-MM-dd – E, y-MM-dd"}
+ y{"M-d-y, E - M-d-y, E"}
}
yMMM{
M{"y MMM–MMM"}
@@ -300,9 +396,9 @@
y{"y MMM d - y MMM d"}
}
yMd{
- M{"M-d-yy - M-d-yy"}
- d{"M-d-yy - M-d-yy"}
- y{"M-d-yy - M-d-yy"}
+ M{"M-d-y - M-d-y"}
+ d{"M-d-y - M-d-y"}
+ y{"M-d-y - M-d-y"}
}
}
monthNames{
@@ -445,6 +541,48 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"දිනය"}
+ relative{
+ "-1"{"ඊයෙ"}
+ "-2"{"පෙරේදා"}
+ "0"{"අද"}
+ "1"{"හෙට"}
+ "2"{"අනිද්දා"}
+ }
+ }
+ dayperiod{
+ dn{"දිවා කාලය"}
+ }
+ era{
+ dn{"යුගය"}
+ }
+ hour{
+ dn{"පැය"}
+ }
+ minute{
+ dn{"මිනිස්තුව"}
+ }
+ month{
+ dn{"මාසය"}
+ }
+ second{
+ dn{"තප්පරය"}
+ }
+ week{
+ dn{"සතිය"}
+ }
+ weekday{
+ dn{"සතියේ දිනය"}
+ }
+ year{
+ dn{"වර්ෂ"}
+ }
+ zone{
+ dn{"වේලා කලාපය"}
+ }
+ }
listPattern{
standard{
2{"{0}, {1}"}
diff --git a/data/locales/si_LK.txt b/data/locales/si_LK.txt
index 5af1d65..4d23599 100755
--- a/data/locales/si_LK.txt
+++ b/data/locales/si_LK.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/si_LK.xml
// *
// ***************************************************************************
si_LK{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/sk.txt b/data/locales/sk.txt
index 85b7348..3f59768 100644
--- a/data/locales/sk.txt
+++ b/data/locales/sk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sk.xml
// *
@@ -16,7 +16,7 @@
"ú v w x y ý z ž]"
}
ExemplarCharactersIndex{"[A Ä B C Č D Ď E F G H {CH} I J K L Ľ M N O Ô P Q R S Š T Ť U V W X Y Z Ž]"}
- ExemplarCharactersPunctuation{"[\- ‐ – , ; \: ! ? . … ‘ ‚ “ „ ( ) \[ \] § @ * / \&]"}
+ ExemplarCharactersPunctuation{"[\\- ‐ – , ; \\: ! ? . … ‘ ‚ “ „ ( ) \\[ \\] § @ * / \\&]"}
LocaleScript{
"Latn",
}
@@ -170,22 +170,18 @@
}
}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
- AmPmMarkers{
- "dopoludnia",
- "popoludní",
- }
+ generic{
DateTimePatterns{
"H:mm:ss zzzz",
"H:mm:ss z",
"H:mm:ss",
"H:mm",
- "EEEE, d. MMMM y",
- "d. MMMM y",
- "d.M.yyyy",
- "d.M.yyyy",
+ "EEEE, d. MMMM y G",
+ "d. MMMM y G",
+ "d.M.y G",
+ "d.M.y GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -212,17 +208,164 @@
mmss{"mm:ss"}
ms{"mm:ss"}
y{"y"}
- yM{"M.yyyy"}
+ yM{"M.y"}
yMEd{"E d. M. y"}
yMMM{"LLL y"}
yMMMEd{"E, d. MMM y"}
yMMMM{"LLLL y"}
- yMMMd{"d.M.yyyy"}
- yMd{"d.M.yyyy"}
+ yMMMd{"d.M.y"}
+ yMd{"d.M.y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyyyM{"M.yyyy"}
- yyyyMMMM{"LLLL y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH – HH"}
+ }
+ Hm{
+ H{"H:mm – H:mm"}
+ m{"H:mm – H:mm"}
+ }
+ Hmv{
+ H{"H:mm – H:mm v"}
+ m{"H:mm – H:mm v"}
+ }
+ Hv{
+ H{"HH – HH v"}
+ }
+ M{
+ M{"M. – M."}
+ }
+ MEd{
+ M{"E, d.M. - E, d.M."}
+ d{"E, d.M. - E, d.M."}
+ }
+ MMM{
+ M{"LLL – LLL"}
+ }
+ MMMEd{
+ M{"E, d. MMM - E, d. MMM"}
+ d{"E, d. - E, d. MMM"}
+ }
+ MMMM{
+ M{"LLLL-LLLL"}
+ }
+ MMMd{
+ M{"d. MMM - d. MMM"}
+ d{"d. - d. MMM"}
+ }
+ Md{
+ M{"d.M. - d.M."}
+ d{"d.M. - d.M."}
+ }
+ d{
+ d{"d. – d."}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h – h a"}
+ }
+ hm{
+ a{"h:mm a - h:mm a"}
+ h{"h:mm - h:mm a"}
+ m{"h:mm - h:mm a"}
+ }
+ hmv{
+ a{"h:mm a - h:mm a v"}
+ h{"h:mm - h:mm a v"}
+ m{"h:mm - h:mm a v"}
+ }
+ hv{
+ a{"h a - h a v"}
+ h{"h – h a v"}
+ }
+ y{
+ y{"y - y"}
+ }
+ yM{
+ M{"M.y - M.y"}
+ y{"M.y - M.y"}
+ }
+ yMEd{
+ M{"E, d.M.y - E, d.M.y"}
+ d{"E, d.M.y - E, d.M.y"}
+ y{"E, d.M.y - E, d.M.y"}
+ }
+ yMMM{
+ M{"LLL - LLL y"}
+ y{"LLL y - LLL y"}
+ }
+ yMMMEd{
+ M{"E, d. MMM - E, d. MMM y"}
+ d{"E, d. - E, d. MMM y"}
+ y{"E, d. MMM y - E, d. MMM y"}
+ }
+ yMMMM{
+ M{"LLLL - LLLL y"}
+ y{"LLLL y - LLLL y"}
+ }
+ yMMMd{
+ M{"d. MMM - d. MMM y"}
+ d{"d. - d. MMM y"}
+ y{"d. MMM y - d. MMM y"}
+ }
+ yMd{
+ M{"d.M.y - d.M.y"}
+ d{"d.M.y - d.M.y"}
+ y{"d.M.y - d.M.y"}
+ }
+ }
+ }
+ gregorian{
+ AmPmMarkers{
+ "dopoludnia",
+ "popoludní",
+ }
+ DateTimePatterns{
+ "H:mm:ss zzzz",
+ "H:mm:ss z",
+ "H:mm:ss",
+ "H:mm",
+ "EEEE, d. MMMM y",
+ "d. MMMM y",
+ "d.M.y",
+ "d.M.y",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d."}
+ H{"H"}
+ Hm{"H:mm"}
+ Hms{"H:mm:ss"}
+ M{"L."}
+ MEd{"E, d.M."}
+ MMM{"LLL"}
+ MMMEd{"E, d. MMM."}
+ MMMMEd{"E, d. MMMM"}
+ MMMMd{"d. MMMM"}
+ MMMd{"d. MMM."}
+ Md{"d.M."}
+ d{"d."}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ mmss{"mm:ss"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M.y"}
+ yMEd{"E d. M. y"}
+ yMMM{"LLL y"}
+ yMMMEd{"E, d. MMM y"}
+ yMMMM{"LLLL y"}
+ yMMMd{"d.M.y"}
+ yMd{"d.M.y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
}
dayNames{
format{
@@ -308,63 +451,6 @@
"n.l.",
}
}
- fields{
- day{
- dn{"Deň"}
- relative{
- "-1"{"Včera"}
- "-2"{"Predvčerom"}
- "0"{"Dnes"}
- "1"{"Zajtra"}
- "2"{"Pozajtra"}
- }
- }
- dayperiod{
- dn{"Časť dňa"}
- }
- era{
- dn{"Éra"}
- }
- hour{
- dn{"Hodina"}
- }
- minute{
- dn{"Minúta"}
- }
- month{
- dn{"Mesiac"}
- relative{
- "-1"{"Posledný mesiac"}
- "0"{"Tento mesiac"}
- "1"{"Budúci mesiac"}
- }
- }
- second{
- dn{"Sekunda"}
- }
- week{
- dn{"Týždeň"}
- relative{
- "-1"{"Minulý týždeň"}
- "0"{"Tento týždeň"}
- "1"{"Budúci týždeň"}
- }
- }
- weekday{
- dn{"Deň v týždni"}
- }
- year{
- dn{"Rok"}
- relative{
- "-1"{"Minulý rok"}
- "0"{"Tento rok"}
- "1"{"Budúci rok"}
- }
- }
- zone{
- dn{"Časové pásmo"}
- }
- }
intervalFormats{
H{
H{"HH – HH"}
@@ -431,13 +517,13 @@
y{"y - y"}
}
yM{
- M{"M.yyyy - M.yyyy"}
- y{"M.yyyy - M.yyyy"}
+ M{"M.y - M.y"}
+ y{"M.y - M.y"}
}
yMEd{
- M{"E, d.M.yy - E, d.M.yy"}
- d{"E, d.M.yy - E, d.M.yy"}
- y{"E, d.M.yy - E, d.M.yy"}
+ M{"E, d.M.y - E, d.M.y"}
+ d{"E, d.M.y - E, d.M.y"}
+ y{"E, d.M.y - E, d.M.y"}
}
yMMM{
M{"LLL - LLL y"}
@@ -458,9 +544,9 @@
y{"d. MMM y - d. MMM y"}
}
yMd{
- M{"d.M.yy - d.M.yy"}
- d{"d.M.yy - d.M.yy"}
- y{"d.M.yy - d.M.yy"}
+ M{"d.M.y - d.M.y"}
+ d{"d.M.y - d.M.y"}
+ y{"d.M.y - d.M.y"}
}
}
monthNames{
@@ -479,50 +565,22 @@
"nov",
"dec",
}
- narrow{
- "j",
- "f",
- "m",
- "a",
- "m",
- "j",
- "j",
- "a",
- "s",
- "o",
- "n",
- "d",
- }
wide{
- "január",
- "február",
- "marec",
- "apríl",
- "máj",
- "jún",
- "júl",
- "august",
- "september",
- "október",
- "november",
- "december",
+ "januára",
+ "februára",
+ "marca",
+ "apríla",
+ "mája",
+ "júna",
+ "júla",
+ "augusta",
+ "septembra",
+ "októbra",
+ "novembra",
+ "decembra",
}
}
stand-alone{
- abbreviated{
- "jan",
- "feb",
- "mar",
- "apr",
- "máj",
- "jún",
- "júl",
- "aug",
- "sep",
- "okt",
- "nov",
- "dec",
- }
narrow{
"j",
"f",
@@ -603,6 +661,63 @@
quotationEnd{"“"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"Deň"}
+ relative{
+ "-1"{"Včera"}
+ "-2"{"Predvčerom"}
+ "0"{"Dnes"}
+ "1"{"Zajtra"}
+ "2"{"Pozajtra"}
+ }
+ }
+ dayperiod{
+ dn{"Časť dňa"}
+ }
+ era{
+ dn{"Éra"}
+ }
+ hour{
+ dn{"Hodina"}
+ }
+ minute{
+ dn{"Minúta"}
+ }
+ month{
+ dn{"Mesiac"}
+ relative{
+ "-1"{"Posledný mesiac"}
+ "0"{"Tento mesiac"}
+ "1"{"Budúci mesiac"}
+ }
+ }
+ second{
+ dn{"Sekunda"}
+ }
+ week{
+ dn{"Týždeň"}
+ relative{
+ "-1"{"Minulý týždeň"}
+ "0"{"Tento týždeň"}
+ "1"{"Budúci týždeň"}
+ }
+ }
+ weekday{
+ dn{"Deň v týždni"}
+ }
+ year{
+ dn{"Rok"}
+ relative{
+ "-1"{"Minulý rok"}
+ "0"{"Tento rok"}
+ "1"{"Budúci rok"}
+ }
+ }
+ zone{
+ dn{"Časové pásmo"}
+ }
+ }
listPattern{
standard{
2{"{0} a {1}"}
diff --git a/data/locales/sk_SK.txt b/data/locales/sk_SK.txt
index 7c6daf0..dbbf150 100644
--- a/data/locales/sk_SK.txt
+++ b/data/locales/sk_SK.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sk_SK.xml
// *
// ***************************************************************************
sk_SK{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/sl.txt b/data/locales/sl.txt
index e1161a8..3e9465e 100644
--- a/data/locales/sl.txt
+++ b/data/locales/sl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sl.xml
// *
@@ -193,8 +193,148 @@
}
}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, dd. MMMM y G",
+ "dd. MMMM y G",
+ "d. MMM y G",
+ "d. MM. yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E, d."}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d. MM."}
+ MMM{"LLL"}
+ MMMEd{"E, d. MMM"}
+ MMMd{"d. MMM"}
+ Md{"d. M."}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ mmss{"mm:ss"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, d. M. y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, d. MMM y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d. MMM y"}
+ yMd{"d. M. y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH.mm–HH.mm"}
+ m{"HH.mm–HH.mm"}
+ }
+ Hmv{
+ H{"HH.mm–HH.mm v"}
+ m{"HH.mm–HH.mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M.–M."}
+ }
+ MEd{
+ M{"E, d. M. – E, d. M."}
+ d{"E, d. – E, d. M."}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E, d. MMM – E, d. MMM"}
+ d{"E, d. – E, d. MMM"}
+ }
+ MMMd{
+ M{"d. MMM – d. MMM"}
+ d{"d.–d. MMM"}
+ }
+ Md{
+ M{"d. M. – d. M."}
+ d{"d. – d. M."}
+ }
+ d{
+ d{"d.–d."}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"M.–M. y"}
+ y{"M. y – M. y"}
+ }
+ yMEd{
+ M{"E, d. M. – E, d. M. y"}
+ d{"E, d. – E, d. M. y"}
+ y{"E, d. M. y – E, d. M. y"}
+ }
+ yMMM{
+ M{"MMM – MMM y"}
+ y{"MMM y – MMM y"}
+ }
+ yMMMEd{
+ M{"E, d. MMM – E, d. MMM y"}
+ d{"E, d. MMM – E, d. MMM y"}
+ y{"E, d. MMM y – E, d. MMM y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"d. MMM – d. MMM y"}
+ d{"d.–d. MMM y"}
+ y{"d. MMM y – d. MMM y"}
+ }
+ yMd{
+ M{"d. M. – d. M. y"}
+ d{"d. M. y – d. M. y"}
+ y{"d. M. y – d. M. y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"dop.",
@@ -207,7 +347,7 @@
"HH:mm",
"EEEE, dd. MMMM y",
"dd. MMMM y",
- "d. MMM yyyy",
+ "d. MMM y",
"d. MM. yy",
"{1} {0}",
"{1} {0}",
@@ -237,12 +377,11 @@
yMEd{"E, d. M. y"}
yMMM{"MMM y"}
yMMMEd{"E, d. MMM y"}
+ yMMMM{"MMMM y"}
yMMMd{"d. MMM y"}
yMd{"d. M. y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyyyM{"M/yyyy"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -314,63 +453,6 @@
"naše štetje",
}
}
- fields{
- day{
- dn{"Dan"}
- relative{
- "-1"{"Včeraj"}
- "-2"{"Predvčerajšnjim"}
- "0"{"Danes"}
- "1"{"Jutri"}
- "2"{"Pojutrišnjem"}
- }
- }
- dayperiod{
- dn{"Čas dneva"}
- }
- era{
- dn{"Doba"}
- }
- hour{
- dn{"Ura"}
- }
- minute{
- dn{"Minuta"}
- }
- month{
- dn{"Mesec"}
- relative{
- "-1"{"Prejšnji mesec"}
- "0"{"Ta mesec"}
- "1"{"Naslednji mesec"}
- }
- }
- second{
- dn{"Sekunda"}
- }
- week{
- dn{"Teden"}
- relative{
- "-1"{"Prejšnji teden"}
- "0"{"Ta teden"}
- "1"{"Naslednji teden"}
- }
- }
- weekday{
- dn{"Dan v tednu"}
- }
- year{
- dn{"Leto"}
- relative{
- "-1"{"Lani"}
- "0"{"Letos"}
- "1"{"Naslednje leto"}
- }
- }
- zone{
- dn{"Območje"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -434,13 +516,13 @@
y{"y–y"}
}
yM{
- M{"M.–M. yy"}
- y{"M. yy – M. yy"}
+ M{"M.–M. y"}
+ y{"M. y – M. y"}
}
yMEd{
- M{"E, d. M. – E, d. M. yy"}
- d{"E, d. – E, d. M. yy"}
- y{"E, d. M. yy – E, d. M. yy"}
+ M{"E, d. M. – E, d. M. y"}
+ d{"E, d. – E, d. M. y"}
+ y{"E, d. M. y – E, d. M. y"}
}
yMMM{
M{"MMM – MMM y"}
@@ -461,9 +543,9 @@
y{"d. MMM y – d. MMM y"}
}
yMd{
- M{"d. M. – d. M. yy"}
- d{"d. M. yy – d. M. yy"}
- y{"d. M. yy – d. M. yy"}
+ M{"d. M. – d. M. y"}
+ d{"d. M. y – d. M. y"}
+ y{"d. M. y – d. M. y"}
}
}
monthNames{
@@ -566,6 +648,63 @@
quotationEnd{"“"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"Dan"}
+ relative{
+ "-1"{"Včeraj"}
+ "-2"{"Predvčerajšnjim"}
+ "0"{"Danes"}
+ "1"{"Jutri"}
+ "2"{"Pojutrišnjem"}
+ }
+ }
+ dayperiod{
+ dn{"Čas dneva"}
+ }
+ era{
+ dn{"Doba"}
+ }
+ hour{
+ dn{"Ura"}
+ }
+ minute{
+ dn{"Minuta"}
+ }
+ month{
+ dn{"Mesec"}
+ relative{
+ "-1"{"Prejšnji mesec"}
+ "0"{"Ta mesec"}
+ "1"{"Naslednji mesec"}
+ }
+ }
+ second{
+ dn{"Sekunda"}
+ }
+ week{
+ dn{"Teden"}
+ relative{
+ "-1"{"Prejšnji teden"}
+ "0"{"Ta teden"}
+ "1"{"Naslednji teden"}
+ }
+ }
+ weekday{
+ dn{"Dan v tednu"}
+ }
+ year{
+ dn{"Leto"}
+ relative{
+ "-1"{"Lani"}
+ "0"{"Letos"}
+ "1"{"Naslednje leto"}
+ }
+ }
+ zone{
+ dn{"Območje"}
+ }
+ }
listPattern{
standard{
2{"{0} in {1}"}
diff --git a/data/locales/sl_SI.txt b/data/locales/sl_SI.txt
index 1b2c4ca..2895596 100644
--- a/data/locales/sl_SI.txt
+++ b/data/locales/sl_SI.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sl_SI.xml
// *
// ***************************************************************************
sl_SI{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/sn.txt b/data/locales/sn.txt
index 0d50a0a..b9d82e3 100755
--- a/data/locales/sn.txt
+++ b/data/locales/sn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sn.xml
// *
@@ -23,8 +23,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
DateTimePatterns{
"h:mm:ss a zzzz",
@@ -34,7 +74,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -107,43 +147,6 @@
"Kristo ashaya",
}
}
- fields{
- day{
- dn{"Zuva"}
- relative{
- "-1"{"Nezuro"}
- "0"{"Nhasi"}
- "1"{"Mangwana"}
- }
- }
- era{
- dn{"Mukore"}
- }
- hour{
- dn{"Awa"}
- }
- minute{
- dn{"Mineti"}
- }
- month{
- dn{"Mwedzi"}
- }
- second{
- dn{"Sekondi"}
- }
- week{
- dn{"Vhiki"}
- }
- weekday{
- dn{"Zuva revhiki"}
- }
- year{
- dn{"Gore"}
- }
- zone{
- dn{"Nguva"}
- }
- }
monthNames{
format{
abbreviated{
@@ -216,4 +219,41 @@
quotationEnd{"”"}
quotationStart{"”"}
}
+ fields{
+ day{
+ dn{"Zuva"}
+ relative{
+ "-1"{"Nezuro"}
+ "0"{"Nhasi"}
+ "1"{"Mangwana"}
+ }
+ }
+ era{
+ dn{"Mukore"}
+ }
+ hour{
+ dn{"Awa"}
+ }
+ minute{
+ dn{"Mineti"}
+ }
+ month{
+ dn{"Mwedzi"}
+ }
+ second{
+ dn{"Sekondi"}
+ }
+ week{
+ dn{"Vhiki"}
+ }
+ weekday{
+ dn{"Zuva revhiki"}
+ }
+ year{
+ dn{"Gore"}
+ }
+ zone{
+ dn{"Nguva"}
+ }
+ }
}
diff --git a/data/locales/sn_ZW.txt b/data/locales/sn_ZW.txt
index d9e3093..63295c1 100755
--- a/data/locales/sn_ZW.txt
+++ b/data/locales/sn_ZW.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sn_ZW.xml
// *
// ***************************************************************************
sn_ZW{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/so.txt b/data/locales/so.txt
index c0e43a4..7dfa36f 100644
--- a/data/locales/so.txt
+++ b/data/locales/so.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/so.xml
// *
@@ -25,8 +25,48 @@
}
}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, MMMM dd, y G",
+ "dd MMMM y G",
+ "dd-MMM-y G",
+ "dd/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"sn.",
@@ -113,46 +153,6 @@
"Ciise ka dib (CS)",
}
}
- fields{
- day{
- dn{"Maalin"}
- relative{
- "-1"{"Shalay"}
- "0"{"Maanta"}
- "1"{"Berri"}
- }
- }
- dayperiod{
- dn{"sn./gn."}
- }
- era{
- dn{"Qarni"}
- }
- hour{
- dn{"Saacad"}
- }
- minute{
- dn{"Daqiiqad"}
- }
- month{
- dn{"Bil"}
- }
- second{
- dn{"Il biriqsi"}
- }
- week{
- dn{"Toddobaad"}
- }
- weekday{
- dn{"Maalinta toddobaadka"}
- }
- year{
- dn{"Sanad"}
- }
- zone{
- dn{"Xadka waqtiga"}
- }
- }
monthNames{
format{
abbreviated{
@@ -209,4 +209,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Maalin"}
+ relative{
+ "-1"{"Shalay"}
+ "0"{"Maanta"}
+ "1"{"Berri"}
+ }
+ }
+ dayperiod{
+ dn{"sn./gn."}
+ }
+ era{
+ dn{"Qarni"}
+ }
+ hour{
+ dn{"Saacad"}
+ }
+ minute{
+ dn{"Daqiiqad"}
+ }
+ month{
+ dn{"Bil"}
+ }
+ second{
+ dn{"Il biriqsi"}
+ }
+ week{
+ dn{"Toddobaad"}
+ }
+ weekday{
+ dn{"Maalinta toddobaadka"}
+ }
+ year{
+ dn{"Sanad"}
+ }
+ zone{
+ dn{"Xadka waqtiga"}
+ }
+ }
}
diff --git a/data/locales/so_DJ.txt b/data/locales/so_DJ.txt
index f960bac..7ccfb60 100644
--- a/data/locales/so_DJ.txt
+++ b/data/locales/so_DJ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/so_DJ.xml
// *
// ***************************************************************************
so_DJ{
- Version{"2.0.57.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/so_ET.txt b/data/locales/so_ET.txt
index 917e5c4..1b0a02f 100644
--- a/data/locales/so_ET.txt
+++ b/data/locales/so_ET.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/so_ET.xml
// *
// ***************************************************************************
so_ET{
- Version{"2.0.57.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/so_KE.txt b/data/locales/so_KE.txt
index d4552b1..d154f5f 100644
--- a/data/locales/so_KE.txt
+++ b/data/locales/so_KE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/so_KE.xml
// *
// ***************************************************************************
so_KE{
- Version{"2.0.57.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/so_SO.txt b/data/locales/so_SO.txt
index 03f4950..eedbdac 100644
--- a/data/locales/so_SO.txt
+++ b/data/locales/so_SO.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/so_SO.xml
// *
// ***************************************************************************
so_SO{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/sq.txt b/data/locales/sq.txt
index 44995aa..42016e7 100644
--- a/data/locales/sq.txt
+++ b/data/locales/sq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sq.xml
// *
@@ -33,8 +33,65 @@
}
}
}
- Version{"2.0.77.38"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h.mm.ss.a zzzz",
+ "h.mm.ss.a z",
+ "h.mm.ss.a",
+ "h.mm.a",
+ "EEEE, dd MMMM y G",
+ "dd MMMM y G",
+ "G y-MM-dd",
+ "GGGGG yy-MM-dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ H{"H"}
+ Hm{"H.mm"}
+ Hms{"H.mm.ss"}
+ M{"L"}
+ MEd{"E, d.M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMMEd{"E d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ Md{"M-d"}
+ d{"d"}
+ h{"h.a"}
+ hm{"h.mm.a"}
+ hms{"h.mm.ss.a"}
+ ms{"mm.ss"}
+ y{"y"}
+ yM{"M.y"}
+ yMEd{"E, d.M.y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, d MMM y"}
+ yMMMM{"MMMM y"}
+ }
+ intervalFormats{
+ yMMM{
+ M{"y-MM – MM"}
+ y{"MMM y - MMM y"}
+ }
+ yMMMEd{
+ M{"E, dd MMM - E, dd MMM y"}
+ d{"E, dd - E, dd MMM y"}
+ y{"E, dd MMM y - E, dd MMM y"}
+ }
+ yMMMd{
+ M{"dd MMM - dd MMM y"}
+ d{"dd-dd MMM y"}
+ y{"dd MMM y - dd MMM y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"PD",
@@ -47,7 +104,7 @@
"h.mm.a",
"EEEE, dd MMMM y",
"dd MMMM y",
- "yyyy-MM-dd",
+ "y-MM-dd",
"yy-MM-dd",
"{1} {0}",
"{1} {0}",
@@ -73,12 +130,11 @@
hms{"h.mm.ss.a"}
ms{"mm.ss"}
y{"y"}
- yM{"M.yyyy"}
- yMEd{"E, d.M.yyyy"}
+ yM{"M.y"}
+ yMEd{"E, d.M.y"}
yMMM{"MMM y"}
yMMMEd{"E, d MMM y"}
yMMMM{"MMMM y"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -121,7 +177,7 @@
}
intervalFormats{
yMMM{
- M{"yyyy-MM – MM"}
+ M{"y-MM – MM"}
y{"MMM y - MMM y"}
}
yMMMEd{
diff --git a/data/locales/sq_AL.txt b/data/locales/sq_AL.txt
index 049139d..ebb24eb 100644
--- a/data/locales/sq_AL.txt
+++ b/data/locales/sq_AL.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sq_AL.xml
// *
// ***************************************************************************
sq_AL{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/sq_MK.txt b/data/locales/sq_MK.txt
index 721ecc2..3a5be3c 100755
--- a/data/locales/sq_MK.txt
+++ b/data/locales/sq_MK.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sq_MK.xml
// *
// ***************************************************************************
sq_MK{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/sr.txt b/data/locales/sr.txt
index 68c0339..79554be 100644
--- a/data/locales/sr.txt
+++ b/data/locales/sr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr.xml
// *
@@ -190,7 +190,7 @@
}
}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.47"}
calendar{
buddhist{
eras{
@@ -241,6 +241,152 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "HH.mm.ss zzzz",
+ "HH.mm.ss z",
+ "HH.mm.ss",
+ "HH.mm",
+ "EEEE, dd. MMMM y. G",
+ "dd. MMMM y. G",
+ "dd.MM.y. G",
+ "d.M.yy. GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d."}
+ H{"HH"}
+ Hm{"HH.mm"}
+ Hms{"HH.mm.ss"}
+ M{"L"}
+ MEd{"E, M-d"}
+ MMM{"LLL"}
+ MMMEd{"E d. MMM"}
+ MMMMEd{"E d. MMMM"}
+ MMMMd{"d. MMMM"}
+ MMMMdd{"dd. MMMM"}
+ MMMd{"d. MMM"}
+ MMMdd{"dd.MMM"}
+ MMdd{"MM-dd"}
+ Md{"d/M"}
+ d{"d"}
+ h{"hh a"}
+ hm{"hh.mm a"}
+ hms{"hh.mm.ss a"}
+ ms{"mm.ss"}
+ y{"y."}
+ yM{"y-M"}
+ yMEd{"E, d. M. y."}
+ yMM{"MM.y"}
+ yMMM{"MMM y."}
+ yMMMEd{"E, d. MMM y."}
+ yMMMM{"MMMM y."}
+ yMMMd{"d. MMM y."}
+ yMMdd{"dd.MM.y"}
+ yMd{"d. M. y."}
+ yQQQ{"QQQ. y"}
+ yQQQQ{"QQQQ. y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH-HH"}
+ }
+ Hm{
+ H{"HH.mm-HH.mm"}
+ m{"HH.mm-HH.mm"}
+ }
+ Hmv{
+ H{"HH.mm-HH.mm v"}
+ m{"HH.mm-HH.mm v"}
+ }
+ Hv{
+ H{"HH-HH v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E, d.M - E, d.M"}
+ d{"E, d.M - E, d.M"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"E, dd. MMM - E, dd. MMM"}
+ d{"E, dd. - E, dd. MMM"}
+ }
+ MMMd{
+ M{"dd. MMM - dd. MMM"}
+ d{"dd.-dd. MMM"}
+ }
+ Md{
+ M{"d.M - d.M"}
+ d{"d.M - d.M"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a - h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h.mm a - h.mm a"}
+ h{"h.mm-h.mm a"}
+ m{"h.mm-h.mm a"}
+ }
+ hmv{
+ a{"h.mm a - h.mm a v"}
+ h{"h.mm-h.mm a v"}
+ m{"h.mm-h.mm a v"}
+ }
+ hv{
+ a{"h a - h a v"}
+ h{"h-h a v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"y M - M"}
+ y{"M.y - M.y"}
+ }
+ yMEd{
+ M{"E, d.M.y. - E, d.M.y."}
+ d{"E, d.M.y. - E, d.M.y."}
+ y{"E, d.M.y. - E, d.M.y."}
+ }
+ yMMM{
+ M{"MMM-MMM y."}
+ y{"MMM y. - MMM y."}
+ }
+ yMMMEd{
+ M{"E, dd. MMM - E, dd. MMM y."}
+ d{"E, dd. - E, dd. MMM y."}
+ y{"E, dd. MMM y. - E, dd. MMM y."}
+ }
+ yMMMM{
+ M{"y-MM – MM"}
+ y{"y-MM – y-MM"}
+ }
+ yMMMd{
+ M{"dd. MMM - dd. MMM y."}
+ d{"dd.-dd. MMM y."}
+ y{"dd. MMM y. - dd. MMM y."}
+ }
+ yMd{
+ M{"d.M.y. - d.M.y."}
+ d{"d.M.y. - d.M.y."}
+ y{"d.M.y. - d.M.y."}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"пре подне",
@@ -284,22 +430,16 @@
ms{"mm.ss"}
y{"y."}
yM{"y-M"}
- yMEd{"E, d. M. yyyy."}
+ yMEd{"E, d. M. y."}
+ yMM{"MM.y"}
yMMM{"MMM y."}
yMMMEd{"E, d. MMM y."}
yMMMM{"MMMM y."}
yMMMd{"d. MMM y."}
+ yMMdd{"dd.MM.y"}
yMd{"d. M. y."}
yQQQ{"QQQ. y"}
yQQQQ{"QQQQ. y"}
- yyMM{"MM.yy"}
- yyMMMd{"d. MMM yy."}
- yyMMdd{"dd.MM.yy"}
- yyQQQ{"QQQ yy"}
- yyQQQQ{"QQQQ yy"}
- yyyy{"y."}
- yyyyMM{"yyyy-MM"}
- yyyyMMMM{"MMMM y."}
}
dayNames{
format{
@@ -393,63 +533,6 @@
"Нове ере",
}
}
- fields{
- day{
- dn{"дан"}
- relative{
- "-1"{"јуче"}
- "-2"{"прекјуче"}
- "0"{"данас"}
- "1"{"сутра"}
- "2"{"прекосутра"}
- }
- }
- dayperiod{
- dn{"пре подне/поподне"}
- }
- era{
- dn{"ера"}
- }
- hour{
- dn{"час"}
- }
- minute{
- dn{"минут"}
- }
- month{
- dn{"месец"}
- relative{
- "-1"{"Прошлог месеца"}
- "0"{"Овог месеца"}
- "1"{"Следећег месеца"}
- }
- }
- second{
- dn{"секунд"}
- }
- week{
- dn{"недеља"}
- relative{
- "-1"{"Прошле недеље"}
- "0"{"Ове недеље"}
- "1"{"Следеће недеље"}
- }
- }
- weekday{
- dn{"дан у недељи"}
- }
- year{
- dn{"година"}
- relative{
- "-1"{"Прошле године"}
- "0"{"Ове године"}
- "1"{"Следеће године"}
- }
- }
- zone{
- dn{"зона"}
- }
- }
intervalFormats{
H{
H{"HH-HH"}
@@ -513,13 +596,13 @@
y{"y-y"}
}
yM{
- M{"yyyy M - M"}
- y{"yyyy M - M"}
+ M{"y M - M"}
+ y{"y M - M"}
}
yMEd{
- M{"E, d.M.yy. - E, d.M.yy."}
- d{"E, d.M.yy. - E, d.M.yy."}
- y{"E, d.M.yy. - E, d.M.yy."}
+ M{"E, d.M.y. - E, d.M.y."}
+ d{"E, d.M.y. - E, d.M.y."}
+ y{"E, d.M.y. - E, d.M.y."}
}
yMMM{
M{"MMM-MMM y."}
@@ -531,8 +614,8 @@
y{"E, dd. MMM y. - E, dd. MMM y."}
}
yMMMM{
- M{"yyyy-MM – MM"}
- y{"yyyy-MM – yyyy-MM"}
+ M{"y-MM – MM"}
+ y{"y-MM – y-MM"}
}
yMMMd{
M{"dd. MMM - dd. MMM y."}
@@ -540,9 +623,9 @@
y{"dd. MMM y. - dd. MMM y."}
}
yMd{
- M{"d.M.yy. - d.M.yy."}
- d{"d.M.yy. - d.M.yy."}
- y{"d.M.yy. - d.M.yy."}
+ M{"d.M.y. - d.M.y."}
+ d{"d.M.y. - d.M.y."}
+ y{"d.M.y. - d.M.y."}
}
}
monthNames{
@@ -1042,6 +1125,63 @@
quotationEnd{"“"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"дан"}
+ relative{
+ "-1"{"јуче"}
+ "-2"{"прекјуче"}
+ "0"{"данас"}
+ "1"{"сутра"}
+ "2"{"прекосутра"}
+ }
+ }
+ dayperiod{
+ dn{"пре подне/поподне"}
+ }
+ era{
+ dn{"ера"}
+ }
+ hour{
+ dn{"час"}
+ }
+ minute{
+ dn{"минут"}
+ }
+ month{
+ dn{"месец"}
+ relative{
+ "-1"{"Прошлог месеца"}
+ "0"{"Овог месеца"}
+ "1"{"Следећег месеца"}
+ }
+ }
+ second{
+ dn{"секунд"}
+ }
+ week{
+ dn{"недеља"}
+ relative{
+ "-1"{"Прошле недеље"}
+ "0"{"Ове недеље"}
+ "1"{"Следеће недеље"}
+ }
+ }
+ weekday{
+ dn{"дан у недељи"}
+ }
+ year{
+ dn{"година"}
+ relative{
+ "-1"{"Прошле године"}
+ "0"{"Ове године"}
+ "1"{"Следеће године"}
+ }
+ }
+ zone{
+ dn{"зона"}
+ }
+ }
listPattern{
standard{
2{"{0} и {1}"}
diff --git a/data/locales/sr_BA.txt b/data/locales/sr_BA.txt
index bad5005..9754916 100644
--- a/data/locales/sr_BA.txt
+++ b/data/locales/sr_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/sr_CS.txt b/data/locales/sr_CS.txt
index b6ee46c..23bc131 100644
--- a/data/locales/sr_CS.txt
+++ b/data/locales/sr_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/sr_Cyrl.txt b/data/locales/sr_Cyrl.txt
index 32c0a8e..b7a2e81 100644
--- a/data/locales/sr_Cyrl.txt
+++ b/data/locales/sr_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr_Cyrl.xml
// *
@@ -13,5 +13,5 @@
LocaleScript{
"Cyrl",
}
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/sr_Cyrl_BA.txt b/data/locales/sr_Cyrl_BA.txt
index 951cb8f..f24078a 100644
--- a/data/locales/sr_Cyrl_BA.txt
+++ b/data/locales/sr_Cyrl_BA.txt
@@ -1,14 +1,31 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr_Cyrl_BA.xml
// *
// ***************************************************************************
sr_Cyrl_BA{
- Version{"2.0.45.82"}
+ Version{"2.0.82.51"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH 'часова', mm 'минута', ss 'секунди' zzzz",
+ "HH.mm.ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, dd. MMMM y. G",
+ "dd. MMMM y. G",
+ "G y-MM-dd",
+ "GGGGG yy-MM-dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
gregorian{
DateTimePatterns{
"HH 'часова', mm 'минута', ss 'секунди' zzzz",
@@ -17,7 +34,7 @@
"HH:mm",
"EEEE, dd. MMMM y.",
"dd. MMMM y.",
- "yyyy-MM-dd",
+ "y-MM-dd",
"yy-MM-dd",
"{1} {0}",
"{1} {0}",
diff --git a/data/locales/sr_Cyrl_CS.txt b/data/locales/sr_Cyrl_CS.txt
index 99b0d57..54c3633 100644
--- a/data/locales/sr_Cyrl_CS.txt
+++ b/data/locales/sr_Cyrl_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/sr_Cyrl_ME.txt b/data/locales/sr_Cyrl_ME.txt
index 9c1e13c..bc11b7d 100644
--- a/data/locales/sr_Cyrl_ME.txt
+++ b/data/locales/sr_Cyrl_ME.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr_Cyrl_ME.xml
// *
// ***************************************************************************
sr_Cyrl_ME{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/sr_Cyrl_RS.txt b/data/locales/sr_Cyrl_RS.txt
index 65d9257..d3bbd0a 100644
--- a/data/locales/sr_Cyrl_RS.txt
+++ b/data/locales/sr_Cyrl_RS.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr_Cyrl_RS.xml
// *
// ***************************************************************************
sr_Cyrl_RS{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/sr_Cyrl_YU.txt b/data/locales/sr_Cyrl_YU.txt
index 088b496..608f5f9 100644
--- a/data/locales/sr_Cyrl_YU.txt
+++ b/data/locales/sr_Cyrl_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/sr_Latn.txt b/data/locales/sr_Latn.txt
index 2e5e0d9..8ea9732 100644
--- a/data/locales/sr_Latn.txt
+++ b/data/locales/sr_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr_Latn.xml
// *
@@ -13,11 +13,170 @@
%%Parent{"root"}
AuxExemplarCharacters{"[å q w x y]"}
ExemplarCharacters{"[a b c č ć d {dž} đ e f g h i j k l {lj} m n {nj} o p r s š t u v z ž]"}
+ ExemplarCharactersIndex{"[A B C Č Ć D {DŽ} E F G H I J K L {LJ} M N {NJ} O P Q R S Š T U V W X Y Z Ž]"}
LocaleScript{
"Latn",
}
NumberElements{
latn{
+ patterns{
+ currencyFormat{"#,##0.00 ¤"}
+ decimalFormat{"#,##0.###"}
+ percentFormat{"#,##0%"}
+ scientificFormat{"#E0"}
+ }
+ patternsLong{
+ decimalFormat{
+ 1000{
+ few{"0 hiljade"}
+ many{"0 hiljada"}
+ one{"0 hiljada"}
+ other{"0 hiljada"}
+ }
+ 10000{
+ few{"00 hiljade"}
+ many{"00 hiljada"}
+ one{"00 hiljada"}
+ other{"00 hiljada"}
+ }
+ 100000{
+ few{"000 hiljade"}
+ many{"000 hiljada"}
+ one{"000 hiljada"}
+ other{"000 hiljada"}
+ }
+ 1000000{
+ few{"0 miliona"}
+ many{"0 miliona"}
+ one{"0 milion"}
+ other{"0 miliona"}
+ }
+ 10000000{
+ few{"00 miliona"}
+ many{"00 miliona"}
+ one{"00 milion"}
+ other{"00 miliona"}
+ }
+ 100000000{
+ few{"000 miliona"}
+ many{"000 miliona"}
+ one{"000 milion"}
+ other{"000 miliona"}
+ }
+ 1000000000{
+ few{"0 milijarde"}
+ many{"0 milijardi"}
+ one{"0 milijarda"}
+ other{"0 milijardi"}
+ }
+ 10000000000{
+ few{"00 milijarde"}
+ many{"00 milijardi"}
+ one{"00 milijarda"}
+ other{"00 milijardi"}
+ }
+ 100000000000{
+ few{"000 milijarde"}
+ many{"000 milijardi"}
+ one{"000 milijarda"}
+ other{"000 milijardi"}
+ }
+ 1000000000000{
+ few{"0 triliona"}
+ many{"0 triliona"}
+ one{"0 trilion"}
+ other{"0 triliona"}
+ }
+ 10000000000000{
+ few{"00 triliona"}
+ many{"00 triliona"}
+ one{"00 trilion"}
+ other{"00 triliona"}
+ }
+ 100000000000000{
+ few{"000 triliona"}
+ many{"000 triliona"}
+ one{"000 trilion"}
+ other{"000 triliona"}
+ }
+ }
+ }
+ patternsShort{
+ decimalFormat{
+ 1000{
+ few{"0"}
+ many{"0"}
+ one{"0"}
+ other{"0"}
+ }
+ 10000{
+ few{"00K"}
+ many{"00K"}
+ one{"00 hilj"}
+ other{"00 hilj"}
+ }
+ 100000{
+ few{"000K"}
+ many{"000 hilj"}
+ one{"000 hilj"}
+ other{"000 hilj"}
+ }
+ 1000000{
+ few{"0 mil"}
+ many{"0 mil"}
+ one{"0 mil"}
+ other{"0 mil"}
+ }
+ 10000000{
+ few{"00 mil"}
+ many{"00 mil"}
+ one{"00 mil"}
+ other{"00 mil"}
+ }
+ 100000000{
+ few{"000 mil"}
+ many{"000 mil"}
+ one{"000 mil"}
+ other{"000 mil"}
+ }
+ 1000000000{
+ few{"0 mlrd"}
+ many{"0 mlrd"}
+ one{"0 mlrd"}
+ other{"0 mlrd"}
+ }
+ 10000000000{
+ few{"00 mlrd"}
+ many{"00 mlrd"}
+ one{"00 mlrd"}
+ other{"00 mlrd"}
+ }
+ 100000000000{
+ few{"000 mlrd"}
+ many{"000 mlrd"}
+ one{"000 mlrd"}
+ other{"000 mlrd"}
+ }
+ 1000000000000{
+ few{"0 bil"}
+ many{"0 bil"}
+ one{"0 bil"}
+ other{"0 bil"}
+ }
+ 10000000000000{
+ few{"00 bil"}
+ many{"00 bil"}
+ one{"00 bil"}
+ other{"00 bil"}
+ }
+ 100000000000000{
+ few{"000 bil"}
+ many{"000 bil"}
+ one{"000 bil"}
+ other{"000 bil"}
+ }
+ }
+ }
symbols{
decimal{","}
exponential{"E"}
@@ -32,8 +191,203 @@
}
}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.51"}
calendar{
+ buddhist{
+ eras{
+ abbreviated{
+ "BE",
+ }
+ }
+ }
+ coptic{
+ monthNames{
+ format{
+ wide{
+ "Taut",
+ "Baba",
+ "Hator",
+ "Kiahk",
+ "Toba",
+ "Amšir",
+ "Baramhat",
+ "Baramuda",
+ "Bašans",
+ "Paona",
+ "Epep",
+ "Mesra",
+ "Nasi",
+ }
+ }
+ }
+ }
+ ethiopic{
+ monthNames{
+ format{
+ wide{
+ "Meskerem",
+ "Tekemt",
+ "Hedar",
+ "Tahsas",
+ "Ter",
+ "Jekatit",
+ "Megabit",
+ "Miazia",
+ "Genbot",
+ "Sene",
+ "Hamle",
+ "Nehase",
+ "Pagumen",
+ }
+ }
+ }
+ }
+ generic{
+ DateTimePatterns{
+ "HH.mm.ss zzzz",
+ "HH.mm.ss z",
+ "HH.mm.ss",
+ "HH.mm",
+ "EEEE, dd. MMMM y. G",
+ "dd. MMMM y. G",
+ "dd.MM.y. G",
+ "d.M.yy. GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d."}
+ H{"HH"}
+ Hm{"HH.mm"}
+ Hms{"HH.mm.ss"}
+ M{"L"}
+ MEd{"E, M-d"}
+ MMM{"LLL"}
+ MMMEd{"E d. MMM"}
+ MMMMEd{"E d. MMMM"}
+ MMMMd{"d. MMMM"}
+ MMMMdd{"dd. MMMM"}
+ MMMd{"d. MMM"}
+ MMMdd{"dd.MMM"}
+ MMdd{"MM-dd"}
+ Md{"d/M"}
+ d{"d"}
+ h{"hh a"}
+ hm{"hh.mm a"}
+ hms{"hh.mm.ss a"}
+ ms{"mm.ss"}
+ y{"y."}
+ yM{"y-M"}
+ yMEd{"E, d. M. y."}
+ yMM{"MM.y"}
+ yMMM{"MMM y."}
+ yMMMEd{"E, d. MMM y."}
+ yMMMM{"MMMM y."}
+ yMMMd{"d. MMM y."}
+ yMMdd{"dd.MM.y"}
+ yMd{"d. M. y."}
+ yQQQ{"QQQ. y"}
+ yQQQQ{"QQQQ. y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH-HH"}
+ }
+ Hm{
+ H{"HH.mm-HH.mm"}
+ m{"HH.mm-HH.mm"}
+ }
+ Hmv{
+ H{"HH.mm-HH.mm v"}
+ m{"HH.mm-HH.mm v"}
+ }
+ Hv{
+ H{"HH-HH v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E, d.M - E, d.M"}
+ d{"E, d.M - E, d.M"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"E, dd. MMM - E, dd. MMM"}
+ d{"E, dd. - E, dd. MMM"}
+ }
+ MMMd{
+ M{"dd. MMM - dd. MMM"}
+ d{"dd.-dd. MMM"}
+ }
+ Md{
+ M{"d.M - d.M"}
+ d{"d.M - d.M"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a - h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h.mm a - h.mm a"}
+ h{"h.mm-h.mm a"}
+ m{"h.mm-h.mm a"}
+ }
+ hmv{
+ a{"h.mm a - h.mm a v"}
+ h{"h.mm-h.mm a v"}
+ m{"h.mm-h.mm a v"}
+ }
+ hv{
+ a{"h a - h a v"}
+ h{"h-h a v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"y M - M"}
+ y{"M.y - M.y"}
+ }
+ yMEd{
+ M{"E, d.M.y. - E, d.M.y."}
+ d{"E, d.M.y. - E, d.M.y."}
+ y{"E, d.M.y. - E, d.M.y."}
+ }
+ yMMM{
+ M{"MMM-MMM y."}
+ y{"MMM y. - MMM y."}
+ }
+ yMMMEd{
+ M{"E, dd. MMM - E, dd. MMM y."}
+ d{"E, dd. - E, dd. MMM y."}
+ y{"E, dd. MMM y. - E, dd. MMM y."}
+ }
+ yMMMM{
+ M{"y-MM – MM"}
+ y{"y-MM – y-MM"}
+ }
+ yMMMd{
+ M{"dd. MMM - dd. MMM y."}
+ d{"dd.-dd. MMM y."}
+ y{"dd. MMM y. - dd. MMM y."}
+ }
+ yMd{
+ M{"d.M.y. - d.M.y."}
+ d{"d.M.y. - d.M.y."}
+ y{"d.M.y. - d.M.y."}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"pre podne",
@@ -56,6 +410,7 @@
}
availableFormats{
Ed{"E d."}
+ H{"HH"}
Hm{"HH.mm"}
Hms{"HH.mm.ss"}
M{"L"}
@@ -64,6 +419,7 @@
MMMEd{"E d. MMM"}
MMMMEd{"E d. MMMM"}
MMMMd{"d. MMMM"}
+ MMMMdd{"dd. MMMM"}
MMMd{"d. MMM"}
MMMdd{"dd.MMM"}
MMdd{"MM-dd"}
@@ -75,22 +431,16 @@
ms{"mm.ss"}
y{"y."}
yM{"y-M"}
- yMEd{"E, d. M. yyyy."}
+ yMEd{"E, d. M. y."}
+ yMM{"MM.y"}
yMMM{"MMM y."}
yMMMEd{"E, d. MMM y."}
yMMMM{"MMMM y."}
yMMMd{"d. MMM y."}
+ yMMdd{"dd.MM.y"}
yMd{"d. M. y."}
- yQQQ{"y QQQ"}
- yQQQQ{"y QQQQ"}
- yyMM{"MM.yy"}
- yyMMMd{"d. MMM yy."}
- yyMMdd{"dd.MM.yy"}
- yyQQQ{"QQQ yy"}
- yyQQQQ{"QQQQ yy"}
- yyyy{"y."}
- yyyyMM{"yyyy-MM"}
- yyyyMMMM{"MMMM y."}
+ yQQQ{"QQQ. y"}
+ yQQQQ{"QQQQ. y"}
}
dayNames{
format{
@@ -103,6 +453,24 @@
"pet",
"sub",
}
+ narrow{
+ "n",
+ "p",
+ "u",
+ "s",
+ "č",
+ "p",
+ "s",
+ }
+ short{
+ "ned",
+ "pon",
+ "uto",
+ "sre",
+ "čet",
+ "pet",
+ "sub",
+ }
wide{
"nedelja",
"ponedeljak",
@@ -114,6 +482,15 @@
}
}
stand-alone{
+ abbreviated{
+ "ned",
+ "pon",
+ "uto",
+ "sre",
+ "čet",
+ "pet",
+ "sub",
+ }
narrow{
"n",
"p",
@@ -123,60 +500,40 @@
"p",
"s",
}
+ short{
+ "ne",
+ "po",
+ "ut",
+ "sr",
+ "če",
+ "pe",
+ "su",
+ }
+ wide{
+ "nedelja",
+ "ponedeljak",
+ "utorak",
+ "sreda",
+ "četvrtak",
+ "petak",
+ "subota",
+ }
}
}
eras{
abbreviated{
"p. n. e.",
- "n. e",
+ "n. e.",
+ }
+ narrow{
+ "p.n.e.",
+ "n.e.",
}
wide{
"Pre nove ere",
"Nove ere",
}
}
- fields{
- day{
- dn{"dan"}
- relative{
- "-1"{"juče"}
- "-2"{"prekjuče"}
- "0"{"danas"}
- "1"{"sutra"}
- "2"{"prekosutra"}
- }
- }
- dayperiod{
- dn{"pre podne/ popodne"}
- }
- era{
- dn{"era"}
- }
- hour{
- dn{"čas"}
- }
- minute{
- dn{"minut"}
- }
- month{
- dn{"mesec"}
- }
- second{
- dn{"sekund"}
- }
- week{
- dn{"nedelja"}
- }
- weekday{
- dn{"dan u nedelji"}
- }
- year{
- dn{"godina"}
- }
- zone{
- dn{"zona"}
- }
- }
intervalFormats{
H{
H{"HH-HH"}
@@ -240,13 +597,13 @@
y{"y-y"}
}
yM{
- M{"M.yy - M.yy"}
- y{"M.yy - M.yy"}
+ M{"y M - M"}
+ y{"y M - M"}
}
yMEd{
- M{"E, d.M.yy. - E, d.M.yy."}
- d{"E, d.M.yy. - E, d.M.yy."}
- y{"E, d.M.yy. - E, d.M.yy."}
+ M{"E, d.M.y. - E, d.M.y."}
+ d{"E, d.M.y. - E, d.M.y."}
+ y{"E, d.M.y. - E, d.M.y."}
}
yMMM{
M{"MMM-MMM y."}
@@ -258,8 +615,8 @@
y{"E, dd. MMM y. - E, dd. MMM y."}
}
yMMMM{
- M{"yyyy-MM – MM"}
- y{"yyyy-MM – yyyy-MM"}
+ M{"y-MM – MM"}
+ y{"y-MM – y-MM"}
}
yMMMd{
M{"dd. MMM - dd. MMM y."}
@@ -267,9 +624,9 @@
y{"dd. MMM y. - dd. MMM y."}
}
yMd{
- M{"d.M.yy. - d.M.yy."}
- d{"d.M.yy. - d.M.yy."}
- y{"d.M.yy. - d.M.yy."}
+ M{"d.M.y. - d.M.y."}
+ d{"d.M.y. - d.M.y."}
+ y{"d.M.y. - d.M.y."}
}
}
monthNames{
@@ -288,6 +645,20 @@
"nov",
"dec",
}
+ narrow{
+ "j",
+ "f",
+ "m",
+ "a",
+ "m",
+ "j",
+ "j",
+ "a",
+ "s",
+ "o",
+ "n",
+ "d",
+ }
wide{
"januar",
"februar",
@@ -304,6 +675,20 @@
}
}
stand-alone{
+ abbreviated{
+ "jan",
+ "feb",
+ "mar",
+ "apr",
+ "maj",
+ "jun",
+ "jul",
+ "avg",
+ "sep",
+ "okt",
+ "nov",
+ "dec",
+ }
narrow{
"j",
"f",
@@ -318,21 +703,410 @@
"n",
"d",
}
+ wide{
+ "januar",
+ "februar",
+ "mart",
+ "april",
+ "maj",
+ "jun",
+ "jul",
+ "avgust",
+ "septembar",
+ "oktobar",
+ "novembar",
+ "decembar",
+ }
}
}
quarters{
format{
abbreviated{
- "Q1",
- "Q2",
- "Q3",
- "Q4",
+ "K1",
+ "K2",
+ "K3",
+ "K4",
+ }
+ narrow{
+ "1.",
+ "2.",
+ "3.",
+ "4.",
}
wide{
- "1. kvartal",
- "2. kvartal",
- "3. kvartal",
- "4. kvartal",
+ "Prvo tromesečje",
+ "Drugo tromesečje",
+ "Treće tromesečje",
+ "Četvrto tromesečje",
+ }
+ }
+ stand-alone{
+ abbreviated{
+ "K1",
+ "K2",
+ "K3",
+ "K4",
+ }
+ narrow{
+ "1.",
+ "2.",
+ "3.",
+ "4.",
+ }
+ wide{
+ "Prvo tromesečje",
+ "Drugo tromesečje",
+ "Treće tromesečje",
+ "Četvrto tromesečje",
+ }
+ }
+ }
+ }
+ hebrew{
+ monthNames{
+ format{
+ wide{
+ "Tišri",
+ "Hešvan",
+ "Kislev",
+ "Tevet",
+ "Ševat",
+ "Adar I",
+ "Adar",
+ "Nisan",
+ "Ijar",
+ "Sivan",
+ "Tamuz",
+ "Av",
+ "Elul",
+ "Adar II",
+ }
+ }
+ }
+ }
+ indian{
+ eras{
+ abbreviated{
+ "SAKA",
+ }
+ }
+ monthNames{
+ format{
+ wide{
+ "Čaitra",
+ "Vaisaka",
+ "Jiaista",
+ "Asada",
+ "Sravana",
+ "Badra",
+ "Asvina",
+ "Kartika",
+ "Argajana",
+ "Pauza",
+ "Maga",
+ "Falguna",
+ }
+ }
+ }
+ }
+ islamic{
+ eras{
+ abbreviated{
+ "AH",
+ }
+ }
+ monthNames{
+ format{
+ wide{
+ "Muraham",
+ "Safar",
+ "Rabiʻ I",
+ "Rabiʻ II",
+ "Jumada I",
+ "Jumada II",
+ "Rađab",
+ "Šaʻban",
+ "Ramadan",
+ "Šaval",
+ "Duʻl-Kiʻda",
+ "Duʻl-hiđa",
+ }
+ }
+ }
+ }
+ japanese{
+ DateTimePatterns{
+ "HH.mm.ss zzzz",
+ "HH.mm.ss z",
+ "HH.mm.ss",
+ "HH.mm",
+ "EEEE, MMMM d, y G",
+ "MMMM d, y G",
+ "MMM d, y G",
+ "M/d/yy G",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ eras{
+ abbreviated{
+ "Taika (645-650)",
+ "Hakuči (650-671)",
+ "Hakuho (672-686)",
+ "Šučo (686-701)",
+ "Taiho (701-704)",
+ "Keiun (704-708)",
+ "Vado (708-715)",
+ "Reiki (715-717)",
+ "Joro (717-724)",
+ "Jinki (724-729)",
+ "Tempio (729-749)",
+ "Tempio-kampo (749-749)",
+ "Tempio-šoho (749-757)",
+ "Tempio-hođi (757-765)",
+ "Tempo-đingo (765-767)",
+ "Đingo-keiun (767-770)",
+ "Hoki (770-780)",
+ "Ten-o (781-782)",
+ "Enrjaku (782-806)",
+ "Daido (806-810)",
+ "Konin (810-824)",
+ "Tenčo (824-834)",
+ "Šova (834-848)",
+ "Kajo (848-851)",
+ "Ninju (851-854)",
+ "Saiko (854-857)",
+ "Tenan (857-859)",
+ "Jogan (859-877)",
+ "Genkei (877-885)",
+ "Ninja (885-889)",
+ "Kampjo (889-898)",
+ "Šotai (898-901)",
+ "Enđi (901-923)",
+ "Enčo (923-931)",
+ "Šohei (931-938)",
+ "Tengjo (938-947)",
+ "Tenriaku (947-957)",
+ "Tentoku (957-961)",
+ "Ova (961-964)",
+ "Koho (964-968)",
+ "Ana (968-970)",
+ "Tenroku (970-973)",
+ "Ten-en (973-976)",
+ "Jogen (976-978)",
+ "Tengen (978-983)",
+ "Eikan (983-985)",
+ "Kana (985-987)",
+ "Ei-en (987-989)",
+ "Eiso (989-990)",
+ "Šorjaku (990-995)",
+ "Čotoku (995-999)",
+ "Čoho (999-1004)",
+ "Kanko (1004-1012)",
+ "Čova (1012-1017)",
+ "Kanin (1017-1021)",
+ "Đian (1021-1024)",
+ "Manju (1024-1028)",
+ "Čogen (1028-1037)",
+ "Čorjaku (1037-1040)",
+ "Čokju (1040-1044)",
+ "Kantoku (1044-1046)",
+ "Eišo (1046-1053)",
+ "Tenđi (1053-1058)",
+ "Kohei (1058-1065)",
+ "Đirjaku (1065-1069)",
+ "Enkju (1069-1074)",
+ "Šoho (1074-1077)",
+ "Šorjaku (1077-1081)",
+ "Eišo (1081-1084)",
+ "Otoku (1084-1087)",
+ "Kanđi (1087-1094)",
+ "Kaho (1094-1096)",
+ "Eičo (1096-1097)",
+ "Šotoku (1097-1099)",
+ "Kova (1099-1104)",
+ "Čođi (1104-1106)",
+ "Kašo (1106-1108)",
+ "Tenin (1108-1110)",
+ "Ten-ei (1110-1113)",
+ "Eikju (1113-1118)",
+ "Đen-ei (1118-1120)",
+ "Hoan (1120-1124)",
+ "Tenđi (1124-1126)",
+ "Daiđi (1126-1131)",
+ "Tenšo (1131-1132)",
+ "Čošao (1132-1135)",
+ "Hoen (1135-1141)",
+ "Eiđi (1141-1142)",
+ "Kođi (1142-1144)",
+ "Tenjo (1144-1145)",
+ "Kjuan (1145-1151)",
+ "Ninpei (1151-1154)",
+ "Kjuju (1154-1156)",
+ "Hogen (1156-1159)",
+ "Heiđi (1159-1160)",
+ "Eirjaku (1160-1161)",
+ "Oho (1161-1163)",
+ "Čokan (1163-1165)",
+ "Eiman (1165-1166)",
+ "Nin-an (1166-1169)",
+ "Kao (1169-1171)",
+ "Šoan (1171-1175)",
+ "Angen (1175-1177)",
+ "Đišo (1177-1181)",
+ "Jova (1181-1182)",
+ "Đuei (1182-1184)",
+ "Genrjuku (1184-1185)",
+ "Bunđi (1185-1190)",
+ "Kenkju (1190-1199)",
+ "Šođi (1199-1201)",
+ "Kenin (1201-1204)",
+ "Genkju (1204-1206)",
+ "Ken-ei (1206-1207)",
+ "Šogen (1207-1211)",
+ "Kenrjaku (1211-1213)",
+ "Kenpo (1213-1219)",
+ "Šokju (1219-1222)",
+ "Đu (1222-1224)",
+ "Đenin (1224-1225)",
+ "Karoku (1225-1227)",
+ "Antei (1227-1229)",
+ "Kanki (1229-1232)",
+ "Đoei (1232-1233)",
+ "Tempuku (1233-1234)",
+ "Bunrjaku (1234-1235)",
+ "Katei (1235-1238)",
+ "Rjakunin (1238-1239)",
+ "En-o (1239-1240)",
+ "Ninji (1240-1243)",
+ "Kangen (1243-1247)",
+ "Hođi (1247-1249)",
+ "Kenčo (1249-1256)",
+ "Kogen (1256-1257)",
+ "Šoka (1257-1259)",
+ "Šogen (1259-1260)",
+ "Bun-o (1260-1261)",
+ "Kočo (1261-1264)",
+ "Bun-ei (1264-1275)",
+ "Kenđi (1275-1278)",
+ "Koan (1278-1288)",
+ "Šu (1288-1293)",
+ "Einin (1293-1299)",
+ "Šoan (1299-1302)",
+ "Kengen (1302-1303)",
+ "Kagen (1303-1306)",
+ "Tokuđi (1306-1308)",
+ "Enkei (1308-1311)",
+ "Očo (1311-1312)",
+ "Šova (1312-1317)",
+ "Bunpo (1317-1319)",
+ "Đeno (1319-1321)",
+ "Đenkjo (1321-1324)",
+ "Šoču (1324-1326)",
+ "Kareki (1326-1329)",
+ "Gentoku (1329-1331)",
+ "Genko (1331-1334)",
+ "Kemu (1334-1336)",
+ "Engen (1336-1340)",
+ "Kokoku (1340-1346)",
+ "Šohei (1346-1370)",
+ "Kentoku (1370-1372)",
+ "Buču (1372-1375)",
+ "Tenju (1375-1379)",
+ "Korjaku (1379-1381)",
+ "Kova (1381-1384)",
+ "Genču (1384-1392)",
+ "Meitoku (1384-1387)",
+ "Kakei (1387-1389)",
+ "Ku (1389-1390)",
+ "Meitoku (1390-1394)",
+ "Oei (1394-1428)",
+ "Šočo (1428-1429)",
+ "Eikjo (1429-1441)",
+ "Kakitsu (1441-1444)",
+ "Bun-an (1444-1449)",
+ "Hotoku (1449-1452)",
+ "Kjotoku (1452-1455)",
+ "Košo (1455-1457)",
+ "Čoroku (1457-1460)",
+ "Kanšo (1460-1466)",
+ "Bunšo (1466-1467)",
+ "Onin (1467-1469)",
+ "Bunmei (1469-1487)",
+ "Čokjo (1487-1489)",
+ "Entoku (1489-1492)",
+ "Meio (1492-1501)",
+ "Bunki (1501-1504)",
+ "Eišo (1504-1521)",
+ "Taiei (1521-1528)",
+ "Kjoroku (1528-1532)",
+ "Tenmon (1532-1555)",
+ "Kođi (1555-1558)",
+ "Eiroku (1558-1570)",
+ "Genki (1570-1573)",
+ "Tenšo (1573-1592)",
+ "Bunroku (1592-1596)",
+ "Keičo (1596-1615)",
+ "Genva (1615-1624)",
+ "Kan-ei (1624-1644)",
+ "Šoho (1644-1648)",
+ "Keian (1648-1652)",
+ "Šu (1652-1655)",
+ "Meirjaku (1655-1658)",
+ "Manji (1658-1661)",
+ "Kanbun (1661-1673)",
+ "Enpo (1673-1681)",
+ "Tenva (1681-1684)",
+ "Jokjo (1684-1688)",
+ "Genroku (1688-1704)",
+ "Hoei (1704-1711)",
+ "Šotoku (1711-1716)",
+ "Kjoho (1716-1736)",
+ "Genbun (1736-1741)",
+ "Kanpo (1741-1744)",
+ "Enkjo (1744-1748)",
+ "Kan-en (1748-1751)",
+ "Horjaku (1751-1764)",
+ "Meiva (1764-1772)",
+ "An-ei (1772-1781)",
+ "Tenmei (1781-1789)",
+ "Kansei (1789-1801)",
+ "Kjova (1801-1804)",
+ "Bunka (1804-1818)",
+ "Bunsei (1818-1830)",
+ "Tenpo (1830-1844)",
+ "Koka (1844-1848)",
+ "Kaei (1848-1854)",
+ "Ansei (1854-1860)",
+ "Man-en (1860-1861)",
+ "Bunkju (1861-1864)",
+ "Genđi (1864-1865)",
+ "Keiko (1865-1868)",
+ "Meiđi",
+ "Taišo",
+ "Šova",
+ "Haisei",
+ }
+ }
+ }
+ persian{
+ monthNames{
+ format{
+ wide{
+ "Faravadin",
+ "Ordibehešt",
+ "Kordad",
+ "Tir",
+ "Mordad",
+ "Šahrivar",
+ "Mehr",
+ "Aban",
+ "Azar",
+ "Dej",
+ "Bahman",
+ "Esfand",
}
}
}
@@ -352,13 +1126,73 @@
quotationEnd{"“"}
quotationStart{"„"}
}
+ fields{
+ day{
+ dn{"dan"}
+ relative{
+ "-1"{"juče"}
+ "-2"{"prekjuče"}
+ "0"{"danas"}
+ "1"{"sutra"}
+ "2"{"prekosutra"}
+ }
+ }
+ dayperiod{
+ dn{"pre podne/popodne"}
+ }
+ era{
+ dn{"era"}
+ }
+ hour{
+ dn{"čas"}
+ }
+ minute{
+ dn{"minut"}
+ }
+ month{
+ dn{"mesec"}
+ relative{
+ "-1"{"Prošlog meseca"}
+ "0"{"Ovog meseca"}
+ "1"{"Sledećeg meseca"}
+ }
+ }
+ second{
+ dn{"sekund"}
+ }
+ week{
+ dn{"nedelja"}
+ relative{
+ "-1"{"Prošle nedelje"}
+ "0"{"Ove nedelje"}
+ "1"{"Sledeće nedelje"}
+ }
+ }
+ weekday{
+ dn{"dan u nedelji"}
+ }
+ year{
+ dn{"godina"}
+ relative{
+ "-1"{"Prošle godine"}
+ "0"{"Ove godine"}
+ "1"{"Sledeće godine"}
+ }
+ }
+ zone{
+ dn{"zona"}
+ }
+ }
listPattern{
standard{
2{"{0} i {1}"}
end{"{0} i {1}"}
+ middle{"{0}, {1}"}
+ start{"{0}, {1}"}
}
}
measurementSystemNames{
+ UK{"imperijalni"}
US{"SAD"}
metric{"Metrički"}
}
@@ -367,31 +1201,91 @@
few{"{0} dana"}
many{"{0} dana"}
one{"{0} dan"}
- other{"{0} dana"}
+ other{"{0} dan"}
+ }
+ day-future{
+ few{"za {0} dana"}
+ many{"za {0} dana"}
+ one{"za {0} dan"}
+ other{"za {0} dana"}
+ }
+ day-past{
+ few{"pre {0} dana"}
+ many{"pre {0} dana"}
+ one{"pre {0} dan"}
+ other{"pre {0} dana"}
}
hour{
few{"{0} sata"}
many{"{0} sati"}
one{"{0} sat"}
- other{"{0} sati"}
+ other{"{0} sat"}
+ }
+ hour-future{
+ few{"za {0} sata"}
+ many{"za {0} sati"}
+ one{"za {0} sat"}
+ other{"za {0} sati"}
+ }
+ hour-past{
+ few{"pre {0} sata"}
+ many{"pre {0} sati"}
+ one{"pre {0} sat"}
+ other{"pre {0} sati"}
}
minute{
- few{"{0} minute"}
+ few{"{0} minuta"}
many{"{0} minuta"}
one{"{0} minut"}
- other{"{0} minuta"}
+ other{"{0} minut"}
+ }
+ minute-future{
+ few{"za {0} minuta"}
+ many{"za {0} minuta"}
+ one{"za {0} minut"}
+ other{"za {0} minuta"}
+ }
+ minute-past{
+ few{"pre {0} minuta"}
+ many{"pre {0} minuta"}
+ one{"pre {0} minut"}
+ other{"pre {0} minuta"}
}
month{
few{"{0} meseca"}
many{"{0} meseci"}
one{"{0} mesec"}
- other{"{0} meseci"}
+ other{"{0} mesec"}
+ }
+ month-future{
+ few{"za {0} meseca"}
+ many{"za {0} meseci"}
+ one{"za {0} mesec"}
+ other{"za {0} meseci"}
+ }
+ month-past{
+ few{"pre {0} meseca"}
+ many{"pre {0} meseci"}
+ one{"pre {0} mesec"}
+ other{"pre {0} meseci"}
}
second{
few{"{0} sekunde"}
many{"{0} sekundi"}
one{"{0} sekunda"}
- other{"{0} sekundi"}
+ other{"{0} sekunda"}
+ }
+ second-future{
+ few{"za {0} sekunde"}
+ many{"za {0} sekundi"}
+ one{"za {0} sekund"}
+ other{"za {0} sekundi"}
+ }
+ second-past{
+ few{"pre {0} sekunde"}
+ many{"pre {0} sekundi"}
+ one{"pre {0} sekund"}
+ other{"pre {0} sekundi"}
}
week{
few{"{0} nedelje"}
@@ -399,11 +1293,79 @@
one{"{0} nedelja"}
other{"{0} nedelja"}
}
+ week-future{
+ few{"za {0} nedelje"}
+ many{"za {0} nedelja"}
+ one{"za {0} nedelju"}
+ other{"za {0} nedelja"}
+ }
+ week-past{
+ few{"pre {0} nedelje"}
+ many{"pre {0} nedelja"}
+ one{"pre {0} nedelju"}
+ other{"pre {0} nedelja"}
+ }
year{
few{"{0} godine"}
many{"{0} godina"}
one{"{0} godina"}
other{"{0} godina"}
}
+ year-future{
+ few{"za {0} godine"}
+ many{"za {0} godina"}
+ one{"za {0} godinu"}
+ other{"za {0} godina"}
+ }
+ year-past{
+ few{"pre {0} godine"}
+ many{"pre {0} godina"}
+ one{"pre {0} godinu"}
+ other{"pre {0} godina"}
+ }
+ }
+ unitsShort{
+ day{
+ few{"{0} dana"}
+ many{"{0} dana"}
+ one{"{0} dan"}
+ other{"{0} dan"}
+ }
+ hour{
+ few{"{0} sata"}
+ many{"{0} sati"}
+ one{"{0} sat"}
+ other{"{0} sat"}
+ }
+ minute{
+ few{"{0} min"}
+ many{"{0} min"}
+ one{"{0} min"}
+ other{"{0} min"}
+ }
+ month{
+ few{"{0} mes"}
+ many{"{0} mes"}
+ one{"{0} mes"}
+ other{"{0} mes"}
+ }
+ second{
+ few{"{0} sek"}
+ many{"{0} sek"}
+ one{"{0} sek"}
+ other{"{0} sek"}
+ }
+ week{
+ few{"{0} ned"}
+ many{"{0} ned"}
+ one{"{0} ned"}
+ other{"{0} ned"}
+ }
+ year{
+ few{"{0} god"}
+ many{"{0} god"}
+ one{"{0} god"}
+ other{"{0} god"}
+ }
}
}
diff --git a/data/locales/sr_Latn_BA.txt b/data/locales/sr_Latn_BA.txt
index b3be17a..9243180 100644
--- a/data/locales/sr_Latn_BA.txt
+++ b/data/locales/sr_Latn_BA.txt
@@ -1,11 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr_Latn_BA.xml
// *
// ***************************************************************************
sr_Latn_BA{
- Version{"2.0.41.23"}
+ %%Parent{"sr_Latn"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/sr_Latn_CS.txt b/data/locales/sr_Latn_CS.txt
index f80a8a8..9df1eb2 100644
--- a/data/locales/sr_Latn_CS.txt
+++ b/data/locales/sr_Latn_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/sr_Latn_ME.txt b/data/locales/sr_Latn_ME.txt
index dc98990..e5e4ace 100644
--- a/data/locales/sr_Latn_ME.txt
+++ b/data/locales/sr_Latn_ME.txt
@@ -1,14 +1,32 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr_Latn_ME.xml
// *
// ***************************************************************************
sr_Latn_ME{
- Version{"2.0.74.64"}
+ %%Parent{"sr_Latn"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH.mm.ss zzzz",
+ "HH.mm.ss z",
+ "HH.mm.ss",
+ "HH.mm",
+ "EEEE, dd. MMMM y. G",
+ "d.MM.y. G",
+ "dd.MM.y. G",
+ "d.M.yy. GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
gregorian{
DateTimePatterns{
"HH.mm.ss zzzz",
@@ -16,7 +34,7 @@
"HH.mm.ss",
"HH.mm",
"EEEE, dd. MMMM y.",
- "d.MM.yyyy.",
+ "d.MM.y.",
"dd.MM.y.",
"d.M.yy.",
"{1} {0}",
diff --git a/data/locales/sr_Latn_RS.txt b/data/locales/sr_Latn_RS.txt
index 8f3bae2..c46982a 100644
--- a/data/locales/sr_Latn_RS.txt
+++ b/data/locales/sr_Latn_RS.txt
@@ -1,11 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr_Latn_RS.xml
// *
// ***************************************************************************
sr_Latn_RS{
- Version{"2.0.41.23"}
+ %%Parent{"sr_Latn"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/sr_Latn_YU.txt b/data/locales/sr_Latn_YU.txt
index 56911ca..9451580 100644
--- a/data/locales/sr_Latn_YU.txt
+++ b/data/locales/sr_Latn_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/sr_ME.txt b/data/locales/sr_ME.txt
index 76ef7f7..8535ec0 100644
--- a/data/locales/sr_ME.txt
+++ b/data/locales/sr_ME.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/sr_RS.txt b/data/locales/sr_RS.txt
index d9c7dc2..2fba029 100644
--- a/data/locales/sr_RS.txt
+++ b/data/locales/sr_RS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/sr_YU.txt b/data/locales/sr_YU.txt
index 9bb7c27..e3b8f74 100644
--- a/data/locales/sr_YU.txt
+++ b/data/locales/sr_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/sv.txt b/data/locales/sv.txt
index 6be3d45..74718b8 100644
--- a/data/locales/sv.txt
+++ b/data/locales/sv.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sv.xml
// *
@@ -13,7 +13,10 @@
AuxExemplarCharacters{"[á â ã ā ç ë í î ï ī ñ ó ú ÿ ü æ ø]"}
ExemplarCharacters{"[a à b c d e é f g h i j k l m n o p q r s t u v w x y z å ä ö]"}
ExemplarCharactersIndex{"[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Ä Ö]"}
- ExemplarCharactersPunctuation{"[\- ‐ – — , ; \: ! ? . … ' ‘ ’ \" “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]"}
+ ExemplarCharactersPunctuation{
+ "[\\- ‐ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ "
+ "″]"
+ }
LocaleScript{
"Latn",
}
@@ -131,7 +134,6 @@
}
symbols{
currencyDecimal{":"}
- currencyGroup{"."}
decimal{","}
exponential{"×10^"}
group{" "}
@@ -145,59 +147,9 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
calendar{
buddhist{
- DateTimePatterns{
- "'kl'. HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE d MMMM y G",
- "d MMMM y G",
- "d MMM y G",
- "G yyyy-MM-dd",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E d/M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMEd{"E d:'e' MMMM"}
- MMMMd{"d:'e' MMMM"}
- MMMd{"d MMM"}
- MMd{"d/M"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d"}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yM{"G yyyy-MM"}
- yMEd{"E, G yyyy-MM-dd"}
- yMMM{"MMM y G"}
- yMMMEd{"E d MMM y G"}
- yMMMd{"d MMM y G"}
- yMd{"G yyyy-MM-dd"}
- yQQQ{"G y QQQ"}
- yQQQQ{"G y QQQQ"}
- yyMM{"G yy-MM"}
- yyMMM{"MMM -yy G"}
- yyQQQ{"QQQ yy G"}
- yyyyMM{"G yyyy-MM"}
- yyyyMMM{"MMM y G"}
- yyyyQQQQ{"QQQQ y G"}
- }
eras{
abbreviated{
"BE",
@@ -240,34 +192,34 @@
}
stand-alone{
abbreviated{
- "tout",
- "bâbâ",
- "hâtour",
- "kiahk",
- "toubah",
- "amshîr",
- "barmahât",
- "barmoudah",
- "bashans",
- "ba’ounah",
- "abîb",
- "misra",
- "al-nasi",
+ "Tout",
+ "Bâbâ",
+ "Hâtour",
+ "Kiahk",
+ "Toubah",
+ "Amshîr",
+ "Barmahât",
+ "Barmoudah",
+ "Bashans",
+ "Ba’ounah",
+ "Abîb",
+ "Misra",
+ "Al-nasi",
}
wide{
- "tout",
- "bâbâ",
- "hâtour",
- "kiahk",
- "toubah",
- "amshîr",
- "barmahât",
- "barmoudah",
- "bashans",
- "ba’ounah",
- "abîb",
- "misra",
- "al-nasi",
+ "Tout",
+ "Bâbâ",
+ "Hâtour",
+ "Kiahk",
+ "Toubah",
+ "Amshîr",
+ "Barmahât",
+ "Barmoudah",
+ "Bashans",
+ "Ba’ounah",
+ "Abîb",
+ "Misra",
+ "Al-nasi",
}
}
}
@@ -308,38 +260,178 @@
}
stand-alone{
abbreviated{
- "mäskäräm",
- "teqemt",
- "hedar",
- "tahesas",
- "ter",
- "yäkatit",
- "mägabit",
- "miyazya",
- "guenbot",
- "säné",
- "hamlé",
- "nähasé",
- "pagumén",
+ "Mäskäräm",
+ "Teqemt",
+ "Hedar",
+ "Tahesas",
+ "Ter",
+ "Yäkatit",
+ "Mägabit",
+ "Miyazya",
+ "Guenbot",
+ "Säné",
+ "Hamlé",
+ "Nähasé",
+ "Pagumén",
}
wide{
- "mäskäräm",
- "teqemt",
- "hedar",
- "tahesas",
- "ter",
- "yäkatit",
- "mägabit",
- "miyazya",
- "guenbot",
- "säné",
- "hamlé",
- "nähasé",
- "pagumén",
+ "Mäskäräm",
+ "Teqemt",
+ "Hedar",
+ "Tahesas",
+ "Ter",
+ "Yäkatit",
+ "Mägabit",
+ "Miyazya",
+ "Guenbot",
+ "Säné",
+ "Hamlé",
+ "Nähasé",
+ "Pagumén",
}
}
}
}
+ generic{
+ DateTimePatterns{
+ "'kl'. HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "G y-MM-dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E d MMM y G"}
+ GyMMMd{"d MMM y G"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMMEd{"E d:'e' MMMM"}
+ MMMMd{"d:'e' MMMM"}
+ MMMd{"d MMM"}
+ MMd{"d/M"}
+ MMdd{"dd/MM"}
+ Md{"d/M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y G"}
+ yyyy{"y G"}
+ yyyyM{"G y-MM"}
+ yyyyMEd{"E, y-MM-dd G"}
+ yyyyMM{"G y-MM"}
+ yyyyMMM{"MMM y G"}
+ yyyyMMMEd{"E d MMM y G"}
+ yyyyMMMd{"d MMM y G"}
+ yyyyMd{"G y-MM-dd"}
+ yyyyQQQ{"G y QQQ"}
+ yyyyQQQQ{"G y QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"HH-HH"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E d/M – E d/M"}
+ d{"E d/M – E d/M"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E d MMM – E d MMM"}
+ d{"E d – E d MMM"}
+ }
+ MMMd{
+ M{"d MMM – d MMM"}
+ d{"d–d MMM"}
+ }
+ Md{
+ M{"d/M – d/M"}
+ d{"d–d/M"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y G"}
+ }
+ yM{
+ M{"G y-MM – MM"}
+ y{"G y-MM – y-MM"}
+ }
+ yMEd{
+ M{"E, y-MM-dd – E, y-MM-dd G"}
+ d{"E, y-MM-dd – E, y-MM-dd G"}
+ y{"E, y-MM-dd – E, y-MM-dd G"}
+ }
+ yMMM{
+ M{"MMM–MMM y G"}
+ y{"MMM y – MMM y G"}
+ }
+ yMMMEd{
+ M{"E dd MMM–E dd MMM y G"}
+ d{"E dd MMM–E dd MMM y G"}
+ y{"E dd MMM y–E dd MMM y G"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y G"}
+ y{"MMMM y – MMMM y G"}
+ }
+ yMMMd{
+ M{"d MMM–d MMM y G"}
+ d{"d–d MMM y G"}
+ y{"d MMM y–d MMM y G"}
+ }
+ yMd{
+ M{"G y-MM-dd – MM-dd"}
+ d{"G y-MM-dd – dd"}
+ y{"G y-MM-dd – y-MM-dd"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"fm",
@@ -353,7 +445,7 @@
"EEEE'en' 'den' d:'e' MMMM y",
"d MMMM y",
"d MMM y",
- "yyyy-MM-dd",
+ "y-MM-dd",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -362,6 +454,10 @@
}
availableFormats{
Ed{"E d"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"E d MMM y G"}
+ GyMMMd{"d MMM y G"}
H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -381,20 +477,15 @@
hms{"h:mm:ss a"}
ms{"mm:ss"}
y{"y"}
- yM{"yyyy-MM"}
- yMEd{"E, yyyy-MM-dd"}
+ yM{"y-MM"}
+ yMEd{"E, y-MM-dd"}
+ yMM{"y-MM"}
yMMM{"MMM y"}
yMMMEd{"E d MMM y"}
yMMMd{"d MMM y"}
- yMd{"yyyy-MM-dd"}
+ yMd{"y-MM-dd"}
yQQQ{"y QQQ"}
yQQQQ{"y QQQQ"}
- yyMM{"yy-MM"}
- yyMMM{"MMM -yy"}
- yyQQQ{"QQQ yy"}
- yyyyMM{"yyyy-MM"}
- yyyyMMM{"MMM y"}
- yyyyQQQQ{"QQQQ y"}
}
dayNames{
format{
@@ -437,13 +528,13 @@
}
stand-alone{
abbreviated{
- "sön",
- "mån",
- "tis",
- "ons",
- "tor",
- "fre",
- "lör",
+ "Sön",
+ "Mån",
+ "Tis",
+ "Ons",
+ "Tor",
+ "Fre",
+ "Lör",
}
narrow{
"S",
@@ -455,22 +546,22 @@
"L",
}
short{
- "sö",
- "må",
- "ti",
- "on",
- "to",
- "fr",
- "lö",
+ "Sö",
+ "Må",
+ "Ti",
+ "On",
+ "To",
+ "Fr",
+ "Lö",
}
wide{
- "söndag",
- "måndag",
- "tisdag",
- "onsdag",
- "torsdag",
- "fredag",
- "lördag",
+ "Söndag",
+ "Måndag",
+ "Tisdag",
+ "Onsdag",
+ "Torsdag",
+ "Fredag",
+ "Lördag",
}
}
}
@@ -488,63 +579,6 @@
"efter Kristus",
}
}
- fields{
- day{
- dn{"dag"}
- relative{
- "-1"{"i går"}
- "-2"{"i förrgår"}
- "0"{"i dag"}
- "1"{"i morgon"}
- "2"{"i övermorgon"}
- }
- }
- dayperiod{
- dn{"fm/em"}
- }
- era{
- dn{"era"}
- }
- hour{
- dn{"timme"}
- }
- minute{
- dn{"minut"}
- }
- month{
- dn{"månad"}
- relative{
- "-1"{"förra månaden"}
- "0"{"denna månad"}
- "1"{"nästa månad"}
- }
- }
- second{
- dn{"sekund"}
- }
- week{
- dn{"vecka"}
- relative{
- "-1"{"förra veckan"}
- "0"{"denna vecka"}
- "1"{"nästa vecka"}
- }
- }
- weekday{
- dn{"veckodag"}
- }
- year{
- dn{"år"}
- relative{
- "-1"{"i fjol"}
- "0"{"i år"}
- "1"{"nästa år"}
- }
- }
- zone{
- dn{"tidszon"}
- }
- }
intervalFormats{
H{
H{"HH-HH"}
@@ -600,13 +634,13 @@
y{"y–y"}
}
yM{
- M{"yyyy-MM – MM"}
- y{"yyyy-MM – yyyy-MM"}
+ M{"y-MM – MM"}
+ y{"y-MM – y-MM"}
}
yMEd{
- M{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
- d{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
- y{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
+ M{"E, y-MM-dd – E, y-MM-dd"}
+ d{"E, y-MM-dd – E, y-MM-dd"}
+ y{"E, y-MM-dd – E, y-MM-dd"}
}
yMMM{
M{"MMM–MMM y"}
@@ -627,9 +661,9 @@
y{"d MMM y–d MMM y"}
}
yMd{
- M{"yyyy-MM-dd – MM-dd"}
- d{"yyyy-MM-dd – dd"}
- y{"yyyy-MM-dd – yyyy-MM-dd"}
+ M{"y-MM-dd – MM-dd"}
+ d{"y-MM-dd – dd"}
+ y{"y-MM-dd – y-MM-dd"}
}
}
monthNames{
@@ -679,18 +713,18 @@
}
stand-alone{
abbreviated{
- "jan",
- "feb",
- "mar",
- "apr",
- "maj",
- "jun",
- "jul",
- "aug",
- "sep",
- "okt",
- "nov",
- "dec",
+ "Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "Maj",
+ "Jun",
+ "Jul",
+ "Aug",
+ "Sep",
+ "Okt",
+ "Nov",
+ "Dec",
}
narrow{
"J",
@@ -707,18 +741,18 @@
"D",
}
wide{
- "januari",
- "februari",
- "mars",
- "april",
- "maj",
- "juni",
- "juli",
- "augusti",
- "september",
- "oktober",
- "november",
- "december",
+ "Januari",
+ "Februari",
+ "Mars",
+ "April",
+ "Maj",
+ "Juni",
+ "Juli",
+ "Augusti",
+ "September",
+ "Oktober",
+ "November",
+ "December",
}
}
}
@@ -808,36 +842,36 @@
}
stand-alone{
abbreviated{
- "tishrí",
- "heshván",
- "kislév",
- "tevét",
- "shevát",
- "adár I",
- "adár",
- "nisán",
- "ijjár",
- "siván",
- "tammúz",
- "ab",
- "elúl",
- "adár II",
+ "Tishrí",
+ "Heshván",
+ "Kislév",
+ "Tevét",
+ "Shevát",
+ "Adár I",
+ "Adár",
+ "Nisán",
+ "Ijjár",
+ "Siván",
+ "Tammúz",
+ "Ab",
+ "Elúl",
+ "Adár II",
}
wide{
- "tishrí",
- "heshván",
- "kislév",
- "tevét",
- "shevát",
- "adár I",
- "adár",
- "nisán",
- "ijjár",
- "siván",
- "tammúz",
- "ab",
- "elúl",
- "adár II",
+ "Tishrí",
+ "Heshván",
+ "Kislév",
+ "Tevét",
+ "Shevát",
+ "Adár I",
+ "Adár",
+ "Nisán",
+ "Ijjár",
+ "Siván",
+ "Tammúz",
+ "Ab",
+ "Elúl",
+ "Adár II",
}
}
}
@@ -881,86 +915,37 @@
}
stand-alone{
abbreviated{
- "chaitra",
- "vaishākh",
- "jyaishtha",
- "āshādha",
- "shrāvana",
- "bhādrapad",
- "āshwin",
- "kārtik",
- "mārgashīrsha",
- "paush",
- "māgh",
- "phālgun",
+ "Chaitra",
+ "Vaishākh",
+ "Jyaishtha",
+ "Āshādha",
+ "Shrāvana",
+ "Bhādrapad",
+ "Āshwin",
+ "Kārtik",
+ "Mārgashīrsha",
+ "Paush",
+ "Māgh",
+ "Phālgun",
}
wide{
- "chaitra",
- "vaishākh",
- "jyaishtha",
- "āshādha",
- "shrāvana",
- "bhādrapad",
- "āshwin",
- "kārtik",
- "mārgashīrsha",
- "paush",
- "māgh",
- "phālgun",
+ "Chaitra",
+ "Vaishākh",
+ "Jyaishtha",
+ "Āshādha",
+ "Shrāvana",
+ "Bhādrapad",
+ "Āshwin",
+ "Kārtik",
+ "Mārgashīrsha",
+ "Paush",
+ "Māgh",
+ "Phālgun",
}
}
}
}
islamic{
- DateTimePatterns{
- "'kl'. HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE d MMMM y G",
- "d MMMM y G",
- "d MMM y G",
- "G y-MM-dd",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E d/M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMEd{"E d:'e' MMMM"}
- MMMMd{"d:'e' MMMM"}
- MMMd{"d MMM"}
- MMd{"d/M"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d"}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"G yy-MM"}
- yyMMM{"MMM -yy G"}
- yyQQQ{"QQQ yy G"}
- yyyy{"y G"}
- yyyyM{"G y-MM"}
- yyyyMEd{"E, G y-MM-dd"}
- yyyyMM{"G y-MM"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E d MMM y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"G y-MM-dd"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
- }
eras{
abbreviated{
"AH",
@@ -985,72 +970,23 @@
}
stand-alone{
wide{
- "muharram",
- "safar",
- "rabi’ al-awwal",
- "rabi’ al-akhir",
- "jumada-l-ula",
- "jumada-l-akhira",
- "rajab",
- "sha’ban",
- "ramadan",
- "shawwal",
- "dhu-l-ga’da",
- "dhu-l-hijja",
+ "Muharram",
+ "Safar",
+ "Rabi’ al-awwal",
+ "Rabi’ al-akhir",
+ "Jumada-l-ula",
+ "Jumada-l-akhira",
+ "Rajab",
+ "Sha’ban",
+ "Ramadan",
+ "Shawwal",
+ "Dhu-l-ga’da",
+ "Dhu-l-hijja",
}
}
}
}
japanese{
- DateTimePatterns{
- "'kl'. HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE d MMMM y G",
- "d MMMM y G",
- "d MMM y G",
- "G y-MM-dd",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E d/M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMEd{"E d:'e' MMMM"}
- MMMMd{"d:'e' MMMM"}
- MMMd{"d MMM"}
- MMd{"d/M"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d"}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"G yy-MM"}
- yyMMM{"MMM -yy G"}
- yyQQQ{"QQQ yy G"}
- yyyy{"y G"}
- yyyyM{"G y-MM"}
- yyyyMEd{"E, G y-MM-dd"}
- yyyyMM{"G y-MM"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E d MMM y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"G y-MM-dd"}
- yyyyQQQ{"G y QQQ"}
- yyyyQQQQ{"G y QQQQ"}
- }
eras{
abbreviated{
"Taika (645–650)",
@@ -1075,7 +1011,7 @@
"Daidō (806–810)",
"Kōnin (810–824)",
"Tenchō (824–834)",
- "Shōwa (834–848)",
+ "Jōwa (834–848)",
"Kajō (848–851)",
"Ninju (851–854)",
"Saiko (854–857)",
@@ -1331,86 +1267,37 @@
}
stand-alone{
abbreviated{
- "farvardin",
- "ordibehesht",
- "khordād",
- "tir",
- "mordād",
- "shahrivar",
- "mehr",
- "ābān",
- "āzar",
- "dey",
- "bahman",
- "esfand",
+ "Farvardin",
+ "Ordibehesht",
+ "Khordād",
+ "Tir",
+ "Mordād",
+ "Shahrivar",
+ "Mehr",
+ "Ābān",
+ "Āzar",
+ "Dey",
+ "Bahman",
+ "Esfand",
}
wide{
- "farvardin",
- "ordibehesht",
- "khordād",
- "tir",
- "mordād",
- "shahrivar",
- "mehr",
- "ābān",
- "āzar",
- "dey",
- "bahman",
- "esfand",
+ "Farvardin",
+ "Ordibehesht",
+ "Khordād",
+ "Tir",
+ "Mordād",
+ "Shahrivar",
+ "Mehr",
+ "Ābān",
+ "Āzar",
+ "Dey",
+ "Bahman",
+ "Esfand",
}
}
}
}
roc{
- DateTimePatterns{
- "'kl'. HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "EEEE d MMMM y G",
- "d MMMM y G",
- "d MMM y G",
- "G y-MM-dd",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"E d"}
- Gy{"y G"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"E d/M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMEd{"E d:'e' MMMM"}
- MMMMd{"d:'e' MMMM"}
- MMMd{"d MMM"}
- MMd{"d/M"}
- MMdd{"dd/MM"}
- Md{"d/M"}
- d{"d"}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"G yy-MM"}
- yyMMM{"MMM -yy G"}
- yyQQQ{"QQQ yy G"}
- yyyy{"y G"}
- yyyyM{"G y-MM"}
- yyyyMEd{"E, G y-MM-dd"}
- yyyyMM{"G y-MM"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E d MMM y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"G y-MM-dd"}
- yyyyQQQ{"G y QQQ"}
- yyyyQQQQ{"G y QQQQ"}
- }
eras{
abbreviated{
"före R.K.",
@@ -1425,6 +1312,63 @@
quotationEnd{"”"}
quotationStart{"”"}
}
+ fields{
+ day{
+ dn{"dag"}
+ relative{
+ "-1"{"i går"}
+ "-2"{"i förrgår"}
+ "0"{"i dag"}
+ "1"{"i morgon"}
+ "2"{"i övermorgon"}
+ }
+ }
+ dayperiod{
+ dn{"fm/em"}
+ }
+ era{
+ dn{"era"}
+ }
+ hour{
+ dn{"timme"}
+ }
+ minute{
+ dn{"minut"}
+ }
+ month{
+ dn{"månad"}
+ relative{
+ "-1"{"förra månaden"}
+ "0"{"denna månad"}
+ "1"{"nästa månad"}
+ }
+ }
+ second{
+ dn{"sekund"}
+ }
+ week{
+ dn{"vecka"}
+ relative{
+ "-1"{"förra veckan"}
+ "0"{"denna vecka"}
+ "1"{"nästa vecka"}
+ }
+ }
+ weekday{
+ dn{"veckodag"}
+ }
+ year{
+ dn{"år"}
+ relative{
+ "-1"{"i fjol"}
+ "0"{"i år"}
+ "1"{"nästa år"}
+ }
+ }
+ zone{
+ dn{"tidszon"}
+ }
+ }
listPattern{
standard{
2{"{0} och {1}"}
diff --git a/data/locales/sv_AX.txt b/data/locales/sv_AX.txt
index bc9fad9..8e46741 100755
--- a/data/locales/sv_AX.txt
+++ b/data/locales/sv_AX.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sv_AX.xml
// *
// ***************************************************************************
sv_AX{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/sv_FI.txt b/data/locales/sv_FI.txt
index 947b9d6..c419a84 100644
--- a/data/locales/sv_FI.txt
+++ b/data/locales/sv_FI.txt
@@ -1,21 +1,17 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sv_FI.xml
// *
// ***************************************************************************
sv_FI{
AuxExemplarCharacters{"[ã ç ë í ñ ó š ÿ ü ž]"}
- Version{"2.0.75.99"}
- calendar{
- gregorian{
- fields{
- dayperiod{
- dn{"dagsperiod"}
- }
- }
+ Version{"2.0.82.45"}
+ fields{
+ dayperiod{
+ dn{"dagsperiod"}
}
}
}
diff --git a/data/locales/sv_SE.txt b/data/locales/sv_SE.txt
index c4a4276..1b3e7a3 100644
--- a/data/locales/sv_SE.txt
+++ b/data/locales/sv_SE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sv_SE.xml
// *
// ***************************************************************************
sv_SE{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/sw.txt b/data/locales/sw.txt
index 05d82a8..69a8c9c 100644
--- a/data/locales/sw.txt
+++ b/data/locales/sw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sw.xml
// *
@@ -141,8 +141,146 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d/M"}
+ MMM{"LLL"}
+ MMMEd{"E, d MMM"}
+ MMMMEd{"E, d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ Md{"d-M"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH – HH"}
+ }
+ Hm{
+ H{"HH:mm - HH:mm"}
+ m{"HH:mm – HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm – HH:mm v"}
+ m{"HH:mm - HH:mm v"}
+ }
+ Hv{
+ H{"HH – HH v"}
+ }
+ M{
+ M{"M - M"}
+ }
+ MEd{
+ M{"E, d/M - E, d/M"}
+ d{"E, d/M - E, d/M"}
+ }
+ MMM{
+ M{"MMM - MMM"}
+ }
+ MMMEd{
+ M{"E, d MMM - E, d MMM"}
+ d{"E, d MMM - E, d MMM"}
+ }
+ MMMd{
+ M{"d MMM - d MMM"}
+ d{"d - d MMM"}
+ }
+ Md{
+ M{"d/M - d/M"}
+ d{"d/M - d/M"}
+ }
+ d{
+ d{"d - d"}
+ }
+ h{
+ a{"h a – h a"}
+ h{"h – h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm – h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm - h:mm a v"}
+ m{"h:mm - h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h – h a v"}
+ }
+ y{
+ y{"y - y"}
+ }
+ yM{
+ M{"M/y - M/y"}
+ y{"M/y - M/y"}
+ }
+ yMEd{
+ M{"E, d/M/y - E, d/M/y"}
+ d{"E, d/M/y - E, d/M/y"}
+ y{"E, d/M/y - E, d/M/y"}
+ }
+ yMMM{
+ M{"MMM - MMM y"}
+ y{"MMM y - MMM y"}
+ }
+ yMMMEd{
+ M{"E, d MMM - E, d MMM y"}
+ d{"E, d MMM - E, d MMM y"}
+ y{"E, d MMM y - E, d MMM y"}
+ }
+ yMMMM{
+ M{"MMMM-MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"d MMM - d MMM y"}
+ d{"d - d MMM y"}
+ y{"d MMM y - d MMM y"}
+ }
+ yMd{
+ M{"d/M/y - d/M/y"}
+ d{"d/M/y - d/M/y"}
+ y{"d/M/y - d/M/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"asubuhi",
@@ -156,7 +294,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -251,63 +389,6 @@
"Baada ya Kristo",
}
}
- fields{
- day{
- dn{"Siku"}
- relative{
- "-1"{"Jana"}
- "-2"{"Mtondo"}
- "0"{"Leo"}
- "1"{"Kesho"}
- "2"{"Kesho kutwa"}
- }
- }
- dayperiod{
- dn{"Muda wa siku"}
- }
- era{
- dn{"Enzi"}
- }
- hour{
- dn{"Saa"}
- }
- minute{
- dn{"Dakika"}
- }
- month{
- dn{"Mwezi"}
- relative{
- "-1"{"Mwezi uliopita"}
- "0"{"Mwezi huu"}
- "1"{"Mwezi ujao"}
- }
- }
- second{
- dn{"Sekunde"}
- }
- week{
- dn{"Wiki"}
- relative{
- "-1"{"Wiki iliyopita"}
- "0"{"Wiki hii"}
- "1"{"Wiki ijayo"}
- }
- }
- weekday{
- dn{"Siku ya wiki"}
- }
- year{
- dn{"Mwaka"}
- relative{
- "-1"{"Mwaka uliopita"}
- "0"{"Mwaka huu"}
- "1"{"Mwaka ujao"}
- }
- }
- zone{
- dn{"Majira ya saa"}
- }
- }
intervalFormats{
H{
H{"HH – HH"}
@@ -370,13 +451,13 @@
y{"y - y"}
}
yM{
- M{"M/yy - M/yy"}
- y{"M/yy - M/yy"}
+ M{"M/y - M/y"}
+ y{"M/y - M/y"}
}
yMEd{
- M{"E, d/M/yy - E, d/M/yy"}
- d{"E, d/M/yy - E, d/M/yy"}
- y{"E, d/M/yy - E, d/M/yy"}
+ M{"E, d/M/y - E, d/M/y"}
+ d{"E, d/M/y - E, d/M/y"}
+ y{"E, d/M/y - E, d/M/y"}
}
yMMM{
M{"MMM - MMM y"}
@@ -397,9 +478,9 @@
y{"d MMM y - d MMM y"}
}
yMd{
- M{"d/M/yy - d/M/yy"}
- d{"d/M/yy - d/M/yy"}
- y{"d/M/yy - d/M/yy"}
+ M{"d/M/y - d/M/y"}
+ d{"d/M/y - d/M/y"}
+ y{"d/M/y - d/M/y"}
}
}
monthNames{
@@ -494,6 +575,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Siku"}
+ relative{
+ "-1"{"Jana"}
+ "-2"{"Mtondo"}
+ "0"{"Leo"}
+ "1"{"Kesho"}
+ "2"{"Kesho kutwa"}
+ }
+ }
+ dayperiod{
+ dn{"Muda wa siku"}
+ }
+ era{
+ dn{"Enzi"}
+ }
+ hour{
+ dn{"Saa"}
+ }
+ minute{
+ dn{"Dakika"}
+ }
+ month{
+ dn{"Mwezi"}
+ relative{
+ "-1"{"Mwezi uliopita"}
+ "0"{"Mwezi huu"}
+ "1"{"Mwezi ujao"}
+ }
+ }
+ second{
+ dn{"Sekunde"}
+ }
+ week{
+ dn{"Wiki"}
+ relative{
+ "-1"{"Wiki iliyopita"}
+ "0"{"Wiki hii"}
+ "1"{"Wiki ijayo"}
+ }
+ }
+ weekday{
+ dn{"Siku ya wiki"}
+ }
+ year{
+ dn{"Mwaka"}
+ relative{
+ "-1"{"Mwaka uliopita"}
+ "0"{"Mwaka huu"}
+ "1"{"Mwaka ujao"}
+ }
+ }
+ zone{
+ dn{"Majira ya saa"}
+ }
+ }
listPattern{
standard{
2{"{0} na {1}"}
diff --git a/data/locales/sw_KE.txt b/data/locales/sw_KE.txt
index f993f05..28b9e3c 100644
--- a/data/locales/sw_KE.txt
+++ b/data/locales/sw_KE.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sw_KE.xml
// *
@@ -14,5 +14,5 @@
}
}
}
- Version{"2.0.65.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/sw_TZ.txt b/data/locales/sw_TZ.txt
index d52146f..76b01e0 100644
--- a/data/locales/sw_TZ.txt
+++ b/data/locales/sw_TZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sw_TZ.xml
// *
// ***************************************************************************
sw_TZ{
- Version{"2.0.58.75"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/sw_UG.txt b/data/locales/sw_UG.txt
index b4c220c..e9e8351 100755
--- a/data/locales/sw_UG.txt
+++ b/data/locales/sw_UG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sw_UG.xml
// *
// ***************************************************************************
sw_UG{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/swc.txt b/data/locales/swc.txt
index 9a386f5..831b3d0 100755
--- a/data/locales/swc.txt
+++ b/data/locales/swc.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/swc.xml
// *
@@ -28,8 +28,49 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d/M/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"ya asubuyi",
@@ -43,7 +84,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM y",
- "d/M/yyyy",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -117,46 +158,6 @@
"kisha ya Yezu Kristo",
}
}
- fields{
- day{
- dn{"Siku"}
- relative{
- "-1"{"Jana"}
- "0"{"Leo"}
- "1"{"Kesho"}
- }
- }
- dayperiod{
- dn{"Muda wa siku"}
- }
- era{
- dn{"Wakati"}
- }
- hour{
- dn{"Saa"}
- }
- minute{
- dn{"Dakika"}
- }
- month{
- dn{"Mwezi"}
- }
- second{
- dn{"Sekunde"}
- }
- week{
- dn{"Juma"}
- }
- weekday{
- dn{"Siku ya juma"}
- }
- year{
- dn{"Mwaka"}
- }
- zone{
- dn{"Majira ya saa"}
- }
- }
monthNames{
format{
abbreviated{
@@ -229,4 +230,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Siku"}
+ relative{
+ "-1"{"Jana"}
+ "0"{"Leo"}
+ "1"{"Kesho"}
+ }
+ }
+ dayperiod{
+ dn{"Muda wa siku"}
+ }
+ era{
+ dn{"Wakati"}
+ }
+ hour{
+ dn{"Saa"}
+ }
+ minute{
+ dn{"Dakika"}
+ }
+ month{
+ dn{"Mwezi"}
+ }
+ second{
+ dn{"Sekunde"}
+ }
+ week{
+ dn{"Juma"}
+ }
+ weekday{
+ dn{"Siku ya juma"}
+ }
+ year{
+ dn{"Mwaka"}
+ }
+ zone{
+ dn{"Majira ya saa"}
+ }
+ }
}
diff --git a/data/locales/swc_CD.txt b/data/locales/swc_CD.txt
index fbcf48e..d82fc39 100755
--- a/data/locales/swc_CD.txt
+++ b/data/locales/swc_CD.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/swc_CD.xml
// *
// ***************************************************************************
swc_CD{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ta.txt b/data/locales/ta.txt
index b44e951..e67053a 100644
--- a/data/locales/ta.txt
+++ b/data/locales/ta.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ta.xml
// *
@@ -151,8 +151,150 @@
native{"tamldec"}
traditional{"taml"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM, y G",
+ "d MMMM, y G",
+ "d MMM, y G",
+ "d-M-yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d/M"}
+ MMM{"LLL"}
+ MMMEd{"E, d MMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMdd{"dd-MM"}
+ Md{"d/M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, d/M/y"}
+ yMM{"MM-y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, d MMM, y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d MMM, y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, d/M – E, d/M"}
+ d{"E, d/M – E, d/M"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E, d MMM – E, d MMM"}
+ d{"E, d MMM – E, d MMM"}
+ }
+ MMMd{
+ M{"d MMM – d MMM"}
+ d{"d–d MMM"}
+ }
+ Md{
+ M{"d/M – d/M"}
+ d{"d/M – d/M"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
+ }
+ yMEd{
+ M{"E, d/M/y – E, d/M/y"}
+ d{"E, d/M/y – E, d/M/y"}
+ y{"E, d/M/y – E, d/M/y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y – MMM y"}
+ }
+ yMMMEd{
+ M{"E, d MMM – E, d MMM, y"}
+ d{"E, d MMM – E, d MMM, y"}
+ y{"E, d MMM, y – E, d MMM, y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"d MMM – d MMM, y"}
+ d{"d–d MMM, y"}
+ y{"d MMM, y – d MMM, y"}
+ }
+ yMd{
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"AM",
@@ -194,14 +336,14 @@
y{"y"}
yM{"M/y"}
yMEd{"E, d/M/y"}
+ yMM{"MM-y"}
yMMM{"MMM y"}
yMMMEd{"E, d MMM, y"}
+ yMMMM{"MMMM y"}
yMMMd{"d MMM, y"}
yMd{"d/M/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyyyMM{"MM-yyyy"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -273,63 +415,6 @@
"அனோ டோமினி",
}
}
- fields{
- day{
- dn{"நாள்"}
- relative{
- "-1"{"நேற்று"}
- "-2"{"முந்தா நாள்"}
- "0"{"இன்று"}
- "1"{"நாளை"}
- "2"{"நாளை மறுநாள்"}
- }
- }
- dayperiod{
- dn{"முற்பகல்/பிற்பகல்"}
- }
- era{
- dn{"காலம்"}
- }
- hour{
- dn{"மணி"}
- }
- minute{
- dn{"நிமிடம்"}
- }
- month{
- dn{"மாதம்"}
- relative{
- "-1"{"சென்ற மாதம்"}
- "0"{"இந்த மாதம்"}
- "1"{"அடுத்த மாதம்"}
- }
- }
- second{
- dn{"வினாடி"}
- }
- week{
- dn{"வாரம்"}
- relative{
- "-1"{"கடந்த வாரம்"}
- "0"{"இந்த வாரம்"}
- "1"{"அடுத்த வாரம்"}
- }
- }
- weekday{
- dn{"வார நாள்"}
- }
- year{
- dn{"வருடம்"}
- relative{
- "-1"{"கடந்த வருடம்"}
- "0"{"இந்த ஆண்டு"}
- "1"{"அடுத்த வருடம்"}
- }
- }
- zone{
- dn{"மண்டலம்"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -393,13 +478,13 @@
y{"y–y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E, d/M/yy – E, d/M/yy"}
- d{"E, d/M/yy – E, d/M/yy"}
- y{"E, d/M/yy – E, d/M/yy"}
+ M{"E, d/M/y – E, d/M/y"}
+ d{"E, d/M/y – E, d/M/y"}
+ y{"E, d/M/y – E, d/M/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -420,9 +505,9 @@
y{"d MMM, y – d MMM, y"}
}
yMd{
- M{"d/M/yy – d/M/yy"}
- d{"d/M/yy – d/M/yy"}
- y{"d/M/yy – d/M/yy"}
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y – d/M/y"}
+ y{"d/M/y – d/M/y"}
}
}
monthNames{
@@ -565,6 +650,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"நாள்"}
+ relative{
+ "-1"{"நேற்று"}
+ "-2"{"முந்தா நாள்"}
+ "0"{"இன்று"}
+ "1"{"நாளை"}
+ "2"{"நாளை மறுநாள்"}
+ }
+ }
+ dayperiod{
+ dn{"முற்பகல்/பிற்பகல்"}
+ }
+ era{
+ dn{"காலம்"}
+ }
+ hour{
+ dn{"மணி"}
+ }
+ minute{
+ dn{"நிமிடம்"}
+ }
+ month{
+ dn{"மாதம்"}
+ relative{
+ "-1"{"சென்ற மாதம்"}
+ "0"{"இந்த மாதம்"}
+ "1"{"அடுத்த மாதம்"}
+ }
+ }
+ second{
+ dn{"வினாடி"}
+ }
+ week{
+ dn{"வாரம்"}
+ relative{
+ "-1"{"கடந்த வாரம்"}
+ "0"{"இந்த வாரம்"}
+ "1"{"அடுத்த வாரம்"}
+ }
+ }
+ weekday{
+ dn{"வார நாள்"}
+ }
+ year{
+ dn{"வருடம்"}
+ relative{
+ "-1"{"கடந்த வருடம்"}
+ "0"{"இந்த ஆண்டு"}
+ "1"{"அடுத்த வருடம்"}
+ }
+ }
+ zone{
+ dn{"மண்டலம்"}
+ }
+ }
listPattern{
standard{
2{"{0} மற்றும் {1}"}
diff --git a/data/locales/ta_IN.txt b/data/locales/ta_IN.txt
index 73f6831..bcc6814 100644
--- a/data/locales/ta_IN.txt
+++ b/data/locales/ta_IN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ta_IN.xml
// *
// ***************************************************************************
ta_IN{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ta_LK.txt b/data/locales/ta_LK.txt
index 315b4bf..edcda8e 100755
--- a/data/locales/ta_LK.txt
+++ b/data/locales/ta_LK.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ta_LK.xml
// *
// ***************************************************************************
ta_LK{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ta_MY.txt b/data/locales/ta_MY.txt
index 9334ea6..28b8f02 100755
--- a/data/locales/ta_MY.txt
+++ b/data/locales/ta_MY.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ta_MY.xml
// *
@@ -16,5 +16,5 @@
}
}
}
- Version{"2.0.74.95"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ta_SG.txt b/data/locales/ta_SG.txt
index 26780a6..34dc2ad 100755
--- a/data/locales/ta_SG.txt
+++ b/data/locales/ta_SG.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ta_SG.xml
// *
@@ -16,5 +16,5 @@
}
}
}
- Version{"2.0.74.95"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/te.txt b/data/locales/te.txt
index 56ebc2e..381db71 100644
--- a/data/locales/te.txt
+++ b/data/locales/te.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/te.xml
// *
@@ -151,8 +151,114 @@
}
native{"telu"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd-MM-yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d/M"}
+ MMM{"LLL"}
+ MMMEd{"E, d MMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMdd{"dd-MM"}
+ Md{"d/M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, d/M/y"}
+ yMM{"MM-y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, d, MMM y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"d, MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y – MMM y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"AM",
@@ -194,14 +300,14 @@
y{"y"}
yM{"M/y"}
yMEd{"E, d/M/y"}
+ yMM{"MM-y"}
yMMM{"MMM y"}
yMMMEd{"E, d, MMM y"}
+ yMMMM{"MMMM y"}
yMMMd{"d, MMM y"}
yMd{"d/M/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyyyMM{"MM-yyyy"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -295,63 +401,6 @@
"సన్.",
}
}
- fields{
- day{
- dn{"దినం"}
- relative{
- "-1"{"నిన్న"}
- "-2"{"మొన్న"}
- "0"{"ఈ రోజు"}
- "1"{"రేపు"}
- "2"{"ఎల్లుండి"}
- }
- }
- dayperiod{
- dn{"AM/PM"}
- }
- era{
- dn{"యుగం, శకము"}
- }
- hour{
- dn{"గంట"}
- }
- minute{
- dn{"నిమిషము"}
- }
- month{
- dn{"నెల"}
- relative{
- "-1"{"గత నెల"}
- "0"{"ఈ నెల"}
- "1"{"తర్వాతి నెల"}
- }
- }
- second{
- dn{"క్షణం"}
- }
- week{
- dn{"వారము"}
- relative{
- "-1"{"గత వారం"}
- "0"{"ఈ వారం"}
- "1"{"తదుపరి వారం"}
- }
- }
- weekday{
- dn{"వారంలో రోజు"}
- }
- year{
- dn{"సంవత్సరం"}
- relative{
- "-1"{"మునుపటి సంవత్సరం"}
- "0"{"ఈ సంవత్సరం"}
- "1"{"తర్వాతి సంవత్సరం"}
- }
- }
- zone{
- dn{"మండలం"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -399,8 +448,8 @@
y{"y–y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -551,6 +600,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"దినం"}
+ relative{
+ "-1"{"నిన్న"}
+ "-2"{"మొన్న"}
+ "0"{"ఈ రోజు"}
+ "1"{"రేపు"}
+ "2"{"ఎల్లుండి"}
+ }
+ }
+ dayperiod{
+ dn{"AM/PM"}
+ }
+ era{
+ dn{"యుగం, శకము"}
+ }
+ hour{
+ dn{"గంట"}
+ }
+ minute{
+ dn{"నిమిషము"}
+ }
+ month{
+ dn{"నెల"}
+ relative{
+ "-1"{"గత నెల"}
+ "0"{"ఈ నెల"}
+ "1"{"తర్వాతి నెల"}
+ }
+ }
+ second{
+ dn{"క్షణం"}
+ }
+ week{
+ dn{"వారము"}
+ relative{
+ "-1"{"గత వారం"}
+ "0"{"ఈ వారం"}
+ "1"{"తదుపరి వారం"}
+ }
+ }
+ weekday{
+ dn{"వారంలో రోజు"}
+ }
+ year{
+ dn{"సంవత్సరం"}
+ relative{
+ "-1"{"మునుపటి సంవత్సరం"}
+ "0"{"ఈ సంవత్సరం"}
+ "1"{"తర్వాతి సంవత్సరం"}
+ }
+ }
+ zone{
+ dn{"మండలం"}
+ }
+ }
listPattern{
standard{
2{"{0} మరియు {1}"}
diff --git a/data/locales/te_IN.txt b/data/locales/te_IN.txt
index 1d5a6cc..b89a49f 100644
--- a/data/locales/te_IN.txt
+++ b/data/locales/te_IN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/te_IN.xml
// *
// ***************************************************************************
te_IN{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/teo.txt b/data/locales/teo.txt
index 7d0cbd3..b25cf05 100755
--- a/data/locales/teo.txt
+++ b/data/locales/teo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/teo.xml
// *
@@ -23,8 +23,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"Taparachu",
@@ -38,7 +78,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -111,43 +151,6 @@
"Baada ya Christo",
}
}
- fields{
- day{
- dn{"Aparan"}
- relative{
- "-1"{"Jaan"}
- "0"{"Lolo"}
- "1"{"Moi"}
- }
- }
- dayperiod{
- dn{"TA/EB"}
- }
- era{
- dn{"Enzi"}
- }
- hour{
- dn{"Esaa"}
- }
- minute{
- dn{"Idakika"}
- }
- month{
- dn{"Elap"}
- }
- second{
- dn{"Isekonde"}
- }
- week{
- dn{"Ewiki"}
- }
- year{
- dn{"Ekan"}
- }
- zone{
- dn{"Majira ya saa"}
- }
- }
monthNames{
format{
abbreviated{
@@ -220,4 +223,41 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Aparan"}
+ relative{
+ "-1"{"Jaan"}
+ "0"{"Lolo"}
+ "1"{"Moi"}
+ }
+ }
+ dayperiod{
+ dn{"TA/EB"}
+ }
+ era{
+ dn{"Enzi"}
+ }
+ hour{
+ dn{"Esaa"}
+ }
+ minute{
+ dn{"Idakika"}
+ }
+ month{
+ dn{"Elap"}
+ }
+ second{
+ dn{"Isekonde"}
+ }
+ week{
+ dn{"Ewiki"}
+ }
+ year{
+ dn{"Ekan"}
+ }
+ zone{
+ dn{"Majira ya saa"}
+ }
+ }
}
diff --git a/data/locales/teo_KE.txt b/data/locales/teo_KE.txt
index d50d733..bbd8dba 100755
--- a/data/locales/teo_KE.txt
+++ b/data/locales/teo_KE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/teo_KE.xml
// *
// ***************************************************************************
teo_KE{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/teo_UG.txt b/data/locales/teo_UG.txt
index b93c9f0..b42f444 100755
--- a/data/locales/teo_UG.txt
+++ b/data/locales/teo_UG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/teo_UG.xml
// *
// ***************************************************************************
teo_UG{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/th.txt b/data/locales/th.txt
index 54239c7..50cd495 100644
--- a/data/locales/th.txt
+++ b/data/locales/th.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/th.xml
// *
@@ -20,7 +20,7 @@
"[ก ข ฃ ค ฅ ฆ ง จ ฉ ช ซ ฌ ญ ฎ ฏ ฐ ฑ ฒ ณ ด ต ถ ท ธ น บ ป ผ ฝ พ ฟ ภ ม ย ร ฤ ล ฦ"
" ว ศ ษ ส ห ฬ อ ฮ]"
}
- ExemplarCharactersPunctuation{"[! \" # ' ( ) * , \- . / \: @ \[ \\ \] ‐ – — ‘ ’ “ ” … ′ ″]"}
+ ExemplarCharactersPunctuation{"[! \u0022 # ' ( ) * , \\- . / \\: @ \\[ \\\\ \\] ‐ – — ‘ ’ “ ” … ′ ″]"}
LocaleScript{
"Thai",
}
@@ -128,7 +128,7 @@
}
native{"thai"}
}
- Version{"2.0.79.79"}
+ Version{"2.0.82.57"}
calendar{
buddhist{
DateTimePatterns{
@@ -148,6 +148,10 @@
}
availableFormats{
Ed{"E d"}
+ Gy{"G y"}
+ GyMMM{"MMM G y"}
+ GyMMMEd{"E d MMM G y"}
+ GyMMMd{"d MMM G y"}
H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -166,17 +170,16 @@
mmss{"mm:ss"}
ms{"mm:ss"}
y{"G y"}
- yM{"M/yyyy"}
- yMEd{"E d/M/yyyy"}
- yMMM{"MMM y"}
- yMMMEd{"E d MMM y"}
- yMMMM{"MMMM y"}
- yMMMd{"d MMM y"}
- yMd{"d/M/yyyy"}
- yQQQ{"QQQ y"}
- yQQQQ{"QQQQ y"}
- yyyyM{"M/yyyy"}
+ yyyy{"G y"}
+ yyyyM{"M/y"}
+ yyyyMEd{"E d/M/y"}
+ yyyyMMM{"MMM y"}
+ yyyyMMMEd{"E d MMM y"}
yyyyMMMM{"MMMM y"}
+ yyyyMMMd{"d MMM y"}
+ yyyyMd{"d/M/y"}
+ yyyyQQQ{"QQQ y"}
+ yyyyQQQQ{"QQQQ y"}
}
eras{
abbreviated{
@@ -205,19 +208,19 @@
M{"M-M"}
}
MEd{
- M{"E d – E d/M"}
- d{"E d – E d/M"}
+ M{"E d - E d/M"}
+ d{"E d - E d/M"}
}
MMM{
M{"LLL-LLL"}
}
MMMEd{
- M{"E d MMM – E d MMM"}
- d{"E d – E d MMM"}
+ M{"E d MMM - E d MMM"}
+ d{"E d - E d MMM"}
}
MMMd{
- M{"d MMM – d MMM"}
- d{"d – d MMM"}
+ M{"d MMM - d MMM"}
+ d{"d - d MMM"}
}
Md{
M{"d/M - d/M"}
@@ -249,36 +252,36 @@
y{"y-y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y - M/y"}
+ y{"M/y - M/y"}
}
yMEd{
- M{"E d/M/yy – E d/M/yy"}
- d{"E d – E d/M/yy"}
- y{"E d/M/yy – E d/M/yy"}
+ M{"E d/M/y - E d/M/y"}
+ d{"E d - E d/M/y"}
+ y{"E d/M/y - E d/M/y"}
}
yMMM{
M{"MMM-MMM y"}
y{"MMM y - MMM y"}
}
yMMMEd{
- M{"E d MMM – E d MMM y"}
- d{"E d – E d MMM y"}
- y{"E d MMM y – E d MMM y"}
+ M{"E d MMM - E d MMM y"}
+ d{"E d - E d MMM y"}
+ y{"E d MMM y - E d MMM y"}
}
yMMMM{
M{"MMMM-MMMM y"}
y{"MMMM y - MMMM y"}
}
yMMMd{
- M{"d MMM – d MMM y"}
- d{"d–d MMM y"}
- y{"d MMM y – d MMM y"}
+ M{"d MMM - d MMM y"}
+ d{"d-d MMM y"}
+ y{"d MMM y - d MMM y"}
}
yMd{
- M{"d/M/yy – d/M/yy"}
- d{"d-d/M/yy"}
- y{"d/M/yy – d/M/yy"}
+ M{"d/M/y - d/M/y"}
+ d{"d-d/M/y"}
+ y{"d/M/y - d/M/y"}
}
}
}
@@ -292,11 +295,11 @@
"U MMMM d",
"U MMM d",
"y-M-d",
- "{1}, {0}",
- "{1}, {0}",
- "{1}, {0}",
- "{1}, {0}",
- "{1}, {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
}
cyclicNameSets{
dayParts{
@@ -690,6 +693,149 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "H นาฬิกา mm นาที ss วินาที zzzz",
+ "H นาฬิกา mm นาที ss วินาที z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEEที่ d MMMM G y",
+ "d MMMM G y",
+ "d MMM G y",
+ "d/M/y G",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ "{1}, {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Gy{"G y"}
+ GyMMM{"MMM G y"}
+ GyMMMEd{"E d MMM G y"}
+ GyMMMd{"d MMM G y"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"G y"}
+ yyyy{"G y"}
+ yyyyM{"M/y G"}
+ yyyyMEd{"E d/M/y G"}
+ yyyyMMM{"MMM G y"}
+ yyyyMMMEd{"E d MMM G y"}
+ yyyyMMMd{"d MMM G y"}
+ yyyyMd{"d/M/y G"}
+ yyyyQQQ{"QQQ G y"}
+ yyyyQQQQ{"QQQQ G y"}
+ }
+ intervalFormats{
+ H{
+ H{"H-H"}
+ }
+ Hm{
+ H{"HH:mm-HH:mm"}
+ m{"HH:mm-HH:mm"}
+ }
+ Hmv{
+ H{"H:mm-H:mm v"}
+ m{"H:mm-H:mm v"}
+ }
+ Hv{
+ H{"H-H v"}
+ }
+ M{
+ M{"M-M"}
+ }
+ MEd{
+ M{"E d - E d/M"}
+ d{"E d - E d/M"}
+ }
+ MMM{
+ M{"LLL-LLL"}
+ }
+ MMMEd{
+ M{"E d MMM - E d MMM"}
+ d{"E d - E d MMM"}
+ }
+ MMMd{
+ M{"d MMM - d MMM"}
+ d{"d - d MMM"}
+ }
+ Md{
+ M{"d/M - d/M"}
+ d{"d/M - d/M"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a - h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h:mm a - h:mm a"}
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ a{"h:mm a - h:mm a v"}
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"h a - h a v"}
+ h{"h-h a v"}
+ }
+ y{
+ y{"G y-y"}
+ }
+ yM{
+ M{"M/y - M/y G"}
+ y{"M/y - M/y G"}
+ }
+ yMEd{
+ M{"E d/M/y - E d/M/y G"}
+ d{"E d - E d/M/y G"}
+ y{"E d/M/y - E d/M/y G"}
+ }
+ yMMM{
+ M{"MMM-MMM G y"}
+ y{"MMM y - MMM G y"}
+ }
+ yMMMEd{
+ M{"E d MMM - E d MMM G y"}
+ d{"E d - E d MMM G y"}
+ y{"E d MMM y - E d MMM G y"}
+ }
+ yMMMM{
+ M{"MMMM-MMMM G y"}
+ y{"MMMM y - MMMM G y"}
+ }
+ yMMMd{
+ M{"d MMM - d MMM G y"}
+ d{"d-d MMM G y"}
+ y{"d MMM y - d MMM G y"}
+ }
+ yMd{
+ M{"d/M/y - d/M/y G"}
+ d{"d-d/M/y G"}
+ y{"d/M/y - d/M/y G"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"ก่อนเที่ยง",
@@ -712,6 +858,10 @@
}
availableFormats{
Ed{"E d"}
+ Gy{"G y"}
+ GyMMM{"MMM G y"}
+ GyMMMEd{"E d MMM G y"}
+ GyMMMd{"d MMM G y"}
H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -730,17 +880,15 @@
mmss{"mm:ss"}
ms{"mm:ss"}
y{"y"}
- yM{"M/yyyy"}
- yMEd{"E d/M/yyyy"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
yMMM{"MMM y"}
yMMMEd{"E d MMM y"}
yMMMM{"MMMM y"}
yMMMd{"d MMM y"}
- yMd{"d/M/yyyy"}
+ yMd{"d/M/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyyyM{"M/yyyy"}
- yyyyMMMM{"MMMM y"}
}
dayNames{
format{
@@ -834,70 +982,13 @@
"คริสต์ศักราช",
}
}
- fields{
- day{
- dn{"วัน"}
- relative{
- "-1"{"เมื่อวาน"}
- "-2"{"เมื่อวานซืน"}
- "0"{"วันนี้"}
- "1"{"พรุ่งนี้"}
- "2"{"มะรืนนี้"}
- }
- }
- dayperiod{
- dn{"ช่วงวัน"}
- }
- era{
- dn{"สมัย"}
- }
- hour{
- dn{"ชั่วโมง"}
- }
- minute{
- dn{"นาที"}
- }
- month{
- dn{"เดือน"}
- relative{
- "-1"{"เดือนที่แล้ว"}
- "0"{"เดือนนี้"}
- "1"{"เดือนหน้า"}
- }
- }
- second{
- dn{"วินาที"}
- }
- week{
- dn{"สัปดาห์"}
- relative{
- "-1"{"สัปดาห์ที่แล้ว"}
- "0"{"สัปดาห์นี้"}
- "1"{"สัปดาห์หน้า"}
- }
- }
- weekday{
- dn{"วันในสัปดาห์"}
- }
- year{
- dn{"ปี"}
- relative{
- "-1"{"ปีที่แล้ว"}
- "0"{"ปีนี้"}
- "1"{"ปีหน้า"}
- }
- }
- zone{
- dn{"เขต"}
- }
- }
intervalFormats{
H{
H{"H-H"}
}
Hm{
- H{"HH:mm–HH:mm"}
- m{"HH:mm–HH:mm"}
+ H{"HH:mm-HH:mm"}
+ m{"HH:mm-HH:mm"}
}
Hmv{
H{"H:mm-H:mm v"}
@@ -910,19 +1001,19 @@
M{"M-M"}
}
MEd{
- M{"E d – E d/M"}
- d{"E d – E d/M"}
+ M{"E d - E d/M"}
+ d{"E d - E d/M"}
}
MMM{
M{"LLL-LLL"}
}
MMMEd{
- M{"E d MMM – E d MMM"}
- d{"E d – E d MMM"}
+ M{"E d MMM - E d MMM"}
+ d{"E d - E d MMM"}
}
MMMd{
- M{"d MMM – d MMM"}
- d{"d – d MMM"}
+ M{"d MMM - d MMM"}
+ d{"d - d MMM"}
}
Md{
M{"d/M - d/M"}
@@ -937,7 +1028,7 @@
h{"h-h a"}
}
hm{
- a{"h:mm a – h:mm a"}
+ a{"h:mm a - h:mm a"}
h{"h:mm-h:mm a"}
m{"h:mm-h:mm a"}
}
@@ -954,36 +1045,36 @@
y{"y-y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y - M/y"}
+ y{"M/y - M/y"}
}
yMEd{
- M{"E d/M/yy – E d/M/yy"}
- d{"E d – E d/M/yy"}
- y{"E d/M/yy – E d/M/yy"}
+ M{"E d/M/y - E d/M/y"}
+ d{"E d - E d/M/y"}
+ y{"E d/M/y - E d/M/y"}
}
yMMM{
M{"MMM-MMM y"}
y{"MMM y - MMM y"}
}
yMMMEd{
- M{"E d MMM – E d MMM y"}
- d{"E d – E d MMM y"}
- y{"E d MMM y – E d MMM y"}
+ M{"E d MMM - E d MMM y"}
+ d{"E d - E d MMM y"}
+ y{"E d MMM y - E d MMM y"}
}
yMMMM{
M{"MMMM-MMMM y"}
y{"MMMM y - MMMM y"}
}
yMMMd{
- M{"d MMM – d MMM y"}
- d{"d–d MMM y"}
- y{"d MMM y – d MMM y"}
+ M{"d MMM - d MMM y"}
+ d{"d-d MMM y"}
+ y{"d MMM y - d MMM y"}
}
yMd{
- M{"d/M/yy – d/M/yy"}
- d{"d-d/M/yy"}
- y{"d/M/yy – d/M/yy"}
+ M{"d/M/y - d/M/y"}
+ d{"d-d/M/y"}
+ y{"d/M/y - d/M/y"}
}
}
monthNames{
@@ -1294,47 +1385,6 @@
}
}
islamic{
- DateTimePatterns{
- "H นาฬิกา mm นาที ss วินาที zzzz",
- "H นาฬิกา mm นาที ss วินาที z",
- "HH:mm:ss",
- "HH:mm",
- "EEEEที่ d MMMM G y",
- "d MMMM y",
- "d MMM y",
- "d/M/yyyy",
- "{1}, {0}",
- "{1}, {0}",
- "{1}, {0}",
- "{1}, {0}",
- "{1}, {0}",
- }
- availableFormats{
- H{"H"}
- Hm{"H:mm"}
- Hms{"H:mm:ss"}
- M{"L"}
- MEd{"E, d/M"}
- MMM{"LLL"}
- MMMEd{"E d MMM"}
- MMMMEd{"E d MMMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
- Md{"d/M"}
- d{"d"}
- h{"h a"}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- ms{"mm:ss"}
- y{"y"}
- yM{"M/yyyy"}
- yMEd{"E d/M/yyyy"}
- yMMM{"MMM y"}
- yMMMEd{"E d MMM y"}
- yMMMM{"MMMM y"}
- yQQQ{"QQQ y"}
- yQQQQ{"QQQQ y"}
- }
eras{
abbreviated{
"ฮ.ศ.",
@@ -1443,7 +1493,7 @@
"EEEEที่ d MMMM ปีGที่ y",
"d MMMM ปีG y",
"d MMM G y",
- "d/M/yy",
+ "d/M/yy G",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -1452,6 +1502,10 @@
}
availableFormats{
Ed{"E d"}
+ Gy{"G y"}
+ GyMMM{"MMM G y"}
+ GyMMMEd{"E d MMM G y"}
+ GyMMMd{"d MMM G y"}
H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -1467,12 +1521,15 @@
hms{"h:mm:ss a"}
ms{"mm:ss"}
y{"G y"}
- yyyy{"G yy"}
- yyyyM{"M/GGGGG yy"}
- yyyyMMM{"MMM G yy"}
+ yyyy{"G y"}
+ yyyyM{"M/GGGGG y"}
+ yyyyMEd{"E d/M/GGGGG y"}
+ yyyyMMM{"MMM G y"}
yyyyMMMEd{"E d MMM G y"}
yyyyMMMd{"d MMM G y"}
- yyyyQQQ{"QQQ G yy"}
+ yyyyMd{"d/M/GGGGG y"}
+ yyyyQQQ{"QQQ G y"}
+ yyyyQQQQ{"QQQQ G y"}
}
eras{
abbreviated{
@@ -1830,6 +1887,10 @@
}
availableFormats{
Ed{"E d"}
+ Gy{"ปีGที่ y"}
+ GyMMM{"MMM G y"}
+ GyMMMEd{"E d MMM G y"}
+ GyMMMd{"d MMM G y"}
H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -1845,12 +1906,14 @@
hms{"h:mm:ss a"}
ms{"mm:ss"}
y{"ปีGที่ y"}
- yyyy{"G yy"}
- yyyyM{"M/GGGGG yy"}
- yyyyMMM{"MMM G yy"}
+ yyyy{"ปีGที่ y"}
+ yyyyM{"M/GGGGG y"}
+ yyyyMEd{"E d/M/GGGGG y"}
+ yyyyMMM{"MMM G y"}
yyyyMMMEd{"E d MMM G y"}
yyyyMMMd{"d MMM G y"}
- yyyyQQQ{"QQQ G yy"}
+ yyyyMd{"d/M/GGGGG y"}
+ yyyyQQQ{"QQQ G y"}
}
eras{
abbreviated{
@@ -1866,6 +1929,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"วัน"}
+ relative{
+ "-1"{"เมื่อวาน"}
+ "-2"{"เมื่อวานซืน"}
+ "0"{"วันนี้"}
+ "1"{"พรุ่งนี้"}
+ "2"{"มะรืนนี้"}
+ }
+ }
+ dayperiod{
+ dn{"ช่วงวัน"}
+ }
+ era{
+ dn{"สมัย"}
+ }
+ hour{
+ dn{"ชั่วโมง"}
+ }
+ minute{
+ dn{"นาที"}
+ }
+ month{
+ dn{"เดือน"}
+ relative{
+ "-1"{"เดือนที่แล้ว"}
+ "0"{"เดือนนี้"}
+ "1"{"เดือนหน้า"}
+ }
+ }
+ second{
+ dn{"วินาที"}
+ }
+ week{
+ dn{"สัปดาห์"}
+ relative{
+ "-1"{"สัปดาห์ที่แล้ว"}
+ "0"{"สัปดาห์นี้"}
+ "1"{"สัปดาห์หน้า"}
+ }
+ }
+ weekday{
+ dn{"วันในสัปดาห์"}
+ }
+ year{
+ dn{"ปี"}
+ relative{
+ "-1"{"ปีที่แล้ว"}
+ "0"{"ปีนี้"}
+ "1"{"ปีหน้า"}
+ }
+ }
+ zone{
+ dn{"เขต"}
+ }
+ }
listPattern{
standard{
2{"{0}และ{1}"}
diff --git a/data/locales/th_TH.txt b/data/locales/th_TH.txt
index 221df81..6ede769 100644
--- a/data/locales/th_TH.txt
+++ b/data/locales/th_TH.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/th_TH.xml
// *
// ***************************************************************************
th_TH{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/th_TH_TRADITIONAL.txt b/data/locales/th_TH_TRADITIONAL.txt
index 9a5620e..37548cf 100644
--- a/data/locales/th_TH_TRADITIONAL.txt
+++ b/data/locales/th_TH_TRADITIONAL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/ti.txt b/data/locales/ti.txt
index deb63a4..36d357b 100644
--- a/data/locales/ti.txt
+++ b/data/locales/ti.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ti.xml
// *
@@ -35,8 +35,32 @@
native{"latn"}
traditional{"ethi"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE፣ dd MMMM መዓልቲ y G",
+ "dd MMMM y G",
+ "dd-MMM-y G",
+ "dd/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MMMMdd{"dd MMMM"}
+ MMdd{"dd/MM"}
+ yMM{"MM/y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"ንጉሆ ሰዓተ",
@@ -60,9 +84,9 @@
availableFormats{
MMMMdd{"dd MMMM"}
MMdd{"dd/MM"}
- yyMM{"MM/yy"}
- yyQQQ{"QQQ yy"}
- yyyyMMMM{"MMMM y"}
+ yMM{"MM/y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
}
dayNames{
format{
diff --git a/data/locales/ti_ER.txt b/data/locales/ti_ER.txt
index cb9e955..1608d2b 100644
--- a/data/locales/ti_ER.txt
+++ b/data/locales/ti_ER.txt
@@ -1,14 +1,31 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ti_ER.xml
// *
// ***************************************************************************
ti_ER{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE፡ dd MMMM መዓልቲ y G",
+ "dd MMMM y G",
+ "dd-MMM-y G",
+ "dd/MM/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ }
gregorian{
DateTimePatterns{
"h:mm:ss a zzzz",
diff --git a/data/locales/ti_ET.txt b/data/locales/ti_ET.txt
index a61ad0d..2605232 100644
--- a/data/locales/ti_ET.txt
+++ b/data/locales/ti_ET.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ti_ET.xml
// *
// ***************************************************************************
ti_ET{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/tl.txt b/data/locales/tl.txt
index 2a55f9a..85b090c 100755
--- a/data/locales/tl.txt
+++ b/data/locales/tl.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/tl_PH.txt b/data/locales/tl_PH.txt
index 52f1969..c788c54 100755
--- a/data/locales/tl_PH.txt
+++ b/data/locales/tl_PH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/to.txt b/data/locales/to.txt
index 93fcd54..f854838 100755
--- a/data/locales/to.txt
+++ b/data/locales/to.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/to.xml
// *
@@ -28,8 +28,132 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d/M/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ Hm{"H:mm"}
+ Hms{"H:mm:ss"}
+ M{"L"}
+ MEd{"E, d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMMEd{"E d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M-y"}
+ yMEd{"E, d/M/y"}
+ yMM{"MM-y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"y QQQ"}
+ yQQQQ{"y QQQQ"}
+ }
+ intervalFormats{
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, d/M - E, d/M"}
+ d{"E, d/M - E, d/M"}
+ }
+ MMM{
+ M{"LLL–LLL"}
+ }
+ MMMEd{
+ M{"E, d MMM - E, d MMM"}
+ d{"E, d MMM - E, d MMM"}
+ }
+ MMMd{
+ M{"d MMM - d MMM"}
+ d{"d-d MMM"}
+ }
+ Md{
+ M{"d/M - d/M"}
+ d{"d/M - d/M"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"M/y - M/y"}
+ y{"M/y - M/y"}
+ }
+ yMEd{
+ M{"E, d/M/y - E, d/M/y"}
+ d{"E, d/M/y - E, d/M/y"}
+ y{"E, d/M/y - E, d/M/y"}
+ }
+ yMMM{
+ M{"MMM-MMM y"}
+ y{"MMM y - MMM y"}
+ }
+ yMMMEd{
+ M{"E, d MMM - E, d MMM y"}
+ d{"E, d MMM - E, d MMM y"}
+ y{"E, d MMM y - E, d MMM y"}
+ }
+ yMMMM{
+ M{"MMMM - MMMM y"}
+ y{"MMMM y - MMMM y"}
+ }
+ yMMMd{
+ M{"d MMM - d MMM y"}
+ d{"MMM d-d, y"}
+ y{"d MMM y - d MMM y"}
+ }
+ yMd{
+ M{"d/M/y - d/M/y"}
+ d{"d/M/y - d/M/y"}
+ y{"d/M/y - d/M/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"AM",
@@ -67,16 +191,14 @@
hms{"h:mm:ss a"}
ms{"mm:ss"}
y{"y"}
- yM{"M-yyyy"}
- yMEd{"E, d/M/yyyy"}
+ yM{"M-y"}
+ yMEd{"E, d/M/y"}
+ yMM{"MM-y"}
yMMM{"MMM y"}
yMMMEd{"E d MMM y"}
yMMMM{"MMMM y"}
yQQQ{"y QQQ"}
yQQQQ{"y QQQQ"}
- yyMM{"MM-yy"}
- yyMMM{"MMM yy"}
- yyQQQ{"QQQ yy"}
}
dayNames{
format{
@@ -152,48 +274,6 @@
"taʻu ʻo Sīsū",
}
}
- fields{
- day{
- dn{"ʻaho"}
- relative{
- "-1"{"ʻaneafi"}
- "-2"{"ʻaneheafi"}
- "0"{"ʻaho⸍ni"}
- "1"{"ʻapongipongi"}
- "2"{"ʻahepongipongi"}
- }
- }
- dayperiod{
- dn{"AM/PM"}
- }
- era{
- dn{"kuonga"}
- }
- hour{
- dn{"houa"}
- }
- minute{
- dn{"miniti"}
- }
- month{
- dn{"māhina"}
- }
- second{
- dn{"sekoni"}
- }
- week{
- dn{"uike"}
- }
- weekday{
- dn{"ʻaho ʻo e uike"}
- }
- year{
- dn{"taʻu"}
- }
- zone{
- dn{"taimi fakavahe"}
- }
- }
intervalFormats{
M{
M{"M–M"}
@@ -243,13 +323,13 @@
y{"y–y"}
}
yM{
- M{"M/yy - M/yy"}
- y{"M/yy - M/yy"}
+ M{"M/y - M/y"}
+ y{"M/y - M/y"}
}
yMEd{
- M{"E, d/M/yy - E, d/M/yy"}
- d{"E, d/M/yy - E, d/M/yy"}
- y{"E, d/M/yy - E, d/M/yy"}
+ M{"E, d/M/y - E, d/M/y"}
+ d{"E, d/M/y - E, d/M/y"}
+ y{"E, d/M/y - E, d/M/y"}
}
yMMM{
M{"MMM-MMM y"}
@@ -270,9 +350,9 @@
y{"d MMM y - d MMM y"}
}
yMd{
- M{"d/M/yy - d/M/yy"}
- d{"d/M/yy - d/M/yy"}
- y{"d/M/yy - d/M/yy"}
+ M{"d/M/y - d/M/y"}
+ d{"d/M/y - d/M/y"}
+ y{"d/M/y - d/M/y"}
}
}
monthNames{
@@ -403,6 +483,48 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"ʻaho"}
+ relative{
+ "-1"{"ʻaneafi"}
+ "-2"{"ʻaneheafi"}
+ "0"{"ʻaho⸍ni"}
+ "1"{"ʻapongipongi"}
+ "2"{"ʻahepongipongi"}
+ }
+ }
+ dayperiod{
+ dn{"AM/PM"}
+ }
+ era{
+ dn{"kuonga"}
+ }
+ hour{
+ dn{"houa"}
+ }
+ minute{
+ dn{"miniti"}
+ }
+ month{
+ dn{"māhina"}
+ }
+ second{
+ dn{"sekoni"}
+ }
+ week{
+ dn{"uike"}
+ }
+ weekday{
+ dn{"ʻaho ʻo e uike"}
+ }
+ year{
+ dn{"taʻu"}
+ }
+ zone{
+ dn{"taimi fakavahe"}
+ }
+ }
measurementSystemNames{
US{"fakaʻamelika"}
metric{"fakamita"}
diff --git a/data/locales/to_TO.txt b/data/locales/to_TO.txt
index 0c3b0cc..0083466 100755
--- a/data/locales/to_TO.txt
+++ b/data/locales/to_TO.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/to_TO.xml
// *
// ***************************************************************************
to_TO{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/tr.txt b/data/locales/tr.txt
index 19a6e10..e541f0c 100644
--- a/data/locales/tr.txt
+++ b/data/locales/tr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/tr.xml
// *
@@ -14,9 +14,12 @@
"[á à ă â å ä ã ā æ ç é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ø ō œ ö q ß ú ù ŭ û ū"
" ü w x ÿ]"
}
- ExemplarCharacters{"[a b c ç d e f g ğ h ı i {i\u0307} j k l m n o ö p r s ş t u ü v y z]"}
+ ExemplarCharacters{"[a b c ç d e f g ğ h ı i İ j k l m n o ö p r s ş t u ü v y z]"}
ExemplarCharactersIndex{"[A B C Ç D E F G H I İ J K L M N O Ö P Q R S Ş T U Ü V W X Y Z]"}
- ExemplarCharactersPunctuation{"[\- ‐ – — , ; \: ! ? . … ' ‘ ’ \" “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]"}
+ ExemplarCharactersPunctuation{
+ "[\\- ‐ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ "
+ "″]"
+ }
LocaleScript{
"Latn",
}
@@ -122,54 +125,13 @@
}
}
}
- Version{"2.0.79.79"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "dd MMMM y G EEEE",
- "dd MMMM y G",
- "dd MMM y G",
- "d.MM.yyyy G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"d E"}
- Gy{"y G"}
- H{"HH"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"dd.MM E"}
- MMM{"LLL"}
- MMMEd{"dd MMM E"}
- MMMd{"dd MMM"}
- Md{"dd.MM"}
- d{"d"}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- mmss{"mm:ss"}
- ms{"mm:ss"}
- y{"y G"}
- yM{"MM.y G"}
- yMEd{"dd.MM.y G E"}
- yMMM{"MMM y G"}
- yMMMEd{"dd MMM y G E"}
- yMMMM{"MMMM y G"}
- yMMMd{"dd MMM y G"}
- yMd{"dd.MM.y G"}
- yQQQ{"QQQ y G"}
- yQQQQ{"QQQQ y G"}
- yyMM{"MM.yy G"}
- yyMMM{"MMM yy G"}
- yyyy{"y G"}
+ eras{
+ abbreviated{
+ "BE",
+ }
}
}
coptic{
@@ -214,6 +176,154 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "d MMMM y G EEEE",
+ "d MMMM y G",
+ "d MMM y G",
+ "d.MM.y G",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"d MMM y G E"}
+ GyMMMd{"dd MMM y G"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"dd.MM E"}
+ MMM{"LLL"}
+ MMMEd{"d MMMM E"}
+ MMMMEd{"dd MMMM E"}
+ MMMMd{"dd MMMM"}
+ MMMd{"d MMMM"}
+ Md{"dd.MM"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ mmss{"mm:ss"}
+ ms{"mm:ss"}
+ y{"y G"}
+ yyyy{"y G"}
+ yyyyM{"MM.y G"}
+ yyyyMEd{"dd.MM.y G E"}
+ yyyyMM{"MM.y G"}
+ yyyyMMM{"MMM y G"}
+ yyyyMMMEd{"d MMM y G E"}
+ yyyyMMMM{"MMMM y G"}
+ yyyyMMMd{"dd MMM y G"}
+ yyyyMd{"dd.MM.y G"}
+ yyyyQQQ{"G y/QQQ"}
+ yyyyQQQQ{"G y/QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"HH-HH"}
+ }
+ Hm{
+ H{"HH:mm-HH:mm"}
+ m{"HH:mm-HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm-HH:mm v"}
+ m{"HH:mm-HH:mm v"}
+ }
+ Hv{
+ H{"HH-HH v"}
+ }
+ M{
+ M{"MM - MM"}
+ }
+ MEd{
+ M{"dd/MM E - dd/MM E"}
+ d{"dd/MM E - dd/MM E"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"d MMM E - d MMM E"}
+ d{"d MMM E - d MMM E"}
+ }
+ MMMd{
+ M{"d MMM - d MMM"}
+ d{"d - d MMM"}
+ }
+ Md{
+ M{"dd/MM - dd/MM"}
+ d{"dd/MM - dd/MM"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h a - h a"}
+ h{"h-h a"}
+ }
+ hm{
+ a{"h:mm a - h:mm a"}
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ a{"h:mm a - h:mm a v"}
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"h a - h a v"}
+ h{"h-h a v"}
+ }
+ y{
+ y{"y-y G"}
+ }
+ yM{
+ M{"MM/y - MM/y G"}
+ y{"MM/y - MM/y G"}
+ }
+ yMEd{
+ M{"dd.MM.y E - dd.MM.y E"}
+ d{"dd.MM.y E - dd.MM.y E"}
+ y{"dd.MM.y E - dd.MM.y E"}
+ }
+ yMMM{
+ M{"MMM-MMM y G"}
+ y{"MMM y - MMM y G"}
+ }
+ yMMMEd{
+ M{"d MMM y E - d MMM y E"}
+ d{"d MMM y E - d MMM y E"}
+ y{"d MMM y E - d MMM y E"}
+ }
+ yMMMM{
+ M{"MMMM-MMMM y G"}
+ y{"MMMM y - MMMM y G"}
+ }
+ yMMMd{
+ M{"d MMM - d MMM y G"}
+ d{"d - d MMM y G"}
+ y{"d MMM y - d MMM y G"}
+ }
+ yMd{
+ M{"dd.MM.y - dd.MM.y G"}
+ d{"dd.MM.y - dd.MM.y G"}
+ y{"dd.MM.y - dd.MM.y G"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"ÖÖ",
@@ -227,7 +337,7 @@
"d MMMM y EEEE",
"d MMMM y",
"d MMM y",
- "d.MM.yyyy",
+ "d MM y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -236,6 +346,10 @@
}
availableFormats{
Ed{"d E"}
+ Gy{"y G"}
+ GyMMM{"MMM y G"}
+ GyMMMEd{"d MMM y G E"}
+ GyMMMd{"dd MMM y G"}
H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -255,19 +369,15 @@
ms{"mm:ss"}
y{"y"}
yM{"MM/y"}
- yMEd{"dd.MM.yyyy E"}
+ yMEd{"dd.MM.y E"}
+ yMM{"MM.y"}
yMMM{"MMM y"}
yMMMEd{"d MMM y E"}
yMMMM{"MMMM y"}
yMMMd{"dd MMM y"}
- yMd{"dd.MM.yyyy"}
+ yMd{"dd.MM.y"}
yQQQ{"y/QQQ"}
yQQQQ{"y/QQQQ"}
- yyMM{"MM.yy"}
- yyMMM{"MMM yy"}
- yyQQQ{"QQQ yy"}
- yyQQQQ{"QQQQ yy"}
- yyyy{"y"}
}
dayNames{
format{
@@ -357,63 +467,6 @@
"Milattan Sonra",
}
}
- fields{
- day{
- dn{"Gün"}
- relative{
- "-1"{"Dün"}
- "-2"{"Evvelsi gün"}
- "0"{"Bugün"}
- "1"{"Yarın"}
- "2"{"Öbür gün"}
- }
- }
- dayperiod{
- dn{"ÖÖ/ÖS"}
- }
- era{
- dn{"Miladi Dönem"}
- }
- hour{
- dn{"Saat"}
- }
- minute{
- dn{"Dakika"}
- }
- month{
- dn{"Ay"}
- relative{
- "-1"{"Geçen ay"}
- "0"{"Bu ay"}
- "1"{"Gelecek ay"}
- }
- }
- second{
- dn{"Saniye"}
- }
- week{
- dn{"Hafta"}
- relative{
- "-1"{"Geçen hafta"}
- "0"{"Bu hafta"}
- "1"{"Gelecek hafta"}
- }
- }
- weekday{
- dn{"Haftanın Günü"}
- }
- year{
- dn{"Yıl"}
- relative{
- "-1"{"Geçen yıl"}
- "0"{"Bu yıl"}
- "1"{"Gelecek yıl"}
- }
- }
- zone{
- dn{"Saat Dilimi"}
- }
- }
intervalFormats{
H{
H{"HH-HH"}
@@ -477,13 +530,13 @@
y{"y-y"}
}
yM{
- M{"MM/yy - MM/yy"}
- y{"MM/yy - MM/yy"}
+ M{"MM/y - MM/y"}
+ y{"MM/y - MM/y"}
}
yMEd{
- M{"dd.MM.yy E - dd.MM.yy E"}
- d{"dd.MM.yy E - dd.MM.yy E"}
- y{"dd.MM.yy E - dd.MM.yy E"}
+ M{"dd.MM.y E - dd.MM.y E"}
+ d{"dd.MM.y E - dd.MM.y E"}
+ y{"dd.MM.y E - dd.MM.y E"}
}
yMMM{
M{"MMM-MMM y"}
@@ -504,9 +557,9 @@
y{"d MMM y - d MMM y"}
}
yMd{
- M{"dd.MM.yy - dd.MM.yy"}
- d{"dd.MM.yy - dd.MM.yy"}
- y{"dd.MM.yy - dd.MM.yy"}
+ M{"dd.MM.y - dd.MM.y"}
+ d{"dd.MM.y - dd.MM.y"}
+ y{"dd.MM.y - dd.MM.y"}
}
}
monthNames{
@@ -665,54 +718,6 @@
}
}
islamic{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "dd MMMM y G EEEE",
- "dd MMMM y G",
- "dd MMM y G",
- "d.MM.yyyy G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"d E"}
- Gy{"y G"}
- H{"HH"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"dd.MM E"}
- MMM{"LLL"}
- MMMEd{"dd MMM E"}
- MMMd{"dd MMM"}
- Md{"dd.MM"}
- d{"d"}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- mmss{"mm:ss"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM.yy G"}
- yyMMM{"MMM yy G"}
- yyQQQ{"QQQ yy G"}
- yyQQQQ{"QQQQ yy G"}
- yyyy{"y G"}
- yyyyM{"MM.y G"}
- yyyyMEd{"dd.MM.y G E"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"dd MMM y G E"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"dd MMM y G"}
- yyyyMd{"dd.MM.y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
- }
monthNames{
format{
abbreviated{
@@ -768,49 +773,16 @@
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
- "dd MMMM y G EEEE",
- "dd MMMM y G",
- "dd MMM y G",
- "d.MM.yyyy G",
+ "d MMMM y G EEEE",
+ "d MMMM y G",
+ "d MMM y G",
+ "d.MM.y G",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
- availableFormats{
- Ed{"d E"}
- Gy{"y G"}
- H{"HH"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"dd.MM E"}
- MMM{"LLL"}
- MMMEd{"dd MMM E"}
- MMMd{"dd MMM"}
- Md{"dd.MM"}
- d{"d"}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- mmss{"mm:ss"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM.yy G"}
- yyMMM{"MMM yy G"}
- yyQQQ{"QQQ yy G"}
- yyQQQQ{"QQQQ yy G"}
- yyyy{"y G"}
- yyyyM{"MM.y G"}
- yyyyMEd{"dd.MM.y G E"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"dd MMM y G E"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"dd MMM y G"}
- yyyyMd{"dd.MM.y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
- }
}
persian{
monthNames{
@@ -833,53 +805,11 @@
}
}
roc{
- DateTimePatterns{
- "HH:mm:ss zzzz",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "dd MMMM y G EEEE",
- "dd MMMM y G",
- "dd MMM y G",
- "d.MM.yyyy G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"d E"}
- Gy{"y G"}
- H{"HH"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"L"}
- MEd{"dd.MM E"}
- MMM{"LLL"}
- MMMEd{"dd MMM E"}
- MMMd{"dd MMM"}
- Md{"dd.MM"}
- d{"d"}
- hm{"h:mm a"}
- hms{"h:mm:ss a"}
- mmss{"mm:ss"}
- ms{"mm:ss"}
- y{"y G"}
- yyMM{"MM.yy G"}
- yyMMM{"MMM yy G"}
- yyQQQ{"QQQ yy G"}
- yyQQQQ{"QQQQ yy G"}
- yyyy{"y G"}
- yyyyM{"MM.y G"}
- yyyyMEd{"dd.MM.y G E"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"dd MMM y G E"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"dd MMM y G"}
- yyyyMd{"dd.MM.y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
+ eras{
+ abbreviated{
+ "Before R.O.C.",
+ "Minguo",
+ }
}
}
}
@@ -889,6 +819,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Gün"}
+ relative{
+ "-1"{"Dün"}
+ "-2"{"Evvelsi gün"}
+ "0"{"Bugün"}
+ "1"{"Yarın"}
+ "2"{"Öbür gün"}
+ }
+ }
+ dayperiod{
+ dn{"ÖÖ/ÖS"}
+ }
+ era{
+ dn{"Miladi Dönem"}
+ }
+ hour{
+ dn{"Saat"}
+ }
+ minute{
+ dn{"Dakika"}
+ }
+ month{
+ dn{"Ay"}
+ relative{
+ "-1"{"Geçen ay"}
+ "0"{"Bu ay"}
+ "1"{"Gelecek ay"}
+ }
+ }
+ second{
+ dn{"Saniye"}
+ }
+ week{
+ dn{"Hafta"}
+ relative{
+ "-1"{"Geçen hafta"}
+ "0"{"Bu hafta"}
+ "1"{"Gelecek hafta"}
+ }
+ }
+ weekday{
+ dn{"Haftanın Günü"}
+ }
+ year{
+ dn{"Yıl"}
+ relative{
+ "-1"{"Geçen yıl"}
+ "0"{"Bu yıl"}
+ "1"{"Gelecek yıl"}
+ }
+ }
+ zone{
+ dn{"Saat Dilimi"}
+ }
+ }
listPattern{
standard{
2{"{0} ve {1}"}
diff --git a/data/locales/tr_CY.txt b/data/locales/tr_CY.txt
index 8fda4de..9df1b55 100755
--- a/data/locales/tr_CY.txt
+++ b/data/locales/tr_CY.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/tr_CY.xml
// *
// ***************************************************************************
tr_CY{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/tr_TR.txt b/data/locales/tr_TR.txt
index af50ff5..28a469b 100644
--- a/data/locales/tr_TR.txt
+++ b/data/locales/tr_TR.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/tr_TR.xml
// *
// ***************************************************************************
tr_TR{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/twq.txt b/data/locales/twq.txt
index a5ff48d..bdeb8f7 100755
--- a/data/locales/twq.txt
+++ b/data/locales/twq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/twq.xml
// *
@@ -28,8 +28,49 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d/M/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"Subbaahi",
@@ -43,7 +84,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM y",
- "d/M/yyyy",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -117,43 +158,6 @@
"Isaa zamanoo",
}
}
- fields{
- day{
- dn{"Zaari"}
- relative{
- "-1"{"Bi"}
- "0"{"Hõo"}
- "1"{"Suba"}
- }
- }
- dayperiod{
- dn{"Subbaahi/Zaarikay banda"}
- }
- era{
- dn{"Zaman"}
- }
- hour{
- dn{"Guuru"}
- }
- minute{
- dn{"Miniti"}
- }
- month{
- dn{"Handu"}
- }
- second{
- dn{"Miti"}
- }
- week{
- dn{"Hebu"}
- }
- year{
- dn{"Jiiri"}
- }
- zone{
- dn{"Leerazuu"}
- }
- }
monthNames{
format{
abbreviated{
@@ -226,4 +230,41 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Zaari"}
+ relative{
+ "-1"{"Bi"}
+ "0"{"Hõo"}
+ "1"{"Suba"}
+ }
+ }
+ dayperiod{
+ dn{"Subbaahi/Zaarikay banda"}
+ }
+ era{
+ dn{"Zaman"}
+ }
+ hour{
+ dn{"Guuru"}
+ }
+ minute{
+ dn{"Miniti"}
+ }
+ month{
+ dn{"Handu"}
+ }
+ second{
+ dn{"Miti"}
+ }
+ week{
+ dn{"Hebu"}
+ }
+ year{
+ dn{"Jiiri"}
+ }
+ zone{
+ dn{"Leerazuu"}
+ }
+ }
}
diff --git a/data/locales/twq_NE.txt b/data/locales/twq_NE.txt
index 70b4c88..13e4dc8 100755
--- a/data/locales/twq_NE.txt
+++ b/data/locales/twq_NE.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/twq_NE.xml
// *
// ***************************************************************************
twq_NE{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/tzm.txt b/data/locales/tzm.txt
index 9c75891..f81c823 100755
--- a/data/locales/tzm.txt
+++ b/data/locales/tzm.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/tzm.xml
// *
@@ -27,8 +27,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"Zdat azal",
@@ -42,7 +82,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -115,46 +155,6 @@
"Ḍeffir Ɛisa (TAƔ)",
}
}
- fields{
- day{
- dn{"Ass"}
- relative{
- "-1"{"Assenaṭ"}
- "0"{"Assa"}
- "1"{"Asekka"}
- }
- }
- dayperiod{
- dn{"Zdat azal/Deffir azal"}
- }
- era{
- dn{"Tallit"}
- }
- hour{
- dn{"Tasragt"}
- }
- minute{
- dn{"Tusdat"}
- }
- month{
- dn{"Ayur"}
- }
- second{
- dn{"Tusnat"}
- }
- week{
- dn{"Imalass"}
- }
- weekday{
- dn{"Ass n Imalass"}
- }
- year{
- dn{"Asseggas"}
- }
- zone{
- dn{"Aseglem asergan"}
- }
- }
monthNames{
format{
abbreviated{
@@ -227,4 +227,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Ass"}
+ relative{
+ "-1"{"Assenaṭ"}
+ "0"{"Assa"}
+ "1"{"Asekka"}
+ }
+ }
+ dayperiod{
+ dn{"Zdat azal/Deffir azal"}
+ }
+ era{
+ dn{"Tallit"}
+ }
+ hour{
+ dn{"Tasragt"}
+ }
+ minute{
+ dn{"Tusdat"}
+ }
+ month{
+ dn{"Ayur"}
+ }
+ second{
+ dn{"Tusnat"}
+ }
+ week{
+ dn{"Imalass"}
+ }
+ weekday{
+ dn{"Ass n Imalass"}
+ }
+ year{
+ dn{"Asseggas"}
+ }
+ zone{
+ dn{"Aseglem asergan"}
+ }
+ }
}
diff --git a/data/locales/tzm_Latn.txt b/data/locales/tzm_Latn.txt
index 0372675..417e94e 100755
--- a/data/locales/tzm_Latn.txt
+++ b/data/locales/tzm_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/tzm_Latn.xml
// *
@@ -13,5 +13,5 @@
LocaleScript{
"Latn",
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/tzm_Latn_MA.txt b/data/locales/tzm_Latn_MA.txt
index 01eb6a9..389de90 100755
--- a/data/locales/tzm_Latn_MA.txt
+++ b/data/locales/tzm_Latn_MA.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/tzm_Latn_MA.xml
// *
// ***************************************************************************
tzm_Latn_MA{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/tzm_MA.txt b/data/locales/tzm_MA.txt
index ebd194c..ee6f521 100755
--- a/data/locales/tzm_MA.txt
+++ b/data/locales/tzm_MA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/uk.txt b/data/locales/uk.txt
index 3f3102e..a5828d1 100644
--- a/data/locales/uk.txt
+++ b/data/locales/uk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uk.xml
// *
@@ -190,7 +190,7 @@
}
}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
calendar{
coptic{
monthNames{
@@ -213,6 +213,152 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, d MMMM y 'р'. G",
+ "d MMMM y 'р'. G",
+ "d MMM y G",
+ "dd.MM.yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E, d"}
+ H{"HH"}
+ HHmm{"HH:mm"}
+ HHmmss{"HH:mm:ss"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, dd.MM"}
+ MMM{"LLL"}
+ MMMEd{"E, d MMM"}
+ MMMMEd{"E, d MMMM"}
+ MMMMd{"d MMMM"}
+ MMMd{"d MMM"}
+ MMdd{"dd.MM"}
+ Md{"dd.MM"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ mmss{"mm:ss"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"MM.y"}
+ yMEd{"E, dd.MM.y"}
+ yMM{"MM.y"}
+ yMMM{"LLL y"}
+ yMMMEd{"E, d MMM y"}
+ yMMMM{"LLLL y"}
+ yMMMd{"d MMM y"}
+ yMd{"dd.MM.y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y 'р'."}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, dd.MM – E, dd.MM"}
+ d{"E, dd.MM – E, dd.MM"}
+ }
+ MMM{
+ M{"LLL–LLL"}
+ }
+ MMMEd{
+ M{"E, d MMM – E, d MMM"}
+ d{"E, d – E, d MMM"}
+ }
+ MMMd{
+ M{"d MMM – d MMM"}
+ d{"d–d MMM"}
+ }
+ Md{
+ M{"dd.MM – dd.MM"}
+ d{"dd.MM – dd.MM"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"MM.y – MM.y"}
+ y{"MM.y – MM.y"}
+ }
+ yMEd{
+ M{"E, dd.MM.y – E, dd.MM.y"}
+ d{"E, dd.MM.y – E, dd.MM.y"}
+ y{"E, dd.MM.y – E, dd.MM.y"}
+ }
+ yMMM{
+ M{"LLL–LLL y"}
+ y{"LLL y – LLL y"}
+ }
+ yMMMEd{
+ M{"E, d MMM – E, d MMM y"}
+ d{"E, d – E, d MMM y"}
+ y{"E, d MMM y – E, d MMM y"}
+ }
+ yMMMM{
+ M{"LLLL – LLLL y"}
+ y{"LLLL y – LLLL y"}
+ }
+ yMMMd{
+ M{"d MMM – d MMM y"}
+ d{"d–d MMM y"}
+ y{"d MMM y – d MMM y"}
+ }
+ yMd{
+ M{"dd.MM.y – dd.MM.y"}
+ d{"dd.MM.y – dd.MM.y"}
+ y{"dd.MM.y – dd.MM.y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"дп",
@@ -256,19 +402,16 @@
mmss{"mm:ss"}
ms{"mm:ss"}
y{"y"}
- yM{"MM.yyyy"}
- yMEd{"E, dd.MM.yyyy"}
+ yM{"MM.y"}
+ yMEd{"E, dd.MM.y"}
+ yMM{"MM.y"}
yMMM{"LLL y"}
yMMMEd{"E, d MMM y"}
yMMMM{"LLLL y"}
yMMMd{"d MMM y"}
- yMd{"dd.MM.yy"}
+ yMd{"dd.MM.y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y 'р'."}
- yyMM{"MM.yy"}
- yyMMM{"LLL yy"}
- yyyyMMMM{"LLLL y"}
- yyyyQQQQ{"QQQQ y 'р'."}
}
dayNames{
format{
@@ -331,63 +474,6 @@
"нашої ери",
}
}
- fields{
- day{
- dn{"День"}
- relative{
- "-1"{"Вчора"}
- "-2"{"Позавчора"}
- "0"{"Сьогодні"}
- "1"{"Завтра"}
- "2"{"Післязавтра"}
- }
- }
- dayperiod{
- dn{"Частина доби"}
- }
- era{
- dn{"Ера"}
- }
- hour{
- dn{"Година"}
- }
- minute{
- dn{"Хвилина"}
- }
- month{
- dn{"Місяць"}
- relative{
- "-1"{"Минулого місяця"}
- "0"{"Цього місяця"}
- "1"{"Наступного місяця"}
- }
- }
- second{
- dn{"Секунда"}
- }
- week{
- dn{"Тиждень"}
- relative{
- "-1"{"Минулого тижня"}
- "0"{"Цього тижня"}
- "1"{"Наступного тижня"}
- }
- }
- weekday{
- dn{"День тижня"}
- }
- year{
- dn{"Рік"}
- relative{
- "-1"{"Минулого року"}
- "0"{"Цього року"}
- "1"{"Наступного року"}
- }
- }
- zone{
- dn{"Зона"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -451,13 +537,13 @@
y{"y–y"}
}
yM{
- M{"MM.yy – MM.yy"}
- y{"MM.yy – MM.yy"}
+ M{"MM.y – MM.y"}
+ y{"MM.y – MM.y"}
}
yMEd{
- M{"E, dd.MM.yy – E, dd.MM.yy"}
- d{"E, dd.MM.yy – E, dd.MM.yy"}
- y{"E, dd.MM.yy – E, dd.MM.yy"}
+ M{"E, dd.MM.y – E, dd.MM.y"}
+ d{"E, dd.MM.y – E, dd.MM.y"}
+ y{"E, dd.MM.y – E, dd.MM.y"}
}
yMMM{
M{"LLL–LLL y"}
@@ -478,9 +564,9 @@
y{"d MMM y – d MMM y"}
}
yMd{
- M{"dd.MM.yy – dd.MM.yy"}
- d{"dd.MM.yy – dd.MM.yy"}
- y{"dd.MM.yy – dd.MM.yy"}
+ M{"dd.MM.y – dd.MM.y"}
+ d{"dd.MM.y – dd.MM.y"}
+ y{"dd.MM.y – dd.MM.y"}
}
}
monthNames{
@@ -693,6 +779,63 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"День"}
+ relative{
+ "-1"{"Вчора"}
+ "-2"{"Позавчора"}
+ "0"{"Сьогодні"}
+ "1"{"Завтра"}
+ "2"{"Післязавтра"}
+ }
+ }
+ dayperiod{
+ dn{"Частина доби"}
+ }
+ era{
+ dn{"Ера"}
+ }
+ hour{
+ dn{"Година"}
+ }
+ minute{
+ dn{"Хвилина"}
+ }
+ month{
+ dn{"Місяць"}
+ relative{
+ "-1"{"Минулого місяця"}
+ "0"{"Цього місяця"}
+ "1"{"Наступного місяця"}
+ }
+ }
+ second{
+ dn{"Секунда"}
+ }
+ week{
+ dn{"Тиждень"}
+ relative{
+ "-1"{"Минулого тижня"}
+ "0"{"Цього тижня"}
+ "1"{"Наступного тижня"}
+ }
+ }
+ weekday{
+ dn{"День тижня"}
+ }
+ year{
+ dn{"Рік"}
+ relative{
+ "-1"{"Минулого року"}
+ "0"{"Цього року"}
+ "1"{"Наступного року"}
+ }
+ }
+ zone{
+ dn{"Зона"}
+ }
+ }
listPattern{
standard{
2{"{0} та {1}"}
diff --git a/data/locales/uk_UA.txt b/data/locales/uk_UA.txt
index b443240..9bdbb84 100644
--- a/data/locales/uk_UA.txt
+++ b/data/locales/uk_UA.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uk_UA.xml
// *
// ***************************************************************************
uk_UA{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ur.txt b/data/locales/ur.txt
index fecdef2..1127e41 100644
--- a/data/locales/ur.txt
+++ b/data/locales/ur.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ur.xml
// *
@@ -22,11 +22,23 @@
"[ا ب پ ت ٹ ث ج چ ح خ د ڈ ذ ر ڑ ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن و ہ ھ ء ی ے"
"]"
}
- ExemplarCharactersPunctuation{"[، ؍ ٫ ٬ ؛ \: ؟ . ۔ ( ) \[ \]]"}
+ ExemplarCharactersPunctuation{"[، ؍ ٫ ٬ ؛ \\: ؟ . ۔ ( ) \\[ \\]]"}
LocaleScript{
"Arab",
}
NumberElements{
+ arabext{
+ symbols{
+ decimal{"."}
+ group{","}
+ infinity{"∞"}
+ list{";"}
+ minusSign{"-"}
+ perMille{"‰"}
+ percentSign{"%"}
+ plusSign{"+"}
+ }
+ }
default{"latn"}
latn{
patterns{
@@ -101,12 +113,150 @@
}
native{"arabext"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE، d MMMM، y G",
+ "d MMMM، y G",
+ "d MMM، y G",
+ "d/M/yy GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E، d/M"}
+ MMM{"LLL"}
+ MMMEd{"E، d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E، d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E، d MMM، y"}
+ yMMMd{"d MMM، y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E، d/M – E، d/M"}
+ d{"E، d/M – E، d/M"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E، d MMM – E، d MMM"}
+ d{"E، d MMM – E، d MMM"}
+ }
+ MMMd{
+ M{"d MMM – d MMM"}
+ d{"d–d MMM"}
+ }
+ Md{
+ M{"d/M – d/M"}
+ d{"d/M – d/M"}
+ }
+ d{
+ d{"d–d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y–y"}
+ }
+ yM{
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
+ }
+ yMEd{
+ M{"E، d/M/y – E، d/M/y"}
+ d{"E، d/M/y – E، d/M/y"}
+ y{"E، d/M/y – E، d/M/y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y – MMM y"}
+ }
+ yMMMEd{
+ M{"E، d MMM – E، d MMM، y"}
+ d{"E، d MMM – E، d MMM، y"}
+ y{"E، d MMM، y – E، d MMM، y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"d MMM – d MMM، y"}
+ d{"d-d MMM، y"}
+ y{"d MMM، y – d MMM، y"}
+ }
+ yMd{
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y - d/M/y"}
+ y{"d/M/y – d/M/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
- "دن",
- "رات",
+ "قبل دوپہر",
+ "بعد دوپہر",
}
DateTimePatterns{
"h:mm:ss a zzzz",
@@ -210,63 +360,6 @@
"عیسوی سن",
}
}
- fields{
- day{
- dn{"دن"}
- relative{
- "-1"{"گزشتہ کل"}
- "-2"{"گزشتہ پرسوں"}
- "0"{"آج"}
- "1"{"آئندہ کل"}
- "2"{"آنے والا پرسوں"}
- }
- }
- dayperiod{
- dn{"رات/صبح"}
- }
- era{
- dn{"عہد"}
- }
- hour{
- dn{"گھنٹہ"}
- }
- minute{
- dn{"منٹ"}
- }
- month{
- dn{"مہینہ"}
- relative{
- "-1"{"پچھلے مہینہ"}
- "0"{"اس مہینہ"}
- "1"{"اگلے مہینہ"}
- }
- }
- second{
- dn{"سیکنڈ"}
- }
- week{
- dn{"ہفتہ"}
- relative{
- "-1"{"پچھلے ہفتہ"}
- "0"{"اس ہفتہ"}
- "1"{"اگلے ہفتہ"}
- }
- }
- weekday{
- dn{"ہفتے کا دن"}
- }
- year{
- dn{"سال"}
- relative{
- "-1"{"پچھلے سال"}
- "0"{"اس سال"}
- "1"{"اگلے سال"}
- }
- }
- zone{
- dn{"منطقہ وقت"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -330,13 +423,13 @@
y{"y–y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E، d/M/yy – E، d/M/yy"}
- d{"E، d/M/yy – E، d/M/yy"}
- y{"E، d/M/yy – E، d/M/yy"}
+ M{"E، d/M/y – E، d/M/y"}
+ d{"E، d/M/y – E، d/M/y"}
+ y{"E، d/M/y – E، d/M/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -357,9 +450,9 @@
y{"d MMM، y – d MMM، y"}
}
yMd{
- M{"d/M/yy – d/M/yy"}
- d{"d/M/yy - d/M/yy"}
- y{"d/M/yy – d/M/yy"}
+ M{"d/M/y – d/M/y"}
+ d{"d/M/y - d/M/y"}
+ y{"d/M/y – d/M/y"}
}
}
monthNames{
@@ -462,9 +555,65 @@
quotationEnd{"“"}
quotationStart{"”"}
}
+ fields{
+ day{
+ dn{"دن"}
+ relative{
+ "-1"{"گزشتہ کل"}
+ "-2"{"گزشتہ پرسوں"}
+ "0"{"آج"}
+ "1"{"آئندہ کل"}
+ "2"{"آنے والا پرسوں"}
+ }
+ }
+ dayperiod{
+ dn{"رات/صبح"}
+ }
+ era{
+ dn{"عہد"}
+ }
+ hour{
+ dn{"گھنٹہ"}
+ }
+ minute{
+ dn{"منٹ"}
+ }
+ month{
+ dn{"مہینہ"}
+ relative{
+ "-1"{"پچھلے مہینہ"}
+ "0"{"اس مہینہ"}
+ "1"{"اگلے مہینہ"}
+ }
+ }
+ second{
+ dn{"سیکنڈ"}
+ }
+ week{
+ dn{"ہفتہ"}
+ relative{
+ "-1"{"پچھلے ہفتہ"}
+ "0"{"اس ہفتہ"}
+ "1"{"اگلے ہفتہ"}
+ }
+ }
+ weekday{
+ dn{"ہفتے کا دن"}
+ }
+ year{
+ dn{"سال"}
+ relative{
+ "-1"{"پچھلے سال"}
+ "0"{"اس سال"}
+ "1"{"اگلے سال"}
+ }
+ }
+ zone{
+ dn{"منطقہ وقت"}
+ }
+ }
layout{
characters{"right-to-left"}
- lines{"top-to-bottom"}
}
listPattern{
standard{
diff --git a/data/locales/ur_IN.txt b/data/locales/ur_IN.txt
index 8f23842..686d78c 100644
--- a/data/locales/ur_IN.txt
+++ b/data/locales/ur_IN.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ur_IN.xml
// *
@@ -20,5 +20,5 @@
}
}
}
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/ur_PK.txt b/data/locales/ur_PK.txt
index 5203e9a..eb3b5f8 100644
--- a/data/locales/ur_PK.txt
+++ b/data/locales/ur_PK.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ur_PK.xml
// *
// ***************************************************************************
ur_PK{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/uz.txt b/data/locales/uz.txt
index 0faf04d..626876d 100644
--- a/data/locales/uz.txt
+++ b/data/locales/uz.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz.xml
// *
@@ -15,7 +15,7 @@
LocaleScript{
"Cyrl",
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
calendar{
gregorian{
dayNames{
diff --git a/data/locales/uz_AF.txt b/data/locales/uz_AF.txt
index 0010d89..5996fc9 100644
--- a/data/locales/uz_AF.txt
+++ b/data/locales/uz_AF.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/uz_Arab.txt b/data/locales/uz_Arab.txt
index e9e7eb3..c9e619b 100644
--- a/data/locales/uz_Arab.txt
+++ b/data/locales/uz_Arab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz_Arab.xml
// *
@@ -38,9 +38,8 @@
}
native{"arabext"}
}
- Version{"2.0.76.36"}
+ Version{"2.0.82.45"}
layout{
characters{"right-to-left"}
- lines{"top-to-bottom"}
}
}
diff --git a/data/locales/uz_Arab_AF.txt b/data/locales/uz_Arab_AF.txt
index dd627f6..52d692f 100644
--- a/data/locales/uz_Arab_AF.txt
+++ b/data/locales/uz_Arab_AF.txt
@@ -1,11 +1,15 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz_Arab_AF.xml
// *
// ***************************************************************************
uz_Arab_AF{
- Version{"2.0.41.23"}
+ %%Parent{"uz_Arab"}
+ Version{"2.0.82.45"}
+ calendar{
+ default{"persian"}
+ }
}
diff --git a/data/locales/uz_Cyrl.txt b/data/locales/uz_Cyrl.txt
index 4f362d7..8545c33 100644
--- a/data/locales/uz_Cyrl.txt
+++ b/data/locales/uz_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz_Cyrl.xml
// *
@@ -13,5 +13,5 @@
LocaleScript{
"Cyrl",
}
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/uz_Cyrl_UZ.txt b/data/locales/uz_Cyrl_UZ.txt
index 9df2610..b7dc9e9 100644
--- a/data/locales/uz_Cyrl_UZ.txt
+++ b/data/locales/uz_Cyrl_UZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz_Cyrl_UZ.xml
// *
// ***************************************************************************
uz_Cyrl_UZ{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/uz_Latn.txt b/data/locales/uz_Latn.txt
index 7c9df5f..ebb6d45 100644
--- a/data/locales/uz_Latn.txt
+++ b/data/locales/uz_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz_Latn.xml
// *
@@ -20,7 +20,7 @@
LocaleScript{
"Latn",
}
- Version{"2.0.74.98"}
+ Version{"2.0.82.45"}
calendar{
gregorian{
dayNames{
diff --git a/data/locales/uz_Latn_UZ.txt b/data/locales/uz_Latn_UZ.txt
index 4199246..0ad0d16 100644
--- a/data/locales/uz_Latn_UZ.txt
+++ b/data/locales/uz_Latn_UZ.txt
@@ -1,11 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz_Latn_UZ.xml
// *
// ***************************************************************************
uz_Latn_UZ{
- Version{"2.0.41.23"}
+ %%Parent{"uz_Latn"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/uz_UZ.txt b/data/locales/uz_UZ.txt
index a419389..35e0a7f 100644
--- a/data/locales/uz_UZ.txt
+++ b/data/locales/uz_UZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/vai.txt b/data/locales/vai.txt
index c1edb3a..53c6d44 100755
--- a/data/locales/vai.txt
+++ b/data/locales/vai.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vai.xml
// *
@@ -31,18 +31,18 @@
}
native{"vaii"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
- gregorian{
+ generic{
DateTimePatterns{
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
- "EEEE, d MMMM y",
- "d MMMM y",
- "d MMM y",
- "dd/MM/yyyy",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -63,12 +63,52 @@
d{"d"}
hm{"h:mm a"}
ms{"mm:ss"}
- y{"yyyy"}
- yM{"M/yyyy"}
- yMEd{"E, M/d/yyyy"}
- yMMM{"MMM yyyy"}
- yMMMEd{"E, MMM d, yyyy"}
- yMMMM{"MMMM yyyy"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
+ gregorian{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y",
+ "d MMMM y",
+ "d MMM y",
+ "dd/MM/y",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
}
@@ -85,37 +125,6 @@
}
}
}
- fields{
- day{
- dn{"ꔎꔒ"}
- relative{
- "-1"{"ꖴꖸ"}
- "0"{"ꗦꗷ"}
- "1"{"ꔻꕯ"}
- }
- }
- hour{
- dn{"ꕌꕎ"}
- }
- minute{
- dn{"ꕆꕇ"}
- }
- month{
- dn{"ꕪꖃ"}
- }
- second{
- dn{"ꕧꕃꕧꕪ"}
- }
- week{
- dn{"ꔨꔤꕃ"}
- }
- weekday{
- dn{"ꔨꕃꕮ ꔎꔒ"}
- }
- year{
- dn{"ꕢꘋ"}
- }
- }
monthNames{
format{
wide{
@@ -142,4 +151,35 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"ꔎꔒ"}
+ relative{
+ "-1"{"ꖴꖸ"}
+ "0"{"ꗦꗷ"}
+ "1"{"ꔻꕯ"}
+ }
+ }
+ hour{
+ dn{"ꕌꕎ"}
+ }
+ minute{
+ dn{"ꕆꕇ"}
+ }
+ month{
+ dn{"ꕪꖃ"}
+ }
+ second{
+ dn{"ꕧꕃꕧꕪ"}
+ }
+ week{
+ dn{"ꔨꔤꕃ"}
+ }
+ weekday{
+ dn{"ꔨꕃꕮ ꔎꔒ"}
+ }
+ year{
+ dn{"ꕢꘋ"}
+ }
+ }
}
diff --git a/data/locales/vai_LR.txt b/data/locales/vai_LR.txt
index 9d1560d..403f4c0 100755
--- a/data/locales/vai_LR.txt
+++ b/data/locales/vai_LR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/vai_Latn.txt b/data/locales/vai_Latn.txt
index a502ee8..7080bfc 100755
--- a/data/locales/vai_Latn.txt
+++ b/data/locales/vai_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vai_Latn.xml
// *
@@ -33,8 +33,49 @@
}
native{"vaii"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y G",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMd{"MMM d y"}
+ yMd{"M/d/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
DateTimePatterns{
"h:mm:ss a zzzz",
@@ -44,7 +85,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -88,37 +129,6 @@
}
}
}
- fields{
- day{
- dn{"tele"}
- relative{
- "-1"{"kunu"}
- "0"{"wɛlɛ"}
- "1"{"sina"}
- }
- }
- hour{
- dn{"hawa"}
- }
- minute{
- dn{"mini"}
- }
- month{
- dn{"kalo"}
- }
- second{
- dn{"jaki-jaka"}
- }
- week{
- dn{"wiki"}
- }
- weekday{
- dn{"wikiyɛma tele"}
- }
- year{
- dn{"saŋ"}
- }
- }
monthNames{
format{
wide{
@@ -145,4 +155,35 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"tele"}
+ relative{
+ "-1"{"kunu"}
+ "0"{"wɛlɛ"}
+ "1"{"sina"}
+ }
+ }
+ hour{
+ dn{"hawa"}
+ }
+ minute{
+ dn{"mini"}
+ }
+ month{
+ dn{"kalo"}
+ }
+ second{
+ dn{"jaki-jaka"}
+ }
+ week{
+ dn{"wiki"}
+ }
+ weekday{
+ dn{"wikiyɛma tele"}
+ }
+ year{
+ dn{"saŋ"}
+ }
+ }
}
diff --git a/data/locales/vai_Latn_LR.txt b/data/locales/vai_Latn_LR.txt
index aa6af4f..74ddbac 100755
--- a/data/locales/vai_Latn_LR.txt
+++ b/data/locales/vai_Latn_LR.txt
@@ -1,12 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vai_Latn_LR.xml
// *
// ***************************************************************************
vai_Latn_LR{
+ %%Parent{"vai_Latn"}
MeasurementSystem:int{1}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/vai_Vaii.txt b/data/locales/vai_Vaii.txt
index 4b61076..9d62765 100755
--- a/data/locales/vai_Vaii.txt
+++ b/data/locales/vai_Vaii.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vai_Vaii.xml
// *
@@ -13,5 +13,5 @@
LocaleScript{
"Vaii",
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/vai_Vaii_LR.txt b/data/locales/vai_Vaii_LR.txt
index 6d0cb51..36b7af7 100755
--- a/data/locales/vai_Vaii_LR.txt
+++ b/data/locales/vai_Vaii_LR.txt
@@ -1,12 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vai_Vaii_LR.xml
// *
// ***************************************************************************
vai_Vaii_LR{
MeasurementSystem:int{1}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/vi.txt b/data/locales/vi.txt
index c7fc0f9..af74b54 100644
--- a/data/locales/vi.txt
+++ b/data/locales/vi.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vi.xml
// *
@@ -122,7 +122,7 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
calendar{
buddhist{
DateTimePatterns{
@@ -132,8 +132,8 @@
"HH:mm",
"EEEE, 'ngày' dd MMMM 'năm' y G",
"'Ngày' dd 'tháng' M 'năm' y G",
- "dd-MM-yyyy G",
- "dd/MM/yyyy G",
+ "dd-MM-y G",
+ "dd/MM/y G",
"{0} {1}",
"{0} {1}",
"{0} {1}",
@@ -141,20 +141,20 @@
"{0} {1}",
}
availableFormats{
- Ed{"E, d"}
+ Ed{"E, dd"}
H{"HH'h'"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
M{"'tháng' L"}
- MEd{"E, d-M"}
+ MEd{"E, dd-M"}
MMM{"LLL"}
- MMMEd{"E, d MMM"}
- MMMMEd{"E, d MMMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
+ MMMEd{"E, dd MMM"}
+ MMMMEd{"E, dd MMMM"}
+ MMMMd{"dd MMMM"}
+ MMMd{"dd MMM"}
MMdd{"dd-MM"}
- Md{"d-M"}
- d{"'Ngày' d"}
+ Md{"dd-M"}
+ d{"'Ngày' dd"}
h{"h'h' a"}
hm{"h:mm a"}
hms{"h:mm:ss a"}
@@ -162,16 +162,15 @@
ms{"mm:ss"}
y{"'Năm' y G"}
yM{"M/y GGGGG"}
- yMEd{"E, d-M-yyyy G"}
+ yMEd{"E, dd-M-y G"}
+ yMM{"MM-y G"}
yMMM{"MMM y G"}
- yMMMEd{"E, d MMM y G"}
+ yMMMEd{"E, dd MMM y G"}
yMMMM{"MMMM y G"}
- yMMMd{"d MMM y G"}
+ yMMMd{"dd MMM y G"}
+ yMd{"dd-M-y G"}
yQQQ{"QQQ y G"}
yQQQQ{"QQQQ y G"}
- yyyy{"'Năm' y G"}
- yyyyMM{"MM-yyyy G"}
- yyyyMd{"d-M-yyyy G"}
}
}
chinese{
@@ -402,6 +401,150 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE, 'ngày' dd MMMM 'năm' y G",
+ "'Ngày' dd 'tháng' M 'năm' y G",
+ "dd-MM-y G",
+ "dd/MM/y GGGGG",
+ "{0} {1}",
+ "{0} {1}",
+ "{0} {1}",
+ "{0} {1}",
+ "{0} {1}",
+ }
+ availableFormats{
+ Ed{"E, dd"}
+ H{"HH"}
+ Hm{"H:mm"}
+ Hms{"H:mm:ss"}
+ M{"L"}
+ MEd{"E, dd-M"}
+ MMM{"LLL"}
+ MMMEd{"E, dd MMM"}
+ MMMMEd{"E, dd MMMM"}
+ MMMMd{"dd MMMM"}
+ MMMd{"dd MMM"}
+ MMdd{"dd-MM"}
+ Md{"dd-M"}
+ d{"'Ngày' dd"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ mmss{"mm:ss"}
+ ms{"mm:ss"}
+ y{"'Năm' y"}
+ yM{"M/y"}
+ yMEd{"E, dd-M-y"}
+ yMM{"MM-y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, dd MMM y"}
+ yMMMM{"MMMM y"}
+ yMMMd{"dd MMM, y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH'h' - HH'h'"}
+ }
+ Hm{
+ H{"HH:mm-HH:mm"}
+ m{"HH:mm-HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm-HH:mm v"}
+ m{"HH:mm-HH:mm v"}
+ }
+ Hv{
+ H{"HH'h'-HH'h' v"}
+ }
+ M{
+ M{"'Tháng' M - 'Tháng' M"}
+ }
+ MEd{
+ M{"EEEE, dd/MM - EEEE, dd/MM"}
+ d{"EEEE, dd/MM - EEEE, dd/MM"}
+ }
+ MMM{
+ M{"MMM-MMM"}
+ }
+ MMMEd{
+ M{"EEEE, 'ngày' dd 'tháng' M - EEEE, 'ngày' dd 'tháng' M"}
+ d{"EEEE, 'ngày' dd - EEEE, 'ngày' dd 'tháng' M"}
+ }
+ MMMd{
+ M{"'Ngày' dd 'tháng' M - 'Ngày' dd 'tháng' M"}
+ d{"'Ngày' dd 'tháng' M - 'Ngày' dd 'tháng' M"}
+ }
+ Md{
+ M{"dd/MM - dd/MM"}
+ d{"dd/MM - dd/MM"}
+ }
+ d{
+ d{"'Ngày' dd-dd"}
+ }
+ fallback{"{0} - {1}"}
+ h{
+ a{"h'h' a - h'h' a"}
+ h{"h'h' - h'h' a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm-h:mm a"}
+ m{"h:mm-h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm-h:mm a v"}
+ m{"h:mm-h:mm a v"}
+ }
+ hv{
+ a{"h'h' a - h'h' a v"}
+ h{"h'h'-h'h' a v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"MM/y - MM/y"}
+ y{"MM/y - MM/y"}
+ }
+ yMEd{
+ M{"EEEE, dd/MM/y - EEEE, dd/MM/y"}
+ d{"EEEE, dd/MM/y - EEEE, dd/MM/y"}
+ y{"EEEE, dd/MM/y - EEEE, dd/MM/y"}
+ }
+ yMMM{
+ M{"'Tháng' M - 'Tháng' M 'năm' y"}
+ y{"'Tháng' M 'năm' y - 'Tháng' M 'năm' y"}
+ }
+ yMMMEd{
+ M{"E, dd 'tháng' M - E, dd 'tháng' M, y"}
+ d{"EEEE, 'ngày' dd MMM - EEEE, 'ngày' dd MMM 'năm' y"}
+ y{"E, dd 'tháng' M, y - E, dd 'tháng' M, y"}
+ }
+ yMMMM{
+ M{"MMMM-MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"'Ngày' dd 'tháng' M - 'Ngày' dd 'tháng' M 'năm' y"}
+ d{"'Ngày' dd 'tháng' M - 'Ngày' dd 'tháng' M 'năm' y"}
+ y{"'Ngày' dd 'tháng' M 'năm' y - 'Ngày' dd 'tháng' M 'năm' y"}
+ }
+ yMd{
+ M{"dd/MM/y - dd/MM/y"}
+ d{"dd/MM/y - dd/MM/y"}
+ y{"dd/MM/y - dd/MM/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"SA",
@@ -414,8 +557,8 @@
"HH:mm",
"EEEE, 'ngày' dd MMMM 'năm' y",
"'Ngày' dd 'tháng' M 'năm' y",
- "dd-MM-yyyy",
- "dd/MM/yyyy",
+ "dd-MM-y",
+ "dd/MM/y",
"{0} {1}",
"{0} {1}",
"{0} {1}",
@@ -423,37 +566,36 @@
"{0} {1}",
}
availableFormats{
- Ed{"E, d"}
+ Ed{"E, dd"}
H{"HH"}
Hm{"H:mm"}
Hms{"H:mm:ss"}
M{"L"}
- MEd{"E, d-M"}
+ MEd{"E, dd-M"}
MMM{"LLL"}
- MMMEd{"E, d MMM"}
- MMMMEd{"E, d MMMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
+ MMMEd{"E, dd MMM"}
+ MMMMEd{"E, dd MMMM"}
+ MMMMd{"dd MMMM"}
+ MMMd{"dd MMM"}
MMdd{"dd-MM"}
- Md{"d-M"}
- d{"'Ngày' d"}
+ Md{"dd-M"}
+ d{"'Ngày' dd"}
h{"h a"}
hm{"h:mm a"}
hms{"h:mm:ss a"}
mmss{"mm:ss"}
ms{"mm:ss"}
y{"'Năm' y"}
- yM{"M/yyyy"}
- yMEd{"E, d-M-yyyy"}
+ yM{"M/y"}
+ yMEd{"E, dd-M-y"}
+ yMM{"MM-y"}
yMMM{"MMM y"}
- yMMMEd{"E, d MMM y"}
+ yMMMEd{"E, dd MMM y"}
yMMMM{"MMMM y"}
- yMMMd{"d MMM, y"}
+ yMMMd{"dd MMM, y"}
yMd{"d/M/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyyy{"y"}
- yyyyMM{"MM-yyyy"}
}
dayNames{
format{
@@ -530,63 +672,6 @@
"sau CN",
}
}
- fields{
- day{
- dn{"Ngày"}
- relative{
- "-1"{"Ngày hôm qua"}
- "-2"{"Ngày hôm kia"}
- "0"{"Hôm nay"}
- "1"{"Ngày mai"}
- "2"{"Ngày kia"}
- }
- }
- dayperiod{
- dn{"SA/CH"}
- }
- era{
- dn{"Thời đại"}
- }
- hour{
- dn{"Giờ"}
- }
- minute{
- dn{"Phút"}
- }
- month{
- dn{"Tháng"}
- relative{
- "-1"{"Tháng trước"}
- "0"{"Tháng này"}
- "1"{"Tháng sau"}
- }
- }
- second{
- dn{"Giây"}
- }
- week{
- dn{"Tuần"}
- relative{
- "-1"{"Tuần trước"}
- "0"{"Tuần này"}
- "1"{"Tuần sau"}
- }
- }
- weekday{
- dn{"Ngày trong tuần"}
- }
- year{
- dn{"Năm"}
- relative{
- "-1"{"Năm ngoái"}
- "0"{"Năm nay"}
- "1"{"Năm sau"}
- }
- }
- zone{
- dn{"Múi giờ"}
- }
- }
intervalFormats{
H{
H{"HH'h' - HH'h'"}
@@ -625,7 +710,7 @@
d{"dd/MM - dd/MM"}
}
d{
- d{"'Ngày' d-d"}
+ d{"'Ngày' dd-dd"}
}
fallback{"{0} - {1}"}
h{
@@ -650,22 +735,22 @@
y{"y-y"}
}
yM{
- M{"MM/yyyy - MM/yyyy"}
- y{"MM/yyyy - MM/yyyy"}
+ M{"MM/y - MM/y"}
+ y{"MM/y - MM/y"}
}
yMEd{
- M{"EEEE, dd/MM/yyyy - EEEE, dd/MM/yyyy"}
- d{"EEEE, dd/MM/yyyy - EEEE, dd/MM/yyyy"}
- y{"EEEE, dd/MM/yyyy - EEEE, dd/MM/yyyy"}
+ M{"EEEE, dd/MM/y - EEEE, dd/MM/y"}
+ d{"EEEE, dd/MM/y - EEEE, dd/MM/y"}
+ y{"EEEE, dd/MM/y - EEEE, dd/MM/y"}
}
yMMM{
M{"'Tháng' M - 'Tháng' M 'năm' y"}
y{"'Tháng' M 'năm' y - 'Tháng' M 'năm' y"}
}
yMMMEd{
- M{"E, d 'tháng' M - E, d 'tháng' M, y"}
+ M{"E, dd 'tháng' M - E, dd 'tháng' M, y"}
d{"EEEE, 'ngày' dd MMM - EEEE, 'ngày' dd MMM 'năm' y"}
- y{"E, d 'tháng' M, y - E, d 'tháng' M, y"}
+ y{"E, dd 'tháng' M, y - E, dd 'tháng' M, y"}
}
yMMMM{
M{"MMMM-MMMM y"}
@@ -677,9 +762,9 @@
y{"'Ngày' dd 'tháng' M 'năm' y - 'Ngày' dd 'tháng' M 'năm' y"}
}
yMd{
- M{"dd/MM/yyyy - dd/MM/yyyy"}
- d{"dd/MM/yyyy - dd/MM/yyyy"}
- y{"dd/MM/yyyy - dd/MM/yyyy"}
+ M{"dd/MM/y - dd/MM/y"}
+ d{"dd/MM/y - dd/MM/y"}
+ y{"dd/MM/y - dd/MM/y"}
}
}
monthNames{
@@ -938,45 +1023,37 @@
"{0} {1}",
}
availableFormats{
- Ed{"E, d"}
+ Ed{"E, dd"}
Gy{"y G"}
H{"HH"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
M{"L"}
- MEd{"E, d-M"}
+ MEd{"E, dd-M"}
MMM{"LLL"}
- MMMEd{"E, d MMM"}
- MMMMEd{"E, d MMMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
+ MMMEd{"E, dd MMM"}
+ MMMMEd{"E, dd MMMM"}
+ MMMMd{"dd MMMM"}
+ MMMd{"dd MMM"}
MMdd{"dd-MM"}
- Md{"d-M"}
- d{"'Ngày' d"}
+ Md{"dd-M"}
+ d{"'Ngày' dd"}
h{"h a"}
hm{"h:mm a"}
hms{"h:mm:ss a"}
mmss{"mm:ss"}
ms{"mm:ss"}
y{"y G"}
- yM{"M/yyyy"}
- yMEd{"E, d-M-yyyy"}
+ yM{"M/y"}
+ yMEd{"E, dd-M-y"}
+ yMM{"MM-y G"}
yMMM{"MMM y"}
- yMMMEd{"E, d MMM y"}
+ yMMMEd{"E, dd MMM y"}
yMMMM{"MMMM y"}
- yQQQ{"QQQ yyyy"}
+ yMMMd{"dd MMM y G"}
+ yMd{"dd-M-y G"}
+ yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
- yyQQQ{"QQQ yy G"}
- yyyy{"'Năm' y G"}
- yyyyMEd{"E, d-M-y G"}
- yyyyMM{"MM-y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"d-M-y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
}
}
japanese{
@@ -989,34 +1066,33 @@
"'Ngày' dd 'tháng' M 'năm' y G",
"dd-MM-y G",
"dd/MM/y G",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
- "{1} {0}",
+ "{0} {1}",
+ "{0} {1}",
+ "{0} {1}",
+ "{0} {1}",
+ "{0} {1}",
}
availableFormats{
- Ed{"E, d"}
- MEd{"E, d-M"}
- MMMEd{"E, d MMM"}
- MMMMEd{"E, d MMMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
+ Ed{"E, dd"}
+ MEd{"E, dd-M"}
+ MMMEd{"E, dd MMM"}
+ MMMMEd{"E, dd MMMM"}
+ MMMMd{"dd MMMM"}
+ MMMd{"dd MMM"}
MMdd{"dd-MM"}
- Md{"d-M"}
- d{"'Ngày' d"}
+ Md{"dd-M"}
+ d{"'Ngày' dd"}
mmss{"mm:ss"}
- yyQQQ{"QQQ yy G"}
- yyyy{"'Năm' y G"}
- yyyyMEd{"E, d-M-y G"}
- yyyyMM{"MM-y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"d-M-y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
+ y{"'Năm' y G"}
+ yMEd{"E, dd-M-y G"}
+ yMM{"MM-y G"}
+ yMMM{"MMM y G"}
+ yMMMEd{"E, dd MMM y G"}
+ yMMMM{"MMMM y G"}
+ yMMMd{"dd MMM y G"}
+ yMd{"dd-M-y G"}
+ yQQQ{"QQQ y G"}
+ yQQQQ{"QQQQ y G"}
}
}
persian{
@@ -1100,37 +1176,35 @@
"{0} {1}",
}
availableFormats{
- Ed{"E, d"}
+ Ed{"E, dd"}
H{"HH'h'"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
M{"'tháng' L"}
- MEd{"E, d-M"}
+ MEd{"E, dd-M"}
MMM{"LLL"}
- MMMEd{"E, d MMM"}
- MMMMEd{"E, d MMMM"}
- MMMMd{"d MMMM"}
- MMMd{"d MMM"}
+ MMMEd{"E, dd MMM"}
+ MMMMEd{"E, dd MMMM"}
+ MMMMd{"dd MMMM"}
+ MMMd{"dd MMM"}
MMdd{"dd-MM"}
- Md{"d-M"}
- d{"'Ngày' d"}
+ Md{"dd-M"}
+ d{"'Ngày' dd"}
h{"h'h' a"}
hm{"h:mm a"}
hms{"h:mm:ss a"}
mmss{"mm:ss"}
ms{"mm:ss"}
y{"y G"}
- yyQQQ{"QQQ yy G"}
- yyyy{"'Năm' y G"}
- yyyyMEd{"E, d-M-y G"}
- yyyyMM{"MM-y G"}
- yyyyMMM{"MMM y G"}
- yyyyMMMEd{"E, d MMM y G"}
- yyyyMMMM{"MMMM y G"}
- yyyyMMMd{"d MMM y G"}
- yyyyMd{"d-M-y G"}
- yyyyQQQ{"QQQ y G"}
- yyyyQQQQ{"QQQQ y G"}
+ yMEd{"E, dd-M-y G"}
+ yMM{"MM-y G"}
+ yMMM{"MMM y G"}
+ yMMMEd{"E, dd MMM y G"}
+ yMMMM{"MMMM y G"}
+ yMMMd{"dd MMM y G"}
+ yMd{"dd-M-y G"}
+ yQQQ{"QQQ y G"}
+ yQQQQ{"QQQQ y G"}
}
eras{
abbreviated{
@@ -1146,6 +1220,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Ngày"}
+ relative{
+ "-1"{"Ngày hôm qua"}
+ "-2"{"Ngày hôm kia"}
+ "0"{"Hôm nay"}
+ "1"{"Ngày mai"}
+ "2"{"Ngày kia"}
+ }
+ }
+ dayperiod{
+ dn{"SA/CH"}
+ }
+ era{
+ dn{"Thời đại"}
+ }
+ hour{
+ dn{"Giờ"}
+ }
+ minute{
+ dn{"Phút"}
+ }
+ month{
+ dn{"Tháng"}
+ relative{
+ "-1"{"Tháng trước"}
+ "0"{"Tháng này"}
+ "1"{"Tháng sau"}
+ }
+ }
+ second{
+ dn{"Giây"}
+ }
+ week{
+ dn{"Tuần"}
+ relative{
+ "-1"{"Tuần trước"}
+ "0"{"Tuần này"}
+ "1"{"Tuần sau"}
+ }
+ }
+ weekday{
+ dn{"Ngày trong tuần"}
+ }
+ year{
+ dn{"Năm"}
+ relative{
+ "-1"{"Năm ngoái"}
+ "0"{"Năm nay"}
+ "1"{"Năm sau"}
+ }
+ }
+ zone{
+ dn{"Múi giờ"}
+ }
+ }
listPattern{
standard{
2{"{0} và {1}"}
diff --git a/data/locales/vi_VN.txt b/data/locales/vi_VN.txt
index 9e59a11..1d89f19 100644
--- a/data/locales/vi_VN.txt
+++ b/data/locales/vi_VN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vi_VN.xml
// *
// ***************************************************************************
vi_VN{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/vun.txt b/data/locales/vun.txt
index 21b5f15..74a5585 100755
--- a/data/locales/vun.txt
+++ b/data/locales/vun.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vun.xml
// *
@@ -23,8 +23,48 @@
}
}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"utuko",
@@ -38,7 +78,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -111,43 +151,6 @@
"Baada ya Kristu",
}
}
- fields{
- day{
- dn{"Mfiri"}
- relative{
- "-1"{"Ukou"}
- "0"{"Inu"}
- "1"{"Ngama"}
- }
- }
- dayperiod{
- dn{"Mfiri o siku"}
- }
- era{
- dn{"Kacha"}
- }
- hour{
- dn{"Saa"}
- }
- minute{
- dn{"Dakyika"}
- }
- month{
- dn{"Mori"}
- }
- second{
- dn{"Sekunde"}
- }
- week{
- dn{"Wiikyi"}
- }
- year{
- dn{"Maka"}
- }
- zone{
- dn{"Mfiri o saa"}
- }
- }
monthNames{
format{
abbreviated{
@@ -220,4 +223,41 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Mfiri"}
+ relative{
+ "-1"{"Ukou"}
+ "0"{"Inu"}
+ "1"{"Ngama"}
+ }
+ }
+ dayperiod{
+ dn{"Mfiri o siku"}
+ }
+ era{
+ dn{"Kacha"}
+ }
+ hour{
+ dn{"Saa"}
+ }
+ minute{
+ dn{"Dakyika"}
+ }
+ month{
+ dn{"Mori"}
+ }
+ second{
+ dn{"Sekunde"}
+ }
+ week{
+ dn{"Wiikyi"}
+ }
+ year{
+ dn{"Maka"}
+ }
+ zone{
+ dn{"Mfiri o saa"}
+ }
+ }
}
diff --git a/data/locales/vun_TZ.txt b/data/locales/vun_TZ.txt
index 5c80c4a..f728447 100755
--- a/data/locales/vun_TZ.txt
+++ b/data/locales/vun_TZ.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vun_TZ.xml
// *
// ***************************************************************************
vun_TZ{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/xog.txt b/data/locales/xog.txt
index 4f15e87..7675833 100755
--- a/data/locales/xog.txt
+++ b/data/locales/xog.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/xog.xml
// *
@@ -22,8 +22,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"Munkyo",
@@ -37,7 +77,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -110,46 +150,6 @@
"Kulisto nga affile",
}
}
- fields{
- day{
- dn{"Olunaku"}
- relative{
- "-1"{"Edho"}
- "0"{"Olwaleelo (leelo)"}
- "1"{"Enkyo"}
- }
- }
- dayperiod{
- dn{"munkyo/Eigulo"}
- }
- era{
- dn{"Emulembe"}
- }
- hour{
- dn{"Essawa"}
- }
- minute{
- dn{"Edakiika"}
- }
- month{
- dn{"Omwezi"}
- }
- second{
- dn{"Obutikitiki"}
- }
- week{
- dn{"Esabiiti"}
- }
- weekday{
- dn{"Olunaka lwa sabiiti"}
- }
- year{
- dn{"Omwaka"}
- }
- zone{
- dn{"Essawa edha"}
- }
- }
monthNames{
format{
abbreviated{
@@ -222,4 +222,44 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Olunaku"}
+ relative{
+ "-1"{"Edho"}
+ "0"{"Olwaleelo (leelo)"}
+ "1"{"Enkyo"}
+ }
+ }
+ dayperiod{
+ dn{"munkyo/Eigulo"}
+ }
+ era{
+ dn{"Emulembe"}
+ }
+ hour{
+ dn{"Essawa"}
+ }
+ minute{
+ dn{"Edakiika"}
+ }
+ month{
+ dn{"Omwezi"}
+ }
+ second{
+ dn{"Obutikitiki"}
+ }
+ week{
+ dn{"Esabiiti"}
+ }
+ weekday{
+ dn{"Olunaka lwa sabiiti"}
+ }
+ year{
+ dn{"Omwaka"}
+ }
+ zone{
+ dn{"Essawa edha"}
+ }
+ }
}
diff --git a/data/locales/xog_UG.txt b/data/locales/xog_UG.txt
index 0c182d0..a8cfd26 100755
--- a/data/locales/xog_UG.txt
+++ b/data/locales/xog_UG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/xog_UG.xml
// *
// ***************************************************************************
xog_UG{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/yav.txt b/data/locales/yav.txt
index 481f082..d98dc7f 100755
--- a/data/locales/yav.txt
+++ b/data/locales/yav.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/yav.xml
// *
@@ -32,8 +32,49 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d/M/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"E d"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E d/M"}
+ MMM{"LLL"}
+ MMMEd{"E d MMM"}
+ MMMd{"d MMM"}
+ Md{"d/M"}
+ d{"d"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"m:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E d/M/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E d MMM y"}
+ yMMMd{"d MMM y"}
+ yMd{"d/M/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"kiɛmɛ́ɛm",
@@ -47,7 +88,7 @@
"EEEE d MMMM y",
"d MMMM y",
"d MMM y",
- "d/M/yyyy",
+ "d/M/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -121,46 +162,6 @@
"ékélémkúnupíén n",
}
}
- fields{
- day{
- dn{"puɔ́sɛ́"}
- relative{
- "-1"{"púyoó"}
- "0"{"ínaan"}
- "1"{"nakinyám"}
- }
- }
- dayperiod{
- dn{"kiɛmɛ́ɛm,kisɛ́ndɛ"}
- }
- era{
- dn{"kipéŋén"}
- }
- hour{
- dn{"kisikɛl,"}
- }
- minute{
- dn{"minít"}
- }
- month{
- dn{"oóli"}
- }
- second{
- dn{"síkɛn"}
- }
- week{
- dn{"sɔ́ndiɛ"}
- }
- weekday{
- dn{"metúk mɔ́sɔ́ndiɛ"}
- }
- year{
- dn{"yɔɔŋ"}
- }
- zone{
- dn{"kinúki kisikɛl ɔ́ pitɔŋ"}
- }
- }
monthNames{
format{
abbreviated{
@@ -217,4 +218,44 @@
quotationEnd{"»"}
quotationStart{"«"}
}
+ fields{
+ day{
+ dn{"puɔ́sɛ́"}
+ relative{
+ "-1"{"púyoó"}
+ "0"{"ínaan"}
+ "1"{"nakinyám"}
+ }
+ }
+ dayperiod{
+ dn{"kiɛmɛ́ɛm,kisɛ́ndɛ"}
+ }
+ era{
+ dn{"kipéŋén"}
+ }
+ hour{
+ dn{"kisikɛl,"}
+ }
+ minute{
+ dn{"minít"}
+ }
+ month{
+ dn{"oóli"}
+ }
+ second{
+ dn{"síkɛn"}
+ }
+ week{
+ dn{"sɔ́ndiɛ"}
+ }
+ weekday{
+ dn{"metúk mɔ́sɔ́ndiɛ"}
+ }
+ year{
+ dn{"yɔɔŋ"}
+ }
+ zone{
+ dn{"kinúki kisikɛl ɔ́ pitɔŋ"}
+ }
+ }
}
diff --git a/data/locales/yav_CM.txt b/data/locales/yav_CM.txt
index e0d7ec0..7f478ac 100755
--- a/data/locales/yav_CM.txt
+++ b/data/locales/yav_CM.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/yav_CM.xml
// *
// ***************************************************************************
yav_CM{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/yo.txt b/data/locales/yo.txt
index 4b63b69..5b44ba6 100755
--- a/data/locales/yo.txt
+++ b/data/locales/yo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/yo.xml
// *
@@ -26,8 +26,48 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd/MM/y GGGGG",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMMEd{"E, MMMM d"}
+ MMMMd{"MMMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ hm{"h:mm a"}
+ ms{"mm:ss"}
+ y{"y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMM{"MMMM y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ }
gregorian{
AmPmMarkers{
"Àárọ̀",
@@ -41,7 +81,7 @@
"EEEE, d MMMM y",
"d MMMM y",
"d MMM y",
- "dd/MM/yyyy",
+ "dd/MM/y",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -103,48 +143,6 @@
"Lehin Kristi",
}
}
- fields{
- day{
- dn{"Ọjọ́"}
- relative{
- "-1"{"Àná"}
- "-2"{"íjẹta"}
- "0"{"Òní"}
- "1"{"Ọ̀la"}
- "2"{"òtúùnla"}
- }
- }
- dayperiod{
- dn{"Àárọ̀/ọ̀sán"}
- }
- era{
- dn{"Ìgbà"}
- }
- hour{
- dn{"wákàtí"}
- }
- minute{
- dn{"Ìsẹ́jú"}
- }
- month{
- dn{"Osù"}
- }
- second{
- dn{"Ìsẹ́jú Ààyá"}
- }
- week{
- dn{"Ọ̀sè"}
- }
- weekday{
- dn{"Ọjọ́ Ọ̀sẹ̀"}
- }
- year{
- dn{"Ọdún"}
- }
- zone{
- dn{"Ibi Àkókò Àgbáyé"}
- }
- }
monthNames{
format{
abbreviated{
@@ -201,4 +199,46 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Ọjọ́"}
+ relative{
+ "-1"{"Àná"}
+ "-2"{"íjẹta"}
+ "0"{"Òní"}
+ "1"{"Ọ̀la"}
+ "2"{"òtúùnla"}
+ }
+ }
+ dayperiod{
+ dn{"Àárọ̀/ọ̀sán"}
+ }
+ era{
+ dn{"Ìgbà"}
+ }
+ hour{
+ dn{"wákàtí"}
+ }
+ minute{
+ dn{"Ìsẹ́jú"}
+ }
+ month{
+ dn{"Osù"}
+ }
+ second{
+ dn{"Ìsẹ́jú Ààyá"}
+ }
+ week{
+ dn{"Ọ̀sè"}
+ }
+ weekday{
+ dn{"Ọjọ́ Ọ̀sẹ̀"}
+ }
+ year{
+ dn{"Ọdún"}
+ }
+ zone{
+ dn{"Ibi Àkókò Àgbáyé"}
+ }
+ }
}
diff --git a/data/locales/yo_NG.txt b/data/locales/yo_NG.txt
index eca9acd..200b9dd 100755
--- a/data/locales/yo_NG.txt
+++ b/data/locales/yo_NG.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/yo_NG.xml
// *
// ***************************************************************************
yo_NG{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/zh.txt b/data/locales/zh.txt
index e4c6ded..68e78a9 100644
--- a/data/locales/zh.txt
+++ b/data/locales/zh.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh.xml
// *
@@ -70,10 +70,10 @@
}
ExemplarCharactersIndex{"[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]"}
ExemplarCharactersPunctuation{
- "[﹉-﹌ _ ＿ ﹍-﹏ ︳ ︴ \- － ﹣ ‐ – — ︱ ― , ， ﹐ 、 ﹑ ; ； ﹔ \: ： ﹕ ! ！ ﹗ ? ？ ﹖ . ． ﹒ ‥"
- " ︰ … 。 · ＇ ‘ ’ \" ＂ “ ” 〝 〞 ( （ ﹙ ︵ ) ） ﹚ ︶ \[ ［ \] ］ \{ ｛ ﹛ ︷ \} ｝ ﹜ ︸ 〈 ︿ "
- "〉 ﹀ 《 ︽ 》 ︾ 「 ﹁ 」 ﹂ 『 ﹃ 』 ﹄ 【 ︻ 】 ︼ 〔 ﹝ ︹ 〕 ﹞ ︺ 〖 〗 ‖ § @ ＠ ﹫ * ＊ ﹡ / ／ \\ ＼"
- " ﹨ \& ＆ ﹠ # ＃ ﹟ % ％ ﹪ ‰ ′ ″ ‵ 〃 ※]"
+ "[﹉-﹌ _ ＿ ﹍-﹏ ︳ ︴ \\- － ﹣ ‐ – — ︱ ― , ， ﹐ 、 ﹑ ; ； ﹔ \\: ： ﹕ ! ！ ﹗ ? ？ ﹖ . ． ﹒"
+ " ‥ ︰ … 。 · ＇ ‘ ’ \u0022 ＂ “ ” 〝 〞 ( （ ﹙ ︵ ) ） ﹚ ︶ \\[ ［ \\] ］ \\{ ｛ ﹛ ︷ \\} "
+ "｝ ﹜ ︸ 〈 ︿ 〉 ﹀ 《 ︽ 》 ︾ 「 ﹁ 」 ﹂ 『 ﹃ 』 ﹄ 【 ︻ 】 ︼ 〔 ﹝ ︹ 〕 ﹞ ︺ 〖 〗 ‖ § @ ＠ ﹫ * ＊ "
+ "﹡ / ／ \\\\ ＼ ﹨ \\& ＆ ﹠ # ＃ ﹟ % ％ ﹪ ‰ ′ ″ ‵ 〃 ※]"
}
LocaleScript{
"Hani",
@@ -184,58 +184,9 @@
native{"hanidec"}
traditional{"hans"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.60"}
calendar{
buddhist{
- DateTimePatterns{
- "zzzzah:mm:ss",
- "zah:mm:ss",
- "ah:mm:ss",
- "ah:mm",
- "Gy年M月d日EEEE",
- "Gy年M月d日",
- "Gyyyy-M-d",
- "Gy-M-d",
- "{1} {0}",
- "{1}{0}",
- "{1}{0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"d日E"}
- Gy{"Gy年"}
- H{"H时"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"M月"}
- MEd{"M-dE"}
- MMM{"LLL"}
- MMMEd{"M月d日E"}
- MMMd{"M月d日"}
- Md{"M-d"}
- d{"d日"}
- h{"ah时"}
- hm{"ah:mm"}
- hms{"ah:mm:ss"}
- ms{"mm:ss"}
- y{"Gy年"}
- yM{"Gy年M月"}
- yMEd{"Gy年M月d日，E"}
- yMMM{"Gy年M月"}
- yMMMEd{"Gy年M月d日E"}
- yQQQ{"Gy年第Q季度"}
- yQQQQ{"Gy年QQQQ"}
- yyyy{"Gy年"}
- yyyyM{"Gy-M"}
- yyyyMEd{"Gy-M-dE"}
- yyyyMMM{"Gy年M月"}
- yyyyMMMEd{"Gy年M月d日E"}
- yyyyMMMd{"Gy年M月d日"}
- yyyyMd{"Gy-M-d"}
- yyyyQQQ{"Gy年第Q季度"}
- yyyyQQQQ{"Gy年QQQQ"}
- }
eras{
abbreviated{
"佛历",
@@ -262,13 +213,17 @@
}
"U-M-d",
"{1} {0}",
- "{1}{0}",
- "{1}{0}",
+ "{1} {0}",
+ "{1} {0}",
"{1} {0}",
"{1} {0}",
}
availableFormats{
Ed{"d日E"}
+ Gy{"U年"}
+ GyMMM{"U年MMM"}
+ GyMMMEd{"U年MMMd日E"}
+ GyMMMd{"U年MMMd日"}
M{"MMM"}
MEd{"M-dE"}
MMMEd{"MMMd日E"}
@@ -276,14 +231,16 @@
Md{"M-d"}
d{"d日"}
y{"U年"}
- yM{"U年M月"}
- yMEd{"U年M月d日，E"}
- yMMM{"U年MMM"}
- yMMMEd{"U年MMMd日E"}
- yMMMd{"U年MMMd日"}
yMd{"U年M月d日"}
- yQQQ{"U年QQQQ"}
- yQQQQ{"U年QQQQ"}
+ yyyy{"U年"}
+ yyyyM{"U年M月"}
+ yyyyMEd{"U年M月d日，E"}
+ yyyyMMM{"U年MMM"}
+ yyyyMMMEd{"U年MMMd日E"}
+ yyyyMMMd{"U年MMMd日"}
+ yyyyMd{"U年M月d日"}
+ yyyyQQQ{"U年QQQQ"}
+ yyyyQQQQ{"U年QQQQ"}
}
cyclicNameSets{
dayParts{
@@ -777,6 +734,146 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "zzzzah:mm:ss",
+ "zah:mm:ss",
+ "ah:mm:ss",
+ "ah:mm",
+ "Gy年M月d日EEEE",
+ "Gy年M月d日",
+ "Gy年M月d日",
+ "Gy-M-d",
+ "{1} {0}",
+ "{1}{0}",
+ "{1}{0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d日E"}
+ Gy{"Gy年"}
+ GyMMM{"Gy年M月"}
+ GyMMMEd{"Gy年M月d日E"}
+ GyMMMd{"Gy年M月d日"}
+ H{"H时"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"M月"}
+ MEd{"M-dE"}
+ MMM{"LLL"}
+ MMMEd{"M月d日E"}
+ MMMd{"M月d日"}
+ Md{"M-d"}
+ d{"d日"}
+ h{"ah时"}
+ hm{"ah:mm"}
+ hms{"ah:mm:ss"}
+ ms{"mm:ss"}
+ y{"Gy年"}
+ yyyy{"Gy年"}
+ yyyyM{"Gy-M"}
+ yyyyMEd{"Gy-M-d（E）"}
+ yyyyMMM{"Gy年M月"}
+ yyyyMMMEd{"Gy年M月d日E"}
+ yyyyMMMM{"Gy年M月"}
+ yyyyMMMd{"Gy年M月d日"}
+ yyyyMd{"Gy-M-d"}
+ yyyyQQQ{"Gy年第Q季度"}
+ yyyyQQQQ{"Gy年QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M月"}
+ }
+ MEd{
+ M{"M/dE至M/dE"}
+ d{"M/dE至M/dE"}
+ }
+ MMM{
+ M{"LLL至LLL"}
+ }
+ MMMEd{
+ M{"M月d日E至M月d日E"}
+ d{"M月d日E至d日E"}
+ }
+ MMMd{
+ M{"M月d日至M月d日"}
+ d{"M月d日至d日"}
+ }
+ Md{
+ M{"M/d – M/d"}
+ d{"M/d – M/d"}
+ }
+ d{
+ d{"d日至d日"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"ah时至ah时"}
+ h{"ah时至h时"}
+ }
+ hm{
+ a{"ah:mm至ah:mm"}
+ h{"ah:mm至h:mm"}
+ m{"ah:mm至h:mm"}
+ }
+ hmv{
+ a{"vah:mm至ah:mm"}
+ h{"vah:mm至h:mm"}
+ m{"vah:mm至h:mm"}
+ }
+ hv{
+ a{"vah时至ah时"}
+ h{"vah时至h时"}
+ }
+ y{
+ y{"Gy–y年"}
+ }
+ yM{
+ M{"Gy年M月至M月"}
+ y{"Gy年M月至y年M月"}
+ }
+ yMEd{
+ M{"Gy/M/dE至y/M/dE"}
+ d{"Gy/M/dE至y/M/dE"}
+ y{"Gy/M/dE至y/M/dE"}
+ }
+ yMMM{
+ M{"Gy年M月至M月"}
+ y{"Gy年M月至y年M月"}
+ }
+ yMMMEd{
+ M{"Gy年M月d日E至M月d日E"}
+ d{"Gy年M月d日E至d日E"}
+ y{"Gy年M月d日E至y年M月d日E"}
+ }
+ yMMMM{
+ M{"Gy年M月至M月"}
+ y{"Gy年M月至y年M月"}
+ }
+ yMMMd{
+ M{"Gy年M月d日至M月d日"}
+ d{"Gy年M月d日至d日"}
+ y{"Gy年M月d日至y年M月d日"}
+ }
+ yMd{
+ M{"Gy/M/d – y/M/d"}
+ d{"Gy/M/d – y/M/d"}
+ y{"Gy/M/d – y/M/d"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"上午",
@@ -799,6 +896,10 @@
}
availableFormats{
Ed{"d日E"}
+ Gy{"Gy年"}
+ GyMMM{"Gy年M月"}
+ GyMMMEd{"Gy年M月d日E"}
+ GyMMMd{"Gy年M月d日"}
H{"H时"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -817,19 +918,15 @@
ms{"mm:ss"}
y{"y年"}
yM{"y/M"}
- yMEd{"y/M/dEEE"}
+ yMEd{"y/M/dE"}
+ yMM{"y年M月"}
yMMM{"y年M月"}
yMMMEd{"y年M月d日E"}
+ yMMMM{"y年M月"}
yMMMd{"y年M月d日"}
yMd{"y/M/d"}
yQQQ{"y年第Q季度"}
yQQQQ{"y年QQQQ"}
- yyMM{"yy年M月"}
- yyMMM{"yy年M月"}
- yyQQQ{"yy年第Q季度"}
- yyyy{"yyyy年"}
- yyyyM{"yyyy年M月"}
- yyyyMMMM{"yyyy年M月"}
}
dayNames{
format{
@@ -923,63 +1020,6 @@
"公元",
}
}
- fields{
- day{
- dn{"日"}
- relative{
- "-1"{"昨天"}
- "-2"{"前天"}
- "0"{"今天"}
- "1"{"明天"}
- "2"{"后天"}
- }
- }
- dayperiod{
- dn{"上午/下午"}
- }
- era{
- dn{"时期"}
- }
- hour{
- dn{"小时"}
- }
- minute{
- dn{"分钟"}
- }
- month{
- dn{"月"}
- relative{
- "-1"{"上个月"}
- "0"{"本月"}
- "1"{"下个月"}
- }
- }
- second{
- dn{"秒钟"}
- }
- week{
- dn{"周"}
- relative{
- "-1"{"上周"}
- "0"{"本周"}
- "1"{"下周"}
- }
- }
- weekday{
- dn{"星期"}
- }
- year{
- dn{"年"}
- relative{
- "-1"{"去年"}
- "0"{"今年"}
- "1"{"明年"}
- }
- }
- zone{
- dn{"时区"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -1039,13 +1079,13 @@
y{"y–y年"}
}
yM{
- M{"yy年M月至M月"}
- y{"yy年M月至yy年M月"}
+ M{"y年M月至M月"}
+ y{"y年M月至y年M月"}
}
yMEd{
- M{"yy/M/dE至yy/M/dE"}
- d{"yy/M/dE至yy/M/dE"}
- y{"yy/M/dE至yy/M/dE"}
+ M{"y/M/dE至y/M/dE"}
+ d{"y/M/dE至y/M/dE"}
+ y{"y/M/dE至y/M/dE"}
}
yMMM{
M{"y年M月至M月"}
@@ -1066,9 +1106,9 @@
y{"y年M月d日至y年M月d日"}
}
yMd{
- M{"yy/M/d – yy/M/d"}
- d{"yy/M/d – yy/M/d"}
- y{"yy/M/d – yy/M/d"}
+ M{"y/M/d – y/M/d"}
+ d{"y/M/d – y/M/d"}
+ y{"y/M/d – y/M/d"}
}
}
monthNames{
@@ -1379,54 +1419,6 @@
}
}
islamic{
- DateTimePatterns{
- "zzzzah:mm:ss",
- "zah:mm:ss",
- "ah:mm:ss",
- "ah:mm",
- "Gy年M月d日EEEE",
- "Gy年M月d日",
- "Gy年M月d日",
- "Gyy-MM-dd",
- "{1} {0}",
- "{1}{0}",
- "{1}{0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"d日E"}
- Gy{"GGGyy年"}
- H{"H时"}
- Hm{"H:mm"}
- Hms{"H:mm:ss"}
- M{"M月"}
- MEd{"M-dE"}
- MMM{"LLL"}
- MMMEd{"M月d日E"}
- MMMMdd{"M月dd日"}
- MMMd{"M月d日"}
- MMdd{"MM-dd"}
- Md{"M-d"}
- d{"d日"}
- h{"ah时"}
- hm{"ah:mm"}
- hms{"ah:mm:ss"}
- ms{"mm:ss"}
- y{"GGGyy年"}
- yM{"y年M月"}
- yMEd{"y年M月d日，E"}
- yMMM{"y年M月"}
- yMMMEd{"y年M月d日E"}
- yQQQ{"y年第Q季度"}
- yQQQQ{"y年QQQQ"}
- yyyy{"GGGyy年"}
- yyyyM{"GGGGGyy-MM"}
- yyyyMMM{"GGGGGyy年M月"}
- yyyyMMMd{"GGGGGyy年M月d日"}
- yyyyMd{"GGGGGyy-MM-dd"}
- yyyyQQQ{"Gy年第Q季度"}
- }
eras{
abbreviated{
"回历",
@@ -1542,6 +1534,9 @@
availableFormats{
Ed{"d日E"}
Gy{"Gy年"}
+ GyMMM{"Gy年M月"}
+ GyMMMEd{"Gy年M月d日E"}
+ GyMMMd{"Gy年M月d日"}
H{"H时"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -1565,6 +1560,7 @@
yyyyMMMd{"Gy年M月d日"}
yyyyMd{"Gy-MM-dd"}
yyyyQQQ{"Gy年第Q季度"}
+ yyyyQQQQ{"Gy年QQQQ"}
}
eras{
abbreviated{
@@ -1905,49 +1901,6 @@
}
}
roc{
- DateTimePatterns{
- "zzzzah:mm:ss",
- "zah:mm:ss",
- "ah:mm:ss",
- "ah:mm",
- "Gy年M月d日EEEE",
- "Gy年M月d日",
- "Gy-M-d",
- "Gy-M-d",
- "{1} {0}",
- "{1}{0}",
- "{1}{0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"d日E"}
- Gy{"Gy年"}
- H{"H时"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"M月"}
- MEd{"M-dE"}
- MMM{"LLL"}
- MMMEd{"M月d日E"}
- MMMd{"M月d日"}
- Md{"M-d"}
- d{"d日"}
- h{"ah时"}
- hm{"ah:mm"}
- hms{"ah:mm:ss"}
- ms{"mm:ss"}
- y{"Gy年"}
- yyyy{"Gy年"}
- yyyyM{"Gy-M"}
- yyyyMEd{"Gy-M-d（E）"}
- yyyyMM{"Gy-MM"}
- yyyyMMM{"Gy年M月"}
- yyyyMMMEd{"Gy年M月d日E"}
- yyyyMMMd{"Gy年M月d日"}
- yyyyMd{"Gy-M-d"}
- yyyyQQQ{"Gy年第Q季度"}
- }
eras{
abbreviated{
"民国前",
@@ -1962,6 +1915,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"日"}
+ relative{
+ "-1"{"昨天"}
+ "-2"{"前天"}
+ "0"{"今天"}
+ "1"{"明天"}
+ "2"{"后天"}
+ }
+ }
+ dayperiod{
+ dn{"上午/下午"}
+ }
+ era{
+ dn{"时期"}
+ }
+ hour{
+ dn{"小时"}
+ }
+ minute{
+ dn{"分钟"}
+ }
+ month{
+ dn{"月"}
+ relative{
+ "-1"{"上个月"}
+ "0"{"本月"}
+ "1"{"下个月"}
+ }
+ }
+ second{
+ dn{"秒钟"}
+ }
+ week{
+ dn{"周"}
+ relative{
+ "-1"{"上周"}
+ "0"{"本周"}
+ "1"{"下周"}
+ }
+ }
+ weekday{
+ dn{"星期"}
+ }
+ year{
+ dn{"年"}
+ relative{
+ "-1"{"去年"}
+ "0"{"今年"}
+ "1"{"明年"}
+ }
+ }
+ zone{
+ dn{"时区"}
+ }
+ }
listPattern{
standard{
2{"{0}和{1}"}
diff --git a/data/locales/zh_CN.txt b/data/locales/zh_CN.txt
index 348f06e..28103b9 100644
--- a/data/locales/zh_CN.txt
+++ b/data/locales/zh_CN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/zh_HK.txt b/data/locales/zh_HK.txt
index 8e03c71..67efd92 100644
--- a/data/locales/zh_HK.txt
+++ b/data/locales/zh_HK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/zh_Hans.txt b/data/locales/zh_Hans.txt
index bda4960..d35a691 100644
--- a/data/locales/zh_Hans.txt
+++ b/data/locales/zh_Hans.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans.xml
// *
@@ -13,5 +13,5 @@
LocaleScript{
"Hani",
}
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/zh_Hans_CN.txt b/data/locales/zh_Hans_CN.txt
index daea601..835f05a 100644
--- a/data/locales/zh_Hans_CN.txt
+++ b/data/locales/zh_Hans_CN.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans_CN.xml
// *
// ***************************************************************************
zh_Hans_CN{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/zh_Hans_HK.txt b/data/locales/zh_Hans_HK.txt
index 20c33d3..2aa8ea9 100755
--- a/data/locales/zh_Hans_HK.txt
+++ b/data/locales/zh_Hans_HK.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans_HK.xml
// *
@@ -14,7 +14,7 @@
}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
DateTimePatterns{
@@ -36,6 +36,59 @@
M{"L"}
}
}
+ generic{
+ DateTimePatterns{
+ "zzzzah:mm:ss",
+ "zah:mm:ss",
+ "ah:mm:ss",
+ "ah:mm",
+ "Gy年M月d日EEEE",
+ "Gy年M月d日",
+ "Gy年M月d日",
+ "d/M/yyGGGGG",
+ "{1} {0}",
+ "{1}{0}",
+ "{1}{0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ HHmm{"HH:mm"}
+ M{"L"}
+ MMMMdd{"M月d日"}
+ Md{"M-d"}
+ yM{"y年M月"}
+ }
+ intervalFormats{
+ Hmv{
+ H{"vHH:mm–HH:mm"}
+ m{"vHH:mm–HH:mm"}
+ }
+ Hv{
+ H{"vHH–HH"}
+ }
+ fallback{"{0}–{1}"}
+ h{
+ h{"ah至h时"}
+ }
+ yM{
+ M{"y年M月至y年M月"}
+ }
+ yMEd{
+ M{"d/M/yE至d/M/yE"}
+ d{"d/M/yE至d/M/yE"}
+ y{"d/M/yE至d/M/yE"}
+ }
+ yMMMEd{
+ d{"y年M月d日E至M月d日E"}
+ }
+ yMd{
+ M{"d/M/y至d/M/y"}
+ d{"d/M/y至d/M/y"}
+ y{"d/M/y至d/M/y"}
+ }
+ }
+ }
gregorian{
DateTimePatterns{
"zzzzah:mm:ss",
@@ -59,11 +112,6 @@
Md{"M-d"}
yM{"y年M月"}
}
- fields{
- era{
- dn{"纪元"}
- }
- }
intervalFormats{
Hmv{
H{"vHH:mm–HH:mm"}
@@ -77,20 +125,20 @@
h{"ah至h时"}
}
yM{
- M{"yy年M月至yy年M月"}
+ M{"y年M月至y年M月"}
}
yMEd{
- M{"d/M/yyE至d/M/yyE"}
- d{"d/M/yyE至d/M/yyE"}
- y{"d/M/yyE至d/M/yyE"}
+ M{"d/M/yE至d/M/yE"}
+ d{"d/M/yE至d/M/yE"}
+ y{"d/M/yE至d/M/yE"}
}
yMMMEd{
d{"y年M月d日E至M月d日E"}
}
yMd{
- M{"d/M/yy至d/M/yy"}
- d{"d/M/yy至d/M/yy"}
- y{"d/M/yy至d/M/yy"}
+ M{"d/M/y至d/M/y"}
+ d{"d/M/y至d/M/y"}
+ y{"d/M/y至d/M/y"}
}
}
}
@@ -151,4 +199,9 @@
}
}
}
+ fields{
+ era{
+ dn{"纪元"}
+ }
+ }
}
diff --git a/data/locales/zh_Hans_MO.txt b/data/locales/zh_Hans_MO.txt
index 2459afd..ec33436 100755
--- a/data/locales/zh_Hans_MO.txt
+++ b/data/locales/zh_Hans_MO.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans_MO.xml
// *
// ***************************************************************************
zh_Hans_MO{
- ExemplarCharactersPunctuation{"[＿ ﹏ \- — ， 、 ； ： ！ ？ … 。 · ‘ ’ “ ” （ ） ［ ］ 〈 〉 《 》 ﹁ ﹂ ﹃ ﹄ 【 】 〔 〕 / ～]"}
+ ExemplarCharactersPunctuation{"[＿ ﹏ \\- — ， 、 ； ： ！ ？ … 。 · ‘ ’ “ ” （ ） ［ ］ 〈 〉 《 》 ﹁ ﹂ ﹃ ﹄ 【 】 〔 〕 / ～]"}
NumberElements{
latn{
patterns{
@@ -15,7 +15,7 @@
}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
DateTimePatterns{
@@ -34,6 +34,69 @@
"{1} {0}",
}
}
+ generic{
+ DateTimePatterns{
+ "zzzzah:mm:ss",
+ "zah:mm:ss",
+ "ah:mm:ss",
+ "ah:mm",
+ "Gy年M月d日EEEE",
+ "Gy年M月d日",
+ "Gy年M月d日",
+ "d/M/yyGGGGG",
+ "{1} {0}",
+ "{1}{0}",
+ "{1}{0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MEd{"M-dE"}
+ MMMMdd{"M月d日"}
+ MMdd{"MM-dd"}
+ Md{"M-d"}
+ yM{"y年M月"}
+ yMEd{"y年M月d日，E"}
+ yMd{"y年M月d日"}
+ }
+ intervalFormats{
+ Hmv{
+ H{"vHH:mm–HH:mm"}
+ m{"vHH:mm–HH:mm"}
+ }
+ Hv{
+ H{"vHH–HH"}
+ }
+ MEd{
+ M{"M-dE至M-dE"}
+ d{"M-dE至M-dE"}
+ }
+ MMMEd{
+ d{"M月d日E至M月d日E"}
+ }
+ Md{
+ M{"M-d至M-d"}
+ d{"M-d至M-d"}
+ }
+ fallback{"{0}–{1}"}
+ yM{
+ M{"y年M月至y年M月"}
+ }
+ yMEd{
+ M{"d/M/yE至d/M/yE"}
+ d{"d/M/yE至d/M/yE"}
+ y{"d/M/yE至d/M/yE"}
+ }
+ yMMMEd{
+ d{"y年M月d日E至M月d日E"}
+ }
+ yMd{
+ M{"d/M/y至d/M/y"}
+ d{"d/M/y至d/M/y"}
+ y{"d/M/y至d/M/y"}
+ }
+ }
+ }
gregorian{
DateTimePatterns{
"zzzzah:mm:ss",
@@ -59,14 +122,6 @@
yMEd{"y年M月d日，E"}
yMd{"y年M月d日"}
}
- fields{
- day{
- dn{"天"}
- }
- era{
- dn{"纪元"}
- }
- }
intervalFormats{
Hmv{
H{"vHH:mm–HH:mm"}
@@ -88,20 +143,20 @@
}
fallback{"{0}–{1}"}
yM{
- M{"yy年M月至yy年M月"}
+ M{"y年M月至y年M月"}
}
yMEd{
- M{"d/M/yyE至d/M/yyE"}
- d{"d/M/yyE至d/M/yyE"}
- y{"d/M/yyE至d/M/yyE"}
+ M{"d/M/yE至d/M/yE"}
+ d{"d/M/yE至d/M/yE"}
+ y{"d/M/yE至d/M/yE"}
}
yMMMEd{
d{"y年M月d日E至M月d日E"}
}
yMd{
- M{"d/M/yy至d/M/yy"}
- d{"d/M/yy至d/M/yy"}
- y{"d/M/yy至d/M/yy"}
+ M{"d/M/y至d/M/y"}
+ d{"d/M/y至d/M/y"}
+ y{"d/M/y至d/M/y"}
}
}
}
@@ -161,4 +216,12 @@
}
}
}
+ fields{
+ day{
+ dn{"天"}
+ }
+ era{
+ dn{"纪元"}
+ }
+ }
}
diff --git a/data/locales/zh_Hans_SG.txt b/data/locales/zh_Hans_SG.txt
index d1bbdcd..7054be3 100644
--- a/data/locales/zh_Hans_SG.txt
+++ b/data/locales/zh_Hans_SG.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans_SG.xml
// *
@@ -14,7 +14,7 @@
}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
calendar{
buddhist{
DateTimePatterns{
@@ -33,6 +33,66 @@
"{1} {0}",
}
}
+ generic{
+ DateTimePatterns{
+ "zzzzah:mm:ss",
+ "ahh:mm:ssz",
+ "ah:mm:ss",
+ "ahh:mm",
+ "Gy年M月d日EEEE",
+ "Gy年M月d日",
+ "Gy年M月d日",
+ "dd/MM/yyGGGGG",
+ "{1} {0}",
+ "{1}{0}",
+ "{1}{0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MEd{"M-dE"}
+ MMMMdd{"M月d日"}
+ MMdd{"MM-dd"}
+ Md{"M-d"}
+ yM{"y年M月"}
+ yMEd{"y年M月d日，E"}
+ yMd{"y年M月d日"}
+ }
+ intervalFormats{
+ Hmv{
+ H{"vHH:mm–HH:mm"}
+ m{"vHH:mm–HH:mm"}
+ }
+ Hv{
+ H{"vHH–HH"}
+ }
+ MEd{
+ M{"M-dE至M-dE"}
+ d{"M-dE至M-dE"}
+ }
+ MMMEd{
+ d{"M月d日E至M月d日E"}
+ }
+ Md{
+ M{"M-d至M-d"}
+ d{"M-d至M-d"}
+ }
+ fallback{"{0}至{1}"}
+ yM{
+ M{"y年M月至y年M月"}
+ }
+ yMEd{
+ M{"d/M/yE至d/M/yE"}
+ d{"d/M/yE至d/M/yE"}
+ y{"d/M/yE至d/M/yE"}
+ }
+ yMd{
+ M{"d/M/y至d/M/y"}
+ d{"d/M/y至d/M/y"}
+ y{"d/M/y至d/M/y"}
+ }
+ }
+ }
gregorian{
DateTimePatterns{
"zzzzah:mm:ss",
@@ -58,11 +118,6 @@
yMEd{"y年M月d日，E"}
yMd{"y年M月d日"}
}
- fields{
- era{
- dn{"纪元"}
- }
- }
intervalFormats{
Hmv{
H{"vHH:mm–HH:mm"}
@@ -84,17 +139,17 @@
}
fallback{"{0}至{1}"}
yM{
- M{"yy年M月至yy年M月"}
+ M{"y年M月至y年M月"}
}
yMEd{
- M{"d/M/yyE至d/M/yyE"}
- d{"d/M/yyE至d/M/yyE"}
- y{"d/M/yyE至d/M/yyE"}
+ M{"d/M/yE至d/M/yE"}
+ d{"d/M/yE至d/M/yE"}
+ y{"d/M/yE至d/M/yE"}
}
yMd{
- M{"d/M/yy至d/M/yy"}
- d{"d/M/yy至d/M/yy"}
- y{"d/M/yy至d/M/yy"}
+ M{"d/M/y至d/M/y"}
+ d{"d/M/y至d/M/y"}
+ y{"d/M/y至d/M/y"}
}
}
}
@@ -154,4 +209,9 @@
}
}
}
+ fields{
+ era{
+ dn{"纪元"}
+ }
+ }
}
diff --git a/data/locales/zh_Hant.txt b/data/locales/zh_Hant.txt
index a84b4d7..b996a16 100644
--- a/data/locales/zh_Hant.txt
+++ b/data/locales/zh_Hant.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hant.xml
// *
@@ -72,10 +72,10 @@
}
ExemplarCharactersIndex{"[一 丁 丈 不 且 丞 並 串 乘 乾 亂 亭 傀 僎 僵 儐 償 儳 儷 儻 叢 嚴 囌 囑 廳]"}
ExemplarCharactersPunctuation{
- "[‾ ﹉-﹌ _ ＿ ﹍-﹏ ︳ ︴ \- － ﹣ ‐ – ︲ — ﹘ ︱ , ， ﹐ 、 ﹑ ; ； ﹔ \: ： ﹕ ! ！ ﹗ ? ？ ﹖ . ．"
- " ﹒ ‥ ︰ … 。 · ＇ ‘ ’ \" ＂ “ ” 〝 〞 ( （ ﹙ ︵ ) ） ﹚ ︶ \[ ［ \] ］ \{ ｛ ﹛ ︷ \} ｝ ﹜ ︸ "
- "〈 ︿ 〉 ﹀ 《 ︽ 》 ︾ 「 ﹁ 」 ﹂ 『 ﹃ 』 ﹄ 【 ︻ 】 ︼ 〔 ﹝ ︹ 〕 ﹞ ︺ § @ ＠ ﹫ * ＊ ﹡ / ／ \\ ＼ ﹨"
- " \& ＆ ﹠ # ＃ ﹟ % ％ ﹪ ‰ † ‡ ‧ ′ ″ ‵ 〃 ※]"
+ "[‾ ﹉-﹌ _ ＿ ﹍-﹏ ︳ ︴ \\- － ﹣ ‐ – ︲ — ﹘ ︱ , ， ﹐ 、 ﹑ ; ； ﹔ \\: ： ﹕ ! ！ ﹗ ? ？ ﹖ ."
+ " ． ﹒ ‥ ︰ … 。 · ＇ ‘ ’ \u0022 ＂ “ ” 〝 〞 ( （ ﹙ ︵ ) ） ﹚ ︶ \\[ ［ \\] ］ \\{ ｛ ﹛ ︷ "
+ "\\} ｝ ﹜ ︸ 〈 ︿ 〉 ﹀ 《 ︽ 》 ︾ 「 ﹁ 」 ﹂ 『 ﹃ 』 ﹄ 【 ︻ 】 ︼ 〔 ﹝ ︹ 〕 ﹞ ︺ § @ ＠ ﹫ * ＊ ﹡ "
+ "/ ／ \\\\ ＼ ﹨ \\& ＆ ﹠ # ＃ ﹟ % ％ ﹪ ‰ † ‡ ‧ ′ ″ ‵ 〃 ※]"
}
LocaleScript{
"Hani",
@@ -187,58 +187,9 @@
native{"hanidec"}
traditional{"hant"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
calendar{
buddhist{
- DateTimePatterns{
- "zzzzah時mm分ss秒",
- "zah時mm分ss秒",
- "ah:mm:ss",
- "ah:mm",
- "Gy年M月d日EEEE",
- "Gy年M月d日",
- "Gy/M/d",
- "Gy/M/d",
- "{1} {0}",
- "{1}{0}",
- "{1}{0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"d日（E）"}
- Gy{"Gy年"}
- H{"H時"}
- Hm{"H:mm"}
- Hms{"H:mm:ss"}
- M{"M月"}
- MEd{"M/d（E）"}
- MMM{"LLL"}
- MMMEd{"M月d日E"}
- MMMMdd{"M月dd日"}
- MMMd{"M月d日"}
- MMdd{"MM/dd"}
- Md{"M/d"}
- d{"d日"}
- h{"ah時"}
- hm{"ah:mm"}
- hms{"ah:mm:ss"}
- ms{"mm:ss"}
- y{"Gy年"}
- yM{"Gy/M"}
- yMEd{"Gy/M/d（E）"}
- yMMM{"Gy年M月"}
- yMMMEd{"Gy年M月d日E"}
- yMMMd{"Gy年M月d日"}
- yMd{"Gy/M/d"}
- yQQQ{"Gy年QQQ"}
- yQQQQ{"Gy年QQQQ"}
- yyMM{"Gyy/MM"}
- yyMMM{"Gyy年M月"}
- yyQQQ{"Gyy年第Q季度"}
- yyyy{"Gy年"}
- yyyyMMM{"Gy年M月"}
- }
eras{
abbreviated{
"佛曆",
@@ -265,13 +216,17 @@
}
"U/M/d",
"{1} {0}",
- "{1}{0}",
- "{1}{0}",
+ "{1} {0}",
+ "{1} {0}",
"{1} {0}",
"{1} {0}",
}
availableFormats{
Ed{"d日E"}
+ Gy{"U年"}
+ GyMMM{"U年MMM"}
+ GyMMMEd{"U年MMMd日E"}
+ GyMMMd{"U年MMMd日"}
M{"MMM"}
MEd{"M/dE"}
MMMEd{"MMMd日E"}
@@ -279,14 +234,16 @@
Md{"M/d"}
d{"d日"}
y{"U年"}
- yM{"U年M月"}
- yMEd{"U年M月d日，E"}
- yMMM{"U年MMM"}
- yMMMEd{"U年MMMd日E"}
- yMMMd{"U年MMMd日"}
yMd{"U年M月d日"}
- yQQQ{"U年QQQQ"}
- yQQQQ{"U年QQQQ"}
+ yyyy{"U年"}
+ yyyyM{"U年M月"}
+ yyyyMEd{"U年M月d日，E"}
+ yyyyMMM{"U年MMM"}
+ yyyyMMMEd{"U年MMMd日E"}
+ yyyyMMMd{"U年MMMd日"}
+ yyyyMd{"U年M月d日"}
+ yyyyQQQ{"U年QQQQ"}
+ yyyyQQQQ{"U年QQQQ"}
}
cyclicNameSets{
dayParts{
@@ -731,6 +688,151 @@
}
}
}
+ generic{
+ DateTimePatterns{
+ "zzzzah時mm分ss秒",
+ "zah時mm分ss秒",
+ "ah:mm:ss",
+ "ah:mm",
+ "Gy年M月d日EEEE",
+ "Gy年M月d日",
+ "Gy/M/d",
+ "Gy/M/d",
+ "{1} {0}",
+ "{1}{0}",
+ "{1}{0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d日（E）"}
+ Gy{"Gy年"}
+ GyMMM{"Gy年M月"}
+ GyMMMEd{"Gy年M月d日E"}
+ GyMMMd{"Gy年M月d日"}
+ H{"H時"}
+ Hm{"H:mm"}
+ Hms{"H:mm:ss"}
+ M{"M月"}
+ MEd{"M/d（E）"}
+ MMM{"LLL"}
+ MMMEd{"M月d日E"}
+ MMMd{"M月d日"}
+ Md{"M/d"}
+ d{"d日"}
+ h{"ah時"}
+ hm{"ah:mm"}
+ hms{"ah:mm:ss"}
+ ms{"mm:ss"}
+ y{"Gy年"}
+ yyyy{"Gy年"}
+ yyyyM{"Gy/M"}
+ yyyyMEd{"Gy/M/d（E）"}
+ yyyyMMM{"Gy年M月"}
+ yyyyMMMEd{"Gy年M月d日E"}
+ yyyyMMMd{"Gy年M月d日"}
+ yyyyMd{"Gy/M/d"}
+ yyyyQQQ{"Gy年QQQ"}
+ yyyyQQQQ{"Gy年QQQQ"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm [v]"}
+ m{"HH:mm–HH:mm [v]"}
+ }
+ Hv{
+ H{"HH–HH [v]"}
+ }
+ M{
+ M{"M月至M月"}
+ }
+ MEd{
+ M{"M/dE至M/dE"}
+ d{"M/dE至M/dE"}
+ }
+ MMM{
+ M{"LLL至LLL"}
+ }
+ MMMEd{
+ M{"M月d日E至M月d日E"}
+ d{"M月d日E至d日E"}
+ }
+ MMMM{
+ M{"LLLL至LLLL"}
+ }
+ MMMd{
+ M{"M月d日至M月d日"}
+ d{"M月d日至d日"}
+ }
+ Md{
+ M{"M/d至M/d"}
+ d{"M/d至M/d"}
+ }
+ d{
+ d{"d日至d日"}
+ }
+ fallback{"{0}至{1}"}
+ h{
+ a{"ah時至ah時"}
+ h{"ah時至h時"}
+ }
+ hm{
+ a{"ah:mm至ah:mm"}
+ h{"ah:mm至h:mm"}
+ m{"ah:mm至h:mm"}
+ }
+ hmv{
+ a{"ah:mm至ah:mm [v]"}
+ h{"ah:mm至h:mm [v]"}
+ m{"ah:mm至h:mm [v]"}
+ }
+ hv{
+ a{"ah時至ah時 [v]"}
+ h{"ah時至h時 [v]"}
+ }
+ y{
+ y{"Gy至y"}
+ }
+ yM{
+ M{"Gy/M至y/M"}
+ y{"Gy/M至y/M"}
+ }
+ yMEd{
+ M{"Gy/M/dE至y/M/dE"}
+ d{"Gy/M/dE至y/M/dE"}
+ y{"Gy/M/dE至y/M/dE"}
+ }
+ yMMM{
+ M{"Gy年M月至M月"}
+ y{"Gy年M月至y年M月"}
+ }
+ yMMMEd{
+ M{"Gy年M月d日E至M月d日E"}
+ d{"Gy年M月d日E至d日E"}
+ y{"Gy年M月d日E至y年M月d日E"}
+ }
+ yMMMM{
+ M{"Gy年M月至M月"}
+ y{"Gy年M月至y年M月"}
+ }
+ yMMMd{
+ M{"Gy年M月d日至M月d日"}
+ d{"Gy年M月d日至d日"}
+ y{"Gy年M月d日至y年M月d日"}
+ }
+ yMd{
+ M{"Gy/M/d至y/M/d"}
+ d{"Gy/M/d至y/M/d"}
+ y{"Gy/M/d至y/M/d"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"上午",
@@ -743,7 +845,7 @@
"ah:mm",
"y年M月d日EEEE",
"y年M月d日",
- "yyyy/M/d",
+ "y/M/d",
"y/M/d",
"{1} {0}",
"{1}{0}",
@@ -753,6 +855,10 @@
}
availableFormats{
Ed{"d日（E）"}
+ Gy{"Gy年"}
+ GyMMM{"Gy年M月"}
+ GyMMMEd{"Gy年M月d日E"}
+ GyMMMd{"Gy年M月d日"}
H{"H時"}
Hm{"H:mm"}
Hms{"H:mm:ss"}
@@ -772,18 +878,14 @@
y{"y年"}
yM{"y/M"}
yMEd{"y/M/d（E）"}
+ yMM{"y-MM"}
yMMM{"y年M月"}
yMMMEd{"y年M月d日E"}
+ yMMMM{"y年M月"}
yMMMd{"y年M月d日"}
yMd{"y/M/d"}
yQQQ{"y年QQQ"}
yQQQQ{"y年QQQQ"}
- yyMM{"yy-MM"}
- yyMMM{"yy年M月"}
- yyQQQ{"yy年第Q季度"}
- yyyy{"y年"}
- yyyyM{"y年M月"}
- yyyyMMMM{"y年M月"}
}
dayNames{
format{
@@ -842,63 +944,6 @@
"西元",
}
}
- fields{
- day{
- dn{"日"}
- relative{
- "-1"{"昨天"}
- "-2"{"前天"}
- "0"{"今天"}
- "1"{"明天"}
- "2"{"後天"}
- }
- }
- dayperiod{
- dn{"上午/下午"}
- }
- era{
- dn{"年代"}
- }
- hour{
- dn{"小時"}
- }
- minute{
- dn{"分鐘"}
- }
- month{
- dn{"月"}
- relative{
- "-1"{"上個月"}
- "0"{"本月"}
- "1"{"下個月"}
- }
- }
- second{
- dn{"秒"}
- }
- week{
- dn{"週"}
- relative{
- "-1"{"上週"}
- "0"{"本週"}
- "1"{"下週"}
- }
- }
- weekday{
- dn{"週天"}
- }
- year{
- dn{"年"}
- relative{
- "-1"{"去年"}
- "0"{"今年"}
- "1"{"明年"}
- }
- }
- zone{
- dn{"時區"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -1264,57 +1309,6 @@
}
}
islamic{
- DateTimePatterns{
- "zzzzah時mm分ss秒",
- "zah時mm分ss秒",
- "ah:mm:ss",
- "ah:mm",
- "Gy年M月d日EEEE",
- "Gy年M月d日",
- "Gy/M/d",
- "Gy/M/d",
- "{1} {0}",
- "{1}{0}",
- "{1}{0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"d日（E）"}
- Gy{"Gy年"}
- H{"H時"}
- Hm{"H:mm"}
- Hms{"H:mm:ss"}
- M{"M月"}
- MEd{"M/d（E）"}
- MMM{"LLL"}
- MMMEd{"M月d日E"}
- MMMMdd{"M月dd日"}
- MMMd{"M月d日"}
- MMdd{"MM/dd"}
- Md{"M/d"}
- d{"d日"}
- h{"ah時"}
- hm{"ah:mm"}
- hms{"ah:mm:ss"}
- ms{"mm:ss"}
- y{"Gy年"}
- yM{"y/M"}
- yMEd{"y/M/d（E）"}
- yMMM{"y年M月"}
- yMMMEd{"y年M月d日E"}
- yMMMd{"Gy年M月d日"}
- yMd{"Gy/M/d"}
- yQQQ{"y年QQQ"}
- yQQQQ{"y年QQQQ"}
- yyyy{"Gy年"}
- yyyyM{"Gy/M"}
- yyyyMMM{"Gy年M月"}
- yyyyMMMEd{"Gy年M月d日E"}
- yyyyMMMd{"Gy年M月d日"}
- yyyyMd{"Gy/M/d"}
- yyyyQQQ{"Gy年QQQ"}
- }
eras{
abbreviated{
"伊斯蘭曆",
@@ -1430,6 +1424,9 @@
availableFormats{
Ed{"d日（E）"}
Gy{"Gy年"}
+ GyMMM{"Gy年M月"}
+ GyMMMEd{"Gy年M月d日E"}
+ GyMMMd{"Gy年M月d日"}
H{"H時"}
Hm{"HH:mm"}
Hms{"HH:mm:ss"}
@@ -1453,6 +1450,7 @@
yyyyMMMd{"Gy年M月d日"}
yyyyMd{"Gy/M/d"}
yyyyQQQ{"Gy年QQQ"}
+ yyyyQQQQ{"Gy年QQQQ"}
}
eras{
abbreviated{
@@ -1793,48 +1791,6 @@
}
}
roc{
- DateTimePatterns{
- "zzzzah時mm分ss秒",
- "zah時mm分ss秒",
- "ah:mm:ss",
- "ah:mm",
- "Gy年M月d日EEEE",
- "Gy年M月d日",
- "Gy/M/d",
- "Gy/M/d",
- "{1} {0}",
- "{1}{0}",
- "{1}{0}",
- "{1} {0}",
- "{1} {0}",
- }
- availableFormats{
- Ed{"d日（E）"}
- Gy{"Gy年"}
- H{"H時"}
- Hm{"HH:mm"}
- Hms{"HH:mm:ss"}
- M{"M月"}
- MEd{"M/d（E）"}
- MMM{"LLL"}
- MMMEd{"M月d日E"}
- MMMd{"M月d日"}
- Md{"M/d"}
- d{"d日"}
- h{"ah時"}
- hm{"ah:mm"}
- hms{"ah:mm:ss"}
- ms{"mm:ss"}
- y{"Gy年"}
- yyyy{"Gy年"}
- yyyyM{"Gy/M"}
- yyyyMEd{"Gy/M/d（E）"}
- yyyyMMM{"Gy年M月"}
- yyyyMMMEd{"Gy年M月d日E"}
- yyyyMMMd{"Gy年M月d日"}
- yyyyMd{"Gy/M/d"}
- yyyyQQQ{"Gy QQQ"}
- }
eras{
abbreviated{
"民國前",
@@ -1849,6 +1805,63 @@
quotationEnd{"」"}
quotationStart{"「"}
}
+ fields{
+ day{
+ dn{"日"}
+ relative{
+ "-1"{"昨天"}
+ "-2"{"前天"}
+ "0"{"今天"}
+ "1"{"明天"}
+ "2"{"後天"}
+ }
+ }
+ dayperiod{
+ dn{"上午/下午"}
+ }
+ era{
+ dn{"年代"}
+ }
+ hour{
+ dn{"小時"}
+ }
+ minute{
+ dn{"分鐘"}
+ }
+ month{
+ dn{"月"}
+ relative{
+ "-1"{"上個月"}
+ "0"{"本月"}
+ "1"{"下個月"}
+ }
+ }
+ second{
+ dn{"秒"}
+ }
+ week{
+ dn{"週"}
+ relative{
+ "-1"{"上週"}
+ "0"{"本週"}
+ "1"{"下週"}
+ }
+ }
+ weekday{
+ dn{"週天"}
+ }
+ year{
+ dn{"年"}
+ relative{
+ "-1"{"去年"}
+ "0"{"今年"}
+ "1"{"明年"}
+ }
+ }
+ zone{
+ dn{"時區"}
+ }
+ }
listPattern{
standard{
2{"{0}和{1}"}
diff --git a/data/locales/zh_Hant_HK.txt b/data/locales/zh_Hant_HK.txt
index 2804d15..881f0a2 100644
--- a/data/locales/zh_Hant_HK.txt
+++ b/data/locales/zh_Hant_HK.txt
@@ -1,12 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hant_HK.xml
// *
// ***************************************************************************
zh_Hant_HK{
+ %%Parent{"zh_Hant"}
NumberElements{
latn{
patterns{
@@ -14,7 +15,7 @@
}
}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.47"}
calendar{
buddhist{
availableFormats{
@@ -22,6 +23,31 @@
Md{"M-d"}
}
}
+ generic{
+ DateTimePatterns{
+ "ah:mm:ss [zzzz]",
+ "ah:mm:ss [z]",
+ "ahh:mm:ss",
+ "ah:mm",
+ "Gy年M月d日EEEE",
+ "Gy年M月d日",
+ "Gy年M月d日",
+ "d/M/yGGGGG",
+ "{1}{0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1}{0}",
+ "{1}{0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ MEd{"E, d/M"}
+ Md{"d/M"}
+ yyyyM{"M/yGGGGG"}
+ yyyyMEd{"E, d/M/yGGGGG"}
+ yyyyMd{"d/M/yGGGGG"}
+ }
+ }
gregorian{
DateTimePatterns{
"ah:mm:ss [zzzz]",
@@ -31,7 +57,7 @@
"y年M月d日EEEE",
"y年M月d日",
"y年M月d日",
- "yy年M月d日",
+ "d/M/yy",
"{1}{0}",
"{1} {0}",
"{1} {0}",
@@ -40,23 +66,8 @@
}
availableFormats{
Ed{"d E"}
- MEd{"E, M-d"}
- Md{"M-d"}
- }
- fields{
- month{
- relative{
- "-1"{"上月"}
- "1"{"下月"}
- }
- }
- year{
- relative{
- "-1"{"上年"}
- "0"{"本年"}
- "1"{"下年"}
- }
- }
+ MEd{"E, d/M"}
+ Md{"d/M"}
}
}
roc{
@@ -66,6 +77,21 @@
}
}
}
+ fields{
+ month{
+ relative{
+ "-1"{"上月"}
+ "1"{"下月"}
+ }
+ }
+ year{
+ relative{
+ "-1"{"上年"}
+ "0"{"本年"}
+ "1"{"下年"}
+ }
+ }
+ }
measurementSystemNames{
UK{"英國"}
US{"美國"}
diff --git a/data/locales/zh_Hant_MO.txt b/data/locales/zh_Hant_MO.txt
index 6b5ca7e..c38c11b 100644
--- a/data/locales/zh_Hant_MO.txt
+++ b/data/locales/zh_Hant_MO.txt
@@ -1,13 +1,14 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hant_MO.xml
// *
// ***************************************************************************
zh_Hant_MO{
- Version{"2.0.75.99"}
+ %%Parent{"zh_Hant"}
+ Version{"2.0.82.51"}
calendar{
buddhist{
availableFormats{
@@ -15,6 +16,28 @@
Md{"M-d"}
}
}
+ generic{
+ DateTimePatterns{
+ "ah:mm:ss [zzzz]",
+ "ah:mm:ss [z]",
+ "ahh:mm:ss",
+ "ah:mm",
+ "Gy年MM月dd日EEEE",
+ "Gy年MM月dd日",
+ "Gy年M月d日",
+ "GGGGGyy年M月d日",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ MEd{"E, M-d"}
+ MMdd{"dd-MM"}
+ Md{"M-d"}
+ }
+ }
gregorian{
DateTimePatterns{
"ah:mm:ss [zzzz]",
diff --git a/data/locales/zh_Hant_TW.txt b/data/locales/zh_Hant_TW.txt
index 0a1ab82..8210e49 100644
--- a/data/locales/zh_Hant_TW.txt
+++ b/data/locales/zh_Hant_TW.txt
@@ -1,11 +1,12 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hant_TW.xml
// *
// ***************************************************************************
zh_Hant_TW{
- Version{"2.0.41.23"}
+ %%Parent{"zh_Hant"}
+ Version{"2.0.82.45"}
}
diff --git a/data/locales/zh_MO.txt b/data/locales/zh_MO.txt
index 7a340a7..0492740 100644
--- a/data/locales/zh_MO.txt
+++ b/data/locales/zh_MO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/zh_SG.txt b/data/locales/zh_SG.txt
index e5b7c41..4ebb462 100644
--- a/data/locales/zh_SG.txt
+++ b/data/locales/zh_SG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/zh_TW.txt b/data/locales/zh_TW.txt
index 5957fe3..dc597d3 100644
--- a/data/locales/zh_TW.txt
+++ b/data/locales/zh_TW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/locales/zu.txt b/data/locales/zu.txt
index 8292585..12283d9 100644
--- a/data/locales/zu.txt
+++ b/data/locales/zu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zu.xml
// *
@@ -149,8 +149,146 @@
}
}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
calendar{
+ generic{
+ DateTimePatterns{
+ "h:mm:ss a zzzz",
+ "h:mm:ss a z",
+ "h:mm:ss a",
+ "h:mm a",
+ "EEEE dd MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "GGGGG y-MM-dd",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ "{1} {0}",
+ }
+ availableFormats{
+ Ed{"d E"}
+ H{"HH"}
+ Hm{"HH:mm"}
+ Hms{"HH:mm:ss"}
+ M{"L"}
+ MEd{"E, M/d"}
+ MMM{"LLL"}
+ MMMEd{"E, MMM d"}
+ MMMd{"MMM d"}
+ Md{"M/d"}
+ d{"d"}
+ h{"h a"}
+ hm{"h:mm a"}
+ hms{"h:mm:ss a"}
+ ms{"mm:ss"}
+ y{"Y"}
+ yM{"M/y"}
+ yMEd{"E, M/d/y"}
+ yMMM{"MMM y"}
+ yMMMEd{"E, MMM d, y"}
+ yMMMd{"MMM d, y"}
+ yMd{"M/d/y"}
+ yQQQ{"QQQ y"}
+ yQQQQ{"QQQQ y"}
+ }
+ intervalFormats{
+ H{
+ H{"HH–HH"}
+ }
+ Hm{
+ H{"HH:mm–HH:mm"}
+ m{"HH:mm–HH:mm"}
+ }
+ Hmv{
+ H{"HH:mm–HH:mm v"}
+ m{"HH:mm–HH:mm v"}
+ }
+ Hv{
+ H{"HH–HH v"}
+ }
+ M{
+ M{"M–M"}
+ }
+ MEd{
+ M{"E, M/d – E, M/d"}
+ d{"E, M/d – E, M/d"}
+ }
+ MMM{
+ M{"MMM–MMM"}
+ }
+ MMMEd{
+ M{"E, MMM d – E, MMM d"}
+ d{"E, MMM d – E, MMM d"}
+ }
+ MMMd{
+ M{"MMM d – MMM d"}
+ d{"MMM d–d"}
+ }
+ Md{
+ M{"M/d – M/d"}
+ d{"M/d – M/d"}
+ }
+ d{
+ d{"d-d"}
+ }
+ fallback{"{0} – {1}"}
+ h{
+ a{"h a – h a"}
+ h{"h–h a"}
+ }
+ hm{
+ a{"h:mm a – h:mm a"}
+ h{"h:mm–h:mm a"}
+ m{"h:mm–h:mm a"}
+ }
+ hmv{
+ a{"h:mm a – h:mm a v"}
+ h{"h:mm–h:mm a v"}
+ m{"h:mm–h:mm a v"}
+ }
+ hv{
+ a{"h a – h a v"}
+ h{"h–h a v"}
+ }
+ y{
+ y{"y-y"}
+ }
+ yM{
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
+ }
+ yMEd{
+ M{"E, M/d/y – E, M/d/y"}
+ d{"E, M/d/y – E, M/d/y"}
+ y{"E, M/d/y – E, M/d/y"}
+ }
+ yMMM{
+ M{"MMM–MMM y"}
+ y{"MMM y – MMM y"}
+ }
+ yMMMEd{
+ M{"E, MMM d – E, MMM d, y"}
+ d{"E, MMM d – E, MMM d, y"}
+ y{"E, MMM d, y – E, MMM d, y"}
+ }
+ yMMMM{
+ M{"MMMM–MMMM y"}
+ y{"MMMM y – MMMM y"}
+ }
+ yMMMd{
+ M{"MMM d – MMM d, y"}
+ d{"MMM d–d, y"}
+ y{"MMM d, y – MMM d, y"}
+ }
+ yMd{
+ M{"M/d/y – M/d/y"}
+ d{"M/d/y – M/d/y"}
+ y{"M/d/y – M/d/y"}
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"Ekuseni",
@@ -164,7 +302,7 @@
"EEEE dd MMMM y",
"d MMMM y",
"d MMM y",
- "yyyy-MM-dd",
+ "y-MM-dd",
"{1} {0}",
"{1} {0}",
"{1} {0}",
@@ -254,63 +392,6 @@
"AD",
}
}
- fields{
- day{
- dn{"Usuku"}
- relative{
- "-1"{"Izolo"}
- "-2"{"Usuku olwandulela olwayizolo"}
- "0"{"Namhlanje"}
- "1"{"Kusasa"}
- "2"{"Usuku olulandela olakusasa"}
- }
- }
- dayperiod{
- dn{"AM/PM"}
- }
- era{
- dn{"Isikhathi"}
- }
- hour{
- dn{"Ihora"}
- }
- minute{
- dn{"Iminithi"}
- }
- month{
- dn{"Inyanga"}
- relative{
- "-1"{"Inyanga edlule"}
- "0"{"Le nyanga"}
- "1"{"Inyanga ezayo"}
- }
- }
- second{
- dn{"Isekhondi"}
- }
- week{
- dn{"Iviki"}
- relative{
- "-1"{"Iviki eledlule"}
- "0"{"Leli viki"}
- "1"{"Iviki elizayo"}
- }
- }
- weekday{
- dn{"Usuku evikini"}
- }
- year{
- dn{"Unyaka"}
- relative{
- "-1"{"Onyakeni odlule"}
- "0"{"Kulo nyaka"}
- "1"{"Unyaka ozayo"}
- }
- }
- zone{
- dn{"Isikhathi sendawo"}
- }
- }
intervalFormats{
H{
H{"HH–HH"}
@@ -374,13 +455,13 @@
y{"y-y"}
}
yM{
- M{"M/yy – M/yy"}
- y{"M/yy – M/yy"}
+ M{"M/y – M/y"}
+ y{"M/y – M/y"}
}
yMEd{
- M{"E, M/d/yy – E, M/d/yy"}
- d{"E, M/d/yy – E, M/d/yy"}
- y{"E, M/d/yy – E, M/d/yy"}
+ M{"E, M/d/y – E, M/d/y"}
+ d{"E, M/d/y – E, M/d/y"}
+ y{"E, M/d/y – E, M/d/y"}
}
yMMM{
M{"MMM–MMM y"}
@@ -401,9 +482,9 @@
y{"MMM d, y – MMM d, y"}
}
yMd{
- M{"M/d/yy – M/d/yy"}
- d{"M/d/yy – M/d/yy"}
- y{"M/d/yy – M/d/yy"}
+ M{"M/d/y – M/d/y"}
+ d{"M/d/y – M/d/y"}
+ y{"M/d/y – M/d/y"}
}
}
monthNames{
@@ -518,6 +599,63 @@
quotationEnd{"”"}
quotationStart{"“"}
}
+ fields{
+ day{
+ dn{"Usuku"}
+ relative{
+ "-1"{"Izolo"}
+ "-2"{"Usuku olwandulela olwayizolo"}
+ "0"{"Namhlanje"}
+ "1"{"Kusasa"}
+ "2"{"Usuku olulandela olakusasa"}
+ }
+ }
+ dayperiod{
+ dn{"AM/PM"}
+ }
+ era{
+ dn{"Isikhathi"}
+ }
+ hour{
+ dn{"Ihora"}
+ }
+ minute{
+ dn{"Iminithi"}
+ }
+ month{
+ dn{"Inyanga"}
+ relative{
+ "-1"{"Inyanga edlule"}
+ "0"{"Le nyanga"}
+ "1"{"Inyanga ezayo"}
+ }
+ }
+ second{
+ dn{"Isekhondi"}
+ }
+ week{
+ dn{"Iviki"}
+ relative{
+ "-1"{"Iviki eledlule"}
+ "0"{"Leli viki"}
+ "1"{"Iviki elizayo"}
+ }
+ }
+ weekday{
+ dn{"Usuku evikini"}
+ }
+ year{
+ dn{"Unyaka"}
+ relative{
+ "-1"{"Onyakeni odlule"}
+ "0"{"Kulo nyaka"}
+ "1"{"Unyaka ozayo"}
+ }
+ }
+ zone{
+ dn{"Isikhathi sendawo"}
+ }
+ }
listPattern{
standard{
2{"I-{0} ne-{1}"}
diff --git a/data/locales/zu_ZA.txt b/data/locales/zu_ZA.txt
index a79fe98..d7dee62 100644
--- a/data/locales/zu_ZA.txt
+++ b/data/locales/zu_ZA.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zu_ZA.xml
// *
// ***************************************************************************
zu_ZA{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/makedata.mak b/data/makedata.mak
index fb1df8a..110bfbc 100644
--- a/data/makedata.mak
+++ b/data/makedata.mak
@@ -1,5 +1,5 @@
#**********************************************************************
-#* Copyright (C) 1999-2012, International Business Machines Corporation
+#* Copyright (C) 1999-2013, International Business Machines Corporation
#* and others. All Rights Reserved.
#**********************************************************************
# nmake file for creating data files on win32
@@ -10,7 +10,7 @@
##############################################################################
# Keep the following in sync with the version - see common/unicode/uvernum.h
-U_ICUDATA_NAME=icudt50
+U_ICUDATA_NAME=icudt51
##############################################################################
U_ICUDATA_ENDIAN_SUFFIX=l
UNICODE_VERSION=6.2
@@ -602,7 +602,7 @@
copy "$(ICUTMP)\$(ICUPKG).dat" "$(ICUOUT)\$(U_ICUDATA_NAME)$(U_ICUDATA_ENDIAN_SUFFIX).dat"
-@erase "$(ICUTMP)\$(ICUPKG).dat"
!ELSE
-"$(ICU_LIB_TARGET)" : $(COMMON_ICUDATA_DEPENDENCIES) $(CNV_FILES) $(CNV_FILES_SPECIAL) "$(ICUBLD_PKG)\unames.icu" "$(ICUBLD_PKG)\cnvalias.icu" "$(ICUBLD_PKG)\nfc.nrm" "$(ICUBLD_PKG)\nfkc.nrm" "$(ICUBLD_PKG)\nfkc_cf.nrm" "$(ICUBLD_PKG)\uts46.nrm" "$(ICUBLD_PKG)\$(ICUCOL)\ucadata.icu" "$(ICUBLD_PKG)\$(ICUCOL)\invuca.icu" $(CURR_RES_FILES) $(LANG_RES_FILES) $(REGION_RES_FILES) $(ZONE_RES_FILES) $(BRK_FILES) $(BRK_DICT_FILES) $(BRK_RES_FILES) $(COL_COL_FILES) $(RBNF_RES_FILES) $(TRANSLIT_RES_FILES) $(ALL_RES) $(SPREP_FILES) "$(ICUBLD_PKG)\confusables.cfu"
+"$(ICU_LIB_TARGET)" : $(COMMON_ICUDATA_DEPENDENCIES) $(CNV_FILES) $(CNV_FILES_SPECIAL) "$(ICUBLD_PKG)\unames.icu" "$(ICUBLD_PKG)\cnvalias.icu" "$(ICUBLD_PKG)\nfc.nrm" "$(ICUBLD_PKG)\nfkc.nrm" "$(ICUBLD_PKG)\nfkc_cf.nrm" "$(ICUBLD_PKG)\uts46.nrm" "$(ICUBLD_PKG)\$(ICUCOL)\ucadata.icu" "$(ICUBLD_PKG)\$(ICUCOL)\invuca.icu" $(CURR_RES_FILES) $(LANG_RES_FILES) $(REGION_RES_FILES) $(ZONE_RES_FILES) $(BRK_FILES) $(BRK_DICT_FILES) $(BRK_RES_FILES) $(ALL_RES) $(COL_COL_FILES) $(RBNF_RES_FILES) $(TRANSLIT_RES_FILES) $(SPREP_FILES) "$(ICUBLD_PKG)\confusables.cfu"
@echo Building icu data
cd "$(ICUBLD_PKG)"
"$(ICUPBIN)\pkgdata" $(COMMON_ICUDATA_ARGUMENTS) <<"$(ICUTMP)\icudata.lst"
@@ -737,15 +737,15 @@
#RBBI .dict file generation.
{$(ICUSRCDATA_RELATIVE_PATH)\$(ICUBRK)}.txt.dict:
@echo Creating $@
- @"$(ICUTOOLS)\gendict\$(CFG)\gendict" -c --uchars $< $(ICUBLD_PKG)\$@
+ @"$(ICUTOOLS)\gendict\$(CFG)\gendict" -c --uchars $< "$(ICUBLD_PKG)\$@"
$(ICUBRK)\thaidict.dict:
@echo Creating $(ICUBRK)\thaidict.dict
- @"$(ICUTOOLS)\gendict\$(CFG)\gendict" -c --bytes --transform offset-0xe00 $(ICUSRCDATA_RELATIVE_PATH)\$(ICUBRK)\thaidict.txt $(ICUBLD_PKG)\$(ICUBRK)\thaidict.dict
+ @"$(ICUTOOLS)\gendict\$(CFG)\gendict" -c --bytes --transform offset-0xe00 $(ICUSRCDATA_RELATIVE_PATH)\$(ICUBRK)\thaidict.txt "$(ICUBLD_PKG)\$(ICUBRK)\thaidict.dict"
$(ICUBRK)\khmerdict.dict:
@echo Creating $(ICUBRK)\khmerdict.dict
- @"$(ICUTOOLS)\gendict\$(CFG)\gendict" -c --bytes --transform offset-0x1780 $(ICUSRCDATA_RELATIVE_PATH)\$(ICUBRK)\khmerdict.txt $(ICUBLD_PKG)\$(ICUBRK)\khmerdict.dict
+ @"$(ICUTOOLS)\gendict\$(CFG)\gendict" -c --bytes --transform offset-0x1780 $(ICUSRCDATA_RELATIVE_PATH)\$(ICUBRK)\khmerdict.txt "$(ICUBLD_PKG)\$(ICUBRK)\khmerdict.dict"
!IFNDEF ICUDATA_SOURCE_ARCHIVE
# Rule for creating converters
diff --git a/data/mappings/README.emoji b/data/mappings/README.emoji
new file mode 100644
index 0000000..17eb8be
--- /dev/null
+++ b/data/mappings/README.emoji
@@ -0,0 +1,131 @@
+== Notes on {kddi,docomo,softbank}-*.ucm mappings.
+
+kddi-jisx-208 is a variant of JIS X 208 used by KDDI, a Japanese cell
+phone carrier.
+
+kddi-shift_jis, docomo-shift_jis, and softbank-shift_jis are variants
+of Shift_JIS used by KDDI, DoCoMo and SoftBank.
+
+ - kddi-jisx-208 contains Emoji (emoticon) code points in
+ 0x75xx, 0x76xx, 0x77xx, 0x78xx, 0x79xx, 0x7Axx, 0x7Bxx,
+ where xx means 21-7E.
+
+ - kddi-shift_jis contains Emoji code points in
+ 0xEBxx, 0xECxx, 0xEDxx, and 0xEExx, 0xF3xx, 0xF4xx, 0xF6xx, 0xF7xx,
+ where xx means 40-7E, 80-FC.
+
+ - docomo-shift_jis contains Emoji code points in
+ 0xF8xx, and 0xF9xx, where xx means 40-7E, 80-FC.
+
+ - softbank-shift_jis contains Emoji code points in
+ 0xF7xx, 0xF9xx, and 0xFBxx, where xx means 40-7E, 80-FC.
+
+ - softbank-jisx-208 contains Emoji code points in
+ 0x75xx, 0x76xx, 0x77xx, 0x78xx, 0x79xx, 0x7Axx, 0x7Bxx, 0x7Dxx
+ where xx means 21-7E.
+
+
+== How the -2012.ucm tables were modified in April 2013
+
+The -2012 versions were created by
+ http://code.google.com/p/emoji4unicode/source/browse/trunk/src/gen_conversion_files.py
+
+using each of the older 2012 versions as the base table files
+to avoid non-Emoji changes:
+
+# gen_google_ucm.sh
+icu_mappings=/google/src/cloud/mscherer/icubranch/google_vendor_src_branch/icu/source/data/mappings
+dest=/home/mscherer/www/no_crawl/emoji
+./gen_conversion_files.py $icu_mappings/docomo-shift_jis-2012.ucm
+cp ../generated/docomo-shift_jis-2012.ucm $dest
+./gen_conversion_files.py $icu_mappings/kddi-shift_jis-2012.ucm
+cp ../generated/kddi-shift_jis-2012.ucm $dest
+./gen_conversion_files.py $icu_mappings/softbank-shift_jis-2012.ucm
+cp ../generated/softbank-shift_jis-2012.ucm $dest
+./gen_conversion_files.py
+
+The only differences from 2012-sep are in mappings for symbols
+that have Unicode Variation Selector (VS) sequences.
+
+The older tables relied on a hack in the ICU conversion code that
+ignored the "use fallback" flag for fallbacks from sequences with VS.
+
+The new tables rely on a new feature in ICU4C 51:
+For the relevant symbols that have roundtrip mappings,
+- the mappings with Emoji Variation Selector
+ use the |0 roundtrip precision
+- the other mappings (no VS & text VS)
+ use the |4 "good one-way" precision
+
+See http://bugs.icu-project.org/trac/ticket/9602
+
+== How the -2012.ucm tables were created in September 2012
+
+The 2012 versions were created by
+ http://code.google.com/p/emoji4unicode/source/browse/trunk/src/gen_conversion_files.py
+
+using each of the 2007 versions as the base table files
+to avoid non-Emoji changes:
+
+icu_mappings=~/p4/emoji/google_vendor_src_branch/icu/source/data/mappings
+dest=~/www/no_crawl/emoji
+./gen_conversion_files.py $icu_mappings/docomo-shift_jis-2007.ucm
+cp ../generated/docomo-shift_jis-2012.ucm $dest
+./gen_conversion_files.py $icu_mappings/kddi-shift_jis-2007.ucm
+cp ../generated/kddi-shift_jis-2012.ucm $dest
+./gen_conversion_files.py $icu_mappings/softbank-shift_jis-2007.ucm
+cp ../generated/softbank-shift_jis-2012.ucm $dest
+./gen_conversion_files.py
+
+The emoji4unicode code uses the mappings that were established during the
+Unicode Emoji standardization process.
+The new conversion tables round-trip carrier Emoji symbol codes
+to and from Unicode 6 standard code points
+and also include fallback mappings from the Google PUA code points
+to the carrier codes.
+
+The trailing "|0" etc. on the mapping table lines specify the mapping type:
+ |0 round-trip Unicode <-> charset
+ |1 fallback Unicode -> charset
+ |3 "reverse fallback" Unicode <- charset
+
+For details about the .ucm file format see
+http://userguide.icu-project.org/conversion/data#TOC-.ucm-File-Format
+
+== How the -2007.ucm tables were created
+
+So far, we haven't obtained "official" conversion tables from the cell
+phone carriers. However, we empirically know their clients support
+VDCs in MS932, like U2460 (CIRCLED DIGIT ONE), etc. Hence we use
+MS932 as the base table for them.
+
+kddi-jisx-208-2007.ucm is based on jisx-208.ucm in this directory.
+The original table's mappings to codes 0x75xx to 0x7Bxx are excluded
+to avoid collisions with emoji.
+
+kddi-shift_jis-2007.ucm is based on windows-932-2000.ucm.
+The original table's mappings to codes 0xEBxx to 0xEExx, and 0xF0xx to
+0xF90xx (EUDC block), are excluded to avoid collisions with emoji.
+
+docomo-shift_jis-2007.ucm is based on windows-932-2000.ucm.
+The original table's mappings to codes 0xF0xx to 0xF90xx (EUDC block)
+are excluded to avoid collisions with emoji.
+
+softbank-shift_jis-2007.ucm is based on windows-932-2000.ucm.
+The original table's mappings to codes 0xF0xx to 0xF90xx (EUDC block),
+and 0xFBxx, are excluded to avoid collisions with emoji.
+
+softbank-jisx-208-2007.ucm is based on jisx-208.ucm in this directory.
+The original table's mappings to codes 0x75xx to 0x7Bxx, and 0x7Dxx
+are excluded to avoid collisions with emoji.
+
+== Google Standard Emoji Unicode Mapping
+
+The Google standard emoji Unicode mapping can be found at:
+
+ /home/build/google3/i18n/encodings/emoji/emoji_unicode_mapping.txt
+
+
+
+TODO(mscherer): Use <icu:base> to share most standard JIS mappings
+among *-shift_jis-2007.ucm files.
diff --git a/data/mappings/convrtrs.txt b/data/mappings/convrtrs.txt
index ed41e12..0cfdfdf 100644
--- a/data/mappings/convrtrs.txt
+++ b/data/mappings/convrtrs.txt
@@ -1,6 +1,6 @@
# ******************************************************************************
# *
-# * Copyright (C) 1995-2012, International Business Machines
+# * Copyright (C) 1995-2013, International Business Machines
# * Corporation and others. All Rights Reserved.
# *
# ******************************************************************************
@@ -285,7 +285,7 @@
# From Unicode: Write BE BOM and BE bytes
# To Unicode: Detects and consumes BOM. Defaults to BE.
# BEGIN Android-changed
-UTF-16,version=2 JavaUnicode # alias made up to avoid java.nio.charset.IllegalCharsetNameException
+UTF-16,version=2 JavaUnicode2 # alias made up to avoid java.nio.charset.IllegalCharsetNameException
# END Android-changed
# Note: ICU does not currently support Java-specific, non-Unicode-standard UTF-32 variants.
@@ -626,12 +626,6 @@
ibm-33722_P12A_P12A-2009_U2 { UTR22* }
ibm-33722 # Leave untagged because this isn't the default
ibm-5050 # Leave untagged because this isn't the default, and yes this alias is correct
- # BEGIN android-removed
- # EUC-JP { IANA MIME* WINDOWS }
- # Extended_UNIX_Code_Packed_Format_for_Japanese { IANA* WINDOWS }
- # csEUCPkdFmtJapanese { IANA WINDOWS }
- # END android-removed
- X-EUC-JP { WINDOWS } # Japan EUC. x-euc-jp is a MIME name
ibm-33722_VPUA
IBM-eucJP
windows-51932-2006 { UTR22* }
@@ -652,23 +646,17 @@
# ibm-954 contains more PUA characters than the others.
ibm-954_P101-2007 { UTR22* }
ibm-954 { IBM* }
- # BEGIN android-removed
- # EUC-JP { JAVA* } # Matches more closely with ibm-1350
- # Extended_UNIX_Code_Packed_Format_for_Japanese { JAVA }
- # csEUCPkdFmtJapanese { JAVA }
- # END android-removed
- # BEGIN android-added
- EUC-JP { IANA MIME* JAVA* } # Matches more closely with ibm-1350
- Extended_UNIX_Code_Packed_Format_for_Japanese { IANA* JAVA }
- csEUCPkdFmtJapanese { IANA JAVA }
- # END android-added
- X-EUC-JP { JAVA } # Japan EUC. x-euc-jp is a MIME name
- eucjis { JAVA }
- ujis # Linux sometimes uses this name. This is an unfortunate generic and rarely used name. Its use is discouraged.
- x-IBM954 { JAVA }
+ x-IBM954 { JAVA* }
x-IBM954C { JAVA }
# eucJP # This is closest to Solaris EUC-JP.
-
+euc-jp-2007 { UTR22* }
+ EUC-JP { MIME* IANA JAVA* WINDOWS* }
+ Extended_UNIX_Code_Packed_Format_for_Japanese { IANA* JAVA WINDOWS }
+ csEUCPkdFmtJapanese { IANA JAVA WINDOWS }
+ X-EUC-JP { MIME JAVA WINDOWS } # Japan EUC. x-euc-jp is a MIME name
+ eucjis {JAVA}
+ ujis # Linux sometimes uses this name. This is an unfortunate generic and rarely used name. Its use is discouraged.
+
aix-IBM_udcJP-4.3.6 { UTR22* }
x-IBM-udcJP { JAVA* }
@@ -691,6 +679,7 @@
windows-950 { WINDOWS* }
x-windows-950 { JAVA }
x-big5
+ ms950
ibm-950_P110-1999 { UTR22* } # Taiwan Big-5 (w/o euro update)
ibm-950 { IBM* JAVA }
cp950 { JAVA* }
@@ -898,27 +887,16 @@
windows-874 { JAVA WINDOWS* }
# END android-changed
MS874 { JAVA* }
- x-windows-874 { JAVA }
# iso-8859-11 { WINDOWS } # iso-8859-11 is similar to TIS-620. ibm-13162 is a closer match.
- # BEGIN android-added
+
+ibm-874_P100-1995 { UTR22* } # Thai PC (w/o euro update).
ibm-874 { IBM* JAVA }
ibm-9066 { IBM } # Yes ibm-874 == ibm-9066. ibm-1161 has the euro update.
- cp874 { JAVA }
+ cp874 { JAVA* }
+ TIS-620 { IANA* JAVA } # This is actually separate from ibm-874, which is similar to this table
tis620.2533 { JAVA } # This is actually separate from ibm-874, which is similar to this table
eucTH # eucTH is an unusual alias from Solaris. eucTH has fewer mappings than TIS620
x-IBM874 { JAVA }
- # END android-added
-
-ibm-874_P100-1995 { UTR22* } # Thai PC (w/o euro update).
- # BEGIN android-removed
- # ibm-874 { IBM* JAVA }
- # ibm-9066 { IBM } # Yes ibm-874 == ibm-9066. ibm-1161 has the euro update.
- # cp874 { JAVA* }
- # TIS-620 { IANA* JAVA } # This is actually separate from ibm-874, which is similar to this table
- # tis620.2533 { JAVA } # This is actually separate from ibm-874, which is similar to this table
- # eucTH # eucTH is an unusual alias from Solaris. eucTH has fewer mappings than TIS620
- # x-IBM874 { JAVA }
- # END android-removed
ibm-1162_P100-1999 { UTR22* } # Thai (w/ euro update)
ibm-1162 { IBM* }
@@ -1336,11 +1314,6 @@
ibm-955_P110-1997 { UTR22* } ibm-955 { IBM* } # Pure DBCS, Japanese EUC, G0 - JIS X208-1978
ibm-9577_P100-2001 { UTR22* } ibm-9577 { IBM* } ibm-1385 { IBM } x-IBM1385 { JAVA* } # ibm-9577 and ibm-1385 are identical DBCS tables.
iso-8859_16-2001 { UTR22* } ISO-8859-16 { IANA* } iso-ir-226 { IANA } ISO_8859-16:2001 { IANA } latin10 { IANA } l10 { IANA }
-# BEGIN android-added
-docomo-shift_jis-2007 { UTR22* } docomo-emoji # DoCoMo specific Shift-JIS
-kddi-shift_jis-2007 { UTR22* } kddi-emoji # KDDI specific Shift-JIS
-softbank-shift_jis-2007 { UTR22* } softbank-emoji # SoftBank specific Shift-JIS
-# END android-added
# To be considered for listing at a later date for the data library customization tool
#ibm-1159_P100-1999 { UTR22* } ibm-1159 { IBM* } # SBCS T-Ch Host. Euro update of ibm-28709. This is used in combination with another CCSID mapping.
diff --git a/data/mappings/docomo-shift_jis-2007.ucm b/data/mappings/docomo-shift_jis-2012.ucm
similarity index 91%
rename from data/mappings/docomo-shift_jis-2007.ucm
rename to data/mappings/docomo-shift_jis-2012.ucm
index 57ff161..ed22bb7 100644
--- a/data/mappings/docomo-shift_jis-2007.ucm
+++ b/data/mappings/docomo-shift_jis-2012.ucm
@@ -1,5 +1,5 @@
# DoCoMo's Shift_JIS. See README.emoji for details.
-<code_set_name> "docomo-shift_jis-2007"
+<code_set_name> "docomo-shift_jis-2012"
<mb_cur_max> 2
<mb_cur_min> 1
<uconv_class> "MBCS"
@@ -8015,408 +8015,432 @@
<U2016> \x81\x61 |1
<U2212> \x81\x7C |1
<U301C> \x81\x60 |1
-<UFE000> \xF8\x9F |0
-<UFE001> \xF8\xA0 |0
-<UFE002> \xF8\xA1 |0
-<UFE003> \xF8\xA2 |0
-<UFE004> \xF8\xA3 |0
-<UFE005> \xF8\xA4 |0
-<UFE006> \xF8\xA5 |0
-<UFE007> \xF8\xA6 |0
-<UFE008> \xF9\x57 |0
-<UFE009> \xF8\x9F |1
-<UFE00A> \xF8\x9F |1
-<UFE00C> \xF8\x9F |1
-<UFE00F> \xF8\x9F\xF8\xA0 |1
-<UFE010> \xF9\x57 |1
-<UFE011> \xF9\x40 |0
-<UFE012> \xF9\x41 |0
-<UFE013> \xF9\x42 |0
-<UFE014> \xF9\x43 |0
-<UFE015> \xF9\x44 |0
-<UFE016> \xF9\x42 |1
-<UFE018> \xF9\x5B |0
-<UFE019> \xF9\x5C |0
-<UFE01A> \xF9\x5D |0
-<UFE01B> \xF9\xC1 |0
-<UFE01C> \xF9\xC1 |1
-<UFE01D> \xF9\xC4 |0
-<UFE01E> \xF9\x5E |1
-<UFE01F> \xF9\x5E |1
-<UFE020> \xF9\x5E |1
-<UFE021> \xF9\x5E |1
-<UFE022> \xF9\x5E |1
-<UFE023> \xF9\x5E |1
-<UFE024> \xF9\x5E |1
-<UFE025> \xF9\x5E |1
-<UFE026> \xF9\x5E |1
-<UFE027> \xF9\x5E |1
-<UFE028> \xF9\x5E |1
-<UFE029> \xF9\x5E |1
-<UFE02A> \xF9\x5E |0
-<UFE02B> \xF8\xA7 |0
-<UFE02C> \xF8\xA8 |0
-<UFE02D> \xF8\xA9 |0
-<UFE02E> \xF8\xAA |0
-<UFE02F> \xF8\xAB |0
-<UFE030> \xF8\xAC |0
-<UFE031> \xF8\xAD |0
-<UFE032> \xF8\xAE |0
-<UFE033> \xF8\xAF |0
-<UFE034> \xF8\xB0 |0
-<UFE035> \xF8\xB1 |0
-<UFE036> \xF8\xB2 |0
-<UFE038> \xF9\xE4 |0
-<UFE03B> \xF9\x57 |1
-<UFE03C> \xF9\xE6 |0
-<UFE03D> \xF9\xE8 |0
-<UFE03E> \xF9\xEB |0
-<UFE03F> \xF9\xEC |0
-<UFE040> \xF9\xED |0
-<UFE042> \xF9\xEC |1
-<UFE04E> \xF9\xE6 |1
-<UFE04F> \xF9\xE7 |0
-<UFE050> \xF9\xE9 |0
-<UFE051> \xF9\xEA |0
-<UFE05B> \xF9\xEA |1
-<UFE190> \xF8\xF2 |0
-<UFE191> \xF8\xF3 |0
-<UFE193> \xF9\x9E |1
-<UFE194> \xF9\xCD |1
-<UFE195> \xF9\xB5 |0
-<UFE198> \xF8\xD6 |1
-<UFE19A> \xF9\x55 |0
-<UFE19B> \xF9\x95 |1
-<UFE19C> \xF9\x95 |1
-<UFE19D> \xF9\x95 |1
-<UFE19E> \xF9\x95 |1
-<UFE1B7> \xF9\x45 |0
-<UFE1B8> \xF9\x46 |0
-<UFE1B9> \xF9\xF3 |0
-<UFE1BA> \xF9\xF4 |0
-<UFE1BB> \xF9\xF4 |1
-<UFE1BC> \xF9\xF5 |0
-<UFE1BD> \xF9\xF6 |0
-<UFE1BE> \xF9\xF9 |0
-<UFE1BF> \xF9\xFA |0
-<UFE1C8> \xF9\xF4 |1
-<UFE1C9> \xF9\xF6 |1
-<UFE1D0> \xF9\x45 |1
-<UFE1D8> \xF9\x45 |1
-<UFE1D9> \xF9\xF6 |1
-<UFE1DB> \xF8\xF9 |1
-<UFE1DD> \xF9\xF4 |1
-<UFE1E0> \xF9\xFA |1
-<UFE320> \xF9\x96 |0
-<UFE321> \xF9\x98 |1
-<UFE322> \xF9\x99 |1
-<UFE323> \xF9\x97 |0
-<UFE324> \xF9\x99 |0
-<UFE325> \xF9\xC8 |1
-<UFE326> \xF9\xCA |0
-<UFE327> \xF9\xCB |0
-<UFE328> \xF9\xF8 |1
-<UFE329> \xF9\xCD |0
-<UFE32A> \xF9\xCD |1
-<UFE32B> \xF9\xF7 |0
-<UFE32C> \xF9\xCB |1
-<UFE32D> \xF9\xCB |1
-<UFE32F> \xF9\xCF |1
-<UFE330> \xF9\x95 |0
-<UFE331> \xF9\xC7 |0
-<UFE332> \xF9\xCF |0
-<UFE333> \xF9\xF8 |0
-<UFE334> \xF9\xCF |1
-<UFE335> \xF9\x95 |1
-<UFE336> \xF9\x95 |1
+# Mappings for Unicode Standard Emoji symbols.
+<U0023>+<U20E3> \xF9\x85 |4
+<U0023>+<UFE0E>+<U20E3> \xF9\x85 |4
+<U0023>+<UFE0F>+<U20E3> \xF9\x85 |0
+<U0030>+<U20E3> \xF9\x90 |4
+<U0030>+<UFE0E>+<U20E3> \xF9\x90 |4
+<U0030>+<UFE0F>+<U20E3> \xF9\x90 |0
+<U0031>+<U20E3> \xF9\x87 |4
+<U0031>+<UFE0E>+<U20E3> \xF9\x87 |4
+<U0031>+<UFE0F>+<U20E3> \xF9\x87 |0
+<U0032>+<U20E3> \xF9\x88 |4
+<U0032>+<UFE0E>+<U20E3> \xF9\x88 |4
+<U0032>+<UFE0F>+<U20E3> \xF9\x88 |0
+<U0033>+<U20E3> \xF9\x89 |4
+<U0033>+<UFE0E>+<U20E3> \xF9\x89 |4
+<U0033>+<UFE0F>+<U20E3> \xF9\x89 |0
+<U0034>+<U20E3> \xF9\x8A |4
+<U0034>+<UFE0E>+<U20E3> \xF9\x8A |4
+<U0034>+<UFE0F>+<U20E3> \xF9\x8A |0
+<U0035>+<U20E3> \xF9\x8B |4
+<U0035>+<UFE0E>+<U20E3> \xF9\x8B |4
+<U0035>+<UFE0F>+<U20E3> \xF9\x8B |0
+<U0036>+<U20E3> \xF9\x8C |4
+<U0036>+<UFE0E>+<U20E3> \xF9\x8C |4
+<U0036>+<UFE0F>+<U20E3> \xF9\x8C |0
+<U0037>+<U20E3> \xF9\x8D |4
+<U0037>+<UFE0E>+<U20E3> \xF9\x8D |4
+<U0037>+<UFE0F>+<U20E3> \xF9\x8D |0
+<U0038>+<U20E3> \xF9\x8E |4
+<U0038>+<UFE0E>+<U20E3> \xF9\x8E |4
+<U0038>+<UFE0F>+<U20E3> \xF9\x8E |0
+<U0039>+<U20E3> \xF9\x8F |4
+<U0039>+<UFE0E>+<U20E3> \xF9\x8F |4
+<U0039>+<UFE0F>+<U20E3> \xF9\x8F |0
+<U00A9> \xF9\xD6 |0
+<U00AE> \xF9\xDB |0
+<U203C> \xF9\xA9 |0
+<U2049> \xF9\xA8 |0
+<U2122> \xF9\xD7 |0
+<U2194> \xF9\xE1 |0
+<U2195> \xF9\xE2 |0
+<U2196> \xF8\xF8 |0
+<U2197> \xF8\xD9 |0
+<U2198> \xF8\xF7 |0
+<U2199> \xF9\x49 |0
+<U21A9> \xF9\x7E |0
+<U231A> \xF9\xC4 |0
+<U231B> \xF9\xC1 |1
+<U23F0> \xF9\x5E |0
+<U23F3> \xF9\xC1 |0
+<U24C2> \xF8\xBD |0
+<U2600> \xF8\x9F |0
+<U2601> \xF8\xA0 |0
+<U260E> \xF8\xE8 |0
+<U2614> \xF8\xA1 |0
+<U2615> \xF8\xD1 |0
+<U263A> \xF9\x95 |1
+<U2648> \xF8\xA7 |0
+<U2649> \xF8\xA8 |0
+<U264A> \xF8\xA9 |0
+<U264B> \xF8\xAA |0
+<U264C> \xF8\xAB |0
+<U264D> \xF8\xAC |0
+<U264E> \xF8\xAD |0
+<U264F> \xF8\xAE |0
+<U2650> \xF8\xAF |0
+<U2651> \xF8\xB0 |0
+<U2652> \xF8\xB1 |0
+<U2653> \xF8\xB2 |0
+<U2660> \xF8\xEF |0
+<U2663> \xF8\xF1 |0
+<U2665> \xF8\xEE |0
+<U2666> \xF8\xF0 |0
+<U2668> \xF9\x9C |0
+<U267B> \xF9\xDA |0
+<U267F> \xF8\xFC |0
+<U2693> \xF8\xC2 |1
+<U26A0> \xF9\xDC |0
+<U26A1> \xF8\xA3 |0
+<U26AA> \xF9\x40 |1
+<U26AB> \xF9\x40 |1
+<U26BD> \xF8\xB7 |0
+<U26BE> \xF8\xB4 |0
+<U26C4> \xF8\xA2 |0
+<U26C5> \xF8\x9F+\xF8\xA0 |1
+<U26D4> \xF9\xD4 |1
+<U26F3> \xF8\xB5 |0
+<U26F5> \xF9\x47 |0
+<U26FD> \xF8\xCC |0
+<U2702> \xF8\xD6 |0
+<U2708> \xF8\xC3 |0
+<U2709> \xF9\x77 |0
+<U270A> \xF8\xF4 |0
+<U270B> \xF8\xF6 |0
+<U270C> \xF8\xF5 |0
+<U270F> \xF9\xBE |0
+<U2712> \xF9\x52 |0
+<U2728> \xF9\x9F |0
+<U2733> \xF9\x9D |1
+<U2734> \xF9\x9D |1
+<U2747> \xF9\x9F |1
+<U2755> \xF9\xA7 |1
+<U2757> \xF9\xA7 |0
+<U2764> \xF9\x91 |0
+<U27B0> \xF9\xAF |0
+<U27BF> \xF9\x84 |0
+<U2934> \xF9\x9A |0
+<U2935> \xF9\xA5 |0
+<U2B55> \xF9\x44 |1
+<U3030> \xF9\xAE |0
+<U3299> \xF9\xD9 |0
+<U1F17F> \xF8\xCD |0
+<U1F191> \xF9\x80 |0
+<U1F193> \xF9\x7B |0
+<U1F194> \xF9\x7C |0
+<U1F195> \xF9\x82 |0
+<U1F196> \xF9\xD4 |0
+<U1F197> \xF9\xB0 |0
+<U1F232> \xF9\xDD |0
+<U1F233> \xF9\xDE |0
+<U1F234> \xF9\xDF |0
+<U1F235> \xF9\xE0 |0
+<U1F300> \xF8\xA4 |0
+<U1F301> \xF8\xA5 |0
+<U1F302> \xF8\xA6 |0
+<U1F303> \xF9\x57 |0
+<U1F304> \xF8\x9F |1
+<U1F305> \xF8\x9F |1
+<U1F307> \xF8\x9F |1
+<U1F309> \xF9\x57 |1
+<U1F30A> \xF9\xE4 |0
+<U1F30C> \xF9\x57 |1
+<U1F311> \xF9\x40 |0
+<U1F313> \xF9\x42 |0
+<U1F314> \xF9\x41 |0
+<U1F315> \xF9\x44 |0
+<U1F319> \xF9\x43 |0
+<U1F31B> \xF9\x42 |1
+<U1F331> \xF9\xEB |0
+<U1F337> \xF9\xE8 |0
+<U1F338> \xF9\xED |0
+<U1F33F> \xF9\xE6 |1
+<U1F340> \xF9\xE6 |0
+<U1F341> \xF9\xEC |0
+<U1F342> \xF9\xEC |1
+<U1F34C> \xF9\xE9 |0
+<U1F34E> \xF9\xEA |0
+<U1F34F> \xF9\xEA |1
+<U1F352> \xF9\xE7 |0
+<U1F354> \xF8\xD4 |0
+<U1F359> \xF9\xEE |0
+<U1F35A> \xF9\xF1 |1
+<U1F35C> \xF9\xF1 |0
+<U1F35E> \xF9\xF2 |0
+<U1F365> \xF8\xA4 |1
+<U1F370> \xF9\xEF |0
+<U1F374> \xF8\xD0 |0
+<U1F375> \xF9\xC3 |0
+<U1F376> \xF9\xF0 |0
+<U1F377> \xF9\xFB |0
+<U1F378> \xF8\xD2 |0
+<U1F379> \xF8\xD2 |1
+<U1F37A> \xF8\xD3 |0
+<U1F37B> \xF8\xD3 |1
+<U1F380> \xF8\xE5 |0
+<U1F381> \xF8\xE6 |0
+<U1F382> \xF8\xE7 |0
+<U1F384> \xF9\x48 |0
+<U1F3A0> \xF8\xDA |0
+<U1F3A3> \xF9\xF6 |1
+<U1F3A4> \xF8\xD7 |0
+<U1F3A5> \xF8\xD8 |0
+<U1F3A6> \xF8\xD8 |1
+<U1F3A7> \xF8\xDB |0
+<U1F3A8> \xF8\xDC |0
+<U1F3A9> \xF8\xDD |0
+<U1F3AA> \xF8\xDE |0
+<U1F3AB> \xF8\xDF |0
+<U1F3AC> \xF9\x50 |0
+<U1F3AE> \xF8\xEC |0
+<U1F3B5> \xF9\x9B |0
+<U1F3B6> \xF9\xA4 |0
+<U1F3BC> \xF9\xA4 |1
+<U1F3BD> \xF8\xB3 |0
+<U1F3BE> \xF8\xB6 |0
+<U1F3BF> \xF8\xB8 |0
+<U1F3C0> \xF8\xB9 |0
+<U1F3C1> \xF8\xBA |0
+<U1F3C2> \xF9\xB7 |0
+<U1F3C3> \xF9\xD8 |0
+<U1F3C4> \xF9\xB7 |1
+<U1F3E0> \xF8\xC4 |0
+<U1F3E1> \xF8\xC4 |1
+<U1F3E2> \xF8\xC5 |0
+<U1F3E3> \xF8\xC6 |0
+<U1F3E5> \xF8\xC7 |0
+<U1F3E6> \xF8\xC8 |0
+<U1F3E7> \xF8\xC9 |0
+<U1F3E8> \xF8\xCA |0
+<U1F3E9> \xF8\xCA+\xF9\x94 |1
+<U1F3EA> \xF8\xCB |0
+<U1F3EB> \xF9\xE3 |0
+<U1F3EE> \xF9\xF0 |1
+<U1F40C> \xF9\xF3 |0
+<U1F40E> \xF9\xF9 |1
+<U1F41F> \xF9\xF6 |0
+<U1F420> \xF9\xF6 |1
+<U1F421> \xF9\xF6 |1
+<U1F423> \xF9\xF4 |1
+<U1F424> \xF9\xF4 |0
+<U1F425> \xF9\xF4 |1
+<U1F426> \xF9\xF4 |1
+<U1F427> \xF9\xF5 |0
+<U1F429> \xF9\x45 |1
+<U1F431> \xF9\x46 |0
+<U1F434> \xF9\xF9 |0
+<U1F436> \xF9\x45 |0
+<U1F437> \xF9\xFA |0
+<U1F43A> \xF9\x45 |1
+<U1F43D> \xF9\xFA |1
+<U1F43E> \xF8\xF9 |1
+<U1F440> \xF8\xF2 |0
+<U1F442> \xF8\xF3 |0
+<U1F444> \xF9\x9E |1
+<U1F445> \xF9\xCD |1
+<U1F44A> \xF9\xA2 |0
+<U1F44B> \xF8\xF6 |1
+<U1F44C> \xF9\xB0 |1
+<U1F44D> \xF9\xCC |0
+<U1F44E> \xF9\xA5 |1
+<U1F450> \xF8\xF6 |1
+<U1F451> \xF9\xBF |0
+<U1F453> \xF8\xFB |0
+<U1F455> \xF9\xB3 |0
+<U1F456> \xF9\xB6 |0
+<U1F45A> \xF9\xB3 |1
+<U1F45B> \xF9\xB4 |0
+<U1F45C> \xF8\xE3 |0
+<U1F45D> \xF9\x51 |0
+<U1F45E> \xF8\xFA |1
+<U1F45F> \xF8\xFA |0
+<U1F460> \xF8\xD5 |0
+<U1F461> \xF8\xD5 |1
+<U1F463> \xF8\xF9 |0
+<U1F464> \xF9\x55 |0
+<U1F466> \xF9\x95 |1
+<U1F467> \xF9\x95 |1
+<U1F468> \xF9\x95 |1
+<U1F469> \xF9\x95 |1
+<U1F484> \xF9\xB5 |0
+<U1F487> \xF8\xD6 |1
+<U1F48B> \xF9\x9E |0
+<U1F48C> \xF9\xBC |0
+<U1F48D> \xF9\xC0 |0
+<U1F48E> \xF9\xC0 |1
+<U1F48F> \xF9\x9E |1
+<U1F491> \xF9\x92 |1
+<U1F493> \xF9\x92 |0
+<U1F494> \xF9\x93 |0
+<U1F495> \xF9\x94 |0
+<U1F496> \xF9\x91 |1
+<U1F497> \xF9\x92 |1
+<U1F498> \xF9\x91 |1
+<U1F499> \xF9\x91 |1
+<U1F49A> \xF9\x91 |1
+<U1F49B> \xF9\x91 |1
+<U1F49C> \xF9\x91 |1
+<U1F49D> \xF9\x91 |1
+<U1F49E> \xF9\x92 |1
+<U1F49F> \xF9\x9D |1
+<U1F4A0> \xF9\x9D |0
+<U1F4A1> \xF9\xA0 |0
+<U1F4A2> \xF9\xA1 |0
+<U1F4A3> \xF9\xA3 |0
+<U1F4A4> \xF9\xA6 |0
+<U1F4A5> \xF9\xAA |0
+<U1F4A6> \xF9\xAB |0
+<U1F4A7> \xF9\xAC |0
+<U1F4A8> \xF9\xAD |0
+<U1F4B0> \xF9\xBA |0
+<U1F4B2> \xF9\xBA |1
+<U1F4B4> \xF9\x7A |0
+<U1F4B5> \xF9\xBA |1
+<U1F4BA> \xF9\x56 |0
+<U1F4BB> \xF9\xBB |0
+<U1F4BC> \xF8\xE3 |1
+<U1F4BF> \xF8\xED |0
+<U1F4C0> \xF8\xED |1
+<U1F4C3> \xF8\xEA |1
+<U1F4C4> \xF8\xEA |1
+<U1F4C7> \xF8\xE4 |1
+<U1F4CB> \xF8\xEA |1
+<U1F4CE> \xF9\xD5 |0
+<U1F4D1> \xF8\xEA |1
+<U1F4D2> \xF8\xE4 |1
+<U1F4D3> \xF8\xE4 |1
+<U1F4D4> \xF8\xE4 |1
+<U1F4D5> \xF8\xE4 |1
+<U1F4D6> \xF8\xE4 |0
+<U1F4D7> \xF8\xE4 |1
+<U1F4D8> \xF8\xE4 |1
+<U1F4D9> \xF8\xE4 |1
+<U1F4DA> \xF8\xE4 |1
+<U1F4DC> \xF9\xAF |1
+<U1F4DD> \xF8\xEA |0
+<U1F4DE> \xF8\xE8 |1
+<U1F4DF> \xF8\xBB |0
+<U1F4E0> \xF9\x74 |0
+<U1F4E6> \xF8\xE6 |1
+<U1F4E7> \xF9\x77 |1
+<U1F4E8> \xF9\x73 |1
+<U1F4E9> \xF9\x73 |0
+<U1F4EA> \xF8\xC6 |1
+<U1F4EB> \xF8\xC6 |1
+<U1F4EE> \xF8\xC6 |1
+<U1F4F1> \xF8\xE9 |0
+<U1F4F2> \xF9\x72 |0
+<U1F4F7> \xF8\xE2 |0
+<U1F4F9> \xF8\xD8 |1
+<U1F4FA> \xF8\xEB |0
+<U1F503> \xF9\xDA |1
+<U1F50D> \xF9\x81 |0
+<U1F50E> \xF9\x81 |1
+<U1F50F> \xF9\x7D |1
+<U1F510> \xF9\x7D |1
+<U1F511> \xF9\x7D |0
+<U1F512> \xF9\x7D |1
+<U1F513> \xF9\x7D |1
+<U1F514> \xF9\xB8 |0
+<U1F51A> \xF9\x5D |0
+<U1F51B> \xF9\x5C |0
+<U1F51C> \xF9\x5B |0
+<U1F526> \xF9\xA0 |1
+<U1F527> \xF9\xBD |0
+<U1F531> \xF9\xBF |1
+<U1F532> \xF9\x40 |1
+<U1F533> \xF9\x40 |1
+<U1F534> \xF9\x40 |1
+<U1F535> \xF9\x40 |1
+<U1F550> \xF9\x5E |1
+<U1F551> \xF9\x5E |1
+<U1F552> \xF9\x5E |1
+<U1F553> \xF9\x5E |1
+<U1F554> \xF9\x5E |1
+<U1F555> \xF9\x5E |1
+<U1F556> \xF9\x5E |1
+<U1F557> \xF9\x5E |1
+<U1F558> \xF9\x5E |1
+<U1F559> \xF9\x5E |1
+<U1F55A> \xF9\x5E |1
+<U1F55B> \xF9\x5E |1
+<U1F5FB> \xF9\xE5 |0
+<U1F601> \xF9\xF8 |0
+<U1F602> \xF9\xCF |1
+<U1F603> \xF9\x95 |0
+<U1F604> \xF9\x95 |1
+<U1F605> \xF9\xC7 |0
+<U1F606> \xF9\xCF |0
+<U1F609> \xF9\xCE |0
+<U1F60A> \xF9\x95 |1
+<U1F60B> \xF9\xF7 |0
+<U1F60C> \xF9\xC6 |0
+<U1F60D> \xF9\xCB |0
+<U1F60F> \xF9\xD1 |0
+<U1F612> \xF9\xCA |0
+<U1F613> \xF9\xC8 |0
+<U1F614> \xF9\xC5 |0
+<U1F616> \xF9\x98 |0
+<U1F618> \xF9\xCB |1
+<U1F61A> \xF9\xCB |1
+<U1F61C> \xF9\xCD |0
+<U1F61D> \xF9\xCD |1
+<U1F61E> \xF9\x97 |0
+<U1F620> \xF9\x96 |0
+<U1F621> \xF9\xC9 |0
+<U1F622> \xF9\xD3 |0
+<U1F623> \xF9\xD0 |0
+<U1F624> \xF9\xF8 |1
+<U1F625> \xF9\xC8 |1
+<U1F628> \xF9\xFC |1
+<U1F629> \xF9\x98 |1
+<U1F62A> \xF9\xA6 |1
+<U1F62B> \xF9\xD0 |1
+<U1F62D> \xF9\xD2 |0
+<U1F630> \xF9\xC8 |1
+<U1F631> \xF9\xFC |0
+<U1F632> \xF9\x99 |1
+<U1F633> \xF9\xCF |1
+<U1F635> \xF9\x99 |0
+<U1F638> \xF9\xF8 |1
+<U1F639> \xF9\xCF |1
+<U1F63A> \xF9\x95 |1
+<U1F63B> \xF9\xCB |1
+<U1F63C> \xF9\xF8 |1
+<U1F63D> \xF9\xCB |1
+<U1F63E> \xF9\xC9 |1
+<U1F63F> \xF9\xD3 |1
+<U1F640> \xF9\x98 |1
+<U1F645> \xF9\xD4 |1
+<U1F646> \xF9\xB0 |1
+<U1F64D> \xF9\x98 |1
+<U1F64E> \xF9\x96 |1
+<U1F683> \xF8\xBC |0
+<U1F684> \xF8\xBE |0
+<U1F685> \xF8\xBE |1
+<U1F687> \xF8\xBD |1
+<U1F68C> \xF8\xC1 |0
+<U1F695> \xF8\xBF |1
+<U1F697> \xF8\xBF |0
+<U1F699> \xF8\xC0 |0
+<U1F6A2> \xF8\xC2 |0
+<U1F6A4> \xF9\x47 |1
+<U1F6A5> \xF8\xCE |0
+<U1F6A9> \xF9\x83 |0
+<U1F6AA> \xF9\xB9 |0
+<U1F6AB> \xF9\xDD |1
+<U1F6AC> \xF8\xE0 |0
+<U1F6AD> \xF8\xE1 |0
+<U1F6B2> \xF9\xC2 |0
+<U1F6B6> \xF9\xD8 |1
+<U1F6BB> \xF8\xCF |0
+<U1F6BD> \xF8\xCF |1
+<U1F6BE> \xF8\xCF |1
+<U1F6C0> \xF9\x9C |1
<UFE337> \xF9\x95 |1
-<UFE338> \xF9\x95 |1
-<UFE339> \xF9\xD3 |0
-<UFE33A> \xF9\xD2 |0
-<UFE33B> \xF9\xFC |1
-<UFE33C> \xF9\xD0 |0
-<UFE33D> \xF9\xC9 |0
-<UFE33E> \xF9\xC6 |0
-<UFE33F> \xF9\x98 |0
-<UFE340> \xF9\xC5 |0
-<UFE341> \xF9\xFC |0
-<UFE342> \xF9\xA6 |1
-<UFE343> \xF9\xD1 |0
-<UFE344> \xF9\xC8 |0
-<UFE345> \xF9\xC8 |1
-<UFE346> \xF9\xD0 |1
-<UFE347> \xF9\xCE |0
-<UFE348> \xF9\x95 |1
-<UFE349> \xF9\xF8 |1
-<UFE34A> \xF9\xCF |1
-<UFE34B> \xF9\xCB |1
-<UFE34C> \xF9\xCB |1
-<UFE34D> \xF9\xD3 |1
-<UFE34E> \xF9\xC9 |1
-<UFE34F> \xF9\xF8 |1
-<UFE350> \xF9\x98 |1
-<UFE351> \xF9\xD4 |1
-<UFE352> \xF9\xB0 |1
-<UFE359> \xF9\x98 |1
-<UFE35A> \xF9\x96 |1
-<UFE4B0> \xF8\xC4 |0
-<UFE4B1> \xF8\xC4 |1
-<UFE4B2> \xF8\xC5 |0
-<UFE4B3> \xF8\xC6 |0
-<UFE4B4> \xF8\xC7 |0
-<UFE4B5> \xF8\xC8 |0
-<UFE4B6> \xF8\xC9 |0
-<UFE4B7> \xF8\xCA |0
-<UFE4B8> \xF8\xCA\xF9\x94 |1
-<UFE4B9> \xF8\xCB |0
-<UFE4BA> \xF9\xE3 |0
-<UFE4C1> \xF8\xC2 |1
-<UFE4C2> \xF9\xF0 |1
-<UFE4C3> \xF9\xE5 |0
-<UFE4C9> \xF9\xBD |0
-<UFE4CC> \xF8\xFA |1
-<UFE4CD> \xF8\xFA |0
-<UFE4CE> \xF8\xFB |0
-<UFE4CF> \xF9\xB3 |0
-<UFE4D0> \xF9\xB6 |0
-<UFE4D1> \xF9\xBF |0
-<UFE4D2> \xF9\xBF |1
-<UFE4D6> \xF8\xD5 |0
-<UFE4D7> \xF8\xD5 |1
-<UFE4DB> \xF9\xB3 |1
-<UFE4DC> \xF9\xB4 |0
-<UFE4DD> \xF9\xBA |0
-<UFE4E0> \xF9\xBA |1
-<UFE4E2> \xF9\x7A |0
-<UFE4E3> \xF9\xBA |1
-<UFE4EF> \xF8\xE2 |0
-<UFE4F0> \xF8\xE3 |0
-<UFE4F1> \xF9\x51 |0
-<UFE4F2> \xF9\xB8 |0
-<UFE4F3> \xF9\xB9 |0
-<UFE4F9> \xF8\xD8 |1
-<UFE4FB> \xF9\xA0 |1
-<UFE4FD> \xF9\xAF |1
-<UFE4FF> \xF8\xE4 |1
-<UFE500> \xF8\xE4 |1
-<UFE501> \xF8\xE4 |1
-<UFE502> \xF8\xE4 |1
-<UFE503> \xF8\xE4 |1
-<UFE505> \xF9\x9C |1
-<UFE506> \xF8\xCF |0
-<UFE507> \xF8\xCF |1
-<UFE508> \xF8\xCF |1
-<UFE50F> \xF8\xE5 |0
-<UFE510> \xF8\xE6 |0
-<UFE511> \xF8\xE7 |0
-<UFE512> \xF9\x48 |0
-<UFE522> \xF8\xBB |0
-<UFE523> \xF8\xE8 |0
-<UFE524> \xF8\xE8 |1
-<UFE525> \xF8\xE9 |0
-<UFE526> \xF9\x72 |0
-<UFE527> \xF8\xEA |0
-<UFE528> \xF9\x74 |0
-<UFE529> \xF9\x77 |0
-<UFE52A> \xF9\x73 |1
-<UFE52B> \xF9\x73 |0
-<UFE52C> \xF8\xC6 |1
-<UFE52D> \xF8\xC6 |1
-<UFE52E> \xF8\xC6 |1
-<UFE535> \xF8\xE6 |1
-<UFE536> \xF9\x52 |0
-<UFE537> \xF9\x56 |0
-<UFE538> \xF9\xBB |0
-<UFE539> \xF9\xBE |0
-<UFE53A> \xF9\xD5 |0
-<UFE53B> \xF8\xE3 |1
-<UFE53E> \xF8\xD6 |0
-<UFE540> \xF8\xEA |1
-<UFE541> \xF8\xEA |1
-<UFE545> \xF8\xE4 |1
-<UFE546> \xF8\xE4 |0
-<UFE547> \xF8\xE4 |1
-<UFE548> \xF8\xEA |1
-<UFE54D> \xF8\xE4 |1
-<UFE54F> \xF8\xE4 |1
-<UFE552> \xF8\xEA |1
-<UFE553> \xF8\xF9 |0
-<UFE7D0> \xF8\xB3 |0
-<UFE7D1> \xF8\xB4 |0
-<UFE7D2> \xF8\xB5 |0
-<UFE7D3> \xF8\xB6 |0
-<UFE7D4> \xF8\xB7 |0
-<UFE7D5> \xF8\xB8 |0
-<UFE7D6> \xF8\xB9 |0
-<UFE7D7> \xF8\xBA |0
-<UFE7D8> \xF9\xB7 |0
-<UFE7D9> \xF9\xD8 |0
-<UFE7DA> \xF9\xB7 |1
-<UFE7DC> \xF9\xF9 |1
-<UFE7DF> \xF8\xBC |0
-<UFE7E0> \xF8\xBD |1
-<UFE7E1> \xF8\xBD |0
-<UFE7E2> \xF8\xBE |0
-<UFE7E3> \xF8\xBE |1
-<UFE7E4> \xF8\xBF |0
-<UFE7E5> \xF8\xC0 |0
-<UFE7E6> \xF8\xC1 |0
-<UFE7E8> \xF8\xC2 |0
-<UFE7E9> \xF8\xC3 |0
-<UFE7EA> \xF9\x47 |0
-<UFE7EB> \xF9\xC2 |0
-<UFE7EE> \xF9\x47 |1
-<UFE7EF> \xF8\xBF |1
-<UFE7F0> \xF9\xD8 |1
-<UFE7F5> \xF8\xCC |0
-<UFE7F6> \xF8\xCD |0
-<UFE7F7> \xF8\xCE |0
-<UFE7FA> \xF9\x9C |0
-<UFE7FC> \xF8\xDA |0
-<UFE7FF> \xF9\xF6 |1
-<UFE800> \xF8\xD7 |0
-<UFE801> \xF8\xD8 |0
-<UFE802> \xF8\xD8 |1
-<UFE803> \xF8\xDB |0
-<UFE804> \xF8\xDC |0
-<UFE805> \xF8\xDD |0
-<UFE806> \xF8\xDE |0
-<UFE807> \xF8\xDF |0
-<UFE808> \xF9\x50 |0
-<UFE80A> \xF8\xEC |0
-<UFE813> \xF9\x9B |0
-<UFE814> \xF9\xA4 |0
-<UFE81A> \xF9\xA4 |1
-<UFE81C> \xF8\xEB |0
-<UFE81D> \xF8\xED |0
-<UFE81E> \xF8\xED |1
-<UFE823> \xF9\x9E |0
-<UFE824> \xF9\xBC |0
-<UFE825> \xF9\xC0 |0
-<UFE826> \xF9\xC0 |1
-<UFE827> \xF9\x9E |1
-<UFE829> \xF9\x92 |1
-<UFE82B> \xF9\x84 |0
-<UFE82C> \xF9\x85 |0
<UFE82D> \xF9\x86 |0
-<UFE82E> \xF9\x87 |0
-<UFE82F> \xF9\x88 |0
-<UFE830> \xF9\x89 |0
-<UFE831> \xF9\x8A |0
-<UFE832> \xF9\x8B |0
-<UFE833> \xF9\x8C |0
-<UFE834> \xF9\x8D |0
-<UFE835> \xF9\x8E |0
-<UFE836> \xF9\x8F |0
-<UFE837> \xF9\x90 |0
-<UFE960> \xF8\xD4 |0
-<UFE961> \xF9\xEE |0
-<UFE962> \xF9\xEF |0
-<UFE963> \xF9\xF1 |0
-<UFE964> \xF9\xF2 |0
-<UFE96A> \xF9\xF1 |1
-<UFE973> \xF8\xA4 |1
-<UFE980> \xF8\xD0 |0
-<UFE981> \xF8\xD1 |0
-<UFE982> \xF8\xD2 |0
-<UFE983> \xF8\xD3 |0
-<UFE984> \xF9\xC3 |0
-<UFE985> \xF9\xF0 |0
-<UFE986> \xF9\xFB |0
-<UFE987> \xF8\xD3 |1
-<UFE988> \xF8\xD2 |1
-<UFEAF0> \xF8\xD9 |0
-<UFEAF1> \xF8\xF7 |0
-<UFEAF2> \xF8\xF8 |0
-<UFEAF3> \xF9\x49 |0
-<UFEAF4> \xF9\x9A |0
-<UFEAF5> \xF9\xA5 |0
-<UFEAF6> \xF9\xE1 |0
-<UFEAF7> \xF9\xE2 |0
-<UFEB04> \xF9\xA7 |0
-<UFEB05> \xF9\xA8 |0
-<UFEB06> \xF9\xA9 |0
-<UFEB07> \xF9\xAE |0
-<UFEB08> \xF9\xAF |0
-<UFEB0B> \xF9\xA7 |1
-<UFEB0C> \xF9\x91 |0
-<UFEB0D> \xF9\x92 |0
-<UFEB0E> \xF9\x93 |0
-<UFEB0F> \xF9\x94 |0
-<UFEB10> \xF9\x91 |1
-<UFEB11> \xF9\x92 |1
-<UFEB12> \xF9\x91 |1
-<UFEB13> \xF9\x91 |1
-<UFEB14> \xF9\x91 |1
-<UFEB15> \xF9\x91 |1
-<UFEB16> \xF9\x91 |1
-<UFEB17> \xF9\x91 |1
-<UFEB18> \xF9\x92 |1
-<UFEB19> \xF9\x9D |1
-<UFEB1A> \xF8\xEE |0
-<UFEB1B> \xF8\xEF |0
-<UFEB1C> \xF8\xF0 |0
-<UFEB1D> \xF8\xF1 |0
-<UFEB1E> \xF8\xE0 |0
-<UFEB1F> \xF8\xE1 |0
-<UFEB20> \xF8\xFC |0
-<UFEB21> \xF9\x7B |0
-<UFEB22> \xF9\x83 |0
-<UFEB23> \xF9\xDC |0
-<UFEB26> \xF9\xD4 |1
-<UFEB27> \xF9\xB0 |0
-<UFEB28> \xF9\xD4 |0
-<UFEB29> \xF9\xD6 |0
-<UFEB2A> \xF9\xD7 |0
-<UFEB2B> \xF9\xD9 |0
-<UFEB2C> \xF9\xDA |0
-<UFEB2D> \xF9\xDB |0
-<UFEB2E> \xF9\xDD |0
-<UFEB2F> \xF9\xDE |0
-<UFEB30> \xF9\xDF |0
-<UFEB31> \xF9\xE0 |0
-<UFEB36> \xF9\x82 |0
-<UFEB44> \xF9\x44 |1
-<UFEB48> \xF9\xDD |1
-<UFEB55> \xF9\x9D |0
-<UFEB56> \xF9\xA0 |0
-<UFEB57> \xF9\xA1 |0
-<UFEB58> \xF9\xA3 |0
-<UFEB59> \xF9\xA6 |0
-<UFEB5A> \xF9\xAA |0
-<UFEB5B> \xF9\xAB |0
-<UFEB5C> \xF9\xAC |0
-<UFEB5D> \xF9\xAD |0
-<UFEB60> \xF9\x9F |0
-<UFEB61> \xF9\x9D |1
-<UFEB62> \xF9\x9D |1
-<UFEB63> \xF9\x40 |1
-<UFEB64> \xF9\x40 |1
-<UFEB65> \xF9\x40 |1
-<UFEB66> \xF9\x40 |1
-<UFEB67> \xF9\x40 |1
-<UFEB77> \xF9\x9F |1
-<UFEB81> \xF9\x7C |0
-<UFEB82> \xF9\x7D |0
-<UFEB83> \xF9\x7E |0
-<UFEB84> \xF9\x80 |0
-<UFEB85> \xF9\x81 |0
-<UFEB86> \xF9\x7D |1
-<UFEB87> \xF9\x7D |1
-<UFEB8A> \xF9\x7D |1
-<UFEB8D> \xF9\x81 |1
-<UFEB90> \xF9\x7D |1
-<UFEB91> \xF9\xDA |1
-<UFEB92> \xF9\x77 |1
-<UFEB93> \xF8\xF4 |0
-<UFEB94> \xF8\xF5 |0
-<UFEB95> \xF8\xF6 |0
-<UFEB96> \xF9\xA2 |0
-<UFEB97> \xF9\xCC |0
-<UFEB9D> \xF8\xF6 |1
-<UFEB9F> \xF9\xB0 |1
-<UFEBA0> \xF9\xA5 |1
-<UFEBA1> \xF8\xF6 |1
<UFEE10> \xF9\x75 |0
<UFEE11> \xF9\x76 |0
<UFEE12> \xF9\x78 |0
@@ -8453,4 +8477,405 @@
<UFEE31> \xF9\x6F |0
<UFEE32> \xF9\x70 |0
<UFEE33> \xF9\x71 |0
+# Fallbacks for Google PUA code points, for Unicode Standard Emoji symbols.
+<UFE000> \xF8\x9F |1
+<UFE001> \xF8\xA0 |1
+<UFE002> \xF8\xA1 |1
+<UFE003> \xF8\xA2 |1
+<UFE004> \xF8\xA3 |1
+<UFE005> \xF8\xA4 |1
+<UFE006> \xF8\xA5 |1
+<UFE007> \xF8\xA6 |1
+<UFE008> \xF9\x57 |1
+<UFE009> \xF8\x9F |1
+<UFE00A> \xF8\x9F |1
+<UFE00C> \xF8\x9F |1
+<UFE00F> \xF8\x9F+\xF8\xA0 |1
+<UFE010> \xF9\x57 |1
+<UFE011> \xF9\x40 |1
+<UFE012> \xF9\x41 |1
+<UFE013> \xF9\x42 |1
+<UFE014> \xF9\x43 |1
+<UFE015> \xF9\x44 |1
+<UFE016> \xF9\x42 |1
+<UFE018> \xF9\x5B |1
+<UFE019> \xF9\x5C |1
+<UFE01A> \xF9\x5D |1
+<UFE01B> \xF9\xC1 |1
+<UFE01C> \xF9\xC1 |1
+<UFE01D> \xF9\xC4 |1
+<UFE01E> \xF9\x5E |1
+<UFE01F> \xF9\x5E |1
+<UFE020> \xF9\x5E |1
+<UFE021> \xF9\x5E |1
+<UFE022> \xF9\x5E |1
+<UFE023> \xF9\x5E |1
+<UFE024> \xF9\x5E |1
+<UFE025> \xF9\x5E |1
+<UFE026> \xF9\x5E |1
+<UFE027> \xF9\x5E |1
+<UFE028> \xF9\x5E |1
+<UFE029> \xF9\x5E |1
+<UFE02A> \xF9\x5E |1
+<UFE02B> \xF8\xA7 |1
+<UFE02C> \xF8\xA8 |1
+<UFE02D> \xF8\xA9 |1
+<UFE02E> \xF8\xAA |1
+<UFE02F> \xF8\xAB |1
+<UFE030> \xF8\xAC |1
+<UFE031> \xF8\xAD |1
+<UFE032> \xF8\xAE |1
+<UFE033> \xF8\xAF |1
+<UFE034> \xF8\xB0 |1
+<UFE035> \xF8\xB1 |1
+<UFE036> \xF8\xB2 |1
+<UFE038> \xF9\xE4 |1
+<UFE03B> \xF9\x57 |1
+<UFE03C> \xF9\xE6 |1
+<UFE03D> \xF9\xE8 |1
+<UFE03E> \xF9\xEB |1
+<UFE03F> \xF9\xEC |1
+<UFE040> \xF9\xED |1
+<UFE042> \xF9\xEC |1
+<UFE04E> \xF9\xE6 |1
+<UFE04F> \xF9\xE7 |1
+<UFE050> \xF9\xE9 |1
+<UFE051> \xF9\xEA |1
+<UFE05B> \xF9\xEA |1
+<UFE190> \xF8\xF2 |1
+<UFE191> \xF8\xF3 |1
+<UFE193> \xF9\x9E |1
+<UFE194> \xF9\xCD |1
+<UFE195> \xF9\xB5 |1
+<UFE198> \xF8\xD6 |1
+<UFE19A> \xF9\x55 |1
+<UFE19B> \xF9\x95 |1
+<UFE19C> \xF9\x95 |1
+<UFE19D> \xF9\x95 |1
+<UFE19E> \xF9\x95 |1
+<UFE1B7> \xF9\x45 |1
+<UFE1B8> \xF9\x46 |1
+<UFE1B9> \xF9\xF3 |1
+<UFE1BA> \xF9\xF4 |1
+<UFE1BB> \xF9\xF4 |1
+<UFE1BC> \xF9\xF5 |1
+<UFE1BD> \xF9\xF6 |1
+<UFE1BE> \xF9\xF9 |1
+<UFE1BF> \xF9\xFA |1
+<UFE1C8> \xF9\xF4 |1
+<UFE1C9> \xF9\xF6 |1
+<UFE1D0> \xF9\x45 |1
+<UFE1D8> \xF9\x45 |1
+<UFE1D9> \xF9\xF6 |1
+<UFE1DB> \xF8\xF9 |1
+<UFE1DD> \xF9\xF4 |1
+<UFE1E0> \xF9\xFA |1
+<UFE320> \xF9\x96 |1
+<UFE321> \xF9\x98 |1
+<UFE322> \xF9\x99 |1
+<UFE323> \xF9\x97 |1
+<UFE324> \xF9\x99 |1
+<UFE325> \xF9\xC8 |1
+<UFE326> \xF9\xCA |1
+<UFE327> \xF9\xCB |1
+<UFE328> \xF9\xF8 |1
+<UFE329> \xF9\xCD |1
+<UFE32A> \xF9\xCD |1
+<UFE32B> \xF9\xF7 |1
+<UFE32C> \xF9\xCB |1
+<UFE32D> \xF9\xCB |1
+<UFE32F> \xF9\xCF |1
+<UFE330> \xF9\x95 |1
+<UFE331> \xF9\xC7 |1
+<UFE332> \xF9\xCF |1
+<UFE333> \xF9\xF8 |1
+<UFE334> \xF9\xCF |1
+<UFE335> \xF9\x95 |1
+<UFE336> \xF9\x95 |1
+<UFE338> \xF9\x95 |1
+<UFE339> \xF9\xD3 |1
+<UFE33A> \xF9\xD2 |1
+<UFE33B> \xF9\xFC |1
+<UFE33C> \xF9\xD0 |1
+<UFE33D> \xF9\xC9 |1
+<UFE33E> \xF9\xC6 |1
+<UFE33F> \xF9\x98 |1
+<UFE340> \xF9\xC5 |1
+<UFE341> \xF9\xFC |1
+<UFE342> \xF9\xA6 |1
+<UFE343> \xF9\xD1 |1
+<UFE344> \xF9\xC8 |1
+<UFE345> \xF9\xC8 |1
+<UFE346> \xF9\xD0 |1
+<UFE347> \xF9\xCE |1
+<UFE348> \xF9\x95 |1
+<UFE349> \xF9\xF8 |1
+<UFE34A> \xF9\xCF |1
+<UFE34B> \xF9\xCB |1
+<UFE34C> \xF9\xCB |1
+<UFE34D> \xF9\xD3 |1
+<UFE34E> \xF9\xC9 |1
+<UFE34F> \xF9\xF8 |1
+<UFE350> \xF9\x98 |1
+<UFE351> \xF9\xD4 |1
+<UFE352> \xF9\xB0 |1
+<UFE359> \xF9\x98 |1
+<UFE35A> \xF9\x96 |1
+<UFE4B0> \xF8\xC4 |1
+<UFE4B1> \xF8\xC4 |1
+<UFE4B2> \xF8\xC5 |1
+<UFE4B3> \xF8\xC6 |1
+<UFE4B4> \xF8\xC7 |1
+<UFE4B5> \xF8\xC8 |1
+<UFE4B6> \xF8\xC9 |1
+<UFE4B7> \xF8\xCA |1
+<UFE4B8> \xF8\xCA+\xF9\x94 |1
+<UFE4B9> \xF8\xCB |1
+<UFE4BA> \xF9\xE3 |1
+<UFE4C1> \xF8\xC2 |1
+<UFE4C2> \xF9\xF0 |1
+<UFE4C3> \xF9\xE5 |1
+<UFE4C9> \xF9\xBD |1
+<UFE4CC> \xF8\xFA |1
+<UFE4CD> \xF8\xFA |1
+<UFE4CE> \xF8\xFB |1
+<UFE4CF> \xF9\xB3 |1
+<UFE4D0> \xF9\xB6 |1
+<UFE4D1> \xF9\xBF |1
+<UFE4D2> \xF9\xBF |1
+<UFE4D6> \xF8\xD5 |1
+<UFE4D7> \xF8\xD5 |1
+<UFE4DB> \xF9\xB3 |1
+<UFE4DC> \xF9\xB4 |1
+<UFE4DD> \xF9\xBA |1
+<UFE4E0> \xF9\xBA |1
+<UFE4E2> \xF9\x7A |1
+<UFE4E3> \xF9\xBA |1
+<UFE4EF> \xF8\xE2 |1
+<UFE4F0> \xF8\xE3 |1
+<UFE4F1> \xF9\x51 |1
+<UFE4F2> \xF9\xB8 |1
+<UFE4F3> \xF9\xB9 |1
+<UFE4F9> \xF8\xD8 |1
+<UFE4FB> \xF9\xA0 |1
+<UFE4FD> \xF9\xAF |1
+<UFE4FF> \xF8\xE4 |1
+<UFE500> \xF8\xE4 |1
+<UFE501> \xF8\xE4 |1
+<UFE502> \xF8\xE4 |1
+<UFE503> \xF8\xE4 |1
+<UFE505> \xF9\x9C |1
+<UFE506> \xF8\xCF |1
+<UFE507> \xF8\xCF |1
+<UFE508> \xF8\xCF |1
+<UFE50F> \xF8\xE5 |1
+<UFE510> \xF8\xE6 |1
+<UFE511> \xF8\xE7 |1
+<UFE512> \xF9\x48 |1
+<UFE522> \xF8\xBB |1
+<UFE523> \xF8\xE8 |1
+<UFE524> \xF8\xE8 |1
+<UFE525> \xF8\xE9 |1
+<UFE526> \xF9\x72 |1
+<UFE527> \xF8\xEA |1
+<UFE528> \xF9\x74 |1
+<UFE529> \xF9\x77 |1
+<UFE52A> \xF9\x73 |1
+<UFE52B> \xF9\x73 |1
+<UFE52C> \xF8\xC6 |1
+<UFE52D> \xF8\xC6 |1
+<UFE52E> \xF8\xC6 |1
+<UFE535> \xF8\xE6 |1
+<UFE536> \xF9\x52 |1
+<UFE537> \xF9\x56 |1
+<UFE538> \xF9\xBB |1
+<UFE539> \xF9\xBE |1
+<UFE53A> \xF9\xD5 |1
+<UFE53B> \xF8\xE3 |1
+<UFE53E> \xF8\xD6 |1
+<UFE540> \xF8\xEA |1
+<UFE541> \xF8\xEA |1
+<UFE545> \xF8\xE4 |1
+<UFE546> \xF8\xE4 |1
+<UFE547> \xF8\xE4 |1
+<UFE548> \xF8\xEA |1
+<UFE54D> \xF8\xE4 |1
+<UFE54F> \xF8\xE4 |1
+<UFE552> \xF8\xEA |1
+<UFE553> \xF8\xF9 |1
+<UFE7D0> \xF8\xB3 |1
+<UFE7D1> \xF8\xB4 |1
+<UFE7D2> \xF8\xB5 |1
+<UFE7D3> \xF8\xB6 |1
+<UFE7D4> \xF8\xB7 |1
+<UFE7D5> \xF8\xB8 |1
+<UFE7D6> \xF8\xB9 |1
+<UFE7D7> \xF8\xBA |1
+<UFE7D8> \xF9\xB7 |1
+<UFE7D9> \xF9\xD8 |1
+<UFE7DA> \xF9\xB7 |1
+<UFE7DC> \xF9\xF9 |1
+<UFE7DF> \xF8\xBC |1
+<UFE7E0> \xF8\xBD |1
+<UFE7E1> \xF8\xBD |1
+<UFE7E2> \xF8\xBE |1
+<UFE7E3> \xF8\xBE |1
+<UFE7E4> \xF8\xBF |1
+<UFE7E5> \xF8\xC0 |1
+<UFE7E6> \xF8\xC1 |1
+<UFE7E8> \xF8\xC2 |1
+<UFE7E9> \xF8\xC3 |1
+<UFE7EA> \xF9\x47 |1
+<UFE7EB> \xF9\xC2 |1
+<UFE7EE> \xF9\x47 |1
+<UFE7EF> \xF8\xBF |1
+<UFE7F0> \xF9\xD8 |1
+<UFE7F5> \xF8\xCC |1
+<UFE7F6> \xF8\xCD |1
+<UFE7F7> \xF8\xCE |1
+<UFE7FA> \xF9\x9C |1
+<UFE7FC> \xF8\xDA |1
+<UFE7FF> \xF9\xF6 |1
+<UFE800> \xF8\xD7 |1
+<UFE801> \xF8\xD8 |1
+<UFE802> \xF8\xD8 |1
+<UFE803> \xF8\xDB |1
+<UFE804> \xF8\xDC |1
+<UFE805> \xF8\xDD |1
+<UFE806> \xF8\xDE |1
+<UFE807> \xF8\xDF |1
+<UFE808> \xF9\x50 |1
+<UFE80A> \xF8\xEC |1
+<UFE813> \xF9\x9B |1
+<UFE814> \xF9\xA4 |1
+<UFE81A> \xF9\xA4 |1
+<UFE81C> \xF8\xEB |1
+<UFE81D> \xF8\xED |1
+<UFE81E> \xF8\xED |1
+<UFE823> \xF9\x9E |1
+<UFE824> \xF9\xBC |1
+<UFE825> \xF9\xC0 |1
+<UFE826> \xF9\xC0 |1
+<UFE827> \xF9\x9E |1
+<UFE829> \xF9\x92 |1
+<UFE82B> \xF9\x84 |1
+<UFE82C> \xF9\x85 |1
+<UFE82E> \xF9\x87 |1
+<UFE82F> \xF9\x88 |1
+<UFE830> \xF9\x89 |1
+<UFE831> \xF9\x8A |1
+<UFE832> \xF9\x8B |1
+<UFE833> \xF9\x8C |1
+<UFE834> \xF9\x8D |1
+<UFE835> \xF9\x8E |1
+<UFE836> \xF9\x8F |1
+<UFE837> \xF9\x90 |1
+<UFE960> \xF8\xD4 |1
+<UFE961> \xF9\xEE |1
+<UFE962> \xF9\xEF |1
+<UFE963> \xF9\xF1 |1
+<UFE964> \xF9\xF2 |1
+<UFE96A> \xF9\xF1 |1
+<UFE973> \xF8\xA4 |1
+<UFE980> \xF8\xD0 |1
+<UFE981> \xF8\xD1 |1
+<UFE982> \xF8\xD2 |1
+<UFE983> \xF8\xD3 |1
+<UFE984> \xF9\xC3 |1
+<UFE985> \xF9\xF0 |1
+<UFE986> \xF9\xFB |1
+<UFE987> \xF8\xD3 |1
+<UFE988> \xF8\xD2 |1
+<UFEAF0> \xF8\xD9 |1
+<UFEAF1> \xF8\xF7 |1
+<UFEAF2> \xF8\xF8 |1
+<UFEAF3> \xF9\x49 |1
+<UFEAF4> \xF9\x9A |1
+<UFEAF5> \xF9\xA5 |1
+<UFEAF6> \xF9\xE1 |1
+<UFEAF7> \xF9\xE2 |1
+<UFEB04> \xF9\xA7 |1
+<UFEB05> \xF9\xA8 |1
+<UFEB06> \xF9\xA9 |1
+<UFEB07> \xF9\xAE |1
+<UFEB08> \xF9\xAF |1
+<UFEB0B> \xF9\xA7 |1
+<UFEB0C> \xF9\x91 |1
+<UFEB0D> \xF9\x92 |1
+<UFEB0E> \xF9\x93 |1
+<UFEB0F> \xF9\x94 |1
+<UFEB10> \xF9\x91 |1
+<UFEB11> \xF9\x92 |1
+<UFEB12> \xF9\x91 |1
+<UFEB13> \xF9\x91 |1
+<UFEB14> \xF9\x91 |1
+<UFEB15> \xF9\x91 |1
+<UFEB16> \xF9\x91 |1
+<UFEB17> \xF9\x91 |1
+<UFEB18> \xF9\x92 |1
+<UFEB19> \xF9\x9D |1
+<UFEB1A> \xF8\xEE |1
+<UFEB1B> \xF8\xEF |1
+<UFEB1C> \xF8\xF0 |1
+<UFEB1D> \xF8\xF1 |1
+<UFEB1E> \xF8\xE0 |1
+<UFEB1F> \xF8\xE1 |1
+<UFEB20> \xF8\xFC |1
+<UFEB21> \xF9\x7B |1
+<UFEB22> \xF9\x83 |1
+<UFEB23> \xF9\xDC |1
+<UFEB26> \xF9\xD4 |1
+<UFEB27> \xF9\xB0 |1
+<UFEB28> \xF9\xD4 |1
+<UFEB29> \xF9\xD6 |1
+<UFEB2A> \xF9\xD7 |1
+<UFEB2B> \xF9\xD9 |1
+<UFEB2C> \xF9\xDA |1
+<UFEB2D> \xF9\xDB |1
+<UFEB2E> \xF9\xDD |1
+<UFEB2F> \xF9\xDE |1
+<UFEB30> \xF9\xDF |1
+<UFEB31> \xF9\xE0 |1
+<UFEB36> \xF9\x82 |1
+<UFEB44> \xF9\x44 |1
+<UFEB48> \xF9\xDD |1
+<UFEB55> \xF9\x9D |1
+<UFEB56> \xF9\xA0 |1
+<UFEB57> \xF9\xA1 |1
+<UFEB58> \xF9\xA3 |1
+<UFEB59> \xF9\xA6 |1
+<UFEB5A> \xF9\xAA |1
+<UFEB5B> \xF9\xAB |1
+<UFEB5C> \xF9\xAC |1
+<UFEB5D> \xF9\xAD |1
+<UFEB60> \xF9\x9F |1
+<UFEB61> \xF9\x9D |1
+<UFEB62> \xF9\x9D |1
+<UFEB63> \xF9\x40 |1
+<UFEB64> \xF9\x40 |1
+<UFEB65> \xF9\x40 |1
+<UFEB66> \xF9\x40 |1
+<UFEB67> \xF9\x40 |1
+<UFEB77> \xF9\x9F |1
+<UFEB81> \xF9\x7C |1
+<UFEB82> \xF9\x7D |1
+<UFEB83> \xF9\x7E |1
+<UFEB84> \xF9\x80 |1
+<UFEB85> \xF9\x81 |1
+<UFEB86> \xF9\x7D |1
+<UFEB87> \xF9\x7D |1
+<UFEB8A> \xF9\x7D |1
+<UFEB8D> \xF9\x81 |1
+<UFEB90> \xF9\x7D |1
+<UFEB91> \xF9\xDA |1
+<UFEB92> \xF9\x77 |1
+<UFEB93> \xF8\xF4 |1
+<UFEB94> \xF8\xF5 |1
+<UFEB95> \xF8\xF6 |1
+<UFEB96> \xF9\xA2 |1
+<UFEB97> \xF9\xCC |1
+<UFEB9D> \xF8\xF6 |1
+<UFEB9F> \xF9\xB0 |1
+<UFEBA0> \xF9\xA5 |1
+<UFEBA1> \xF8\xF6 |1
END CHARMAP
diff --git a/data/mappings/euc-jp-2007.ucm b/data/mappings/euc-jp-2007.ucm
new file mode 100644
index 0000000..9dc69be
--- /dev/null
+++ b/data/mappings/euc-jp-2007.ucm
@@ -0,0 +1,13697 @@
+# ***************************************************************************
+# *
+# * Copyright (C) 1995-2013, International Business Machines
+# * Corporation and others. All Rights Reserved.
+# *
+# ***************************************************************************
+#
+# File created by combining Mozilla's EUC-JP, IE7's codepage 51932 and ibm-954
+#
+<code_set_name> "euc-jp-2007"
+<char_name_mask> "AXXXX"
+<mb_cur_max> 3
+<mb_cur_min> 1
+<uconv_class> "MBCS"
+<subchar> \xF4\xFE
+<subchar1> \x1A
+<icu:charsetFamily> "ASCII"
+#<icu:alias> "ibm-954_VPUA"
+
+<icu:state> 0-8d, 8e:2, 8f:3, 90-9f, a1-fe:1
+<icu:state> a1-fe
+<icu:state> a1-e4
+<icu:state> a1-fe:1, a1:4, a3-a4:4, ef-f2:4, f4-fe:4
+<icu:state> a1-fe.u
+
+CHARMAP
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U0080> \x80 |0
+<U0081> \x81 |0
+<U0082> \x82 |0
+<U0083> \x83 |0
+<U0084> \x84 |0
+<U0085> \x85 |0
+<U0086> \x86 |0
+<U0087> \x87 |0
+<U0088> \x88 |0
+<U0089> \x89 |0
+<U008A> \x8A |0
+<U008B> \x8B |0
+<U008C> \x8C |0
+<U008D> \x8D |0
+<U0090> \x90 |0
+<U0091> \x91 |0
+<U0092> \x92 |0
+<U0093> \x93 |0
+<U0094> \x94 |0
+<U0095> \x95 |0
+<U0096> \x96 |0
+<U0097> \x97 |0
+<U0098> \x98 |0
+<U0099> \x99 |0
+<U009A> \x9A |0
+<U009B> \x9B |0
+<U009C> \x9C |0
+<U009D> \x9D |0
+<U009E> \x9E |0
+<U009F> \x9F |0
+<U00A1> \x8F\xA2\xC2 |0
+<U00A2> \xA1\xF1 |1
+<U00A2> \x8E\xE0 |3
+<U00A3> \xA1\xF2 |1
+<U00A3> \x8E\xE1 |3
+<U00A4> \x8F\xA2\xF0 |0
+<U00A5> \x5C |1
+<U00A6> \xFC\xFC |1
+<U00A6> \x8F\xA2\xC3 |3
+<U00A7> \xA1\xF8 |0
+<U00A8> \xA1\xAF |0
+<U00A9> \x8F\xA2\xED |0
+<U00AA> \x8F\xA2\xEC |0
+<U00AC> \xA2\xCC |1
+<U00AC> \x8E\xE2 |3
+<U00AE> \x8F\xA2\xEE |0
+<U00AF> \x8F\xA2\xB4 |0
+<U00B0> \xA1\xEB |0
+<U00B1> \xA1\xDE |0
+<U00B4> \xA1\xAD |0
+<U00B6> \xA2\xF9 |0
+<U00B8> \x8F\xA2\xB1 |0
+<U00BA> \x8F\xA2\xEB |0
+<U00BF> \x8F\xA2\xC4 |0
+<U00C0> \x8F\xAA\xA2 |0
+<U00C1> \x8F\xAA\xA1 |0
+<U00C2> \x8F\xAA\xA4 |0
+<U00C3> \x8F\xAA\xAA |0
+<U00C4> \x8F\xAA\xA3 |0
+<U00C5> \x8F\xAA\xA9 |0
+<U00C6> \x8F\xA9\xA1 |0
+<U00C7> \x8F\xAA\xAE |0
+<U00C8> \x8F\xAA\xB2 |0
+<U00C9> \x8F\xAA\xB1 |0
+<U00CA> \x8F\xAA\xB4 |0
+<U00CB> \x8F\xAA\xB3 |0
+<U00CC> \x8F\xAA\xC0 |0
+<U00CD> \x8F\xAA\xBF |0
+<U00CE> \x8F\xAA\xC2 |0
+<U00CF> \x8F\xAA\xC1 |0
+<U00D1> \x8F\xAA\xD0 |0
+<U00D2> \x8F\xAA\xD2 |0
+<U00D3> \x8F\xAA\xD1 |0
+<U00D4> \x8F\xAA\xD4 |0
+<U00D5> \x8F\xAA\xD8 |0
+<U00D6> \x8F\xAA\xD3 |0
+<U00D7> \xA1\xDF |0
+<U00D8> \x8F\xA9\xAC |0
+<U00D9> \x8F\xAA\xE3 |0
+<U00DA> \x8F\xAA\xE2 |0
+<U00DB> \x8F\xAA\xE5 |0
+<U00DC> \x8F\xAA\xE4 |0
+<U00DD> \x8F\xAA\xF2 |0
+<U00DE> \x8F\xA9\xB0 |0
+<U00DF> \x8F\xA9\xCE |0
+<U00E0> \x8F\xAB\xA2 |0
+<U00E1> \x8F\xAB\xA1 |0
+<U00E2> \x8F\xAB\xA4 |0
+<U00E3> \x8F\xAB\xAA |0
+<U00E4> \x8F\xAB\xA3 |0
+<U00E5> \x8F\xAB\xA9 |0
+<U00E6> \x8F\xA9\xC1 |0
+<U00E7> \x8F\xAB\xAE |0
+<U00E8> \x8F\xAB\xB2 |0
+<U00E9> \x8F\xAB\xB1 |0
+<U00EA> \x8F\xAB\xB4 |0
+<U00EB> \x8F\xAB\xB3 |0
+<U00EC> \x8F\xAB\xC0 |0
+<U00ED> \x8F\xAB\xBF |0
+<U00EE> \x8F\xAB\xC2 |0
+<U00EF> \x8F\xAB\xC1 |0
+<U00F0> \x8F\xA9\xC3 |0
+<U00F1> \x8F\xAB\xD0 |0
+<U00F2> \x8F\xAB\xD2 |0
+<U00F3> \x8F\xAB\xD1 |0
+<U00F4> \x8F\xAB\xD4 |0
+<U00F5> \x8F\xAB\xD8 |0
+<U00F6> \x8F\xAB\xD3 |0
+<U00F7> \xA1\xE0 |0
+<U00F8> \x8F\xA9\xCC |0
+<U00F9> \x8F\xAB\xE3 |0
+<U00FA> \x8F\xAB\xE2 |0
+<U00FB> \x8F\xAB\xE5 |0
+<U00FC> \x8F\xAB\xE4 |0
+<U00FD> \x8F\xAB\xF2 |0
+<U00FE> \x8F\xA9\xD0 |0
+<U00FF> \x8F\xAB\xF3 |0
+<U0100> \x8F\xAA\xA7 |0
+<U0101> \x8F\xAB\xA7 |0
+<U0102> \x8F\xAA\xA5 |0
+<U0103> \x8F\xAB\xA5 |0
+<U0104> \x8F\xAA\xA8 |0
+<U0105> \x8F\xAB\xA8 |0
+<U0106> \x8F\xAA\xAB |0
+<U0107> \x8F\xAB\xAB |0
+<U0108> \x8F\xAA\xAC |0
+<U0109> \x8F\xAB\xAC |0
+<U010A> \x8F\xAA\xAF |0
+<U010B> \x8F\xAB\xAF |0
+<U010C> \x8F\xAA\xAD |0
+<U010D> \x8F\xAB\xAD |0
+<U010E> \x8F\xAA\xB0 |0
+<U010F> \x8F\xAB\xB0 |0
+<U0110> \x8F\xA9\xA2 |0
+<U0111> \x8F\xA9\xC2 |0
+<U0112> \x8F\xAA\xB7 |0
+<U0113> \x8F\xAB\xB7 |0
+<U0116> \x8F\xAA\xB6 |0
+<U0117> \x8F\xAB\xB6 |0
+<U0118> \x8F\xAA\xB8 |0
+<U0119> \x8F\xAB\xB8 |0
+<U011A> \x8F\xAA\xB5 |0
+<U011B> \x8F\xAB\xB5 |0
+<U011C> \x8F\xAA\xBA |0
+<U011D> \x8F\xAB\xBA |0
+<U011E> \x8F\xAA\xBB |0
+<U011F> \x8F\xAB\xBB |0
+<U0120> \x8F\xAA\xBD |0
+<U0121> \x8F\xAB\xBD |0
+<U0122> \x8F\xAA\xBC |0
+<U0124> \x8F\xAA\xBE |0
+<U0125> \x8F\xAB\xBE |0
+<U0126> \x8F\xA9\xA4 |0
+<U0127> \x8F\xA9\xC4 |0
+<U0128> \x8F\xAA\xC7 |0
+<U0129> \x8F\xAB\xC7 |0
+<U012A> \x8F\xAA\xC5 |0
+<U012B> \x8F\xAB\xC5 |0
+<U012E> \x8F\xAA\xC6 |0
+<U012F> \x8F\xAB\xC6 |0
+<U0130> \x8F\xAA\xC4 |0
+<U0131> \x8F\xA9\xC5 |0
+<U0132> \x8F\xA9\xA6 |0
+<U0133> \x8F\xA9\xC6 |0
+<U0134> \x8F\xAA\xC8 |0
+<U0135> \x8F\xAB\xC8 |0
+<U0136> \x8F\xAA\xC9 |0
+<U0137> \x8F\xAB\xC9 |0
+<U0138> \x8F\xA9\xC7 |0
+<U0139> \x8F\xAA\xCA |0
+<U013A> \x8F\xAB\xCA |0
+<U013B> \x8F\xAA\xCC |0
+<U013C> \x8F\xAB\xCC |0
+<U013D> \x8F\xAA\xCB |0
+<U013E> \x8F\xAB\xCB |0
+<U013F> \x8F\xA9\xA9 |0
+<U0140> \x8F\xA9\xC9 |0
+<U0141> \x8F\xA9\xA8 |0
+<U0142> \x8F\xA9\xC8 |0
+<U0143> \x8F\xAA\xCD |0
+<U0144> \x8F\xAB\xCD |0
+<U0145> \x8F\xAA\xCF |0
+<U0146> \x8F\xAB\xCF |0
+<U0147> \x8F\xAA\xCE |0
+<U0148> \x8F\xAB\xCE |0
+<U0149> \x8F\xA9\xCA |0
+<U014A> \x8F\xA9\xAB |0
+<U014B> \x8F\xA9\xCB |0
+<U014C> \x8F\xAA\xD7 |0
+<U014D> \x8F\xAB\xD7 |0
+<U0150> \x8F\xAA\xD6 |0
+<U0151> \x8F\xAB\xD6 |0
+<U0152> \x8F\xA9\xAD |0
+<U0153> \x8F\xA9\xCD |0
+<U0154> \x8F\xAA\xD9 |0
+<U0155> \x8F\xAB\xD9 |0
+<U0156> \x8F\xAA\xDB |0
+<U0157> \x8F\xAB\xDB |0
+<U0158> \x8F\xAA\xDA |0
+<U0159> \x8F\xAB\xDA |0
+<U015A> \x8F\xAA\xDC |0
+<U015B> \x8F\xAB\xDC |0
+<U015C> \x8F\xAA\xDD |0
+<U015D> \x8F\xAB\xDD |0
+<U015E> \x8F\xAA\xDF |0
+<U015F> \x8F\xAB\xDF |0
+<U0160> \x8F\xAA\xDE |0
+<U0161> \x8F\xAB\xDE |0
+<U0162> \x8F\xAA\xE1 |0
+<U0163> \x8F\xAB\xE1 |0
+<U0164> \x8F\xAA\xE0 |0
+<U0165> \x8F\xAB\xE0 |0
+<U0166> \x8F\xA9\xAF |0
+<U0167> \x8F\xA9\xCF |0
+<U0168> \x8F\xAA\xEC |0
+<U0169> \x8F\xAB\xEC |0
+<U016A> \x8F\xAA\xE9 |0
+<U016B> \x8F\xAB\xE9 |0
+<U016C> \x8F\xAA\xE6 |0
+<U016D> \x8F\xAB\xE6 |0
+<U016E> \x8F\xAA\xEB |0
+<U016F> \x8F\xAB\xEB |0
+<U0170> \x8F\xAA\xE8 |0
+<U0171> \x8F\xAB\xE8 |0
+<U0172> \x8F\xAA\xEA |0
+<U0173> \x8F\xAB\xEA |0
+<U0174> \x8F\xAA\xF1 |0
+<U0175> \x8F\xAB\xF1 |0
+<U0176> \x8F\xAA\xF4 |0
+<U0177> \x8F\xAB\xF4 |0
+<U0178> \x8F\xAA\xF3 |0
+<U0179> \x8F\xAA\xF5 |0
+<U017A> \x8F\xAB\xF5 |0
+<U017B> \x8F\xAA\xF7 |0
+<U017C> \x8F\xAB\xF7 |0
+<U017D> \x8F\xAA\xF6 |0
+<U017E> \x8F\xAB\xF6 |0
+<U01CD> \x8F\xAA\xA6 |0
+<U01CE> \x8F\xAB\xA6 |0
+<U01CF> \x8F\xAA\xC3 |0
+<U01D0> \x8F\xAB\xC3 |0
+<U01D1> \x8F\xAA\xD5 |0
+<U01D2> \x8F\xAB\xD5 |0
+<U01D3> \x8F\xAA\xE7 |0
+<U01D4> \x8F\xAB\xE7 |0
+<U01D5> \x8F\xAA\xF0 |0
+<U01D6> \x8F\xAB\xF0 |0
+<U01D7> \x8F\xAA\xED |0
+<U01D8> \x8F\xAB\xED |0
+<U01D9> \x8F\xAA\xEF |0
+<U01DA> \x8F\xAB\xEF |0
+<U01DB> \x8F\xAA\xEE |0
+<U01DC> \x8F\xAB\xEE |0
+<U01F5> \x8F\xAB\xB9 |0
+<U02C7> \x8F\xA2\xB0 |0
+<U02D8> \x8F\xA2\xAF |0
+<U02D9> \x8F\xA2\xB2 |0
+<U02DA> \x8F\xA2\xB6 |0
+<U02DB> \x8F\xA2\xB5 |0
+<U02DD> \x8F\xA2\xB3 |0
+<U0384> \x8F\xA2\xB8 |0
+<U0385> \x8F\xA2\xB9 |0
+<U0386> \x8F\xA6\xE1 |0
+<U0388> \x8F\xA6\xE2 |0
+<U0389> \x8F\xA6\xE3 |0
+<U038A> \x8F\xA6\xE4 |0
+<U038C> \x8F\xA6\xE7 |0
+<U038E> \x8F\xA6\xE9 |0
+<U038F> \x8F\xA6\xEC |0
+<U0390> \x8F\xA6\xF6 |0
+<U0391> \xA6\xA1 |0
+<U0392> \xA6\xA2 |0
+<U0393> \xA6\xA3 |0
+<U0394> \xA6\xA4 |0
+<U0395> \xA6\xA5 |0
+<U0396> \xA6\xA6 |0
+<U0397> \xA6\xA7 |0
+<U0398> \xA6\xA8 |0
+<U0399> \xA6\xA9 |0
+<U039A> \xA6\xAA |0
+<U039B> \xA6\xAB |0
+<U039C> \xA6\xAC |0
+<U039D> \xA6\xAD |0
+<U039E> \xA6\xAE |0
+<U039F> \xA6\xAF |0
+<U03A0> \xA6\xB0 |0
+<U03A1> \xA6\xB1 |0
+<U03A3> \xA6\xB2 |0
+<U03A4> \xA6\xB3 |0
+<U03A5> \xA6\xB4 |0
+<U03A6> \xA6\xB5 |0
+<U03A7> \xA6\xB6 |0
+<U03A8> \xA6\xB7 |0
+<U03A9> \xA6\xB8 |0
+<U03AA> \x8F\xA6\xE5 |0
+<U03AB> \x8F\xA6\xEA |0
+<U03AC> \x8F\xA6\xF1 |0
+<U03AD> \x8F\xA6\xF2 |0
+<U03AE> \x8F\xA6\xF3 |0
+<U03AF> \x8F\xA6\xF4 |0
+<U03B0> \x8F\xA6\xFB |0
+<U03B1> \xA6\xC1 |0
+<U03B2> \xA6\xC2 |0
+<U03B3> \xA6\xC3 |0
+<U03B4> \xA6\xC4 |0
+<U03B5> \xA6\xC5 |0
+<U03B6> \xA6\xC6 |0
+<U03B7> \xA6\xC7 |0
+<U03B8> \xA6\xC8 |0
+<U03B9> \xA6\xC9 |0
+<U03BA> \xA6\xCA |0
+<U03BB> \xA6\xCB |0
+<U03BC> \xA6\xCC |0
+<U03BD> \xA6\xCD |0
+<U03BE> \xA6\xCE |0
+<U03BF> \xA6\xCF |0
+<U03C0> \xA6\xD0 |0
+<U03C1> \xA6\xD1 |0
+<U03C2> \x8F\xA6\xF8 |0
+<U03C3> \xA6\xD2 |0
+<U03C4> \xA6\xD3 |0
+<U03C5> \xA6\xD4 |0
+<U03C6> \xA6\xD5 |0
+<U03C7> \xA6\xD6 |0
+<U03C8> \xA6\xD7 |0
+<U03C9> \xA6\xD8 |0
+<U03CA> \x8F\xA6\xF5 |0
+<U03CB> \x8F\xA6\xFA |0
+<U03CC> \x8F\xA6\xF7 |0
+<U03CD> \x8F\xA6\xF9 |0
+<U03CE> \x8F\xA6\xFC |0
+<U0401> \xA7\xA7 |0
+<U0402> \x8F\xA7\xC2 |0
+<U0403> \x8F\xA7\xC3 |0
+<U0404> \x8F\xA7\xC4 |0
+<U0405> \x8F\xA7\xC5 |0
+<U0406> \x8F\xA7\xC6 |0
+<U0407> \x8F\xA7\xC7 |0
+<U0408> \x8F\xA7\xC8 |0
+<U0409> \x8F\xA7\xC9 |0
+<U040A> \x8F\xA7\xCA |0
+<U040B> \x8F\xA7\xCB |0
+<U040C> \x8F\xA7\xCC |0
+<U040E> \x8F\xA7\xCD |0
+<U040F> \x8F\xA7\xCE |0
+<U0410> \xA7\xA1 |0
+<U0411> \xA7\xA2 |0
+<U0412> \xA7\xA3 |0
+<U0413> \xA7\xA4 |0
+<U0414> \xA7\xA5 |0
+<U0415> \xA7\xA6 |0
+<U0416> \xA7\xA8 |0
+<U0417> \xA7\xA9 |0
+<U0418> \xA7\xAA |0
+<U0419> \xA7\xAB |0
+<U041A> \xA7\xAC |0
+<U041B> \xA7\xAD |0
+<U041C> \xA7\xAE |0
+<U041D> \xA7\xAF |0
+<U041E> \xA7\xB0 |0
+<U041F> \xA7\xB1 |0
+<U0420> \xA7\xB2 |0
+<U0421> \xA7\xB3 |0
+<U0422> \xA7\xB4 |0
+<U0423> \xA7\xB5 |0
+<U0424> \xA7\xB6 |0
+<U0425> \xA7\xB7 |0
+<U0426> \xA7\xB8 |0
+<U0427> \xA7\xB9 |0
+<U0428> \xA7\xBA |0
+<U0429> \xA7\xBB |0
+<U042A> \xA7\xBC |0
+<U042B> \xA7\xBD |0
+<U042C> \xA7\xBE |0
+<U042D> \xA7\xBF |0
+<U042E> \xA7\xC0 |0
+<U042F> \xA7\xC1 |0
+<U0430> \xA7\xD1 |0
+<U0431> \xA7\xD2 |0
+<U0432> \xA7\xD3 |0
+<U0433> \xA7\xD4 |0
+<U0434> \xA7\xD5 |0
+<U0435> \xA7\xD6 |0
+<U0436> \xA7\xD8 |0
+<U0437> \xA7\xD9 |0
+<U0438> \xA7\xDA |0
+<U0439> \xA7\xDB |0
+<U043A> \xA7\xDC |0
+<U043B> \xA7\xDD |0
+<U043C> \xA7\xDE |0
+<U043D> \xA7\xDF |0
+<U043E> \xA7\xE0 |0
+<U043F> \xA7\xE1 |0
+<U0440> \xA7\xE2 |0
+<U0441> \xA7\xE3 |0
+<U0442> \xA7\xE4 |0
+<U0443> \xA7\xE5 |0
+<U0444> \xA7\xE6 |0
+<U0445> \xA7\xE7 |0
+<U0446> \xA7\xE8 |0
+<U0447> \xA7\xE9 |0
+<U0448> \xA7\xEA |0
+<U0449> \xA7\xEB |0
+<U044A> \xA7\xEC |0
+<U044B> \xA7\xED |0
+<U044C> \xA7\xEE |0
+<U044D> \xA7\xEF |0
+<U044E> \xA7\xF0 |0
+<U044F> \xA7\xF1 |0
+<U0451> \xA7\xD7 |0
+<U0452> \x8F\xA7\xF2 |0
+<U0453> \x8F\xA7\xF3 |0
+<U0454> \x8F\xA7\xF4 |0
+<U0455> \x8F\xA7\xF5 |0
+<U0456> \x8F\xA7\xF6 |0
+<U0457> \x8F\xA7\xF7 |0
+<U0458> \x8F\xA7\xF8 |0
+<U0459> \x8F\xA7\xF9 |0
+<U045A> \x8F\xA7\xFA |0
+<U045B> \x8F\xA7\xFB |0
+<U045C> \x8F\xA7\xFC |0
+<U045E> \x8F\xA7\xFD |0
+<U045F> \x8F\xA7\xFE |0
+<U2010> \xA1\xBE |0
+<U2014> \xA1\xBD |1
+<U2015> \xA1\xBD |0
+<U2016> \xA1\xC2 |1
+<U2018> \xA1\xC6 |0
+<U2019> \xA1\xC7 |0
+<U201C> \xA1\xC8 |0
+<U201D> \xA1\xC9 |0
+<U2020> \xA2\xF7 |0
+<U2021> \xA2\xF8 |0
+<U2025> \xA1\xC5 |0
+<U2026> \xA1\xC4 |0
+<U2030> \xA2\xF3 |0
+<U2032> \xA1\xEC |0
+<U2033> \xA1\xED |0
+<U203B> \xA2\xA8 |0
+<U203E> \x7E |1
+<U2103> \xA1\xEE |0
+<U2116> \x8F\xA2\xF1 |3
+<U2116> \xAD\xE2 |0
+<U2121> \xAD\xE4 |0
+<U2122> \x8F\xA2\xEF |0
+<U212B> \xA2\xF2 |0
+<U2160> \x8F\xF3\xAB |3
+<U2160> \xAD\xB5 |0
+<U2161> \x8F\xF3\xAC |3
+<U2161> \xAD\xB6 |0
+<U2162> \x8F\xF3\xAD |3
+<U2162> \xAD\xB7 |0
+<U2163> \x8F\xF3\xAE |3
+<U2163> \xAD\xB8 |0
+<U2164> \x8F\xF3\xAF |3
+<U2164> \xAD\xB9 |0
+<U2165> \x8F\xF3\xB0 |3
+<U2165> \xAD\xBA |0
+<U2166> \x8F\xF3\xB1 |3
+<U2166> \xAD\xBB |0
+<U2167> \x8F\xF3\xB2 |3
+<U2167> \xAD\xBC |0
+<U2168> \x8F\xF3\xB3 |3
+<U2168> \xAD\xBD |0
+<U2169> \x8F\xF3\xB4 |3
+<U2169> \xAD\xBE |0
+<U2170> \x8F\xF3\xA1 |3
+<U2170> \xFC\xF1 |0
+<U2171> \x8F\xF3\xA2 |3
+<U2171> \xFC\xF2 |0
+<U2172> \x8F\xF3\xA3 |3
+<U2172> \xFC\xF3 |0
+<U2173> \x8F\xF3\xA4 |3
+<U2173> \xFC\xF4 |0
+<U2174> \x8F\xF3\xA5 |3
+<U2174> \xFC\xF5 |0
+<U2175> \x8F\xF3\xA6 |3
+<U2175> \xFC\xF6 |0
+<U2176> \x8F\xF3\xA7 |3
+<U2176> \xFC\xF7 |0
+<U2177> \x8F\xF3\xA8 |3
+<U2177> \xFC\xF8 |0
+<U2178> \x8F\xF3\xA9 |3
+<U2178> \xFC\xF9 |0
+<U2179> \x8F\xF3\xAA |3
+<U2179> \xFC\xFA |0
+<U2190> \xA2\xAB |0
+<U2191> \xA2\xAC |0
+<U2192> \xA2\xAA |0
+<U2193> \xA2\xAD |0
+<U21D2> \xA2\xCD |0
+<U21D4> \xA2\xCE |0
+<U2200> \xA2\xCF |0
+<U2202> \xA2\xDF |0
+<U2203> \xA2\xD0 |0
+<U2207> \xA2\xE0 |0
+<U2208> \xA2\xBA |0
+<U220B> \xA2\xBB |0
+<U2211> \xAD\xF4 |0
+<U2212> \xA1\xDD |1
+<U221A> \xA2\xE5 |0
+<U221A> \xAD\xF5 |3
+<U221D> \xA2\xE7 |0
+<U221E> \xA1\xE7 |0
+<U221F> \xAD\xF8 |0
+<U2220> \xA2\xDC |0
+<U2220> \xAD\xF7 |3
+<U2225> \xA1\xC2 |0
+<U2227> \xA2\xCA |0
+<U2228> \xA2\xCB |0
+<U2229> \xA2\xC1 |0
+<U2229> \xAD\xFB |3
+<U222A> \xA2\xC0 |0
+<U222A> \xAD\xFC |3
+<U222B> \xA2\xE9 |0
+<U222B> \xAD\xF2 |3
+<U222C> \xA2\xEA |0
+<U222E> \xAD\xF3 |0
+<U2234> \xA1\xE8 |0
+<U2235> \xA2\xE8 |0
+<U2235> \xAD\xFA |3
+<U223D> \xA2\xE6 |0
+<U2252> \xA2\xE2 |0
+<U2252> \xAD\xF0 |3
+<U2260> \xA1\xE2 |0
+<U2261> \xA2\xE1 |0
+<U2261> \xAD\xF1 |3
+<U2266> \xA1\xE5 |0
+<U2267> \xA1\xE6 |0
+<U226A> \xA2\xE3 |0
+<U226B> \xA2\xE4 |0
+<U2282> \xA2\xBE |0
+<U2283> \xA2\xBF |0
+<U2286> \xA2\xBC |0
+<U2287> \xA2\xBD |0
+<U22A5> \xA2\xDD |0
+<U22A5> \xAD\xF6 |3
+<U22BF> \xAD\xF9 |0
+<U22EF> \xA1\xC4 |1
+<U2312> \xA2\xDE |0
+<U2460> \xAD\xA1 |0
+<U2461> \xAD\xA2 |0
+<U2462> \xAD\xA3 |0
+<U2463> \xAD\xA4 |0
+<U2464> \xAD\xA5 |0
+<U2465> \xAD\xA6 |0
+<U2466> \xAD\xA7 |0
+<U2467> \xAD\xA8 |0
+<U2468> \xAD\xA9 |0
+<U2469> \xAD\xAA |0
+<U246A> \xAD\xAB |0
+<U246B> \xAD\xAC |0
+<U246C> \xAD\xAD |0
+<U246D> \xAD\xAE |0
+<U246E> \xAD\xAF |0
+<U246F> \xAD\xB0 |0
+<U2470> \xAD\xB1 |0
+<U2471> \xAD\xB2 |0
+<U2472> \xAD\xB3 |0
+<U2473> \xAD\xB4 |0
+<U2500> \xA8\xA1 |0
+<U2501> \xA8\xAC |0
+<U2502> \xA8\xA2 |0
+<U2503> \xA8\xAD |0
+<U250C> \xA8\xA3 |0
+<U250F> \xA8\xAE |0
+<U2510> \xA8\xA4 |0
+<U2513> \xA8\xAF |0
+<U2514> \xA8\xA6 |0
+<U2517> \xA8\xB1 |0
+<U2518> \xA8\xA5 |0
+<U251B> \xA8\xB0 |0
+<U251C> \xA8\xA7 |0
+<U251D> \xA8\xBC |0
+<U2520> \xA8\xB7 |0
+<U2523> \xA8\xB2 |0
+<U2524> \xA8\xA9 |0
+<U2525> \xA8\xBE |0
+<U2528> \xA8\xB9 |0
+<U252B> \xA8\xB4 |0
+<U252C> \xA8\xA8 |0
+<U252F> \xA8\xB8 |0
+<U2530> \xA8\xBD |0
+<U2533> \xA8\xB3 |0
+<U2534> \xA8\xAA |0
+<U2537> \xA8\xBA |0
+<U2538> \xA8\xBF |0
+<U253B> \xA8\xB5 |0
+<U253C> \xA8\xAB |0
+<U253F> \xA8\xBB |0
+<U2542> \xA8\xC0 |0
+<U254B> \xA8\xB6 |0
+<U25A0> \xA2\xA3 |0
+<U25A1> \xA2\xA2 |0
+<U25B2> \xA2\xA5 |0
+<U25B3> \xA2\xA4 |0
+<U25BC> \xA2\xA7 |0
+<U25BD> \xA2\xA6 |0
+<U25C6> \xA2\xA1 |0
+<U25C7> \xA1\xFE |0
+<U25CB> \xA1\xFB |0
+<U25CE> \xA1\xFD |0
+<U25CF> \xA1\xFC |0
+<U25EF> \xA2\xFE |0
+<U2605> \xA1\xFA |0
+<U2606> \xA1\xF9 |0
+<U2640> \xA1\xEA |0
+<U2642> \xA1\xE9 |0
+<U266A> \xA2\xF6 |0
+<U266D> \xA2\xF5 |0
+<U266F> \xA2\xF4 |0
+<U3000> \xA1\xA1 |0
+<U3001> \xA1\xA2 |0
+<U3002> \xA1\xA3 |0
+<U3003> \xA1\xB7 |0
+<U3005> \xA1\xB9 |0
+<U3006> \xA1\xBA |0
+<U3007> \xA1\xBB |0
+<U3008> \xA1\xD2 |0
+<U3009> \xA1\xD3 |0
+<U300A> \xA1\xD4 |0
+<U300B> \xA1\xD5 |0
+<U300C> \xA1\xD6 |0
+<U300D> \xA1\xD7 |0
+<U300E> \xA1\xD8 |0
+<U300F> \xA1\xD9 |0
+<U3010> \xA1\xDA |0
+<U3011> \xA1\xDB |0
+<U3012> \xA2\xA9 |0
+<U3013> \xA2\xAE |0
+<U3014> \xA1\xCC |0
+<U3015> \xA1\xCD |0
+<U301C> \xA1\xC1 |1
+<U301D> \xAD\xE0 |0
+<U301F> \xAD\xE1 |0
+<U3041> \xA4\xA1 |0
+<U3042> \xA4\xA2 |0
+<U3043> \xA4\xA3 |0
+<U3044> \xA4\xA4 |0
+<U3045> \xA4\xA5 |0
+<U3046> \xA4\xA6 |0
+<U3047> \xA4\xA7 |0
+<U3048> \xA4\xA8 |0
+<U3049> \xA4\xA9 |0
+<U304A> \xA4\xAA |0
+<U304B> \xA4\xAB |0
+<U304C> \xA4\xAC |0
+<U304D> \xA4\xAD |0
+<U304E> \xA4\xAE |0
+<U304F> \xA4\xAF |0
+<U3050> \xA4\xB0 |0
+<U3051> \xA4\xB1 |0
+<U3052> \xA4\xB2 |0
+<U3053> \xA4\xB3 |0
+<U3054> \xA4\xB4 |0
+<U3055> \xA4\xB5 |0
+<U3056> \xA4\xB6 |0
+<U3057> \xA4\xB7 |0
+<U3058> \xA4\xB8 |0
+<U3059> \xA4\xB9 |0
+<U305A> \xA4\xBA |0
+<U305B> \xA4\xBB |0
+<U305C> \xA4\xBC |0
+<U305D> \xA4\xBD |0
+<U305E> \xA4\xBE |0
+<U305F> \xA4\xBF |0
+<U3060> \xA4\xC0 |0
+<U3061> \xA4\xC1 |0
+<U3062> \xA4\xC2 |0
+<U3063> \xA4\xC3 |0
+<U3064> \xA4\xC4 |0
+<U3065> \xA4\xC5 |0
+<U3066> \xA4\xC6 |0
+<U3067> \xA4\xC7 |0
+<U3068> \xA4\xC8 |0
+<U3069> \xA4\xC9 |0
+<U306A> \xA4\xCA |0
+<U306B> \xA4\xCB |0
+<U306C> \xA4\xCC |0
+<U306D> \xA4\xCD |0
+<U306E> \xA4\xCE |0
+<U306F> \xA4\xCF |0
+<U3070> \xA4\xD0 |0
+<U3071> \xA4\xD1 |0
+<U3072> \xA4\xD2 |0
+<U3073> \xA4\xD3 |0
+<U3074> \xA4\xD4 |0
+<U3075> \xA4\xD5 |0
+<U3076> \xA4\xD6 |0
+<U3077> \xA4\xD7 |0
+<U3078> \xA4\xD8 |0
+<U3079> \xA4\xD9 |0
+<U307A> \xA4\xDA |0
+<U307B> \xA4\xDB |0
+<U307C> \xA4\xDC |0
+<U307D> \xA4\xDD |0
+<U307E> \xA4\xDE |0
+<U307F> \xA4\xDF |0
+<U3080> \xA4\xE0 |0
+<U3081> \xA4\xE1 |0
+<U3082> \xA4\xE2 |0
+<U3083> \xA4\xE3 |0
+<U3084> \xA4\xE4 |0
+<U3085> \xA4\xE5 |0
+<U3086> \xA4\xE6 |0
+<U3087> \xA4\xE7 |0
+<U3088> \xA4\xE8 |0
+<U3089> \xA4\xE9 |0
+<U308A> \xA4\xEA |0
+<U308B> \xA4\xEB |0
+<U308C> \xA4\xEC |0
+<U308D> \xA4\xED |0
+<U308E> \xA4\xEE |0
+<U308F> \xA4\xEF |0
+<U3090> \xA4\xF0 |0
+<U3091> \xA4\xF1 |0
+<U3092> \xA4\xF2 |0
+<U3093> \xA4\xF3 |0
+<U309B> \xA1\xAB |0
+<U309C> \xA1\xAC |0
+<U309D> \xA1\xB5 |0
+<U309E> \xA1\xB6 |0
+<U30A1> \xA5\xA1 |0
+<U30A2> \xA5\xA2 |0
+<U30A3> \xA5\xA3 |0
+<U30A4> \xA5\xA4 |0
+<U30A5> \xA5\xA5 |0
+<U30A6> \xA5\xA6 |0
+<U30A7> \xA5\xA7 |0
+<U30A8> \xA5\xA8 |0
+<U30A9> \xA5\xA9 |0
+<U30AA> \xA5\xAA |0
+<U30AB> \xA5\xAB |0
+<U30AC> \xA5\xAC |0
+<U30AD> \xA5\xAD |0
+<U30AE> \xA5\xAE |0
+<U30AF> \xA5\xAF |0
+<U30B0> \xA5\xB0 |0
+<U30B1> \xA5\xB1 |0
+<U30B2> \xA5\xB2 |0
+<U30B3> \xA5\xB3 |0
+<U30B4> \xA5\xB4 |0
+<U30B5> \xA5\xB5 |0
+<U30B6> \xA5\xB6 |0
+<U30B7> \xA5\xB7 |0
+<U30B8> \xA5\xB8 |0
+<U30B9> \xA5\xB9 |0
+<U30BA> \xA5\xBA |0
+<U30BB> \xA5\xBB |0
+<U30BC> \xA5\xBC |0
+<U30BD> \xA5\xBD |0
+<U30BE> \xA5\xBE |0
+<U30BF> \xA5\xBF |0
+<U30C0> \xA5\xC0 |0
+<U30C1> \xA5\xC1 |0
+<U30C2> \xA5\xC2 |0
+<U30C3> \xA5\xC3 |0
+<U30C4> \xA5\xC4 |0
+<U30C5> \xA5\xC5 |0
+<U30C6> \xA5\xC6 |0
+<U30C7> \xA5\xC7 |0
+<U30C8> \xA5\xC8 |0
+<U30C9> \xA5\xC9 |0
+<U30CA> \xA5\xCA |0
+<U30CB> \xA5\xCB |0
+<U30CC> \xA5\xCC |0
+<U30CD> \xA5\xCD |0
+<U30CE> \xA5\xCE |0
+<U30CF> \xA5\xCF |0
+<U30D0> \xA5\xD0 |0
+<U30D1> \xA5\xD1 |0
+<U30D2> \xA5\xD2 |0
+<U30D3> \xA5\xD3 |0
+<U30D4> \xA5\xD4 |0
+<U30D5> \xA5\xD5 |0
+<U30D6> \xA5\xD6 |0
+<U30D7> \xA5\xD7 |0
+<U30D8> \xA5\xD8 |0
+<U30D9> \xA5\xD9 |0
+<U30DA> \xA5\xDA |0
+<U30DB> \xA5\xDB |0
+<U30DC> \xA5\xDC |0
+<U30DD> \xA5\xDD |0
+<U30DE> \xA5\xDE |0
+<U30DF> \xA5\xDF |0
+<U30E0> \xA5\xE0 |0
+<U30E1> \xA5\xE1 |0
+<U30E2> \xA5\xE2 |0
+<U30E3> \xA5\xE3 |0
+<U30E4> \xA5\xE4 |0
+<U30E5> \xA5\xE5 |0
+<U30E6> \xA5\xE6 |0
+<U30E7> \xA5\xE7 |0
+<U30E8> \xA5\xE8 |0
+<U30E9> \xA5\xE9 |0
+<U30EA> \xA5\xEA |0
+<U30EB> \xA5\xEB |0
+<U30EC> \xA5\xEC |0
+<U30ED> \xA5\xED |0
+<U30EE> \xA5\xEE |0
+<U30EF> \xA5\xEF |0
+<U30F0> \xA5\xF0 |0
+<U30F1> \xA5\xF1 |0
+<U30F2> \xA5\xF2 |0
+<U30F3> \xA5\xF3 |0
+<U30F4> \xA5\xF4 |0
+<U30F5> \xA5\xF5 |0
+<U30F6> \xA5\xF6 |0
+<U30FB> \xA1\xA6 |0
+<U30FC> \xA1\xBC |0
+<U30FD> \xA1\xB3 |0
+<U30FE> \xA1\xB4 |0
+<U3231> \xAD\xEA |0
+<U3231> \x8F\xF3\xB7 |3
+<U3232> \xAD\xEB |0
+<U3239> \xAD\xEC |0
+<U32A4> \xAD\xE5 |0
+<U32A5> \xAD\xE6 |0
+<U32A6> \xAD\xE7 |0
+<U32A7> \xAD\xE8 |0
+<U32A8> \xAD\xE9 |0
+<U3303> \xAD\xC6 |0
+<U330D> \xAD\xCA |0
+<U3314> \xAD\xC1 |0
+<U3318> \xAD\xC4 |0
+<U3322> \xAD\xC2 |0
+<U3323> \xAD\xCC |0
+<U3326> \xAD\xCB |0
+<U3327> \xAD\xC5 |0
+<U332B> \xAD\xCD |0
+<U3336> \xAD\xC7 |0
+<U333B> \xAD\xCF |0
+<U3349> \xAD\xC0 |0
+<U334A> \xAD\xCE |0
+<U334D> \xAD\xC3 |0
+<U3351> \xAD\xC8 |0
+<U3357> \xAD\xC9 |0
+<U337B> \xAD\xDF |0
+<U337C> \xAD\xEF |0
+<U337D> \xAD\xEE |0
+<U337E> \xAD\xED |0
+<U338E> \xAD\xD3 |0
+<U338F> \xAD\xD4 |0
+<U339C> \xAD\xD0 |0
+<U339D> \xAD\xD1 |0
+<U339E> \xAD\xD2 |0
+<U33A1> \xAD\xD6 |0
+<U33C4> \xAD\xD5 |0
+<U33CD> \xAD\xE3 |0
+<U4E00> \xB0\xEC |0
+<U4E01> \xC3\xFA |0
+<U4E02> \x8F\xB0\xA1 |0
+<U4E03> \xBC\xB7 |0
+<U4E04> \x8F\xB0\xA2 |0
+<U4E05> \x8F\xB0\xA3 |0
+<U4E07> \xCB\xFC |0
+<U4E08> \xBE\xE6 |0
+<U4E09> \xBB\xB0 |0
+<U4E0A> \xBE\xE5 |0
+<U4E0B> \xB2\xBC |0
+<U4E0C> \x8F\xB0\xA4 |0
+<U4E0D> \xC9\xD4 |0
+<U4E0E> \xCD\xBF |0
+<U4E10> \xD0\xA2 |0
+<U4E11> \xB1\xAF |0
+<U4E12> \x8F\xB0\xA5 |0
+<U4E14> \xB3\xEE |0
+<U4E15> \xD0\xA3 |0
+<U4E16> \xC0\xA4 |0
+<U4E17> \xD2\xC2 |0
+<U4E18> \xB5\xD6 |0
+<U4E19> \xCA\xBA |0
+<U4E1E> \xBE\xE7 |0
+<U4E1F> \x8F\xB0\xA6 |0
+<U4E21> \xCE\xBE |0
+<U4E23> \x8F\xB0\xA7 |0
+<U4E24> \x8F\xB0\xA8 |0
+<U4E26> \xCA\xC2 |0
+<U4E28> \x8F\xB0\xA9 |3
+<U4E28> \xF9\xAD |0
+<U4E2A> \xD0\xA4 |0
+<U4E2B> \x8F\xB0\xAA |0
+<U4E2D> \xC3\xE6 |0
+<U4E2E> \x8F\xB0\xAB |0
+<U4E2F> \x8F\xB0\xAC |0
+<U4E30> \x8F\xB0\xAD |0
+<U4E31> \xD0\xA5 |0
+<U4E32> \xB6\xFA |0
+<U4E35> \x8F\xB0\xAE |0
+<U4E36> \xD0\xA6 |0
+<U4E38> \xB4\xDD |0
+<U4E39> \xC3\xB0 |0
+<U4E3B> \xBC\xE7 |0
+<U4E3C> \xD0\xA7 |0
+<U4E3F> \xD0\xA8 |0
+<U4E40> \x8F\xB0\xAF |0
+<U4E41> \x8F\xB0\xB0 |0
+<U4E42> \xD0\xA9 |0
+<U4E43> \xC7\xB5 |0
+<U4E44> \x8F\xB0\xB1 |0
+<U4E45> \xB5\xD7 |0
+<U4E47> \x8F\xB0\xB2 |0
+<U4E4B> \xC7\xB7 |0
+<U4E4D> \xC6\xE3 |0
+<U4E4E> \xB8\xC3 |0
+<U4E4F> \xCB\xB3 |0
+<U4E51> \x8F\xB0\xB3 |0
+<U4E55> \xE9\xC9 |0
+<U4E56> \xD0\xAA |0
+<U4E57> \xBE\xE8 |0
+<U4E58> \xD0\xAB |0
+<U4E59> \xB2\xB5 |0
+<U4E5A> \x8F\xB0\xB4 |0
+<U4E5C> \x8F\xB0\xB5 |0
+<U4E5D> \xB6\xE5 |0
+<U4E5E> \xB8\xF0 |0
+<U4E5F> \xCC\xE9 |0
+<U4E62> \xD6\xA6 |0
+<U4E63> \x8F\xB0\xB6 |0
+<U4E68> \x8F\xB0\xB7 |0
+<U4E69> \x8F\xB0\xB8 |0
+<U4E71> \xCD\xF0 |0
+<U4E73> \xC6\xFD |0
+<U4E74> \x8F\xB0\xB9 |0
+<U4E75> \x8F\xB0\xBA |0
+<U4E79> \x8F\xB0\xBB |0
+<U4E7E> \xB4\xA5 |0
+<U4E7F> \x8F\xB0\xBC |0
+<U4E80> \xB5\xB5 |0
+<U4E82> \xD0\xAC |0
+<U4E85> \xD0\xAD |0
+<U4E86> \xCE\xBB |0
+<U4E88> \xCD\xBD |0
+<U4E89> \xC1\xE8 |0
+<U4E8A> \xD0\xAF |0
+<U4E8B> \xBB\xF6 |0
+<U4E8C> \xC6\xF3 |0
+<U4E8D> \x8F\xB0\xBD |0
+<U4E8E> \xD0\xB2 |0
+<U4E91> \xB1\xBE |0
+<U4E92> \xB8\xDF |0
+<U4E94> \xB8\xDE |0
+<U4E95> \xB0\xE6 |0
+<U4E96> \x8F\xB0\xBE |0
+<U4E97> \x8F\xB0\xBF |0
+<U4E98> \xCF\xCB |0
+<U4E99> \xCF\xCA |0
+<U4E9B> \xBA\xB3 |0
+<U4E9C> \xB0\xA1 |0
+<U4E9D> \x8F\xB0\xC0 |0
+<U4E9E> \xD0\xB3 |0
+<U4E9F> \xD0\xB4 |0
+<U4EA0> \xD0\xB5 |0
+<U4EA1> \xCB\xB4 |0
+<U4EA2> \xD0\xB6 |0
+<U4EA4> \xB8\xF2 |0
+<U4EA5> \xB0\xE7 |0
+<U4EA6> \xCB\xF2 |0
+<U4EA8> \xB5\xFC |0
+<U4EAB> \xB5\xFD |0
+<U4EAC> \xB5\xFE |0
+<U4EAD> \xC4\xE2 |0
+<U4EAE> \xCE\xBC |0
+<U4EAF> \x8F\xB0\xC1 |0
+<U4EB0> \xD0\xB7 |0
+<U4EB3> \xD0\xB8 |0
+<U4EB6> \xD0\xB9 |0
+<U4EB9> \x8F\xB0\xC2 |0
+<U4EBA> \xBF\xCD |0
+<U4EC0> \xBD\xBA |0
+<U4EC1> \xBF\xCE |0
+<U4EC2> \xD0\xBE |0
+<U4EC3> \x8F\xB0\xC3 |0
+<U4EC4> \xD0\xBC |0
+<U4EC6> \xD0\xBD |0
+<U4EC7> \xB5\xD8 |0
+<U4ECA> \xBA\xA3 |0
+<U4ECB> \xB2\xF0 |0
+<U4ECD> \xD0\xBB |0
+<U4ECE> \xD0\xBA |0
+<U4ECF> \xCA\xA9 |0
+<U4ED0> \x8F\xB0\xC4 |0
+<U4ED4> \xBB\xC6 |0
+<U4ED5> \xBB\xC5 |0
+<U4ED6> \xC2\xBE |0
+<U4ED7> \xD0\xBF |0
+<U4ED8> \xC9\xD5 |0
+<U4ED9> \xC0\xE7 |0
+<U4EDA> \x8F\xB0\xC5 |0
+<U4EDB> \x8F\xB0\xC6 |0
+<U4EDD> \xA1\xB8 |0
+<U4EDE> \xD0\xC0 |0
+<U4EDF> \xD0\xC2 |0
+<U4EE0> \x8F\xB0\xC7 |0
+<U4EE1> \x8F\xB0\xC8 |3
+<U4EE1> \xF9\xAE |0
+<U4EE2> \x8F\xB0\xC9 |0
+<U4EE3> \xC2\xE5 |0
+<U4EE4> \xCE\xE1 |0
+<U4EE5> \xB0\xCA |0
+<U4EE8> \x8F\xB0\xCA |0
+<U4EED> \xD0\xC1 |0
+<U4EEE> \xB2\xBE |0
+<U4EEF> \x8F\xB0\xCB |0
+<U4EF0> \xB6\xC4 |0
+<U4EF1> \x8F\xB0\xCC |0
+<U4EF2> \xC3\xE7 |0
+<U4EF3> \x8F\xB0\xCD |0
+<U4EF5> \x8F\xB0\xCE |0
+<U4EF6> \xB7\xEF |0
+<U4EF7> \xD0\xC3 |0
+<U4EFB> \xC7\xA4 |0
+<U4EFC> \xF9\xAF |0
+<U4EFD> \x8F\xB0\xCF |0
+<U4EFE> \x8F\xB0\xD0 |0
+<U4EFF> \x8F\xB0\xD1 |0
+<U4F00> \x8F\xB0\xD2 |3
+<U4F00> \xF9\xB0 |0
+<U4F01> \xB4\xEB |0
+<U4F02> \x8F\xB0\xD3 |0
+<U4F03> \x8F\xB0\xD4 |3
+<U4F03> \xF9\xB1 |0
+<U4F08> \x8F\xB0\xD5 |0
+<U4F09> \xD0\xC4 |0
+<U4F0A> \xB0\xCB |0
+<U4F0B> \x8F\xB0\xD6 |0
+<U4F0C> \x8F\xB0\xD7 |0
+<U4F0D> \xB8\xE0 |0
+<U4F0E> \xB4\xEC |0
+<U4F0F> \xC9\xFA |0
+<U4F10> \xC8\xB2 |0
+<U4F11> \xB5\xD9 |0
+<U4F12> \x8F\xB0\xD8 |0
+<U4F15> \x8F\xB0\xD9 |0
+<U4F16> \x8F\xB0\xDA |0
+<U4F17> \x8F\xB0\xDB |0
+<U4F19> \x8F\xB0\xDC |0
+<U4F1A> \xB2\xF1 |0
+<U4F1C> \xD0\xE7 |0
+<U4F1D> \xC5\xC1 |0
+<U4F2E> \x8F\xB0\xDD |0
+<U4F2F> \xC7\xEC |0
+<U4F30> \xD0\xC6 |0
+<U4F31> \x8F\xB0\xDE |0
+<U4F33> \x8F\xB0\xE0 |0
+<U4F34> \xC8\xBC |0
+<U4F35> \x8F\xB0\xE1 |0
+<U4F36> \xCE\xE2 |0
+<U4F37> \x8F\xB0\xE2 |0
+<U4F38> \xBF\xAD |0
+<U4F39> \x8F\xB0\xE3 |3
+<U4F39> \xF9\xB2 |0
+<U4F3A> \xBB\xC7 |0
+<U4F3B> \x8F\xB0\xE4 |0
+<U4F3C> \xBB\xF7 |0
+<U4F3D> \xB2\xC0 |0
+<U4F3E> \x8F\xB0\xE5 |0
+<U4F40> \x8F\xB0\xE6 |0
+<U4F42> \x8F\xB0\xE7 |0
+<U4F43> \xC4\xD1 |0
+<U4F46> \xC3\xA2 |0
+<U4F47> \xD0\xCA |0
+<U4F48> \x8F\xB0\xE8 |0
+<U4F49> \x8F\xB0\xE9 |0
+<U4F4B> \x8F\xB0\xEA |0
+<U4F4C> \x8F\xB0\xEB |0
+<U4F4D> \xB0\xCC |0
+<U4F4E> \xC4\xE3 |0
+<U4F4F> \xBD\xBB |0
+<U4F50> \xBA\xB4 |0
+<U4F51> \xCD\xA4 |0
+<U4F52> \x8F\xB0\xEC |0
+<U4F53> \xC2\xCE |0
+<U4F54> \x8F\xB0\xED |0
+<U4F55> \xB2\xBF |0
+<U4F56> \x8F\xB0\xEE |3
+<U4F56> \xF9\xB3 |0
+<U4F57> \xD0\xC9 |0
+<U4F58> \x8F\xB0\xEF |0
+<U4F59> \xCD\xBE |0
+<U4F5A> \xD0\xC5 |0
+<U4F5B> \xD0\xC7 |0
+<U4F5C> \xBA\xEE |0
+<U4F5D> \xD0\xC8 |0
+<U4F5E> \xD5\xA4 |0
+<U4F5F> \x8F\xB0\xF0 |0
+<U4F60> \x8F\xB0\xDF |0
+<U4F63> \x8F\xB0\xF1 |0
+<U4F69> \xD0\xD0 |0
+<U4F6A> \x8F\xB0\xF2 |0
+<U4F6C> \x8F\xB0\xF3 |0
+<U4F6E> \x8F\xB0\xF4 |0
+<U4F6F> \xD0\xD3 |0
+<U4F70> \xD0\xD1 |0
+<U4F71> \x8F\xB0\xF5 |0
+<U4F73> \xB2\xC2 |0
+<U4F75> \xCA\xBB |0
+<U4F76> \xD0\xCB |0
+<U4F77> \x8F\xB0\xF6 |0
+<U4F78> \x8F\xB0\xF7 |0
+<U4F79> \x8F\xB0\xF8 |0
+<U4F7A> \x8F\xB0\xF9 |0
+<U4F7B> \xD0\xCF |0
+<U4F7C> \xB8\xF3 |0
+<U4F7D> \x8F\xB0\xFA |0
+<U4F7E> \x8F\xB0\xFB |0
+<U4F7F> \xBB\xC8 |0
+<U4F81> \x8F\xB0\xFC |0
+<U4F82> \x8F\xB0\xFD |0
+<U4F83> \xB4\xA6 |0
+<U4F84> \x8F\xB0\xFE |0
+<U4F85> \x8F\xB1\xA1 |0
+<U4F86> \xD0\xD4 |0
+<U4F88> \xD0\xCC |0
+<U4F89> \x8F\xB1\xA2 |0
+<U4F8A> \x8F\xB1\xA3 |3
+<U4F8A> \xF9\xB5 |0
+<U4F8B> \xCE\xE3 |0
+<U4F8C> \x8F\xB1\xA4 |0
+<U4F8D> \xBB\xF8 |0
+<U4F8E> \x8F\xB1\xA5 |0
+<U4F8F> \xD0\xCD |0
+<U4F90> \x8F\xB1\xA6 |0
+<U4F91> \xD0\xD2 |0
+<U4F92> \x8F\xB1\xA7 |3
+<U4F92> \xF9\xB4 |0
+<U4F93> \x8F\xB1\xA8 |0
+<U4F94> \x8F\xB1\xA9 |3
+<U4F94> \xF9\xB7 |0
+<U4F96> \xD0\xD5 |0
+<U4F97> \x8F\xB1\xAA |0
+<U4F98> \xD0\xCE |0
+<U4F99> \x8F\xB1\xAB |0
+<U4F9A> \x8F\xB1\xAC |3
+<U4F9A> \xF9\xB6 |0
+<U4F9B> \xB6\xA1 |0
+<U4F9D> \xB0\xCD |0
+<U4F9E> \x8F\xB1\xAD |0
+<U4F9F> \x8F\xB1\xAE |0
+<U4FA0> \xB6\xA2 |0
+<U4FA1> \xB2\xC1 |0
+<U4FAB> \xD5\xA5 |0
+<U4FAD> \xCB\xF9 |0
+<U4FAE> \xC9\xEE |0
+<U4FAF> \xB8\xF4 |0
+<U4FB2> \x8F\xB1\xAF |0
+<U4FB5> \xBF\xAF |0
+<U4FB6> \xCE\xB7 |0
+<U4FB7> \x8F\xB1\xB0 |0
+<U4FB9> \x8F\xB1\xB1 |0
+<U4FBB> \x8F\xB1\xB2 |0
+<U4FBC> \x8F\xB1\xB3 |0
+<U4FBD> \x8F\xB1\xB4 |0
+<U4FBE> \x8F\xB1\xB5 |0
+<U4FBF> \xCA\xD8 |0
+<U4FC0> \x8F\xB1\xB6 |0
+<U4FC1> \x8F\xB1\xB7 |0
+<U4FC2> \xB7\xB8 |0
+<U4FC3> \xC2\xA5 |0
+<U4FC4> \xB2\xE4 |0
+<U4FC5> \x8F\xB1\xB8 |0
+<U4FC6> \x8F\xB1\xB9 |0
+<U4FC8> \x8F\xB1\xBA |0
+<U4FC9> \x8F\xB1\xBB |3
+<U4FC9> \xF9\xA6 |0
+<U4FCA> \xBD\xD3 |0
+<U4FCB> \x8F\xB1\xBC |0
+<U4FCC> \x8F\xB1\xBD |0
+<U4FCD> \x8F\xB1\xBE |3
+<U4FCD> \xF9\xB8 |0
+<U4FCE> \xD0\xD9 |0
+<U4FCF> \x8F\xB1\xBF |0
+<U4FD0> \xD0\xDE |0
+<U4FD1> \xD0\xDC |0
+<U4FD2> \x8F\xB1\xC0 |0
+<U4FD4> \xD0\xD7 |0
+<U4FD7> \xC2\xAF |0
+<U4FD8> \xD0\xDA |0
+<U4FDA> \xD0\xDD |0
+<U4FDB> \xD0\xDB |0
+<U4FDC> \x8F\xB1\xC1 |0
+<U4FDD> \xCA\xDD |0
+<U4FDF> \xD0\xD8 |0
+<U4FE0> \x8F\xB1\xC2 |0
+<U4FE1> \xBF\xAE |0
+<U4FE2> \x8F\xB1\xC3 |0
+<U4FE3> \xCB\xF3 |0
+<U4FE4> \xD0\xDF |0
+<U4FE5> \xD0\xE0 |0
+<U4FEE> \xBD\xA4 |0
+<U4FEF> \xD0\xED |0
+<U4FF0> \x8F\xB1\xC4 |0
+<U4FF2> \x8F\xB1\xC5 |0
+<U4FF3> \xC7\xD0 |0
+<U4FF5> \xC9\xB6 |0
+<U4FF6> \xD0\xE8 |0
+<U4FF8> \xCA\xF0 |0
+<U4FFA> \xB2\xB6 |0
+<U4FFC> \x8F\xB1\xC6 |0
+<U4FFD> \x8F\xB1\xC7 |0
+<U4FFE> \xD0\xEC |0
+<U4FFF> \x8F\xB1\xC8 |3
+<U4FFF> \xF9\xBB |0
+<U5000> \x8F\xB1\xC9 |0
+<U5001> \x8F\xB1\xCA |0
+<U5004> \x8F\xB1\xCB |0
+<U5005> \xD0\xE6 |0
+<U5006> \xD0\xEF |0
+<U5007> \x8F\xB1\xCC |0
+<U5009> \xC1\xD2 |0
+<U500A> \x8F\xB1\xCD |0
+<U500B> \xB8\xC4 |0
+<U500C> \x8F\xB1\xCE |0
+<U500D> \xC7\xDC |0
+<U500E> \x8F\xB1\xCF |0
+<U500F> \xE0\xC7 |0
+<U5010> \x8F\xB1\xD0 |0
+<U5011> \xD0\xEE |0
+<U5012> \xC5\xDD |0
+<U5013> \x8F\xB1\xD1 |0
+<U5014> \xD0\xE3 |0
+<U5016> \xB8\xF6 |0
+<U5017> \x8F\xB1\xD2 |0
+<U5018> \x8F\xB1\xD3 |0
+<U5019> \xB8\xF5 |0
+<U501A> \xD0\xE1 |0
+<U501B> \x8F\xB1\xD4 |0
+<U501C> \x8F\xB1\xD5 |0
+<U501D> \x8F\xB1\xD6 |0
+<U501E> \x8F\xB1\xD7 |3
+<U501E> \xF9\xBC |0
+<U501F> \xBC\xDA |0
+<U5021> \xD0\xE9 |0
+<U5022> \x8F\xB1\xD8 |3
+<U5022> \xF9\xBA |0
+<U5023> \xCA\xEF |0
+<U5024> \xC3\xCD |0
+<U5025> \xD0\xE5 |0
+<U5026> \xB7\xF1 |0
+<U5027> \x8F\xB1\xD9 |0
+<U5028> \xD0\xE2 |0
+<U5029> \xD0\xEA |0
+<U502A> \xD0\xE4 |0
+<U502B> \xCE\xD1 |0
+<U502C> \xD0\xEB |0
+<U502D> \xCF\xC1 |0
+<U502E> \x8F\xB1\xDA |0
+<U5030> \x8F\xB1\xDB |0
+<U5032> \x8F\xB1\xDC |0
+<U5033> \x8F\xB1\xDD |0
+<U5035> \x8F\xB1\xDE |0
+<U5036> \xB6\xE6 |0
+<U5039> \xB7\xF0 |0
+<U503B> \x8F\xB1\xF6 |0
+<U5040> \x8F\xB1\xDF |3
+<U5040> \xF9\xB9 |0
+<U5041> \x8F\xB1\xE0 |0
+<U5042> \x8F\xB1\xE1 |3
+<U5042> \xF9\xBF |0
+<U5043> \xD0\xF0 |0
+<U5045> \x8F\xB1\xE2 |0
+<U5046> \x8F\xB1\xE3 |3
+<U5046> \xF9\xBD |0
+<U5047> \xD0\xF1 |0
+<U5048> \xD0\xF5 |0
+<U5049> \xB0\xCE |0
+<U504A> \x8F\xB1\xE4 |0
+<U504C> \x8F\xB1\xE5 |0
+<U504E> \x8F\xB1\xE6 |0
+<U504F> \xCA\xD0 |0
+<U5050> \xD0\xF4 |0
+<U5051> \x8F\xB1\xE7 |0
+<U5052> \x8F\xB1\xE8 |0
+<U5053> \x8F\xB1\xE9 |0
+<U5055> \xD0\xF3 |0
+<U5056> \xD0\xF7 |0
+<U5057> \x8F\xB1\xEA |0
+<U5059> \x8F\xB1\xEB |0
+<U505A> \xD0\xF6 |0
+<U505C> \xC4\xE4 |0
+<U505F> \x8F\xB1\xEC |0
+<U5060> \x8F\xB1\xED |0
+<U5062> \x8F\xB1\xEE |0
+<U5063> \x8F\xB1\xEF |0
+<U5065> \xB7\xF2 |0
+<U5066> \x8F\xB1\xF0 |0
+<U5067> \x8F\xB1\xF1 |0
+<U506A> \x8F\xB1\xF2 |0
+<U506C> \xD0\xF8 |0
+<U506D> \x8F\xB1\xF3 |0
+<U5070> \x8F\xB1\xF4 |3
+<U5070> \xF9\xBE |0
+<U5071> \x8F\xB1\xF5 |0
+<U5072> \xBC\xC5 |0
+<U5074> \xC2\xA6 |0
+<U5075> \xC4\xE5 |0
+<U5076> \xB6\xF6 |0
+<U5078> \xD0\xF9 |0
+<U507D> \xB5\xB6 |0
+<U5080> \xD0\xFA |0
+<U5081> \x8F\xB1\xF7 |0
+<U5083> \x8F\xB1\xF8 |0
+<U5084> \x8F\xB1\xF9 |0
+<U5085> \xD0\xFC |0
+<U5086> \x8F\xB1\xFA |0
+<U508A> \x8F\xB1\xFB |0
+<U508D> \xCB\xB5 |0
+<U508E> \x8F\xB1\xFC |0
+<U508F> \x8F\xB1\xFD |0
+<U5090> \x8F\xB1\xFE |0
+<U5091> \xB7\xE6 |0
+<U5092> \x8F\xB2\xA1 |0
+<U5093> \x8F\xB2\xA2 |0
+<U5094> \x8F\xB2\xA3 |3
+<U5094> \xF9\xC0 |0
+<U5096> \x8F\xB2\xA4 |0
+<U5098> \xBB\xB1 |0
+<U5099> \xC8\xF7 |0
+<U509A> \xD0\xFB |0
+<U509B> \x8F\xB2\xA5 |0
+<U509C> \x8F\xB2\xA6 |0
+<U509E> \x8F\xB2\xA7 |0
+<U509F> \x8F\xB2\xA8 |0
+<U50A0> \x8F\xB2\xA9 |0
+<U50A1> \x8F\xB2\xAA |0
+<U50A2> \x8F\xB2\xAB |0
+<U50AA> \x8F\xB2\xAC |0
+<U50AC> \xBA\xC5 |0
+<U50AD> \xCD\xC3 |0
+<U50AF> \x8F\xB2\xAD |0
+<U50B0> \x8F\xB2\xAE |0
+<U50B2> \xD0\xFE |0
+<U50B3> \xD1\xA3 |0
+<U50B4> \xD0\xFD |0
+<U50B5> \xBA\xC4 |0
+<U50B7> \xBD\xFD |0
+<U50B9> \x8F\xB2\xAF |0
+<U50BA> \x8F\xB2\xB0 |0
+<U50BD> \x8F\xB2\xB1 |0
+<U50BE> \xB7\xB9 |0
+<U50C0> \x8F\xB2\xB2 |0
+<U50C2> \xD1\xA4 |0
+<U50C3> \x8F\xB2\xB3 |0
+<U50C4> \x8F\xB2\xB4 |0
+<U50C5> \xB6\xCF |0
+<U50C7> \x8F\xB2\xB5 |0
+<U50C9> \xD1\xA1 |0
+<U50CA> \xD1\xA2 |0
+<U50CC> \x8F\xB2\xB6 |0
+<U50CD> \xC6\xAF |0
+<U50CE> \x8F\xB2\xB7 |0
+<U50CF> \xC1\xFC |0
+<U50D0> \x8F\xB2\xB8 |0
+<U50D1> \xB6\xA3 |0
+<U50D3> \x8F\xB2\xB9 |0
+<U50D4> \x8F\xB2\xBA |0
+<U50D5> \xCB\xCD |0
+<U50D6> \xD1\xA5 |0
+<U50D8> \x8F\xB2\xBB |3
+<U50D8> \xF9\xC2 |0
+<U50DA> \xCE\xBD |0
+<U50DC> \x8F\xB2\xBC |0
+<U50DD> \x8F\xB2\xBD |0
+<U50DE> \xD1\xA6 |0
+<U50DF> \x8F\xB2\xBE |0
+<U50E2> \x8F\xB2\xBF |0
+<U50E3> \xD1\xA9 |0
+<U50E4> \x8F\xB2\xC0 |0
+<U50E5> \xD1\xA7 |0
+<U50E6> \x8F\xB2\xC1 |0
+<U50E7> \xC1\xCE |0
+<U50E8> \x8F\xB2\xC2 |0
+<U50E9> \x8F\xB2\xC3 |0
+<U50ED> \xD1\xA8 |0
+<U50EE> \xD1\xAA |0
+<U50EF> \x8F\xB2\xC4 |0
+<U50F1> \x8F\xB2\xC5 |0
+<U50F2> \x8F\xB2\xD1 |0
+<U50F4> \xF9\xC1 |0
+<U50F5> \xD1\xAC |0
+<U50F6> \x8F\xB2\xC6 |0
+<U50F9> \xD1\xAB |0
+<U50FA> \x8F\xB2\xC7 |0
+<U50FB> \xCA\xC8 |0
+<U50FE> \x8F\xB2\xC8 |0
+<U5100> \xB5\xB7 |0
+<U5101> \xD1\xAE |0
+<U5102> \xD1\xAF |0
+<U5103> \x8F\xB2\xC9 |0
+<U5104> \xB2\xAF |0
+<U5106> \x8F\xB2\xCA |0
+<U5107> \x8F\xB2\xCB |0
+<U5108> \x8F\xB2\xCC |0
+<U5109> \xD1\xAD |0
+<U510B> \x8F\xB2\xCD |0
+<U510C> \x8F\xB2\xCE |0
+<U510D> \x8F\xB2\xCF |0
+<U510E> \x8F\xB2\xD0 |0
+<U5110> \x8F\xB2\xD2 |0
+<U5112> \xBC\xF4 |0
+<U5114> \xD1\xB2 |0
+<U5115> \xD1\xB1 |0
+<U5116> \xD1\xB0 |0
+<U5117> \x8F\xB2\xD3 |0
+<U5118> \xD0\xD6 |0
+<U5119> \x8F\xB2\xD4 |0
+<U511A> \xD1\xB3 |0
+<U511B> \x8F\xB2\xD5 |0
+<U511C> \x8F\xB2\xD6 |0
+<U511D> \x8F\xB2\xD7 |0
+<U511E> \x8F\xB2\xD8 |0
+<U511F> \xBD\xFE |0
+<U5121> \xD1\xB4 |0
+<U5123> \x8F\xB2\xD9 |0
+<U5127> \x8F\xB2\xDA |0
+<U5128> \x8F\xB2\xDB |0
+<U512A> \xCD\xA5 |0
+<U512C> \x8F\xB2\xDC |0
+<U512D> \x8F\xB2\xDD |0
+<U512F> \x8F\xB2\xDE |0
+<U5131> \x8F\xB2\xDF |0
+<U5132> \xCC\xD9 |0
+<U5133> \x8F\xB2\xE0 |0
+<U5134> \x8F\xB2\xE1 |0
+<U5135> \x8F\xB2\xE2 |0
+<U5137> \xD1\xB6 |0
+<U5138> \x8F\xB2\xE3 |0
+<U5139> \x8F\xB2\xE4 |0
+<U513A> \xD1\xB5 |0
+<U513B> \xD1\xB8 |0
+<U513C> \xD1\xB7 |0
+<U513F> \xD1\xB9 |0
+<U5140> \xD1\xBA |0
+<U5141> \xB0\xF4 |0
+<U5142> \x8F\xB2\xE5 |0
+<U5143> \xB8\xB5 |0
+<U5144> \xB7\xBB |0
+<U5145> \xBD\xBC |0
+<U5146> \xC3\xFB |0
+<U5147> \xB6\xA4 |0
+<U5148> \xC0\xE8 |0
+<U5149> \xB8\xF7 |0
+<U514A> \x8F\xB2\xE6 |3
+<U514A> \xF9\xC3 |0
+<U514B> \xB9\xEE |0
+<U514C> \xD1\xBC |0
+<U514D> \xCC\xC8 |0
+<U514E> \xC5\xC6 |0
+<U514F> \x8F\xB2\xE7 |0
+<U5150> \xBB\xF9 |0
+<U5152> \xD1\xBB |0
+<U5153> \x8F\xB2\xE8 |0
+<U5154> \xD1\xBD |0
+<U5155> \x8F\xB2\xE9 |0
+<U5157> \x8F\xB2\xEA |0
+<U5158> \x8F\xB2\xEB |0
+<U515A> \xC5\xDE |0
+<U515C> \xB3\xF5 |0
+<U515F> \x8F\xB2\xEC |0
+<U5162> \xD1\xBE |0
+<U5164> \x8F\xB2\xED |3
+<U5164> \xF9\xC4 |0
+<U5165> \xC6\xFE |0
+<U5166> \x8F\xB2\xEE |0
+<U5168> \xC1\xB4 |0
+<U5169> \xD1\xC0 |0
+<U516A> \xD1\xC1 |0
+<U516B> \xC8\xAC |0
+<U516C> \xB8\xF8 |0
+<U516D> \xCF\xBB |0
+<U516E> \xD1\xC2 |0
+<U5171> \xB6\xA6 |0
+<U5175> \xCA\xBC |0
+<U5176> \xC2\xB6 |0
+<U5177> \xB6\xF1 |0
+<U5178> \xC5\xB5 |0
+<U517C> \xB7\xF3 |0
+<U517E> \x8F\xB2\xEF |0
+<U5180> \xD1\xC3 |0
+<U5182> \xD1\xC4 |0
+<U5183> \x8F\xB2\xF0 |0
+<U5184> \x8F\xB2\xF1 |0
+<U5185> \xC6\xE2 |0
+<U5186> \xB1\xDF |0
+<U5189> \xD1\xC7 |0
+<U518A> \xBA\xFD |0
+<U518B> \x8F\xB2\xF2 |0
+<U518C> \xD1\xC6 |0
+<U518D> \xBA\xC6 |0
+<U518E> \x8F\xB2\xF3 |0
+<U518F> \xD1\xC8 |0
+<U5190> \xE6\xEE |0
+<U5191> \xD1\xC9 |0
+<U5192> \xCB\xC1 |0
+<U5193> \xD1\xCA |0
+<U5195> \xD1\xCB |0
+<U5196> \xD1\xCC |0
+<U5197> \xBE\xE9 |0
+<U5198> \x8F\xB2\xF4 |0
+<U5199> \xBC\xCC |0
+<U519D> \x8F\xB2\xF5 |3
+<U519D> \xF9\xC5 |0
+<U51A0> \xB4\xA7 |0
+<U51A1> \x8F\xB2\xF6 |0
+<U51A2> \xD1\xCF |0
+<U51A3> \x8F\xB2\xF7 |0
+<U51A4> \xD1\xCD |0
+<U51A5> \xCC\xBD |0
+<U51A6> \xD1\xCE |0
+<U51A8> \xC9\xDA |0
+<U51A9> \xD1\xD0 |0
+<U51AA> \xD1\xD1 |0
+<U51AB> \xD1\xD2 |0
+<U51AC> \xC5\xDF |0
+<U51AD> \x8F\xB2\xF8 |0
+<U51B0> \xD1\xD6 |0
+<U51B1> \xD1\xD4 |0
+<U51B2> \xD1\xD5 |0
+<U51B3> \xD1\xD3 |0
+<U51B4> \xBA\xE3 |0
+<U51B5> \xD1\xD7 |0
+<U51B6> \xCC\xEA |0
+<U51B7> \xCE\xE4 |0
+<U51B8> \x8F\xB2\xF9 |0
+<U51BA> \x8F\xB2\xFA |0
+<U51BC> \x8F\xB2\xFB |0
+<U51BD> \xD1\xD8 |0
+<U51BE> \x8F\xB2\xFC |3
+<U51BE> \xF9\xC6 |0
+<U51BF> \x8F\xB2\xFD |0
+<U51C2> \x8F\xB2\xFE |0
+<U51C4> \xC0\xA8 |0
+<U51C5> \xD1\xD9 |0
+<U51C6> \xBD\xDA |0
+<U51C8> \x8F\xB3\xA1 |0
+<U51C9> \xD1\xDA |0
+<U51CB> \xC3\xFC |0
+<U51CC> \xCE\xBF |0
+<U51CD> \xC5\xE0 |0
+<U51CF> \x8F\xB3\xA2 |0
+<U51D1> \x8F\xB3\xA3 |0
+<U51D2> \x8F\xB3\xA4 |0
+<U51D3> \x8F\xB3\xA5 |0
+<U51D5> \x8F\xB3\xA6 |0
+<U51D6> \xD2\xC5 |0
+<U51D8> \x8F\xB3\xA7 |0
+<U51DB> \xD1\xDB |0
+<U51DC> \xF4\xA5 |0
+<U51DD> \xB6\xC5 |0
+<U51DE> \x8F\xB3\xA8 |0
+<U51E0> \xD1\xDC |0
+<U51E1> \xCB\xDE |0
+<U51E2> \x8F\xB3\xA9 |0
+<U51E5> \x8F\xB3\xAA |0
+<U51E6> \xBD\xE8 |0
+<U51E7> \xC2\xFC |0
+<U51E9> \xD1\xDE |0
+<U51EA> \xC6\xE4 |0
+<U51EC> \xF9\xC7 |0
+<U51ED> \xD1\xDF |0
+<U51EE> \x8F\xB3\xAB |0
+<U51F0> \xD1\xE0 |0
+<U51F1> \xB3\xAE |0
+<U51F2> \x8F\xB3\xAC |0
+<U51F3> \x8F\xB3\xAD |0
+<U51F4> \x8F\xB3\xAE |0
+<U51F5> \xD1\xE1 |0
+<U51F6> \xB6\xA7 |0
+<U51F7> \x8F\xB3\xAF |0
+<U51F8> \xC6\xCC |0
+<U51F9> \xB1\xFA |0
+<U51FA> \xBD\xD0 |0
+<U51FD> \xC8\xA1 |0
+<U51FE> \xD1\xE2 |0
+<U5200> \xC5\xE1 |0
+<U5201> \x8F\xB3\xB0 |0
+<U5202> \x8F\xB3\xB1 |0
+<U5203> \xBF\xCF |0
+<U5204> \xD1\xE3 |0
+<U5205> \x8F\xB3\xB2 |0
+<U5206> \xCA\xAC |0
+<U5207> \xC0\xDA |0
+<U5208> \xB4\xA2 |0
+<U520A> \xB4\xA9 |0
+<U520B> \xD1\xE4 |0
+<U520E> \xD1\xE6 |0
+<U5211> \xB7\xBA |0
+<U5212> \x8F\xB3\xB3 |0
+<U5213> \x8F\xB3\xB4 |0
+<U5214> \xD1\xE5 |0
+<U5215> \x8F\xB3\xB5 |3
+<U5215> \xF9\xC8 |0
+<U5216> \x8F\xB3\xB6 |0
+<U5217> \xCE\xF3 |0
+<U5218> \x8F\xB3\xB7 |0
+<U521D> \xBD\xE9 |0
+<U5222> \x8F\xB3\xB8 |0
+<U5224> \xC8\xBD |0
+<U5225> \xCA\xCC |0
+<U5227> \xD1\xE7 |0
+<U5228> \x8F\xB3\xB9 |0
+<U5229> \xCD\xF8 |0
+<U522A> \xD1\xE8 |0
+<U522E> \xD1\xE9 |0
+<U5230> \xC5\xFE |0
+<U5231> \x8F\xB3\xBA |0
+<U5232> \x8F\xB3\xBB |0
+<U5233> \xD1\xEA |0
+<U5235> \x8F\xB3\xBC |0
+<U5236> \xC0\xA9 |0
+<U5237> \xBA\xFE |0
+<U5238> \xB7\xF4 |0
+<U5239> \xD1\xEB |0
+<U523A> \xBB\xC9 |0
+<U523B> \xB9\xEF |0
+<U523C> \x8F\xB3\xBD |0
+<U5243> \xC4\xE6 |0
+<U5244> \xD1\xED |0
+<U5245> \x8F\xB3\xBE |0
+<U5247> \xC2\xA7 |0
+<U5249> \x8F\xB3\xBF |0
+<U524A> \xBA\xEF |0
+<U524B> \xD1\xEE |0
+<U524C> \xD1\xEF |0
+<U524D> \xC1\xB0 |0
+<U524F> \xD1\xEC |0
+<U5254> \xD1\xF1 |0
+<U5255> \x8F\xB3\xC0 |0
+<U5256> \xCB\xB6 |0
+<U5257> \x8F\xB3\xC1 |0
+<U5258> \x8F\xB3\xC2 |0
+<U525A> \x8F\xB3\xC3 |0
+<U525B> \xB9\xE4 |0
+<U525C> \x8F\xB3\xC4 |0
+<U525D> \xC7\xED |1
+<U525E> \xD1\xF0 |0
+<U525F> \x8F\xB3\xC5 |0
+<U5260> \x8F\xB3\xC6 |0
+<U5261> \x8F\xB3\xC7 |0
+<U5263> \xB7\xF5 |0
+<U5264> \xBA\xDE |0
+<U5265> \xC7\xED |0
+<U5266> \x8F\xB3\xC8 |0
+<U5269> \xD1\xF4 |0
+<U526A> \xD1\xF2 |0
+<U526E> \x8F\xB3\xC9 |0
+<U526F> \xC9\xFB |0
+<U5270> \xBE\xEA |0
+<U5271> \xD1\xFB |0
+<U5272> \xB3\xE4 |0
+<U5273> \xD1\xF5 |0
+<U5274> \xD1\xF3 |0
+<U5275> \xC1\xCF |0
+<U5277> \x8F\xB3\xCA |0
+<U5278> \x8F\xB3\xCB |0
+<U5279> \x8F\xB3\xCC |0
+<U527D> \xD1\xF7 |0
+<U527F> \xD1\xF6 |0
+<U5280> \x8F\xB3\xCD |0
+<U5282> \x8F\xB3\xCE |0
+<U5283> \xB3\xC4 |0
+<U5285> \x8F\xB3\xCF |0
+<U5287> \xB7\xE0 |0
+<U5288> \xD1\xFC |0
+<U5289> \xCE\xAD |0
+<U528A> \x8F\xB3\xD0 |0
+<U528C> \x8F\xB3\xD1 |0
+<U528D> \xD1\xF8 |0
+<U5291> \xD1\xFD |0
+<U5292> \xD1\xFA |0
+<U5293> \x8F\xB3\xD2 |0
+<U5294> \xD1\xF9 |0
+<U5295> \x8F\xB3\xD3 |0
+<U5296> \x8F\xB3\xD4 |0
+<U5297> \x8F\xB3\xD5 |0
+<U5298> \x8F\xB3\xD6 |0
+<U529A> \x8F\xB3\xD7 |0
+<U529B> \xCE\xCF |0
+<U529C> \x8F\xB3\xD8 |3
+<U529C> \xF9\xC9 |0
+<U529F> \xB8\xF9 |0
+<U52A0> \xB2\xC3 |0
+<U52A3> \xCE\xF4 |0
+<U52A4> \x8F\xB3\xD9 |0
+<U52A5> \x8F\xB3\xDA |0
+<U52A6> \x8F\xB3\xDB |3
+<U52A6> \xF9\xCA |0
+<U52A7> \x8F\xB3\xDC |0
+<U52A9> \xBD\xF5 |0
+<U52AA> \xC5\xD8 |0
+<U52AB> \xB9\xE5 |0
+<U52AC> \xD2\xA2 |0
+<U52AD> \xD2\xA3 |0
+<U52AF> \x8F\xB3\xDD |3
+<U52AF> \xFB\xBC |0
+<U52B0> \x8F\xB3\xDE |0
+<U52B1> \xCE\xE5 |0
+<U52B4> \xCF\xAB |0
+<U52B5> \xD2\xA5 |0
+<U52B6> \x8F\xB3\xDF |0
+<U52B7> \x8F\xB3\xE0 |0
+<U52B8> \x8F\xB3\xE1 |0
+<U52B9> \xB8\xFA |0
+<U52BA> \x8F\xB3\xE2 |0
+<U52BB> \x8F\xB3\xE3 |0
+<U52BC> \xD2\xA4 |0
+<U52BD> \x8F\xB3\xE4 |0
+<U52BE> \xB3\xAF |0
+<U52C0> \x8F\xB3\xE5 |3
+<U52C0> \xF9\xCB |0
+<U52C1> \xD2\xA6 |0
+<U52C3> \xCB\xD6 |0
+<U52C4> \x8F\xB3\xE6 |0
+<U52C5> \xC4\xBC |0
+<U52C6> \x8F\xB3\xE7 |0
+<U52C7> \xCD\xA6 |0
+<U52C8> \x8F\xB3\xE8 |0
+<U52C9> \xCA\xD9 |0
+<U52CC> \x8F\xB3\xE9 |0
+<U52CD> \xD2\xA7 |0
+<U52CF> \x8F\xB3\xEA |0
+<U52D1> \x8F\xB3\xEB |0
+<U52D2> \xF0\xD5 |0
+<U52D4> \x8F\xB3\xEC |0
+<U52D5> \xC6\xB0 |0
+<U52D6> \x8F\xB3\xED |0
+<U52D7> \xD2\xA8 |0
+<U52D8> \xB4\xAA |0
+<U52D9> \xCC\xB3 |0
+<U52DB> \x8F\xB3\xEE |3
+<U52DB> \xF9\xCC |0
+<U52DC> \x8F\xB3\xEF |0
+<U52DD> \xBE\xA1 |0
+<U52DE> \xD2\xA9 |0
+<U52DF> \xCA\xE7 |0
+<U52E0> \xD2\xAD |0
+<U52E1> \x8F\xB3\xF0 |0
+<U52E2> \xC0\xAA |0
+<U52E3> \xD2\xAA |0
+<U52E4> \xB6\xD0 |0
+<U52E5> \x8F\xB3\xF1 |0
+<U52E6> \xD2\xAB |0
+<U52E7> \xB4\xAB |0
+<U52E8> \x8F\xB3\xF2 |0
+<U52E9> \x8F\xB3\xF3 |0
+<U52EA> \x8F\xB3\xF4 |0
+<U52EC> \x8F\xB3\xF5 |0
+<U52F0> \x8F\xB3\xF6 |0
+<U52F1> \x8F\xB3\xF7 |0
+<U52F2> \xB7\xAE |0
+<U52F3> \xD2\xAE |0
+<U52F4> \x8F\xB3\xF8 |0
+<U52F5> \xD2\xAF |0
+<U52F6> \x8F\xB3\xF9 |0
+<U52F7> \x8F\xB3\xFA |0
+<U52F8> \xD2\xB0 |0
+<U52F9> \xD2\xB1 |0
+<U52FA> \xBC\xDB |0
+<U52FE> \xB8\xFB |0
+<U52FF> \xCC\xDE |0
+<U5300> \x8F\xB3\xFB |3
+<U5300> \xF9\xCD |0
+<U5301> \xCC\xE8 |0
+<U5302> \xC6\xF7 |0
+<U5303> \x8F\xB3\xFC |0
+<U5305> \xCA\xF1 |0
+<U5306> \xD2\xB2 |0
+<U5307> \xF9\xCE |0
+<U5308> \xD2\xB3 |0
+<U530A> \x8F\xB3\xFD |0
+<U530B> \x8F\xB3\xFE |0
+<U530C> \x8F\xB4\xA1 |0
+<U530D> \xD2\xB5 |0
+<U530F> \xD2\xB7 |0
+<U5310> \xD2\xB6 |0
+<U5311> \x8F\xB4\xA2 |0
+<U5313> \x8F\xB4\xA3 |0
+<U5315> \xD2\xB8 |0
+<U5316> \xB2\xBD |0
+<U5317> \xCB\xCC |0
+<U5318> \x8F\xB4\xA4 |0
+<U5319> \xBA\xFC |0
+<U531A> \xD2\xB9 |0
+<U531B> \x8F\xB4\xA5 |0
+<U531C> \x8F\xB4\xA6 |0
+<U531D> \xC1\xD9 |0
+<U531E> \x8F\xB4\xA7 |0
+<U531F> \x8F\xB4\xA8 |0
+<U5320> \xBE\xA2 |0
+<U5321> \xB6\xA9 |0
+<U5323> \xD2\xBA |0
+<U5324> \xF9\xCF |0
+<U5325> \x8F\xB4\xA9 |0
+<U5327> \x8F\xB4\xAA |0
+<U5328> \x8F\xB4\xAB |0
+<U5329> \x8F\xB4\xAC |0
+<U532A> \xC8\xDB |0
+<U532B> \x8F\xB4\xAD |0
+<U532C> \x8F\xB4\xAE |0
+<U532D> \x8F\xB4\xAF |0
+<U532F> \xD2\xBB |0
+<U5330> \x8F\xB4\xB0 |0
+<U5331> \xD2\xBC |0
+<U5332> \x8F\xB4\xB1 |0
+<U5333> \xD2\xBD |0
+<U5335> \x8F\xB4\xB2 |0
+<U5338> \xD2\xBE |0
+<U5339> \xC9\xA4 |0
+<U533A> \xB6\xE8 |0
+<U533B> \xB0\xE5 |0
+<U533C> \x8F\xB4\xB3 |0
+<U533D> \x8F\xB4\xB4 |0
+<U533E> \x8F\xB4\xB5 |0
+<U533F> \xC6\xBF |0
+<U5340> \xD2\xBF |0
+<U5341> \xBD\xBD |0
+<U5342> \x8F\xB4\xB6 |0
+<U5343> \xC0\xE9 |0
+<U5345> \xD2\xC1 |0
+<U5346> \xD2\xC0 |0
+<U5347> \xBE\xA3 |0
+<U5348> \xB8\xE1 |0
+<U5349> \xD2\xC3 |0
+<U534A> \xC8\xBE |0
+<U534B> \x8F\xB4\xB8 |0
+<U534C> \x8F\xB4\xB7 |0
+<U534D> \xD2\xC4 |0
+<U5351> \xC8\xDC |0
+<U5352> \xC2\xB4 |0
+<U5353> \xC2\xEE |0
+<U5354> \xB6\xA8 |0
+<U5357> \xC6\xEE |0
+<U5358> \xC3\xB1 |0
+<U5359> \x8F\xB4\xB9 |0
+<U535A> \xC7\xEE |0
+<U535B> \x8F\xB4\xBA |0
+<U535C> \xCB\xCE |0
+<U535E> \xD2\xC6 |0
+<U5360> \xC0\xEA |0
+<U5361> \x8F\xB4\xBB |0
+<U5363> \x8F\xB4\xBC |0
+<U5365> \x8F\xB4\xBD |0
+<U5366> \xB7\xB5 |0
+<U5369> \xD2\xC7 |0
+<U536C> \x8F\xB4\xBE |0
+<U536D> \x8F\xB4\xBF |0
+<U536E> \xD2\xC8 |0
+<U536F> \xB1\xAC |0
+<U5370> \xB0\xF5 |0
+<U5371> \xB4\xED |0
+<U5372> \x8F\xB4\xC0 |3
+<U5372> \xF9\xD0 |0
+<U5373> \xC2\xA8 |0
+<U5374> \xB5\xD1 |0
+<U5375> \xCD\xF1 |0
+<U5377> \xD2\xCB |0
+<U5378> \xB2\xB7 |0
+<U5379> \x8F\xB4\xC1 |0
+<U537B> \xD2\xCA |0
+<U537E> \x8F\xB4\xC2 |0
+<U537F> \xB6\xAA |0
+<U5382> \xD2\xCC |0
+<U5383> \x8F\xB4\xC3 |0
+<U5384> \xCC\xF1 |0
+<U5387> \x8F\xB4\xC4 |0
+<U5388> \x8F\xB4\xC5 |0
+<U538E> \x8F\xB4\xC6 |0
+<U5393> \x8F\xB4\xC7 |3
+<U5393> \xF9\xD1 |0
+<U5394> \x8F\xB4\xC8 |0
+<U5396> \xD2\xCD |0
+<U5398> \xCE\xD2 |0
+<U5399> \x8F\xB4\xC9 |0
+<U539A> \xB8\xFC |0
+<U539D> \x8F\xB4\xCA |0
+<U539F> \xB8\xB6 |0
+<U53A0> \xD2\xCE |0
+<U53A1> \x8F\xB4\xCB |0
+<U53A4> \x8F\xB4\xCC |0
+<U53A5> \xD2\xD0 |0
+<U53A6> \xD2\xCF |0
+<U53A8> \xBF\xDF |0
+<U53A9> \xB1\xB9 |0
+<U53AA> \x8F\xB4\xCD |0
+<U53AB> \x8F\xB4\xCE |0
+<U53AD> \xB1\xDE |0
+<U53AE> \xD2\xD1 |0
+<U53AF> \x8F\xB4\xCF |0
+<U53B0> \xD2\xD2 |0
+<U53B2> \x8F\xB4\xD0 |3
+<U53B2> \xF9\xD2 |0
+<U53B3> \xB8\xB7 |0
+<U53B4> \x8F\xB4\xD1 |0
+<U53B5> \x8F\xB4\xD2 |0
+<U53B6> \xD2\xD3 |0
+<U53B7> \x8F\xB4\xD3 |0
+<U53B8> \x8F\xB4\xD4 |0
+<U53BA> \x8F\xB4\xD5 |0
+<U53BB> \xB5\xEE |0
+<U53BD> \x8F\xB4\xD6 |0
+<U53C0> \x8F\xB4\xD7 |0
+<U53C2> \xBB\xB2 |0
+<U53C3> \xD2\xD4 |0
+<U53C5> \x8F\xB4\xD8 |0
+<U53C8> \xCB\xF4 |0
+<U53C9> \xBA\xB5 |0
+<U53CA> \xB5\xDA |0
+<U53CB> \xCD\xA7 |0
+<U53CC> \xC1\xD0 |0
+<U53CD> \xC8\xBF |0
+<U53CE> \xBC\xFD |0
+<U53CF> \x8F\xB4\xD9 |0
+<U53D2> \x8F\xB4\xDA |0
+<U53D3> \x8F\xB4\xDB |0
+<U53D4> \xBD\xC7 |0
+<U53D5> \x8F\xB4\xDC |0
+<U53D6> \xBC\xE8 |0
+<U53D7> \xBC\xF5 |0
+<U53D9> \xBD\xF6 |0
+<U53DA> \x8F\xB4\xDD |0
+<U53DB> \xC8\xC0 |0
+<U53DD> \x8F\xB4\xDE |3
+<U53DD> \xF9\xD3 |0
+<U53DE> \x8F\xB4\xDF |0
+<U53DF> \xD2\xD7 |0
+<U53E0> \x8F\xB4\xE0 |0
+<U53E1> \xB1\xC3 |0
+<U53E2> \xC1\xD1 |0
+<U53E3> \xB8\xFD |0
+<U53E4> \xB8\xC5 |0
+<U53E5> \xB6\xE7 |0
+<U53E6> \x8F\xB4\xE1 |0
+<U53E7> \x8F\xB4\xE2 |0
+<U53E8> \xD2\xDB |0
+<U53E9> \xC3\xA1 |0
+<U53EA> \xC2\xFE |0
+<U53EB> \xB6\xAB |0
+<U53EC> \xBE\xA4 |0
+<U53ED> \xD2\xDC |0
+<U53EE> \xD2\xDA |0
+<U53EF> \xB2\xC4 |0
+<U53F0> \xC2\xE6 |0
+<U53F1> \xBC\xB8 |0
+<U53F2> \xBB\xCB |0
+<U53F3> \xB1\xA6 |0
+<U53F5> \x8F\xB4\xE3 |0
+<U53F6> \xB3\xF0 |0
+<U53F7> \xB9\xE6 |0
+<U53F8> \xBB\xCA |0
+<U53FA> \xD2\xDD |0
+<U5401> \xD2\xDE |0
+<U5402> \x8F\xB4\xE4 |0
+<U5403> \xB5\xC9 |0
+<U5404> \xB3\xC6 |0
+<U5408> \xB9\xE7 |0
+<U5409> \xB5\xC8 |0
+<U540A> \xC4\xDF |0
+<U540B> \xB1\xA5 |0
+<U540C> \xC6\xB1 |0
+<U540D> \xCC\xBE |0
+<U540E> \xB9\xA1 |0
+<U540F> \xCD\xF9 |0
+<U5410> \xC5\xC7 |0
+<U5411> \xB8\xFE |0
+<U5413> \x8F\xB4\xE5 |0
+<U541A> \x8F\xB4\xE6 |0
+<U541B> \xB7\xAF |0
+<U541D> \xD2\xE7 |0
+<U541F> \xB6\xE3 |0
+<U5420> \xCB\xCA |0
+<U5421> \x8F\xB4\xE7 |0
+<U5426> \xC8\xDD |0
+<U5427> \x8F\xB4\xE8 |0
+<U5428> \x8F\xB4\xE9 |0
+<U5429> \xD2\xE6 |0
+<U542A> \x8F\xB4\xEA |0
+<U542B> \xB4\xDE |0
+<U542C> \xD2\xE1 |0
+<U542D> \xD2\xE2 |0
+<U542E> \xD2\xE4 |0
+<U542F> \x8F\xB4\xEB |0
+<U5431> \x8F\xB4\xEC |0
+<U5434> \x8F\xB4\xED |0
+<U5435> \x8F\xB4\xEE |0
+<U5436> \xD2\xE5 |0
+<U5438> \xB5\xDB |0
+<U5439> \xBF\xE1 |0
+<U543B> \xCA\xAD |0
+<U543C> \xD2\xE3 |0
+<U543D> \xD2\xDF |0
+<U543E> \xB8\xE3 |0
+<U5440> \xD2\xE0 |0
+<U5442> \xCF\xA4 |0
+<U5443> \x8F\xB4\xEF |0
+<U5444> \x8F\xB4\xF0 |0
+<U5446> \xCA\xF2 |0
+<U5447> \x8F\xB4\xF1 |0
+<U5448> \xC4\xE8 |0
+<U5449> \xB8\xE2 |0
+<U544A> \xB9\xF0 |0
+<U544D> \x8F\xB4\xF2 |0
+<U544E> \xD2\xE8 |0
+<U544F> \x8F\xB4\xF3 |0
+<U5451> \xC6\xDD |0
+<U545E> \x8F\xB4\xF4 |0
+<U545F> \xD2\xEC |0
+<U5462> \x8F\xB4\xF5 |0
+<U5464> \x8F\xB4\xF6 |0
+<U5466> \x8F\xB4\xF7 |0
+<U5467> \x8F\xB4\xF8 |0
+<U5468> \xBC\xFE |0
+<U5469> \x8F\xB4\xF9 |0
+<U546A> \xBC\xF6 |0
+<U546B> \x8F\xB4\xFA |0
+<U546D> \x8F\xB4\xFB |0
+<U546E> \x8F\xB4\xFC |0
+<U5470> \xD2\xEF |0
+<U5471> \xD2\xED |0
+<U5473> \xCC\xA3 |0
+<U5474> \x8F\xB4\xFD |0
+<U5475> \xD2\xEA |0
+<U5476> \xD2\xF3 |0
+<U5477> \xD2\xEE |0
+<U547B> \xD2\xF1 |0
+<U547C> \xB8\xC6 |0
+<U547D> \xCC\xBF |0
+<U547F> \x8F\xB4\xFE |0
+<U5480> \xD2\xF2 |0
+<U5481> \x8F\xB5\xA1 |0
+<U5483> \x8F\xB5\xA2 |0
+<U5484> \xD2\xF4 |0
+<U5485> \x8F\xB5\xA3 |0
+<U5486> \xD2\xF6 |0
+<U5488> \x8F\xB5\xA4 |0
+<U5489> \x8F\xB5\xA5 |0
+<U548A> \xF9\xD6 |0
+<U548B> \xBA\xF0 |0
+<U548C> \xCF\xC2 |0
+<U548D> \x8F\xB5\xA6 |0
+<U548E> \xD2\xEB |0
+<U548F> \xD2\xE9 |0
+<U5490> \xD2\xF5 |0
+<U5491> \x8F\xB5\xA7 |0
+<U5492> \xD2\xF0 |0
+<U5495> \x8F\xB5\xA8 |0
+<U5496> \x8F\xB5\xA9 |0
+<U549C> \x8F\xB5\xAA |3
+<U549C> \xF9\xD5 |0
+<U549F> \x8F\xB5\xAB |0
+<U54A1> \x8F\xB5\xAC |0
+<U54A2> \xD2\xF8 |0
+<U54A4> \xD3\xA3 |0
+<U54A5> \xD2\xFA |0
+<U54A6> \x8F\xB5\xAD |0
+<U54A7> \x8F\xB5\xAE |0
+<U54A8> \xD2\xFE |0
+<U54A9> \x8F\xB5\xAF |3
+<U54A9> \xF9\xD7 |0
+<U54AA> \x8F\xB5\xB0 |0
+<U54AB> \xD3\xA1 |0
+<U54AC> \xD2\xFB |0
+<U54AD> \x8F\xB5\xB1 |0
+<U54AE> \x8F\xB5\xB2 |0
+<U54AF> \xD3\xBE |0
+<U54B1> \x8F\xB5\xB3 |0
+<U54B2> \xBA\xE9 |0
+<U54B3> \xB3\xB1 |0
+<U54B7> \x8F\xB5\xB4 |0
+<U54B8> \xD2\xF9 |0
+<U54B9> \x8F\xB5\xB5 |0
+<U54BA> \x8F\xB5\xB6 |0
+<U54BB> \x8F\xB5\xB7 |0
+<U54BC> \xD3\xA5 |0
+<U54BD> \xB0\xF6 |0
+<U54BE> \xD3\xA4 |0
+<U54BF> \x8F\xB5\xB8 |0
+<U54C0> \xB0\xA5 |0
+<U54C1> \xC9\xCA |0
+<U54C2> \xD3\xA2 |0
+<U54C4> \xD2\xFC |0
+<U54C6> \x8F\xB5\xB9 |0
+<U54C7> \xD2\xF7 |0
+<U54C8> \xD2\xFD |0
+<U54C9> \xBA\xC8 |0
+<U54CA> \x8F\xB5\xBA |0
+<U54CD> \x8F\xB5\xBB |0
+<U54CE> \x8F\xB5\xBC |0
+<U54D8> \xD3\xA6 |0
+<U54E0> \x8F\xB5\xBD |0
+<U54E1> \xB0\xF7 |0
+<U54E2> \xD3\xAF |0
+<U54E5> \xD3\xA7 |0
+<U54E6> \xD3\xA8 |0
+<U54E8> \xBE\xA5 |0
+<U54E9> \xCB\xE9 |0
+<U54EA> \x8F\xB5\xBE |0
+<U54EC> \x8F\xB5\xBF |0
+<U54ED> \xD3\xAD |0
+<U54EE> \xD3\xAC |0
+<U54EF> \x8F\xB5\xC0 |0
+<U54F2> \xC5\xAF |0
+<U54F6> \x8F\xB5\xC1 |0
+<U54FA> \xD3\xAE |0
+<U54FC> \x8F\xB5\xC2 |0
+<U54FD> \xD3\xAB |0
+<U54FE> \x8F\xB5\xC3 |0
+<U54FF> \x8F\xB5\xC4 |3
+<U54FF> \xF9\xD8 |0
+<U5500> \x8F\xB5\xC5 |0
+<U5501> \x8F\xB5\xC6 |0
+<U5504> \xB1\xB4 |0
+<U5505> \x8F\xB5\xC7 |0
+<U5506> \xBA\xB6 |0
+<U5507> \xBF\xB0 |0
+<U5508> \x8F\xB5\xC8 |0
+<U5509> \x8F\xB5\xC9 |0
+<U550C> \x8F\xB5\xCA |0
+<U550D> \x8F\xB5\xCB |0
+<U550E> \x8F\xB5\xCC |0
+<U550F> \xD3\xA9 |0
+<U5510> \xC5\xE2 |0
+<U5514> \xD3\xAA |0
+<U5515> \x8F\xB5\xCD |0
+<U5516> \xB0\xA2 |0
+<U552A> \x8F\xB5\xCE |0
+<U552B> \x8F\xB5\xCF |0
+<U552E> \xD3\xB4 |0
+<U552F> \xCD\xA3 |0
+<U5531> \xBE\xA7 |0
+<U5532> \x8F\xB5\xD0 |0
+<U5533> \xD3\xBA |0
+<U5535> \x8F\xB5\xD1 |0
+<U5536> \x8F\xB5\xD2 |0
+<U5538> \xD3\xB9 |0
+<U5539> \xD3\xB0 |0
+<U553B> \x8F\xB5\xD3 |0
+<U553C> \x8F\xB5\xD4 |0
+<U553D> \x8F\xB5\xD5 |0
+<U553E> \xC2\xC3 |0
+<U5540> \xD3\xB1 |0
+<U5541> \x8F\xB5\xD6 |0
+<U5544> \xC2\xEF |0
+<U5545> \xD3\xB6 |0
+<U5546> \xBE\xA6 |0
+<U5547> \x8F\xB5\xD7 |0
+<U5549> \x8F\xB5\xD8 |0
+<U554A> \x8F\xB5\xD9 |0
+<U554C> \xD3\xB3 |0
+<U554D> \x8F\xB5\xDA |0
+<U554F> \xCC\xE4 |0
+<U5550> \x8F\xB5\xDB |0
+<U5551> \x8F\xB5\xDC |0
+<U5553> \xB7\xBC |0
+<U5556> \xD3\xB7 |0
+<U5557> \xD3\xB8 |0
+<U5558> \x8F\xB5\xDD |0
+<U555A> \x8F\xB5\xDE |0
+<U555B> \x8F\xB5\xDF |0
+<U555C> \xD3\xB5 |0
+<U555D> \xD3\xBB |0
+<U555E> \x8F\xB5\xE0 |0
+<U5560> \x8F\xB5\xE1 |0
+<U5561> \x8F\xB5\xE2 |0
+<U5563> \xD3\xB2 |0
+<U5564> \x8F\xB5\xE3 |0
+<U5566> \x8F\xB5\xE4 |0
+<U557B> \xD3\xC1 |0
+<U557C> \xD3\xC6 |0
+<U557E> \xD3\xC2 |0
+<U557F> \x8F\xB5\xE5 |0
+<U5580> \xD3\xBD |0
+<U5581> \x8F\xB5\xE6 |0
+<U5582> \x8F\xB5\xE7 |0
+<U5583> \xD3\xC7 |0
+<U5584> \xC1\xB1 |0
+<U5586> \x8F\xB5\xE8 |3
+<U5586> \xF9\xD9 |0
+<U5587> \xD3\xC9 |0
+<U5588> \x8F\xB5\xE9 |0
+<U5589> \xB9\xA2 |0
+<U558A> \xD3\xBF |0
+<U558B> \xC3\xFD |0
+<U558E> \x8F\xB5\xEA |0
+<U558F> \x8F\xB5\xEB |0
+<U5591> \x8F\xB5\xEC |0
+<U5592> \x8F\xB5\xED |0
+<U5593> \x8F\xB5\xEE |0
+<U5594> \x8F\xB5\xEF |0
+<U5597> \x8F\xB5\xF0 |0
+<U5598> \xD3\xC3 |0
+<U5599> \xD3\xBC |0
+<U559A> \xB4\xAD |0
+<U559C> \xB4\xEE |0
+<U559D> \xB3\xE5 |0
+<U559E> \xD3\xC4 |0
+<U559F> \xD3\xC0 |0
+<U55A3> \x8F\xB5\xF1 |0
+<U55A4> \x8F\xB5\xF2 |0
+<U55A7> \xB7\xF6 |0
+<U55A8> \xD3\xCA |0
+<U55A9> \xD3\xC8 |0
+<U55AA> \xC1\xD3 |0
+<U55AB> \xB5\xCA |0
+<U55AC> \xB6\xAC |0
+<U55AD> \x8F\xB5\xF3 |0
+<U55AE> \xD3\xC5 |0
+<U55B0> \xB6\xF4 |0
+<U55B2> \x8F\xB5\xF4 |0
+<U55B6> \xB1\xC4 |0
+<U55BF> \x8F\xB5\xF5 |0
+<U55C1> \x8F\xB5\xF6 |0
+<U55C3> \x8F\xB5\xF7 |0
+<U55C4> \xD3\xCE |0
+<U55C5> \xD3\xCC |0
+<U55C6> \x8F\xB5\xF8 |0
+<U55C7> \xD4\xA7 |0
+<U55C9> \x8F\xB5\xF9 |0
+<U55CB> \x8F\xB5\xFA |0
+<U55CC> \x8F\xB5\xFB |0
+<U55CE> \x8F\xB5\xFC |0
+<U55D1> \x8F\xB5\xFD |0
+<U55D2> \x8F\xB5\xFE |0
+<U55D3> \x8F\xB6\xA1 |0
+<U55D4> \xD3\xD1 |0
+<U55D7> \x8F\xB6\xA2 |0
+<U55D8> \x8F\xB6\xA3 |0
+<U55DA> \xD3\xCB |0
+<U55DB> \x8F\xB6\xA4 |0
+<U55DC> \xD3\xCF |0
+<U55DE> \x8F\xB6\xA5 |0
+<U55DF> \xD3\xCD |0
+<U55E2> \x8F\xB6\xA6 |0
+<U55E3> \xBB\xCC |0
+<U55E4> \xD3\xD0 |0
+<U55E9> \x8F\xB6\xA7 |0
+<U55F6> \x8F\xB6\xA8 |0
+<U55F7> \xD3\xD3 |0
+<U55F9> \xD3\xD8 |0
+<U55FD> \xD3\xD6 |0
+<U55FE> \xD3\xD5 |0
+<U55FF> \x8F\xB6\xA9 |0
+<U5605> \x8F\xB6\xAA |0
+<U5606> \xC3\xB2 |0
+<U5608> \x8F\xB6\xAB |0
+<U5609> \xB2\xC5 |0
+<U560A> \x8F\xB6\xAC |0
+<U560D> \x8F\xB6\xAD |0
+<U560E> \x8F\xB6\xAE |0
+<U560F> \x8F\xB6\xAF |0
+<U5610> \x8F\xB6\xB0 |0
+<U5611> \x8F\xB6\xB1 |0
+<U5612> \x8F\xB6\xB2 |0
+<U5614> \xD3\xD2 |0
+<U5616> \xD3\xD4 |0
+<U5617> \xBE\xA8 |0
+<U5618> \xB1\xB3 |0
+<U5619> \x8F\xB6\xB3 |0
+<U561B> \xD3\xD7 |0
+<U5629> \xB2\xDE |0
+<U562C> \x8F\xB6\xB4 |0
+<U562F> \xD3\xE2 |0
+<U5630> \x8F\xB6\xB5 |0
+<U5631> \xBE\xFC |0
+<U5632> \xD3\xDE |0
+<U5633> \x8F\xB6\xB6 |0
+<U5634> \xD3\xDC |0
+<U5635> \x8F\xB6\xB7 |0
+<U5636> \xD3\xDD |0
+<U5637> \x8F\xB6\xB8 |0
+<U5638> \xD3\xDF |0
+<U5639> \x8F\xB6\xB9 |0
+<U563B> \x8F\xB6\xBA |0
+<U563C> \x8F\xB6\xBB |0
+<U563D> \x8F\xB6\xBC |0
+<U563F> \x8F\xB6\xBD |0
+<U5640> \x8F\xB6\xBE |0
+<U5641> \x8F\xB6\xBF |0
+<U5642> \xB1\xBD |0
+<U5643> \x8F\xB6\xC0 |0
+<U5644> \x8F\xB6\xC1 |0
+<U5646> \x8F\xB6\xC2 |0
+<U5649> \x8F\xB6\xC3 |0
+<U564B> \x8F\xB6\xC4 |0
+<U564C> \xC1\xB9 |0
+<U564D> \x8F\xB6\xC5 |0
+<U564E> \xD3\xD9 |0
+<U564F> \x8F\xB6\xC6 |0
+<U5650> \xD3\xDA |0
+<U5654> \x8F\xB6\xC7 |0
+<U565B> \xB3\xFA |0
+<U565E> \x8F\xB6\xC8 |0
+<U5660> \x8F\xB6\xC9 |0
+<U5661> \x8F\xB6\xCA |0
+<U5662> \x8F\xB6\xCB |0
+<U5663> \x8F\xB6\xCC |0
+<U5664> \xD3\xE1 |0
+<U5666> \x8F\xB6\xCD |0
+<U5668> \xB4\xEF |0
+<U5669> \x8F\xB6\xCE |0
+<U566A> \xD3\xE4 |0
+<U566B> \xD3\xE0 |0
+<U566C> \xD3\xE3 |0
+<U566D> \x8F\xB6\xCF |0
+<U566F> \x8F\xB6\xD0 |0
+<U5671> \x8F\xB6\xD1 |0
+<U5672> \x8F\xB6\xD2 |0
+<U5674> \xCA\xAE |0
+<U5675> \x8F\xB6\xD3 |0
+<U5678> \xC6\xD5 |0
+<U567A> \xC8\xB8 |0
+<U5680> \xD3\xE6 |0
+<U5684> \x8F\xB6\xD4 |0
+<U5685> \x8F\xB6\xD5 |0
+<U5686> \xD3\xE5 |0
+<U5687> \xB3\xC5 |0
+<U5688> \x8F\xB6\xD6 |0
+<U568A> \xD3\xE7 |0
+<U568B> \x8F\xB6\xD7 |0
+<U568C> \x8F\xB6\xD8 |0
+<U568F> \xD3\xEA |0
+<U5694> \xD3\xE9 |0
+<U5695> \x8F\xB6\xD9 |0
+<U5699> \x8F\xB6\xDA |0
+<U569A> \x8F\xB6\xDB |0
+<U569D> \x8F\xB6\xDC |0
+<U569E> \x8F\xB6\xDD |0
+<U569F> \x8F\xB6\xDE |0
+<U56A0> \xD3\xE8 |0
+<U56A2> \xC7\xB9 |0
+<U56A5> \xD3\xEB |0
+<U56A6> \x8F\xB6\xDF |0
+<U56A7> \x8F\xB6\xE0 |0
+<U56A8> \x8F\xB6\xE1 |0
+<U56A9> \x8F\xB6\xE2 |0
+<U56AB> \x8F\xB6\xE3 |0
+<U56AC> \x8F\xB6\xE4 |0
+<U56AD> \x8F\xB6\xE5 |0
+<U56AE> \xD3\xEC |0
+<U56B1> \x8F\xB6\xE6 |0
+<U56B3> \x8F\xB6\xE7 |0
+<U56B4> \xD3\xEE |0
+<U56B6> \xD3\xED |0
+<U56B7> \x8F\xB6\xE8 |0
+<U56BC> \xD3\xF0 |0
+<U56BE> \x8F\xB6\xE9 |0
+<U56C0> \xD3\xF3 |0
+<U56C1> \xD3\xF1 |0
+<U56C2> \xD3\xEF |0
+<U56C3> \xD3\xF2 |0
+<U56C5> \x8F\xB6\xEA |0
+<U56C8> \xD3\xF4 |0
+<U56C9> \x8F\xB6\xEB |0
+<U56CA> \x8F\xB6\xEC |0
+<U56CB> \x8F\xB6\xED |0
+<U56CC> \x8F\xB6\xF0 |0
+<U56CD> \x8F\xB6\xF1 |0
+<U56CE> \xD3\xF5 |0
+<U56CF> \x8F\xB6\xEE |0
+<U56D0> \x8F\xB6\xEF |0
+<U56D1> \xD3\xF6 |0
+<U56D3> \xD3\xF7 |0
+<U56D7> \xD3\xF8 |0
+<U56D8> \xD1\xC5 |0
+<U56D9> \x8F\xB6\xF2 |0
+<U56DA> \xBC\xFC |0
+<U56DB> \xBB\xCD |0
+<U56DC> \x8F\xB6\xF3 |0
+<U56DD> \x8F\xB6\xF4 |0
+<U56DE> \xB2\xF3 |0
+<U56DF> \x8F\xB6\xF5 |0
+<U56E0> \xB0\xF8 |0
+<U56E1> \x8F\xB6\xF6 |0
+<U56E3> \xC3\xC4 |0
+<U56E4> \x8F\xB6\xF7 |0
+<U56E5> \x8F\xB6\xF8 |0
+<U56E6> \x8F\xB6\xF9 |0
+<U56E7> \x8F\xB6\xFA |0
+<U56E8> \x8F\xB6\xFB |0
+<U56EB> \x8F\xB6\xFD |0
+<U56ED> \x8F\xB6\xFE |0
+<U56EE> \xD3\xF9 |0
+<U56F0> \xBA\xA4 |0
+<U56F1> \x8F\xB6\xFC |0
+<U56F2> \xB0\xCF |0
+<U56F3> \xBF\xDE |0
+<U56F6> \x8F\xB7\xA1 |0
+<U56F7> \x8F\xB7\xA2 |0
+<U56F9> \xD3\xFA |0
+<U56FA> \xB8\xC7 |0
+<U56FD> \xB9\xF1 |0
+<U56FF> \xD3\xFC |0
+<U5700> \xD3\xFB |0
+<U5701> \x8F\xB7\xA3 |0
+<U5702> \x8F\xB7\xA4 |0
+<U5703> \xCA\xE0 |0
+<U5704> \xD3\xFD |0
+<U5707> \x8F\xB7\xA5 |0
+<U5708> \xD4\xA1 |0
+<U5709> \xD3\xFE |0
+<U570A> \x8F\xB7\xA6 |0
+<U570B> \xD4\xA2 |0
+<U570C> \x8F\xB7\xA7 |0
+<U570D> \xD4\xA3 |0
+<U570F> \xB7\xF7 |0
+<U5711> \x8F\xB7\xA8 |0
+<U5712> \xB1\xE0 |0
+<U5713> \xD4\xA4 |0
+<U5715> \x8F\xB7\xA9 |0
+<U5716> \xD4\xA6 |0
+<U5718> \xD4\xA5 |0
+<U571A> \x8F\xB7\xAA |0
+<U571B> \x8F\xB7\xAB |0
+<U571C> \xD4\xA8 |0
+<U571D> \x8F\xB7\xAC |0
+<U571F> \xC5\xDA |0
+<U5720> \x8F\xB7\xAD |0
+<U5722> \x8F\xB7\xAE |0
+<U5723> \x8F\xB7\xAF |0
+<U5724> \x8F\xB7\xB0 |0
+<U5725> \x8F\xB7\xB1 |0
+<U5726> \xD4\xA9 |0
+<U5727> \xB0\xB5 |0
+<U5728> \xBA\xDF |0
+<U5729> \x8F\xB7\xB2 |0
+<U572A> \x8F\xB7\xB3 |0
+<U572C> \x8F\xB7\xB4 |0
+<U572D> \xB7\xBD |0
+<U572E> \x8F\xB7\xB5 |0
+<U572F> \x8F\xB7\xB6 |0
+<U5730> \xC3\xCF |0
+<U5733> \x8F\xB7\xB7 |0
+<U5734> \x8F\xB7\xB8 |0
+<U5737> \xD4\xAA |0
+<U5738> \xD4\xAB |0
+<U573B> \xD4\xAD |0
+<U573D> \x8F\xB7\xB9 |0
+<U573E> \x8F\xB7\xBA |0
+<U573F> \x8F\xB7\xBB |0
+<U5740> \xD4\xAE |0
+<U5742> \xBA\xE4 |0
+<U5745> \x8F\xB7\xBC |0
+<U5746> \x8F\xB7\xBD |0
+<U5747> \xB6\xD1 |0
+<U574A> \xCB\xB7 |0
+<U574C> \x8F\xB7\xBE |0
+<U574D> \x8F\xB7\xBF |0
+<U574E> \xD4\xAC |0
+<U574F> \xD4\xAF |0
+<U5750> \xBA\xC1 |0
+<U5751> \xB9\xA3 |0
+<U5752> \x8F\xB7\xC0 |0
+<U5759> \xF9\xDA |0
+<U5761> \xD4\xB3 |0
+<U5762> \x8F\xB7\xC1 |0
+<U5764> \xBA\xA5 |0
+<U5765> \x8F\xB7\xC2 |3
+<U5765> \xF9\xDB |0
+<U5766> \xC3\xB3 |0
+<U5767> \x8F\xB7\xC3 |0
+<U5768> \x8F\xB7\xC4 |0
+<U5769> \xD4\xB0 |0
+<U576A> \xC4\xDA |0
+<U576B> \x8F\xB7\xC5 |0
+<U576D> \x8F\xB7\xC6 |0
+<U576E> \x8F\xB7\xC7 |0
+<U576F> \x8F\xB7\xC8 |0
+<U5770> \x8F\xB7\xC9 |0
+<U5771> \x8F\xB7\xCA |0
+<U5773> \x8F\xB7\xCB |0
+<U5774> \x8F\xB7\xCC |0
+<U5775> \x8F\xB7\xCD |0
+<U5777> \x8F\xB7\xCE |0
+<U5779> \x8F\xB7\xCF |0
+<U577A> \x8F\xB7\xD0 |0
+<U577B> \x8F\xB7\xD1 |0
+<U577C> \x8F\xB7\xD2 |0
+<U577E> \x8F\xB7\xD3 |0
+<U577F> \xD4\xB4 |0
+<U5781> \x8F\xB7\xD4 |0
+<U5782> \xBF\xE2 |0
+<U5783> \x8F\xB7\xD5 |0
+<U5788> \xD4\xB2 |0
+<U5789> \xD4\xB5 |0
+<U578B> \xB7\xBF |0
+<U578C> \x8F\xB7\xD6 |0
+<U5793> \xD4\xB6 |0
+<U5794> \x8F\xB7\xD7 |0
+<U5795> \x8F\xB7\xE0 |0
+<U5797> \x8F\xB7\xD8 |0
+<U5799> \x8F\xB7\xD9 |0
+<U579A> \x8F\xB7\xDA |0
+<U579C> \x8F\xB7\xDB |0
+<U579D> \x8F\xB7\xDC |0
+<U579E> \x8F\xB7\xDD |0
+<U579F> \x8F\xB7\xDE |0
+<U57A0> \xD4\xB7 |0
+<U57A1> \x8F\xB7\xDF |0
+<U57A2> \xB9\xA4 |0
+<U57A3> \xB3\xC0 |0
+<U57A4> \xD4\xB9 |0
+<U57A7> \x8F\xB7\xE1 |0
+<U57A8> \x8F\xB7\xE2 |0
+<U57A9> \x8F\xB7\xE3 |0
+<U57AA> \xD4\xBA |0
+<U57AC> \x8F\xB7\xE4 |3
+<U57AC> \xF9\xDC |0
+<U57B0> \xD4\xBB |0
+<U57B3> \xD4\xB8 |0
+<U57B8> \x8F\xB7\xE5 |0
+<U57BD> \x8F\xB7\xE6 |0
+<U57C0> \xD4\xB1 |0
+<U57C3> \xD4\xBC |0
+<U57C6> \xD4\xBD |0
+<U57C7> \x8F\xB7\xE7 |3
+<U57C7> \xF9\xDE |0
+<U57C8> \x8F\xB7\xE8 |3
+<U57C8> \xF9\xDD |0
+<U57CB> \xCB\xE4 |0
+<U57CC> \x8F\xB7\xE9 |0
+<U57CE> \xBE\xEB |0
+<U57CF> \x8F\xB7\xEA |0
+<U57D2> \xD4\xBF |0
+<U57D3> \xD4\xC0 |0
+<U57D4> \xD4\xBE |0
+<U57D5> \x8F\xB7\xEB |0
+<U57D6> \xD4\xC2 |0
+<U57DC> \xC7\xB8 |0
+<U57DD> \x8F\xB7\xEC |0
+<U57DE> \x8F\xB7\xED |0
+<U57DF> \xB0\xE8 |0
+<U57E0> \xC9\xD6 |0
+<U57E1> \x8F\xB7\xFE |0
+<U57E3> \xD4\xC3 |0
+<U57E4> \x8F\xB7\xEE |0
+<U57E6> \x8F\xB7\xEF |0
+<U57E7> \x8F\xB7\xF0 |0
+<U57E9> \x8F\xB7\xF1 |0
+<U57ED> \x8F\xB7\xF2 |0
+<U57F0> \x8F\xB7\xF3 |0
+<U57F4> \xBE\xFD |0
+<U57F5> \x8F\xB7\xF4 |0
+<U57F6> \x8F\xB7\xF5 |0
+<U57F7> \xBC\xB9 |0
+<U57F8> \x8F\xB7\xF6 |0
+<U57F9> \xC7\xDD |0
+<U57FA> \xB4\xF0 |0
+<U57FC> \xBA\xEB |0
+<U57FD> \x8F\xB7\xF7 |0
+<U57FE> \x8F\xB7\xF8 |0
+<U57FF> \x8F\xB7\xF9 |0
+<U5800> \xCB\xD9 |0
+<U5802> \xC6\xB2 |0
+<U5803> \x8F\xB7\xFA |0
+<U5804> \x8F\xB7\xFB |0
+<U5805> \xB7\xF8 |0
+<U5806> \xC2\xCF |0
+<U5808> \x8F\xB7\xFC |0
+<U5809> \x8F\xB7\xFD |0
+<U580A> \xD4\xC1 |0
+<U580B> \xD4\xC4 |0
+<U580C> \x8F\xB8\xA1 |0
+<U580D> \x8F\xB8\xA2 |0
+<U5815> \xC2\xC4 |0
+<U5819> \xD4\xC5 |0
+<U581B> \x8F\xB8\xA3 |0
+<U581D> \xD4\xC6 |0
+<U581E> \x8F\xB8\xA4 |0
+<U581F> \x8F\xB8\xA5 |0
+<U5820> \x8F\xB8\xA6 |0
+<U5821> \xD4\xC8 |0
+<U5824> \xC4\xE9 |0
+<U5826> \x8F\xB8\xA7 |0
+<U5827> \x8F\xB8\xA8 |0
+<U582A> \xB4\xAE |0
+<U582D> \x8F\xB8\xA9 |0
+<U582F> \xF4\xA1 |0
+<U5830> \xB1\xE1 |0
+<U5831> \xCA\xF3 |0
+<U5832> \x8F\xB8\xAA |0
+<U5834> \xBE\xEC |0
+<U5835> \xC5\xC8 |0
+<U5839> \x8F\xB8\xAB |0
+<U583A> \xBA\xE6 |0
+<U583D> \xD4\xCE |0
+<U583F> \x8F\xB8\xAC |0
+<U5840> \xCA\xBD |0
+<U5841> \xCE\xDD |0
+<U5849> \x8F\xB8\xAD |0
+<U584A> \xB2\xF4 |0
+<U584B> \xD4\xCA |0
+<U584C> \x8F\xB8\xAE |0
+<U584D> \x8F\xB8\xAF |0
+<U584F> \x8F\xB8\xB0 |0
+<U5850> \x8F\xB8\xB1 |0
+<U5851> \xC1\xBA |0
+<U5852> \xD4\xCD |0
+<U5854> \xC5\xE3 |0
+<U5855> \x8F\xB8\xB2 |0
+<U5857> \xC5\xC9 |0
+<U5858> \xC5\xE4 |0
+<U5859> \xC8\xB9 |0
+<U585A> \xC4\xCD |0
+<U585E> \xBA\xC9 |0
+<U585F> \x8F\xB8\xB3 |0
+<U5861> \x8F\xB8\xB4 |0
+<U5862> \xD4\xC9 |0
+<U5864> \x8F\xB8\xB5 |0
+<U5867> \x8F\xB8\xB6 |0
+<U5868> \x8F\xB8\xB7 |0
+<U5869> \xB1\xF6 |0
+<U586B> \xC5\xB6 |0
+<U5870> \xD4\xCB |0
+<U5872> \xD4\xC7 |0
+<U5875> \xBF\xD0 |0
+<U5878> \x8F\xB8\xB8 |0
+<U5879> \xD4\xCF |0
+<U587C> \x8F\xB8\xB9 |0
+<U587E> \xBD\xCE |0
+<U587F> \x8F\xB8\xBA |0
+<U5880> \x8F\xB8\xBB |0
+<U5881> \x8F\xB8\xBC |0
+<U5883> \xB6\xAD |0
+<U5885> \xD4\xD0 |0
+<U5887> \x8F\xB8\xBD |0
+<U5888> \x8F\xB8\xBE |0
+<U5889> \x8F\xB8\xBF |0
+<U588A> \x8F\xB8\xC0 |0
+<U588C> \x8F\xB8\xC1 |0
+<U588D> \x8F\xB8\xC2 |0
+<U588F> \x8F\xB8\xC3 |0
+<U5890> \x8F\xB8\xC4 |0
+<U5893> \xCA\xE8 |0
+<U5894> \x8F\xB8\xC5 |0
+<U5896> \x8F\xB8\xC6 |0
+<U5897> \xC1\xFD |0
+<U589C> \xC4\xC6 |0
+<U589D> \x8F\xB8\xC7 |0
+<U589E> \xF9\xE1 |0
+<U589F> \xD4\xD2 |0
+<U58A0> \x8F\xB8\xC8 |0
+<U58A1> \x8F\xB8\xC9 |0
+<U58A2> \x8F\xB8\xCA |0
+<U58A6> \x8F\xB8\xCB |0
+<U58A8> \xCB\xCF |0
+<U58A9> \x8F\xB8\xCC |0
+<U58AB> \xD4\xD3 |0
+<U58AE> \xD4\xD8 |0
+<U58B1> \x8F\xB8\xCD |0
+<U58B2> \x8F\xB8\xCE |3
+<U58B2> \xF9\xE2 |0
+<U58B3> \xCA\xAF |0
+<U58B8> \xD4\xD7 |0
+<U58B9> \xD4\xD1 |0
+<U58BA> \xD4\xD4 |0
+<U58BB> \xD4\xD6 |0
+<U58BC> \x8F\xB8\xD0 |0
+<U58BE> \xBA\xA6 |0
+<U58C1> \xCA\xC9 |0
+<U58C2> \x8F\xB8\xD1 |0
+<U58C4> \x8F\xB8\xCF |0
+<U58C5> \xD4\xD9 |0
+<U58C7> \xC3\xC5 |0
+<U58C8> \x8F\xB8\xD2 |0
+<U58CA> \xB2\xF5 |0
+<U58CC> \xBE\xED |0
+<U58CD> \x8F\xB8\xD3 |0
+<U58CE> \x8F\xB8\xD4 |0
+<U58D0> \x8F\xB8\xD5 |0
+<U58D1> \xD4\xDB |0
+<U58D2> \x8F\xB8\xD6 |0
+<U58D3> \xD4\xDA |0
+<U58D4> \x8F\xB8\xD7 |0
+<U58D5> \xB9\xE8 |0
+<U58D6> \x8F\xB8\xD8 |0
+<U58D7> \xD4\xDC |0
+<U58D8> \xD4\xDE |0
+<U58D9> \xD4\xDD |0
+<U58DA> \x8F\xB8\xD9 |0
+<U58DC> \xD4\xE0 |0
+<U58DD> \x8F\xB8\xDA |0
+<U58DE> \xD4\xD5 |0
+<U58DF> \xD4\xE2 |0
+<U58E1> \x8F\xB8\xDB |0
+<U58E2> \x8F\xB8\xDC |0
+<U58E4> \xD4\xE1 |0
+<U58E5> \xD4\xDF |0
+<U58E9> \x8F\xB8\xDD |0
+<U58EB> \xBB\xCE |0
+<U58EC> \xBF\xD1 |0
+<U58EE> \xC1\xD4 |0
+<U58EF> \xD4\xE3 |0
+<U58F0> \xC0\xBC |0
+<U58F1> \xB0\xED |0
+<U58F2> \xC7\xE4 |0
+<U58F3> \x8F\xB8\xDE |0
+<U58F7> \xC4\xDB |0
+<U58F9> \xD4\xE5 |0
+<U58FA> \xD4\xE4 |0
+<U58FB> \xD4\xE6 |0
+<U58FC> \xD4\xE7 |0
+<U58FD> \xD4\xE8 |0
+<U5902> \xD4\xE9 |0
+<U5905> \x8F\xB8\xDF |0
+<U5906> \x8F\xB8\xE0 |0
+<U5909> \xCA\xD1 |0
+<U590A> \xD4\xEA |0
+<U590B> \x8F\xB8\xE1 |3
+<U590B> \xF9\xE3 |0
+<U590C> \x8F\xB8\xE2 |0
+<U590F> \xB2\xC6 |0
+<U5910> \xD4\xEB |0
+<U5912> \x8F\xB8\xE3 |0
+<U5913> \x8F\xB8\xE4 |0
+<U5914> \x8F\xB8\xE5 |0
+<U5915> \xCD\xBC |0
+<U5916> \xB3\xB0 |0
+<U5918> \xD2\xC9 |0
+<U5919> \xBD\xC8 |0
+<U591A> \xC2\xBF |0
+<U591B> \xD4\xEC |0
+<U591C> \xCC\xEB |0
+<U591D> \x8F\xB8\xE7 |0
+<U5921> \x8F\xB8\xE8 |0
+<U5922> \xCC\xB4 |0
+<U5923> \x8F\xB8\xE9 |0
+<U5924> \x8F\xB8\xEA |0
+<U5925> \xD4\xEE |0
+<U5927> \xC2\xE7 |0
+<U5928> \x8F\xB8\xEB |0
+<U5929> \xC5\xB7 |0
+<U592A> \xC2\xC0 |0
+<U592B> \xC9\xD7 |0
+<U592C> \xD4\xEF |0
+<U592D> \xD4\xF0 |0
+<U592E> \xB1\xFB |0
+<U592F> \x8F\xB8\xEC |0
+<U5930> \x8F\xB8\xED |0
+<U5931> \xBC\xBA |0
+<U5932> \xD4\xF1 |0
+<U5933> \x8F\xB8\xEE |0
+<U5935> \x8F\xB8\xEF |0
+<U5936> \x8F\xB8\xF0 |0
+<U5937> \xB0\xD0 |0
+<U5938> \xD4\xF2 |0
+<U593E> \xD4\xF3 |0
+<U593F> \x8F\xB8\xF1 |0
+<U5943> \x8F\xB8\xF2 |0
+<U5944> \xB1\xE2 |0
+<U5946> \x8F\xB8\xF3 |0
+<U5947> \xB4\xF1 |0
+<U5948> \xC6\xE0 |0
+<U5949> \xCA\xF4 |0
+<U594E> \xD4\xF7 |0
+<U594F> \xC1\xD5 |0
+<U5950> \xD4\xF6 |0
+<U5951> \xB7\xC0 |0
+<U5952> \x8F\xB8\xF4 |0
+<U5953> \x8F\xB8\xF5 |3
+<U5953> \xF9\xE4 |0
+<U5954> \xCB\xDB |0
+<U5955> \xD4\xF5 |0
+<U5957> \xC5\xE5 |0
+<U5958> \xD4\xF9 |0
+<U5959> \x8F\xB8\xF6 |0
+<U595A> \xD4\xF8 |0
+<U595B> \x8F\xB8\xF7 |3
+<U595B> \xF9\xE5 |0
+<U595D> \x8F\xB8\xF8 |3
+<U595D> \xF9\xE6 |0
+<U595E> \x8F\xB8\xF9 |0
+<U595F> \x8F\xB8\xFA |0
+<U5960> \xD4\xFB |0
+<U5961> \x8F\xB8\xFB |0
+<U5962> \xD4\xFA |0
+<U5963> \x8F\xB8\xFC |3
+<U5963> \xF9\xE7 |0
+<U5965> \xB1\xFC |0
+<U5967> \xD4\xFC |0
+<U5968> \xBE\xA9 |0
+<U5969> \xD4\xFE |0
+<U596A> \xC3\xA5 |0
+<U596B> \x8F\xB8\xFD |0
+<U596C> \xD4\xFD |0
+<U596D> \x8F\xB8\xFE |0
+<U596E> \xCA\xB3 |0
+<U596F> \x8F\xB9\xA1 |0
+<U5972> \x8F\xB9\xA2 |0
+<U5973> \xBD\xF7 |0
+<U5974> \xC5\xDB |0
+<U5975> \x8F\xB9\xA3 |0
+<U5976> \x8F\xB9\xA4 |0
+<U5978> \xD5\xA1 |0
+<U5979> \x8F\xB9\xA5 |0
+<U597B> \x8F\xB9\xA6 |0
+<U597C> \x8F\xB9\xA7 |0
+<U597D> \xB9\xA5 |0
+<U5981> \xD5\xA2 |0
+<U5982> \xC7\xA1 |0
+<U5983> \xC8\xDE |0
+<U5984> \xCC\xD1 |0
+<U598A> \xC7\xA5 |0
+<U598B> \x8F\xB9\xA8 |0
+<U598C> \x8F\xB9\xA9 |0
+<U598D> \xD5\xAB |0
+<U598E> \x8F\xB9\xAA |0
+<U5992> \x8F\xB9\xAB |0
+<U5993> \xB5\xB8 |0
+<U5995> \x8F\xB9\xAC |0
+<U5996> \xCD\xC5 |0
+<U5997> \x8F\xB9\xAD |0
+<U5999> \xCC\xAF |0
+<U599B> \xD6\xAC |0
+<U599D> \xD5\xA3 |0
+<U599F> \x8F\xB9\xAE |0
+<U59A3> \xD5\xA6 |0
+<U59A4> \x8F\xB9\xAF |3
+<U59A4> \xF9\xE8 |0
+<U59A5> \xC2\xC5 |0
+<U59A7> \x8F\xB9\xB0 |0
+<U59A8> \xCB\xB8 |0
+<U59AC> \xC5\xCA |0
+<U59AD> \x8F\xB9\xB1 |0
+<U59AE> \x8F\xB9\xB2 |0
+<U59AF> \x8F\xB9\xB3 |0
+<U59B0> \x8F\xB9\xB4 |0
+<U59B2> \xD5\xA7 |0
+<U59B3> \x8F\xB9\xB5 |0
+<U59B7> \x8F\xB9\xB6 |0
+<U59B9> \xCB\xE5 |0
+<U59BA> \x8F\xB9\xB7 |3
+<U59BA> \xF9\xE9 |0
+<U59BB> \xBA\xCA |0
+<U59BC> \x8F\xB9\xB8 |0
+<U59BE> \xBE\xAA |0
+<U59C1> \x8F\xB9\xB9 |0
+<U59C3> \x8F\xB9\xBA |0
+<U59C4> \x8F\xB9\xBB |0
+<U59C6> \xD5\xA8 |0
+<U59C8> \x8F\xB9\xBC |0
+<U59C9> \xBB\xD0 |0
+<U59CA> \x8F\xB9\xBD |0
+<U59CB> \xBB\xCF |0
+<U59CD> \x8F\xB9\xBE |0
+<U59D0> \xB0\xB9 |0
+<U59D1> \xB8\xC8 |0
+<U59D2> \x8F\xB9\xBF |0
+<U59D3> \xC0\xAB |0
+<U59D4> \xB0\xD1 |0
+<U59D9> \xD5\xAC |0
+<U59DA> \xD5\xAD |0
+<U59DC> \xD5\xAA |0
+<U59DD> \x8F\xB9\xC0 |0
+<U59DE> \x8F\xB9\xC1 |0
+<U59DF> \x8F\xB9\xC2 |0
+<U59E3> \x8F\xB9\xC3 |0
+<U59E4> \x8F\xB9\xC4 |0
+<U59E5> \xB1\xB8 |0
+<U59E6> \xB4\xAF |0
+<U59E7> \x8F\xB9\xC5 |0
+<U59E8> \xD5\xA9 |0
+<U59EA> \xCC\xC5 |0
+<U59EB> \xC9\xB1 |0
+<U59EE> \x8F\xB9\xC6 |0
+<U59EF> \x8F\xB9\xC7 |0
+<U59F1> \x8F\xB9\xC8 |0
+<U59F2> \x8F\xB9\xC9 |0
+<U59F4> \x8F\xB9\xCA |0
+<U59F6> \xB0\xA8 |0
+<U59F7> \x8F\xB9\xCB |0
+<U59FB> \xB0\xF9 |0
+<U59FF> \xBB\xD1 |0
+<U5A00> \x8F\xB9\xCC |0
+<U5A01> \xB0\xD2 |0
+<U5A03> \xB0\xA3 |0
+<U5A04> \x8F\xB9\xCD |0
+<U5A09> \xD5\xB2 |0
+<U5A0C> \x8F\xB9\xCE |0
+<U5A0D> \x8F\xB9\xCF |0
+<U5A0E> \x8F\xB9\xD0 |0
+<U5A11> \xD5\xB0 |0
+<U5A12> \x8F\xB9\xD1 |0
+<U5A13> \x8F\xB9\xD2 |0
+<U5A18> \xCC\xBC |0
+<U5A1A> \xD5\xB3 |0
+<U5A1C> \xD5\xB1 |0
+<U5A1E> \x8F\xB9\xD3 |0
+<U5A1F> \xD5\xAF |0
+<U5A20> \xBF\xB1 |0
+<U5A23> \x8F\xB9\xD4 |0
+<U5A24> \x8F\xB9\xD5 |0
+<U5A25> \xD5\xAE |0
+<U5A27> \x8F\xB9\xD6 |0
+<U5A28> \x8F\xB9\xD7 |0
+<U5A29> \xCA\xDA |0
+<U5A2A> \x8F\xB9\xD8 |0
+<U5A2D> \x8F\xB9\xD9 |0
+<U5A2F> \xB8\xE4 |0
+<U5A30> \x8F\xB9\xDA |0
+<U5A35> \xD5\xB7 |0
+<U5A36> \xD5\xB8 |0
+<U5A3C> \xBE\xAB |0
+<U5A40> \xD5\xB4 |0
+<U5A41> \xCF\xAC |0
+<U5A44> \x8F\xB9\xDB |0
+<U5A45> \x8F\xB9\xDC |0
+<U5A46> \xC7\xCC |0
+<U5A47> \x8F\xB9\xDD |0
+<U5A48> \x8F\xB9\xDE |0
+<U5A49> \xD5\xB6 |0
+<U5A4C> \x8F\xB9\xDF |0
+<U5A50> \x8F\xB9\xE0 |0
+<U5A55> \x8F\xB9\xE1 |0
+<U5A5A> \xBA\xA7 |0
+<U5A5E> \x8F\xB9\xE2 |0
+<U5A62> \xD5\xB9 |0
+<U5A63> \x8F\xB9\xE3 |0
+<U5A65> \x8F\xB9\xE4 |0
+<U5A66> \xC9\xD8 |0
+<U5A67> \x8F\xB9\xE5 |0
+<U5A6A> \xD5\xBA |0
+<U5A6C> \xD5\xB5 |0
+<U5A6D> \x8F\xB9\xE6 |0
+<U5A77> \x8F\xB9\xE7 |0
+<U5A7A> \x8F\xB9\xE8 |0
+<U5A7B> \x8F\xB9\xE9 |0
+<U5A7E> \x8F\xB9\xEA |0
+<U5A7F> \xCC\xBB |0
+<U5A8B> \x8F\xB9\xEB |0
+<U5A90> \x8F\xB9\xEC |0
+<U5A92> \xC7\xDE |0
+<U5A93> \x8F\xB9\xED |0
+<U5A96> \x8F\xB9\xEE |0
+<U5A99> \x8F\xB9\xEF |0
+<U5A9A> \xD5\xBB |0
+<U5A9B> \xC9\xB2 |0
+<U5A9C> \x8F\xB9\xF0 |0
+<U5A9E> \x8F\xB9\xF1 |0
+<U5A9F> \x8F\xB9\xF2 |0
+<U5AA0> \x8F\xB9\xF3 |0
+<U5AA2> \x8F\xB9\xF4 |0
+<U5AA7> \x8F\xB9\xF5 |0
+<U5AAC> \x8F\xB9\xF6 |0
+<U5AB1> \x8F\xB9\xF7 |0
+<U5AB2> \x8F\xB9\xF8 |0
+<U5AB3> \x8F\xB9\xF9 |0
+<U5AB5> \x8F\xB9\xFA |0
+<U5AB8> \x8F\xB9\xFB |0
+<U5ABA> \x8F\xB9\xFC |0
+<U5ABB> \x8F\xB9\xFD |0
+<U5ABC> \xD5\xBC |0
+<U5ABD> \xD5\xC0 |0
+<U5ABE> \xD5\xBD |0
+<U5ABF> \x8F\xB9\xFE |0
+<U5AC1> \xB2\xC7 |0
+<U5AC2> \xD5\xBF |0
+<U5AC4> \x8F\xBA\xA1 |0
+<U5AC6> \x8F\xBA\xA2 |0
+<U5AC8> \x8F\xBA\xA3 |0
+<U5AC9> \xBC\xBB |0
+<U5ACB> \xD5\xBE |0
+<U5ACC> \xB7\xF9 |0
+<U5ACF> \x8F\xBA\xA4 |0
+<U5AD0> \xD5\xCC |0
+<U5AD6> \xD5\xC5 |0
+<U5AD7> \xD5\xC2 |0
+<U5ADA> \x8F\xBA\xA5 |0
+<U5ADC> \x8F\xBA\xA6 |0
+<U5AE0> \x8F\xBA\xA7 |0
+<U5AE1> \xC3\xE4 |0
+<U5AE3> \xD5\xC1 |0
+<U5AE5> \x8F\xBA\xA8 |0
+<U5AE6> \xD5\xC3 |0
+<U5AE9> \xD5\xC4 |0
+<U5AEA> \x8F\xBA\xA9 |0
+<U5AEE> \x8F\xBA\xAA |0
+<U5AF5> \x8F\xBA\xAB |0
+<U5AF6> \x8F\xBA\xAC |0
+<U5AFA> \xD5\xC6 |0
+<U5AFB> \xD5\xC7 |0
+<U5AFD> \x8F\xBA\xAD |0
+<U5B00> \x8F\xBA\xAE |0
+<U5B01> \x8F\xBA\xAF |0
+<U5B08> \x8F\xBA\xB0 |0
+<U5B09> \xB4\xF2 |0
+<U5B0B> \xD5\xC9 |0
+<U5B0C> \xD5\xC8 |0
+<U5B16> \xD5\xCA |0
+<U5B17> \x8F\xBA\xB1 |0
+<U5B19> \x8F\xBA\xB3 |0
+<U5B1B> \x8F\xBA\xB4 |0
+<U5B1D> \x8F\xBA\xB5 |0
+<U5B21> \x8F\xBA\xB6 |0
+<U5B22> \xBE\xEE |0
+<U5B25> \x8F\xBA\xB7 |0
+<U5B2A> \xD5\xCD |0
+<U5B2C> \xC4\xDC |0
+<U5B2D> \x8F\xBA\xB8 |0
+<U5B30> \xB1\xC5 |0
+<U5B32> \xD5\xCB |0
+<U5B34> \x8F\xBA\xB2 |0
+<U5B36> \xD5\xCE |0
+<U5B38> \x8F\xBA\xB9 |0
+<U5B3E> \xD5\xCF |0
+<U5B40> \xD5\xD2 |0
+<U5B41> \x8F\xBA\xBA |0
+<U5B43> \xD5\xD0 |0
+<U5B45> \xD5\xD1 |0
+<U5B4B> \x8F\xBA\xBB |0
+<U5B4C> \x8F\xBA\xBC |0
+<U5B50> \xBB\xD2 |0
+<U5B51> \xD5\xD3 |0
+<U5B52> \x8F\xBA\xBD |0
+<U5B54> \xB9\xA6 |0
+<U5B55> \xD5\xD4 |0
+<U5B56> \x8F\xBA\xBE |3
+<U5B56> \xF9\xEA |0
+<U5B57> \xBB\xFA |0
+<U5B58> \xC2\xB8 |0
+<U5B5A> \xD5\xD5 |0
+<U5B5B> \xD5\xD6 |0
+<U5B5C> \xBB\xDA |0
+<U5B5D> \xB9\xA7 |0
+<U5B5E> \x8F\xBA\xBF |0
+<U5B5F> \xCC\xD2 |0
+<U5B63> \xB5\xA8 |0
+<U5B64> \xB8\xC9 |0
+<U5B65> \xD5\xD7 |0
+<U5B66> \xB3\xD8 |0
+<U5B68> \x8F\xBA\xC0 |0
+<U5B69> \xD5\xD8 |0
+<U5B6B> \xC2\xB9 |0
+<U5B6E> \x8F\xBA\xC1 |0
+<U5B6F> \x8F\xBA\xC2 |0
+<U5B70> \xD5\xD9 |0
+<U5B71> \xD6\xA3 |0
+<U5B73> \xD5\xDA |0
+<U5B75> \xD5\xDB |0
+<U5B78> \xD5\xDC |0
+<U5B7A> \xD5\xDE |0
+<U5B7C> \x8F\xBA\xC3 |0
+<U5B7D> \x8F\xBA\xC4 |0
+<U5B7E> \x8F\xBA\xC5 |0
+<U5B7F> \x8F\xBA\xC6 |0
+<U5B80> \xD5\xDF |0
+<U5B81> \x8F\xBA\xC7 |0
+<U5B83> \xD5\xE0 |0
+<U5B84> \x8F\xBA\xC8 |0
+<U5B85> \xC2\xF0 |0
+<U5B86> \x8F\xBA\xC9 |0
+<U5B87> \xB1\xA7 |0
+<U5B88> \xBC\xE9 |0
+<U5B89> \xB0\xC2 |0
+<U5B8A> \x8F\xBA\xCA |0
+<U5B8B> \xC1\xD7 |0
+<U5B8C> \xB4\xB0 |0
+<U5B8D> \xBC\xB5 |0
+<U5B8E> \x8F\xBA\xCB |0
+<U5B8F> \xB9\xA8 |0
+<U5B90> \x8F\xBA\xCC |0
+<U5B91> \x8F\xBA\xCD |0
+<U5B93> \x8F\xBA\xCE |0
+<U5B94> \x8F\xBA\xCF |0
+<U5B95> \xC5\xE6 |0
+<U5B96> \x8F\xBA\xD0 |0
+<U5B97> \xBD\xA1 |0
+<U5B98> \xB4\xB1 |0
+<U5B99> \xC3\xE8 |0
+<U5B9A> \xC4\xEA |0
+<U5B9B> \xB0\xB8 |0
+<U5B9C> \xB5\xB9 |0
+<U5B9D> \xCA\xF5 |0
+<U5B9F> \xBC\xC2 |0
+<U5BA2> \xB5\xD2 |0
+<U5BA3> \xC0\xEB |0
+<U5BA4> \xBC\xBC |0
+<U5BA5> \xCD\xA8 |0
+<U5BA6> \xD5\xE1 |0
+<U5BA8> \x8F\xBA\xD1 |0
+<U5BA9> \x8F\xBA\xD2 |0
+<U5BAC> \x8F\xBA\xD3 |0
+<U5BAD> \x8F\xBA\xD4 |0
+<U5BAE> \xB5\xDC |0
+<U5BAF> \x8F\xBA\xD5 |0
+<U5BB0> \xBA\xCB |0
+<U5BB1> \x8F\xBA\xD6 |0
+<U5BB2> \x8F\xBA\xD7 |0
+<U5BB3> \xB3\xB2 |0
+<U5BB4> \xB1\xE3 |0
+<U5BB5> \xBE\xAC |0
+<U5BB6> \xB2\xC8 |0
+<U5BB7> \x8F\xBA\xD8 |0
+<U5BB8> \xD5\xE2 |0
+<U5BB9> \xCD\xC6 |0
+<U5BBA> \x8F\xBA\xD9 |0
+<U5BBC> \x8F\xBA\xDA |0
+<U5BBF> \xBD\xC9 |0
+<U5BC0> \x8F\xBA\xDB |3
+<U5BC0> \xF9\xEB |0
+<U5BC1> \x8F\xBA\xDC |0
+<U5BC2> \xBC\xE4 |0
+<U5BC3> \xD5\xE3 |0
+<U5BC4> \xB4\xF3 |0
+<U5BC5> \xC6\xD2 |0
+<U5BC6> \xCC\xA9 |0
+<U5BC7> \xD5\xE4 |0
+<U5BC9> \xD5\xE5 |0
+<U5BCC> \xC9\xD9 |0
+<U5BCD> \x8F\xBA\xDD |0
+<U5BCF> \x8F\xBA\xDE |0
+<U5BD0> \xD5\xE7 |0
+<U5BD2> \xB4\xA8 |0
+<U5BD3> \xB6\xF7 |0
+<U5BD4> \xD5\xE6 |0
+<U5BD6> \x8F\xBA\xDF |0
+<U5BD7> \x8F\xBA\xE0 |0
+<U5BD8> \x8F\xBA\xE1 |3
+<U5BD8> \xF9\xED |0
+<U5BD9> \x8F\xBA\xE2 |0
+<U5BDA> \x8F\xBA\xE3 |0
+<U5BDB> \xB4\xB2 |0
+<U5BDD> \xBF\xB2 |0
+<U5BDE> \xD5\xEB |0
+<U5BDF> \xBB\xA1 |0
+<U5BE0> \x8F\xBA\xE4 |0
+<U5BE1> \xB2\xC9 |0
+<U5BE2> \xD5\xEA |0
+<U5BE4> \xD5\xE8 |0
+<U5BE5> \xD5\xEC |0
+<U5BE6> \xD5\xE9 |0
+<U5BE7> \xC7\xAB |0
+<U5BE8> \xDC\xCD |0
+<U5BE9> \xBF\xB3 |0
+<U5BEB> \xD5\xED |0
+<U5BEC> \xF9\xEE |0
+<U5BEE> \xCE\xC0 |0
+<U5BEF> \x8F\xBA\xE5 |0
+<U5BF0> \xD5\xEE |0
+<U5BF1> \x8F\xBA\xE6 |0
+<U5BF3> \xD5\xF0 |0
+<U5BF4> \x8F\xBA\xE7 |0
+<U5BF5> \xC3\xFE |0
+<U5BF6> \xD5\xEF |0
+<U5BF8> \xC0\xA3 |0
+<U5BFA> \xBB\xFB |0
+<U5BFD> \x8F\xBA\xE8 |0
+<U5BFE> \xC2\xD0 |0
+<U5BFF> \xBC\xF7 |0
+<U5C01> \xC9\xF5 |0
+<U5C02> \xC0\xEC |0
+<U5C04> \xBC\xCD |0
+<U5C05> \xD5\xF1 |0
+<U5C06> \xBE\xAD |0
+<U5C07> \xD5\xF2 |0
+<U5C08> \xD5\xF3 |0
+<U5C09> \xB0\xD3 |0
+<U5C0A> \xC2\xBA |0
+<U5C0B> \xBF\xD2 |0
+<U5C0C> \x8F\xBA\xE9 |0
+<U5C0D> \xD5\xF4 |0
+<U5C0E> \xC6\xB3 |0
+<U5C0F> \xBE\xAE |0
+<U5C11> \xBE\xAF |0
+<U5C13> \xD5\xF5 |0
+<U5C16> \xC0\xED |0
+<U5C17> \x8F\xBA\xEA |0
+<U5C1A> \xBE\xB0 |0
+<U5C1E> \x8F\xBA\xEB |3
+<U5C1E> \xF9\xEF |0
+<U5C1F> \x8F\xBA\xEC |0
+<U5C20> \xD5\xF6 |0
+<U5C22> \xD5\xF7 |0
+<U5C23> \x8F\xBA\xED |0
+<U5C24> \xCC\xE0 |0
+<U5C26> \x8F\xBA\xEE |0
+<U5C28> \xD5\xF8 |0
+<U5C29> \x8F\xBA\xEF |0
+<U5C2B> \x8F\xBA\xF0 |0
+<U5C2C> \x8F\xBA\xF1 |0
+<U5C2D> \xB6\xC6 |0
+<U5C2E> \x8F\xBA\xF2 |0
+<U5C30> \x8F\xBA\xF3 |0
+<U5C31> \xBD\xA2 |0
+<U5C32> \x8F\xBA\xF4 |0
+<U5C35> \x8F\xBA\xF5 |0
+<U5C36> \x8F\xBA\xF6 |0
+<U5C38> \xD5\xF9 |0
+<U5C39> \xD5\xFA |0
+<U5C3A> \xBC\xDC |0
+<U5C3B> \xBF\xAC |0
+<U5C3C> \xC6\xF4 |0
+<U5C3D> \xBF\xD4 |0
+<U5C3E> \xC8\xF8 |0
+<U5C3F> \xC7\xA2 |0
+<U5C40> \xB6\xC9 |0
+<U5C41> \xD5\xFB |0
+<U5C45> \xB5\xEF |0
+<U5C46> \xD5\xFC |0
+<U5C48> \xB6\xFE |0
+<U5C4A> \xC6\xCF |0
+<U5C4B> \xB2\xB0 |0
+<U5C4D> \xBB\xD3 |0
+<U5C4E> \xD5\xFD |0
+<U5C4F> \xD6\xA2 |0
+<U5C50> \xD6\xA1 |0
+<U5C51> \xB6\xFD |0
+<U5C53> \xD5\xFE |0
+<U5C55> \xC5\xB8 |0
+<U5C59> \x8F\xBA\xF7 |0
+<U5C5A> \x8F\xBA\xF8 |0
+<U5C5B> \xD6\xA2 |1
+<U5C5C> \x8F\xBA\xF9 |0
+<U5C5E> \xC2\xB0 |0
+<U5C60> \xC5\xCB |0
+<U5C61> \xBC\xC8 |0
+<U5C62> \x8F\xBA\xFA |0
+<U5C63> \x8F\xBA\xFB |0
+<U5C64> \xC1\xD8 |0
+<U5C65> \xCD\xFA |0
+<U5C67> \x8F\xBA\xFC |0
+<U5C68> \x8F\xBA\xFD |0
+<U5C69> \x8F\xBA\xFE |0
+<U5C6C> \xD6\xA4 |0
+<U5C6D> \x8F\xBB\xA1 |0
+<U5C6E> \xD6\xA5 |0
+<U5C6F> \xC6\xD6 |0
+<U5C70> \x8F\xBB\xA2 |0
+<U5C71> \xBB\xB3 |0
+<U5C74> \x8F\xBB\xA3 |0
+<U5C75> \x8F\xBB\xA4 |0
+<U5C76> \xD6\xA7 |0
+<U5C79> \xD6\xA8 |0
+<U5C7A> \x8F\xBB\xA5 |0
+<U5C7B> \x8F\xBB\xA6 |0
+<U5C7C> \x8F\xBB\xA7 |0
+<U5C7D> \x8F\xBB\xA8 |0
+<U5C87> \x8F\xBB\xA9 |0
+<U5C88> \x8F\xBB\xAA |0
+<U5C8A> \x8F\xBB\xAB |0
+<U5C8C> \xD6\xA9 |0
+<U5C8F> \x8F\xBB\xAC |0
+<U5C90> \xB4\xF4 |0
+<U5C91> \xD6\xAA |0
+<U5C92> \x8F\xBB\xAD |0
+<U5C94> \xD6\xAB |0
+<U5C9D> \x8F\xBB\xAE |0
+<U5C9F> \x8F\xBB\xAF |0
+<U5CA0> \x8F\xBB\xB0 |0
+<U5CA1> \xB2\xAC |0
+<U5CA2> \x8F\xBB\xB1 |0
+<U5CA3> \x8F\xBB\xB2 |0
+<U5CA6> \x8F\xBB\xB3 |3
+<U5CA6> \xF9\xF0 |0
+<U5CA8> \xC1\xBB |0
+<U5CA9> \xB4\xE4 |0
+<U5CAA> \x8F\xBB\xB4 |0
+<U5CAB> \xD6\xAD |0
+<U5CAC> \xCC\xA8 |0
+<U5CB1> \xC2\xD2 |0
+<U5CB2> \x8F\xBB\xB5 |0
+<U5CB3> \xB3\xD9 |0
+<U5CB4> \x8F\xBB\xB6 |0
+<U5CB5> \x8F\xBB\xB7 |0
+<U5CB6> \xD6\xAF |0
+<U5CB7> \xD6\xB1 |0
+<U5CB8> \xB4\xDF |0
+<U5CBA> \x8F\xBB\xB8 |3
+<U5CBA> \xF9\xF1 |0
+<U5CBB> \xD6\xAE |0
+<U5CBC> \xD6\xB0 |0
+<U5CBE> \xD6\xB3 |0
+<U5CC5> \xD6\xB2 |0
+<U5CC7> \xD6\xB4 |0
+<U5CC9> \x8F\xBB\xB9 |0
+<U5CCB> \x8F\xBB\xBA |0
+<U5CD2> \x8F\xBB\xBB |0
+<U5CD7> \x8F\xBB\xBD |0
+<U5CD9> \xD6\xB5 |0
+<U5CDD> \x8F\xBB\xBC |0
+<U5CE0> \xC6\xBD |0
+<U5CE1> \xB6\xAE |0
+<U5CE8> \xB2\xE5 |0
+<U5CE9> \xD6\xB6 |0
+<U5CEA> \xD6\xBB |0
+<U5CED> \xD6\xB9 |0
+<U5CEE> \x8F\xBB\xBE |0
+<U5CEF> \xCA\xF7 |0
+<U5CF0> \xCA\xF6 |0
+<U5CF1> \x8F\xBB\xBF |0
+<U5CF2> \x8F\xBB\xC0 |0
+<U5CF4> \x8F\xBB\xC1 |0
+<U5CF5> \xF9\xF2 |0
+<U5CF6> \xC5\xE7 |0
+<U5CFA> \xD6\xB8 |0
+<U5CFB> \xBD\xD4 |0
+<U5CFD> \xD6\xB7 |0
+<U5D01> \x8F\xBB\xC2 |0
+<U5D06> \x8F\xBB\xC3 |0
+<U5D07> \xBF\xF2 |0
+<U5D0B> \xD6\xBC |0
+<U5D0D> \x8F\xBB\xC4 |0
+<U5D0E> \xBA\xEA |0
+<U5D11> \xD6\xC2 |0
+<U5D12> \x8F\xBB\xC5 |0
+<U5D14> \xD6\xC3 |0
+<U5D15> \xD6\xBD |0
+<U5D16> \xB3\xB3 |0
+<U5D17> \xD6\xBE |0
+<U5D18> \xD6\xC7 |0
+<U5D19> \xD6\xC6 |0
+<U5D1A> \xD6\xC5 |0
+<U5D1B> \xD6\xC1 |0
+<U5D1F> \xD6\xC0 |0
+<U5D22> \xD6\xC4 |0
+<U5D23> \x8F\xBB\xC7 |0
+<U5D24> \x8F\xBB\xC8 |0
+<U5D26> \x8F\xBB\xC9 |0
+<U5D27> \x8F\xBB\xCA |3
+<U5D27> \xF9\xF3 |0
+<U5D29> \xCA\xF8 |0
+<U5D2B> \x8F\xBB\xC6 |0
+<U5D31> \x8F\xBB\xCB |0
+<U5D34> \x8F\xBB\xCC |0
+<U5D39> \x8F\xBB\xCD |0
+<U5D3D> \x8F\xBB\xCE |0
+<U5D3F> \x8F\xBB\xCF |0
+<U5D42> \x8F\xBB\xD0 |3
+<U5D42> \xF9\xF6 |0
+<U5D43> \x8F\xBB\xD1 |0
+<U5D46> \x8F\xBB\xD2 |0
+<U5D48> \x8F\xBB\xD3 |0
+<U5D4A> \x8F\xBB\xD7 |0
+<U5D4B> \xD6\xCB |0
+<U5D4C> \xD6\xC8 |0
+<U5D4E> \xD6\xCA |0
+<U5D50> \xCD\xF2 |0
+<U5D51> \x8F\xBB\xD5 |0
+<U5D52> \xD6\xC9 |0
+<U5D53> \xF9\xF4 |0
+<U5D55> \x8F\xBB\xD4 |0
+<U5D59> \x8F\xBB\xD6 |0
+<U5D5C> \xD6\xBF |0
+<U5D5F> \x8F\xBB\xD8 |0
+<U5D60> \x8F\xBB\xD9 |0
+<U5D61> \x8F\xBB\xDA |0
+<U5D62> \x8F\xBB\xDB |0
+<U5D64> \x8F\xBB\xDC |0
+<U5D69> \xBF\xF3 |0
+<U5D6A> \x8F\xBB\xDD |0
+<U5D6C> \xD6\xCC |0
+<U5D6D> \x8F\xBB\xDE |3
+<U5D6D> \xF9\xF7 |0
+<U5D6F> \xBA\xB7 |0
+<U5D70> \x8F\xBB\xDF |0
+<U5D73> \xD6\xCD |0
+<U5D76> \xD6\xCE |0
+<U5D79> \x8F\xBB\xE0 |0
+<U5D7A> \x8F\xBB\xE1 |0
+<U5D7E> \x8F\xBB\xE2 |0
+<U5D7F> \x8F\xBB\xE3 |0
+<U5D81> \x8F\xBB\xE4 |0
+<U5D82> \xD6\xD1 |0
+<U5D83> \x8F\xBB\xE5 |0
+<U5D84> \xD6\xD0 |0
+<U5D87> \xD6\xCF |0
+<U5D88> \x8F\xBB\xE6 |0
+<U5D8A> \x8F\xBB\xE7 |0
+<U5D8B> \xC5\xE8 |0
+<U5D8C> \xD6\xBA |0
+<U5D90> \xD6\xD7 |0
+<U5D92> \x8F\xBB\xE8 |0
+<U5D93> \x8F\xBB\xE9 |0
+<U5D94> \x8F\xBB\xEA |0
+<U5D95> \x8F\xBB\xEB |0
+<U5D99> \x8F\xBB\xEC |0
+<U5D9B> \x8F\xBB\xED |0
+<U5D9D> \xD6\xD3 |0
+<U5D9F> \x8F\xBB\xEE |0
+<U5DA0> \x8F\xBB\xEF |0
+<U5DA2> \xD6\xD2 |0
+<U5DA7> \x8F\xBB\xF0 |0
+<U5DAB> \x8F\xBB\xF1 |0
+<U5DAC> \xD6\xD4 |0
+<U5DAE> \xD6\xD5 |0
+<U5DB0> \x8F\xBB\xF2 |0
+<U5DB2> \x8F\xE6\xF4 |0
+<U5DB4> \x8F\xBB\xF3 |0
+<U5DB7> \xD6\xD8 |0
+<U5DB8> \x8F\xBB\xF4 |3
+<U5DB8> \xF9\xF8 |0
+<U5DB9> \x8F\xBB\xF5 |3
+<U5DB9> \xF9\xF9 |0
+<U5DBA> \xCE\xE6 |0
+<U5DBC> \xD6\xD9 |0
+<U5DBD> \xD6\xD6 |0
+<U5DC3> \x8F\xBB\xF6 |0
+<U5DC7> \x8F\xBB\xF7 |0
+<U5DC9> \xD6\xDA |0
+<U5DCB> \x8F\xBB\xF8 |0
+<U5DCC> \xB4\xE0 |0
+<U5DCD> \xD6\xDB |0
+<U5DCE> \x8F\xBB\xFA |0
+<U5DD0> \x8F\xBB\xF9 |3
+<U5DD0> \xF9\xFA |0
+<U5DD2> \xD6\xDD |0
+<U5DD3> \xD6\xDC |0
+<U5DD6> \xD6\xDE |0
+<U5DD8> \x8F\xBB\xFB |0
+<U5DD9> \x8F\xBB\xFC |0
+<U5DDB> \xD6\xDF |0
+<U5DDD> \xC0\xEE |0
+<U5DDE> \xBD\xA3 |0
+<U5DE0> \x8F\xBB\xFD |0
+<U5DE1> \xBD\xE4 |0
+<U5DE3> \xC1\xE3 |0
+<U5DE4> \x8F\xBB\xFE |0
+<U5DE5> \xB9\xA9 |0
+<U5DE6> \xBA\xB8 |0
+<U5DE7> \xB9\xAA |0
+<U5DE8> \xB5\xF0 |0
+<U5DE9> \x8F\xBC\xA1 |0
+<U5DEB> \xD6\xE0 |0
+<U5DEE> \xBA\xB9 |0
+<U5DF1> \xB8\xCA |0
+<U5DF2> \xD6\xE1 |0
+<U5DF3> \xCC\xA6 |0
+<U5DF4> \xC7\xC3 |0
+<U5DF5> \xD6\xE2 |0
+<U5DF7> \xB9\xAB |0
+<U5DF8> \x8F\xBC\xA2 |0
+<U5DF9> \x8F\xBC\xA3 |0
+<U5DFB> \xB4\xAC |0
+<U5DFD> \xC3\xA7 |0
+<U5DFE> \xB6\xD2 |0
+<U5E00> \x8F\xBC\xA4 |0
+<U5E02> \xBB\xD4 |0
+<U5E03> \xC9\xDB |0
+<U5E06> \xC8\xC1 |0
+<U5E07> \x8F\xBC\xA5 |0
+<U5E0B> \xD6\xE3 |0
+<U5E0C> \xB4\xF5 |0
+<U5E0D> \x8F\xBC\xA6 |0
+<U5E11> \xD6\xE6 |0
+<U5E12> \x8F\xBC\xA7 |0
+<U5E14> \x8F\xBC\xA8 |0
+<U5E15> \x8F\xBC\xA9 |0
+<U5E16> \xC4\xA1 |0
+<U5E18> \x8F\xBC\xAA |0
+<U5E19> \xD6\xE5 |0
+<U5E1A> \xD6\xE4 |0
+<U5E1B> \xD6\xE7 |0
+<U5E1D> \xC4\xEB |0
+<U5E1F> \x8F\xBC\xAB |0
+<U5E20> \x8F\xBC\xAC |0
+<U5E25> \xBF\xE3 |0
+<U5E28> \x8F\xBC\xAE |0
+<U5E2B> \xBB\xD5 |0
+<U5E2D> \xC0\xCA |0
+<U5E2E> \x8F\xBC\xAD |0
+<U5E2F> \xC2\xD3 |0
+<U5E30> \xB5\xA2 |0
+<U5E32> \x8F\xBC\xAF |0
+<U5E33> \xC4\xA2 |0
+<U5E35> \x8F\xBC\xB0 |0
+<U5E36> \xD6\xE8 |0
+<U5E37> \xD6\xE9 |0
+<U5E38> \xBE\xEF |0
+<U5E3D> \xCB\xB9 |0
+<U5E3E> \x8F\xBC\xB1 |0
+<U5E40> \xD6\xEC |0
+<U5E43> \xD6\xEB |0
+<U5E44> \xD6\xEA |0
+<U5E45> \xC9\xFD |0
+<U5E47> \xD6\xF3 |0
+<U5E49> \x8F\xBC\xB4 |0
+<U5E4B> \x8F\xBC\xB2 |0
+<U5E4C> \xCB\xDA |0
+<U5E4E> \xD6\xED |0
+<U5E50> \x8F\xBC\xB3 |0
+<U5E51> \x8F\xBC\xB5 |0
+<U5E54> \xD6\xEF |0
+<U5E55> \xCB\xEB |0
+<U5E56> \x8F\xBC\xB6 |0
+<U5E57> \xD6\xEE |0
+<U5E58> \x8F\xBC\xB7 |0
+<U5E5B> \x8F\xBC\xB8 |0
+<U5E5C> \x8F\xBC\xB9 |0
+<U5E5E> \x8F\xBC\xBA |0
+<U5E5F> \xD6\xF0 |0
+<U5E61> \xC8\xA8 |0
+<U5E62> \xD6\xF1 |0
+<U5E63> \xCA\xBE |0
+<U5E64> \xD6\xF2 |0
+<U5E68> \x8F\xBC\xBB |0
+<U5E6A> \x8F\xBC\xBC |0
+<U5E6B> \x8F\xBC\xBD |0
+<U5E6C> \x8F\xBC\xBE |0
+<U5E6D> \x8F\xBC\xBF |0
+<U5E6E> \x8F\xBC\xC0 |0
+<U5E70> \x8F\xBC\xC1 |0
+<U5E72> \xB4\xB3 |0
+<U5E73> \xCA\xBF |0
+<U5E74> \xC7\xAF |0
+<U5E75> \xD6\xF4 |0
+<U5E76> \xD6\xF5 |0
+<U5E78> \xB9\xAC |0
+<U5E79> \xB4\xB4 |0
+<U5E7A> \xD6\xF6 |0
+<U5E7B> \xB8\xB8 |0
+<U5E7C> \xCD\xC4 |0
+<U5E7D> \xCD\xA9 |0
+<U5E7E> \xB4\xF6 |0
+<U5E7F> \xD6\xF8 |0
+<U5E80> \x8F\xBC\xC2 |0
+<U5E81> \xC4\xA3 |0
+<U5E83> \xB9\xAD |0
+<U5E84> \xBE\xB1 |0
+<U5E87> \xC8\xDF |0
+<U5E8A> \xBE\xB2 |0
+<U5E8B> \x8F\xBC\xC3 |0
+<U5E8E> \x8F\xBC\xC4 |0
+<U5E8F> \xBD\xF8 |0
+<U5E95> \xC4\xEC |0
+<U5E96> \xCA\xF9 |0
+<U5E97> \xC5\xB9 |0
+<U5E9A> \xB9\xAE |0
+<U5E9C> \xC9\xDC |0
+<U5EA0> \xD6\xF9 |0
+<U5EA2> \x8F\xBC\xC5 |0
+<U5EA4> \x8F\xBC\xC6 |0
+<U5EA5> \x8F\xBC\xC7 |0
+<U5EA6> \xC5\xD9 |0
+<U5EA7> \xBA\xC2 |0
+<U5EA8> \x8F\xBC\xC8 |0
+<U5EAA> \x8F\xBC\xC9 |0
+<U5EAB> \xB8\xCB |0
+<U5EAC> \x8F\xBC\xCA |0
+<U5EAD> \xC4\xED |0
+<U5EB1> \x8F\xBC\xCB |0
+<U5EB3> \x8F\xBC\xCC |0
+<U5EB5> \xB0\xC3 |0
+<U5EB6> \xBD\xEE |0
+<U5EB7> \xB9\xAF |0
+<U5EB8> \xCD\xC7 |0
+<U5EBD> \x8F\xBC\xCD |0
+<U5EBE> \x8F\xBC\xCE |0
+<U5EBF> \x8F\xBC\xCF |0
+<U5EC1> \xD6\xFA |0
+<U5EC2> \xD6\xFB |0
+<U5EC3> \xC7\xD1 |0
+<U5EC6> \x8F\xBC\xD0 |0
+<U5EC8> \xD6\xFC |0
+<U5EC9> \xCE\xF7 |0
+<U5ECA> \xCF\xAD |0
+<U5ECB> \x8F\xBC\xD2 |0
+<U5ECC> \x8F\xBC\xD1 |0
+<U5ECE> \x8F\xBC\xD3 |0
+<U5ECF> \xD6\xFE |0
+<U5ED0> \xD6\xFD |0
+<U5ED1> \x8F\xBC\xD4 |0
+<U5ED2> \x8F\xBC\xD5 |0
+<U5ED3> \xB3\xC7 |0
+<U5ED4> \x8F\xBC\xD6 |0
+<U5ED5> \x8F\xBC\xD7 |0
+<U5ED6> \xD7\xA1 |0
+<U5EDA> \xD7\xA4 |0
+<U5EDB> \xD7\xA5 |0
+<U5EDC> \x8F\xBC\xD8 |0
+<U5EDD> \xD7\xA3 |0
+<U5EDE> \x8F\xBC\xD9 |0
+<U5EDF> \xC9\xC0 |0
+<U5EE0> \xBE\xB3 |0
+<U5EE1> \xD7\xA7 |0
+<U5EE2> \xD7\xA6 |0
+<U5EE3> \xD7\xA2 |0
+<U5EE5> \x8F\xBC\xDA |0
+<U5EE8> \xD7\xA8 |0
+<U5EE9> \xD7\xA9 |0
+<U5EEB> \x8F\xBC\xDB |0
+<U5EEC> \xD7\xAA |0
+<U5EF0> \xD7\xAD |0
+<U5EF1> \xD7\xAB |0
+<U5EF3> \xD7\xAC |0
+<U5EF4> \xD7\xAE |0
+<U5EF6> \xB1\xE4 |0
+<U5EF7> \xC4\xEE |0
+<U5EF8> \xD7\xAF |0
+<U5EFA> \xB7\xFA |0
+<U5EFB> \xB2\xF6 |0
+<U5EFC> \xC7\xB6 |0
+<U5EFE> \xD7\xB0 |0
+<U5EFF> \xC6\xFB |0
+<U5F01> \xCA\xDB |0
+<U5F02> \x8F\xBC\xDC |0
+<U5F03> \xD7\xB1 |0
+<U5F04> \xCF\xAE |0
+<U5F06> \x8F\xBC\xDD |0
+<U5F07> \x8F\xBC\xDE |0
+<U5F08> \x8F\xBC\xDF |0
+<U5F09> \xD7\xB2 |0
+<U5F0A> \xCA\xC0 |0
+<U5F0B> \xD7\xB5 |0
+<U5F0C> \xD0\xA1 |0
+<U5F0D> \xD0\xB1 |0
+<U5F0E> \x8F\xBC\xE0 |0
+<U5F0F> \xBC\xB0 |0
+<U5F10> \xC6\xF5 |0
+<U5F11> \xD7\xB6 |0
+<U5F13> \xB5\xDD |0
+<U5F14> \xC4\xA4 |0
+<U5F15> \xB0\xFA |0
+<U5F16> \xD7\xB7 |0
+<U5F17> \xCA\xA6 |0
+<U5F18> \xB9\xB0 |0
+<U5F19> \x8F\xBC\xE1 |0
+<U5F1B> \xC3\xD0 |0
+<U5F1C> \x8F\xBC\xE2 |0
+<U5F1D> \x8F\xBC\xE3 |0
+<U5F1F> \xC4\xEF |0
+<U5F21> \x8F\xBC\xE4 |3
+<U5F21> \xF9\xFB |0
+<U5F22> \x8F\xBC\xE5 |0
+<U5F23> \x8F\xBC\xE6 |0
+<U5F24> \x8F\xBC\xE7 |0
+<U5F25> \xCC\xEF |0
+<U5F26> \xB8\xB9 |0
+<U5F27> \xB8\xCC |0
+<U5F28> \x8F\xBC\xE8 |0
+<U5F29> \xD7\xB8 |0
+<U5F2B> \x8F\xBC\xE9 |0
+<U5F2C> \x8F\xBC\xEA |0
+<U5F2D> \xD7\xB9 |0
+<U5F2E> \x8F\xBC\xEB |0
+<U5F2F> \xD7\xBF |0
+<U5F30> \x8F\xBC\xEC |0
+<U5F31> \xBC\xE5 |0
+<U5F34> \x8F\xBC\xED |3
+<U5F34> \xF9\xFC |0
+<U5F35> \xC4\xA5 |0
+<U5F36> \x8F\xBC\xEE |0
+<U5F37> \xB6\xAF |0
+<U5F38> \xD7\xBA |0
+<U5F3B> \x8F\xBC\xEF |0
+<U5F3C> \xC9\xAB |0
+<U5F3D> \x8F\xBC\xF0 |0
+<U5F3E> \xC3\xC6 |0
+<U5F3F> \x8F\xBC\xF1 |0
+<U5F40> \x8F\xBC\xF2 |0
+<U5F41> \xD7\xBB |0
+<U5F44> \x8F\xBC\xF3 |0
+<U5F45> \x8F\xBC\xF4 |3
+<U5F45> \xF9\xAC |0
+<U5F47> \x8F\xBC\xF5 |0
+<U5F48> \xD7\xBC |0
+<U5F4A> \xB6\xB0 |0
+<U5F4C> \xD7\xBD |0
+<U5F4D> \x8F\xBC\xF6 |0
+<U5F4E> \xD7\xBE |0
+<U5F50> \x8F\xBC\xF7 |0
+<U5F51> \xD7\xC0 |0
+<U5F53> \xC5\xF6 |0
+<U5F54> \x8F\xBC\xF8 |0
+<U5F56> \xD7\xC1 |0
+<U5F57> \xD7\xC2 |0
+<U5F58> \x8F\xBC\xF9 |0
+<U5F59> \xD7\xC3 |0
+<U5F5B> \x8F\xBC\xFA |0
+<U5F5C> \xD7\xB4 |0
+<U5F5D> \xD7\xB3 |0
+<U5F60> \x8F\xBC\xFB |0
+<U5F61> \xD7\xC4 |0
+<U5F62> \xB7\xC1 |0
+<U5F63> \x8F\xBC\xFC |0
+<U5F64> \x8F\xBC\xFD |0
+<U5F66> \xC9\xA7 |0
+<U5F67> \x8F\xBC\xFE |3
+<U5F67> \xF9\xFD |0
+<U5F69> \xBA\xCC |0
+<U5F6A> \xC9\xB7 |0
+<U5F6B> \xC4\xA6 |0
+<U5F6C> \xC9\xCB |0
+<U5F6D> \xD7\xC5 |0
+<U5F6F> \x8F\xBD\xA1 |0
+<U5F70> \xBE\xB4 |0
+<U5F71> \xB1\xC6 |0
+<U5F72> \x8F\xBD\xA2 |0
+<U5F73> \xD7\xC6 |0
+<U5F74> \x8F\xBD\xA3 |0
+<U5F75> \x8F\xBD\xA4 |0
+<U5F77> \xD7\xC7 |0
+<U5F78> \x8F\xBD\xA5 |0
+<U5F79> \xCC\xF2 |0
+<U5F7A> \x8F\xBD\xA6 |0
+<U5F7C> \xC8\xE0 |0
+<U5F7D> \x8F\xBD\xA7 |0
+<U5F7E> \x8F\xBD\xA8 |0
+<U5F7F> \xD7\xCA |0
+<U5F80> \xB1\xFD |0
+<U5F81> \xC0\xAC |0
+<U5F82> \xD7\xC9 |0
+<U5F83> \xD7\xC8 |0
+<U5F84> \xB7\xC2 |0
+<U5F85> \xC2\xD4 |0
+<U5F87> \xD7\xCE |0
+<U5F88> \xD7\xCC |0
+<U5F89> \x8F\xBD\xA9 |0
+<U5F8A> \xD7\xCB |0
+<U5F8B> \xCE\xA7 |0
+<U5F8C> \xB8\xE5 |0
+<U5F8D> \x8F\xBD\xAA |0
+<U5F8F> \x8F\xBD\xAB |0
+<U5F90> \xBD\xF9 |0
+<U5F91> \xD7\xCD |0
+<U5F92> \xC5\xCC |0
+<U5F93> \xBD\xBE |0
+<U5F96> \x8F\xBD\xAC |0
+<U5F97> \xC6\xC0 |0
+<U5F98> \xD7\xD1 |0
+<U5F99> \xD7\xD0 |0
+<U5F9C> \x8F\xBD\xAD |0
+<U5F9D> \x8F\xBD\xAE |0
+<U5F9E> \xD7\xCF |0
+<U5FA0> \xD7\xD2 |0
+<U5FA1> \xB8\xE6 |0
+<U5FA2> \x8F\xBD\xAF |0
+<U5FA4> \x8F\xBD\xB2 |0
+<U5FA7> \x8F\xBD\xB0 |0
+<U5FA8> \xD7\xD3 |0
+<U5FA9> \xC9\xFC |0
+<U5FAA> \xBD\xDB |0
+<U5FAB> \x8F\xBD\xB1 |0
+<U5FAC> \x8F\xBD\xB3 |0
+<U5FAD> \xD7\xD4 |0
+<U5FAE> \xC8\xF9 |0
+<U5FAF> \x8F\xBD\xB4 |0
+<U5FB0> \x8F\xBD\xB5 |0
+<U5FB1> \x8F\xBD\xB6 |0
+<U5FB3> \xC6\xC1 |0
+<U5FB4> \xC4\xA7 |0
+<U5FB7> \xF9\xFE |0
+<U5FB8> \x8F\xBD\xB7 |0
+<U5FB9> \xC5\xB0 |0
+<U5FBC> \xD7\xD5 |0
+<U5FBD> \xB5\xAB |0
+<U5FC3> \xBF\xB4 |0
+<U5FC4> \x8F\xBD\xB8 |0
+<U5FC5> \xC9\xAC |0
+<U5FC7> \x8F\xBD\xB9 |0
+<U5FC8> \x8F\xBD\xBA |0
+<U5FC9> \x8F\xBD\xBB |0
+<U5FCB> \x8F\xBD\xBC |0
+<U5FCC> \xB4\xF7 |0
+<U5FCD> \xC7\xA6 |0
+<U5FD0> \x8F\xBD\xBD |0
+<U5FD1> \x8F\xBD\xBE |0
+<U5FD2> \x8F\xBD\xBF |0
+<U5FD3> \x8F\xBD\xC0 |0
+<U5FD4> \x8F\xBD\xC1 |0
+<U5FD6> \xD7\xD6 |0
+<U5FD7> \xBB\xD6 |0
+<U5FD8> \xCB\xBA |0
+<U5FD9> \xCB\xBB |0
+<U5FDC> \xB1\xFE |0
+<U5FDD> \xD7\xDB |0
+<U5FDE> \x8F\xBD\xC2 |3
+<U5FDE> \xFA\xA1 |0
+<U5FE0> \xC3\xE9 |0
+<U5FE1> \x8F\xBD\xC3 |0
+<U5FE2> \x8F\xBD\xC4 |0
+<U5FE4> \xD7\xD8 |0
+<U5FE8> \x8F\xBD\xC5 |0
+<U5FE9> \x8F\xBD\xC6 |0
+<U5FEA> \x8F\xBD\xC7 |0
+<U5FEB> \xB2\xF7 |0
+<U5FEC> \x8F\xBD\xC8 |0
+<U5FED> \x8F\xBD\xC9 |0
+<U5FEE> \x8F\xBD\xCA |0
+<U5FEF> \x8F\xBD\xCB |0
+<U5FF0> \xD8\xAD |0
+<U5FF1> \xD7\xDA |0
+<U5FF2> \x8F\xBD\xCC |0
+<U5FF3> \x8F\xBD\xCD |0
+<U5FF5> \xC7\xB0 |0
+<U5FF6> \x8F\xBD\xCE |0
+<U5FF8> \xD7\xD9 |0
+<U5FFA> \x8F\xBD\xCF |0
+<U5FFB> \xD7\xD7 |0
+<U5FFC> \x8F\xBD\xD0 |0
+<U5FFD> \xB9\xFA |0
+<U5FFF> \xD7\xDD |0
+<U6007> \x8F\xBD\xD1 |0
+<U600A> \x8F\xBD\xD2 |0
+<U600D> \x8F\xBD\xD3 |0
+<U600E> \xD7\xE3 |0
+<U600F> \xD7\xE9 |0
+<U6010> \xD7\xE1 |0
+<U6012> \xC5\xDC |0
+<U6013> \x8F\xBD\xD4 |0
+<U6014> \x8F\xBD\xD5 |0
+<U6015> \xD7\xE6 |0
+<U6016> \xC9\xDD |0
+<U6017> \x8F\xBD\xD6 |0
+<U6018> \x8F\xBD\xD7 |0
+<U6019> \xD7\xE0 |0
+<U601A> \x8F\xBD\xD8 |0
+<U601B> \xD7\xE5 |0
+<U601C> \xCE\xE7 |0
+<U601D> \xBB\xD7 |0
+<U601F> \x8F\xBD\xD9 |0
+<U6020> \xC2\xD5 |0
+<U6021> \xD7\xDE |0
+<U6024> \x8F\xBD\xDA |0
+<U6025> \xB5\xDE |0
+<U6026> \xD7\xE8 |0
+<U6027> \xC0\xAD |0
+<U6028> \xB1\xE5 |0
+<U6029> \xD7\xE2 |0
+<U602A> \xB2\xF8 |0
+<U602B> \xD7\xE7 |0
+<U602D> \x8F\xBD\xDB |0
+<U602F> \xB6\xB1 |0
+<U6031> \xD7\xE4 |0
+<U6033> \x8F\xBD\xDC |0
+<U6035> \x8F\xBD\xDD |0
+<U603A> \xD7\xEA |0
+<U6040> \x8F\xBD\xDE |0
+<U6041> \xD7\xEC |0
+<U6042> \xD7\xF6 |0
+<U6043> \xD7\xF4 |0
+<U6046> \xD7\xF1 |0
+<U6047> \x8F\xBD\xDF |0
+<U6048> \x8F\xBD\xE0 |0
+<U6049> \x8F\xBD\xE1 |0
+<U604A> \xD7\xF0 |0
+<U604B> \xCE\xF8 |0
+<U604C> \x8F\xBD\xE2 |0
+<U604D> \xD7\xF2 |0
+<U6050> \xB6\xB2 |0
+<U6051> \x8F\xBD\xE3 |0
+<U6052> \xB9\xB1 |0
+<U6054> \x8F\xBD\xE4 |0
+<U6055> \xBD\xFA |0
+<U6056> \x8F\xBD\xE5 |0
+<U6057> \x8F\xBD\xE6 |0
+<U6059> \xD7\xF9 |0
+<U605A> \xD7\xEB |0
+<U605D> \x8F\xBD\xE7 |3
+<U605D> \xFA\xA2 |0
+<U605F> \xD7\xEF |0
+<U6060> \xD7\xDF |0
+<U6061> \x8F\xBD\xE8 |0
+<U6062> \xB2\xFA |0
+<U6063> \xD7\xF3 |0
+<U6064> \xD7\xF5 |0
+<U6065> \xC3\xD1 |0
+<U6067> \x8F\xBD\xE9 |0
+<U6068> \xBA\xA8 |0
+<U6069> \xB2\xB8 |0
+<U606A> \xD7\xED |0
+<U606B> \xD7\xF8 |0
+<U606C> \xD7\xF7 |0
+<U606D> \xB6\xB3 |0
+<U606F> \xC2\xA9 |0
+<U6070> \xB3\xE6 |0
+<U6071> \x8F\xBD\xEA |0
+<U6075> \xB7\xC3 |0
+<U6077> \xD7\xEE |0
+<U607E> \x8F\xBD\xEB |0
+<U607F> \x8F\xBD\xEC |0
+<U6081> \xD7\xFA |0
+<U6082> \x8F\xBD\xED |0
+<U6083> \xD7\xFD |0
+<U6084> \xD8\xA1 |0
+<U6085> \xFA\xA3 |0
+<U6086> \x8F\xBD\xEE |0
+<U6088> \x8F\xBD\xEF |0
+<U6089> \xBC\xBD |0
+<U608A> \x8F\xBD\xF0 |3
+<U608A> \xFA\xA4 |0
+<U608B> \xD8\xA7 |0
+<U608C> \xC4\xF0 |0
+<U608D> \xD7\xFB |0
+<U608E> \x8F\xBD\xF1 |0
+<U6091> \x8F\xBD\xF2 |0
+<U6092> \xD8\xA5 |0
+<U6093> \x8F\xBD\xF3 |0
+<U6094> \xB2\xF9 |0
+<U6095> \x8F\xBD\xF4 |0
+<U6096> \xD8\xA3 |0
+<U6097> \xD8\xA4 |0
+<U6098> \x8F\xBD\xF5 |0
+<U609A> \xD7\xFE |0
+<U609B> \xD8\xA2 |0
+<U609D> \x8F\xBD\xF6 |0
+<U609E> \x8F\xBD\xF7 |0
+<U609F> \xB8\xE7 |0
+<U60A0> \xCD\xAA |0
+<U60A2> \x8F\xBD\xF8 |0
+<U60A3> \xB4\xB5 |0
+<U60A4> \x8F\xBD\xF9 |0
+<U60A5> \x8F\xBD\xFA |0
+<U60A6> \xB1\xD9 |0
+<U60A7> \xD8\xA6 |0
+<U60A8> \x8F\xBD\xFB |0
+<U60A9> \xC7\xBA |0
+<U60AA> \xB0\xAD |0
+<U60B0> \x8F\xBD\xFC |0
+<U60B1> \x8F\xBD\xFD |0
+<U60B2> \xC8\xE1 |0
+<U60B3> \xD7\xDC |0
+<U60B4> \xD8\xAC |0
+<U60B5> \xD8\xB0 |0
+<U60B6> \xCC\xE5 |0
+<U60B7> \x8F\xBD\xFE |0
+<U60B8> \xD8\xA9 |0
+<U60BB> \x8F\xBE\xA1 |0
+<U60BC> \xC5\xE9 |0
+<U60BD> \xD8\xAE |0
+<U60BE> \x8F\xBE\xA2 |0
+<U60C2> \x8F\xBE\xA3 |0
+<U60C4> \x8F\xBE\xA4 |0
+<U60C5> \xBE\xF0 |0
+<U60C6> \xD8\xAF |0
+<U60C7> \xC6\xD7 |0
+<U60C8> \x8F\xBE\xA5 |0
+<U60C9> \x8F\xBE\xA6 |0
+<U60CA> \x8F\xBE\xA7 |0
+<U60CB> \x8F\xBE\xA8 |0
+<U60CE> \x8F\xBE\xA9 |0
+<U60CF> \x8F\xBE\xAA |0
+<U60D1> \xCF\xC7 |0
+<U60D3> \xD8\xAB |0
+<U60D4> \x8F\xBE\xAB |0
+<U60D5> \x8F\xBE\xAC |3
+<U60D5> \xFA\xA6 |0
+<U60D8> \xD8\xB1 |0
+<U60D9> \x8F\xBE\xAD |0
+<U60DA> \xB9\xFB |0
+<U60DB> \x8F\xBE\xAE |0
+<U60DC> \xC0\xCB |0
+<U60DD> \x8F\xBE\xAF |0
+<U60DE> \x8F\xBE\xB0 |3
+<U60DE> \xFA\xA5 |0
+<U60DF> \xB0\xD4 |0
+<U60E0> \xD8\xAA |0
+<U60E1> \xD8\xA8 |0
+<U60E2> \x8F\xBE\xB1 |0
+<U60E3> \xC1\xDA |0
+<U60E5> \x8F\xBE\xB2 |0
+<U60E7> \xD7\xFC |0
+<U60E8> \xBB\xB4 |0
+<U60F0> \xC2\xC6 |0
+<U60F1> \xD8\xBD |0
+<U60F2> \x8F\xBE\xB3 |3
+<U60F2> \xFA\xA8 |0
+<U60F3> \xC1\xDB |0
+<U60F4> \xD8\xB8 |0
+<U60F5> \x8F\xBE\xB4 |0
+<U60F6> \xD8\xB5 |0
+<U60F7> \xD8\xB6 |0
+<U60F8> \x8F\xBE\xB5 |0
+<U60F9> \xBC\xE6 |0
+<U60FA> \xD8\xB9 |0
+<U60FB> \xD8\xBC |0
+<U60FC> \x8F\xBE\xB6 |0
+<U60FD> \x8F\xBE\xB7 |0
+<U6100> \xD8\xB7 |0
+<U6101> \xBD\xA5 |0
+<U6102> \x8F\xBE\xB8 |0
+<U6103> \xD8\xBA |0
+<U6106> \xD8\xB4 |0
+<U6107> \x8F\xBE\xB9 |0
+<U6108> \xCC\xFC |0
+<U6109> \xCC\xFB |0
+<U610A> \x8F\xBE\xBA |0
+<U610C> \x8F\xBE\xBB |0
+<U610D> \xD8\xBE |0
+<U610E> \xD8\xBF |0
+<U610F> \xB0\xD5 |0
+<U6110> \x8F\xBE\xBC |0
+<U6111> \x8F\xBE\xBD |3
+<U6111> \xFA\xA9 |0
+<U6112> \x8F\xBE\xBE |0
+<U6113> \x8F\xBE\xBF |0
+<U6114> \x8F\xBE\xC0 |0
+<U6115> \xD8\xB3 |0
+<U6116> \x8F\xBE\xC1 |0
+<U6117> \x8F\xBE\xC2 |0
+<U6119> \x8F\xBE\xC3 |0
+<U611A> \xB6\xF2 |0
+<U611B> \xB0\xA6 |0
+<U611C> \x8F\xBE\xC4 |0
+<U611E> \x8F\xBE\xC5 |0
+<U611F> \xB4\xB6 |0
+<U6120> \xFA\xA7 |0
+<U6121> \xD8\xBB |0
+<U6122> \x8F\xBE\xC6 |0
+<U6127> \xD8\xC3 |0
+<U6128> \xD8\xC2 |0
+<U612A> \x8F\xBE\xC7 |0
+<U612B> \x8F\xBE\xC8 |0
+<U612C> \xD8\xC7 |0
+<U6130> \x8F\xBE\xC9 |3
+<U6130> \xFA\xAB |0
+<U6131> \x8F\xBE\xCA |0
+<U6134> \xD8\xC8 |0
+<U6135> \x8F\xBE\xCB |0
+<U6136> \x8F\xBE\xCC |0
+<U6137> \x8F\xBE\xCD |3
+<U6137> \xFA\xAA |0
+<U6139> \x8F\xBE\xCE |0
+<U613C> \xD8\xC6 |0
+<U613D> \xD8\xC9 |0
+<U613E> \xD8\xC1 |0
+<U613F> \xD8\xC5 |0
+<U6141> \x8F\xBE\xCF |0
+<U6142> \xD8\xCA |0
+<U6144> \xD8\xCB |0
+<U6145> \x8F\xBE\xD0 |0
+<U6146> \x8F\xBE\xD1 |0
+<U6147> \xD8\xC0 |0
+<U6148> \xBB\xFC |0
+<U6149> \x8F\xBE\xD2 |0
+<U614A> \xD8\xC4 |0
+<U614B> \xC2\xD6 |0
+<U614C> \xB9\xB2 |0
+<U614D> \xD8\xB2 |0
+<U614E> \xBF\xB5 |0
+<U6153> \xD8\xD8 |0
+<U6155> \xCA\xE9 |0
+<U6158> \xD8\xCE |0
+<U6159> \xD8\xCF |0
+<U615A> \xD8\xD0 |0
+<U615D> \xD8\xD7 |0
+<U615E> \x8F\xBE\xD3 |0
+<U615F> \xD8\xD6 |0
+<U6160> \x8F\xBE\xD4 |0
+<U6162> \xCB\xFD |0
+<U6163> \xB4\xB7 |0
+<U6165> \xD8\xD4 |0
+<U6167> \xB7\xC5 |0
+<U6168> \xB3\xB4 |0
+<U616B> \xD8\xD1 |0
+<U616C> \x8F\xBE\xD5 |0
+<U616E> \xCE\xB8 |0
+<U616F> \xD8\xD3 |0
+<U6170> \xB0\xD6 |0
+<U6171> \xD8\xD5 |0
+<U6172> \x8F\xBE\xD6 |0
+<U6173> \xD8\xCC |0
+<U6174> \xD8\xD2 |0
+<U6175> \xD8\xD9 |0
+<U6176> \xB7\xC4 |0
+<U6177> \xD8\xCD |0
+<U6178> \x8F\xBE\xD7 |0
+<U617B> \x8F\xBE\xD8 |0
+<U617C> \x8F\xBE\xD9 |0
+<U617E> \xCD\xDD |0
+<U617F> \x8F\xBE\xDA |0
+<U6180> \x8F\xBE\xDB |0
+<U6181> \x8F\xBE\xDC |0
+<U6182> \xCD\xAB |0
+<U6183> \x8F\xBE\xDD |0
+<U6184> \x8F\xBE\xDE |0
+<U6187> \xD8\xDC |0
+<U618A> \xD8\xE0 |0
+<U618B> \x8F\xBE\xDF |0
+<U618D> \x8F\xBE\xE0 |0
+<U618E> \xC1\xFE |0
+<U6190> \xCE\xF9 |0
+<U6191> \xD8\xE1 |0
+<U6192> \x8F\xBE\xE1 |0
+<U6193> \x8F\xBE\xE2 |0
+<U6194> \xD8\xDE |0
+<U6196> \xD8\xDB |0
+<U6197> \x8F\xBE\xE3 |0
+<U6198> \x8F\xBE\xE4 |3
+<U6198> \xFA\xAC |0
+<U6199> \xD8\xDA |0
+<U619A> \xD8\xDF |0
+<U619C> \x8F\xBE\xE5 |0
+<U619D> \x8F\xBE\xE6 |0
+<U619F> \x8F\xBE\xE7 |0
+<U61A0> \x8F\xBE\xE8 |0
+<U61A4> \xCA\xB0 |0
+<U61A5> \x8F\xBE\xE9 |0
+<U61A7> \xC6\xB4 |0
+<U61A8> \x8F\xBE\xEA |0
+<U61A9> \xB7\xC6 |0
+<U61AA> \x8F\xBE\xEB |0
+<U61AB> \xD8\xE2 |0
+<U61AC> \xD8\xDD |0
+<U61AD> \x8F\xBE\xEC |0
+<U61AE> \xD8\xE3 |0
+<U61B2> \xB7\xFB |0
+<U61B6> \xB2\xB1 |0
+<U61B8> \x8F\xBE\xED |0
+<U61B9> \x8F\xBE\xEE |0
+<U61BA> \xD8\xEB |0
+<U61BC> \x8F\xBE\xEF |0
+<U61BE> \xB4\xB8 |0
+<U61C0> \x8F\xBE\xF0 |0
+<U61C1> \x8F\xBE\xF1 |0
+<U61C2> \x8F\xBE\xF2 |0
+<U61C3> \xD8\xE9 |0
+<U61C6> \xD8\xEA |0
+<U61C7> \xBA\xA9 |0
+<U61C8> \xD8\xE8 |0
+<U61C9> \xD8\xE6 |0
+<U61CA> \xD8\xE5 |0
+<U61CB> \xD8\xEC |0
+<U61CC> \xD8\xE4 |0
+<U61CD> \xD8\xEE |0
+<U61CE> \x8F\xBE\xF3 |0
+<U61CF> \x8F\xBE\xF4 |0
+<U61D0> \xB2\xFB |0
+<U61D5> \x8F\xBE\xF5 |0
+<U61DC> \x8F\xBE\xF6 |0
+<U61DD> \x8F\xBE\xF7 |0
+<U61DE> \x8F\xBE\xF8 |0
+<U61DF> \x8F\xBE\xF9 |0
+<U61E1> \x8F\xBE\xFA |0
+<U61E2> \x8F\xBE\xFB |0
+<U61E3> \xD8\xF0 |0
+<U61E5> \x8F\xBE\xFE |0
+<U61E6> \xD8\xEF |0
+<U61E7> \x8F\xBE\xFC |0
+<U61E9> \x8F\xBE\xFD |0
+<U61EC> \x8F\xBF\xA1 |0
+<U61ED> \x8F\xBF\xA2 |0
+<U61EF> \x8F\xBF\xA3 |0
+<U61F2> \xC4\xA8 |0
+<U61F4> \xD8\xF3 |0
+<U61F6> \xD8\xF1 |0
+<U61F7> \xD8\xE7 |0
+<U61F8> \xB7\xFC |0
+<U61FA> \xD8\xF2 |0
+<U61FC> \xD8\xF6 |0
+<U61FD> \xD8\xF5 |0
+<U61FE> \xD8\xF7 |0
+<U61FF> \xD8\xF4 |0
+<U6200> \xD8\xF8 |0
+<U6201> \x8F\xBF\xA4 |0
+<U6203> \x8F\xBF\xA5 |0
+<U6204> \x8F\xBF\xA6 |0
+<U6207> \x8F\xBF\xA7 |0
+<U6208> \xD8\xF9 |0
+<U6209> \xD8\xFA |0
+<U620A> \xCA\xEA |0
+<U620C> \xD8\xFC |0
+<U620D> \xD8\xFB |0
+<U620E> \xBD\xBF |0
+<U6210> \xC0\xAE |0
+<U6211> \xB2\xE6 |0
+<U6212> \xB2\xFC |0
+<U6213> \x8F\xBF\xA8 |3
+<U6213> \xFA\xAD |0
+<U6214> \xD8\xFD |0
+<U6215> \x8F\xBF\xA9 |0
+<U6216> \xB0\xBF |0
+<U621A> \xC0\xCC |0
+<U621B> \xD8\xFE |0
+<U621C> \x8F\xBF\xAA |0
+<U621D> \xEC\xC3 |0
+<U621E> \xD9\xA1 |0
+<U621F> \xB7\xE1 |0
+<U6220> \x8F\xBF\xAB |0
+<U6221> \xD9\xA2 |0
+<U6222> \x8F\xBF\xAC |0
+<U6223> \x8F\xBF\xAD |0
+<U6226> \xC0\xEF |0
+<U6227> \x8F\xBF\xAE |0
+<U6229> \x8F\xBF\xAF |0
+<U622A> \xD9\xA3 |0
+<U622B> \x8F\xBF\xB0 |0
+<U622E> \xD9\xA4 |0
+<U622F> \xB5\xBA |0
+<U6230> \xD9\xA5 |0
+<U6232> \xD9\xA6 |0
+<U6233> \xD9\xA7 |0
+<U6234> \xC2\xD7 |0
+<U6238> \xB8\xCD |0
+<U6239> \x8F\xBF\xB1 |0
+<U623B> \xCC\xE1 |0
+<U623D> \x8F\xBF\xB2 |0
+<U623F> \xCB\xBC |0
+<U6240> \xBD\xEA |0
+<U6241> \xD9\xA8 |0
+<U6242> \x8F\xBF\xB3 |0
+<U6243> \x8F\xBF\xB4 |0
+<U6244> \x8F\xBF\xB5 |0
+<U6246> \x8F\xBF\xB6 |0
+<U6247> \xC0\xF0 |0
+<U6248> \xEE\xBD |0
+<U6249> \xC8\xE2 |0
+<U624B> \xBC\xEA |0
+<U624C> \x8F\xBF\xB7 |0
+<U624D> \xBA\xCD |0
+<U624E> \xD9\xA9 |0
+<U6250> \x8F\xBF\xB8 |0
+<U6251> \x8F\xBF\xB9 |0
+<U6252> \x8F\xBF\xBA |0
+<U6253> \xC2\xC7 |0
+<U6254> \x8F\xBF\xBB |0
+<U6255> \xCA\xA7 |0
+<U6256> \x8F\xBF\xBC |0
+<U6258> \xC2\xF1 |0
+<U625A> \x8F\xBF\xBD |0
+<U625B> \xD9\xAC |0
+<U625C> \x8F\xBF\xBE |0
+<U625E> \xD9\xAA |0
+<U6260> \xD9\xAD |0
+<U6263> \xD9\xAB |0
+<U6264> \x8F\xBF\xBF |0
+<U6268> \xD9\xAE |0
+<U626D> \x8F\xBF\xC0 |0
+<U626E> \xCA\xB1 |0
+<U626F> \x8F\xBF\xC1 |0
+<U6271> \xB0\xB7 |0
+<U6273> \x8F\xBF\xC2 |0
+<U6276> \xC9\xDE |0
+<U6279> \xC8\xE3 |0
+<U627A> \x8F\xBF\xC3 |0
+<U627C> \xD9\xAF |0
+<U627D> \x8F\xBF\xC4 |0
+<U627E> \xD9\xB2 |0
+<U627F> \xBE\xB5 |0
+<U6280> \xB5\xBB |0
+<U6282> \xD9\xB0 |0
+<U6283> \xD9\xB7 |0
+<U6284> \xBE\xB6 |0
+<U6289> \xD9\xB1 |0
+<U628A> \xC7\xC4 |0
+<U628D> \x8F\xBF\xC5 |0
+<U628E> \x8F\xBF\xC6 |0
+<U628F> \x8F\xBF\xC7 |0
+<U6290> \x8F\xBF\xC8 |0
+<U6291> \xCD\xDE |0
+<U6292> \xD9\xB3 |0
+<U6293> \xD9\xB4 |0
+<U6294> \xD9\xB8 |0
+<U6295> \xC5\xEA |0
+<U6296> \xD9\xB5 |0
+<U6297> \xB9\xB3 |0
+<U6298> \xC0\xDE |0
+<U629B> \xD9\xC6 |0
+<U629C> \xC8\xB4 |0
+<U629E> \xC2\xF2 |0
+<U62A6> \x8F\xBF\xC9 |3
+<U62A6> \xFA\xAE |0
+<U62A8> \x8F\xBF\xCA |0
+<U62AB> \xC8\xE4 |0
+<U62AC> \xDA\xAD |0
+<U62B1> \xCA\xFA |0
+<U62B3> \x8F\xBF\xCB |0
+<U62B5> \xC4\xF1 |0
+<U62B6> \x8F\xBF\xCC |0
+<U62B7> \x8F\xBF\xCD |0
+<U62B9> \xCB\xF5 |0
+<U62BA> \x8F\xBF\xCE |0
+<U62BB> \xD9\xBB |0
+<U62BC> \xB2\xA1 |0
+<U62BD> \xC3\xEA |0
+<U62BE> \x8F\xBF\xCF |0
+<U62BF> \x8F\xBF\xD0 |0
+<U62C2> \xD9\xC4 |0
+<U62C4> \x8F\xBF\xD1 |0
+<U62C5> \xC3\xB4 |0
+<U62C6> \xD9\xBE |0
+<U62C7> \xD9\xC5 |0
+<U62C8> \xD9\xC0 |0
+<U62C9> \xD9\xC7 |0
+<U62CA> \xD9\xC3 |0
+<U62CC> \xD9\xC2 |0
+<U62CD> \xC7\xEF |0
+<U62CE> \x8F\xBF\xD2 |0
+<U62CF> \xD9\xBC |0
+<U62D0> \xB2\xFD |0
+<U62D1> \xD9\xBA |0
+<U62D2> \xB5\xF1 |0
+<U62D3> \xC2\xF3 |0
+<U62D4> \xD9\xB6 |0
+<U62D5> \x8F\xBF\xD3 |0
+<U62D6> \x8F\xBF\xD4 |0
+<U62D7> \xD9\xB9 |0
+<U62D8> \xB9\xB4 |0
+<U62D9> \xC0\xDB |0
+<U62DA> \x8F\xBF\xD5 |0
+<U62DB> \xBE\xB7 |0
+<U62DC> \xD9\xC1 |0
+<U62DD> \xC7\xD2 |0
+<U62E0> \xB5\xF2 |0
+<U62E1> \xB3\xC8 |0
+<U62EA> \x8F\xBF\xD6 |0
+<U62EC> \xB3\xE7 |0
+<U62ED> \xBF\xA1 |0
+<U62EE> \xD9\xC9 |0
+<U62EF> \xD9\xCE |0
+<U62F1> \xD9\xCA |0
+<U62F2> \x8F\xBF\xD7 |0
+<U62F3> \xB7\xFD |0
+<U62F4> \x8F\xBF\xD8 |0
+<U62F5> \xD9\xCF |0
+<U62F6> \xBB\xA2 |0
+<U62F7> \xB9\xE9 |0
+<U62FC> \x8F\xBF\xD9 |0
+<U62FD> \x8F\xBF\xDA |0
+<U62FE> \xBD\xA6 |0
+<U62FF> \xD9\xBD |0
+<U6301> \xBB\xFD |0
+<U6302> \xD9\xCC |0
+<U6303> \x8F\xBF\xDB |0
+<U6304> \x8F\xBF\xDC |0
+<U6307> \xBB\xD8 |0
+<U6308> \xD9\xCD |0
+<U6309> \xB0\xC4 |0
+<U630A> \x8F\xBF\xDD |0
+<U630B> \x8F\xBF\xDE |0
+<U630C> \xD9\xC8 |0
+<U630D> \x8F\xBF\xDF |0
+<U6310> \x8F\xBF\xE0 |0
+<U6311> \xC4\xA9 |0
+<U6313> \x8F\xBF\xE1 |0
+<U6316> \x8F\xBF\xE2 |0
+<U6318> \x8F\xBF\xE3 |0
+<U6319> \xB5\xF3 |0
+<U631F> \xB6\xB4 |0
+<U6327> \xD9\xCB |0
+<U6328> \xB0\xA7 |0
+<U6329> \x8F\xBF\xE4 |0
+<U632A> \x8F\xBF\xE5 |0
+<U632B> \xBA\xC3 |0
+<U632D> \x8F\xBF\xE6 |0
+<U632F> \xBF\xB6 |0
+<U6335> \x8F\xBF\xE7 |0
+<U6336> \x8F\xBF\xE8 |0
+<U6339> \x8F\xBF\xE9 |0
+<U633A> \xC4\xF2 |0
+<U633C> \x8F\xBF\xEA |0
+<U633D> \xC8\xD4 |0
+<U633E> \xD9\xD1 |0
+<U633F> \xC1\xDE |0
+<U6341> \x8F\xBF\xEB |0
+<U6342> \x8F\xBF\xEC |0
+<U6343> \x8F\xBF\xED |0
+<U6344> \x8F\xBF\xEE |0
+<U6346> \x8F\xBF\xEF |0
+<U6349> \xC2\xAA |0
+<U634A> \x8F\xBF\xF0 |0
+<U634B> \x8F\xBF\xF1 |0
+<U634C> \xBB\xAB |0
+<U634D> \xD9\xD2 |0
+<U634E> \x8F\xBF\xF2 |0
+<U634F> \xD9\xD4 |0
+<U6350> \xD9\xD0 |0
+<U6352> \x8F\xBF\xF3 |0
+<U6353> \x8F\xBF\xF4 |0
+<U6354> \x8F\xBF\xF5 |0
+<U6355> \xCA\xE1 |0
+<U6357> \xC4\xBD |0
+<U6358> \x8F\xBF\xF6 |0
+<U635B> \x8F\xBF\xF7 |0
+<U635C> \xC1\xDC |0
+<U6365> \x8F\xBF\xF8 |0
+<U6366> \x8F\xBF\xF9 |0
+<U6367> \xCA\xFB |0
+<U6368> \xBC\xCE |0
+<U6369> \xD9\xE0 |0
+<U636B> \xD9\xDF |0
+<U636C> \x8F\xBF\xFA |0
+<U636D> \x8F\xBF\xFB |0
+<U636E> \xBF\xF8 |0
+<U6371> \x8F\xBF\xFC |0
+<U6372> \xB7\xFE |0
+<U6374> \x8F\xBF\xFD |0
+<U6375> \x8F\xBF\xFE |0
+<U6376> \xD9\xD9 |0
+<U6377> \xBE\xB9 |0
+<U6378> \x8F\xC0\xA1 |0
+<U637A> \xC6\xE8 |0
+<U637B> \xC7\xB1 |0
+<U637C> \x8F\xC0\xA2 |0
+<U637D> \x8F\xC0\xA3 |0
+<U637F> \x8F\xC0\xA4 |0
+<U6380> \xD9\xD7 |0
+<U6382> \x8F\xC0\xA5 |0
+<U6383> \xC1\xDD |0
+<U6384> \x8F\xC0\xA6 |0
+<U6387> \x8F\xC0\xA7 |0
+<U6388> \xBC\xF8 |0
+<U6389> \xD9\xDC |0
+<U638A> \x8F\xC0\xA8 |0
+<U638C> \xBE\xB8 |0
+<U638E> \xD9\xD6 |0
+<U638F> \xD9\xDB |0
+<U6390> \x8F\xC0\xA9 |0
+<U6392> \xC7\xD3 |0
+<U6394> \x8F\xC0\xAA |0
+<U6395> \x8F\xC0\xAB |0
+<U6396> \xD9\xD5 |0
+<U6398> \xB7\xA1 |0
+<U6399> \x8F\xC0\xAC |0
+<U639A> \x8F\xC0\xAD |0
+<U639B> \xB3\xDD |0
+<U639E> \x8F\xC0\xAE |0
+<U639F> \xD9\xDD |0
+<U63A0> \xCE\xAB |0
+<U63A1> \xBA\xCE |0
+<U63A2> \xC3\xB5 |0
+<U63A3> \xD9\xDA |0
+<U63A4> \x8F\xC0\xAF |0
+<U63A5> \xC0\xDC |0
+<U63A6> \x8F\xC0\xB0 |0
+<U63A7> \xB9\xB5 |0
+<U63A8> \xBF\xE4 |0
+<U63A9> \xB1\xE6 |0
+<U63AA> \xC1\xBC |0
+<U63AB> \xD9\xD8 |0
+<U63AC> \xB5\xC5 |0
+<U63AD> \x8F\xC0\xB1 |0
+<U63AE> \x8F\xC0\xB2 |0
+<U63AF> \x8F\xC0\xB3 |0
+<U63B2> \xB7\xC7 |0
+<U63B4> \xC4\xCF |0
+<U63B5> \xD9\xDE |0
+<U63BB> \xC1\xDF |0
+<U63BD> \x8F\xC0\xB4 |0
+<U63BE> \xD9\xE1 |0
+<U63C0> \xD9\xE3 |0
+<U63C1> \x8F\xC0\xB5 |0
+<U63C3> \xC2\xB7 |0
+<U63C4> \xD9\xE9 |0
+<U63C5> \x8F\xC0\xB6 |0
+<U63C6> \xD9\xE4 |0
+<U63C8> \x8F\xC0\xB7 |0
+<U63C9> \xD9\xE6 |0
+<U63CE> \x8F\xC0\xB8 |0
+<U63CF> \xC9\xC1 |0
+<U63D0> \xC4\xF3 |0
+<U63D1> \x8F\xC0\xB9 |0
+<U63D2> \xD9\xE7 |0
+<U63D3> \x8F\xC0\xBA |0
+<U63D4> \x8F\xC0\xBB |0
+<U63D5> \x8F\xC0\xBC |0
+<U63D6> \xCD\xAC |0
+<U63DA> \xCD\xC8 |0
+<U63DB> \xB4\xB9 |0
+<U63DC> \x8F\xC0\xBD |0
+<U63E0> \x8F\xC0\xBE |0
+<U63E1> \xB0\xAE |0
+<U63E3> \xD9\xE5 |0
+<U63E5> \x8F\xC0\xBF |0
+<U63E9> \xD9\xE2 |0
+<U63EA> \x8F\xC0\xC0 |0
+<U63EC> \x8F\xC0\xC1 |0
+<U63EE> \xB4\xF8 |0
+<U63F2> \x8F\xC0\xC2 |0
+<U63F3> \x8F\xC0\xC3 |0
+<U63F4> \xB1\xE7 |0
+<U63F5> \x8F\xC0\xC4 |3
+<U63F5> \xFA\xAF |0
+<U63F6> \xD9\xE8 |0
+<U63F8> \x8F\xC0\xC5 |0
+<U63F9> \x8F\xC0\xC6 |0
+<U63FA> \xCD\xC9 |0
+<U6406> \xD9\xEC |0
+<U6409> \x8F\xC0\xC7 |0
+<U640A> \x8F\xC0\xC8 |0
+<U640D> \xC2\xBB |0
+<U640F> \xD9\xF3 |0
+<U6410> \x8F\xC0\xC9 |0
+<U6412> \x8F\xC0\xCA |0
+<U6413> \xD9\xED |0
+<U6414> \x8F\xC0\xCB |0
+<U6416> \xD9\xEA |0
+<U6417> \xD9\xF1 |0
+<U6418> \x8F\xC0\xCC |0
+<U641C> \xD9\xD3 |0
+<U641E> \x8F\xC0\xCD |0
+<U6420> \x8F\xC0\xCE |0
+<U6422> \x8F\xC0\xCF |0
+<U6424> \x8F\xC0\xD0 |0
+<U6425> \x8F\xC0\xD1 |0
+<U6426> \xD9\xEE |0
+<U6428> \xD9\xF2 |0
+<U6429> \x8F\xC0\xD2 |0
+<U642A> \x8F\xC0\xD3 |0
+<U642C> \xC8\xC2 |0
+<U642D> \xC5\xEB |0
+<U642F> \x8F\xC0\xD4 |0
+<U6430> \x8F\xC0\xD5 |0
+<U6434> \xD9\xEB |0
+<U6435> \x8F\xC0\xD6 |0
+<U6436> \xD9\xEF |0
+<U643A> \xB7\xC8 |0
+<U643D> \x8F\xC0\xD7 |0
+<U643E> \xBA\xF1 |0
+<U643F> \x8F\xC0\xD8 |0
+<U6442> \xC0\xDD |0
+<U644B> \x8F\xC0\xD9 |0
+<U644E> \xD9\xF7 |0
+<U644F> \x8F\xC0\xDA |0
+<U6451> \x8F\xC0\xDB |0
+<U6452> \x8F\xC0\xDC |0
+<U6453> \x8F\xC0\xDD |0
+<U6454> \x8F\xC0\xDE |0
+<U6458> \xC5\xA6 |0
+<U645A> \x8F\xC0\xDF |0
+<U645B> \x8F\xC0\xE0 |0
+<U645C> \x8F\xC0\xE1 |0
+<U645D> \x8F\xC0\xE2 |0
+<U645F> \x8F\xC0\xE3 |0
+<U6460> \x8F\xC0\xE4 |3
+<U6460> \xFA\xB0 |0
+<U6461> \x8F\xC0\xE5 |0
+<U6463> \x8F\xC0\xE6 |0
+<U6467> \xD9\xF4 |0
+<U6469> \xCB\xE0 |0
+<U646D> \x8F\xC0\xE7 |0
+<U646F> \xD9\xF5 |0
+<U6473> \x8F\xC0\xE8 |0
+<U6474> \x8F\xC0\xE9 |0
+<U6476> \xD9\xF6 |0
+<U6478> \xCC\xCE |0
+<U647A> \xC0\xA2 |0
+<U647B> \x8F\xC0\xEA |0
+<U647D> \x8F\xC0\xEB |0
+<U6483> \xB7\xE2 |0
+<U6485> \x8F\xC0\xEC |0
+<U6487> \x8F\xC0\xED |0
+<U6488> \xD9\xFD |0
+<U648F> \x8F\xC0\xEE |0
+<U6490> \x8F\xC0\xEF |0
+<U6491> \x8F\xC0\xF0 |0
+<U6492> \xBB\xB5 |0
+<U6493> \xD9\xFA |0
+<U6495> \xD9\xF9 |0
+<U6498> \x8F\xC0\xF1 |0
+<U6499> \x8F\xC0\xF2 |0
+<U649A> \xC7\xB2 |0
+<U649B> \x8F\xC0\xF3 |0
+<U649D> \x8F\xC0\xF4 |3
+<U649D> \xFA\xB1 |0
+<U649E> \xC6\xB5 |0
+<U649F> \x8F\xC0\xF5 |0
+<U64A1> \x8F\xC0\xF6 |0
+<U64A3> \x8F\xC0\xF7 |0
+<U64A4> \xC5\xB1 |0
+<U64A5> \xD9\xFB |0
+<U64A6> \x8F\xC0\xF8 |0
+<U64A8> \x8F\xC0\xF9 |0
+<U64A9> \xD9\xFC |0
+<U64AB> \xC9\xEF |0
+<U64AC> \x8F\xC0\xFA |0
+<U64AD> \xC7\xC5 |0
+<U64AE> \xBB\xA3 |0
+<U64B0> \xC0\xF1 |0
+<U64B2> \xCB\xD0 |0
+<U64B3> \x8F\xC0\xFB |0
+<U64B9> \xB3\xC9 |0
+<U64BB> \xDA\xA5 |0
+<U64BC> \xD9\xFE |0
+<U64BD> \x8F\xC0\xFC |0
+<U64BE> \x8F\xC0\xFD |0
+<U64BF> \x8F\xC0\xFE |0
+<U64C1> \xCD\xCA |0
+<U64C2> \xDA\xA7 |0
+<U64C4> \x8F\xC1\xA1 |0
+<U64C5> \xDA\xA3 |0
+<U64C7> \xDA\xA4 |0
+<U64C9> \x8F\xC1\xA2 |0
+<U64CA> \x8F\xC1\xA3 |0
+<U64CB> \x8F\xC1\xA4 |0
+<U64CC> \x8F\xC1\xA5 |0
+<U64CD> \xC1\xE0 |0
+<U64CE> \x8F\xC1\xA6 |3
+<U64CE> \xFA\xB2 |0
+<U64D0> \x8F\xC1\xA7 |0
+<U64D1> \x8F\xC1\xA8 |0
+<U64D2> \xDA\xA2 |0
+<U64D4> \xD9\xBF |0
+<U64D5> \x8F\xC1\xA9 |0
+<U64D7> \x8F\xC1\xAA |0
+<U64D8> \xDA\xA6 |0
+<U64DA> \xDA\xA1 |0
+<U64E0> \xDA\xAB |0
+<U64E1> \xDA\xAC |0
+<U64E2> \xC5\xA7 |0
+<U64E3> \xDA\xAE |0
+<U64E4> \x8F\xC1\xAB |0
+<U64E5> \x8F\xC1\xAC |0
+<U64E6> \xBB\xA4 |0
+<U64E7> \xDA\xA9 |0
+<U64E9> \x8F\xC1\xAD |0
+<U64EA> \x8F\xC1\xAE |0
+<U64EC> \xB5\xBC |0
+<U64ED> \x8F\xC1\xAF |0
+<U64EF> \xDA\xAF |0
+<U64F0> \x8F\xC1\xB0 |0
+<U64F1> \xDA\xA8 |0
+<U64F2> \xDA\xB3 |0
+<U64F4> \xDA\xB2 |0
+<U64F5> \x8F\xC1\xB1 |0
+<U64F6> \xDA\xB1 |0
+<U64F7> \x8F\xC1\xB2 |0
+<U64FA> \xDA\xB4 |0
+<U64FB> \x8F\xC1\xB3 |0
+<U64FD> \xDA\xB6 |0
+<U64FE> \xBE\xF1 |0
+<U64FF> \x8F\xC1\xB4 |0
+<U6500> \xDA\xB5 |0
+<U6501> \x8F\xC1\xB5 |0
+<U6504> \x8F\xC1\xB6 |0
+<U6505> \xDA\xB9 |0
+<U6508> \x8F\xC1\xB7 |0
+<U6509> \x8F\xC1\xB8 |0
+<U650A> \x8F\xC1\xB9 |0
+<U650F> \x8F\xC1\xBA |0
+<U6513> \x8F\xC1\xBB |0
+<U6514> \x8F\xC1\xBC |0
+<U6516> \x8F\xC1\xBD |0
+<U6518> \xDA\xB7 |0
+<U6519> \x8F\xC1\xBE |0
+<U651B> \x8F\xC1\xBF |0
+<U651C> \xDA\xB8 |0
+<U651D> \xD9\xF0 |0
+<U651E> \x8F\xC1\xC0 |0
+<U651F> \x8F\xC1\xC1 |0
+<U6522> \x8F\xC1\xC2 |0
+<U6523> \xDA\xBB |0
+<U6524> \xDA\xBA |0
+<U6526> \x8F\xC1\xC3 |0
+<U6529> \x8F\xC1\xC4 |0
+<U652A> \xD9\xF8 |0
+<U652B> \xDA\xBC |0
+<U652C> \xDA\xB0 |0
+<U652E> \x8F\xC1\xC5 |0
+<U652F> \xBB\xD9 |0
+<U6531> \x8F\xC1\xC6 |0
+<U6534> \xDA\xBD |0
+<U6535> \xDA\xBE |0
+<U6536> \xDA\xC0 |0
+<U6537> \xDA\xBF |0
+<U6538> \xDA\xC1 |0
+<U6539> \xB2\xFE |0
+<U653A> \x8F\xC1\xC7 |0
+<U653B> \xB9\xB6 |0
+<U653C> \x8F\xC1\xC8 |0
+<U653D> \x8F\xC1\xC9 |0
+<U653E> \xCA\xFC |0
+<U653F> \xC0\xAF |0
+<U6543> \x8F\xC1\xCA |0
+<U6545> \xB8\xCE |0
+<U6547> \x8F\xC1\xCB |0
+<U6548> \xDA\xC3 |0
+<U6549> \x8F\xC1\xCC |0
+<U654D> \xDA\xC6 |0
+<U654E> \xFA\xB3 |0
+<U654F> \xC9\xD2 |0
+<U6550> \x8F\xC1\xCD |0
+<U6551> \xB5\xDF |0
+<U6552> \x8F\xC1\xCE |0
+<U6554> \x8F\xC1\xCF |0
+<U6555> \xDA\xC5 |0
+<U6556> \xDA\xC4 |0
+<U6557> \xC7\xD4 |0
+<U6558> \xDA\xC7 |0
+<U6559> \xB6\xB5 |0
+<U655D> \xDA\xC9 |0
+<U655E> \xDA\xC8 |0
+<U655F> \x8F\xC1\xD0 |0
+<U6560> \x8F\xC1\xD1 |0
+<U6562> \xB4\xBA |0
+<U6563> \xBB\xB6 |0
+<U6566> \xC6\xD8 |0
+<U6567> \x8F\xC1\xD2 |0
+<U656B> \x8F\xC1\xD3 |0
+<U656C> \xB7\xC9 |0
+<U6570> \xBF\xF4 |0
+<U6572> \xDA\xCA |0
+<U6574> \xC0\xB0 |0
+<U6575> \xC5\xA8 |0
+<U6577> \xC9\xDF |0
+<U6578> \xDA\xCB |0
+<U657A> \x8F\xC1\xD4 |0
+<U657D> \x8F\xC1\xD5 |0
+<U6581> \x8F\xC1\xD6 |0
+<U6582> \xDA\xCC |0
+<U6583> \xDA\xCD |0
+<U6585> \x8F\xC1\xD7 |0
+<U6587> \xCA\xB8 |0
+<U6588> \xD5\xDD |0
+<U6589> \xC0\xC6 |0
+<U658A> \x8F\xC1\xD8 |0
+<U658C> \xC9\xCC |0
+<U658E> \xBA\xD8 |0
+<U6590> \xC8\xE5 |0
+<U6591> \xC8\xC3 |0
+<U6592> \x8F\xC1\xD9 |0
+<U6595> \x8F\xC1\xDA |0
+<U6597> \xC5\xCD |0
+<U6598> \x8F\xC1\xDB |0
+<U6599> \xCE\xC1 |0
+<U659B> \xDA\xCF |0
+<U659C> \xBC\xD0 |0
+<U659D> \x8F\xC1\xDC |0
+<U659F> \xDA\xD0 |0
+<U65A0> \x8F\xC1\xDD |0
+<U65A1> \xB0\xB6 |0
+<U65A3> \x8F\xC1\xDE |0
+<U65A4> \xB6\xD4 |0
+<U65A5> \xC0\xCD |0
+<U65A6> \x8F\xC1\xDF |0
+<U65A7> \xC9\xE0 |0
+<U65AB> \xDA\xD1 |0
+<U65AC> \xBB\xC2 |0
+<U65AD> \xC3\xC7 |0
+<U65AE> \x8F\xC1\xE0 |0
+<U65AF> \xBB\xDB |0
+<U65B0> \xBF\xB7 |0
+<U65B2> \x8F\xC1\xE1 |0
+<U65B3> \x8F\xC1\xE2 |0
+<U65B4> \x8F\xC1\xE3 |0
+<U65B7> \xDA\xD2 |0
+<U65B9> \xCA\xFD |0
+<U65BC> \xB1\xF7 |0
+<U65BD> \xBB\xDC |0
+<U65BF> \x8F\xC1\xE4 |0
+<U65C1> \xDA\xD5 |0
+<U65C2> \x8F\xC1\xE5 |0
+<U65C3> \xDA\xD3 |0
+<U65C4> \xDA\xD6 |0
+<U65C5> \xCE\xB9 |0
+<U65C6> \xDA\xD4 |0
+<U65C8> \x8F\xC1\xE6 |0
+<U65C9> \x8F\xC1\xE7 |0
+<U65CB> \xC0\xFB |0
+<U65CC> \xDA\xD7 |0
+<U65CE> \x8F\xC1\xE8 |0
+<U65CF> \xC2\xB2 |0
+<U65D0> \x8F\xC1\xE9 |0
+<U65D2> \xDA\xD8 |0
+<U65D4> \x8F\xC1\xEA |0
+<U65D6> \x8F\xC1\xEB |0
+<U65D7> \xB4\xFA |0
+<U65D8> \x8F\xC1\xEC |0
+<U65D9> \xDA\xDA |0
+<U65DB> \xDA\xD9 |0
+<U65DF> \x8F\xC1\xED |0
+<U65E0> \xDA\xDB |0
+<U65E1> \xDA\xDC |0
+<U65E2> \xB4\xFB |0
+<U65E5> \xC6\xFC |0
+<U65E6> \xC3\xB6 |0
+<U65E7> \xB5\xEC |0
+<U65E8> \xBB\xDD |0
+<U65E9> \xC1\xE1 |0
+<U65EC> \xBD\xDC |0
+<U65ED> \xB0\xB0 |0
+<U65F0> \x8F\xC1\xEE |0
+<U65F1> \xDA\xDD |0
+<U65F2> \x8F\xC1\xEF |0
+<U65F4> \x8F\xC1\xF0 |0
+<U65F5> \x8F\xC1\xF1 |0
+<U65F9> \x8F\xC1\xF2 |0
+<U65FA> \xB2\xA2 |0
+<U65FB> \xDA\xE1 |0
+<U65FE> \x8F\xC1\xF3 |0
+<U65FF> \x8F\xC1\xF4 |0
+<U6600> \x8F\xC1\xF5 |3
+<U6600> \xFA\xB4 |0
+<U6602> \xB9\xB7 |0
+<U6603> \xDA\xE0 |0
+<U6604> \x8F\xC1\xF6 |0
+<U6606> \xBA\xAB |0
+<U6607> \xBE\xBA |0
+<U6608> \x8F\xC1\xF7 |0
+<U6609> \x8F\xC1\xF8 |3
+<U6609> \xFA\xB7 |0
+<U660A> \xDA\xDF |0
+<U660C> \xBE\xBB |0
+<U660D> \x8F\xC1\xF9 |0
+<U660E> \xCC\xC0 |0
+<U660F> \xBA\xAA |0
+<U6611> \x8F\xC1\xFA |0
+<U6612> \x8F\xC1\xFB |0
+<U6613> \xB0\xD7 |0
+<U6614> \xC0\xCE |0
+<U6615> \x8F\xC1\xFC |3
+<U6615> \xFA\xB5 |0
+<U6616> \x8F\xC1\xFD |0
+<U661C> \xDA\xE6 |0
+<U661D> \x8F\xC1\xFE |0
+<U661E> \x8F\xC2\xA1 |3
+<U661E> \xFA\xB9 |0
+<U661F> \xC0\xB1 |0
+<U6620> \xB1\xC7 |0
+<U6621> \x8F\xC2\xA2 |0
+<U6622> \x8F\xC2\xA3 |0
+<U6623> \x8F\xC2\xA4 |0
+<U6624> \x8F\xC2\xA5 |3
+<U6624> \xFA\xBA |0
+<U6625> \xBD\xD5 |0
+<U6626> \x8F\xC2\xA6 |0
+<U6627> \xCB\xE6 |0
+<U6628> \xBA\xF2 |0
+<U6629> \x8F\xC2\xA7 |0
+<U662A> \x8F\xC2\xA8 |0
+<U662B> \x8F\xC2\xA9 |0
+<U662C> \x8F\xC2\xAA |0
+<U662D> \xBE\xBC |0
+<U662E> \x8F\xC2\xAB |3
+<U662E> \xFA\xB8 |0
+<U662F> \xC0\xA7 |0
+<U6630> \x8F\xC2\xAC |0
+<U6631> \x8F\xC2\xAD |3
+<U6631> \xF9\xA8 |0
+<U6633> \x8F\xC2\xAE |0
+<U6634> \xDA\xE5 |0
+<U6635> \xDA\xE3 |0
+<U6636> \xDA\xE4 |0
+<U6637> \x8F\xC2\xB0 |0
+<U6639> \x8F\xC2\xAF |0
+<U663B> \xFA\xB6 |0
+<U663C> \xC3\xEB |0
+<U663F> \xDB\xA6 |0
+<U6640> \x8F\xC2\xB1 |0
+<U6641> \xDA\xEA |0
+<U6642> \xBB\xFE |0
+<U6643> \xB9\xB8 |0
+<U6644> \xDA\xE8 |0
+<U6645> \x8F\xC2\xB2 |0
+<U6646> \x8F\xC2\xB3 |0
+<U6649> \xDA\xE9 |0
+<U664A> \x8F\xC2\xB4 |0
+<U664B> \xBF\xB8 |0
+<U664C> \x8F\xC2\xB5 |0
+<U664E> \x8F\xC2\xB7 |0
+<U664F> \xDA\xE7 |0
+<U6651> \x8F\xC2\xB6 |0
+<U6652> \xBB\xAF |0
+<U6657> \x8F\xC2\xB8 |3
+<U6657> \xFA\xBC |0
+<U6658> \x8F\xC2\xB9 |0
+<U6659> \x8F\xC2\xBA |3
+<U6659> \xFA\xBD |0
+<U665B> \x8F\xC2\xBB |0
+<U665C> \x8F\xC2\xBC |0
+<U665D> \xDA\xEC |0
+<U665E> \xDA\xEB |0
+<U665F> \xDA\xF0 |0
+<U6660> \x8F\xC2\xBD |0
+<U6661> \x8F\xC2\xBE |0
+<U6662> \xDA\xF1 |0
+<U6664> \xDA\xED |0
+<U6665> \xFA\xBB |0
+<U6666> \xB3\xA2 |0
+<U6667> \xDA\xEE |0
+<U6668> \xDA\xEF |0
+<U6669> \xC8\xD5 |0
+<U666A> \x8F\xC2\xC0 |0
+<U666B> \x8F\xC2\xC1 |0
+<U666C> \x8F\xC2\xC2 |0
+<U666E> \xC9\xE1 |0
+<U666F> \xB7\xCA |0
+<U6670> \xDA\xF2 |0
+<U6673> \x8F\xC2\xC4 |3
+<U6673> \xFA\xBF |0
+<U6674> \xC0\xB2 |0
+<U6675> \x8F\xC2\xC5 |0
+<U6676> \xBE\xBD |0
+<U6677> \x8F\xC2\xC7 |0
+<U6678> \x8F\xC2\xC8 |0
+<U6679> \x8F\xC2\xC9 |0
+<U667A> \xC3\xD2 |0
+<U667B> \x8F\xC2\xCA |0
+<U667C> \x8F\xC2\xCC |0
+<U667E> \x8F\xC2\xC3 |0
+<U667F> \x8F\xC2\xC6 |0
+<U6680> \x8F\xC2\xCB |0
+<U6681> \xB6\xC7 |0
+<U6683> \xDA\xF3 |0
+<U6684> \xDA\xF7 |0
+<U6687> \xB2\xCB |0
+<U6688> \xDA\xF4 |0
+<U6689> \xDA\xF6 |0
+<U668B> \x8F\xC2\xCD |0
+<U668C> \x8F\xC2\xCE |0
+<U668D> \x8F\xC2\xCF |0
+<U668E> \xDA\xF5 |0
+<U6690> \x8F\xC2\xD0 |0
+<U6691> \xBD\xEB |0
+<U6692> \x8F\xC2\xD1 |0
+<U6696> \xC3\xC8 |0
+<U6697> \xB0\xC5 |0
+<U6698> \xDA\xF8 |0
+<U6699> \x8F\xC2\xD2 |3
+<U6699> \xFA\xC0 |0
+<U669A> \x8F\xC2\xD3 |0
+<U669B> \x8F\xC2\xD4 |0
+<U669C> \x8F\xC2\xD5 |0
+<U669D> \xDA\xF9 |0
+<U669F> \x8F\xC2\xD6 |0
+<U66A0> \x8F\xC2\xD7 |3
+<U66A0> \xFA\xC1 |0
+<U66A2> \xC4\xAA |0
+<U66A4> \x8F\xC2\xD8 |0
+<U66A6> \xCE\xF1 |0
+<U66AB> \xBB\xC3 |0
+<U66AD> \x8F\xC2\xD9 |0
+<U66AE> \xCA\xEB |0
+<U66B1> \x8F\xC2\xDA |0
+<U66B2> \x8F\xC2\xDB |3
+<U66B2> \xFA\xC2 |0
+<U66B4> \xCB\xBD |0
+<U66B5> \x8F\xC2\xDC |0
+<U66B8> \xDB\xA2 |0
+<U66B9> \xDA\xFB |0
+<U66BB> \x8F\xC2\xDD |0
+<U66BC> \xDA\xFE |0
+<U66BE> \xDA\xFD |0
+<U66BF> \x8F\xC2\xDE |3
+<U66BF> \xFA\xC3 |0
+<U66C0> \x8F\xC2\xDF |0
+<U66C1> \xDA\xFA |0
+<U66C2> \x8F\xC2\xE0 |0
+<U66C3> \x8F\xC2\xE1 |0
+<U66C4> \xDB\xA1 |0
+<U66C7> \xC6\xDE |0
+<U66C8> \x8F\xC2\xE2 |0
+<U66C9> \xDA\xFC |0
+<U66CC> \x8F\xC2\xE3 |0
+<U66CE> \x8F\xC2\xE4 |0
+<U66CF> \x8F\xC2\xE5 |0
+<U66D4> \x8F\xC2\xE6 |0
+<U66D6> \xDB\xA3 |0
+<U66D9> \xBD\xEC |0
+<U66DA> \xDB\xA4 |0
+<U66DB> \x8F\xC2\xE7 |0
+<U66DC> \xCD\xCB |0
+<U66DD> \xC7\xF8 |0
+<U66DF> \x8F\xC2\xE8 |0
+<U66E0> \xDB\xA5 |0
+<U66E6> \xDB\xA7 |0
+<U66E8> \x8F\xC2\xE9 |0
+<U66E9> \xDB\xA8 |0
+<U66EB> \x8F\xC2\xEA |0
+<U66EC> \x8F\xC2\xEB |0
+<U66EE> \x8F\xC2\xEC |0
+<U66F0> \xDB\xA9 |0
+<U66F2> \xB6\xCA |0
+<U66F3> \xB1\xC8 |0
+<U66F4> \xB9\xB9 |0
+<U66F5> \xDB\xAA |0
+<U66F7> \xDB\xAB |0
+<U66F8> \xBD\xF1 |0
+<U66F9> \xC1\xE2 |0
+<U66FA> \x8F\xC2\xED |3
+<U66FA> \xFA\xC4 |0
+<U66FB> \x8F\xC2\xBF |3
+<U66FB> \xF9\xAB |0
+<U66FC> \xD2\xD8 |0
+<U66FD> \xC1\xBE |0
+<U66FE> \xC1\xBD |0
+<U66FF> \xC2\xD8 |0
+<U6700> \xBA\xC7 |0
+<U6703> \xD0\xF2 |0
+<U6705> \x8F\xC2\xEE |0
+<U6707> \x8F\xC2\xEF |0
+<U6708> \xB7\xEE |0
+<U6709> \xCD\xAD |0
+<U670B> \xCA\xFE |0
+<U670D> \xC9\xFE |0
+<U670E> \x8F\xC2\xF0 |3
+<U670E> \xFA\xC5 |0
+<U670F> \xDB\xAC |0
+<U6713> \x8F\xC2\xF1 |0
+<U6714> \xBA\xF3 |0
+<U6715> \xC4\xBF |0
+<U6716> \xDB\xAD |0
+<U6717> \xCF\xAF |0
+<U6719> \x8F\xC2\xF2 |0
+<U671B> \xCB\xBE |0
+<U671C> \x8F\xC2\xF3 |0
+<U671D> \xC4\xAB |0
+<U671E> \xDB\xAE |0
+<U671F> \xB4\xFC |0
+<U6720> \x8F\xC2\xF4 |0
+<U6722> \x8F\xC2\xF5 |0
+<U6726> \xDB\xAF |0
+<U6727> \xDB\xB0 |0
+<U6728> \xCC\xDA |0
+<U672A> \xCC\xA4 |0
+<U672B> \xCB\xF6 |0
+<U672C> \xCB\xDC |0
+<U672D> \xBB\xA5 |0
+<U672E> \xDB\xB2 |0
+<U6731> \xBC\xEB |0
+<U6733> \x8F\xC2\xF6 |0
+<U6734> \xCB\xD1 |0
+<U6736> \xDB\xB4 |0
+<U6737> \xDB\xB7 |0
+<U6738> \xDB\xB6 |0
+<U673A> \xB4\xF9 |0
+<U673D> \xB5\xE0 |0
+<U673E> \x8F\xC2\xF7 |0
+<U673F> \xDB\xB3 |0
+<U6741> \xDB\xB5 |0
+<U6745> \x8F\xC2\xF8 |0
+<U6746> \xDB\xB8 |0
+<U6747> \x8F\xC2\xF9 |0
+<U6748> \x8F\xC2\xFA |0
+<U6749> \xBF\xF9 |0
+<U674C> \x8F\xC2\xFB |0
+<U674E> \xCD\xFB |0
+<U674F> \xB0\xC9 |0
+<U6750> \xBA\xE0 |0
+<U6751> \xC2\xBC |0
+<U6753> \xBC\xDD |0
+<U6754> \x8F\xC2\xFC |0
+<U6755> \x8F\xC2\xFD |0
+<U6756> \xBE\xF3 |0
+<U6759> \xDB\xBB |0
+<U675C> \xC5\xCE |0
+<U675D> \x8F\xC2\xFE |0
+<U675E> \xDB\xB9 |0
+<U675F> \xC2\xAB |0
+<U6760> \xDB\xBA |0
+<U6761> \xBE\xF2 |0
+<U6762> \xCC\xDD |0
+<U6763> \xDB\xBC |0
+<U6764> \xDB\xBD |0
+<U6765> \xCD\xE8 |0
+<U6766> \x8F\xC3\xA1 |3
+<U6766> \xFA\xC7 |0
+<U676A> \xDB\xC2 |0
+<U676C> \x8F\xC3\xA2 |0
+<U676D> \xB9\xBA |0
+<U676E> \x8F\xC3\xA3 |0
+<U676F> \xC7\xD5 |0
+<U6770> \xDB\xBF |0
+<U6771> \xC5\xEC |0
+<U6772> \xDA\xDE |0
+<U6773> \xDA\xE2 |0
+<U6774> \x8F\xC3\xA4 |0
+<U6775> \xB5\xCF |0
+<U6776> \x8F\xC3\xA5 |0
+<U6777> \xC7\xC7 |0
+<U677B> \x8F\xC3\xA6 |0
+<U677C> \xDB\xC1 |0
+<U677E> \xBE\xBE |0
+<U677F> \xC8\xC4 |0
+<U6781> \x8F\xC3\xA7 |0
+<U6784> \x8F\xC3\xA8 |0
+<U6785> \xDB\xC7 |0
+<U6787> \xC8\xFA |0
+<U6789> \xDB\xBE |0
+<U678B> \xDB\xC4 |0
+<U678C> \xDB\xC3 |0
+<U678E> \x8F\xC3\xA9 |0
+<U678F> \x8F\xC3\xAA |0
+<U6790> \xC0\xCF |0
+<U6791> \x8F\xC3\xAB |0
+<U6793> \x8F\xC3\xAC |0
+<U6795> \xCB\xED |0
+<U6796> \x8F\xC3\xAD |0
+<U6797> \xCE\xD3 |0
+<U6798> \x8F\xC3\xAE |0
+<U6799> \x8F\xC3\xAF |0
+<U679A> \xCB\xE7 |0
+<U679B> \x8F\xC3\xB0 |0
+<U679C> \xB2\xCC |0
+<U679D> \xBB\xDE |0
+<U67A0> \xCF\xC8 |0
+<U67A1> \xDB\xC6 |0
+<U67A2> \xBF\xF5 |0
+<U67A6> \xDB\xC5 |0
+<U67A9> \xDB\xC0 |0
+<U67AF> \xB8\xCF |0
+<U67B0> \x8F\xC3\xB1 |0
+<U67B1> \x8F\xC3\xB2 |0
+<U67B2> \x8F\xC3\xB3 |0
+<U67B3> \xDB\xCC |0
+<U67B4> \xDB\xCA |0
+<U67B5> \x8F\xC3\xB4 |0
+<U67B6> \xB2\xCD |0
+<U67B7> \xDB\xC8 |0
+<U67B8> \xDB\xCE |0
+<U67B9> \xDB\xD4 |0
+<U67BB> \x8F\xC3\xB5 |3
+<U67BB> \xFA\xC8 |0
+<U67BC> \x8F\xC3\xB6 |0
+<U67BD> \x8F\xC3\xB7 |0
+<U67C0> \x8F\xC3\xB9 |3
+<U67C0> \xFA\xCA |0
+<U67C1> \xC2\xC8 |0
+<U67C2> \x8F\xC3\xBA |0
+<U67C3> \x8F\xC3\xBB |0
+<U67C4> \xCA\xC1 |0
+<U67C5> \x8F\xC3\xBC |0
+<U67C6> \xDB\xD6 |0
+<U67C8> \x8F\xC3\xBD |0
+<U67C9> \x8F\xC3\xBE |0
+<U67CA> \xC9\xA2 |0
+<U67CE> \xDB\xD5 |0
+<U67CF> \xC7\xF0 |0
+<U67D0> \xCB\xBF |0
+<U67D1> \xB4\xBB |0
+<U67D2> \x8F\xC3\xBF |0
+<U67D3> \xC0\xF7 |0
+<U67D4> \xBD\xC0 |0
+<U67D7> \x8F\xC3\xC0 |0
+<U67D8> \xC4\xD3 |0
+<U67D9> \x8F\xC3\xC1 |0
+<U67DA> \xCD\xAE |0
+<U67DC> \x8F\xC3\xC2 |0
+<U67DD> \xDB\xD1 |0
+<U67DE> \xDB\xD0 |0
+<U67E1> \x8F\xC3\xC3 |0
+<U67E2> \xDB\xD2 |0
+<U67E4> \xDB\xCF |0
+<U67E6> \x8F\xC3\xC4 |0
+<U67E7> \xDB\xD7 |0
+<U67E9> \xDB\xCD |0
+<U67EC> \xDB\xCB |0
+<U67EE> \xDB\xD3 |0
+<U67EF> \xDB\xC9 |0
+<U67F0> \x8F\xC3\xC5 |0
+<U67F1> \xC3\xEC |0
+<U67F2> \x8F\xC3\xC6 |0
+<U67F3> \xCC\xF8 |0
+<U67F4> \xBC\xC6 |0
+<U67F5> \xBA\xF4 |0
+<U67F6> \x8F\xC3\xC7 |0
+<U67F7> \x8F\xC3\xC8 |0
+<U67F9> \x8F\xC3\xB8 |0
+<U67FB> \xBA\xBA |0
+<U67FE> \xCB\xEF |0
+<U67FF> \xB3\xC1 |0
+<U6801> \xFA\xCB |0
+<U6802> \xC4\xCE |0
+<U6803> \xC6\xCA |0
+<U6804> \xB1\xC9 |0
+<U6805> \xBA\xF4 |1
+<U6813> \xC0\xF2 |0
+<U6814> \x8F\xC3\xCA |0
+<U6816> \xC0\xB4 |0
+<U6817> \xB7\xAA |0
+<U6819> \x8F\xC3\xCB |0
+<U681D> \x8F\xC3\xCC |0
+<U681E> \xDB\xD9 |0
+<U681F> \x8F\xC3\xCD |0
+<U6821> \xB9\xBB |0
+<U6822> \xB3\xFC |0
+<U6827> \x8F\xC3\xCF |0
+<U6828> \x8F\xC3\xCE |0
+<U6829> \xDB\xDB |0
+<U682A> \xB3\xF4 |0
+<U682B> \xDB\xE1 |0
+<U682C> \x8F\xC3\xD0 |0
+<U682D> \x8F\xC3\xD1 |0
+<U682F> \x8F\xC3\xD2 |0
+<U6830> \x8F\xC3\xD3 |0
+<U6831> \x8F\xC3\xD4 |0
+<U6832> \xDB\xDE |0
+<U6833> \x8F\xC3\xD5 |0
+<U6834> \xC0\xF3 |0
+<U6838> \xB3\xCB |0
+<U6839> \xBA\xAC |0
+<U683B> \x8F\xC3\xD6 |0
+<U683C> \xB3\xCA |0
+<U683D> \xBA\xCF |0
+<U683F> \x8F\xC3\xD7 |0
+<U6840> \xDB\xDC |0
+<U6841> \xB7\xE5 |0
+<U6842> \xB7\xCB |0
+<U6843> \xC5\xED |0
+<U6844> \x8F\xC3\xD8 |3
+<U6844> \xFA\xCC |0
+<U6845> \x8F\xC3\xD9 |0
+<U6846> \xDB\xDA |0
+<U6848> \xB0\xC6 |0
+<U684A> \x8F\xC3\xDA |0
+<U684C> \x8F\xC3\xDB |0
+<U684D> \xDB\xDD |0
+<U684E> \xDB\xDF |0
+<U6850> \xB6\xCD |0
+<U6851> \xB7\xAC |0
+<U6852> \x8F\xC3\xC9 |3
+<U6852> \xFA\xC9 |0
+<U6853> \xB4\xBC |0
+<U6854> \xB5\xCB |0
+<U6855> \x8F\xC3\xDC |0
+<U6857> \x8F\xC3\xDD |0
+<U6858> \x8F\xC3\xDE |0
+<U6859> \xDB\xE2 |0
+<U685B> \x8F\xC3\xDF |0
+<U685C> \xBA\xF9 |0
+<U685D> \xCB\xF1 |0
+<U685F> \xBB\xB7 |0
+<U6863> \xDB\xE3 |0
+<U6867> \xC9\xB0 |0
+<U686B> \x8F\xC3\xE0 |0
+<U686E> \x8F\xC3\xE1 |0
+<U686F> \x8F\xC3\xE2 |0
+<U6870> \x8F\xC3\xE3 |0
+<U6871> \x8F\xC3\xE4 |0
+<U6872> \x8F\xC3\xE5 |0
+<U6874> \xDB\xEF |0
+<U6875> \x8F\xC3\xE6 |0
+<U6876> \xB2\xB3 |0
+<U6877> \xDB\xE4 |0
+<U6879> \x8F\xC3\xE7 |0
+<U687A> \x8F\xC3\xE8 |0
+<U687B> \x8F\xC3\xE9 |0
+<U687C> \x8F\xC3\xEA |0
+<U687E> \xDB\xF5 |0
+<U687F> \xDB\xE5 |0
+<U6881> \xCE\xC2 |0
+<U6882> \x8F\xC3\xEB |0
+<U6883> \xDB\xEC |0
+<U6884> \x8F\xC3\xEC |0
+<U6885> \xC7\xDF |0
+<U6886> \x8F\xC3\xED |0
+<U6888> \x8F\xC3\xEE |0
+<U688D> \xDB\xF4 |0
+<U688E> \xDB\xF4 |1
+<U688F> \xDB\xE7 |0
+<U6893> \xB0\xB4 |0
+<U6894> \xDB\xE9 |0
+<U6896> \x8F\xC3\xEF |0
+<U6897> \xB9\xBC |0
+<U6898> \x8F\xC3\xF0 |0
+<U689A> \x8F\xC3\xF1 |0
+<U689B> \xDB\xEB |0
+<U689C> \x8F\xC3\xF2 |0
+<U689D> \xDB\xEA |0
+<U689F> \xDB\xE6 |0
+<U68A0> \xDB\xF1 |0
+<U68A1> \x8F\xC3\xF3 |0
+<U68A2> \xBE\xBF |0
+<U68A3> \x8F\xC3\xF4 |0
+<U68A5> \x8F\xC3\xF5 |0
+<U68A6> \xD4\xED |0
+<U68A7> \xB8\xE8 |0
+<U68A8> \xCD\xFC |0
+<U68A9> \x8F\xC3\xF6 |0
+<U68AA> \x8F\xC3\xF7 |0
+<U68AD> \xDB\xE8 |0
+<U68AE> \x8F\xC3\xF8 |0
+<U68AF> \xC4\xF4 |0
+<U68B0> \xB3\xA3 |0
+<U68B1> \xBA\xAD |0
+<U68B2> \x8F\xC3\xF9 |0
+<U68B3> \xDB\xE0 |0
+<U68B5> \xDB\xF0 |0
+<U68B6> \xB3\xE1 |0
+<U68B9> \xDB\xEE |0
+<U68BA> \xDB\xF2 |0
+<U68BB> \x8F\xC3\xFA |0
+<U68BC> \xC5\xEE |0
+<U68C4> \xB4\xFE |0
+<U68C5> \x8F\xC3\xFB |0
+<U68C6> \xDC\xB2 |0
+<U68C8> \x8F\xC3\xFC |3
+<U68C8> \xF9\xA9 |0
+<U68C9> \xCC\xC9 |0
+<U68CA> \xDB\xF7 |0
+<U68CB> \xB4\xFD |0
+<U68CC> \x8F\xC3\xFD |0
+<U68CD> \xDB\xFE |0
+<U68CF> \x8F\xC3\xFE |3
+<U68CF> \xFA\xCD |0
+<U68D0> \x8F\xC4\xA1 |0
+<U68D1> \x8F\xC4\xA2 |0
+<U68D2> \xCB\xC0 |0
+<U68D3> \x8F\xC4\xA3 |0
+<U68D4> \xDC\xA1 |0
+<U68D5> \xDC\xA3 |0
+<U68D6> \x8F\xC4\xA4 |0
+<U68D7> \xDC\xA7 |0
+<U68D8> \xDB\xF9 |0
+<U68D9> \x8F\xC4\xA5 |0
+<U68DA> \xC3\xAA |0
+<U68DC> \x8F\xC4\xA6 |0
+<U68DD> \x8F\xC4\xA7 |0
+<U68DF> \xC5\xEF |0
+<U68E0> \xDC\xAB |0
+<U68E1> \xDB\xFC |0
+<U68E3> \xDC\xA8 |0
+<U68E5> \x8F\xC4\xA8 |0
+<U68E7> \xDC\xA2 |0
+<U68E8> \x8F\xC4\xA9 |0
+<U68EA> \x8F\xC4\xAA |0
+<U68EB> \x8F\xC4\xAB |0
+<U68EC> \x8F\xC4\xAC |0
+<U68ED> \x8F\xC4\xAD |0
+<U68EE> \xBF\xB9 |0
+<U68EF> \xDC\xAC |0
+<U68F0> \x8F\xC4\xAE |0
+<U68F1> \x8F\xC4\xAF |0
+<U68F2> \xC0\xB3 |0
+<U68F5> \x8F\xC4\xB0 |0
+<U68F6> \x8F\xC4\xB1 |0
+<U68F9> \xDC\xAA |0
+<U68FA> \xB4\xBD |0
+<U68FB> \x8F\xC4\xB2 |0
+<U68FC> \x8F\xC4\xB3 |0
+<U68FD> \x8F\xC4\xB4 |0
+<U6900> \xCF\xD0 |0
+<U6901> \xDB\xF6 |0
+<U6904> \xDC\xA6 |0
+<U6905> \xB0\xD8 |0
+<U6906> \x8F\xC4\xB5 |0
+<U6908> \xDB\xF8 |0
+<U6909> \x8F\xC4\xB6 |0
+<U690A> \x8F\xC4\xB7 |0
+<U690B> \xCC\xBA |0
+<U690C> \xDB\xFD |0
+<U690D> \xBF\xA2 |0
+<U690E> \xC4\xC7 |0
+<U690F> \xDB\xF3 |0
+<U6910> \x8F\xC4\xB8 |0
+<U6911> \x8F\xC4\xB9 |0
+<U6912> \xDC\xA5 |0
+<U6913> \x8F\xC4\xBA |0
+<U6916> \x8F\xC4\xBB |0
+<U6917> \x8F\xC4\xBC |0
+<U6919> \xBF\xFA |0
+<U691A> \xDC\xAF |0
+<U691B> \xB3\xF1 |0
+<U691C> \xB8\xA1 |0
+<U6921> \xDC\xB1 |0
+<U6922> \xDB\xFA |0
+<U6923> \xDC\xB0 |0
+<U6925> \xDC\xA9 |0
+<U6926> \xDB\xFB |0
+<U6928> \xDC\xAD |0
+<U692A> \xDC\xAE |0
+<U6930> \xDC\xBF |0
+<U6931> \x8F\xC4\xBD |0
+<U6933> \x8F\xC4\xBE |0
+<U6934> \xC6\xCE |0
+<U6935> \x8F\xC4\xBF |0
+<U6936> \xDC\xA4 |0
+<U6938> \x8F\xC4\xC0 |0
+<U6939> \xDC\xBB |0
+<U693B> \x8F\xC4\xC1 |0
+<U693D> \xDC\xBD |0
+<U693F> \xC4\xD8 |0
+<U6942> \x8F\xC4\xC2 |0
+<U6945> \x8F\xC4\xC3 |0
+<U6949> \x8F\xC4\xC4 |0
+<U694A> \xCD\xCC |0
+<U694E> \x8F\xC4\xC5 |0
+<U6953> \xC9\xF6 |0
+<U6954> \xDC\xB8 |0
+<U6955> \xC2\xCA |0
+<U6957> \x8F\xC4\xC6 |0
+<U6959> \xDC\xBE |0
+<U695A> \xC1\xBF |0
+<U695B> \x8F\xC4\xC7 |0
+<U695C> \xDC\xB5 |0
+<U695D> \xDC\xC2 |0
+<U695E> \xDC\xC1 |0
+<U6960> \xC6\xEF |0
+<U6961> \xDC\xC0 |0
+<U6962> \xC6\xEA |0
+<U6963> \x8F\xC4\xC8 |0
+<U6964> \x8F\xC4\xC9 |0
+<U6965> \x8F\xC4\xCA |0
+<U6966> \x8F\xC4\xCB |0
+<U6968> \x8F\xC4\xCC |3
+<U6968> \xFA\xCF |0
+<U6969> \x8F\xC4\xCD |0
+<U696A> \xDC\xC4 |0
+<U696B> \xDC\xB7 |0
+<U696C> \x8F\xC4\xCE |0
+<U696D> \xB6\xC8 |0
+<U696E> \xDC\xBA |0
+<U696F> \xBD\xDD |0
+<U6970> \x8F\xC4\xCF |0
+<U6971> \x8F\xC4\xD0 |0
+<U6972> \x8F\xC4\xD1 |0
+<U6973> \xC7\xE0 |0
+<U6974> \xDC\xBC |0
+<U6975> \xB6\xCB |0
+<U6977> \xDC\xB4 |0
+<U6978> \xDC\xB6 |0
+<U6979> \xDC\xB3 |0
+<U697A> \x8F\xC4\xD2 |0
+<U697B> \x8F\xC4\xD3 |0
+<U697C> \xCF\xB0 |0
+<U697D> \xB3\xDA |0
+<U697E> \xDC\xB9 |0
+<U697F> \x8F\xC4\xD4 |0
+<U6980> \x8F\xC4\xD5 |0
+<U6981> \xDC\xC3 |0
+<U6982> \xB3\xB5 |0
+<U698A> \xBA\xE7 |0
+<U698D> \x8F\xC4\xD6 |0
+<U698E> \xB1\xDD |0
+<U6991> \xDC\xD4 |0
+<U6992> \x8F\xC4\xD7 |0
+<U6994> \xCF\xB1 |0
+<U6995> \xDC\xD7 |0
+<U6996> \x8F\xC4\xD8 |0
+<U6998> \x8F\xC4\xD9 |3
+<U6998> \xFA\xD1 |0
+<U699B> \xBF\xBA |0
+<U699C> \xDC\xD6 |0
+<U69A0> \xDC\xD5 |0
+<U69A1> \x8F\xC4\xDA |0
+<U69A5> \x8F\xC4\xDB |0
+<U69A6> \x8F\xC4\xDC |0
+<U69A7> \xDC\xD2 |0
+<U69A8> \x8F\xC4\xDD |0
+<U69AB> \x8F\xC4\xDE |0
+<U69AD> \x8F\xC4\xDF |0
+<U69AE> \xDC\xC6 |0
+<U69AF> \x8F\xC4\xE0 |0
+<U69B1> \xDC\xE3 |0
+<U69B2> \xDC\xC5 |0
+<U69B4> \xDC\xD8 |0
+<U69B7> \x8F\xC4\xE1 |0
+<U69B8> \x8F\xC4\xE2 |0
+<U69BA> \x8F\xC4\xE3 |0
+<U69BB> \xDC\xD0 |0
+<U69BC> \x8F\xC4\xE4 |0
+<U69BE> \xDC\xCB |0
+<U69BF> \xDC\xC8 |0
+<U69C1> \xDC\xC9 |0
+<U69C3> \xDC\xD1 |0
+<U69C5> \x8F\xC4\xE5 |0
+<U69C7> \xF4\xA2 |0
+<U69C8> \x8F\xC4\xE6 |0
+<U69CA> \xDC\xCE |0
+<U69CB> \xB9\xBD |0
+<U69CC> \xC4\xC8 |0
+<U69CD> \xC1\xE4 |0
+<U69CE> \xDC\xCC |0
+<U69D0> \xDC\xC7 |0
+<U69D1> \x8F\xC4\xE7 |0
+<U69D3> \xDC\xCA |0
+<U69D6> \x8F\xC4\xE8 |0
+<U69D7> \x8F\xC4\xE9 |0
+<U69D8> \xCD\xCD |0
+<U69D9> \xCB\xEA |0
+<U69DD> \xDC\xCF |0
+<U69DE> \xDC\xD9 |0
+<U69E2> \x8F\xC4\xEA |3
+<U69E2> \xFA\xD2 |0
+<U69E5> \x8F\xC4\xEB |0
+<U69E7> \xDC\xE1 |0
+<U69E8> \xDC\xDA |0
+<U69EB> \xDC\xE7 |0
+<U69ED> \xDC\xE5 |0
+<U69EE> \x8F\xC4\xEC |0
+<U69EF> \x8F\xC4\xED |0
+<U69F1> \x8F\xC4\xEE |0
+<U69F2> \xDC\xE0 |0
+<U69F3> \x8F\xC4\xEF |0
+<U69F5> \x8F\xC4\xF0 |0
+<U69F9> \xDC\xDF |0
+<U69FB> \xC4\xD0 |0
+<U69FD> \xC1\xE5 |0
+<U69FE> \x8F\xC4\xF1 |0
+<U69FF> \xDC\xDD |0
+<U6A00> \x8F\xC4\xF2 |0
+<U6A01> \x8F\xC4\xF3 |0
+<U6A02> \xDC\xDB |0
+<U6A03> \x8F\xC4\xF4 |0
+<U6A05> \xDC\xE2 |0
+<U6A0A> \xDC\xE8 |0
+<U6A0B> \xC8\xF5 |0
+<U6A0C> \xDC\xEE |0
+<U6A0F> \x8F\xC4\xF5 |0
+<U6A11> \x8F\xC4\xF6 |0
+<U6A12> \xDC\xE9 |0
+<U6A13> \xDC\xEC |0
+<U6A14> \xDC\xE6 |0
+<U6A15> \x8F\xC4\xF7 |0
+<U6A17> \xC3\xF4 |0
+<U6A19> \xC9\xB8 |0
+<U6A1A> \x8F\xC4\xF8 |0
+<U6A1B> \xDC\xDC |0
+<U6A1D> \x8F\xC4\xF9 |0
+<U6A1E> \xDC\xE4 |0
+<U6A1F> \xBE\xC0 |0
+<U6A20> \x8F\xC4\xFA |0
+<U6A21> \xCC\xCF |0
+<U6A22> \xDC\xF8 |0
+<U6A23> \xDC\xEB |0
+<U6A24> \x8F\xC4\xFB |0
+<U6A28> \x8F\xC4\xFC |0
+<U6A29> \xB8\xA2 |0
+<U6A2A> \xB2\xA3 |0
+<U6A2B> \xB3\xDF |0
+<U6A2E> \xDC\xD3 |0
+<U6A30> \x8F\xC4\xFD |3
+<U6A30> \xFA\xD3 |0
+<U6A32> \x8F\xC4\xFE |0
+<U6A34> \x8F\xC5\xA1 |0
+<U6A35> \xBE\xC1 |0
+<U6A36> \xDC\xF0 |0
+<U6A37> \x8F\xC5\xA2 |0
+<U6A38> \xDC\xF7 |0
+<U6A39> \xBC\xF9 |0
+<U6A3A> \xB3\xF2 |0
+<U6A3B> \x8F\xC5\xA3 |0
+<U6A3D> \xC3\xAE |0
+<U6A3E> \x8F\xC5\xA4 |0
+<U6A3F> \x8F\xC5\xA5 |0
+<U6A44> \xDC\xED |0
+<U6A45> \x8F\xC5\xA6 |0
+<U6A46> \x8F\xC5\xA7 |3
+<U6A46> \xFA\xD5 |0
+<U6A47> \xDC\xF2 |0
+<U6A48> \xDC\xF6 |0
+<U6A49> \x8F\xC5\xA8 |0
+<U6A4A> \x8F\xC5\xA9 |0
+<U6A4B> \xB6\xB6 |0
+<U6A4E> \x8F\xC5\xAA |0
+<U6A50> \x8F\xC5\xAB |0
+<U6A51> \x8F\xC5\xAC |0
+<U6A52> \x8F\xC5\xAD |0
+<U6A55> \x8F\xC5\xAE |0
+<U6A56> \x8F\xC5\xAF |0
+<U6A58> \xB5\xCC |0
+<U6A59> \xDC\xF4 |0
+<U6A5B> \x8F\xC5\xB0 |0
+<U6A5F> \xB5\xA1 |0
+<U6A61> \xC6\xCB |0
+<U6A62> \xDC\xF3 |0
+<U6A64> \x8F\xC5\xB1 |0
+<U6A66> \xDC\xF5 |0
+<U6A67> \x8F\xC5\xB2 |0
+<U6A6A> \x8F\xC5\xB3 |0
+<U6A6B> \xFA\xD4 |0
+<U6A71> \x8F\xC5\xB4 |0
+<U6A72> \xDC\xEF |0
+<U6A73> \x8F\xC5\xB5 |3
+<U6A73> \xFA\xD6 |0
+<U6A78> \xDC\xF1 |0
+<U6A7E> \x8F\xC5\xB6 |3
+<U6A7E> \xFA\xD7 |0
+<U6A7F> \xB3\xE0 |0
+<U6A80> \xC3\xC9 |0
+<U6A81> \x8F\xC5\xB7 |0
+<U6A83> \x8F\xC5\xB8 |0
+<U6A84> \xDC\xFC |0
+<U6A86> \x8F\xC5\xB9 |0
+<U6A87> \x8F\xC5\xBA |0
+<U6A89> \x8F\xC5\xBB |0
+<U6A8B> \x8F\xC5\xBC |0
+<U6A8D> \xDC\xFA |0
+<U6A8E> \xB8\xE9 |0
+<U6A90> \xDC\xF9 |0
+<U6A91> \x8F\xC5\xBD |0
+<U6A97> \xDD\xA1 |0
+<U6A9B> \x8F\xC5\xBE |0
+<U6A9C> \xDB\xD8 |0
+<U6A9D> \x8F\xC5\xBF |0
+<U6A9E> \x8F\xC5\xC0 |0
+<U6A9F> \x8F\xC5\xC1 |0
+<U6AA0> \xDC\xFB |0
+<U6AA2> \xDC\xFD |0
+<U6AA3> \xDC\xFE |0
+<U6AA5> \x8F\xC5\xC2 |0
+<U6AAA> \xDD\xAC |0
+<U6AAB> \x8F\xC5\xC3 |0
+<U6AAC> \xDD\xA8 |0
+<U6AAE> \xDB\xED |0
+<U6AAF> \x8F\xC5\xC4 |0
+<U6AB0> \x8F\xC5\xC5 |0
+<U6AB1> \x8F\xC5\xC6 |0
+<U6AB3> \xDD\xA7 |0
+<U6AB4> \x8F\xC5\xC7 |0
+<U6AB8> \xDD\xA6 |0
+<U6ABB> \xDD\xA3 |0
+<U6ABD> \x8F\xC5\xC8 |0
+<U6ABE> \x8F\xC5\xC9 |0
+<U6ABF> \x8F\xC5\xCA |0
+<U6AC1> \xDC\xEA |0
+<U6AC2> \xDD\xA5 |0
+<U6AC3> \xDD\xA4 |0
+<U6AC6> \x8F\xC5\xCB |0
+<U6AC8> \x8F\xC5\xCD |0
+<U6AC9> \x8F\xC5\xCC |0
+<U6ACC> \x8F\xC5\xCE |0
+<U6AD0> \x8F\xC5\xCF |0
+<U6AD1> \xDD\xAA |0
+<U6AD3> \xCF\xA6 |0
+<U6AD4> \x8F\xC5\xD0 |0
+<U6AD5> \x8F\xC5\xD1 |0
+<U6AD6> \x8F\xC5\xD2 |0
+<U6ADA> \xDD\xAD |0
+<U6ADB> \xB6\xFB |0
+<U6ADC> \x8F\xC5\xD3 |0
+<U6ADD> \x8F\xC5\xD4 |0
+<U6ADE> \xDD\xA9 |0
+<U6ADF> \xDD\xAB |0
+<U6AE2> \xFA\xD8 |0
+<U6AE4> \x8F\xC5\xD5 |3
+<U6AE4> \xFA\xD9 |0
+<U6AE7> \x8F\xC5\xD6 |0
+<U6AE8> \xC8\xA7 |0
+<U6AEA> \xDD\xAE |0
+<U6AEC> \x8F\xC5\xD7 |0
+<U6AF0> \x8F\xC5\xD8 |0
+<U6AF1> \x8F\xC5\xD9 |0
+<U6AF2> \x8F\xC5\xDA |0
+<U6AFA> \xDD\xB2 |0
+<U6AFB> \xDD\xAF |0
+<U6AFC> \x8F\xC5\xDB |0
+<U6AFD> \x8F\xC5\xDC |0
+<U6B02> \x8F\xC5\xDD |0
+<U6B03> \x8F\xC5\xDE |0
+<U6B04> \xCD\xF3 |0
+<U6B05> \xDD\xB0 |0
+<U6B06> \x8F\xC5\xDF |0
+<U6B07> \x8F\xC5\xE0 |0
+<U6B09> \x8F\xC5\xE1 |0
+<U6B0A> \xDC\xDE |0
+<U6B0F> \x8F\xC5\xE2 |0
+<U6B10> \x8F\xC5\xE3 |0
+<U6B11> \x8F\xC5\xE4 |0
+<U6B12> \xDD\xB3 |0
+<U6B16> \xDD\xB4 |0
+<U6B17> \x8F\xC5\xE5 |0
+<U6B1B> \x8F\xC5\xE6 |0
+<U6B1D> \xB1\xB5 |0
+<U6B1E> \x8F\xC5\xE7 |0
+<U6B1F> \xDD\xB6 |0
+<U6B20> \xB7\xE7 |0
+<U6B21> \xBC\xA1 |0
+<U6B23> \xB6\xD5 |0
+<U6B24> \x8F\xC5\xE8 |0
+<U6B27> \xB2\xA4 |0
+<U6B28> \x8F\xC5\xE9 |0
+<U6B2B> \x8F\xC5\xEA |0
+<U6B2C> \x8F\xC5\xEB |0
+<U6B2F> \x8F\xC5\xEC |0
+<U6B32> \xCD\xDF |0
+<U6B35> \x8F\xC5\xED |0
+<U6B36> \x8F\xC5\xEE |0
+<U6B37> \xDD\xB8 |0
+<U6B38> \xDD\xB7 |0
+<U6B39> \xDD\xBA |0
+<U6B3A> \xB5\xBD |0
+<U6B3B> \x8F\xC5\xEF |0
+<U6B3D> \xB6\xD6 |0
+<U6B3E> \xB4\xBE |0
+<U6B3F> \x8F\xC5\xF0 |0
+<U6B43> \xDD\xBD |0
+<U6B46> \x8F\xC5\xF1 |0
+<U6B47> \xDD\xBC |0
+<U6B49> \xDD\xBE |0
+<U6B4A> \x8F\xC5\xF2 |0
+<U6B4C> \xB2\xCE |0
+<U6B4D> \x8F\xC5\xF3 |0
+<U6B4E> \xC3\xB7 |0
+<U6B50> \xDD\xBF |0
+<U6B52> \x8F\xC5\xF4 |0
+<U6B53> \xB4\xBF |0
+<U6B54> \xDD\xC1 |0
+<U6B56> \x8F\xC5\xF5 |0
+<U6B58> \x8F\xC5\xF6 |0
+<U6B59> \xDD\xC0 |0
+<U6B5B> \xDD\xC2 |0
+<U6B5D> \x8F\xC5\xF7 |0
+<U6B5F> \xDD\xC3 |0
+<U6B60> \x8F\xC5\xF8 |0
+<U6B61> \xDD\xC4 |0
+<U6B62> \xBB\xDF |0
+<U6B63> \xC0\xB5 |0
+<U6B64> \xBA\xA1 |0
+<U6B66> \xC9\xF0 |0
+<U6B67> \x8F\xC5\xF9 |0
+<U6B69> \xCA\xE2 |0
+<U6B6A> \xCF\xC4 |0
+<U6B6B> \x8F\xC5\xFA |0
+<U6B6E> \x8F\xC5\xFB |0
+<U6B6F> \xBB\xF5 |0
+<U6B70> \x8F\xC5\xFC |0
+<U6B73> \xBA\xD0 |0
+<U6B74> \xCE\xF2 |0
+<U6B75> \x8F\xC5\xFD |0
+<U6B78> \xDD\xC5 |0
+<U6B79> \xDD\xC6 |0
+<U6B7B> \xBB\xE0 |0
+<U6B7D> \x8F\xC5\xFE |0
+<U6B7E> \x8F\xC6\xA1 |0
+<U6B7F> \xDD\xC7 |0
+<U6B80> \xDD\xC8 |0
+<U6B82> \x8F\xC6\xA2 |0
+<U6B83> \xDD\xCA |0
+<U6B84> \xDD\xC9 |0
+<U6B85> \x8F\xC6\xA3 |0
+<U6B86> \xCB\xD8 |0
+<U6B89> \xBD\xDE |0
+<U6B8A> \xBC\xEC |0
+<U6B8B> \xBB\xC4 |0
+<U6B8D> \xDD\xCB |0
+<U6B95> \xDD\xCD |0
+<U6B96> \xBF\xA3 |0
+<U6B97> \x8F\xC6\xA4 |0
+<U6B98> \xDD\xCC |0
+<U6B9B> \x8F\xC6\xA5 |0
+<U6B9E> \xDD\xCE |0
+<U6B9F> \x8F\xC6\xA6 |0
+<U6BA0> \x8F\xC6\xA7 |0
+<U6BA2> \x8F\xC6\xA8 |0
+<U6BA3> \x8F\xC6\xA9 |0
+<U6BA4> \xDD\xCF |0
+<U6BA8> \x8F\xC6\xAA |0
+<U6BA9> \x8F\xC6\xAB |0
+<U6BAA> \xDD\xD0 |0
+<U6BAB> \xDD\xD1 |0
+<U6BAC> \x8F\xC6\xAC |0
+<U6BAD> \x8F\xC6\xAD |0
+<U6BAE> \x8F\xC6\xAE |0
+<U6BAF> \xDD\xD2 |0
+<U6BB0> \x8F\xC6\xAF |0
+<U6BB1> \xDD\xD4 |0
+<U6BB2> \xDD\xD3 |0
+<U6BB3> \xDD\xD5 |0
+<U6BB4> \xB2\xA5 |0
+<U6BB5> \xC3\xCA |0
+<U6BB7> \xDD\xD6 |0
+<U6BB8> \x8F\xC6\xB0 |0
+<U6BB9> \x8F\xC6\xB1 |0
+<U6BBA> \xBB\xA6 |0
+<U6BBB> \xB3\xCC |0
+<U6BBC> \xDD\xD7 |0
+<U6BBD> \x8F\xC6\xB2 |0
+<U6BBE> \x8F\xC6\xB3 |0
+<U6BBF> \xC5\xC2 |0
+<U6BC0> \xD4\xCC |0
+<U6BC3> \x8F\xC6\xB4 |0
+<U6BC4> \x8F\xC6\xB5 |0
+<U6BC5> \xB5\xA3 |0
+<U6BC6> \xDD\xD8 |0
+<U6BC9> \x8F\xC6\xB6 |0
+<U6BCB> \xDD\xD9 |0
+<U6BCC> \x8F\xC6\xB7 |0
+<U6BCD> \xCA\xEC |0
+<U6BCE> \xCB\xE8 |0
+<U6BD2> \xC6\xC7 |0
+<U6BD3> \xDD\xDA |0
+<U6BD4> \xC8\xE6 |0
+<U6BD6> \x8F\xC6\xB8 |3
+<U6BD6> \xFA\xDA |0
+<U6BD8> \xC8\xFB |0
+<U6BDA> \x8F\xC6\xB9 |0
+<U6BDB> \xCC\xD3 |0
+<U6BDF> \xDD\xDB |0
+<U6BE1> \x8F\xC6\xBA |0
+<U6BE3> \x8F\xC6\xBB |0
+<U6BE6> \x8F\xC6\xBC |0
+<U6BE7> \x8F\xC6\xBD |0
+<U6BEB> \xDD\xDD |0
+<U6BEC> \xDD\xDC |0
+<U6BEE> \x8F\xC6\xBE |0
+<U6BEF> \xDD\xDF |0
+<U6BF1> \x8F\xC6\xBF |0
+<U6BF3> \xDD\xDE |0
+<U6BF7> \x8F\xC6\xC0 |0
+<U6BF9> \x8F\xC6\xC1 |0
+<U6BFF> \x8F\xC6\xC2 |0
+<U6C02> \x8F\xC6\xC3 |0
+<U6C04> \x8F\xC6\xC4 |0
+<U6C05> \x8F\xC6\xC5 |0
+<U6C08> \xDD\xE1 |0
+<U6C09> \x8F\xC6\xC6 |0
+<U6C0D> \x8F\xC6\xC7 |0
+<U6C0E> \x8F\xC6\xC8 |0
+<U6C0F> \xBB\xE1 |0
+<U6C10> \x8F\xC6\xC9 |0
+<U6C11> \xCC\xB1 |0
+<U6C12> \x8F\xC6\xCA |0
+<U6C13> \xDD\xE2 |0
+<U6C14> \xDD\xE3 |0
+<U6C17> \xB5\xA4 |0
+<U6C19> \x8F\xC6\xCB |0
+<U6C1B> \xDD\xE4 |0
+<U6C1F> \x8F\xC6\xCC |0
+<U6C23> \xDD\xE6 |0
+<U6C24> \xDD\xE5 |0
+<U6C26> \x8F\xC6\xCD |0
+<U6C27> \x8F\xC6\xCE |0
+<U6C28> \x8F\xC6\xCF |0
+<U6C2C> \x8F\xC6\xD0 |0
+<U6C2E> \x8F\xC6\xD1 |0
+<U6C33> \x8F\xC6\xD2 |0
+<U6C34> \xBF\xE5 |0
+<U6C35> \x8F\xC6\xD3 |0
+<U6C36> \x8F\xC6\xD4 |0
+<U6C37> \xC9\xB9 |0
+<U6C38> \xB1\xCA |0
+<U6C3A> \x8F\xC6\xD5 |0
+<U6C3B> \x8F\xC6\xD6 |0
+<U6C3E> \xC8\xC5 |0
+<U6C3F> \x8F\xC6\xD7 |3
+<U6C3F> \xFA\xDB |0
+<U6C40> \xC4\xF5 |0
+<U6C41> \xBD\xC1 |0
+<U6C42> \xB5\xE1 |0
+<U6C4A> \x8F\xC6\xD8 |0
+<U6C4B> \x8F\xC6\xD9 |0
+<U6C4D> \x8F\xC6\xDA |0
+<U6C4E> \xC8\xC6 |0
+<U6C4F> \x8F\xC6\xDB |0
+<U6C50> \xBC\xAE |0
+<U6C52> \x8F\xC6\xDC |0
+<U6C54> \x8F\xC6\xDD |0
+<U6C55> \xDD\xE8 |0
+<U6C57> \xB4\xC0 |0
+<U6C59> \x8F\xC6\xDE |0
+<U6C5A> \xB1\xF8 |0
+<U6C5B> \x8F\xC6\xDF |0
+<U6C5C> \x8F\xC6\xE0 |3
+<U6C5C> \xFA\xDC |0
+<U6C5D> \xC6\xF2 |0
+<U6C5E> \xDD\xE7 |0
+<U6C5F> \xB9\xBE |0
+<U6C60> \xC3\xD3 |0
+<U6C62> \xDD\xE9 |0
+<U6C67> \x8F\xC7\xB6 |0
+<U6C68> \xDD\xF1 |0
+<U6C6A> \xDD\xEA |0
+<U6C6B> \x8F\xC6\xE1 |0
+<U6C6D> \x8F\xC6\xE2 |0
+<U6C6F> \x8F\xC6\xE3 |3
+<U6C6F> \xFA\xDE |0
+<U6C70> \xC2\xC1 |0
+<U6C72> \xB5\xE2 |0
+<U6C73> \xDD\xF2 |0
+<U6C74> \x8F\xC6\xE4 |0
+<U6C76> \x8F\xC6\xE5 |0
+<U6C78> \x8F\xC6\xE6 |0
+<U6C79> \x8F\xC6\xE7 |0
+<U6C7A> \xB7\xE8 |0
+<U6C7B> \x8F\xC6\xE8 |0
+<U6C7D> \xB5\xA5 |0
+<U6C7E> \xDD\xF0 |0
+<U6C81> \xDD\xEE |0
+<U6C82> \xDD\xEB |0
+<U6C83> \xCD\xE0 |0
+<U6C85> \x8F\xC6\xE9 |0
+<U6C86> \x8F\xC6\xEA |3
+<U6C86> \xFA\xDD |0
+<U6C87> \x8F\xC6\xEB |0
+<U6C88> \xC4\xC0 |0
+<U6C89> \x8F\xC6\xEC |0
+<U6C8C> \xC6\xD9 |0
+<U6C8D> \xDD\xEC |0
+<U6C90> \xDD\xF4 |0
+<U6C92> \xDD\xF3 |0
+<U6C93> \xB7\xA3 |0
+<U6C94> \x8F\xC6\xED |0
+<U6C95> \x8F\xC6\xEE |0
+<U6C96> \xB2\xAD |0
+<U6C97> \x8F\xC6\xEF |0
+<U6C98> \x8F\xC6\xF0 |0
+<U6C99> \xBA\xBB |0
+<U6C9A> \xDD\xED |0
+<U6C9B> \xDD\xEF |0
+<U6C9C> \x8F\xC6\xF1 |0
+<U6C9F> \x8F\xC6\xF2 |0
+<U6CA1> \xCB\xD7 |0
+<U6CA2> \xC2\xF4 |0
+<U6CAB> \xCB\xF7 |0
+<U6CAE> \xDD\xFC |0
+<U6CB0> \x8F\xC6\xF3 |0
+<U6CB1> \xDD\xFD |0
+<U6CB2> \x8F\xC6\xF4 |0
+<U6CB3> \xB2\xCF |0
+<U6CB4> \x8F\xC6\xF5 |0
+<U6CB8> \xCA\xA8 |0
+<U6CB9> \xCC\xFD |0
+<U6CBA> \xDE\xA1 |0
+<U6CBB> \xBC\xA3 |0
+<U6CBC> \xBE\xC2 |0
+<U6CBD> \xDD\xF8 |0
+<U6CBE> \xDD\xFE |0
+<U6CBF> \xB1\xE8 |0
+<U6CC1> \xB6\xB7 |0
+<U6CC2> \x8F\xC6\xF6 |0
+<U6CC4> \xDD\xF5 |0
+<U6CC5> \xDD\xFA |0
+<U6CC6> \x8F\xC6\xF7 |0
+<U6CC9> \xC0\xF4 |0
+<U6CCA> \xC7\xF1 |0
+<U6CCC> \xC8\xE7 |0
+<U6CCD> \x8F\xC6\xF8 |0
+<U6CCF> \x8F\xC6\xF9 |0
+<U6CD0> \x8F\xC6\xFA |0
+<U6CD1> \x8F\xC6\xFB |0
+<U6CD2> \x8F\xC6\xFC |0
+<U6CD3> \xDD\xF7 |0
+<U6CD4> \x8F\xC6\xFD |0
+<U6CD5> \xCB\xA1 |0
+<U6CD6> \x8F\xC6\xFE |0
+<U6CD7> \xDD\xF9 |0
+<U6CD9> \xDE\xA4 |0
+<U6CDA> \x8F\xC7\xA1 |3
+<U6CDA> \xFA\xDF |0
+<U6CDB> \xDE\xA2 |0
+<U6CDC> \x8F\xC7\xA2 |0
+<U6CDD> \xDD\xFB |0
+<U6CE0> \x8F\xC7\xA3 |0
+<U6CE1> \xCB\xA2 |0
+<U6CE2> \xC7\xC8 |0
+<U6CE3> \xB5\xE3 |0
+<U6CE5> \xC5\xA5 |0
+<U6CE7> \x8F\xC7\xA4 |0
+<U6CE8> \xC3\xED |0
+<U6CE9> \x8F\xC7\xA5 |0
+<U6CEA> \xDE\xA5 |0
+<U6CEB> \x8F\xC7\xA6 |0
+<U6CEC> \x8F\xC7\xA7 |0
+<U6CEE> \x8F\xC7\xA8 |0
+<U6CEF> \xDE\xA3 |0
+<U6CF0> \xC2\xD9 |0
+<U6CF1> \xDD\xF6 |0
+<U6CF2> \x8F\xC7\xA9 |0
+<U6CF3> \xB1\xCB |0
+<U6CF4> \x8F\xC7\xAA |0
+<U6D04> \x8F\xC7\xAB |3
+<U6D04> \xFA\xE0 |0
+<U6D07> \x8F\xC7\xAC |0
+<U6D0A> \x8F\xC7\xAD |0
+<U6D0B> \xCD\xCE |0
+<U6D0C> \xDE\xB0 |0
+<U6D0E> \x8F\xC7\xAE |0
+<U6D0F> \x8F\xC7\xAF |0
+<U6D11> \x8F\xC7\xB0 |0
+<U6D12> \xDE\xAF |0
+<U6D13> \x8F\xC7\xB1 |0
+<U6D17> \xC0\xF6 |0
+<U6D19> \xDE\xAC |0
+<U6D1A> \x8F\xC7\xB2 |0
+<U6D1B> \xCD\xEC |0
+<U6D1E> \xC6\xB6 |0
+<U6D1F> \xDE\xA6 |0
+<U6D25> \xC4\xC5 |0
+<U6D26> \x8F\xC7\xB3 |0
+<U6D27> \x8F\xC7\xB4 |0
+<U6D28> \x8F\xC7\xB5 |0
+<U6D29> \xB1\xCC |0
+<U6D2A> \xB9\xBF |0
+<U6D2B> \xDE\xA9 |0
+<U6D2E> \x8F\xC7\xB7 |0
+<U6D2F> \x8F\xC7\xB8 |0
+<U6D31> \x8F\xC7\xB9 |0
+<U6D32> \xBD\xA7 |0
+<U6D33> \xDE\xAE |0
+<U6D35> \xDE\xAD |0
+<U6D36> \xDE\xA8 |0
+<U6D38> \xDE\xAB |0
+<U6D39> \x8F\xC7\xBA |0
+<U6D3B> \xB3\xE8 |0
+<U6D3C> \x8F\xC7\xBB |0
+<U6D3D> \xDE\xAA |0
+<U6D3E> \xC7\xC9 |0
+<U6D3F> \x8F\xC7\xBC |0
+<U6D41> \xCE\xAE |0
+<U6D44> \xBE\xF4 |0
+<U6D45> \xC0\xF5 |0
+<U6D57> \x8F\xC7\xBD |0
+<U6D59> \xDE\xB6 |0
+<U6D5A> \xDE\xB4 |0
+<U6D5C> \xC9\xCD |0
+<U6D5E> \x8F\xC7\xBE |0
+<U6D5F> \x8F\xC7\xBF |0
+<U6D61> \x8F\xC7\xC0 |0
+<U6D63> \xDE\xB1 |0
+<U6D64> \xDE\xB3 |0
+<U6D65> \x8F\xC7\xC1 |0
+<U6D66> \xB1\xBA |0
+<U6D67> \x8F\xC7\xC2 |0
+<U6D69> \xB9\xC0 |0
+<U6D6A> \xCF\xB2 |0
+<U6D6C> \xB3\xBD |0
+<U6D6E> \xC9\xE2 |0
+<U6D6F> \x8F\xC7\xC3 |3
+<U6D6F> \xFA\xE2 |0
+<U6D70> \x8F\xC7\xC4 |0
+<U6D74> \xCD\xE1 |0
+<U6D77> \xB3\xA4 |0
+<U6D78> \xBF\xBB |0
+<U6D79> \xDE\xB5 |0
+<U6D7C> \x8F\xC7\xC5 |0
+<U6D82> \x8F\xC7\xC6 |0
+<U6D85> \xDE\xBA |0
+<U6D87> \x8F\xC7\xC7 |3
+<U6D87> \xFA\xE1 |0
+<U6D88> \xBE\xC3 |0
+<U6D8C> \xCD\xB0 |0
+<U6D8E> \xDE\xB7 |0
+<U6D91> \x8F\xC7\xC8 |0
+<U6D92> \x8F\xC7\xC9 |0
+<U6D93> \xDE\xB2 |0
+<U6D94> \x8F\xC7\xCA |0
+<U6D95> \xDE\xB8 |0
+<U6D96> \x8F\xC7\xCB |3
+<U6D96> \xFA\xE3 |0
+<U6D97> \x8F\xC7\xCC |0
+<U6D98> \x8F\xC7\xCD |0
+<U6D99> \xCE\xDE |0
+<U6D9B> \xC5\xF3 |0
+<U6D9C> \xC6\xC2 |0
+<U6DAA> \x8F\xC7\xCE |0
+<U6DAC> \x8F\xC7\xCF |3
+<U6DAC> \xFA\xE4 |0
+<U6DAF> \xB3\xB6 |0
+<U6DB2> \xB1\xD5 |0
+<U6DB4> \x8F\xC7\xD0 |0
+<U6DB5> \xDE\xBE |0
+<U6DB7> \x8F\xC7\xD1 |0
+<U6DB8> \xDE\xC1 |0
+<U6DB9> \x8F\xC7\xD2 |0
+<U6DBC> \xCE\xC3 |0
+<U6DBD> \x8F\xC7\xD3 |0
+<U6DBF> \x8F\xC7\xD4 |0
+<U6DC0> \xCD\xE4 |0
+<U6DC4> \x8F\xC7\xD5 |0
+<U6DC5> \xDE\xC8 |0
+<U6DC6> \xDE\xC2 |0
+<U6DC7> \xDE\xBF |0
+<U6DC8> \x8F\xC7\xD6 |0
+<U6DCA> \x8F\xC7\xD7 |0
+<U6DCB> \xCE\xD4 |0
+<U6DCC> \xDE\xC5 |0
+<U6DCE> \x8F\xC7\xD8 |0
+<U6DCF> \x8F\xC7\xD9 |3
+<U6DCF> \xFA\xE5 |0
+<U6DD1> \xBD\xCA |0
+<U6DD2> \xDE\xC7 |0
+<U6DD5> \xDE\xCC |0
+<U6DD6> \x8F\xC7\xDA |0
+<U6DD8> \xC5\xF1 |0
+<U6DD9> \xDE\xCA |0
+<U6DDB> \x8F\xC7\xDB |0
+<U6DDD> \x8F\xC7\xDC |0
+<U6DDE> \xDE\xC4 |0
+<U6DDF> \x8F\xC7\xDD |0
+<U6DE0> \x8F\xC7\xDE |0
+<U6DE1> \xC3\xB8 |0
+<U6DE2> \x8F\xC7\xDF |0
+<U6DE4> \xDE\xCB |0
+<U6DE5> \x8F\xC7\xE0 |0
+<U6DE6> \xDE\xC0 |0
+<U6DE8> \xDE\xC6 |0
+<U6DE9> \x8F\xC7\xE1 |0
+<U6DEA> \xDE\xCD |0
+<U6DEB> \xB0\xFC |0
+<U6DEC> \xDE\xC3 |0
+<U6DEE> \xDE\xCE |0
+<U6DEF> \x8F\xC7\xE2 |0
+<U6DF0> \x8F\xC7\xE3 |0
+<U6DF1> \xBF\xBC |0
+<U6DF2> \xFA\xE7 |0
+<U6DF3> \xBD\xDF |0
+<U6DF4> \x8F\xC7\xE4 |0
+<U6DF5> \xCA\xA5 |0
+<U6DF6> \x8F\xC7\xE5 |0
+<U6DF7> \xBA\xAE |0
+<U6DF8> \xFA\xE6 |0
+<U6DF9> \xDE\xBB |0
+<U6DFA> \xDE\xC9 |0
+<U6DFB> \xC5\xBA |0
+<U6DFC> \x8F\xC7\xE6 |3
+<U6DFC> \xFA\xE8 |0
+<U6E00> \x8F\xC7\xE7 |0
+<U6E04> \x8F\xC7\xE8 |0
+<U6E05> \xC0\xB6 |0
+<U6E07> \xB3\xE9 |0
+<U6E08> \xBA\xD1 |0
+<U6E09> \xBE\xC4 |0
+<U6E0A> \xDE\xBD |0
+<U6E0B> \xBD\xC2 |0
+<U6E13> \xB7\xCC |0
+<U6E15> \xDE\xBC |0
+<U6E19> \xDE\xD2 |0
+<U6E1A> \xBD\xED |0
+<U6E1B> \xB8\xBA |0
+<U6E1D> \xDE\xE1 |0
+<U6E1E> \x8F\xC7\xE9 |0
+<U6E1F> \xDE\xDB |0
+<U6E20> \xB5\xF4 |0
+<U6E21> \xC5\xCF |0
+<U6E22> \x8F\xC7\xEA |0
+<U6E23> \xDE\xD6 |0
+<U6E24> \xDE\xDF |0
+<U6E25> \xB0\xAF |0
+<U6E26> \xB1\xB2 |0
+<U6E27> \x8F\xC7\xEB |3
+<U6E27> \xFA\xEB |0
+<U6E29> \xB2\xB9 |0
+<U6E2B> \xDE\xD8 |0
+<U6E2C> \xC2\xAC |0
+<U6E2D> \xDE\xCF |0
+<U6E2E> \xDE\xD1 |0
+<U6E2F> \xB9\xC1 |0
+<U6E32> \x8F\xC7\xEC |0
+<U6E36> \x8F\xC7\xED |0
+<U6E38> \xDE\xE2 |0
+<U6E39> \x8F\xC7\xEE |3
+<U6E39> \xFA\xE9 |0
+<U6E3A> \xDE\xDD |0
+<U6E3B> \x8F\xC7\xEF |0
+<U6E3C> \x8F\xC7\xF0 |3
+<U6E3C> \xFA\xEC |0
+<U6E3E> \xDE\xD5 |0
+<U6E43> \xDE\xDC |0
+<U6E44> \x8F\xC7\xF1 |0
+<U6E45> \x8F\xC7\xF2 |0
+<U6E48> \x8F\xC7\xF3 |0
+<U6E49> \x8F\xC7\xF4 |0
+<U6E4A> \xCC\xAB |0
+<U6E4B> \x8F\xC7\xF5 |0
+<U6E4D> \xDE\xDA |0
+<U6E4E> \xDE\xDE |0
+<U6E4F> \x8F\xC7\xF6 |0
+<U6E51> \x8F\xC7\xF7 |0
+<U6E52> \x8F\xC7\xF8 |0
+<U6E53> \x8F\xC7\xF9 |0
+<U6E54> \x8F\xC7\xFA |0
+<U6E56> \xB8\xD0 |0
+<U6E57> \x8F\xC7\xFB |0
+<U6E58> \xBE\xC5 |0
+<U6E5B> \xC3\xB9 |0
+<U6E5C> \x8F\xC7\xFC |3
+<U6E5C> \xFA\xEA |0
+<U6E5D> \x8F\xC7\xFD |0
+<U6E5E> \x8F\xC7\xFE |0
+<U6E5F> \xDE\xD4 |0
+<U6E62> \x8F\xC8\xA1 |0
+<U6E63> \x8F\xC8\xA2 |0
+<U6E67> \xCD\xAF |0
+<U6E68> \x8F\xC8\xA3 |0
+<U6E6B> \xDE\xD7 |0
+<U6E6E> \xDE\xD0 |0
+<U6E6F> \xC5\xF2 |0
+<U6E72> \xDE\xD3 |0
+<U6E73> \x8F\xC8\xA4 |0
+<U6E76> \xDE\xD9 |0
+<U6E7B> \x8F\xC8\xA5 |0
+<U6E7D> \x8F\xC8\xA6 |0
+<U6E7E> \xCF\xD1 |0
+<U6E7F> \xBC\xBE |0
+<U6E80> \xCB\xFE |0
+<U6E82> \xDE\xE3 |0
+<U6E8C> \xC8\xAE |0
+<U6E8D> \x8F\xC8\xA7 |0
+<U6E8F> \xDE\xEF |0
+<U6E90> \xB8\xBB |0
+<U6E93> \x8F\xC8\xA8 |0
+<U6E96> \xBD\xE0 |0
+<U6E98> \xDE\xE5 |0
+<U6E99> \x8F\xC8\xA9 |0
+<U6E9C> \xCE\xAF |0
+<U6E9D> \xB9\xC2 |0
+<U6E9F> \xDE\xF2 |0
+<U6EA0> \x8F\xC8\xAA |0
+<U6EA2> \xB0\xEE |0
+<U6EA5> \xDE\xF0 |0
+<U6EA7> \x8F\xC8\xAB |0
+<U6EAA> \xDE\xE4 |0
+<U6EAD> \x8F\xC8\xAC |0
+<U6EAE> \x8F\xC8\xAD |0
+<U6EAF> \xDE\xEA |0
+<U6EB1> \x8F\xC8\xAE |0
+<U6EB2> \xDE\xEC |0
+<U6EB3> \x8F\xC8\xAF |0
+<U6EB6> \xCD\xCF |0
+<U6EB7> \xDE\xE7 |0
+<U6EBA> \xC5\xAE |0
+<U6EBB> \x8F\xC8\xB0 |0
+<U6EBD> \xDE\xE9 |0
+<U6EBF> \x8F\xC8\xB1 |3
+<U6EBF> \xFA\xED |0
+<U6EC0> \x8F\xC8\xB2 |0
+<U6EC1> \x8F\xC8\xB3 |0
+<U6EC2> \xDE\xF1 |0
+<U6EC3> \x8F\xC8\xB4 |0
+<U6EC4> \xDE\xEB |0
+<U6EC5> \xCC\xC7 |0
+<U6EC7> \x8F\xC8\xB5 |0
+<U6EC8> \x8F\xC8\xB6 |0
+<U6EC9> \xDE\xE6 |0
+<U6ECA> \x8F\xC8\xB7 |0
+<U6ECB> \xBC\xA2 |0
+<U6ECC> \xDE\xFE |0
+<U6ECD> \x8F\xC8\xB8 |0
+<U6ECE> \x8F\xC8\xB9 |0
+<U6ECF> \x8F\xC8\xBA |0
+<U6ED1> \xB3\xEA |0
+<U6ED3> \xDE\xE8 |0
+<U6ED4> \xDE\xED |0
+<U6ED5> \xDE\xEE |0
+<U6EDD> \xC2\xEC |0
+<U6EDE> \xC2\xDA |0
+<U6EEB> \x8F\xC8\xBB |0
+<U6EEC> \xDE\xF6 |0
+<U6EED> \x8F\xC8\xBC |0
+<U6EEE> \x8F\xC8\xBD |0
+<U6EEF> \xDE\xFC |0
+<U6EF2> \xDE\xFA |0
+<U6EF4> \xC5\xA9 |0
+<U6EF7> \xDF\xA3 |0
+<U6EF8> \xDE\xF7 |0
+<U6EF9> \x8F\xC8\xBE |0
+<U6EFB> \x8F\xC8\xBF |0
+<U6EFD> \x8F\xC8\xC0 |0
+<U6EFE> \xDE\xF8 |0
+<U6EFF> \xDE\xE0 |0
+<U6F01> \xB5\xF9 |0
+<U6F02> \xC9\xBA |0
+<U6F04> \x8F\xC8\xC1 |0
+<U6F06> \xBC\xBF |0
+<U6F08> \x8F\xC8\xC2 |0
+<U6F09> \xB9\xF7 |0
+<U6F0A> \x8F\xC8\xC3 |0
+<U6F0C> \x8F\xC8\xC4 |0
+<U6F0D> \x8F\xC8\xC5 |0
+<U6F0F> \xCF\xB3 |0
+<U6F11> \xDE\xF4 |0
+<U6F13> \xDF\xA2 |0
+<U6F14> \xB1\xE9 |0
+<U6F15> \xC1\xE6 |0
+<U6F16> \x8F\xC8\xC6 |0
+<U6F18> \x8F\xC8\xC7 |0
+<U6F1A> \x8F\xC8\xC8 |0
+<U6F1B> \x8F\xC8\xC9 |0
+<U6F20> \xC7\xF9 |0
+<U6F22> \xB4\xC1 |0
+<U6F23> \xCE\xFA |0
+<U6F26> \x8F\xC8\xCA |0
+<U6F29> \x8F\xC8\xCB |0
+<U6F2A> \x8F\xC8\xCC |0
+<U6F2B> \xCC\xA1 |0
+<U6F2C> \xC4\xD2 |0
+<U6F2D> \x8F\xC8\xD3 |0
+<U6F2F> \x8F\xC8\xCD |0
+<U6F30> \x8F\xC8\xCE |0
+<U6F31> \xDE\xFB |0
+<U6F32> \xDE\xFD |0
+<U6F33> \x8F\xC8\xCF |0
+<U6F36> \x8F\xC8\xD0 |0
+<U6F38> \xC1\xB2 |0
+<U6F3B> \x8F\xC8\xD1 |0
+<U6F3C> \x8F\xC8\xD2 |0
+<U6F3E> \xDF\xA1 |0
+<U6F3F> \xDE\xF9 |0
+<U6F41> \xDE\xF3 |0
+<U6F45> \xB4\xC3 |0
+<U6F4F> \x8F\xC8\xD4 |0
+<U6F51> \x8F\xC8\xD5 |0
+<U6F52> \x8F\xC8\xD6 |0
+<U6F53> \x8F\xC8\xD7 |0
+<U6F54> \xB7\xE9 |0
+<U6F57> \x8F\xC8\xD8 |0
+<U6F58> \xDF\xAF |0
+<U6F59> \x8F\xC8\xD9 |0
+<U6F5A> \x8F\xC8\xDA |0
+<U6F5B> \xDF\xAA |0
+<U6F5C> \xC0\xF8 |0
+<U6F5D> \x8F\xC8\xDB |0
+<U6F5E> \x8F\xC8\xDC |0
+<U6F5F> \xB3\xE3 |0
+<U6F61> \x8F\xC8\xDD |0
+<U6F62> \x8F\xC8\xDE |0
+<U6F64> \xBD\xE1 |0
+<U6F66> \xDF\xB3 |0
+<U6F68> \x8F\xC8\xDF |0
+<U6F6C> \x8F\xC8\xE0 |0
+<U6F6D> \xDF\xAC |0
+<U6F6E> \xC4\xAC |0
+<U6F6F> \xDF\xA9 |0
+<U6F70> \xC4\xD9 |0
+<U6F74> \xDF\xCC |0
+<U6F78> \xDF\xA6 |0
+<U6F7A> \xDF\xA5 |0
+<U6F7C> \xDF\xAE |0
+<U6F7D> \x8F\xC8\xE1 |0
+<U6F7E> \x8F\xC8\xE2 |0
+<U6F80> \xDF\xA8 |0
+<U6F81> \xDF\xA7 |0
+<U6F82> \xDF\xAD |0
+<U6F83> \x8F\xC8\xE3 |0
+<U6F84> \xC0\xA1 |0
+<U6F86> \xDF\xA4 |0
+<U6F87> \x8F\xC8\xE4 |0
+<U6F88> \x8F\xC8\xE5 |3
+<U6F88> \xFA\xEE |0
+<U6F8B> \x8F\xC8\xE6 |0
+<U6F8C> \x8F\xC8\xE7 |0
+<U6F8D> \x8F\xC8\xE8 |0
+<U6F8E> \xDF\xB0 |0
+<U6F90> \x8F\xC8\xE9 |0
+<U6F91> \xDF\xB1 |0
+<U6F92> \x8F\xC8\xEA |0
+<U6F93> \x8F\xC8\xEB |0
+<U6F94> \x8F\xC8\xEC |0
+<U6F96> \x8F\xC8\xED |0
+<U6F97> \xB4\xC2 |0
+<U6F9A> \x8F\xC8\xEE |0
+<U6F9F> \x8F\xC8\xEF |0
+<U6FA0> \x8F\xC8\xF0 |0
+<U6FA1> \xDF\xB6 |0
+<U6FA3> \xDF\xB5 |0
+<U6FA4> \xDF\xB7 |0
+<U6FA5> \x8F\xC8\xF1 |0
+<U6FA6> \x8F\xC8\xF2 |0
+<U6FA7> \x8F\xC8\xF3 |0
+<U6FA8> \x8F\xC8\xF4 |0
+<U6FAA> \xDF\xBA |0
+<U6FAE> \x8F\xC8\xF5 |0
+<U6FAF> \x8F\xC8\xF6 |0
+<U6FB0> \x8F\xC8\xF7 |0
+<U6FB1> \xC5\xC3 |0
+<U6FB3> \xDF\xB4 |0
+<U6FB5> \x8F\xC8\xF8 |3
+<U6FB5> \xFA\xEF |0
+<U6FB6> \x8F\xC8\xF9 |0
+<U6FB9> \xDF\xB8 |0
+<U6FBC> \x8F\xC8\xFA |0
+<U6FC0> \xB7\xE3 |0
+<U6FC1> \xC2\xF9 |0
+<U6FC2> \xDF\xB2 |0
+<U6FC3> \xC7\xBB |0
+<U6FC5> \x8F\xC8\xFB |0
+<U6FC6> \xDF\xB9 |0
+<U6FC7> \x8F\xC8\xFC |0
+<U6FC8> \x8F\xC8\xFD |0
+<U6FCA> \x8F\xC8\xFE |0
+<U6FD4> \xDF\xBE |0
+<U6FD5> \xDF\xBC |0
+<U6FD8> \xDF\xBF |0
+<U6FDA> \x8F\xC9\xA1 |0
+<U6FDB> \xDF\xC2 |0
+<U6FDE> \x8F\xC9\xA2 |0
+<U6FDF> \xDF\xBB |0
+<U6FE0> \xB9\xEA |0
+<U6FE1> \xC7\xA8 |0
+<U6FE4> \xDE\xB9 |0
+<U6FE8> \x8F\xC9\xA3 |0
+<U6FE9> \x8F\xC9\xA4 |0
+<U6FEB> \xCD\xF4 |0
+<U6FEC> \xDF\xBD |0
+<U6FEE> \xDF\xC1 |0
+<U6FEF> \xC2\xF5 |0
+<U6FF0> \x8F\xC9\xA5 |0
+<U6FF1> \xDF\xC0 |0
+<U6FF3> \xDF\xAB |0
+<U6FF5> \x8F\xC9\xA6 |3
+<U6FF5> \xFA\xF0 |0
+<U6FF6> \xEF\xE9 |0
+<U6FF9> \x8F\xC9\xA7 |0
+<U6FFA> \xDF\xC5 |0
+<U6FFC> \x8F\xC9\xA8 |0
+<U6FFD> \x8F\xC9\xA9 |0
+<U6FFE> \xDF\xC9 |0
+<U7000> \x8F\xC9\xAA |0
+<U7001> \xDF\xC7 |0
+<U7005> \x8F\xC9\xAB |3
+<U7005> \xFA\xF1 |0
+<U7006> \x8F\xC9\xAC |0
+<U7007> \x8F\xC9\xAD |3
+<U7007> \xFA\xF2 |0
+<U7009> \xDF\xC3 |0
+<U700B> \xDF\xC4 |0
+<U700D> \x8F\xC9\xAE |0
+<U700F> \xDF\xC8 |0
+<U7011> \xDF\xC6 |0
+<U7015> \xC9\xCE |0
+<U7017> \x8F\xC9\xAF |0
+<U7018> \xDF\xCE |0
+<U701A> \xDF\xCB |0
+<U701B> \xDF\xCA |0
+<U701D> \xDF\xCD |0
+<U701E> \xC6\xD4 |0
+<U701F> \xDF\xCF |0
+<U7020> \x8F\xC9\xB0 |0
+<U7023> \x8F\xC9\xB1 |0
+<U7026> \xC3\xF5 |0
+<U7027> \xC2\xED |0
+<U7028> \xFA\xF3 |0
+<U702C> \xC0\xA5 |0
+<U702F> \x8F\xC9\xB2 |0
+<U7030> \xDF\xD0 |0
+<U7032> \xDF\xD2 |0
+<U7034> \x8F\xC9\xB3 |0
+<U7037> \x8F\xC9\xB4 |0
+<U7039> \x8F\xC9\xB5 |0
+<U703C> \x8F\xC9\xB6 |0
+<U703E> \xDF\xD1 |0
+<U7043> \x8F\xC9\xB7 |0
+<U7044> \x8F\xC9\xB8 |0
+<U7048> \x8F\xC9\xB9 |0
+<U7049> \x8F\xC9\xBA |0
+<U704A> \x8F\xC9\xBB |0
+<U704B> \x8F\xC9\xBC |0
+<U704C> \xDE\xF5 |0
+<U704E> \x8F\xC9\xC1 |0
+<U7051> \xDF\xD3 |0
+<U7054> \x8F\xC9\xBD |0
+<U7055> \x8F\xC9\xBE |0
+<U7058> \xC6\xE7 |0
+<U705D> \x8F\xC9\xBF |0
+<U705E> \x8F\xC9\xC0 |0
+<U7063> \xDF\xD4 |0
+<U7064> \x8F\xC9\xC2 |0
+<U7065> \x8F\xC9\xC3 |0
+<U706B> \xB2\xD0 |0
+<U706C> \x8F\xC9\xC4 |0
+<U706E> \x8F\xC9\xC5 |0
+<U706F> \xC5\xF4 |0
+<U7070> \xB3\xA5 |0
+<U7075> \x8F\xC9\xC6 |0
+<U7076> \x8F\xC9\xC7 |0
+<U7078> \xB5\xE4 |0
+<U707C> \xBC\xDE |0
+<U707D> \xBA\xD2 |0
+<U707E> \x8F\xC9\xC8 |0
+<U7081> \x8F\xC9\xC9 |0
+<U7085> \x8F\xC9\xCA |3
+<U7085> \xFA\xF4 |0
+<U7086> \x8F\xC9\xCB |0
+<U7089> \xCF\xA7 |0
+<U708A> \xBF\xE6 |0
+<U708E> \xB1\xEA |0
+<U7092> \xDF\xD6 |0
+<U7094> \x8F\xC9\xCC |0
+<U7095> \x8F\xC9\xCD |0
+<U7096> \x8F\xC9\xCE |0
+<U7097> \x8F\xC9\xCF |0
+<U7098> \x8F\xC9\xD0 |0
+<U7099> \xDF\xD5 |0
+<U709B> \x8F\xC9\xD1 |0
+<U70A4> \x8F\xC9\xD2 |0
+<U70AB> \x8F\xC9\xD3 |3
+<U70AB> \xFA\xF5 |0
+<U70AC> \xDF\xD9 |0
+<U70AD> \xC3\xBA |0
+<U70AE> \xDF\xDC |0
+<U70AF> \xDF\xD7 |0
+<U70B0> \x8F\xC9\xD4 |0
+<U70B1> \x8F\xC9\xD5 |0
+<U70B3> \xDF\xDB |0
+<U70B4> \x8F\xC9\xD6 |0
+<U70B7> \x8F\xC9\xD7 |0
+<U70B8> \xDF\xDA |0
+<U70B9> \xC5\xC0 |0
+<U70BA> \xB0\xD9 |0
+<U70BB> \xF9\xA7 |0
+<U70C8> \xCE\xF5 |0
+<U70CA> \x8F\xC9\xD8 |0
+<U70CB> \xDF\xDE |0
+<U70CF> \xB1\xA8 |0
+<U70D1> \x8F\xC9\xD9 |0
+<U70D3> \x8F\xC9\xDA |0
+<U70D4> \x8F\xC9\xDB |0
+<U70D5> \x8F\xC9\xDC |0
+<U70D6> \x8F\xC9\xDD |0
+<U70D8> \x8F\xC9\xDE |0
+<U70D9> \xDF\xE0 |0
+<U70DC> \x8F\xC9\xDF |0
+<U70DD> \xDF\xDF |0
+<U70DF> \xDF\xDD |0
+<U70E4> \x8F\xC9\xE0 |0
+<U70F1> \xDF\xD8 |0
+<U70F9> \xCB\xA3 |0
+<U70FA> \x8F\xC9\xE1 |0
+<U70FD> \xDF\xE2 |0
+<U7103> \x8F\xC9\xE2 |0
+<U7104> \x8F\xC9\xE3 |3
+<U7104> \xFA\xF7 |0
+<U7105> \x8F\xC9\xE4 |0
+<U7106> \x8F\xC9\xE5 |0
+<U7107> \x8F\xC9\xE6 |0
+<U7109> \xDF\xE1 |0
+<U710B> \x8F\xC9\xE7 |0
+<U710C> \x8F\xC9\xE8 |0
+<U710F> \x8F\xC9\xE9 |3
+<U710F> \xFA\xF6 |0
+<U7114> \xB1\xEB |0
+<U7119> \xDF\xE4 |0
+<U711A> \xCA\xB2 |0
+<U711C> \xDF\xE3 |0
+<U711E> \x8F\xC9\xEA |0
+<U7120> \x8F\xC9\xEB |0
+<U7121> \xCC\xB5 |0
+<U7126> \xBE\xC7 |0
+<U712B> \x8F\xC9\xEC |0
+<U712D> \x8F\xC9\xED |0
+<U712F> \x8F\xC9\xEE |0
+<U7130> \x8F\xC9\xEF |0
+<U7131> \x8F\xC9\xF0 |0
+<U7136> \xC1\xB3 |0
+<U7138> \x8F\xC9\xF1 |0
+<U713C> \xBE\xC6 |0
+<U7141> \x8F\xC9\xF2 |0
+<U7145> \x8F\xC9\xF3 |0
+<U7146> \x8F\xC9\xF4 |3
+<U7146> \xFA\xF9 |0
+<U7147> \x8F\xC9\xF5 |3
+<U7147> \xFA\xFA |0
+<U7149> \xCE\xFB |0
+<U714A> \x8F\xC9\xF6 |0
+<U714B> \x8F\xC9\xF7 |0
+<U714C> \xDF\xEA |0
+<U714E> \xC0\xF9 |0
+<U7150> \x8F\xC9\xF8 |0
+<U7152> \x8F\xC9\xF9 |0
+<U7155> \xDF\xE6 |0
+<U7156> \xDF\xEB |0
+<U7157> \x8F\xC9\xFA |0
+<U7159> \xB1\xEC |0
+<U715A> \x8F\xC9\xFB |0
+<U715C> \x8F\xC9\xFC |3
+<U715C> \xFA\xF8 |0
+<U715E> \x8F\xC9\xFD |0
+<U7160> \x8F\xC9\xFE |0
+<U7162> \xDF\xE9 |0
+<U7164> \xC7\xE1 |0
+<U7165> \xDF\xE5 |0
+<U7166> \xDF\xE8 |0
+<U7167> \xBE\xC8 |0
+<U7168> \x8F\xCA\xA1 |0
+<U7169> \xC8\xD1 |0
+<U716C> \xDF\xEC |0
+<U716E> \xBC\xD1 |0
+<U7179> \x8F\xCA\xA2 |0
+<U717D> \xC0\xFA |0
+<U7180> \x8F\xCA\xA3 |0
+<U7184> \xDF\xEF |0
+<U7185> \x8F\xCA\xA4 |0
+<U7187> \x8F\xCA\xA5 |0
+<U7188> \xDF\xE7 |0
+<U718A> \xB7\xA7 |0
+<U718C> \x8F\xCA\xA6 |0
+<U718F> \xDF\xED |0
+<U7192> \x8F\xCA\xA7 |0
+<U7194> \xCD\xD0 |0
+<U7195> \xDF\xF0 |0
+<U7199> \xF4\xA6 |0
+<U719A> \x8F\xCA\xA8 |0
+<U719B> \x8F\xCA\xA9 |0
+<U719F> \xBD\xCF |0
+<U71A0> \x8F\xCA\xAA |0
+<U71A2> \x8F\xCA\xAB |0
+<U71A8> \xDF\xF1 |0
+<U71AC> \xDF\xF2 |0
+<U71AF> \x8F\xCA\xAC |0
+<U71B0> \x8F\xCA\xAD |0
+<U71B1> \xC7\xAE |0
+<U71B2> \x8F\xCA\xAE |0
+<U71B3> \x8F\xCA\xAF |0
+<U71B9> \xDF\xF4 |0
+<U71BA> \x8F\xCA\xB0 |0
+<U71BE> \xDF\xF5 |0
+<U71BF> \x8F\xCA\xB1 |0
+<U71C0> \x8F\xCA\xB2 |0
+<U71C1> \x8F\xCA\xB3 |3
+<U71C1> \xFA\xFC |0
+<U71C3> \xC7\xB3 |0
+<U71C4> \x8F\xCA\xB4 |0
+<U71C8> \xC5\xF5 |0
+<U71C9> \xDF\xF7 |0
+<U71CB> \x8F\xCA\xB5 |0
+<U71CC> \x8F\xCA\xB6 |0
+<U71CE> \xDF\xF9 |0
+<U71D0> \xCE\xD5 |0
+<U71D2> \xDF\xF6 |0
+<U71D3> \x8F\xCA\xB7 |0
+<U71D4> \xDF\xF8 |0
+<U71D5> \xB1\xED |0
+<U71D6> \x8F\xCA\xB8 |0
+<U71D7> \xDF\xF3 |0
+<U71D9> \x8F\xCA\xB9 |0
+<U71DA> \x8F\xCA\xBA |0
+<U71DC> \x8F\xCA\xBB |0
+<U71DF> \xD3\xDB |0
+<U71E0> \xDF\xFA |0
+<U71E5> \xC1\xE7 |0
+<U71E6> \xBB\xB8 |0
+<U71E7> \xDF\xFC |0
+<U71EC> \xDF\xFB |0
+<U71ED> \xBF\xA4 |0
+<U71EE> \xD2\xD9 |0
+<U71F5> \xDF\xFD |0
+<U71F8> \x8F\xCA\xBC |0
+<U71F9> \xE0\xA1 |0
+<U71FB> \xDF\xEE |0
+<U71FC> \xDF\xFE |0
+<U71FE> \x8F\xCA\xBD |3
+<U71FE> \xFA\xFD |0
+<U71FF> \xE0\xA2 |0
+<U7200> \x8F\xCA\xBE |0
+<U7206> \xC7\xFA |0
+<U7207> \x8F\xCA\xBF |0
+<U7208> \x8F\xCA\xC0 |0
+<U7209> \x8F\xCA\xC1 |0
+<U720D> \xE0\xA3 |0
+<U7210> \xE0\xA4 |0
+<U7213> \x8F\xCA\xC2 |0
+<U7217> \x8F\xCA\xC3 |0
+<U721A> \x8F\xCA\xC4 |0
+<U721B> \xE0\xA5 |0
+<U721D> \x8F\xCA\xC5 |0
+<U721F> \x8F\xCA\xC6 |0
+<U7224> \x8F\xCA\xC7 |0
+<U7228> \xE0\xA6 |0
+<U722A> \xC4\xDE |0
+<U722B> \x8F\xCA\xC8 |0
+<U722C> \xE0\xA8 |0
+<U722D> \xE0\xA7 |0
+<U722F> \x8F\xCA\xC9 |0
+<U7230> \xE0\xA9 |0
+<U7232> \xE0\xAA |0
+<U7234> \x8F\xCA\xCA |0
+<U7235> \xBC\xDF |0
+<U7236> \xC9\xE3 |0
+<U7238> \x8F\xCA\xCB |0
+<U7239> \x8F\xCA\xCC |0
+<U723A> \xCC\xEC |0
+<U723B> \xE0\xAB |0
+<U723C> \xE0\xAC |0
+<U723D> \xC1\xD6 |0
+<U723E> \xBC\xA4 |0
+<U723F> \xE0\xAD |0
+<U7240> \xE0\xAE |0
+<U7241> \x8F\xCA\xCD |0
+<U7242> \x8F\xCA\xCE |0
+<U7243> \x8F\xCA\xCF |0
+<U7245> \x8F\xCA\xD0 |0
+<U7246> \xE0\xAF |0
+<U7247> \xCA\xD2 |0
+<U7248> \xC8\xC7 |0
+<U724B> \xE0\xB0 |0
+<U724C> \xC7\xD7 |0
+<U724E> \x8F\xCA\xD1 |0
+<U724F> \x8F\xCA\xD2 |0
+<U7250> \x8F\xCA\xD3 |0
+<U7252> \xC4\xAD |0
+<U7253> \x8F\xCA\xD4 |0
+<U7255> \x8F\xCA\xD5 |0
+<U7256> \x8F\xCA\xD6 |0
+<U7258> \xE0\xB1 |0
+<U7259> \xB2\xE7 |0
+<U725A> \x8F\xCA\xD7 |0
+<U725B> \xB5\xED |0
+<U725C> \x8F\xCA\xD8 |0
+<U725D> \xCC\xC6 |0
+<U725E> \x8F\xCA\xD9 |0
+<U725F> \xCC\xB6 |0
+<U7260> \x8F\xCA\xDA |0
+<U7261> \xB2\xB4 |0
+<U7262> \xCF\xB4 |0
+<U7263> \x8F\xCA\xDB |0
+<U7267> \xCB\xD2 |0
+<U7268> \x8F\xCA\xDC |0
+<U7269> \xCA\xAA |0
+<U726B> \x8F\xCA\xDD |0
+<U726E> \x8F\xCA\xDE |0
+<U726F> \x8F\xCA\xDF |0
+<U7271> \x8F\xCA\xE0 |0
+<U7272> \xC0\xB7 |0
+<U7274> \xE0\xB2 |0
+<U7277> \x8F\xCA\xE1 |0
+<U7278> \x8F\xCA\xE2 |0
+<U7279> \xC6\xC3 |0
+<U727B> \x8F\xCA\xE3 |0
+<U727C> \x8F\xCA\xE4 |0
+<U727D> \xB8\xA3 |0
+<U727E> \xE0\xB3 |0
+<U727F> \x8F\xCA\xE5 |0
+<U7280> \xBA\xD4 |0
+<U7281> \xE0\xB5 |0
+<U7282> \xE0\xB4 |0
+<U7284> \x8F\xCA\xE6 |0
+<U7287> \xE0\xB6 |0
+<U7289> \x8F\xCA\xE7 |0
+<U728D> \x8F\xCA\xE8 |0
+<U728E> \x8F\xCA\xE9 |0
+<U7292> \xE0\xB7 |0
+<U7293> \x8F\xCA\xEA |0
+<U7296> \xE0\xB8 |0
+<U729B> \x8F\xCA\xEB |0
+<U72A0> \xB5\xBE |0
+<U72A2> \xE0\xB9 |0
+<U72A7> \xE0\xBA |0
+<U72A8> \x8F\xCA\xEC |0
+<U72AC> \xB8\xA4 |0
+<U72AD> \x8F\xCA\xED |0
+<U72AE> \x8F\xCA\xEE |0
+<U72AF> \xC8\xC8 |0
+<U72B1> \x8F\xCA\xEF |3
+<U72B1> \xFA\xFE |0
+<U72B2> \xE0\xBC |0
+<U72B4> \x8F\xCA\xF0 |0
+<U72B6> \xBE\xF5 |0
+<U72B9> \xE0\xBB |0
+<U72BE> \x8F\xCA\xF1 |3
+<U72BE> \xFB\xA1 |0
+<U72C1> \x8F\xCA\xF2 |0
+<U72C2> \xB6\xB8 |0
+<U72C3> \xE0\xBD |0
+<U72C4> \xE0\xBF |0
+<U72C6> \xE0\xBE |0
+<U72C7> \x8F\xCA\xF3 |0
+<U72C9> \x8F\xCA\xF4 |0
+<U72CC> \x8F\xCA\xF5 |0
+<U72CE> \xE0\xC0 |0
+<U72D0> \xB8\xD1 |0
+<U72D2> \xE0\xC1 |0
+<U72D5> \x8F\xCA\xF6 |0
+<U72D6> \x8F\xCA\xF7 |0
+<U72D7> \xB6\xE9 |0
+<U72D8> \x8F\xCA\xF8 |0
+<U72D9> \xC1\xC0 |0
+<U72DB> \xB9\xFD |0
+<U72DF> \x8F\xCA\xF9 |0
+<U72E0> \xE0\xC3 |0
+<U72E1> \xE0\xC4 |0
+<U72E2> \xE0\xC2 |0
+<U72E5> \x8F\xCA\xFA |0
+<U72E9> \xBC\xED |0
+<U72EC> \xC6\xC8 |0
+<U72ED> \xB6\xB9 |0
+<U72F3> \x8F\xCA\xFB |0
+<U72F4> \x8F\xCA\xFC |0
+<U72F7> \xE0\xC6 |0
+<U72F8> \xC3\xAC |0
+<U72F9> \xE0\xC5 |0
+<U72FA> \x8F\xCA\xFD |0
+<U72FB> \x8F\xCA\xFE |0
+<U72FC> \xCF\xB5 |0
+<U72FD> \xC7\xE2 |0
+<U72FE> \x8F\xCB\xA1 |0
+<U7302> \x8F\xCB\xA2 |0
+<U7304> \x8F\xCB\xA3 |0
+<U7305> \x8F\xCB\xA4 |0
+<U7307> \x8F\xCB\xA5 |0
+<U730A> \xE0\xC9 |0
+<U730B> \x8F\xCB\xA6 |0
+<U730D> \x8F\xCB\xA7 |0
+<U7312> \x8F\xCB\xA8 |0
+<U7313> \x8F\xCB\xA9 |0
+<U7316> \xE0\xCB |0
+<U7317> \xE0\xC8 |0
+<U7318> \x8F\xCB\xAA |0
+<U7319> \x8F\xCB\xAB |0
+<U731B> \xCC\xD4 |0
+<U731C> \xE0\xCA |0
+<U731D> \xE0\xCC |0
+<U731E> \x8F\xCB\xAC |0
+<U731F> \xCE\xC4 |0
+<U7322> \x8F\xCB\xAD |0
+<U7324> \x8F\xCB\xAE |3
+<U7324> \xFB\xA2 |0
+<U7325> \xE0\xD0 |0
+<U7327> \x8F\xCB\xAF |0
+<U7328> \x8F\xCB\xB0 |0
+<U7329> \xE0\xCF |0
+<U732A> \xC3\xF6 |0
+<U732B> \xC7\xAD |0
+<U732C> \x8F\xCB\xB1 |0
+<U732E> \xB8\xA5 |0
+<U732F> \xE0\xCE |0
+<U7331> \x8F\xCB\xB2 |0
+<U7332> \x8F\xCB\xB3 |0
+<U7334> \xE0\xCD |0
+<U7335> \x8F\xCB\xB4 |0
+<U7336> \xCD\xB1 |0
+<U7337> \xCD\xB2 |0
+<U733A> \x8F\xCB\xB5 |0
+<U733B> \x8F\xCB\xB6 |0
+<U733D> \x8F\xCB\xB7 |0
+<U733E> \xE0\xD1 |0
+<U733F> \xB1\xEE |0
+<U7343> \x8F\xCB\xB8 |0
+<U7344> \xB9\xF6 |0
+<U7345> \xBB\xE2 |0
+<U734D> \x8F\xCB\xB9 |0
+<U734E> \xE0\xD2 |0
+<U734F> \xE0\xD3 |0
+<U7350> \x8F\xCB\xBA |0
+<U7352> \x8F\xCB\xBB |0
+<U7356> \x8F\xCB\xBC |0
+<U7357> \xE0\xD5 |0
+<U7358> \x8F\xCB\xBD |0
+<U735D> \x8F\xCB\xBE |0
+<U735E> \x8F\xCB\xBF |0
+<U735F> \x8F\xCB\xC0 |0
+<U7360> \x8F\xCB\xC1 |0
+<U7363> \xBD\xC3 |0
+<U7366> \x8F\xCB\xC2 |0
+<U7367> \x8F\xCB\xC3 |0
+<U7368> \xE0\xD7 |0
+<U7369> \x8F\xCB\xC4 |0
+<U736A> \xE0\xD6 |0
+<U736B> \x8F\xCB\xC5 |0
+<U736C> \x8F\xCB\xC6 |0
+<U736E> \x8F\xCB\xC7 |0
+<U736F> \x8F\xCB\xC8 |0
+<U7370> \xE0\xD8 |0
+<U7371> \x8F\xCB\xC9 |0
+<U7372> \xB3\xCD |0
+<U7375> \xE0\xDA |0
+<U7377> \x8F\xCB\xCA |3
+<U7377> \xFB\xA4 |0
+<U7378> \xE0\xD9 |0
+<U7379> \x8F\xCB\xCB |0
+<U737A> \xE0\xDC |0
+<U737B> \xE0\xDB |0
+<U737C> \x8F\xCB\xCC |0
+<U7380> \x8F\xCB\xCD |0
+<U7381> \x8F\xCB\xCE |0
+<U7383> \x8F\xCB\xCF |0
+<U7384> \xB8\xBC |0
+<U7385> \x8F\xCB\xD0 |0
+<U7386> \x8F\xCB\xD1 |0
+<U7387> \xCE\xA8 |0
+<U7389> \xB6\xCC |0
+<U738B> \xB2\xA6 |0
+<U738E> \x8F\xCB\xD2 |0
+<U7390> \x8F\xCB\xD3 |0
+<U7393> \x8F\xCB\xD4 |0
+<U7395> \x8F\xCB\xD5 |0
+<U7396> \xB6\xEA |0
+<U7397> \x8F\xCB\xD6 |0
+<U7398> \x8F\xCB\xD7 |0
+<U739C> \x8F\xCB\xD8 |0
+<U739E> \x8F\xCB\xD9 |0
+<U739F> \x8F\xCB\xDA |0
+<U73A0> \x8F\xCB\xDB |0
+<U73A2> \x8F\xCB\xDC |0
+<U73A5> \x8F\xCB\xDD |0
+<U73A6> \x8F\xCB\xDE |0
+<U73A9> \xB4\xE1 |0
+<U73AA> \x8F\xCB\xDF |0
+<U73AB> \x8F\xCB\xE0 |0
+<U73AD> \x8F\xCB\xE1 |0
+<U73B2> \xCE\xE8 |0
+<U73B3> \xE0\xDE |0
+<U73B5> \x8F\xCB\xE2 |0
+<U73B7> \x8F\xCB\xE3 |0
+<U73B9> \x8F\xCB\xE4 |0
+<U73BB> \xE0\xE0 |0
+<U73BC> \x8F\xCB\xE5 |0
+<U73BD> \x8F\xCB\xE6 |3
+<U73BD> \xFB\xA5 |0
+<U73BF> \x8F\xCB\xE7 |0
+<U73C0> \xE0\xE1 |0
+<U73C2> \xB2\xD1 |0
+<U73C5> \x8F\xCB\xE8 |0
+<U73C6> \x8F\xCB\xE9 |0
+<U73C8> \xE0\xDD |0
+<U73C9> \x8F\xCB\xEA |3
+<U73C9> \xFB\xA6 |0
+<U73CA> \xBB\xB9 |0
+<U73CB> \x8F\xCB\xEB |0
+<U73CC> \x8F\xCB\xEC |0
+<U73CD> \xC4\xC1 |0
+<U73CE> \xE0\xDF |0
+<U73CF> \x8F\xCB\xED |0
+<U73D2> \x8F\xCB\xEE |3
+<U73D2> \xFB\xA9 |0
+<U73D3> \x8F\xCB\xEF |0
+<U73D6> \x8F\xCB\xF0 |3
+<U73D6> \xFB\xA7 |0
+<U73D9> \x8F\xCB\xF1 |0
+<U73DD> \x8F\xCB\xF2 |0
+<U73DE> \xE0\xE4 |0
+<U73E0> \xBC\xEE |0
+<U73E1> \x8F\xCB\xF3 |0
+<U73E3> \x8F\xCB\xF4 |3
+<U73E3> \xFB\xA8 |0
+<U73E5> \xE0\xE2 |0
+<U73E6> \x8F\xCB\xF5 |0
+<U73E7> \x8F\xCB\xF6 |0
+<U73E9> \x8F\xCB\xF7 |0
+<U73EA> \xB7\xBE |0
+<U73ED> \xC8\xC9 |0
+<U73EE> \xE0\xE3 |0
+<U73F1> \xE0\xFE |0
+<U73F4> \x8F\xCB\xF8 |0
+<U73F5> \x8F\xCB\xF9 |3
+<U73F5> \xFB\xAB |0
+<U73F7> \x8F\xCB\xFA |0
+<U73F8> \xE0\xE9 |0
+<U73F9> \x8F\xCB\xFB |0
+<U73FA> \x8F\xCB\xFC |0
+<U73FB> \x8F\xCB\xFD |0
+<U73FD> \x8F\xCB\xFE |0
+<U73FE> \xB8\xBD |0
+<U73FF> \x8F\xCC\xA1 |0
+<U7400> \x8F\xCC\xA2 |0
+<U7401> \x8F\xCC\xA3 |0
+<U7403> \xB5\xE5 |0
+<U7404> \x8F\xCC\xA4 |0
+<U7405> \xE0\xE6 |0
+<U7406> \xCD\xFD |0
+<U7407> \x8F\xCC\xA5 |3
+<U7407> \xFB\xAA |0
+<U7409> \xCE\xB0 |0
+<U740A> \x8F\xCC\xA6 |0
+<U7411> \x8F\xCC\xA7 |0
+<U741A> \x8F\xCC\xA8 |0
+<U741B> \x8F\xCC\xA9 |0
+<U7422> \xC2\xF6 |0
+<U7424> \x8F\xCC\xAA |0
+<U7425> \xE0\xE8 |0
+<U7426> \x8F\xCC\xAB |3
+<U7426> \xFB\xAC |0
+<U7428> \x8F\xCC\xAC |0
+<U7429> \x8F\xCC\xAD |3
+<U7429> \xFB\xAE |0
+<U742A> \x8F\xCC\xAE |3
+<U742A> \xFB\xAD |0
+<U742B> \x8F\xCC\xAF |0
+<U742C> \x8F\xCC\xB0 |0
+<U742D> \x8F\xCC\xB1 |0
+<U742E> \x8F\xCC\xB2 |3
+<U742E> \xFB\xAF |0
+<U742F> \x8F\xCC\xB3 |0
+<U7430> \x8F\xCC\xB4 |0
+<U7431> \x8F\xCC\xB5 |0
+<U7432> \xE0\xEA |0
+<U7433> \xCE\xD6 |0
+<U7434> \xB6\xD7 |0
+<U7435> \xC8\xFC |0
+<U7436> \xC7\xCA |0
+<U7439> \x8F\xCC\xB6 |0
+<U743A> \xE0\xEB |0
+<U743F> \xE0\xED |0
+<U7440> \x8F\xCC\xB7 |0
+<U7441> \xE0\xF0 |0
+<U7443> \x8F\xCC\xB8 |0
+<U7444> \x8F\xCC\xB9 |0
+<U7446> \x8F\xCC\xBA |0
+<U7447> \x8F\xCC\xBB |0
+<U744B> \x8F\xCC\xBC |0
+<U744D> \x8F\xCC\xBD |0
+<U7451> \x8F\xCC\xBE |0
+<U7452> \x8F\xCC\xBF |0
+<U7455> \xE0\xEC |0
+<U7457> \x8F\xCC\xC0 |0
+<U7459> \xE0\xEF |0
+<U745A> \xB8\xEA |0
+<U745B> \xB1\xCD |0
+<U745C> \xE0\xF1 |0
+<U745D> \x8F\xCC\xC1 |0
+<U745E> \xBF\xF0 |0
+<U745F> \xE0\xEE |0
+<U7460> \xCE\xDC |0
+<U7462> \x8F\xCC\xC2 |3
+<U7462> \xFB\xB0 |0
+<U7463> \xE0\xF4 |0
+<U7464> \xF4\xA4 |0
+<U7466> \x8F\xCC\xC3 |0
+<U7467> \x8F\xCC\xC4 |0
+<U7468> \x8F\xCC\xC5 |0
+<U7469> \xE0\xF2 |0
+<U746A> \xE0\xF5 |0
+<U746B> \x8F\xCC\xC6 |0
+<U746D> \x8F\xCC\xC7 |0
+<U746E> \x8F\xCC\xC8 |0
+<U746F> \xE0\xE7 |0
+<U7470> \xE0\xF3 |0
+<U7471> \x8F\xCC\xC9 |0
+<U7472> \x8F\xCC\xCA |0
+<U7473> \xBA\xBC |0
+<U7476> \xE0\xF6 |0
+<U747E> \xE0\xF7 |0
+<U7480> \x8F\xCC\xCB |0
+<U7481> \x8F\xCC\xCC |0
+<U7483> \xCD\xFE |0
+<U7485> \x8F\xCC\xCD |0
+<U7486> \x8F\xCC\xCE |0
+<U7487> \x8F\xCC\xCF |0
+<U7489> \x8F\xCC\xD0 |3
+<U7489> \xFB\xB1 |0
+<U748B> \xE0\xF8 |0
+<U748F> \x8F\xCC\xD1 |0
+<U7490> \x8F\xCC\xD2 |0
+<U7491> \x8F\xCC\xD3 |0
+<U7492> \x8F\xCC\xD4 |0
+<U7498> \x8F\xCC\xD5 |0
+<U7499> \x8F\xCC\xD6 |0
+<U749A> \x8F\xCC\xD7 |0
+<U749C> \x8F\xCC\xD8 |0
+<U749E> \xE0\xF9 |0
+<U749F> \x8F\xCC\xD9 |3
+<U749F> \xFB\xB2 |0
+<U74A0> \x8F\xCC\xDA |0
+<U74A1> \x8F\xCC\xDB |0
+<U74A2> \xE0\xE5 |0
+<U74A3> \x8F\xCC\xDC |0
+<U74A6> \x8F\xCC\xDD |0
+<U74A7> \xE0\xFA |0
+<U74A8> \x8F\xCC\xDE |0
+<U74A9> \x8F\xCC\xDF |0
+<U74AA> \x8F\xCC\xE0 |0
+<U74AB> \x8F\xCC\xE1 |0
+<U74AE> \x8F\xCC\xE2 |0
+<U74AF> \x8F\xCC\xE3 |0
+<U74B0> \xB4\xC4 |0
+<U74B1> \x8F\xCC\xE4 |0
+<U74B2> \x8F\xCC\xE5 |0
+<U74B5> \x8F\xCC\xE6 |0
+<U74B9> \x8F\xCC\xE7 |0
+<U74BB> \x8F\xCC\xE8 |0
+<U74BD> \xBC\xA5 |0
+<U74BF> \x8F\xCC\xE9 |0
+<U74C8> \x8F\xCC\xEA |0
+<U74C9> \x8F\xCC\xEB |0
+<U74CA> \xE0\xFB |0
+<U74CC> \x8F\xCC\xEC |0
+<U74CF> \xE0\xFC |0
+<U74D0> \x8F\xCC\xED |0
+<U74D3> \x8F\xCC\xEE |0
+<U74D4> \xE0\xFD |0
+<U74D8> \x8F\xCC\xEF |0
+<U74DA> \x8F\xCC\xF0 |0
+<U74DB> \x8F\xCC\xF1 |0
+<U74DC> \xB1\xBB |0
+<U74DE> \x8F\xCC\xF2 |0
+<U74DF> \x8F\xCC\xF3 |0
+<U74E0> \xE1\xA1 |0
+<U74E2> \xC9\xBB |0
+<U74E3> \xE1\xA2 |0
+<U74E4> \x8F\xCC\xF4 |0
+<U74E6> \xB4\xA4 |0
+<U74E7> \xE1\xA3 |0
+<U74E8> \x8F\xCC\xF5 |0
+<U74E9> \xE1\xA4 |0
+<U74EA> \x8F\xCC\xF6 |0
+<U74EB> \x8F\xCC\xF7 |0
+<U74EE> \xE1\xA5 |0
+<U74EF> \x8F\xCC\xF8 |0
+<U74F0> \xE1\xA7 |0
+<U74F1> \xE1\xA8 |0
+<U74F2> \xE1\xA6 |0
+<U74F4> \x8F\xCC\xF9 |0
+<U74F6> \xC9\xD3 |0
+<U74F7> \xE1\xAA |0
+<U74F8> \xE1\xA9 |0
+<U74FA> \x8F\xCC\xFA |0
+<U74FB> \x8F\xCC\xFB |0
+<U74FC> \x8F\xCC\xFC |0
+<U74FF> \x8F\xCC\xFD |0
+<U7501> \xFB\xB3 |0
+<U7503> \xE1\xAC |0
+<U7504> \xE1\xAB |0
+<U7505> \xE1\xAD |0
+<U7506> \x8F\xCC\xFE |0
+<U750C> \xE1\xAE |0
+<U750D> \xE1\xB0 |0
+<U750E> \xE1\xAF |0
+<U7511> \xB9\xF9 |0
+<U7512> \x8F\xCD\xA1 |0
+<U7513> \xE1\xB2 |0
+<U7515> \xE1\xB1 |0
+<U7516> \x8F\xCD\xA2 |0
+<U7517> \x8F\xCD\xA3 |0
+<U7518> \xB4\xC5 |0
+<U751A> \xBF\xD3 |0
+<U751C> \xC5\xBC |0
+<U751E> \xE1\xB3 |0
+<U751F> \xC0\xB8 |0
+<U7520> \x8F\xCD\xA4 |0
+<U7521> \x8F\xCD\xA5 |0
+<U7523> \xBB\xBA |0
+<U7524> \x8F\xCD\xA6 |0
+<U7525> \xB1\xF9 |0
+<U7526> \xE1\xB4 |0
+<U7527> \x8F\xCD\xA7 |0
+<U7528> \xCD\xD1 |0
+<U7529> \x8F\xCD\xA8 |0
+<U752A> \x8F\xCD\xA9 |0
+<U752B> \xCA\xE3 |0
+<U752C> \xE1\xB5 |0
+<U752F> \x8F\xCD\xAA |3
+<U752F> \xF9\xEC |0
+<U7530> \xC5\xC4 |0
+<U7531> \xCD\xB3 |0
+<U7532> \xB9\xC3 |0
+<U7533> \xBF\xBD |0
+<U7536> \x8F\xCD\xAB |0
+<U7537> \xC3\xCB |0
+<U7538> \xD2\xB4 |0
+<U7539> \x8F\xCD\xAC |0
+<U753A> \xC4\xAE |0
+<U753B> \xB2\xE8 |0
+<U753C> \xE1\xB6 |0
+<U753D> \x8F\xCD\xAD |0
+<U753E> \x8F\xCD\xAE |0
+<U753F> \x8F\xCD\xAF |0
+<U7540> \x8F\xCD\xB0 |0
+<U7543> \x8F\xCD\xB1 |0
+<U7544> \xE1\xB7 |0
+<U7546> \xE1\xBC |0
+<U7547> \x8F\xCD\xB2 |0
+<U7548> \x8F\xCD\xB3 |0
+<U7549> \xE1\xBA |0
+<U754A> \xE1\xB9 |0
+<U754B> \xDA\xC2 |0
+<U754C> \xB3\xA6 |0
+<U754D> \xE1\xB8 |0
+<U754E> \x8F\xCD\xB4 |0
+<U754F> \xB0\xDA |0
+<U7550> \x8F\xCD\xB5 |0
+<U7551> \xC8\xAA |0
+<U7552> \x8F\xCD\xB6 |0
+<U7554> \xC8\xCA |0
+<U7557> \x8F\xCD\xB7 |0
+<U7559> \xCE\xB1 |0
+<U755A> \xE1\xBD |0
+<U755B> \xE1\xBB |0
+<U755C> \xC3\xDC |0
+<U755D> \xC0\xA6 |0
+<U755E> \x8F\xCD\xB8 |0
+<U755F> \x8F\xCD\xB9 |0
+<U7560> \xC8\xAB |0
+<U7561> \x8F\xCD\xBA |0
+<U7562> \xC9\xAD |0
+<U7564> \xE1\xBF |0
+<U7565> \xCE\xAC |0
+<U7566> \xB7\xCD |0
+<U7567> \xE1\xC0 |0
+<U7569> \xE1\xBE |0
+<U756A> \xC8\xD6 |0
+<U756B> \xE1\xC1 |0
+<U756D> \xE1\xC2 |0
+<U756F> \x8F\xCD\xBB |3
+<U756F> \xFB\xB4 |0
+<U7570> \xB0\xDB |0
+<U7571> \x8F\xCD\xBC |0
+<U7573> \xBE\xF6 |0
+<U7574> \xE1\xC7 |0
+<U7576> \xE1\xC4 |0
+<U7577> \xC6\xED |0
+<U7578> \xE1\xC3 |0
+<U7579> \x8F\xCD\xBD |0
+<U757A> \x8F\xCD\xBE |0
+<U757B> \x8F\xCD\xBF |0
+<U757C> \x8F\xCD\xC0 |0
+<U757D> \x8F\xCD\xC1 |0
+<U757E> \x8F\xCD\xC2 |0
+<U757F> \xB5\xA6 |0
+<U7581> \x8F\xCD\xC3 |0
+<U7582> \xE1\xCA |0
+<U7585> \x8F\xCD\xC4 |0
+<U7586> \xE1\xC5 |0
+<U7587> \xE1\xC6 |0
+<U7589> \xE1\xC9 |0
+<U758A> \xE1\xC8 |0
+<U758B> \xC9\xA5 |0
+<U758E> \xC1\xC2 |0
+<U758F> \xC1\xC1 |0
+<U7590> \x8F\xCD\xC5 |0
+<U7591> \xB5\xBF |0
+<U7592> \x8F\xCD\xC6 |0
+<U7593> \x8F\xCD\xC7 |0
+<U7594> \xE1\xCB |0
+<U7595> \x8F\xCD\xC8 |0
+<U7599> \x8F\xCD\xC9 |0
+<U759A> \xE1\xCC |0
+<U759C> \x8F\xCD\xCA |0
+<U759D> \xE1\xCD |0
+<U75A2> \x8F\xCD\xCB |0
+<U75A3> \xE1\xCF |0
+<U75A4> \x8F\xCD\xCC |0
+<U75A5> \xE1\xCE |0
+<U75AB> \xB1\xD6 |0
+<U75B1> \xE1\xD7 |0
+<U75B2> \xC8\xE8 |0
+<U75B3> \xE1\xD1 |0
+<U75B4> \x8F\xCD\xCD |0
+<U75B5> \xE1\xD3 |0
+<U75B8> \xE1\xD5 |0
+<U75B9> \xBF\xBE |0
+<U75BA> \x8F\xCD\xCE |0
+<U75BC> \xE1\xD6 |0
+<U75BD> \xE1\xD4 |0
+<U75BE> \xBC\xC0 |0
+<U75BF> \x8F\xCD\xCF |0
+<U75C0> \x8F\xCD\xD0 |0
+<U75C1> \x8F\xCD\xD1 |0
+<U75C2> \xE1\xD0 |0
+<U75C3> \xE1\xD2 |0
+<U75C4> \x8F\xCD\xD2 |0
+<U75C5> \xC9\xC2 |0
+<U75C6> \x8F\xCD\xD3 |0
+<U75C7> \xBE\xC9 |0
+<U75CA> \xE1\xD9 |0
+<U75CC> \x8F\xCD\xD4 |0
+<U75CD> \xE1\xD8 |0
+<U75CE> \x8F\xCD\xD5 |0
+<U75CF> \x8F\xCD\xD6 |0
+<U75D2> \xE1\xDA |0
+<U75D4> \xBC\xA6 |0
+<U75D5> \xBA\xAF |0
+<U75D7> \x8F\xCD\xD7 |0
+<U75D8> \xC5\xF7 |0
+<U75D9> \xE1\xDB |0
+<U75DB> \xC4\xCB |0
+<U75DC> \x8F\xCD\xD8 |0
+<U75DE> \xE1\xDD |0
+<U75DF> \x8F\xCD\xD9 |0
+<U75E0> \x8F\xCD\xDA |0
+<U75E1> \x8F\xCD\xDB |0
+<U75E2> \xCE\xA1 |0
+<U75E3> \xE1\xDC |0
+<U75E4> \x8F\xCD\xDC |0
+<U75E7> \x8F\xCD\xDD |0
+<U75E9> \xC1\xE9 |0
+<U75EC> \x8F\xCD\xDE |0
+<U75EE> \x8F\xCD\xDF |0
+<U75EF> \x8F\xCD\xE0 |0
+<U75F0> \xE1\xE2 |0
+<U75F1> \x8F\xCD\xE1 |0
+<U75F2> \xE1\xE4 |0
+<U75F3> \xE1\xE5 |0
+<U75F4> \xC3\xD4 |0
+<U75F9> \x8F\xCD\xE2 |0
+<U75FA> \xE1\xE3 |0
+<U75FC> \xE1\xE0 |0
+<U75FE> \xE1\xDE |0
+<U75FF> \xE1\xDF |0
+<U7600> \x8F\xCD\xE3 |0
+<U7601> \xE1\xE1 |0
+<U7602> \x8F\xCD\xE4 |0
+<U7603> \x8F\xCD\xE5 |0
+<U7604> \x8F\xCD\xE6 |0
+<U7607> \x8F\xCD\xE7 |0
+<U7608> \x8F\xCD\xE8 |0
+<U7609> \xE1\xE8 |0
+<U760A> \x8F\xCD\xE9 |0
+<U760B> \xE1\xE6 |0
+<U760C> \x8F\xCD\xEA |0
+<U760D> \xE1\xE7 |0
+<U760F> \x8F\xCD\xEB |0
+<U7612> \x8F\xCD\xEC |0
+<U7613> \x8F\xCD\xED |0
+<U7615> \x8F\xCD\xEE |0
+<U7616> \x8F\xCD\xEF |0
+<U7619> \x8F\xCD\xF0 |0
+<U761B> \x8F\xCD\xF1 |0
+<U761C> \x8F\xCD\xF2 |0
+<U761D> \x8F\xCD\xF3 |0
+<U761E> \x8F\xCD\xF4 |0
+<U761F> \xE1\xE9 |0
+<U7620> \xE1\xEB |0
+<U7621> \xE1\xEC |0
+<U7622> \xE1\xED |0
+<U7623> \x8F\xCD\xF5 |0
+<U7624> \xE1\xEE |0
+<U7625> \x8F\xCD\xF6 |0
+<U7626> \x8F\xCD\xF7 |0
+<U7627> \xE1\xEA |0
+<U7629> \x8F\xCD\xF8 |0
+<U762D> \x8F\xCD\xF9 |0
+<U7630> \xE1\xF0 |0
+<U7632> \x8F\xCD\xFA |0
+<U7633> \x8F\xCD\xFB |0
+<U7634> \xE1\xEF |0
+<U7635> \x8F\xCD\xFC |0
+<U7638> \x8F\xCD\xFD |0
+<U7639> \x8F\xCD\xFE |0
+<U763A> \x8F\xCE\xA1 |0
+<U763B> \xE1\xF1 |0
+<U763C> \x8F\xCE\xA2 |0
+<U7640> \x8F\xCE\xA4 |0
+<U7641> \x8F\xCE\xA5 |0
+<U7642> \xCE\xC5 |0
+<U7643> \x8F\xCE\xA6 |0
+<U7644> \x8F\xCE\xA7 |0
+<U7645> \x8F\xCE\xA8 |0
+<U7646> \xE1\xF4 |0
+<U7647> \xE1\xF2 |0
+<U7648> \xE1\xF3 |0
+<U7649> \x8F\xCE\xA9 |0
+<U764A> \x8F\xCE\xA3 |0
+<U764B> \x8F\xCE\xAA |0
+<U764C> \xB4\xE2 |0
+<U7652> \xCC\xFE |0
+<U7655> \x8F\xCE\xAB |0
+<U7656> \xCA\xCA |0
+<U7658> \xE1\xF6 |0
+<U7659> \x8F\xCE\xAC |0
+<U765C> \xE1\xF5 |0
+<U765F> \x8F\xCE\xAD |0
+<U7661> \xE1\xF7 |0
+<U7662> \xE1\xF8 |0
+<U7664> \x8F\xCE\xAE |0
+<U7665> \x8F\xCE\xAF |0
+<U7667> \xE1\xFC |0
+<U7668> \xE1\xF9 |0
+<U7669> \xE1\xFA |0
+<U766A> \xE1\xFB |0
+<U766C> \xE1\xFD |0
+<U766D> \x8F\xCE\xB0 |0
+<U766E> \x8F\xCE\xB1 |0
+<U766F> \x8F\xCE\xB2 |0
+<U7670> \xE1\xFE |0
+<U7671> \x8F\xCE\xB3 |0
+<U7672> \xE2\xA1 |0
+<U7674> \x8F\xCE\xB4 |0
+<U7676> \xE2\xA2 |0
+<U7678> \xE2\xA3 |0
+<U767A> \xC8\xAF |0
+<U767B> \xC5\xD0 |0
+<U767C> \xE2\xA4 |0
+<U767D> \xC7\xF2 |0
+<U767E> \xC9\xB4 |0
+<U7680> \xE2\xA5 |0
+<U7681> \x8F\xCE\xB5 |0
+<U7682> \xFB\xB5 |0
+<U7683> \xE2\xA6 |0
+<U7684> \xC5\xAA |0
+<U7685> \x8F\xCE\xB6 |0
+<U7686> \xB3\xA7 |0
+<U7687> \xB9\xC4 |0
+<U7688> \xE2\xA7 |0
+<U768B> \xE2\xA8 |0
+<U768C> \x8F\xCE\xB7 |0
+<U768D> \x8F\xCE\xB8 |0
+<U768E> \xE2\xA9 |0
+<U7690> \xBB\xA9 |0
+<U7693> \xE2\xAB |0
+<U7695> \x8F\xCE\xB9 |0
+<U7696> \xE2\xAA |0
+<U7699> \xE2\xAC |0
+<U769A> \xE2\xAD |0
+<U769B> \x8F\xCE\xBA |3
+<U769B> \xFB\xB8 |0
+<U769C> \x8F\xCE\xBB |3
+<U769C> \xFB\xB6 |0
+<U769D> \x8F\xCE\xBC |0
+<U769E> \xFB\xB7 |0
+<U769F> \x8F\xCE\xBD |0
+<U76A0> \x8F\xCE\xBE |0
+<U76A2> \x8F\xCE\xBF |0
+<U76A3> \x8F\xCE\xC0 |0
+<U76A4> \x8F\xCE\xC1 |0
+<U76A5> \x8F\xCE\xC2 |0
+<U76A6> \x8F\xCE\xC3 |3
+<U76A6> \xFB\xB9 |0
+<U76A7> \x8F\xCE\xC4 |0
+<U76A8> \x8F\xCE\xC5 |0
+<U76AA> \x8F\xCE\xC6 |0
+<U76AD> \x8F\xCE\xC7 |0
+<U76AE> \xC8\xE9 |0
+<U76B0> \xE2\xAE |0
+<U76B4> \xE2\xAF |0
+<U76B7> \xF3\xE9 |0
+<U76B8> \xE2\xB0 |0
+<U76B9> \xE2\xB1 |0
+<U76BA> \xE2\xB2 |0
+<U76BD> \x8F\xCE\xC8 |0
+<U76BF> \xBB\xAE |0
+<U76C1> \x8F\xCE\xC9 |0
+<U76C2> \xE2\xB3 |0
+<U76C3> \xC7\xD6 |0
+<U76C5> \x8F\xCE\xCA |0
+<U76C6> \xCB\xDF |0
+<U76C8> \xB1\xCE |0
+<U76C9> \x8F\xCE\xCB |0
+<U76CA> \xB1\xD7 |0
+<U76CB> \x8F\xCE\xCC |0
+<U76CC> \x8F\xCE\xCD |0
+<U76CD> \xE2\xB4 |0
+<U76CE> \x8F\xCE\xCE |0
+<U76D2> \xE2\xB6 |0
+<U76D4> \x8F\xCE\xCF |0
+<U76D6> \xE2\xB5 |0
+<U76D7> \xC5\xF0 |0
+<U76D9> \x8F\xCE\xD0 |0
+<U76DB> \xC0\xB9 |0
+<U76DC> \xDD\xB9 |0
+<U76DE> \xE2\xB7 |0
+<U76DF> \xCC\xC1 |0
+<U76E0> \x8F\xCE\xD1 |0
+<U76E1> \xE2\xB8 |0
+<U76E3> \xB4\xC6 |0
+<U76E4> \xC8\xD7 |0
+<U76E5> \xE2\xB9 |0
+<U76E6> \x8F\xCE\xD2 |0
+<U76E7> \xE2\xBA |0
+<U76E8> \x8F\xCE\xD3 |0
+<U76EA> \xE2\xBB |0
+<U76EC> \x8F\xCE\xD4 |0
+<U76EE> \xCC\xDC |0
+<U76F0> \x8F\xCE\xD5 |0
+<U76F1> \x8F\xCE\xD6 |0
+<U76F2> \xCC\xD5 |0
+<U76F4> \xC4\xBE |0
+<U76F6> \x8F\xCE\xD7 |0
+<U76F8> \xC1\xEA |0
+<U76F9> \x8F\xCE\xD8 |0
+<U76FB> \xE2\xBD |0
+<U76FC> \x8F\xCE\xD9 |0
+<U76FE> \xBD\xE2 |0
+<U7700> \x8F\xCE\xDA |0
+<U7701> \xBE\xCA |0
+<U7704> \xE2\xC0 |0
+<U7706> \x8F\xCE\xDB |0
+<U7707> \xE2\xBF |0
+<U7708> \xE2\xBE |0
+<U7709> \xC8\xFD |0
+<U770A> \x8F\xCE\xDC |0
+<U770B> \xB4\xC7 |0
+<U770C> \xB8\xA9 |0
+<U770E> \x8F\xCE\xDD |0
+<U7712> \x8F\xCE\xDE |0
+<U7714> \x8F\xCE\xDF |0
+<U7715> \x8F\xCE\xE0 |0
+<U7717> \x8F\xCE\xE1 |0
+<U7719> \x8F\xCE\xE2 |0
+<U771A> \x8F\xCE\xE3 |0
+<U771B> \xE2\xC6 |0
+<U771C> \x8F\xCE\xE4 |0
+<U771E> \xE2\xC3 |0
+<U771F> \xBF\xBF |0
+<U7720> \xCC\xB2 |0
+<U7722> \x8F\xCE\xE5 |0
+<U7724> \xE2\xC2 |0
+<U7725> \xE2\xC4 |0
+<U7726> \xE2\xC5 |0
+<U7728> \x8F\xCE\xE6 |0
+<U7729> \xE2\xC1 |0
+<U772D> \x8F\xCE\xE7 |0
+<U772E> \x8F\xCE\xE8 |0
+<U772F> \x8F\xCE\xE9 |0
+<U7734> \x8F\xCE\xEA |0
+<U7735> \x8F\xCE\xEB |0
+<U7736> \x8F\xCE\xEC |0
+<U7737> \xE2\xC7 |0
+<U7738> \xE2\xC8 |0
+<U7739> \x8F\xCE\xED |0
+<U773A> \xC4\xAF |0
+<U773C> \xB4\xE3 |0
+<U773D> \x8F\xCE\xEE |0
+<U773E> \x8F\xCE\xEF |0
+<U7740> \xC3\xE5 |0
+<U7742> \x8F\xCE\xF0 |0
+<U7745> \x8F\xCE\xF1 |0
+<U7746> \x8F\xCE\xF2 |3
+<U7746> \xFB\xBB |0
+<U7747> \xE2\xC9 |0
+<U774A> \x8F\xCE\xF3 |0
+<U774D> \x8F\xCE\xF4 |0
+<U774E> \x8F\xCE\xF5 |0
+<U774F> \x8F\xCE\xF6 |0
+<U7752> \x8F\xCE\xF7 |0
+<U7756> \x8F\xCE\xF8 |0
+<U7757> \x8F\xCE\xF9 |0
+<U775A> \xE2\xCA |0
+<U775B> \xE2\xCD |0
+<U775C> \x8F\xCE\xFA |0
+<U775E> \x8F\xCE\xFB |0
+<U775F> \x8F\xCE\xFC |0
+<U7760> \x8F\xCE\xFD |0
+<U7761> \xBF\xE7 |0
+<U7762> \x8F\xCE\xFE |0
+<U7763> \xC6\xC4 |0
+<U7764> \x8F\xCF\xA1 |0
+<U7765> \xE2\xCE |0
+<U7766> \xCB\xD3 |0
+<U7767> \x8F\xCF\xA2 |0
+<U7768> \xE2\xCB |0
+<U776A> \x8F\xCF\xA3 |0
+<U776B> \xE2\xCC |0
+<U776C> \x8F\xCF\xA4 |0
+<U7770> \x8F\xCF\xA5 |0
+<U7772> \x8F\xCF\xA6 |0
+<U7773> \x8F\xCF\xA7 |0
+<U7774> \x8F\xCF\xA8 |0
+<U7779> \xE2\xD1 |0
+<U777A> \x8F\xCF\xA9 |0
+<U777D> \x8F\xCF\xAA |0
+<U777E> \xE2\xD0 |0
+<U777F> \xE2\xCF |0
+<U7780> \x8F\xCF\xAB |0
+<U7784> \x8F\xCF\xAC |0
+<U778B> \xE2\xD3 |0
+<U778C> \x8F\xCF\xAD |0
+<U778D> \x8F\xCF\xAE |0
+<U778E> \xE2\xD2 |0
+<U7791> \xE2\xD4 |0
+<U7794> \x8F\xCF\xAF |0
+<U7795> \x8F\xCF\xB0 |0
+<U7796> \x8F\xCF\xB1 |0
+<U779A> \x8F\xCF\xB2 |0
+<U779E> \xE2\xD6 |0
+<U779F> \x8F\xCF\xB3 |0
+<U77A0> \xE2\xD5 |0
+<U77A2> \x8F\xCF\xB4 |0
+<U77A5> \xCA\xCD |0
+<U77A7> \x8F\xCF\xB5 |0
+<U77AA> \x8F\xCF\xB6 |0
+<U77AC> \xBD\xD6 |0
+<U77AD> \xCE\xC6 |0
+<U77AE> \x8F\xCF\xB7 |0
+<U77AF> \x8F\xCF\xB8 |0
+<U77B0> \xE2\xD7 |0
+<U77B1> \x8F\xCF\xB9 |0
+<U77B3> \xC6\xB7 |0
+<U77B5> \x8F\xCF\xBA |0
+<U77B6> \xE2\xD8 |0
+<U77B9> \xE2\xD9 |0
+<U77BB> \xE2\xDD |0
+<U77BC> \xE2\xDB |0
+<U77BD> \xE2\xDC |0
+<U77BE> \x8F\xCF\xBB |0
+<U77BF> \xE2\xDA |0
+<U77C3> \x8F\xCF\xBC |0
+<U77C7> \xE2\xDE |0
+<U77C9> \x8F\xCF\xBD |0
+<U77CD> \xE2\xDF |0
+<U77D1> \x8F\xCF\xBE |0
+<U77D2> \x8F\xCF\xBF |0
+<U77D5> \x8F\xCF\xC0 |0
+<U77D7> \xE2\xE0 |0
+<U77D9> \x8F\xCF\xC1 |0
+<U77DA> \xE2\xE1 |0
+<U77DB> \xCC\xB7 |0
+<U77DC> \xE2\xE2 |0
+<U77DE> \x8F\xCF\xC2 |0
+<U77DF> \x8F\xCF\xC3 |0
+<U77E0> \x8F\xCF\xC4 |0
+<U77E2> \xCC\xF0 |0
+<U77E3> \xE2\xE3 |0
+<U77E4> \x8F\xCF\xC5 |0
+<U77E5> \xC3\xCE |0
+<U77E6> \x8F\xCF\xC6 |0
+<U77E7> \xC7\xEA |0
+<U77E9> \xB6\xEB |0
+<U77EA> \x8F\xCF\xC7 |0
+<U77EC> \x8F\xCF\xC8 |0
+<U77ED> \xC3\xBB |0
+<U77EE> \xE2\xE4 |0
+<U77EF> \xB6\xBA |0
+<U77F0> \x8F\xCF\xC9 |0
+<U77F1> \x8F\xCF\xCA |0
+<U77F3> \xC0\xD0 |0
+<U77F4> \x8F\xCF\xCB |0
+<U77F8> \x8F\xCF\xCC |0
+<U77FB> \x8F\xCF\xCD |0
+<U77FC> \xE2\xE5 |0
+<U7802> \xBA\xBD |0
+<U7805> \x8F\xCF\xCE |0
+<U7806> \x8F\xCF\xCF |0
+<U7809> \x8F\xCF\xD0 |0
+<U780C> \xE2\xE6 |0
+<U780D> \x8F\xCF\xD1 |0
+<U780E> \x8F\xCF\xD2 |0
+<U7811> \x8F\xCF\xD3 |0
+<U7812> \xE2\xE7 |0
+<U7814> \xB8\xA6 |0
+<U7815> \xBA\xD5 |0
+<U781D> \x8F\xCF\xD4 |0
+<U7820> \xE2\xE9 |0
+<U7821> \x8F\xCF\xD5 |3
+<U7821> \xFB\xBD |0
+<U7822> \x8F\xCF\xD6 |0
+<U7823> \x8F\xCF\xD7 |0
+<U7825> \xC5\xD6 |0
+<U7826> \xBA\xD6 |0
+<U7827> \xB5\xCE |0
+<U782D> \x8F\xCF\xD8 |0
+<U782E> \x8F\xCF\xD9 |0
+<U7830> \x8F\xCF\xDA |0
+<U7832> \xCB\xA4 |0
+<U7834> \xC7\xCB |0
+<U7835> \x8F\xCF\xDB |0
+<U7837> \x8F\xCF\xDC |0
+<U783A> \xC5\xD7 |0
+<U783F> \xB9\xDC |0
+<U7843> \x8F\xCF\xDD |0
+<U7844> \x8F\xCF\xDE |0
+<U7845> \xE2\xEB |0
+<U7847> \x8F\xCF\xDF |0
+<U7848> \x8F\xCF\xE0 |0
+<U784C> \x8F\xCF\xE1 |0
+<U784E> \x8F\xCF\xE2 |3
+<U784E> \xFB\xBE |0
+<U7852> \x8F\xCF\xE3 |0
+<U785C> \x8F\xCF\xE4 |0
+<U785D> \xBE\xCB |0
+<U785E> \x8F\xCF\xE5 |0
+<U7860> \x8F\xCF\xE6 |0
+<U7861> \x8F\xCF\xE7 |0
+<U7863> \x8F\xCF\xE8 |0
+<U7864> \x8F\xCF\xE9 |3
+<U7864> \xFB\xBF |0
+<U7868> \x8F\xCF\xEA |0
+<U786A> \x8F\xCF\xEB |0
+<U786B> \xCE\xB2 |0
+<U786C> \xB9\xC5 |0
+<U786E> \x8F\xCF\xEC |0
+<U786F> \xB8\xA7 |0
+<U7872> \xC8\xA3 |0
+<U7874> \xE2\xED |0
+<U787A> \x8F\xCF\xED |3
+<U787A> \xFB\xC0 |0
+<U787C> \xE2\xEF |0
+<U787E> \x8F\xCF\xEE |0
+<U7881> \xB8\xEB |0
+<U7886> \xE2\xEE |0
+<U7887> \xC4\xF6 |0
+<U788A> \x8F\xCF\xEF |0
+<U788C> \xE2\xF1 |0
+<U788D> \xB3\xB7 |0
+<U788E> \xE2\xEC |0
+<U788F> \x8F\xCF\xF0 |0
+<U7891> \xC8\xEA |0
+<U7893> \xB1\xB0 |0
+<U7894> \x8F\xCF\xF1 |0
+<U7895> \xBA\xEC |0
+<U7897> \xCF\xD2 |0
+<U7898> \x8F\xCF\xF2 |0
+<U789A> \xE2\xF0 |0
+<U789D> \x8F\xCF\xF4 |0
+<U789E> \x8F\xCF\xF5 |0
+<U789F> \x8F\xCF\xF6 |0
+<U78A1> \x8F\xCF\xF3 |0
+<U78A3> \xE2\xF2 |0
+<U78A4> \x8F\xCF\xF7 |0
+<U78A7> \xCA\xCB |0
+<U78A8> \x8F\xCF\xF8 |0
+<U78A9> \xC0\xD9 |0
+<U78AA> \xE2\xF4 |0
+<U78AC> \x8F\xCF\xF9 |0
+<U78AD> \x8F\xCF\xFA |0
+<U78AF> \xE2\xF5 |0
+<U78B0> \x8F\xCF\xFB |0
+<U78B1> \x8F\xCF\xFC |0
+<U78B2> \x8F\xCF\xFD |0
+<U78B3> \x8F\xCF\xFE |0
+<U78B5> \xE2\xF3 |0
+<U78BA> \xB3\xCE |0
+<U78BB> \x8F\xD0\xA1 |0
+<U78BC> \xE2\xFB |0
+<U78BD> \x8F\xD0\xA2 |0
+<U78BE> \xE2\xFA |0
+<U78BF> \x8F\xD0\xA3 |0
+<U78C1> \xBC\xA7 |0
+<U78C5> \xE2\xFC |0
+<U78C6> \xE2\xF7 |0
+<U78C7> \x8F\xD0\xA4 |0
+<U78C8> \x8F\xD0\xA5 |0
+<U78C9> \x8F\xD0\xA6 |0
+<U78CA> \xE2\xFD |0
+<U78CB> \xE2\xF8 |0
+<U78CC> \x8F\xD0\xA7 |0
+<U78CE> \x8F\xD0\xA8 |0
+<U78D0> \xC8\xD8 |0
+<U78D1> \xE2\xF6 |0
+<U78D2> \x8F\xD0\xA9 |0
+<U78D3> \x8F\xD0\xAA |0
+<U78D4> \xE2\xF9 |0
+<U78D5> \x8F\xD0\xAB |0
+<U78D6> \x8F\xD0\xAC |0
+<U78DA> \xE3\xA2 |0
+<U78DB> \x8F\xD0\xAE |0
+<U78DF> \x8F\xD0\xAF |0
+<U78E0> \x8F\xD0\xB0 |0
+<U78E1> \x8F\xD0\xB1 |0
+<U78E4> \x8F\xD0\xAD |0
+<U78E6> \x8F\xD0\xB2 |0
+<U78E7> \xE3\xA1 |0
+<U78E8> \xCB\xE1 |0
+<U78EA> \x8F\xD0\xB3 |0
+<U78EC> \xE2\xFE |0
+<U78EF> \xB0\xEB |0
+<U78F2> \x8F\xD0\xB4 |0
+<U78F3> \x8F\xD0\xB5 |0
+<U78F4> \xE3\xA4 |0
+<U78F6> \x8F\xD0\xB7 |0
+<U78F7> \x8F\xD0\xB8 |0
+<U78FA> \x8F\xD0\xB9 |0
+<U78FB> \x8F\xD0\xBA |0
+<U78FD> \xE3\xA3 |0
+<U78FF> \x8F\xD0\xBB |0
+<U7900> \x8F\xD0\xB6 |0
+<U7901> \xBE\xCC |0
+<U7906> \x8F\xD0\xBC |0
+<U7907> \xE3\xA5 |0
+<U790C> \x8F\xD0\xBD |0
+<U790E> \xC1\xC3 |0
+<U7910> \x8F\xD0\xBE |0
+<U7911> \xE3\xA7 |0
+<U7912> \xE3\xA6 |0
+<U7919> \xE3\xA8 |0
+<U791A> \x8F\xD0\xBF |0
+<U791C> \x8F\xD0\xC0 |0
+<U791E> \x8F\xD0\xC1 |0
+<U791F> \x8F\xD0\xC2 |0
+<U7920> \x8F\xD0\xC3 |0
+<U7925> \x8F\xD0\xC4 |0
+<U7926> \xE2\xE8 |0
+<U7927> \x8F\xD0\xC5 |0
+<U7929> \x8F\xD0\xC6 |0
+<U792A> \xE2\xEA |0
+<U792B> \xE3\xAA |0
+<U792C> \xE3\xA9 |0
+<U792D> \x8F\xD0\xC7 |0
+<U7930> \xFB\xC1 |0
+<U7931> \x8F\xD0\xC8 |0
+<U7934> \x8F\xD0\xC9 |0
+<U7935> \x8F\xD0\xCA |0
+<U793A> \xBC\xA8 |0
+<U793B> \x8F\xD0\xCB |0
+<U793C> \xCE\xE9 |0
+<U793D> \x8F\xD0\xCC |0
+<U793E> \xBC\xD2 |0
+<U793F> \x8F\xD0\xCD |0
+<U7940> \xE3\xAB |0
+<U7941> \xB7\xB7 |0
+<U7944> \x8F\xD0\xCE |0
+<U7945> \x8F\xD0\xCF |0
+<U7946> \x8F\xD0\xD0 |0
+<U7947> \xB5\xC0 |0
+<U7948> \xB5\xA7 |0
+<U7949> \xBB\xE3 |0
+<U794A> \x8F\xD0\xD1 |0
+<U794B> \x8F\xD0\xD2 |0
+<U794F> \x8F\xD0\xD3 |0
+<U7950> \xCD\xB4 |0
+<U7951> \x8F\xD0\xD4 |0
+<U7953> \xE3\xB1 |0
+<U7954> \x8F\xD0\xD5 |0
+<U7955> \xE3\xB0 |0
+<U7956> \xC1\xC4 |0
+<U7957> \xE3\xAD |0
+<U7958> \x8F\xD0\xD6 |0
+<U795A> \xE3\xAF |0
+<U795B> \x8F\xD0\xD7 |0
+<U795C> \x8F\xD0\xD8 |0
+<U795D> \xBD\xCB |0
+<U795E> \xBF\xC0 |0
+<U795F> \xE3\xAE |0
+<U7960> \xE3\xAC |0
+<U7962> \xC7\xAA |0
+<U7965> \xBE\xCD |0
+<U7967> \x8F\xD0\xD9 |0
+<U7968> \xC9\xBC |0
+<U7969> \x8F\xD0\xDA |0
+<U796B> \x8F\xD0\xDB |0
+<U796D> \xBA\xD7 |0
+<U7972> \x8F\xD0\xDC |0
+<U7977> \xC5\xF8 |0
+<U7979> \x8F\xD0\xDD |0
+<U797A> \xE3\xB2 |0
+<U797B> \x8F\xD0\xDE |0
+<U797C> \x8F\xD0\xDF |0
+<U797E> \x8F\xD0\xE0 |0
+<U797F> \xE3\xB3 |0
+<U7980> \xE3\xC9 |0
+<U7981> \xB6\xD8 |0
+<U7984> \xCF\xBD |0
+<U7985> \xC1\xB5 |0
+<U798A> \xE3\xB4 |0
+<U798B> \x8F\xD0\xE1 |0
+<U798C> \x8F\xD0\xE2 |0
+<U798D> \xB2\xD2 |0
+<U798E> \xC4\xF7 |0
+<U798F> \xCA\xA1 |0
+<U7991> \x8F\xD0\xE3 |0
+<U7993> \x8F\xD0\xE4 |0
+<U7994> \x8F\xD0\xE5 |3
+<U7994> \xFB\xC5 |0
+<U7995> \x8F\xD0\xE6 |0
+<U7996> \x8F\xD0\xE7 |0
+<U7998> \x8F\xD0\xE8 |0
+<U799B> \x8F\xD0\xE9 |3
+<U799B> \xFB\xC7 |0
+<U799C> \x8F\xD0\xEA |0
+<U799D> \xE3\xB5 |0
+<U79A1> \x8F\xD0\xEB |0
+<U79A6> \xB5\xFA |0
+<U79A7> \xE3\xB6 |0
+<U79A8> \x8F\xD0\xEC |0
+<U79A9> \x8F\xD0\xED |0
+<U79AA> \xE3\xB8 |0
+<U79AB> \x8F\xD0\xEE |0
+<U79AE> \xE3\xB9 |0
+<U79AF> \x8F\xD0\xEF |0
+<U79B0> \xC7\xA9 |0
+<U79B1> \x8F\xD0\xF0 |0
+<U79B3> \xE3\xBA |0
+<U79B4> \x8F\xD0\xF1 |0
+<U79B8> \x8F\xD0\xF2 |0
+<U79B9> \xE3\xBB |0
+<U79BA> \xE3\xBC |0
+<U79BB> \x8F\xD0\xF3 |0
+<U79BD> \xB6\xD9 |0
+<U79BE> \xB2\xD3 |0
+<U79BF> \xC6\xC5 |0
+<U79C0> \xBD\xA8 |0
+<U79C1> \xBB\xE4 |0
+<U79C2> \x8F\xD0\xF4 |0
+<U79C4> \x8F\xD0\xF5 |0
+<U79C7> \x8F\xD0\xF6 |0
+<U79C8> \x8F\xD0\xF7 |0
+<U79C9> \xE3\xBD |0
+<U79CA> \x8F\xD0\xF8 |0
+<U79CB> \xBD\xA9 |0
+<U79CF> \x8F\xD0\xF9 |0
+<U79D1> \xB2\xCA |0
+<U79D2> \xC9\xC3 |0
+<U79D4> \x8F\xD0\xFA |0
+<U79D5> \xE3\xBE |0
+<U79D6> \x8F\xD0\xFB |0
+<U79D8> \xC8\xEB |0
+<U79DA> \x8F\xD0\xFC |0
+<U79DD> \x8F\xD0\xFD |0
+<U79DE> \x8F\xD0\xFE |0
+<U79DF> \xC1\xC5 |0
+<U79E0> \x8F\xD1\xA1 |0
+<U79E1> \xE3\xC1 |0
+<U79E2> \x8F\xD1\xA2 |0
+<U79E3> \xE3\xC2 |0
+<U79E4> \xC7\xE9 |0
+<U79E5> \x8F\xD1\xA3 |0
+<U79E6> \xBF\xC1 |0
+<U79E7> \xE3\xBF |0
+<U79E9> \xC3\xE1 |0
+<U79EA> \x8F\xD1\xA4 |0
+<U79EB> \x8F\xD1\xA5 |0
+<U79EC> \xE3\xC0 |0
+<U79ED> \x8F\xD1\xA6 |0
+<U79F0> \xBE\xCE |0
+<U79F1> \x8F\xD1\xA7 |0
+<U79F8> \x8F\xD1\xA8 |0
+<U79FB> \xB0\xDC |0
+<U79FC> \x8F\xD1\xA9 |0
+<U7A00> \xB5\xA9 |0
+<U7A02> \x8F\xD1\xAA |0
+<U7A03> \x8F\xD1\xAB |0
+<U7A07> \x8F\xD1\xAC |0
+<U7A08> \xE3\xC3 |0
+<U7A09> \x8F\xD1\xAD |0
+<U7A0A> \x8F\xD1\xAE |0
+<U7A0B> \xC4\xF8 |0
+<U7A0C> \x8F\xD1\xAF |0
+<U7A0D> \xE3\xC4 |0
+<U7A0E> \xC0\xC7 |0
+<U7A11> \x8F\xD1\xB0 |0
+<U7A14> \xCC\xAD |0
+<U7A15> \x8F\xD1\xB1 |0
+<U7A17> \xC9\xA3 |0
+<U7A18> \xE3\xC5 |0
+<U7A19> \xE3\xC6 |0
+<U7A1A> \xC3\xD5 |0
+<U7A1B> \x8F\xD1\xB2 |0
+<U7A1C> \xCE\xC7 |0
+<U7A1E> \x8F\xD1\xB3 |0
+<U7A1F> \xE3\xC8 |0
+<U7A20> \xE3\xC7 |0
+<U7A21> \x8F\xD1\xB4 |0
+<U7A27> \x8F\xD1\xB5 |0
+<U7A2B> \x8F\xD1\xB6 |0
+<U7A2D> \x8F\xD1\xB7 |0
+<U7A2E> \xBC\xEF |0
+<U7A2F> \x8F\xD1\xB8 |0
+<U7A30> \x8F\xD1\xB9 |0
+<U7A31> \xE3\xCA |0
+<U7A32> \xB0\xF0 |0
+<U7A34> \x8F\xD1\xBA |0
+<U7A35> \x8F\xD1\xBB |0
+<U7A37> \xE3\xCD |0
+<U7A38> \x8F\xD1\xBC |0
+<U7A39> \x8F\xD1\xBD |0
+<U7A3A> \x8F\xD1\xBE |0
+<U7A3B> \xE3\xCB |0
+<U7A3C> \xB2\xD4 |0
+<U7A3D> \xB7\xCE |0
+<U7A3E> \xE3\xCC |0
+<U7A3F> \xB9\xC6 |0
+<U7A40> \xB9\xF2 |0
+<U7A42> \xCA\xE6 |0
+<U7A43> \xE3\xCE |0
+<U7A44> \x8F\xD1\xBF |0
+<U7A45> \x8F\xD1\xC0 |0
+<U7A46> \xCB\xD4 |0
+<U7A47> \x8F\xD1\xC1 |0
+<U7A48> \x8F\xD1\xC2 |0
+<U7A49> \xE3\xD0 |0
+<U7A4C> \x8F\xD1\xC3 |0
+<U7A4D> \xC0\xD1 |0
+<U7A4E> \xB1\xCF |0
+<U7A4F> \xB2\xBA |0
+<U7A50> \xB0\xAC |0
+<U7A55> \x8F\xD1\xC4 |0
+<U7A56> \x8F\xD1\xC5 |0
+<U7A57> \xE3\xCF |0
+<U7A59> \x8F\xD1\xC6 |0
+<U7A5C> \x8F\xD1\xC7 |0
+<U7A5D> \x8F\xD1\xC8 |0
+<U7A5F> \x8F\xD1\xC9 |0
+<U7A60> \x8F\xD1\xCA |0
+<U7A61> \xE3\xD1 |0
+<U7A62> \xE3\xD2 |0
+<U7A63> \xBE\xF7 |0
+<U7A65> \x8F\xD1\xCB |0
+<U7A67> \x8F\xD1\xCC |0
+<U7A69> \xE3\xD3 |0
+<U7A6A> \x8F\xD1\xCD |0
+<U7A6B> \xB3\xCF |0
+<U7A6D> \x8F\xD1\xCE |0
+<U7A70> \xE3\xD5 |0
+<U7A74> \xB7\xEA |0
+<U7A75> \x8F\xD1\xCF |0
+<U7A76> \xB5\xE6 |0
+<U7A78> \x8F\xD1\xD0 |0
+<U7A79> \xE3\xD6 |0
+<U7A7A> \xB6\xF5 |0
+<U7A7D> \xE3\xD7 |0
+<U7A7E> \x8F\xD1\xD1 |0
+<U7A7F> \xC0\xFC |0
+<U7A80> \x8F\xD1\xD2 |0
+<U7A81> \xC6\xCD |0
+<U7A82> \x8F\xD1\xD3 |0
+<U7A83> \xC0\xE0 |0
+<U7A84> \xBA\xF5 |0
+<U7A85> \x8F\xD1\xD4 |0
+<U7A86> \x8F\xD1\xD5 |0
+<U7A88> \xE3\xD8 |0
+<U7A8A> \x8F\xD1\xD6 |0
+<U7A8B> \x8F\xD1\xD7 |0
+<U7A90> \x8F\xD1\xD8 |0
+<U7A91> \x8F\xD1\xD9 |0
+<U7A92> \xC3\xE2 |0
+<U7A93> \xC1\xEB |0
+<U7A94> \x8F\xD1\xDA |0
+<U7A95> \xE3\xDA |0
+<U7A96> \xE3\xDC |0
+<U7A97> \xE3\xD9 |0
+<U7A98> \xE3\xDB |0
+<U7A9E> \x8F\xD1\xDB |0
+<U7A9F> \xB7\xA2 |0
+<U7AA0> \x8F\xD1\xDC |0
+<U7AA3> \x8F\xD1\xDD |0
+<U7AA9> \xE3\xDD |0
+<U7AAA> \xB7\xA6 |0
+<U7AAC> \x8F\xD1\xDE |0
+<U7AAE> \xB5\xE7 |0
+<U7AAF> \xCD\xD2 |0
+<U7AB0> \xE3\xDF |0
+<U7AB3> \x8F\xD1\xDF |0
+<U7AB5> \x8F\xD1\xE0 |0
+<U7AB6> \xE3\xE0 |0
+<U7AB9> \x8F\xD1\xE1 |0
+<U7ABA> \xB1\xAE |0
+<U7ABB> \x8F\xD1\xE2 |0
+<U7ABC> \x8F\xD1\xE3 |0
+<U7ABF> \xE3\xE3 |0
+<U7AC3> \xB3\xF6 |0
+<U7AC4> \xE3\xE2 |0
+<U7AC5> \xE3\xE1 |0
+<U7AC6> \x8F\xD1\xE4 |0
+<U7AC7> \xE3\xE5 |0
+<U7AC8> \xE3\xDE |0
+<U7AC9> \x8F\xD1\xE5 |0
+<U7ACA> \xE3\xE6 |0
+<U7ACB> \xCE\xA9 |0
+<U7ACC> \x8F\xD1\xE6 |0
+<U7ACD> \xE3\xE7 |0
+<U7ACE> \x8F\xD1\xE7 |0
+<U7ACF> \xE3\xE8 |0
+<U7AD1> \x8F\xD1\xE8 |3
+<U7AD1> \xFB\xC8 |0
+<U7AD2> \xD4\xF4 |0
+<U7AD3> \xE3\xEA |0
+<U7AD5> \xE3\xE9 |0
+<U7AD9> \xE3\xEB |0
+<U7ADA> \xE3\xEC |0
+<U7ADB> \x8F\xD1\xE9 |0
+<U7ADC> \xCE\xB5 |0
+<U7ADD> \xE3\xED |0
+<U7ADF> \xF0\xEF |0
+<U7AE0> \xBE\xCF |0
+<U7AE1> \xE3\xEE |0
+<U7AE2> \xE3\xEF |0
+<U7AE3> \xBD\xD7 |0
+<U7AE5> \xC6\xB8 |0
+<U7AE6> \xE3\xF0 |0
+<U7AE7> \xFB\xC9 |0
+<U7AE8> \x8F\xD1\xEA |0
+<U7AE9> \x8F\xD1\xEB |0
+<U7AEA> \xC3\xA8 |0
+<U7AEB> \x8F\xD1\xEC |3
+<U7AEB> \xFB\xCB |0
+<U7AEC> \x8F\xD1\xED |0
+<U7AED> \xE3\xF1 |0
+<U7AEF> \xC3\xBC |0
+<U7AF0> \xE3\xF2 |0
+<U7AF1> \x8F\xD1\xEE |0
+<U7AF4> \x8F\xD1\xEF |0
+<U7AF6> \xB6\xA5 |0
+<U7AF8> \xD1\xBF |0
+<U7AF9> \xC3\xDD |0
+<U7AFA> \xBC\xB3 |0
+<U7AFB> \x8F\xD1\xF0 |0
+<U7AFD> \x8F\xD1\xF1 |0
+<U7AFE> \x8F\xD1\xF2 |0
+<U7AFF> \xB4\xC8 |0
+<U7B02> \xE3\xF3 |0
+<U7B04> \xE4\xA2 |0
+<U7B06> \xE3\xF6 |0
+<U7B07> \x8F\xD1\xF3 |0
+<U7B08> \xB5\xE8 |0
+<U7B0A> \xE3\xF5 |0
+<U7B0B> \xE4\xA4 |0
+<U7B0F> \xE3\xF4 |0
+<U7B11> \xBE\xD0 |0
+<U7B14> \x8F\xD1\xF4 |0
+<U7B18> \xE3\xF8 |0
+<U7B19> \xE3\xF9 |0
+<U7B1B> \xC5\xAB |0
+<U7B1E> \xE3\xFA |0
+<U7B1F> \x8F\xD1\xF5 |0
+<U7B20> \xB3\xDE |0
+<U7B23> \x8F\xD1\xF6 |0
+<U7B25> \xBF\xDA |0
+<U7B26> \xC9\xE4 |0
+<U7B27> \x8F\xD1\xF7 |0
+<U7B28> \xE3\xFC |0
+<U7B29> \x8F\xD1\xF8 |0
+<U7B2A> \x8F\xD1\xF9 |0
+<U7B2B> \x8F\xD1\xFA |0
+<U7B2C> \xC2\xE8 |0
+<U7B2D> \x8F\xD1\xFB |0
+<U7B2E> \x8F\xD1\xFC |0
+<U7B2F> \x8F\xD1\xFD |0
+<U7B30> \x8F\xD1\xFE |0
+<U7B31> \x8F\xD2\xA1 |0
+<U7B33> \xE3\xF7 |0
+<U7B34> \x8F\xD2\xA2 |0
+<U7B35> \xE3\xFB |0
+<U7B36> \xE3\xFD |0
+<U7B39> \xBA\xFB |0
+<U7B3D> \x8F\xD2\xA3 |0
+<U7B3F> \x8F\xD2\xA4 |0
+<U7B40> \x8F\xD2\xA5 |0
+<U7B41> \x8F\xD2\xA6 |0
+<U7B45> \xE4\xA6 |0
+<U7B46> \xC9\xAE |0
+<U7B47> \x8F\xD2\xA7 |0
+<U7B48> \xC8\xA6 |0
+<U7B49> \xC5\xF9 |0
+<U7B4B> \xB6\xDA |0
+<U7B4C> \xE4\xA5 |0
+<U7B4D> \xE4\xA3 |0
+<U7B4E> \x8F\xD2\xA8 |0
+<U7B4F> \xC8\xB5 |0
+<U7B50> \xE3\xFE |0
+<U7B51> \xC3\xDE |0
+<U7B52> \xC5\xFB |0
+<U7B54> \xC5\xFA |0
+<U7B55> \x8F\xD2\xA9 |0
+<U7B56> \xBA\xF6 |0
+<U7B5D> \xE4\xB8 |0
+<U7B60> \x8F\xD2\xAA |0
+<U7B64> \x8F\xD2\xAB |0
+<U7B65> \xE4\xA8 |0
+<U7B66> \x8F\xD2\xAC |0
+<U7B67> \xE4\xAA |0
+<U7B69> \x8F\xD2\xAD |0
+<U7B6A> \x8F\xD2\xAE |0
+<U7B6C> \xE4\xAD |0
+<U7B6D> \x8F\xD2\xAF |0
+<U7B6E> \xE4\xAE |0
+<U7B6F> \x8F\xD2\xB0 |0
+<U7B70> \xE4\xAB |0
+<U7B71> \xE4\xAC |0
+<U7B72> \x8F\xD2\xB1 |0
+<U7B73> \x8F\xD2\xB2 |0
+<U7B74> \xE4\xA9 |0
+<U7B75> \xE4\xA7 |0
+<U7B77> \x8F\xD2\xB3 |0
+<U7B7A> \xE4\xA1 |0
+<U7B84> \x8F\xD2\xB4 |0
+<U7B86> \xCA\xCF |0
+<U7B87> \xB2\xD5 |0
+<U7B89> \x8F\xD2\xB5 |0
+<U7B8B> \xE4\xB5 |0
+<U7B8D> \xE4\xB2 |0
+<U7B8E> \x8F\xD2\xB6 |0
+<U7B8F> \xE4\xB7 |0
+<U7B90> \x8F\xD2\xB7 |0
+<U7B91> \x8F\xD2\xB8 |0
+<U7B92> \xE4\xB6 |0
+<U7B94> \xC7\xF3 |0
+<U7B95> \xCC\xA7 |0
+<U7B96> \x8F\xD2\xB9 |0
+<U7B97> \xBB\xBB |0
+<U7B98> \xE4\xB0 |0
+<U7B99> \xE4\xB9 |0
+<U7B9A> \xE4\xB4 |0
+<U7B9B> \x8F\xD2\xBA |0
+<U7B9C> \xE4\xB3 |0
+<U7B9D> \xE4\xAF |0
+<U7B9E> \x8F\xD2\xBB |3
+<U7B9E> \xFB\xCC |0
+<U7B9F> \xE4\xB1 |0
+<U7BA0> \x8F\xD2\xBC |0
+<U7BA1> \xB4\xC9 |0
+<U7BA5> \x8F\xD2\xBD |0
+<U7BAA> \xC3\xBD |0
+<U7BAC> \x8F\xD2\xBE |0
+<U7BAD> \xC0\xFD |0
+<U7BAF> \x8F\xD2\xBF |0
+<U7BB0> \x8F\xD2\xC0 |0
+<U7BB1> \xC8\xA2 |0
+<U7BB2> \x8F\xD2\xC1 |0
+<U7BB4> \xE4\xBE |0
+<U7BB5> \x8F\xD2\xC2 |0
+<U7BB6> \x8F\xD2\xC3 |0
+<U7BB8> \xC8\xA4 |0
+<U7BBA> \x8F\xD2\xC4 |0
+<U7BBB> \x8F\xD2\xC5 |0
+<U7BBC> \x8F\xD2\xC6 |0
+<U7BBD> \x8F\xD2\xC7 |0
+<U7BC0> \xC0\xE1 |0
+<U7BC1> \xE4\xBB |0
+<U7BC2> \x8F\xD2\xC8 |0
+<U7BC4> \xC8\xCF |0
+<U7BC5> \x8F\xD2\xC9 |0
+<U7BC6> \xE4\xBF |0
+<U7BC7> \xCA\xD3 |0
+<U7BC8> \x8F\xD2\xCA |0
+<U7BC9> \xC3\xDB |0
+<U7BCA> \x8F\xD2\xCB |0
+<U7BCB> \xE4\xBA |0
+<U7BCC> \xE4\xBC |0
+<U7BCF> \xE4\xBD |0
+<U7BD4> \x8F\xD2\xCC |0
+<U7BD6> \x8F\xD2\xCD |0
+<U7BD7> \x8F\xD2\xCE |0
+<U7BD9> \x8F\xD2\xCF |0
+<U7BDA> \x8F\xD2\xD0 |0
+<U7BDB> \x8F\xD2\xD1 |0
+<U7BDD> \xE4\xC0 |0
+<U7BE0> \xBC\xC4 |0
+<U7BE4> \xC6\xC6 |0
+<U7BE5> \xE4\xC5 |0
+<U7BE6> \xE4\xC4 |0
+<U7BE8> \x8F\xD2\xD2 |0
+<U7BE9> \xE4\xC1 |0
+<U7BEA> \x8F\xD2\xD3 |0
+<U7BED> \xCF\xB6 |0
+<U7BF2> \x8F\xD2\xD4 |0
+<U7BF3> \xE4\xCA |0
+<U7BF4> \x8F\xD2\xD5 |0
+<U7BF5> \x8F\xD2\xD6 |0
+<U7BF6> \xE4\xCE |0
+<U7BF7> \xE4\xCB |0
+<U7BF8> \x8F\xD2\xD7 |0
+<U7BF9> \x8F\xD2\xD8 |0
+<U7BFA> \x8F\xD2\xD9 |0
+<U7BFC> \x8F\xD2\xDA |0
+<U7BFE> \x8F\xD2\xDB |0
+<U7C00> \xE4\xC7 |0
+<U7C01> \x8F\xD2\xDC |0
+<U7C02> \x8F\xD2\xDD |0
+<U7C03> \x8F\xD2\xDE |0
+<U7C04> \x8F\xD2\xDF |0
+<U7C06> \x8F\xD2\xE0 |0
+<U7C07> \xE4\xC8 |0
+<U7C09> \x8F\xD2\xE1 |0
+<U7C0B> \x8F\xD2\xE2 |0
+<U7C0C> \x8F\xD2\xE3 |0
+<U7C0D> \xE4\xCD |0
+<U7C0E> \x8F\xD2\xE4 |0
+<U7C0F> \x8F\xD2\xE5 |0
+<U7C11> \xE4\xC2 |0
+<U7C12> \xD2\xD5 |0
+<U7C13> \xE4\xC9 |0
+<U7C14> \xE4\xC3 |0
+<U7C17> \xE4\xCC |0
+<U7C19> \x8F\xD2\xE6 |0
+<U7C1B> \x8F\xD2\xE7 |0
+<U7C1E> \xC3\xBD |1
+<U7C1F> \xE4\xD2 |0
+<U7C20> \x8F\xD2\xE8 |0
+<U7C21> \xB4\xCA |0
+<U7C23> \xE4\xCF |0
+<U7C25> \x8F\xD2\xE9 |0
+<U7C26> \x8F\xD2\xEA |0
+<U7C27> \xE4\xD0 |0
+<U7C28> \x8F\xD2\xEB |0
+<U7C2A> \xE4\xD1 |0
+<U7C2B> \xE4\xD4 |0
+<U7C2C> \x8F\xD2\xEC |0
+<U7C31> \x8F\xD2\xED |0
+<U7C33> \x8F\xD2\xEE |0
+<U7C34> \x8F\xD2\xEF |0
+<U7C36> \x8F\xD2\xF0 |0
+<U7C37> \xE4\xD3 |0
+<U7C38> \xC8\xF6 |0
+<U7C39> \x8F\xD2\xF1 |0
+<U7C3A> \x8F\xD2\xF2 |0
+<U7C3D> \xE4\xD5 |0
+<U7C3E> \xCE\xFC |0
+<U7C3F> \xCA\xED |0
+<U7C40> \xE4\xDA |0
+<U7C43> \xE4\xD7 |0
+<U7C46> \x8F\xD2\xF3 |0
+<U7C4A> \x8F\xD2\xF4 |0
+<U7C4C> \xE4\xD6 |0
+<U7C4D> \xC0\xD2 |0
+<U7C4F> \xE4\xD9 |0
+<U7C50> \xE4\xDB |0
+<U7C51> \x8F\xD2\xF6 |0
+<U7C52> \x8F\xD2\xF7 |0
+<U7C53> \x8F\xD2\xF8 |0
+<U7C54> \xE4\xD8 |0
+<U7C55> \x8F\xD2\xF5 |0
+<U7C56> \xE4\xDF |0
+<U7C58> \xE4\xDC |0
+<U7C59> \x8F\xD2\xF9 |0
+<U7C5A> \x8F\xD2\xFA |0
+<U7C5B> \x8F\xD2\xFB |0
+<U7C5C> \x8F\xD2\xFC |0
+<U7C5D> \x8F\xD2\xFD |0
+<U7C5E> \x8F\xD2\xFE |0
+<U7C5F> \xE4\xDD |0
+<U7C60> \xE4\xC6 |0
+<U7C61> \x8F\xD3\xA1 |0
+<U7C63> \x8F\xD3\xA2 |0
+<U7C64> \xE4\xDE |0
+<U7C65> \xE4\xE0 |0
+<U7C67> \x8F\xD3\xA3 |0
+<U7C69> \x8F\xD3\xA4 |0
+<U7C6C> \xE4\xE1 |0
+<U7C6D> \x8F\xD3\xA5 |0
+<U7C6E> \x8F\xD3\xA6 |0
+<U7C70> \x8F\xD3\xA7 |0
+<U7C72> \x8F\xD3\xA8 |0
+<U7C73> \xCA\xC6 |0
+<U7C75> \xE4\xE2 |0
+<U7C79> \x8F\xD3\xA9 |0
+<U7C7C> \x8F\xD3\xAA |0
+<U7C7D> \x8F\xD3\xAB |0
+<U7C7E> \xCC\xE2 |0
+<U7C81> \xB6\xCE |0
+<U7C82> \xB7\xA9 |0
+<U7C83> \xE4\xE3 |0
+<U7C86> \x8F\xD3\xAC |0
+<U7C87> \x8F\xD3\xAD |0
+<U7C89> \xCA\xB4 |0
+<U7C8B> \xBF\xE8 |0
+<U7C8D> \xCC\xB0 |0
+<U7C8F> \x8F\xD3\xAE |0
+<U7C90> \xE4\xE4 |0
+<U7C92> \xCE\xB3 |0
+<U7C94> \x8F\xD3\xAF |0
+<U7C95> \xC7\xF4 |0
+<U7C97> \xC1\xC6 |0
+<U7C98> \xC7\xB4 |0
+<U7C9B> \xBD\xCD |0
+<U7C9E> \x8F\xD3\xB0 |0
+<U7C9F> \xB0\xC0 |0
+<U7CA0> \x8F\xD3\xB1 |0
+<U7CA1> \xE4\xE9 |0
+<U7CA2> \xE4\xE7 |0
+<U7CA4> \xE4\xE5 |0
+<U7CA5> \xB4\xA1 |0
+<U7CA6> \x8F\xD3\xB2 |0
+<U7CA7> \xBE\xD1 |0
+<U7CA8> \xE4\xEA |0
+<U7CAB> \xE4\xE8 |0
+<U7CAD> \xE4\xE6 |0
+<U7CAE> \xE4\xEE |0
+<U7CB0> \x8F\xD3\xB3 |0
+<U7CB1> \xE4\xED |0
+<U7CB2> \xE4\xEC |0
+<U7CB3> \xE4\xEB |0
+<U7CB6> \x8F\xD3\xB4 |0
+<U7CB7> \x8F\xD3\xB5 |0
+<U7CB9> \xE4\xEF |0
+<U7CBA> \x8F\xD3\xB6 |0
+<U7CBB> \x8F\xD3\xB7 |0
+<U7CBC> \x8F\xD3\xB8 |0
+<U7CBD> \xE4\xF0 |0
+<U7CBE> \xC0\xBA |0
+<U7CBF> \x8F\xD3\xB9 |0
+<U7CC0> \xE4\xF1 |0
+<U7CC2> \xE4\xF3 |0
+<U7CC4> \x8F\xD3\xBA |0
+<U7CC5> \xE4\xF2 |0
+<U7CC7> \x8F\xD3\xBB |0
+<U7CC8> \x8F\xD3\xBC |0
+<U7CC9> \x8F\xD3\xBD |0
+<U7CCA> \xB8\xD2 |0
+<U7CCD> \x8F\xD3\xBE |0
+<U7CCE> \xC1\xB8 |0
+<U7CCF> \x8F\xD3\xBF |0
+<U7CD2> \xE4\xF5 |0
+<U7CD3> \x8F\xD3\xC0 |0
+<U7CD4> \x8F\xD3\xC1 |0
+<U7CD5> \x8F\xD3\xC2 |0
+<U7CD6> \xC5\xFC |0
+<U7CD7> \x8F\xD3\xC3 |0
+<U7CD8> \xE4\xF4 |0
+<U7CD9> \x8F\xD3\xC4 |0
+<U7CDA> \x8F\xD3\xC5 |0
+<U7CDC> \xE4\xF6 |0
+<U7CDD> \x8F\xD3\xC6 |0
+<U7CDE> \xCA\xB5 |0
+<U7CDF> \xC1\xEC |0
+<U7CE0> \xB9\xC7 |0
+<U7CE2> \xE4\xF7 |0
+<U7CE6> \x8F\xD3\xC7 |0
+<U7CE7> \xCE\xC8 |0
+<U7CE9> \x8F\xD3\xC8 |0
+<U7CEB> \x8F\xD3\xC9 |0
+<U7CEF> \xE4\xF9 |0
+<U7CF2> \xE4\xFA |0
+<U7CF4> \xE4\xFB |0
+<U7CF5> \x8F\xD3\xCA |0
+<U7CF6> \xE4\xFC |0
+<U7CF8> \xBB\xE5 |0
+<U7CFA> \xE4\xFD |0
+<U7CFB> \xB7\xCF |0
+<U7CFE> \xB5\xEA |0
+<U7D00> \xB5\xAA |0
+<U7D02> \xE5\xA1 |0
+<U7D03> \x8F\xD3\xCB |0
+<U7D04> \xCC\xF3 |0
+<U7D05> \xB9\xC8 |0
+<U7D06> \xE4\xFE |0
+<U7D07> \x8F\xD3\xCC |0
+<U7D08> \x8F\xD3\xCD |0
+<U7D09> \x8F\xD3\xCE |0
+<U7D0A> \xE5\xA4 |0
+<U7D0B> \xCC\xE6 |0
+<U7D0D> \xC7\xBC |0
+<U7D0F> \x8F\xD3\xCF |0
+<U7D10> \xC9\xB3 |0
+<U7D11> \x8F\xD3\xD0 |0
+<U7D12> \x8F\xD3\xD1 |0
+<U7D13> \x8F\xD3\xD2 |0
+<U7D14> \xBD\xE3 |0
+<U7D15> \xE5\xA3 |0
+<U7D16> \x8F\xD3\xD3 |0
+<U7D17> \xBC\xD3 |0
+<U7D18> \xB9\xC9 |0
+<U7D19> \xBB\xE6 |0
+<U7D1A> \xB5\xE9 |0
+<U7D1B> \xCA\xB6 |0
+<U7D1C> \xE5\xA2 |0
+<U7D1D> \x8F\xD3\xD4 |0
+<U7D1E> \x8F\xD3\xD5 |0
+<U7D20> \xC1\xC7 |0
+<U7D21> \xCB\xC2 |0
+<U7D22> \xBA\xF7 |0
+<U7D23> \x8F\xD3\xD6 |0
+<U7D26> \x8F\xD3\xD7 |0
+<U7D2A> \x8F\xD3\xD8 |0
+<U7D2B> \xBB\xE7 |0
+<U7D2C> \xC4\xDD |0
+<U7D2D> \x8F\xD3\xD9 |0
+<U7D2E> \xE5\xA7 |0
+<U7D2F> \xCE\xDF |0
+<U7D30> \xBA\xD9 |0
+<U7D31> \x8F\xD3\xDA |0
+<U7D32> \xE5\xA8 |0
+<U7D33> \xBF\xC2 |0
+<U7D35> \xE5\xAA |0
+<U7D39> \xBE\xD2 |0
+<U7D3A> \xBA\xB0 |0
+<U7D3C> \x8F\xD3\xDB |0
+<U7D3D> \x8F\xD3\xDC |0
+<U7D3E> \x8F\xD3\xDD |0
+<U7D3F> \xE5\xA9 |0
+<U7D40> \x8F\xD3\xDE |0
+<U7D41> \x8F\xD3\xDF |0
+<U7D42> \xBD\xAA |0
+<U7D43> \xB8\xBE |0
+<U7D44> \xC1\xC8 |0
+<U7D45> \xE5\xA5 |0
+<U7D46> \xE5\xAB |0
+<U7D47> \x8F\xD3\xE0 |0
+<U7D48> \x8F\xD3\xE1 |3
+<U7D48> \xFB\xCE |0
+<U7D4B> \xE5\xA6 |0
+<U7D4C> \xB7\xD0 |0
+<U7D4D> \x8F\xD3\xE2 |0
+<U7D4E> \xE5\xAE |0
+<U7D4F> \xE5\xB2 |0
+<U7D50> \xB7\xEB |0
+<U7D51> \x8F\xD3\xE3 |0
+<U7D53> \x8F\xD3\xE4 |0
+<U7D56> \xE5\xAD |0
+<U7D57> \x8F\xD3\xE5 |0
+<U7D59> \x8F\xD3\xE6 |0
+<U7D5A> \x8F\xD3\xE7 |0
+<U7D5B> \xE5\xB6 |0
+<U7D5C> \x8F\xD3\xE8 |3
+<U7D5C> \xFB\xCF |0
+<U7D5D> \x8F\xD3\xE9 |0
+<U7D5E> \xB9\xCA |0
+<U7D61> \xCD\xED |0
+<U7D62> \xB0\xBC |0
+<U7D63> \xE5\xB3 |0
+<U7D65> \x8F\xD3\xEA |0
+<U7D66> \xB5\xEB |0
+<U7D67> \x8F\xD3\xEB |0
+<U7D68> \xE5\xB0 |0
+<U7D6A> \x8F\xD3\xEC |0
+<U7D6E> \xE5\xB1 |0
+<U7D70> \x8F\xD3\xED |0
+<U7D71> \xC5\xFD |0
+<U7D72> \xE5\xAF |0
+<U7D73> \xE5\xAC |0
+<U7D75> \xB3\xA8 |0
+<U7D76> \xC0\xE4 |0
+<U7D78> \x8F\xD3\xEE |0
+<U7D79> \xB8\xA8 |0
+<U7D7A> \x8F\xD3\xEF |0
+<U7D7B> \x8F\xD3\xF0 |0
+<U7D7D> \xE5\xB8 |0
+<U7D7F> \x8F\xD3\xF1 |0
+<U7D81> \x8F\xD3\xF2 |0
+<U7D82> \x8F\xD3\xF3 |0
+<U7D83> \x8F\xD3\xF4 |0
+<U7D85> \x8F\xD3\xF5 |0
+<U7D86> \x8F\xD3\xF6 |0
+<U7D88> \x8F\xD3\xF7 |0
+<U7D89> \xE5\xB5 |0
+<U7D8B> \x8F\xD3\xF8 |0
+<U7D8C> \x8F\xD3\xF9 |0
+<U7D8D> \x8F\xD3\xFA |0
+<U7D8F> \xE5\xB7 |0
+<U7D91> \x8F\xD3\xFB |0
+<U7D93> \xE5\xB4 |0
+<U7D96> \x8F\xD3\xFC |0
+<U7D97> \x8F\xD3\xFD |0
+<U7D99> \xB7\xD1 |0
+<U7D9A> \xC2\xB3 |0
+<U7D9B> \xE5\xB9 |0
+<U7D9C> \xC1\xEE |0
+<U7D9D> \x8F\xD3\xFE |0
+<U7D9E> \x8F\xD4\xA1 |0
+<U7D9F> \xE5\xC6 |0
+<U7DA0> \xFB\xD1 |0
+<U7DA2> \xE5\xC2 |0
+<U7DA3> \xE5\xBC |0
+<U7DA6> \x8F\xD4\xA2 |0
+<U7DA7> \x8F\xD4\xA3 |0
+<U7DAA> \x8F\xD4\xA4 |0
+<U7DAB> \xE5\xC0 |0
+<U7DAC> \xBC\xFA |0
+<U7DAD> \xB0\xDD |0
+<U7DAE> \xE5\xBB |0
+<U7DAF> \xE5\xC3 |0
+<U7DB0> \xE5\xC7 |0
+<U7DB1> \xB9\xCB |0
+<U7DB2> \xCC\xD6 |0
+<U7DB3> \x8F\xD4\xA5 |0
+<U7DB4> \xC4\xD6 |0
+<U7DB5> \xE5\xBD |0
+<U7DB6> \x8F\xD4\xA6 |0
+<U7DB7> \x8F\xD4\xA7 |3
+<U7DB7> \xFB\xD0 |0
+<U7DB8> \xE5\xC5 |0
+<U7DB9> \x8F\xD4\xA8 |0
+<U7DBA> \xE5\xBA |0
+<U7DBB> \xC3\xBE |0
+<U7DBD> \xE5\xBF |0
+<U7DBE> \xB0\xBD |0
+<U7DBF> \xCC\xCA |0
+<U7DC2> \x8F\xD4\xA9 |0
+<U7DC3> \x8F\xD4\xAA |0
+<U7DC4> \x8F\xD4\xAB |0
+<U7DC5> \x8F\xD4\xAC |0
+<U7DC6> \x8F\xD4\xAD |0
+<U7DC7> \xE5\xBE |0
+<U7DCA> \xB6\xDB |0
+<U7DCB> \xC8\xEC |0
+<U7DCC> \x8F\xD4\xAE |0
+<U7DCD> \x8F\xD4\xAF |0
+<U7DCE> \x8F\xD4\xB0 |0
+<U7DCF> \xC1\xED |0
+<U7DD1> \xCE\xD0 |0
+<U7DD2> \xBD\xEF |0
+<U7DD5> \xE5\xEE |0
+<U7DD6> \xFB\xD2 |0
+<U7DD7> \x8F\xD4\xB1 |0
+<U7DD8> \xE5\xC8 |0
+<U7DD9> \x8F\xD4\xB2 |0
+<U7DDA> \xC0\xFE |0
+<U7DDC> \xE5\xC4 |0
+<U7DDD> \xE5\xC9 |0
+<U7DDE> \xE5\xCB |0
+<U7DE0> \xC4\xF9 |0
+<U7DE1> \xE5\xCE |0
+<U7DE2> \x8F\xD4\xB4 |0
+<U7DE4> \xE5\xCA |0
+<U7DE5> \x8F\xD4\xB5 |0
+<U7DE6> \x8F\xD4\xB6 |0
+<U7DE8> \xCA\xD4 |0
+<U7DE9> \xB4\xCB |0
+<U7DEA> \x8F\xD4\xB7 |0
+<U7DEB> \x8F\xD4\xB8 |0
+<U7DEC> \xCC\xCB |0
+<U7DED> \x8F\xD4\xB9 |0
+<U7DEF> \xB0\xDE |0
+<U7DF1> \x8F\xD4\xBA |0
+<U7DF2> \xE5\xCD |0
+<U7DF4> \xCE\xFD |0
+<U7DF5> \x8F\xD4\xBB |0
+<U7DF6> \x8F\xD4\xBC |0
+<U7DF9> \x8F\xD4\xBD |0
+<U7DFA> \x8F\xD4\xBE |0
+<U7DFB> \xE5\xCC |0
+<U7E00> \x8F\xD4\xB3 |0
+<U7E01> \xB1\xEF |0
+<U7E04> \xC6\xEC |0
+<U7E05> \xE5\xCF |0
+<U7E08> \x8F\xD4\xBF |0
+<U7E09> \xE5\xD6 |0
+<U7E0A> \xE5\xD0 |0
+<U7E0B> \xE5\xD7 |0
+<U7E10> \x8F\xD4\xC0 |0
+<U7E11> \x8F\xD4\xC1 |0
+<U7E12> \xE5\xD3 |0
+<U7E15> \x8F\xD4\xC2 |0
+<U7E17> \x8F\xD4\xC3 |0
+<U7E1B> \xC7\xFB |0
+<U7E1C> \x8F\xD4\xC4 |0
+<U7E1D> \x8F\xD4\xC5 |0
+<U7E1E> \xBC\xCA |0
+<U7E1F> \xE5\xD5 |0
+<U7E20> \x8F\xD4\xC6 |0
+<U7E21> \xE5\xD2 |0
+<U7E22> \xE5\xD8 |0
+<U7E23> \xE5\xD1 |0
+<U7E26> \xBD\xC4 |0
+<U7E27> \x8F\xD4\xC7 |0
+<U7E28> \x8F\xD4\xC8 |0
+<U7E2B> \xCB\xA5 |0
+<U7E2C> \x8F\xD4\xC9 |0
+<U7E2D> \x8F\xD4\xCA |0
+<U7E2E> \xBD\xCC |0
+<U7E2F> \x8F\xD4\xCB |0
+<U7E31> \xE5\xD4 |0
+<U7E32> \xE5\xE0 |0
+<U7E33> \x8F\xD4\xCC |0
+<U7E35> \xE5\xDC |0
+<U7E36> \x8F\xD4\xCD |0
+<U7E37> \xE5\xDF |0
+<U7E39> \xE5\xDD |0
+<U7E3A> \xE5\xE1 |0
+<U7E3B> \xE5\xDB |0
+<U7E3D> \xE5\xC1 |0
+<U7E3E> \xC0\xD3 |0
+<U7E3F> \x8F\xD4\xCE |0
+<U7E41> \xC8\xCB |0
+<U7E43> \xE5\xDE |0
+<U7E44> \x8F\xD4\xCF |0
+<U7E45> \x8F\xD4\xD0 |0
+<U7E46> \xE5\xD9 |0
+<U7E47> \x8F\xD4\xD1 |0
+<U7E48> \xE5\xDA |1
+<U7E4A> \xC1\xA1 |0
+<U7E4B> \xB7\xD2 |0
+<U7E4D> \xBD\xAB |0
+<U7E4E> \x8F\xD4\xD2 |0
+<U7E50> \x8F\xD4\xD3 |0
+<U7E52> \x8F\xD4\xD4 |3
+<U7E52> \xFB\xD3 |0
+<U7E54> \xBF\xA5 |0
+<U7E55> \xC1\xB6 |0
+<U7E56> \xE5\xE4 |0
+<U7E58> \x8F\xD4\xD5 |0
+<U7E59> \xE5\xE6 |0
+<U7E5A> \xE5\xE7 |0
+<U7E5D> \xE5\xE3 |0
+<U7E5E> \xE5\xE5 |0
+<U7E5F> \x8F\xD4\xD6 |0
+<U7E61> \x8F\xD4\xD7 |0
+<U7E62> \x8F\xD4\xD8 |0
+<U7E65> \x8F\xD4\xD9 |0
+<U7E66> \xE5\xDA |0
+<U7E67> \xE5\xE2 |0
+<U7E69> \xE5\xEA |0
+<U7E6A> \xE5\xE9 |0
+<U7E6B> \x8F\xD4\xDA |0
+<U7E6D> \xCB\xFA |0
+<U7E6E> \x8F\xD4\xDB |0
+<U7E6F> \x8F\xD4\xDC |0
+<U7E70> \xB7\xAB |0
+<U7E73> \x8F\xD4\xDD |0
+<U7E78> \x8F\xD4\xDE |0
+<U7E79> \xE5\xE8 |0
+<U7E7B> \xE5\xEC |0
+<U7E7C> \xE5\xEB |0
+<U7E7D> \xE5\xEF |0
+<U7E7E> \x8F\xD4\xDF |0
+<U7E7F> \xE5\xF1 |0
+<U7E81> \x8F\xD4\xE0 |0
+<U7E82> \xBB\xBC |0
+<U7E83> \xE5\xED |0
+<U7E86> \x8F\xD4\xE1 |0
+<U7E87> \x8F\xD4\xE2 |0
+<U7E88> \xE5\xF2 |0
+<U7E89> \xE5\xF3 |0
+<U7E8A> \x8F\xD4\xE3 |3
+<U7E8A> \xF9\xA1 |0
+<U7E8C> \xE5\xF4 |0
+<U7E8D> \x8F\xD4\xE4 |0
+<U7E8E> \xE5\xFA |0
+<U7E8F> \xC5\xBB |0
+<U7E90> \xE5\xF6 |0
+<U7E91> \x8F\xD4\xE5 |0
+<U7E92> \xE5\xF5 |0
+<U7E93> \xE5\xF7 |0
+<U7E94> \xE5\xF8 |0
+<U7E95> \x8F\xD4\xE6 |0
+<U7E96> \xE5\xF9 |0
+<U7E98> \x8F\xD4\xE7 |0
+<U7E9A> \x8F\xD4\xE8 |0
+<U7E9B> \xE5\xFB |0
+<U7E9C> \xE5\xFC |0
+<U7E9D> \x8F\xD4\xE9 |0
+<U7E9E> \x8F\xD4\xEA |0
+<U7F36> \xB4\xCC |0
+<U7F38> \xE5\xFD |0
+<U7F3A> \xE5\xFE |0
+<U7F3B> \x8F\xD4\xEC |0
+<U7F3C> \x8F\xD4\xEB |0
+<U7F3D> \x8F\xD4\xED |0
+<U7F3E> \x8F\xD4\xEE |0
+<U7F3F> \x8F\xD4\xEF |0
+<U7F43> \x8F\xD4\xF0 |0
+<U7F44> \x8F\xD4\xF1 |0
+<U7F45> \xE6\xA1 |0
+<U7F47> \x8F\xD4\xF2 |3
+<U7F47> \xFB\xD4 |0
+<U7F4C> \xE6\xA2 |0
+<U7F4D> \xE6\xA3 |0
+<U7F4E> \xE6\xA4 |0
+<U7F4F> \x8F\xD4\xF3 |0
+<U7F50> \xE6\xA5 |0
+<U7F51> \xE6\xA6 |0
+<U7F52> \x8F\xD4\xF4 |0
+<U7F53> \x8F\xD4\xF5 |0
+<U7F54> \xE6\xA8 |0
+<U7F55> \xE6\xA7 |0
+<U7F58> \xE6\xA9 |0
+<U7F5B> \x8F\xD4\xF6 |0
+<U7F5C> \x8F\xD4\xF7 |0
+<U7F5D> \x8F\xD4\xF8 |0
+<U7F5F> \xE6\xAA |0
+<U7F60> \xE6\xAB |0
+<U7F61> \x8F\xD4\xF9 |0
+<U7F63> \x8F\xD4\xFA |0
+<U7F64> \x8F\xD4\xFB |0
+<U7F65> \x8F\xD4\xFC |0
+<U7F66> \x8F\xD4\xFD |0
+<U7F67> \xE6\xAE |0
+<U7F68> \xE6\xAC |0
+<U7F69> \xE6\xAD |0
+<U7F6A> \xBA\xE1 |0
+<U7F6B> \xB7\xD3 |0
+<U7F6D> \x8F\xD4\xFE |0
+<U7F6E> \xC3\xD6 |0
+<U7F70> \xC8\xB3 |0
+<U7F71> \x8F\xD5\xA1 |0
+<U7F72> \xBD\xF0 |0
+<U7F75> \xC7\xCD |0
+<U7F77> \xC8\xED |0
+<U7F78> \xE6\xAF |0
+<U7F79> \xD8\xED |0
+<U7F7D> \x8F\xD5\xA2 |0
+<U7F7E> \x8F\xD5\xA3 |0
+<U7F7F> \x8F\xD5\xA4 |0
+<U7F80> \x8F\xD5\xA5 |0
+<U7F82> \xE6\xB0 |0
+<U7F83> \xE6\xB2 |0
+<U7F85> \xCD\xE5 |0
+<U7F86> \xE6\xB1 |0
+<U7F87> \xE6\xB4 |0
+<U7F88> \xE6\xB3 |0
+<U7F8A> \xCD\xD3 |0
+<U7F8B> \x8F\xD5\xA6 |0
+<U7F8C> \xE6\xB5 |0
+<U7F8D> \x8F\xD5\xA7 |0
+<U7F8E> \xC8\xFE |0
+<U7F8F> \x8F\xD5\xA8 |0
+<U7F90> \x8F\xD5\xA9 |0
+<U7F91> \x8F\xD5\xAA |0
+<U7F94> \xE6\xB6 |0
+<U7F96> \x8F\xD5\xAB |0
+<U7F97> \x8F\xD5\xAC |0
+<U7F9A> \xE6\xB9 |0
+<U7F9C> \x8F\xD5\xAD |0
+<U7F9D> \xE6\xB8 |0
+<U7F9E> \xE6\xB7 |0
+<U7FA1> \x8F\xD5\xAE |3
+<U7FA1> \xFB\xD5 |0
+<U7FA2> \x8F\xD5\xAF |0
+<U7FA3> \xE6\xBA |0
+<U7FA4> \xB7\xB2 |0
+<U7FA6> \x8F\xD5\xB0 |0
+<U7FA8> \xC1\xA2 |0
+<U7FA9> \xB5\xC1 |0
+<U7FAA> \x8F\xD5\xB1 |0
+<U7FAD> \x8F\xD5\xB2 |0
+<U7FAE> \xE6\xBE |0
+<U7FAF> \xE6\xBB |0
+<U7FB2> \xE6\xBC |0
+<U7FB4> \x8F\xD5\xB3 |0
+<U7FB6> \xE6\xBF |0
+<U7FB8> \xE6\xC0 |0
+<U7FB9> \xE6\xBD |0
+<U7FBC> \x8F\xD5\xB4 |0
+<U7FBD> \xB1\xA9 |0
+<U7FBF> \x8F\xD5\xB5 |0
+<U7FC0> \x8F\xD5\xB6 |0
+<U7FC1> \xB2\xA7 |0
+<U7FC3> \x8F\xD5\xB7 |0
+<U7FC5> \xE6\xC2 |0
+<U7FC6> \xE6\xC3 |0
+<U7FC8> \x8F\xD5\xB8 |0
+<U7FCA> \xE6\xC4 |0
+<U7FCC> \xCD\xE2 |0
+<U7FCE> \x8F\xD5\xB9 |0
+<U7FCF> \x8F\xD5\xBA |0
+<U7FD2> \xBD\xAC |0
+<U7FD4> \xE6\xC6 |0
+<U7FD5> \xE6\xC5 |0
+<U7FDB> \x8F\xD5\xBB |0
+<U7FDF> \x8F\xD5\xBC |0
+<U7FE0> \xBF\xE9 |0
+<U7FE1> \xE6\xC7 |0
+<U7FE3> \x8F\xD5\xBD |0
+<U7FE5> \x8F\xD5\xBE |0
+<U7FE6> \xE6\xC8 |0
+<U7FE8> \x8F\xD5\xBF |0
+<U7FE9> \xE6\xC9 |0
+<U7FEB> \xB4\xE5 |0
+<U7FEC> \x8F\xD5\xC0 |0
+<U7FEE> \x8F\xD5\xC1 |0
+<U7FEF> \x8F\xD5\xC2 |0
+<U7FF0> \xB4\xCD |0
+<U7FF2> \x8F\xD5\xC3 |0
+<U7FF3> \xE6\xCA |0
+<U7FF9> \xE6\xCB |0
+<U7FFA> \x8F\xD5\xC4 |0
+<U7FFB> \xCB\xDD |0
+<U7FFC> \xCD\xE3 |0
+<U7FFD> \x8F\xD5\xC5 |0
+<U7FFE> \x8F\xD5\xC6 |0
+<U7FFF> \x8F\xD5\xC7 |0
+<U8000> \xCD\xD4 |0
+<U8001> \xCF\xB7 |0
+<U8003> \xB9\xCD |0
+<U8004> \xE6\xCE |0
+<U8005> \xBC\xD4 |0
+<U8006> \xE6\xCD |0
+<U8007> \x8F\xD5\xC8 |0
+<U8008> \x8F\xD5\xC9 |0
+<U800A> \x8F\xD5\xCA |0
+<U800B> \xE6\xCF |0
+<U800C> \xBC\xA9 |0
+<U800D> \x8F\xD5\xCB |0
+<U800E> \x8F\xD5\xCC |0
+<U800F> \x8F\xD5\xCD |0
+<U8010> \xC2\xD1 |0
+<U8011> \x8F\xD5\xCE |0
+<U8012> \xE6\xD0 |0
+<U8013> \x8F\xD5\xCF |0
+<U8014> \x8F\xD5\xD0 |0
+<U8015> \xB9\xCC |0
+<U8016> \x8F\xD5\xD1 |0
+<U8017> \xCC\xD7 |0
+<U8018> \xE6\xD1 |0
+<U8019> \xE6\xD2 |0
+<U801C> \xE6\xD3 |0
+<U801D> \x8F\xD5\xD2 |0
+<U801E> \x8F\xD5\xD3 |0
+<U801F> \x8F\xD5\xD4 |0
+<U8020> \x8F\xD5\xD5 |0
+<U8021> \xE6\xD4 |0
+<U8024> \x8F\xD5\xD6 |0
+<U8026> \x8F\xD5\xD7 |0
+<U8028> \xE6\xD5 |0
+<U802C> \x8F\xD5\xD8 |0
+<U802E> \x8F\xD5\xD9 |0
+<U8030> \x8F\xD5\xDA |0
+<U8033> \xBC\xAA |0
+<U8034> \x8F\xD5\xDB |0
+<U8035> \x8F\xD5\xDC |0
+<U8036> \xCC\xED |0
+<U8037> \x8F\xD5\xDD |0
+<U8039> \x8F\xD5\xDE |0
+<U803A> \x8F\xD5\xDF |0
+<U803B> \xE6\xD7 |0
+<U803C> \x8F\xD5\xE0 |0
+<U803D> \xC3\xBF |0
+<U803E> \x8F\xD5\xE1 |0
+<U803F> \xE6\xD6 |0
+<U8040> \x8F\xD5\xE2 |0
+<U8044> \x8F\xD5\xE3 |0
+<U8046> \xE6\xD9 |0
+<U804A> \xE6\xD8 |0
+<U8052> \xE6\xDA |0
+<U8056> \xC0\xBB |0
+<U8058> \xE6\xDB |0
+<U805A> \xE6\xDC |0
+<U805E> \xCA\xB9 |0
+<U805F> \xE6\xDD |0
+<U8060> \x8F\xD5\xE4 |0
+<U8061> \xC1\xEF |0
+<U8062> \xE6\xDE |0
+<U8064> \x8F\xD5\xE5 |0
+<U8066> \x8F\xD5\xE6 |0
+<U8068> \xE6\xDF |0
+<U806D> \x8F\xD5\xE7 |0
+<U806F> \xCE\xFE |0
+<U8070> \xE6\xE2 |0
+<U8071> \x8F\xD5\xE8 |0
+<U8072> \xE6\xE1 |0
+<U8073> \xE6\xE0 |0
+<U8074> \xC4\xB0 |0
+<U8075> \x8F\xD5\xE9 |0
+<U8076> \xE6\xE3 |0
+<U8077> \xBF\xA6 |0
+<U8079> \xE6\xE4 |0
+<U807D> \xE6\xE5 |0
+<U807E> \xCF\xB8 |0
+<U807F> \xE6\xE6 |0
+<U8081> \x8F\xD5\xEA |0
+<U8084> \xE6\xE7 |0
+<U8085> \xE6\xE9 |0
+<U8086> \xE6\xE8 |0
+<U8087> \xC8\xA5 |0
+<U8088> \x8F\xD5\xEB |0
+<U8089> \xC6\xF9 |0
+<U808B> \xCF\xBE |0
+<U808C> \xC8\xA9 |0
+<U808E> \x8F\xD5\xEC |0
+<U8093> \xE6\xEB |0
+<U8096> \xBE\xD3 |0
+<U8098> \xC9\xAA |0
+<U809A> \xE6\xEC |0
+<U809B> \xE6\xEA |0
+<U809C> \x8F\xD5\xED |0
+<U809D> \xB4\xCE |0
+<U809E> \x8F\xD5\xEE |0
+<U80A1> \xB8\xD4 |0
+<U80A2> \xBB\xE8 |0
+<U80A5> \xC8\xEE |0
+<U80A6> \x8F\xD5\xEF |0
+<U80A7> \x8F\xD5\xF0 |0
+<U80A9> \xB8\xAA |0
+<U80AA> \xCB\xC3 |0
+<U80AB> \x8F\xD5\xF1 |0
+<U80AC> \xE6\xEF |0
+<U80AD> \xE6\xED |0
+<U80AF> \xB9\xCE |0
+<U80B1> \xB9\xCF |0
+<U80B2> \xB0\xE9 |0
+<U80B4> \xBA\xE8 |0
+<U80B8> \x8F\xD5\xF2 |0
+<U80B9> \x8F\xD5\xF3 |0
+<U80BA> \xC7\xD9 |0
+<U80C3> \xB0\xDF |0
+<U80C4> \xE6\xF4 |0
+<U80C6> \xC3\xC0 |0
+<U80C8> \x8F\xD5\xF4 |0
+<U80CC> \xC7\xD8 |0
+<U80CD> \x8F\xD5\xF5 |0
+<U80CE> \xC2\xDB |0
+<U80CF> \x8F\xD5\xF6 |0
+<U80D2> \x8F\xD5\xF7 |0
+<U80D4> \x8F\xD5\xF8 |0
+<U80D5> \x8F\xD5\xF9 |0
+<U80D6> \xE6\xF6 |0
+<U80D7> \x8F\xD5\xFA |0
+<U80D8> \x8F\xD5\xFB |0
+<U80D9> \xE6\xF2 |0
+<U80DA> \xE6\xF5 |0
+<U80DB> \xE6\xF0 |0
+<U80DD> \xE6\xF3 |0
+<U80DE> \xCB\xA6 |0
+<U80E0> \x8F\xD5\xFC |0
+<U80E1> \xB8\xD5 |0
+<U80E4> \xB0\xFD |0
+<U80E5> \xE6\xF1 |0
+<U80ED> \x8F\xD5\xFD |0
+<U80EE> \x8F\xD5\xFE |0
+<U80EF> \xE6\xF8 |0
+<U80F0> \x8F\xD6\xA1 |0
+<U80F1> \xE6\xF9 |0
+<U80F2> \x8F\xD6\xA2 |0
+<U80F3> \x8F\xD6\xA3 |0
+<U80F4> \xC6\xB9 |0
+<U80F6> \x8F\xD6\xA4 |0
+<U80F8> \xB6\xBB |0
+<U80F9> \x8F\xD6\xA5 |0
+<U80FA> \x8F\xD6\xA6 |0
+<U80FC> \xE7\xA6 |0
+<U80FD> \xC7\xBD |0
+<U80FE> \x8F\xD6\xA7 |0
+<U8102> \xBB\xE9 |0
+<U8103> \x8F\xD6\xA8 |0
+<U8105> \xB6\xBC |0
+<U8106> \xC0\xC8 |0
+<U8107> \xCF\xC6 |0
+<U8108> \xCC\xAE |0
+<U8109> \xE6\xF7 |0
+<U810A> \xC0\xD4 |0
+<U810B> \x8F\xD6\xA9 |0
+<U8116> \x8F\xD6\xAA |0
+<U8117> \x8F\xD6\xAB |0
+<U8118> \x8F\xD6\xAC |0
+<U811A> \xB5\xD3 |0
+<U811B> \xE6\xFA |0
+<U811C> \x8F\xD6\xAD |0
+<U811E> \x8F\xD6\xAE |0
+<U8120> \x8F\xD6\xAF |0
+<U8123> \xE6\xFC |0
+<U8124> \x8F\xD6\xB0 |0
+<U8127> \x8F\xD6\xB1 |0
+<U8129> \xE6\xFB |0
+<U812C> \x8F\xD6\xB2 |0
+<U812F> \xE6\xFD |0
+<U8130> \x8F\xD6\xB3 |0
+<U8131> \xC3\xA6 |0
+<U8133> \xC7\xBE |0
+<U8135> \x8F\xD6\xB4 |0
+<U8139> \xC4\xB1 |0
+<U813A> \x8F\xD6\xB5 |0
+<U813C> \x8F\xD6\xB6 |0
+<U813E> \xE7\xA3 |0
+<U8141> \xE7\xA6 |1
+<U8145> \x8F\xD6\xB7 |0
+<U8146> \xE7\xA2 |0
+<U8147> \x8F\xD6\xB8 |0
+<U814A> \x8F\xD6\xB9 |0
+<U814B> \xE6\xFE |0
+<U814C> \x8F\xD6\xBA |0
+<U814E> \xBF\xD5 |0
+<U8150> \xC9\xE5 |0
+<U8151> \xE7\xA5 |0
+<U8152> \x8F\xD6\xBB |0
+<U8153> \xE7\xA4 |0
+<U8154> \xB9\xD0 |0
+<U8155> \xCF\xD3 |0
+<U8157> \x8F\xD6\xBC |0
+<U815F> \xE7\xB5 |0
+<U8160> \x8F\xD6\xBD |0
+<U8161> \x8F\xD6\xBE |0
+<U8165> \xE7\xA9 |0
+<U8166> \xE7\xAA |0
+<U8167> \x8F\xD6\xBF |0
+<U8168> \x8F\xD6\xC0 |0
+<U8169> \x8F\xD6\xC1 |0
+<U816B> \xBC\xF0 |0
+<U816D> \x8F\xD6\xC2 |0
+<U816E> \xE7\xA8 |0
+<U816F> \x8F\xD6\xC3 |0
+<U8170> \xB9\xF8 |0
+<U8171> \xE7\xA7 |0
+<U8174> \xE7\xAB |0
+<U8177> \x8F\xD6\xC4 |0
+<U8178> \xC4\xB2 |0
+<U8179> \xCA\xA2 |0
+<U817A> \xC1\xA3 |0
+<U817F> \xC2\xDC |0
+<U8180> \xE7\xAF |0
+<U8181> \x8F\xD6\xC5 |0
+<U8182> \xE7\xB0 |0
+<U8183> \xE7\xAC |0
+<U8184> \x8F\xD6\xC7 |0
+<U8185> \x8F\xD6\xC8 |0
+<U8186> \x8F\xD6\xC9 |0
+<U8188> \xE7\xAD |0
+<U818A> \xE7\xAE |0
+<U818B> \x8F\xD6\xCA |0
+<U818E> \x8F\xD6\xCB |0
+<U818F> \xB9\xD1 |0
+<U8190> \x8F\xD6\xC6 |0
+<U8193> \xE7\xB6 |0
+<U8195> \xE7\xB2 |0
+<U8196> \x8F\xD6\xCC |0
+<U8198> \x8F\xD6\xCD |0
+<U819A> \xC9\xE6 |0
+<U819B> \x8F\xD6\xCE |0
+<U819C> \xCB\xEC |0
+<U819D> \xC9\xA8 |0
+<U819E> \x8F\xD6\xCF |0
+<U81A0> \xE7\xB1 |0
+<U81A2> \x8F\xD6\xD0 |0
+<U81A3> \xE7\xB4 |0
+<U81A4> \xE7\xB3 |0
+<U81A8> \xCB\xC4 |0
+<U81A9> \xE7\xB7 |0
+<U81AE> \x8F\xD6\xD1 |0
+<U81B0> \xE7\xB8 |0
+<U81B2> \x8F\xD6\xD2 |0
+<U81B3> \xC1\xB7 |0
+<U81B4> \x8F\xD6\xD3 |0
+<U81B5> \xE7\xB9 |0
+<U81B8> \xE7\xBB |0
+<U81BA> \xE7\xBF |0
+<U81BB> \x8F\xD6\xD4 |0
+<U81BD> \xE7\xBC |0
+<U81BE> \xE7\xBA |0
+<U81BF> \xC7\xBF |0
+<U81C0> \xE7\xBD |0
+<U81C2> \xE7\xBE |0
+<U81C3> \x8F\xD6\xD6 |0
+<U81C5> \x8F\xD6\xD7 |0
+<U81C6> \xB2\xB2 |0
+<U81C8> \xE7\xC5 |0
+<U81C9> \xE7\xC0 |0
+<U81CA> \x8F\xD6\xD8 |0
+<U81CB> \x8F\xD6\xD5 |0
+<U81CD> \xE7\xC1 |0
+<U81CE> \x8F\xD6\xD9 |0
+<U81CF> \x8F\xD6\xDA |0
+<U81D1> \xE7\xC2 |0
+<U81D3> \xC2\xA1 |0
+<U81D5> \x8F\xD6\xDB |0
+<U81D7> \x8F\xD6\xDC |0
+<U81D8> \xE7\xC4 |0
+<U81D9> \xE7\xC3 |0
+<U81DA> \xE7\xC6 |0
+<U81DB> \x8F\xD6\xDD |0
+<U81DD> \x8F\xD6\xDE |0
+<U81DE> \x8F\xD6\xDF |0
+<U81DF> \xE7\xC7 |0
+<U81E0> \xE7\xC8 |0
+<U81E1> \x8F\xD6\xE0 |0
+<U81E3> \xBF\xC3 |0
+<U81E4> \x8F\xD6\xE1 |0
+<U81E5> \xB2\xE9 |0
+<U81E7> \xE7\xC9 |0
+<U81E8> \xCE\xD7 |0
+<U81EA> \xBC\xAB |0
+<U81EB> \x8F\xD6\xE2 |0
+<U81EC> \x8F\xD6\xE3 |0
+<U81ED> \xBD\xAD |0
+<U81F0> \x8F\xD6\xE4 |0
+<U81F1> \x8F\xD6\xE5 |0
+<U81F2> \x8F\xD6\xE6 |0
+<U81F3> \xBB\xEA |0
+<U81F4> \xC3\xD7 |0
+<U81F5> \x8F\xD6\xE7 |0
+<U81F6> \x8F\xD6\xE8 |0
+<U81F8> \x8F\xD6\xE9 |0
+<U81F9> \x8F\xD6\xEA |0
+<U81FA> \xE7\xCA |0
+<U81FB> \xE7\xCB |0
+<U81FC> \xB1\xB1 |0
+<U81FD> \x8F\xD6\xEB |0
+<U81FE> \xE7\xCC |0
+<U81FF> \x8F\xD6\xEC |0
+<U8200> \x8F\xD6\xED |0
+<U8201> \xE7\xCD |0
+<U8202> \xE7\xCE |0
+<U8203> \x8F\xD6\xEE |0
+<U8205> \xE7\xCF |0
+<U8207> \xE7\xD0 |0
+<U8208> \xB6\xBD |0
+<U8209> \xDA\xAA |0
+<U820A> \xE7\xD1 |0
+<U820C> \xC0\xE5 |0
+<U820D> \xE7\xD2 |0
+<U820E> \xBC\xCB |0
+<U820F> \x8F\xD6\xEF |0
+<U8210> \xE7\xD3 |0
+<U8212> \xD0\xB0 |0
+<U8213> \x8F\xD6\xF0 |0
+<U8214> \x8F\xD6\xF1 |0
+<U8216> \xE7\xD4 |0
+<U8217> \xCA\xDE |0
+<U8218> \xB4\xDC |0
+<U8219> \x8F\xD6\xF2 |0
+<U821A> \x8F\xD6\xF3 |0
+<U821B> \xC1\xA4 |0
+<U821C> \xBD\xD8 |0
+<U821D> \x8F\xD6\xF4 |0
+<U821E> \xC9\xF1 |0
+<U821F> \xBD\xAE |0
+<U8221> \x8F\xD6\xF5 |0
+<U8222> \x8F\xD6\xF6 |0
+<U8228> \x8F\xD6\xF7 |0
+<U8229> \xE7\xD5 |0
+<U822A> \xB9\xD2 |0
+<U822B> \xE7\xD6 |0
+<U822C> \xC8\xCC |0
+<U822E> \xE7\xE4 |0
+<U8232> \x8F\xD6\xF8 |0
+<U8233> \xE7\xD8 |0
+<U8234> \x8F\xD6\xF9 |0
+<U8235> \xC2\xC9 |0
+<U8236> \xC7\xF5 |0
+<U8237> \xB8\xBF |0
+<U8238> \xE7\xD7 |0
+<U8239> \xC1\xA5 |0
+<U823A> \x8F\xD6\xFA |0
+<U8240> \xE7\xD9 |0
+<U8243> \x8F\xD6\xFB |0
+<U8244> \x8F\xD6\xFC |0
+<U8245> \x8F\xD6\xFD |0
+<U8246> \x8F\xD6\xFE |0
+<U8247> \xC4\xFA |0
+<U824B> \x8F\xD7\xA1 |0
+<U824E> \x8F\xD7\xA2 |0
+<U824F> \x8F\xD7\xA3 |0
+<U8251> \x8F\xD7\xA4 |0
+<U8256> \x8F\xD7\xA5 |0
+<U8258> \xE7\xDB |0
+<U8259> \xE7\xDA |0
+<U825A> \xE7\xDD |0
+<U825C> \x8F\xD7\xA6 |0
+<U825D> \xE7\xDC |0
+<U825F> \xE7\xDE |0
+<U8260> \x8F\xD7\xA7 |0
+<U8262> \xE7\xE0 |0
+<U8263> \x8F\xD7\xA8 |0
+<U8264> \xE7\xDF |0
+<U8266> \xB4\xCF |0
+<U8267> \x8F\xD7\xA9 |0
+<U8268> \xE7\xE1 |0
+<U826A> \xE7\xE2 |0
+<U826B> \xE7\xE3 |0
+<U826D> \x8F\xD7\xAA |0
+<U826E> \xBA\xB1 |0
+<U826F> \xCE\xC9 |0
+<U8271> \xE7\xE5 |0
+<U8272> \xBF\xA7 |0
+<U8274> \x8F\xD7\xAB |0
+<U8276> \xB1\xF0 |0
+<U8277> \xE7\xE6 |0
+<U8278> \xE7\xE7 |0
+<U827B> \x8F\xD7\xAC |0
+<U827D> \x8F\xD7\xAD |0
+<U827E> \xE7\xE8 |0
+<U827F> \x8F\xD7\xAE |0
+<U8280> \x8F\xD7\xAF |0
+<U8281> \x8F\xD7\xB0 |0
+<U8283> \x8F\xD7\xB1 |0
+<U8284> \x8F\xD7\xB2 |0
+<U8287> \x8F\xD7\xB3 |0
+<U8289> \x8F\xD7\xB4 |0
+<U828A> \x8F\xD7\xB5 |0
+<U828B> \xB0\xF2 |0
+<U828D> \xE7\xE9 |0
+<U828E> \x8F\xD7\xB6 |0
+<U8291> \x8F\xD7\xB7 |0
+<U8292> \xE7\xEA |0
+<U8294> \x8F\xD7\xB8 |0
+<U8296> \x8F\xD7\xB9 |0
+<U8298> \x8F\xD7\xBA |0
+<U8299> \xC9\xE7 |0
+<U829A> \x8F\xD7\xBB |0
+<U829B> \x8F\xD7\xBC |0
+<U829D> \xBC\xC7 |0
+<U829F> \xE7\xEC |0
+<U82A0> \x8F\xD7\xBD |0
+<U82A1> \x8F\xD7\xBE |0
+<U82A3> \x8F\xD7\xBF |0
+<U82A4> \x8F\xD7\xC0 |0
+<U82A5> \xB3\xA9 |0
+<U82A6> \xB0\xB2 |0
+<U82A7> \x8F\xD7\xC1 |0
+<U82A8> \x8F\xD7\xC2 |0
+<U82A9> \x8F\xD7\xC3 |0
+<U82AA> \x8F\xD7\xC4 |0
+<U82AB> \xE7\xEB |0
+<U82AC> \xE7\xEE |0
+<U82AD> \xC7\xCE |0
+<U82AE> \x8F\xD7\xC5 |0
+<U82AF> \xBF\xC4 |0
+<U82B0> \x8F\xD7\xC6 |0
+<U82B1> \xB2\xD6 |0
+<U82B2> \x8F\xD7\xC7 |0
+<U82B3> \xCB\xA7 |0
+<U82B4> \x8F\xD7\xC8 |0
+<U82B7> \x8F\xD7\xC9 |0
+<U82B8> \xB7\xDD |0
+<U82B9> \xB6\xDC |0
+<U82BA> \x8F\xD7\xCA |0
+<U82BB> \xE7\xED |0
+<U82BC> \x8F\xD7\xCB |0
+<U82BD> \xB2\xEA |0
+<U82BE> \x8F\xD7\xCC |0
+<U82BF> \x8F\xD7\xCD |0
+<U82C5> \xB4\xA3 |0
+<U82C6> \x8F\xD7\xCE |0
+<U82D0> \x8F\xD7\xCF |0
+<U82D1> \xB1\xF1 |0
+<U82D2> \xE7\xF2 |0
+<U82D3> \xCE\xEA |0
+<U82D4> \xC2\xDD |0
+<U82D5> \x8F\xD7\xD0 |0
+<U82D7> \xC9\xC4 |0
+<U82D9> \xE7\xFE |0
+<U82DA> \x8F\xD7\xD1 |0
+<U82DB> \xB2\xD7 |0
+<U82DC> \xE7\xFC |0
+<U82DE> \xE7\xFA |0
+<U82DF> \xE7\xF1 |0
+<U82E0> \x8F\xD7\xD2 |0
+<U82E1> \xE7\xEF |0
+<U82E2> \x8F\xD7\xD3 |0
+<U82E3> \xE7\xF0 |0
+<U82E4> \x8F\xD7\xD4 |0
+<U82E5> \xBC\xE3 |0
+<U82E6> \xB6\xEC |0
+<U82E7> \xC3\xF7 |0
+<U82E8> \x8F\xD7\xD5 |0
+<U82EA> \x8F\xD7\xD6 |0
+<U82EB> \xC6\xD1 |0
+<U82ED> \x8F\xD7\xD7 |0
+<U82EF> \x8F\xD7\xD8 |0
+<U82F1> \xB1\xD1 |0
+<U82F3> \xE7\xF4 |0
+<U82F4> \xE7\xF3 |0
+<U82F6> \x8F\xD7\xD9 |0
+<U82F7> \x8F\xD7\xDA |0
+<U82F9> \xE7\xF9 |0
+<U82FA> \xE7\xF5 |0
+<U82FB> \xE7\xF8 |0
+<U82FD> \x8F\xD7\xDB |0
+<U82FE> \x8F\xD7\xDC |0
+<U8300> \x8F\xD7\xDD |0
+<U8301> \x8F\xD7\xDE |3
+<U8301> \xFB\xD7 |0
+<U8302> \xCC\xD0 |0
+<U8303> \xE7\xF7 |0
+<U8304> \xB2\xD8 |0
+<U8305> \xB3\xFD |0
+<U8306> \xE7\xFB |0
+<U8307> \x8F\xD7\xDF |0
+<U8308> \x8F\xD7\xE0 |0
+<U8309> \xE7\xFD |0
+<U830A> \x8F\xD7\xE1 |0
+<U830B> \x8F\xD7\xE2 |0
+<U830E> \xB7\xD4 |0
+<U8316> \xE8\xA3 |0
+<U8317> \xE8\xAC |0
+<U8318> \xE8\xAD |0
+<U831B> \x8F\xD7\xE4 |0
+<U831C> \xB0\xAB |0
+<U831D> \x8F\xD7\xE5 |0
+<U831E> \x8F\xD7\xE6 |0
+<U831F> \x8F\xD7\xE7 |0
+<U8321> \x8F\xD7\xE8 |0
+<U8322> \x8F\xD7\xE9 |0
+<U8323> \xE8\xB4 |0
+<U8328> \xB0\xF1 |0
+<U832B> \xE8\xAB |0
+<U832C> \x8F\xD7\xEA |0
+<U832D> \x8F\xD7\xEB |0
+<U832E> \x8F\xD7\xEC |0
+<U832F> \xE8\xAA |0
+<U8330> \x8F\xD7\xED |0
+<U8331> \xE8\xA5 |0
+<U8332> \xE8\xA4 |0
+<U8333> \x8F\xD7\xEE |0
+<U8334> \xE8\xA2 |0
+<U8335> \xE8\xA1 |0
+<U8336> \xC3\xE3 |0
+<U8337> \x8F\xD7\xEF |0
+<U8338> \xC2\xFB |0
+<U8339> \xE8\xA7 |0
+<U833A> \x8F\xD7\xF0 |0
+<U833C> \x8F\xD7\xF1 |0
+<U833D> \x8F\xD7\xF2 |0
+<U8340> \xE8\xA6 |0
+<U8342> \x8F\xD7\xF3 |0
+<U8343> \x8F\xD7\xF4 |0
+<U8344> \x8F\xD7\xF5 |0
+<U8345> \xE8\xA9 |0
+<U8346> \xB7\xD5 |1
+<U8347> \x8F\xD7\xF6 |0
+<U8349> \xC1\xF0 |0
+<U834A> \xB7\xD5 |0
+<U834D> \x8F\xD7\xF7 |0
+<U834E> \x8F\xD7\xF8 |0
+<U834F> \xB1\xC1 |0
+<U8350> \xE8\xA8 |0
+<U8351> \x8F\xD7\xF9 |0
+<U8352> \xB9\xD3 |0
+<U8353> \x8F\xD8\xBE |0
+<U8354> \x8F\xD7\xE3 |0
+<U8355> \x8F\xD7\xFA |0
+<U8356> \x8F\xD7\xFB |0
+<U8357> \x8F\xD7\xFC |0
+<U8358> \xC1\xF1 |0
+<U8362> \xFB\xD8 |0
+<U8370> \x8F\xD7\xFD |0
+<U8373> \xE8\xBA |0
+<U8375> \xE8\xBB |0
+<U8377> \xB2\xD9 |0
+<U8378> \x8F\xD7\xFE |0
+<U837B> \xB2\xAE |0
+<U837C> \xE8\xB8 |0
+<U837D> \x8F\xD8\xA1 |0
+<U837F> \x8F\xD8\xA2 |3
+<U837F> \xFB\xD9 |0
+<U8380> \x8F\xD8\xA3 |0
+<U8382> \x8F\xD8\xA4 |0
+<U8384> \x8F\xD8\xA5 |0
+<U8385> \xE8\xAE |0
+<U8386> \x8F\xD8\xA6 |0
+<U8387> \xE8\xB6 |0
+<U8389> \xE8\xBD |0
+<U838A> \xE8\xB7 |0
+<U838D> \x8F\xD8\xA7 |0
+<U838E> \xE8\xB5 |0
+<U8392> \x8F\xD8\xA8 |0
+<U8393> \xE7\xF6 |0
+<U8394> \x8F\xD8\xA9 |0
+<U8395> \x8F\xD8\xAA |0
+<U8396> \xE8\xB3 |0
+<U8398> \x8F\xD8\xAB |0
+<U8399> \x8F\xD8\xAC |0
+<U839A> \xE8\xAF |0
+<U839B> \x8F\xD8\xAD |0
+<U839C> \x8F\xD8\xAE |0
+<U839D> \x8F\xD8\xAF |0
+<U839E> \xB4\xD0 |0
+<U839F> \xE8\xB1 |0
+<U83A0> \xE8\xBC |0
+<U83A2> \xE8\xB2 |0
+<U83A6> \x8F\xD8\xB0 |0
+<U83A7> \x8F\xD8\xB1 |0
+<U83A8> \xE8\xBE |0
+<U83A9> \x8F\xD8\xB2 |0
+<U83AA> \xE8\xB0 |0
+<U83AB> \xC7\xFC |0
+<U83AC> \x8F\xD8\xB3 |0
+<U83AD> \x8F\xD8\xCC |0
+<U83B1> \xCD\xE9 |0
+<U83B5> \xE8\xB9 |0
+<U83BD> \xE8\xCF |0
+<U83BE> \x8F\xD8\xB4 |0
+<U83BF> \x8F\xD8\xB5 |0
+<U83C0> \x8F\xD8\xB6 |0
+<U83C1> \xE8\xC7 |0
+<U83C5> \xBF\xFB |0
+<U83C7> \x8F\xD8\xB7 |3
+<U83C7> \xFB\xDA |0
+<U83C9> \x8F\xD8\xB8 |0
+<U83CA> \xB5\xC6 |0
+<U83CC> \xB6\xDD |0
+<U83CE> \xE8\xC2 |0
+<U83CF> \x8F\xD8\xB9 |0
+<U83D0> \x8F\xD8\xBA |0
+<U83D1> \x8F\xD8\xBB |0
+<U83D3> \xB2\xDB |0
+<U83D4> \x8F\xD8\xBC |0
+<U83D6> \xBE\xD4 |0
+<U83D8> \xE8\xC5 |0
+<U83DC> \xBA\xDA |0
+<U83DD> \x8F\xD8\xBD |0
+<U83DF> \xC5\xD1 |0
+<U83E0> \xE8\xCA |0
+<U83E8> \x8F\xD8\xBF |0
+<U83E9> \xCA\xEE |0
+<U83EA> \x8F\xD8\xC0 |0
+<U83EB> \xE8\xC1 |0
+<U83EF> \xB2\xDA |0
+<U83F0> \xB8\xD6 |0
+<U83F1> \xC9\xA9 |0
+<U83F2> \xE8\xCB |0
+<U83F4> \xE8\xBF |0
+<U83F6> \x8F\xD8\xC1 |3
+<U83F6> \xFB\xDB |0
+<U83F7> \xE8\xC8 |0
+<U83F8> \x8F\xD8\xC2 |0
+<U83F9> \x8F\xD8\xC3 |0
+<U83FB> \xE8\xD2 |0
+<U83FC> \x8F\xD8\xC4 |0
+<U83FD> \xE8\xC3 |0
+<U8401> \x8F\xD8\xC5 |0
+<U8403> \xE8\xC4 |0
+<U8404> \xC6\xBA |0
+<U8406> \x8F\xD8\xC6 |0
+<U8407> \xE8\xC9 |0
+<U840A> \x8F\xD8\xC7 |0
+<U840B> \xE8\xC6 |0
+<U840C> \xCB\xA8 |0
+<U840D> \xE8\xCC |0
+<U840E> \xB0\xE0 |0
+<U840F> \x8F\xD8\xC8 |0
+<U8411> \x8F\xD8\xC9 |0
+<U8413> \xE8\xC0 |0
+<U8415> \x8F\xD8\xCA |0
+<U8419> \x8F\xD8\xCB |0
+<U8420> \xE8\xCE |0
+<U8422> \xE8\xCD |0
+<U8429> \xC7\xEB |0
+<U842A> \xE8\xD4 |0
+<U842C> \xE8\xDF |0
+<U842F> \x8F\xD8\xCD |0
+<U8431> \xB3\xFE |0
+<U8435> \xE8\xE2 |0
+<U8438> \xE8\xD0 |0
+<U8439> \x8F\xD8\xCE |0
+<U843C> \xE8\xD5 |0
+<U843D> \xCD\xEE |0
+<U8445> \x8F\xD8\xCF |0
+<U8446> \xE8\xDE |0
+<U8447> \x8F\xD8\xD0 |0
+<U8448> \x8F\xD8\xD1 |3
+<U8448> \xFB\xDC |0
+<U8449> \xCD\xD5 |0
+<U844A> \x8F\xD8\xD2 |0
+<U844D> \x8F\xD8\xD3 |0
+<U844E> \xCE\xAA |0
+<U844F> \x8F\xD8\xD4 |0
+<U8451> \x8F\xD8\xD5 |0
+<U8452> \x8F\xD8\xD6 |0
+<U8456> \x8F\xD8\xD7 |0
+<U8457> \xC3\xF8 |0
+<U8458> \x8F\xD8\xD8 |0
+<U8459> \x8F\xD8\xD9 |0
+<U845A> \x8F\xD8\xDA |0
+<U845B> \xB3\xEB |0
+<U845C> \x8F\xD8\xDB |0
+<U8460> \x8F\xD8\xDC |0
+<U8461> \xC9\xF2 |0
+<U8462> \xE8\xE4 |0
+<U8463> \xC6\xA1 |0
+<U8464> \x8F\xD8\xDD |0
+<U8465> \x8F\xD8\xDE |0
+<U8466> \xB0\xB1 |0
+<U8467> \x8F\xD8\xDF |0
+<U8469> \xE8\xDD |0
+<U846A> \x8F\xD8\xE0 |0
+<U846B> \xE8\xD9 |0
+<U846C> \xC1\xF2 |0
+<U846D> \xE8\xD3 |0
+<U846E> \xE8\xDB |0
+<U846F> \xE8\xE0 |0
+<U8470> \x8F\xD8\xE1 |0
+<U8471> \xC7\xAC |0
+<U8473> \x8F\xD8\xE2 |0
+<U8474> \x8F\xD8\xE3 |0
+<U8475> \xB0\xAA |0
+<U8476> \x8F\xD8\xE4 |0
+<U8477> \xE8\xD8 |0
+<U8478> \x8F\xD8\xE5 |0
+<U8479> \xE8\xE1 |0
+<U847A> \xC9\xF8 |0
+<U847C> \x8F\xD8\xE6 |0
+<U847D> \x8F\xD8\xE7 |0
+<U8481> \x8F\xD8\xE8 |0
+<U8482> \xE8\xDC |0
+<U8484> \xE8\xD7 |0
+<U8485> \x8F\xD8\xE9 |0
+<U848B> \xBE\xD5 |0
+<U8490> \xBD\xAF |0
+<U8492> \x8F\xD8\xEA |0
+<U8493> \x8F\xD8\xEB |0
+<U8494> \xBC\xAC |0
+<U8495> \x8F\xD8\xEC |0
+<U8499> \xCC\xD8 |0
+<U849C> \xC9\xC7 |0
+<U849E> \x8F\xD8\xED |0
+<U849F> \xE8\xE7 |0
+<U84A1> \xE8\xF0 |0
+<U84A6> \x8F\xD8\xEE |0
+<U84A8> \x8F\xD8\xEF |0
+<U84A9> \x8F\xD8\xF0 |0
+<U84AA> \x8F\xD8\xF1 |0
+<U84AD> \xE8\xDA |0
+<U84AF> \x8F\xD8\xF2 |0
+<U84B1> \x8F\xD8\xF3 |0
+<U84B2> \xB3\xF7 |0
+<U84B4> \x8F\xD8\xF4 |3
+<U84B4> \xFB\xDD |0
+<U84B8> \xBE\xF8 |0
+<U84B9> \xE8\xE5 |0
+<U84BA> \x8F\xD8\xF5 |0
+<U84BB> \xE8\xEA |0
+<U84BC> \xC1\xF3 |0
+<U84BD> \x8F\xD8\xF6 |0
+<U84BE> \x8F\xD8\xF7 |0
+<U84BF> \xE8\xE6 |0
+<U84C0> \x8F\xD8\xF8 |0
+<U84C1> \xE8\xED |0
+<U84C2> \x8F\xD8\xF9 |0
+<U84C4> \xC3\xDF |0
+<U84C6> \xE8\xEE |0
+<U84C7> \x8F\xD8\xFA |0
+<U84C8> \x8F\xD8\xFB |0
+<U84C9> \xCD\xD6 |0
+<U84CA> \xE8\xE3 |0
+<U84CB> \xB3\xB8 |0
+<U84CC> \x8F\xD8\xFC |0
+<U84CD> \xE8\xE9 |0
+<U84CF> \x8F\xD8\xFD |0
+<U84D0> \xE8\xEC |0
+<U84D1> \xCC\xAC |0
+<U84D3> \x8F\xD8\xFE |0
+<U84D6> \xE8\xEF |0
+<U84D9> \xE8\xE8 |0
+<U84DA> \xE8\xEB |0
+<U84DC> \x8F\xD9\xA1 |3
+<U84DC> \xF9\xA5 |0
+<U84E7> \x8F\xD9\xA2 |0
+<U84EA> \x8F\xD9\xA3 |0
+<U84EC> \xCB\xA9 |0
+<U84EE> \xCF\xA1 |0
+<U84EF> \x8F\xD9\xA4 |0
+<U84F0> \x8F\xD9\xA5 |0
+<U84F1> \x8F\xD9\xA6 |0
+<U84F2> \x8F\xD9\xA7 |0
+<U84F4> \xE8\xF3 |0
+<U84F7> \x8F\xD9\xA8 |0
+<U84FA> \x8F\xD9\xAA |0
+<U84FB> \x8F\xD9\xAB |0
+<U84FC> \xE8\xFA |0
+<U84FD> \x8F\xD9\xAC |0
+<U84FF> \xE8\xF2 |0
+<U8500> \xBC\xC3 |0
+<U8502> \x8F\xD9\xAD |0
+<U8503> \x8F\xD9\xAE |0
+<U8506> \xE8\xD1 |0
+<U8507> \x8F\xD9\xAF |0
+<U850C> \x8F\xD9\xB0 |0
+<U850E> \x8F\xD9\xB1 |0
+<U8510> \x8F\xD9\xB2 |0
+<U8511> \xCA\xCE |0
+<U8513> \xCC\xA2 |0
+<U8514> \xE8\xF9 |0
+<U8515> \xE8\xF8 |0
+<U8517> \xE8\xF4 |0
+<U8518> \xE8\xF5 |0
+<U851A> \xB1\xB6 |0
+<U851C> \x8F\xD9\xB3 |0
+<U851E> \x8F\xD9\xB4 |0
+<U851F> \xE8\xF7 |0
+<U8521> \xE8\xF1 |0
+<U8522> \x8F\xD9\xB5 |0
+<U8523> \x8F\xD9\xB6 |0
+<U8524> \x8F\xD9\xB7 |0
+<U8525> \x8F\xD9\xB8 |0
+<U8526> \xC4\xD5 |0
+<U8527> \x8F\xD9\xB9 |0
+<U852A> \x8F\xD9\xBA |0
+<U852B> \x8F\xD9\xBB |0
+<U852C> \xE8\xF6 |0
+<U852D> \xB0\xFE |0
+<U852F> \x8F\xD9\xBC |0
+<U8532> \x8F\xD9\xA9 |0
+<U8533> \x8F\xD9\xBD |0
+<U8534> \x8F\xD9\xBE |0
+<U8535> \xC2\xA2 |0
+<U8536> \x8F\xD9\xBF |0
+<U853D> \xCA\xC3 |0
+<U853F> \x8F\xD9\xC0 |0
+<U8540> \xE8\xFB |0
+<U8541> \xE9\xA1 |0
+<U8543> \xC8\xD9 |0
+<U8546> \x8F\xD9\xC1 |0
+<U8548> \xE8\xFE |0
+<U8549> \xBE\xD6 |0
+<U854A> \xBC\xC9 |0
+<U854B> \xE9\xA3 |0
+<U854E> \xB6\xBE |0
+<U854F> \x8F\xD9\xC2 |0
+<U8550> \x8F\xD9\xC3 |0
+<U8551> \x8F\xD9\xC4 |0
+<U8552> \x8F\xD9\xC5 |0
+<U8553> \x8F\xD9\xC6 |3
+<U8553> \xFB\xDE |0
+<U8555> \xE9\xA4 |0
+<U8556> \x8F\xD9\xC7 |0
+<U8557> \xC9\xF9 |0
+<U8558> \xE8\xFD |0
+<U8559> \x8F\xD9\xC8 |3
+<U8559> \xFB\xDF |0
+<U855A> \xE8\xD6 |0
+<U855C> \x8F\xD9\xC9 |0
+<U855D> \x8F\xD9\xCA |0
+<U855E> \x8F\xD9\xCB |0
+<U855F> \x8F\xD9\xCC |0
+<U8560> \x8F\xD9\xCD |0
+<U8561> \x8F\xD9\xCE |0
+<U8562> \x8F\xD9\xCF |0
+<U8563> \xE8\xFC |0
+<U8564> \x8F\xD9\xD0 |0
+<U8568> \xCF\xCF |0
+<U8569> \xC6\xA2 |0
+<U856A> \xC9\xF3 |0
+<U856B> \x8F\xD9\xD1 |3
+<U856B> \xFB\xE0 |0
+<U856D> \xE9\xAB |0
+<U856F> \x8F\xD9\xD2 |0
+<U8577> \xE9\xB1 |0
+<U8579> \x8F\xD9\xD3 |0
+<U857A> \x8F\xD9\xD4 |0
+<U857B> \x8F\xD9\xD5 |0
+<U857D> \x8F\xD9\xD6 |0
+<U857E> \xE9\xB2 |0
+<U857F> \x8F\xD9\xD7 |0
+<U8580> \xE9\xA5 |0
+<U8581> \x8F\xD9\xD8 |0
+<U8584> \xC7\xF6 |0
+<U8585> \x8F\xD9\xD9 |0
+<U8586> \x8F\xD9\xDA |0
+<U8587> \xE9\xAF |0
+<U8588> \xE9\xA7 |0
+<U8589> \x8F\xD9\xDB |0
+<U858A> \xE9\xA9 |0
+<U858B> \x8F\xD9\xDC |0
+<U858C> \x8F\xD9\xDD |0
+<U858F> \x8F\xD9\xDE |0
+<U8590> \xE9\xB3 |0
+<U8591> \xE9\xA8 |0
+<U8593> \x8F\xD9\xDF |0
+<U8594> \xE9\xAC |0
+<U8597> \xB1\xF2 |0
+<U8598> \x8F\xD9\xE0 |0
+<U8599> \xC6\xE5 |0
+<U859B> \xE9\xAD |0
+<U859C> \xE9\xB0 |0
+<U859D> \x8F\xD9\xE1 |0
+<U859F> \x8F\xD9\xE2 |0
+<U85A0> \x8F\xD9\xE3 |0
+<U85A2> \x8F\xD9\xE4 |0
+<U85A4> \xE9\xA6 |0
+<U85A5> \x8F\xD9\xE5 |0
+<U85A6> \xC1\xA6 |0
+<U85A7> \x8F\xD9\xE6 |0
+<U85A8> \xE9\xAA |0
+<U85A9> \xBB\xA7 |0
+<U85AA> \xBF\xC5 |0
+<U85AB> \xB7\xB0 |0
+<U85AC> \xCC\xF4 |0
+<U85AD> \x8F\xD9\xF4 |0
+<U85AE> \xCC\xF9 |0
+<U85AF> \xBD\xF2 |0
+<U85B0> \xFB\xE2 |0
+<U85B4> \x8F\xD9\xE7 |0
+<U85B6> \x8F\xD9\xE8 |0
+<U85B7> \x8F\xD9\xE9 |0
+<U85B8> \x8F\xD9\xEA |0
+<U85B9> \xE9\xB7 |0
+<U85BA> \xE9\xB5 |0
+<U85BC> \x8F\xD9\xEB |0
+<U85BD> \x8F\xD9\xEC |0
+<U85BE> \x8F\xD9\xED |0
+<U85BF> \x8F\xD9\xEE |0
+<U85C1> \xCF\xCE |0
+<U85C2> \x8F\xD9\xEF |0
+<U85C7> \x8F\xD9\xF0 |0
+<U85C9> \xE9\xB4 |0
+<U85CA> \x8F\xD9\xF1 |0
+<U85CB> \x8F\xD9\xF2 |0
+<U85CD> \xCD\xF5 |0
+<U85CE> \x8F\xD9\xF3 |0
+<U85CF> \xE9\xB6 |0
+<U85D0> \xE9\xB8 |0
+<U85D5> \xE9\xB9 |0
+<U85D8> \x8F\xD9\xF5 |0
+<U85DA> \x8F\xD9\xF6 |0
+<U85DC> \xE9\xBC |0
+<U85DD> \xE9\xBA |0
+<U85DF> \x8F\xD9\xF7 |0
+<U85E0> \x8F\xD9\xF8 |0
+<U85E4> \xC6\xA3 |0
+<U85E5> \xE9\xBB |0
+<U85E6> \x8F\xD9\xF9 |0
+<U85E8> \x8F\xD9\xFA |0
+<U85E9> \xC8\xCD |0
+<U85EA> \xE9\xAE |0
+<U85ED> \x8F\xD9\xFB |0
+<U85F3> \x8F\xD9\xFC |0
+<U85F6> \x8F\xD9\xFD |0
+<U85F7> \xBD\xF3 |0
+<U85F9> \xE9\xBD |0
+<U85FA> \xE9\xC2 |0
+<U85FB> \xC1\xF4 |0
+<U85FC> \x8F\xD9\xFE |0
+<U85FE> \xE9\xC1 |0
+<U85FF> \x8F\xDA\xA1 |0
+<U8600> \x8F\xDA\xA2 |0
+<U8602> \xE9\xA2 |0
+<U8604> \x8F\xDA\xA3 |0
+<U8605> \x8F\xDA\xA4 |0
+<U8606> \xE9\xC3 |0
+<U8607> \xC1\xC9 |0
+<U860A> \xE9\xBE |0
+<U860B> \xE9\xC0 |0
+<U860D> \x8F\xDA\xA5 |0
+<U860E> \x8F\xDA\xA6 |0
+<U8610> \x8F\xDA\xA7 |0
+<U8611> \x8F\xDA\xA8 |0
+<U8612> \x8F\xDA\xA9 |0
+<U8613> \xE9\xBF |0
+<U8616> \xDD\xB1 |0
+<U8617> \xDD\xA2 |0
+<U8618> \x8F\xDA\xAA |0
+<U8619> \x8F\xDA\xAB |0
+<U861A> \xE9\xC5 |0
+<U861B> \x8F\xDA\xAC |0
+<U861E> \x8F\xDA\xAD |0
+<U8621> \x8F\xDA\xAE |0
+<U8622> \xE9\xC4 |0
+<U8627> \x8F\xDA\xAF |0
+<U8629> \x8F\xDA\xB0 |0
+<U862D> \xCD\xF6 |0
+<U862F> \xE2\xBC |0
+<U8630> \xE9\xC6 |0
+<U8636> \x8F\xDA\xB1 |0
+<U8638> \x8F\xDA\xB2 |0
+<U863A> \x8F\xDA\xB3 |0
+<U863C> \x8F\xDA\xB4 |0
+<U863D> \x8F\xDA\xB5 |0
+<U863F> \xE9\xC7 |0
+<U8640> \x8F\xDA\xB6 |0
+<U8641> \x8F\xB8\xE6 |0
+<U8642> \x8F\xDA\xB7 |0
+<U8646> \x8F\xDA\xB8 |0
+<U864D> \xE9\xC8 |0
+<U864E> \xB8\xD7 |0
+<U8650> \xB5\xD4 |0
+<U8652> \x8F\xDA\xB9 |0
+<U8653> \x8F\xDA\xBA |0
+<U8654> \xE9\xCA |0
+<U8655> \xD1\xDD |0
+<U8656> \x8F\xDA\xBB |0
+<U8657> \x8F\xDA\xBC |0
+<U8658> \x8F\xDA\xBD |0
+<U8659> \x8F\xDA\xBE |0
+<U865A> \xB5\xF5 |0
+<U865C> \xCE\xBA |0
+<U865D> \x8F\xDA\xBF |0
+<U865E> \xB6\xF3 |0
+<U865F> \xE9\xCB |0
+<U8660> \x8F\xDA\xC0 |0
+<U8661> \x8F\xDA\xC1 |0
+<U8662> \x8F\xDA\xC2 |0
+<U8663> \x8F\xDA\xC3 |0
+<U8664> \x8F\xDA\xC4 |0
+<U8667> \xE9\xCC |0
+<U8669> \x8F\xDA\xC5 |0
+<U866B> \xC3\xEE |0
+<U866C> \x8F\xDA\xC6 |0
+<U866F> \x8F\xDA\xC7 |0
+<U8671> \xE9\xCD |0
+<U8675> \x8F\xDA\xC8 |0
+<U8676> \x8F\xDA\xC9 |0
+<U8677> \x8F\xDA\xCA |0
+<U8679> \xC6\xFA |0
+<U867A> \x8F\xDA\xCB |0
+<U867B> \xB0\xBA |0
+<U8688> \x8F\xDA\xED |0
+<U868A> \xB2\xE3 |0
+<U868B> \xE9\xD2 |0
+<U868C> \xE9\xD3 |0
+<U868D> \x8F\xDA\xCC |0
+<U8691> \x8F\xDA\xCD |0
+<U8693> \xE9\xCE |0
+<U8695> \xBB\xBD |0
+<U8696> \x8F\xDA\xCE |0
+<U8698> \x8F\xDA\xCF |0
+<U869A> \x8F\xDA\xD0 |0
+<U869C> \x8F\xDA\xD1 |0
+<U86A1> \x8F\xDA\xD2 |0
+<U86A3> \xE9\xCF |0
+<U86A4> \xC7\xC2 |0
+<U86A6> \x8F\xDA\xD3 |0
+<U86A7> \x8F\xDA\xD4 |0
+<U86A8> \x8F\xDA\xD5 |0
+<U86A9> \xE9\xD0 |0
+<U86AA> \xE9\xD1 |0
+<U86AB> \xE9\xDB |0
+<U86AD> \x8F\xDA\xD6 |0
+<U86AF> \xE9\xD5 |0
+<U86B0> \xE9\xD8 |0
+<U86B1> \x8F\xDA\xD7 |0
+<U86B3> \x8F\xDA\xD8 |0
+<U86B4> \x8F\xDA\xD9 |0
+<U86B5> \x8F\xDA\xDA |0
+<U86B6> \xE9\xD4 |0
+<U86B7> \x8F\xDA\xDB |0
+<U86B8> \x8F\xDA\xDC |0
+<U86B9> \x8F\xDA\xDD |0
+<U86BF> \x8F\xDA\xDE |0
+<U86C0> \x8F\xDA\xDF |0
+<U86C1> \x8F\xDA\xE0 |0
+<U86C3> \x8F\xDA\xE1 |0
+<U86C4> \xE9\xD6 |0
+<U86C5> \x8F\xDA\xE2 |0
+<U86C6> \xE9\xD7 |0
+<U86C7> \xBC\xD8 |0
+<U86C9> \xE9\xD9 |0
+<U86CB> \xC3\xC1 |0
+<U86CD> \xB7\xD6 |0
+<U86CE> \xB3\xC2 |0
+<U86D1> \x8F\xDA\xE3 |0
+<U86D2> \x8F\xDA\xE4 |0
+<U86D4> \xE9\xDC |0
+<U86D5> \x8F\xDA\xE5 |0
+<U86D7> \x8F\xDA\xE6 |0
+<U86D9> \xB3\xBF |0
+<U86DA> \x8F\xDA\xE7 |0
+<U86DB> \xE9\xE1 |0
+<U86DC> \x8F\xDA\xE8 |0
+<U86DE> \xE9\xDD |0
+<U86DF> \xE9\xE0 |0
+<U86E0> \x8F\xDA\xE9 |0
+<U86E3> \x8F\xDA\xEA |0
+<U86E4> \xC8\xBA |0
+<U86E5> \x8F\xDA\xEB |0
+<U86E7> \x8F\xDA\xEC |0
+<U86E9> \xE9\xDE |0
+<U86EC> \xE9\xDF |0
+<U86ED> \xC9\xC8 |0
+<U86EE> \xC8\xDA |0
+<U86EF> \xE9\xE2 |0
+<U86F8> \xC2\xFD |0
+<U86F9> \xE9\xEC |0
+<U86FA> \x8F\xDA\xEE |0
+<U86FB> \xE9\xE8 |0
+<U86FC> \x8F\xDA\xEF |0
+<U86FD> \x8F\xDA\xF0 |0
+<U86FE> \xB2\xEB |0
+<U8700> \xE9\xE6 |0
+<U8702> \xCB\xAA |0
+<U8703> \xE9\xE7 |0
+<U8704> \x8F\xDA\xF1 |0
+<U8705> \x8F\xDA\xF2 |0
+<U8706> \xE9\xE4 |0
+<U8707> \x8F\xDA\xF3 |0
+<U8708> \xE9\xE5 |0
+<U8709> \xE9\xEA |0
+<U870A> \xE9\xED |0
+<U870B> \x8F\xDA\xF4 |0
+<U870D> \xE9\xEB |0
+<U870E> \x8F\xDA\xF5 |0
+<U870F> \x8F\xDA\xF6 |0
+<U8710> \x8F\xDA\xF7 |0
+<U8711> \xE9\xE9 |0
+<U8712> \xE9\xE3 |0
+<U8713> \x8F\xDA\xF8 |0
+<U8714> \x8F\xDA\xF9 |0
+<U8718> \xC3\xD8 |0
+<U8719> \x8F\xDA\xFA |0
+<U871A> \xE9\xF4 |0
+<U871C> \xCC\xAA |0
+<U871E> \x8F\xDA\xFB |0
+<U871F> \x8F\xDA\xFC |0
+<U8721> \x8F\xDA\xFD |0
+<U8723> \x8F\xDA\xFE |0
+<U8725> \xE9\xF2 |0
+<U8728> \x8F\xDB\xA1 |0
+<U8729> \xE9\xF3 |0
+<U872E> \x8F\xDB\xA2 |0
+<U872F> \x8F\xDB\xA3 |0
+<U8731> \x8F\xDB\xA4 |0
+<U8732> \x8F\xDB\xA5 |0
+<U8734> \xE9\xEE |0
+<U8737> \xE9\xF0 |0
+<U8739> \x8F\xDB\xA6 |0
+<U873A> \x8F\xDB\xA7 |0
+<U873B> \xE9\xF1 |0
+<U873C> \x8F\xDB\xA8 |0
+<U873D> \x8F\xDB\xA9 |0
+<U873E> \x8F\xDB\xAA |0
+<U873F> \xE9\xEF |0
+<U8740> \x8F\xDB\xAB |0
+<U8743> \x8F\xDB\xAC |0
+<U8745> \x8F\xDB\xAD |0
+<U8749> \xC0\xE6 |0
+<U874B> \xCF\xB9 |0
+<U874C> \xE9\xF8 |0
+<U874D> \x8F\xDB\xAE |0
+<U874E> \xE9\xF9 |0
+<U8753> \xEA\xA1 |0
+<U8755> \xBF\xAA |0
+<U8757> \xE9\xFB |0
+<U8758> \x8F\xDB\xAF |0
+<U8759> \xE9\xFE |0
+<U875D> \x8F\xDB\xB0 |0
+<U875F> \xE9\xF6 |0
+<U8760> \xE9\xF5 |0
+<U8761> \x8F\xDB\xB1 |0
+<U8763> \xEA\xA2 |0
+<U8764> \x8F\xDB\xB2 |0
+<U8765> \x8F\xDB\xB3 |0
+<U8766> \xB2\xDC |0
+<U8768> \xE9\xFC |0
+<U876A> \xEA\xA3 |0
+<U876E> \xE9\xFD |0
+<U876F> \x8F\xDB\xB4 |0
+<U8771> \x8F\xDB\xB5 |0
+<U8772> \x8F\xDB\xB6 |0
+<U8774> \xE9\xFA |0
+<U8776> \xC4\xB3 |0
+<U8778> \xE9\xF7 |0
+<U877B> \x8F\xDB\xB7 |0
+<U877F> \xC7\xE8 |0
+<U8782> \xEA\xA7 |0
+<U8783> \x8F\xDB\xB8 |0
+<U8784> \x8F\xDB\xB9 |0
+<U8785> \x8F\xDB\xBA |0
+<U8786> \x8F\xDB\xBB |0
+<U8787> \x8F\xDB\xBC |0
+<U8788> \x8F\xDB\xBD |0
+<U8789> \x8F\xDB\xBE |0
+<U878B> \x8F\xDB\xBF |0
+<U878C> \x8F\xDB\xC0 |0
+<U878D> \xCD\xBB |0
+<U8790> \x8F\xDB\xC1 |0
+<U8793> \x8F\xDB\xC2 |0
+<U8795> \x8F\xDB\xC3 |0
+<U8797> \x8F\xDB\xC4 |0
+<U8798> \x8F\xDB\xC5 |0
+<U8799> \x8F\xDB\xC6 |0
+<U879E> \x8F\xDB\xC7 |0
+<U879F> \xEA\xA6 |0
+<U87A0> \x8F\xDB\xC8 |0
+<U87A2> \xEA\xA5 |0
+<U87A3> \x8F\xDB\xC9 |0
+<U87A7> \x8F\xDB\xCA |0
+<U87AB> \xEA\xAE |0
+<U87AC> \x8F\xDB\xCB |0
+<U87AD> \x8F\xDB\xCC |0
+<U87AE> \x8F\xDB\xCD |0
+<U87AF> \xEA\xA8 |0
+<U87B1> \x8F\xDB\xCE |0
+<U87B3> \xEA\xB0 |0
+<U87B5> \x8F\xDB\xCF |0
+<U87BA> \xCD\xE6 |0
+<U87BB> \xEA\xB3 |0
+<U87BD> \xEA\xAA |0
+<U87BE> \x8F\xDB\xD0 |0
+<U87BF> \x8F\xDB\xD1 |0
+<U87C0> \xEA\xAB |0
+<U87C1> \x8F\xDB\xD2 |0
+<U87C4> \xEA\xAF |0
+<U87C6> \xEA\xB2 |0
+<U87C7> \xEA\xB1 |0
+<U87C8> \x8F\xDB\xD3 |0
+<U87C9> \x8F\xDB\xD4 |0
+<U87CA> \x8F\xDB\xD5 |0
+<U87CB> \xEA\xA9 |0
+<U87CE> \x8F\xDB\xD6 |0
+<U87D0> \xEA\xAC |0
+<U87D2> \xEA\xBD |0
+<U87D5> \x8F\xDB\xD7 |0
+<U87D6> \x8F\xDB\xD8 |0
+<U87D9> \x8F\xDB\xD9 |0
+<U87DA> \x8F\xDB\xDA |0
+<U87DC> \x8F\xDB\xDB |0
+<U87DF> \x8F\xDB\xDC |0
+<U87E0> \xEA\xB6 |0
+<U87E2> \x8F\xDB\xDD |0
+<U87E3> \x8F\xDB\xDE |0
+<U87E4> \x8F\xDB\xDF |0
+<U87EA> \x8F\xDB\xE0 |0
+<U87EB> \x8F\xDB\xE1 |0
+<U87EC> \xC0\xE6 |1
+<U87ED> \x8F\xDB\xE2 |0
+<U87EF> \xEA\xB4 |0
+<U87F1> \x8F\xDB\xE3 |0
+<U87F2> \xEA\xB5 |0
+<U87F3> \x8F\xDB\xE4 |0
+<U87F6> \xEA\xBA |0
+<U87F7> \xEA\xBB |0
+<U87F8> \x8F\xDB\xE5 |0
+<U87F9> \xB3\xAA |0
+<U87FA> \x8F\xDB\xE6 |0
+<U87FB> \xB5\xC2 |0
+<U87FE> \xEA\xB9 |0
+<U87FF> \x8F\xDB\xE7 |0
+<U8801> \x8F\xDB\xE8 |0
+<U8803> \x8F\xDB\xE9 |0
+<U8805> \xEA\xA4 |0
+<U8806> \x8F\xDB\xEA |0
+<U8807> \xFB\xE5 |0
+<U8809> \x8F\xDB\xEB |0
+<U880A> \x8F\xDB\xEC |0
+<U880B> \x8F\xDB\xED |0
+<U880D> \xEA\xB8 |0
+<U880E> \xEA\xBC |0
+<U880F> \xEA\xB7 |0
+<U8810> \x8F\xDB\xEE |0
+<U8811> \xEA\xBE |0
+<U8812> \x8F\xDB\xF0 |0
+<U8813> \x8F\xDB\xF1 |0
+<U8814> \x8F\xDB\xF2 |0
+<U8815> \xEA\xC0 |0
+<U8816> \xEA\xBF |0
+<U8818> \x8F\xDB\xF3 |0
+<U8819> \x8F\xDB\xEF |0
+<U881A> \x8F\xDB\xF4 |0
+<U881B> \x8F\xDB\xF5 |0
+<U881C> \x8F\xDB\xF6 |0
+<U881E> \x8F\xDB\xF7 |0
+<U881F> \x8F\xDB\xF8 |0
+<U8821> \xEA\xC2 |0
+<U8822> \xEA\xC1 |0
+<U8823> \xE9\xDA |0
+<U8827> \xEA\xC6 |0
+<U8828> \x8F\xDB\xF9 |0
+<U882D> \x8F\xDB\xFA |0
+<U882E> \x8F\xDB\xFB |0
+<U8830> \x8F\xDB\xFC |0
+<U8831> \xEA\xC3 |0
+<U8832> \x8F\xDB\xFD |0
+<U8835> \x8F\xDB\xFE |0
+<U8836> \xEA\xC4 |0
+<U8839> \xEA\xC5 |0
+<U883A> \x8F\xDC\xA1 |0
+<U883B> \xEA\xC7 |0
+<U883C> \x8F\xDC\xA2 |0
+<U8840> \xB7\xEC |0
+<U8841> \x8F\xDC\xA3 |0
+<U8842> \xEA\xC9 |0
+<U8843> \x8F\xDC\xA4 |0
+<U8844> \xEA\xC8 |0
+<U8845> \x8F\xDC\xA5 |0
+<U8846> \xBD\xB0 |0
+<U8848> \x8F\xDC\xA6 |0
+<U8849> \x8F\xDC\xA7 |0
+<U884A> \x8F\xDC\xA8 |0
+<U884B> \x8F\xDC\xA9 |0
+<U884C> \xB9\xD4 |0
+<U884D> \xDE\xA7 |0
+<U884E> \x8F\xDC\xAA |0
+<U8851> \x8F\xDC\xAB |0
+<U8852> \xEA\xCA |0
+<U8853> \xBD\xD1 |0
+<U8855> \x8F\xDC\xAC |0
+<U8856> \x8F\xDC\xAD |0
+<U8857> \xB3\xB9 |0
+<U8858> \x8F\xDC\xAE |0
+<U8859> \xEA\xCB |0
+<U885A> \x8F\xDC\xAF |0
+<U885B> \xB1\xD2 |0
+<U885C> \x8F\xDC\xB0 |0
+<U885D> \xBE\xD7 |0
+<U885E> \xEA\xCC |0
+<U885F> \x8F\xDC\xB1 |0
+<U8860> \x8F\xDC\xB2 |0
+<U8861> \xB9\xD5 |0
+<U8862> \xEA\xCD |0
+<U8863> \xB0\xE1 |0
+<U8864> \x8F\xDC\xB3 |0
+<U8868> \xC9\xBD |0
+<U8869> \x8F\xDC\xB4 |0
+<U886B> \xEA\xCE |0
+<U8870> \xBF\xEA |0
+<U8871> \x8F\xDC\xB5 |0
+<U8872> \xEA\xD5 |0
+<U8875> \xEA\xD2 |0
+<U8877> \xC3\xEF |0
+<U8879> \x8F\xDC\xB6 |0
+<U887B> \x8F\xDC\xB7 |0
+<U887D> \xEA\xD3 |0
+<U887E> \xEA\xD0 |0
+<U887F> \xB6\xDE |0
+<U8880> \x8F\xDC\xB8 |0
+<U8881> \xEA\xCF |0
+<U8882> \xEA\xD6 |0
+<U8888> \xB7\xB6 |0
+<U888B> \xC2\xDE |0
+<U888D> \xEA\xDC |0
+<U8892> \xEA\xD8 |0
+<U8896> \xC2\xB5 |0
+<U8897> \xEA\xD7 |0
+<U8898> \x8F\xDC\xB9 |0
+<U8899> \xEA\xDA |0
+<U889A> \x8F\xDC\xBA |0
+<U889B> \x8F\xDC\xBB |0
+<U889C> \x8F\xDC\xBC |0
+<U889E> \xEA\xD1 |0
+<U889F> \x8F\xDC\xBD |0
+<U88A0> \x8F\xDC\xBE |0
+<U88A2> \xEA\xDB |0
+<U88A4> \xEA\xDD |0
+<U88A8> \x8F\xDC\xBF |0
+<U88AA> \x8F\xDC\xC0 |0
+<U88AB> \xC8\xEF |0
+<U88AE> \xEA\xD9 |0
+<U88B0> \xEA\xDE |0
+<U88B1> \xEA\xE0 |0
+<U88B4> \xB8\xD3 |0
+<U88B5> \xEA\xD4 |0
+<U88B7> \xB0\xC1 |0
+<U88BA> \x8F\xDC\xC1 |0
+<U88BD> \x8F\xDC\xC2 |0
+<U88BE> \x8F\xDC\xC3 |0
+<U88BF> \xEA\xDF |0
+<U88C0> \x8F\xDC\xC4 |0
+<U88C1> \xBA\xDB |0
+<U88C2> \xCE\xF6 |0
+<U88C3> \xEA\xE1 |0
+<U88C4> \xEA\xE2 |0
+<U88C5> \xC1\xF5 |0
+<U88CA> \x8F\xDC\xC5 |0
+<U88CB> \x8F\xDC\xC6 |0
+<U88CC> \x8F\xDC\xC7 |0
+<U88CD> \x8F\xDC\xC8 |0
+<U88CE> \x8F\xDC\xC9 |0
+<U88CF> \xCE\xA2 |0
+<U88D1> \x8F\xDC\xCA |0
+<U88D2> \x8F\xDC\xCB |0
+<U88D3> \x8F\xDC\xCC |0
+<U88D4> \xEA\xE3 |0
+<U88D5> \xCD\xB5 |0
+<U88D8> \xEA\xE4 |0
+<U88D9> \xEA\xE5 |0
+<U88DB> \x8F\xDC\xCD |0
+<U88DC> \xCA\xE4 |0
+<U88DD> \xEA\xE6 |0
+<U88DE> \x8F\xDC\xCE |0
+<U88DF> \xBA\xC0 |0
+<U88E1> \xCE\xA3 |0
+<U88E7> \x8F\xDC\xCF |0
+<U88E8> \xEA\xEB |0
+<U88EF> \x8F\xDC\xD0 |0
+<U88F0> \x8F\xDC\xD1 |0
+<U88F1> \x8F\xDC\xD2 |0
+<U88F2> \xEA\xEC |0
+<U88F3> \xBE\xD8 |0
+<U88F4> \xEA\xEA |0
+<U88F5> \x8F\xDC\xD3 |3
+<U88F5> \xFB\xE6 |0
+<U88F7> \x8F\xDC\xD4 |0
+<U88F8> \xCD\xE7 |0
+<U88F9> \xEA\xE7 |0
+<U88FC> \xEA\xE9 |0
+<U88FD> \xC0\xBD |0
+<U88FE> \xBF\xFE |0
+<U8901> \x8F\xDC\xD5 |0
+<U8902> \xEA\xE8 |0
+<U8904> \xEA\xED |0
+<U8906> \x8F\xDC\xD6 |0
+<U8907> \xCA\xA3 |0
+<U890A> \xEA\xEF |0
+<U890C> \xEA\xEE |0
+<U890D> \x8F\xDC\xD7 |0
+<U890E> \x8F\xDC\xD8 |0
+<U890F> \x8F\xDC\xD9 |0
+<U8910> \xB3\xEC |0
+<U8912> \xCB\xAB |0
+<U8913> \xEA\xF0 |0
+<U8915> \x8F\xDC\xDA |0
+<U8916> \x8F\xDC\xDB |0
+<U8918> \x8F\xDC\xDC |0
+<U8919> \x8F\xDC\xDD |0
+<U891A> \x8F\xDC\xDE |0
+<U891C> \x8F\xDC\xDF |3
+<U891C> \xF9\xA2 |0
+<U891D> \xEA\xFC |0
+<U891E> \xEA\xF2 |0
+<U8920> \x8F\xDC\xE0 |0
+<U8925> \xEA\xF3 |0
+<U8926> \x8F\xDC\xE1 |0
+<U8927> \x8F\xDC\xE2 |0
+<U8928> \x8F\xDC\xE3 |0
+<U892A> \xEA\xF4 |0
+<U892B> \xEA\xF5 |0
+<U8930> \x8F\xDC\xE4 |0
+<U8931> \x8F\xDC\xE5 |0
+<U8932> \x8F\xDC\xE6 |0
+<U8935> \x8F\xDC\xE7 |0
+<U8936> \xEA\xF9 |0
+<U8938> \xEA\xFA |0
+<U8939> \x8F\xDC\xE8 |0
+<U893A> \x8F\xDC\xE9 |0
+<U893B> \xEA\xF8 |0
+<U893E> \x8F\xDC\xEA |0
+<U8940> \x8F\xDC\xEB |0
+<U8941> \xEA\xF6 |0
+<U8942> \x8F\xDC\xEC |0
+<U8943> \xEA\xF1 |0
+<U8944> \xEA\xF7 |0
+<U8945> \x8F\xDC\xED |0
+<U8946> \x8F\xDC\xEE |0
+<U8949> \x8F\xDC\xEF |0
+<U894C> \xEA\xFB |0
+<U894D> \xF0\xB7 |0
+<U894F> \x8F\xDC\xF0 |0
+<U8952> \x8F\xDC\xF1 |0
+<U8956> \xB2\xA8 |0
+<U8957> \x8F\xDC\xF2 |0
+<U895A> \x8F\xDC\xF3 |0
+<U895B> \x8F\xDC\xF4 |0
+<U895C> \x8F\xDC\xF5 |0
+<U895E> \xEA\xFE |0
+<U895F> \xB6\xDF |0
+<U8960> \xEA\xFD |0
+<U8961> \x8F\xDC\xF6 |0
+<U8962> \x8F\xDC\xF7 |0
+<U8963> \x8F\xDC\xF8 |0
+<U8964> \xEB\xA2 |0
+<U8966> \xEB\xA1 |0
+<U896A> \xEB\xA4 |0
+<U896B> \x8F\xDC\xF9 |0
+<U896D> \xEB\xA3 |0
+<U896E> \x8F\xDC\xFA |0
+<U896F> \xEB\xA5 |0
+<U8970> \x8F\xDC\xFB |0
+<U8972> \xBD\xB1 |0
+<U8973> \x8F\xDC\xFC |0
+<U8974> \xEB\xA6 |0
+<U8975> \x8F\xDC\xFD |0
+<U8977> \xEB\xA7 |0
+<U897A> \x8F\xDC\xFE |0
+<U897B> \x8F\xDD\xA1 |0
+<U897C> \x8F\xDD\xA2 |0
+<U897D> \x8F\xDD\xA3 |0
+<U897E> \xEB\xA8 |0
+<U897F> \xC0\xBE |0
+<U8981> \xCD\xD7 |0
+<U8983> \xEB\xA9 |0
+<U8986> \xCA\xA4 |0
+<U8987> \xC7\xC6 |0
+<U8988> \xEB\xAA |0
+<U8989> \x8F\xDD\xA4 |0
+<U898A> \xEB\xAB |0
+<U898B> \xB8\xAB |0
+<U898D> \x8F\xDD\xA5 |0
+<U898F> \xB5\xAC |0
+<U8990> \x8F\xDD\xA6 |0
+<U8993> \xEB\xAC |0
+<U8994> \x8F\xDD\xA7 |0
+<U8995> \x8F\xDD\xA8 |0
+<U8996> \xBB\xEB |0
+<U8997> \xC7\xC1 |0
+<U8998> \xEB\xAD |0
+<U899A> \xB3\xD0 |0
+<U899B> \x8F\xDD\xA9 |0
+<U899C> \x8F\xDD\xAA |0
+<U899F> \x8F\xDD\xAB |0
+<U89A0> \x8F\xDD\xAC |0
+<U89A1> \xEB\xAE |0
+<U89A5> \x8F\xDD\xAD |0
+<U89A6> \xEB\xB0 |0
+<U89A7> \xCD\xF7 |0
+<U89A9> \xEB\xAF |0
+<U89AA> \xBF\xC6 |0
+<U89AC> \xEB\xB1 |0
+<U89AF> \xEB\xB2 |0
+<U89B0> \x8F\xDD\xAE |0
+<U89B2> \xEB\xB3 |0
+<U89B3> \xB4\xD1 |0
+<U89B4> \x8F\xDD\xAF |0
+<U89B5> \x8F\xDD\xB0 |0
+<U89B6> \x8F\xDD\xB1 |0
+<U89B7> \x8F\xDD\xB2 |0
+<U89BA> \xEB\xB4 |0
+<U89BC> \x8F\xDD\xB3 |0
+<U89BD> \xEB\xB5 |0
+<U89BF> \xEB\xB6 |0
+<U89C0> \xEB\xB7 |0
+<U89D2> \xB3\xD1 |0
+<U89D4> \x8F\xDD\xB4 |0
+<U89D5> \x8F\xDD\xB5 |0
+<U89D6> \x8F\xDD\xB6 |0
+<U89D7> \x8F\xDD\xB7 |0
+<U89D8> \x8F\xDD\xB8 |0
+<U89DA> \xEB\xB8 |0
+<U89DC> \xEB\xB9 |0
+<U89DD> \xEB\xBA |0
+<U89E3> \xB2\xF2 |0
+<U89E5> \x8F\xDD\xB9 |0
+<U89E6> \xBF\xA8 |0
+<U89E7> \xEB\xBB |0
+<U89E9> \x8F\xDD\xBA |0
+<U89EB> \x8F\xDD\xBB |0
+<U89ED> \x8F\xDD\xBC |0
+<U89F1> \x8F\xDD\xBD |0
+<U89F3> \x8F\xDD\xBE |0
+<U89F4> \xEB\xBC |0
+<U89F6> \x8F\xDD\xBF |0
+<U89F8> \xEB\xBD |0
+<U89F9> \x8F\xDD\xC0 |0
+<U89FD> \x8F\xDD\xC1 |0
+<U89FF> \x8F\xDD\xC2 |0
+<U8A00> \xB8\xC0 |0
+<U8A02> \xC4\xFB |0
+<U8A03> \xEB\xBE |0
+<U8A04> \x8F\xDD\xC3 |0
+<U8A05> \x8F\xDD\xC4 |0
+<U8A07> \x8F\xDD\xC5 |0
+<U8A08> \xB7\xD7 |0
+<U8A0A> \xBF\xD6 |0
+<U8A0C> \xEB\xC1 |0
+<U8A0E> \xC6\xA4 |0
+<U8A0F> \x8F\xDD\xC6 |0
+<U8A10> \xEB\xC0 |0
+<U8A11> \x8F\xDD\xC7 |0
+<U8A12> \x8F\xDD\xC8 |3
+<U8A12> \xFB\xE7 |0
+<U8A13> \xB7\xB1 |0
+<U8A14> \x8F\xDD\xC9 |0
+<U8A15> \x8F\xDD\xCA |0
+<U8A16> \xEB\xBF |0
+<U8A17> \xC2\xF7 |0
+<U8A18> \xB5\xAD |0
+<U8A1B> \xEB\xC2 |0
+<U8A1D> \xEB\xC3 |0
+<U8A1E> \x8F\xDD\xCB |0
+<U8A1F> \xBE\xD9 |0
+<U8A20> \x8F\xDD\xCC |0
+<U8A22> \x8F\xDD\xCD |0
+<U8A23> \xB7\xED |0
+<U8A24> \x8F\xDD\xCE |0
+<U8A25> \xEB\xC4 |0
+<U8A26> \x8F\xDD\xCF |0
+<U8A2A> \xCB\xAC |0
+<U8A2B> \x8F\xDD\xD0 |0
+<U8A2C> \x8F\xDD\xD1 |0
+<U8A2D> \xC0\xDF |0
+<U8A2F> \x8F\xDD\xD2 |0
+<U8A31> \xB5\xF6 |0
+<U8A33> \xCC\xF5 |0
+<U8A34> \xC1\xCA |0
+<U8A35> \x8F\xDD\xD3 |0
+<U8A36> \xEB\xC5 |0
+<U8A37> \x8F\xDD\xD4 |3
+<U8A37> \xFB\xE8 |0
+<U8A3A> \xBF\xC7 |0
+<U8A3B> \xC3\xF0 |0
+<U8A3C> \xBE\xDA |0
+<U8A3D> \x8F\xDD\xD5 |0
+<U8A3E> \x8F\xDD\xD6 |0
+<U8A40> \x8F\xDD\xD7 |0
+<U8A41> \xEB\xC6 |0
+<U8A43> \x8F\xDD\xD8 |0
+<U8A45> \x8F\xDD\xD9 |0
+<U8A46> \xEB\xC9 |0
+<U8A47> \x8F\xDD\xDA |0
+<U8A48> \xEB\xCA |0
+<U8A49> \x8F\xDD\xDB |0
+<U8A4D> \x8F\xDD\xDC |0
+<U8A4E> \x8F\xDD\xDD |0
+<U8A50> \xBA\xBE |0
+<U8A51> \xC2\xC2 |0
+<U8A52> \xEB\xC8 |0
+<U8A53> \x8F\xDD\xDE |0
+<U8A54> \xBE\xDB |0
+<U8A55> \xC9\xBE |0
+<U8A56> \x8F\xDD\xDF |0
+<U8A57> \x8F\xDD\xE0 |0
+<U8A58> \x8F\xDD\xE1 |0
+<U8A5B> \xEB\xC7 |0
+<U8A5C> \x8F\xDD\xE2 |0
+<U8A5D> \x8F\xDD\xE3 |0
+<U8A5E> \xBB\xEC |0
+<U8A60> \xB1\xD3 |0
+<U8A61> \x8F\xDD\xE4 |0
+<U8A62> \xEB\xCE |0
+<U8A63> \xB7\xD8 |0
+<U8A65> \x8F\xDD\xE5 |0
+<U8A66> \xBB\xEE |0
+<U8A67> \x8F\xDD\xE6 |0
+<U8A69> \xBB\xED |0
+<U8A6B> \xCF\xCD |0
+<U8A6C> \xEB\xCD |0
+<U8A6D> \xEB\xCC |0
+<U8A6E> \xC1\xA7 |0
+<U8A70> \xB5\xCD |0
+<U8A71> \xCF\xC3 |0
+<U8A72> \xB3\xBA |0
+<U8A73> \xBE\xDC |0
+<U8A75> \x8F\xDD\xE7 |0
+<U8A76> \x8F\xDD\xE8 |0
+<U8A77> \x8F\xDD\xE9 |0
+<U8A79> \x8F\xDD\xEA |3
+<U8A79> \xFB\xE9 |0
+<U8A7A> \x8F\xDD\xEB |0
+<U8A7B> \x8F\xDD\xEC |0
+<U8A7C> \xEB\xCB |0
+<U8A7E> \x8F\xDD\xED |0
+<U8A7F> \x8F\xDD\xEE |0
+<U8A80> \x8F\xDD\xEF |0
+<U8A82> \xEB\xD0 |0
+<U8A83> \x8F\xDD\xF0 |0
+<U8A84> \xEB\xD1 |0
+<U8A85> \xEB\xCF |0
+<U8A86> \x8F\xDD\xF1 |0
+<U8A87> \xB8\xD8 |0
+<U8A89> \xCD\xC0 |0
+<U8A8B> \x8F\xDD\xF2 |0
+<U8A8C> \xBB\xEF |0
+<U8A8D> \xC7\xA7 |0
+<U8A8F> \x8F\xDD\xF3 |0
+<U8A90> \x8F\xDD\xF4 |0
+<U8A91> \xEB\xD4 |0
+<U8A92> \x8F\xDD\xF5 |0
+<U8A93> \xC0\xC0 |0
+<U8A95> \xC3\xC2 |0
+<U8A96> \x8F\xDD\xF6 |0
+<U8A97> \x8F\xDD\xF7 |0
+<U8A98> \xCD\xB6 |0
+<U8A99> \x8F\xDD\xF8 |0
+<U8A9A> \xEB\xD7 |0
+<U8A9E> \xB8\xEC |0
+<U8A9F> \x8F\xDD\xF9 |0
+<U8AA0> \xC0\xBF |0
+<U8AA1> \xEB\xD3 |0
+<U8AA3> \xEB\xD8 |0
+<U8AA4> \xB8\xED |0
+<U8AA5> \xEB\xD5 |0
+<U8AA6> \xEB\xD6 |0
+<U8AA7> \x8F\xDD\xFA |3
+<U8AA7> \xFB\xEA |0
+<U8AA8> \xEB\xD2 |0
+<U8AA9> \x8F\xDD\xFB |0
+<U8AAC> \xC0\xE2 |0
+<U8AAD> \xC6\xC9 |0
+<U8AAE> \x8F\xDD\xFC |0
+<U8AAF> \x8F\xDD\xFD |0
+<U8AB0> \xC3\xAF |0
+<U8AB2> \xB2\xDD |0
+<U8AB3> \x8F\xDD\xFE |0
+<U8AB6> \x8F\xDE\xA1 |0
+<U8AB7> \x8F\xDE\xA2 |0
+<U8AB9> \xC8\xF0 |0
+<U8ABB> \x8F\xDE\xA3 |0
+<U8ABC> \xB5\xC3 |0
+<U8ABE> \x8F\xDE\xA4 |3
+<U8ABE> \xFB\xEB |0
+<U8ABF> \xC4\xB4 |0
+<U8AC2> \xEB\xDB |0
+<U8AC3> \x8F\xDE\xA5 |0
+<U8AC4> \xEB\xD9 |0
+<U8AC6> \x8F\xDE\xA6 |0
+<U8AC7> \xC3\xCC |0
+<U8AC8> \x8F\xDE\xA7 |0
+<U8AC9> \x8F\xDE\xA8 |0
+<U8ACA> \x8F\xDE\xA9 |0
+<U8ACB> \xC0\xC1 |0
+<U8ACC> \xB4\xD2 |0
+<U8ACD> \xEB\xDA |0
+<U8ACF> \xBF\xDB |0
+<U8AD1> \x8F\xDE\xAA |0
+<U8AD2> \xCE\xCA |0
+<U8AD3> \x8F\xDE\xAB |0
+<U8AD4> \x8F\xDE\xAC |0
+<U8AD5> \x8F\xDE\xAD |0
+<U8AD6> \xCF\xC0 |0
+<U8AD7> \x8F\xDE\xAE |0
+<U8ADA> \xEB\xDC |0
+<U8ADB> \xEB\xE7 |0
+<U8ADC> \xC4\xB5 |0
+<U8ADD> \x8F\xDE\xAF |0
+<U8ADE> \xEB\xE6 |0
+<U8ADF> \x8F\xDE\xB0 |3
+<U8ADF> \xFB\xEC |0
+<U8AE0> \xEB\xE3 |0
+<U8AE1> \xEB\xEB |0
+<U8AE2> \xEB\xE4 |0
+<U8AE4> \xEB\xE0 |0
+<U8AE6> \xC4\xFC |0
+<U8AE7> \xEB\xDF |0
+<U8AEB> \xEB\xDD |0
+<U8AEC> \x8F\xDE\xB1 |0
+<U8AED> \xCD\xA1 |0
+<U8AEE> \xBB\xF0 |0
+<U8AF0> \x8F\xDE\xB2 |0
+<U8AF1> \xEB\xE1 |0
+<U8AF3> \xEB\xDE |0
+<U8AF4> \x8F\xDE\xB3 |0
+<U8AF5> \x8F\xDE\xB4 |0
+<U8AF6> \x8F\xDE\xB5 |3
+<U8AF6> \xFB\xEE |0
+<U8AF7> \xEB\xE5 |0
+<U8AF8> \xBD\xF4 |0
+<U8AFA> \xB8\xC1 |0
+<U8AFC> \x8F\xDE\xB6 |0
+<U8AFE> \xC2\xFA |0
+<U8AFF> \x8F\xDE\xB7 |0
+<U8B00> \xCB\xC5 |0
+<U8B01> \xB1\xDA |0
+<U8B02> \xB0\xE2 |0
+<U8B04> \xC6\xA5 |0
+<U8B05> \x8F\xDE\xB8 |0
+<U8B06> \x8F\xDE\xB9 |0
+<U8B07> \xEB\xE9 |0
+<U8B0A> \x8F\xDE\xBF |0
+<U8B0B> \x8F\xDE\xBA |0
+<U8B0C> \xEB\xE8 |0
+<U8B0E> \xC6\xE6 |0
+<U8B10> \xEB\xED |0
+<U8B11> \x8F\xDE\xBB |0
+<U8B14> \xEB\xE2 |0
+<U8B16> \xEB\xEC |0
+<U8B17> \xEB\xEE |0
+<U8B19> \xB8\xAC |0
+<U8B1A> \xEB\xEA |0
+<U8B1B> \xB9\xD6 |0
+<U8B1C> \x8F\xDE\xBC |0
+<U8B1D> \xBC\xD5 |0
+<U8B1E> \x8F\xDE\xBD |0
+<U8B1F> \x8F\xDE\xBE |0
+<U8B20> \xEB\xEF |0
+<U8B21> \xCD\xD8 |0
+<U8B26> \xEB\xF2 |0
+<U8B28> \xEB\xF5 |0
+<U8B2B> \xEB\xF3 |0
+<U8B2C> \xC9\xB5 |0
+<U8B2D> \x8F\xDE\xC0 |0
+<U8B30> \x8F\xDE\xC1 |0
+<U8B33> \xEB\xF0 |0
+<U8B37> \x8F\xDE\xC2 |0
+<U8B39> \xB6\xE0 |0
+<U8B3C> \x8F\xDE\xC3 |0
+<U8B3E> \xEB\xF4 |0
+<U8B41> \xEB\xF6 |0
+<U8B42> \x8F\xDE\xC4 |0
+<U8B43> \x8F\xDE\xC5 |0
+<U8B44> \x8F\xDE\xC6 |0
+<U8B45> \x8F\xDE\xC7 |0
+<U8B46> \x8F\xDE\xC8 |0
+<U8B48> \x8F\xDE\xC9 |0
+<U8B49> \xEB\xFA |0
+<U8B4C> \xEB\xF7 |0
+<U8B4D> \x8F\xDE\xCE |0
+<U8B4E> \xEB\xF9 |0
+<U8B4F> \xEB\xF8 |0
+<U8B52> \x8F\xDE\xCA |0
+<U8B53> \x8F\xDE\xCB |3
+<U8B53> \xFB\xEF |0
+<U8B54> \x8F\xDE\xCC |0
+<U8B56> \xEB\xFB |0
+<U8B58> \xBC\xB1 |0
+<U8B59> \x8F\xDE\xCD |0
+<U8B5A> \xEB\xFD |0
+<U8B5B> \xEB\xFC |0
+<U8B5C> \xC9\xE8 |0
+<U8B5E> \x8F\xDE\xCF |0
+<U8B5F> \xEC\xA1 |0
+<U8B63> \x8F\xDE\xD0 |0
+<U8B66> \xB7\xD9 |0
+<U8B6B> \xEB\xFE |0
+<U8B6C> \xEC\xA2 |0
+<U8B6D> \x8F\xDE\xD1 |0
+<U8B6F> \xEC\xA3 |0
+<U8B70> \xB5\xC4 |0
+<U8B71> \xE6\xC1 |0
+<U8B72> \xBE\xF9 |0
+<U8B74> \xEC\xA4 |0
+<U8B76> \x8F\xDE\xD2 |0
+<U8B77> \xB8\xEE |0
+<U8B78> \x8F\xDE\xD3 |0
+<U8B79> \x8F\xDE\xD4 |0
+<U8B7C> \x8F\xDE\xD5 |0
+<U8B7D> \xEC\xA5 |0
+<U8B7E> \x8F\xDE\xD6 |0
+<U8B7F> \xFB\xF0 |0
+<U8B80> \xEC\xA6 |0
+<U8B81> \x8F\xDE\xD7 |0
+<U8B83> \xBB\xBE |0
+<U8B84> \x8F\xDE\xD8 |0
+<U8B85> \x8F\xDE\xD9 |0
+<U8B8A> \xDA\xCE |0
+<U8B8B> \x8F\xDE\xDA |0
+<U8B8C> \xEC\xA7 |0
+<U8B8D> \x8F\xDE\xDB |0
+<U8B8E> \xEC\xA8 |0
+<U8B8F> \x8F\xDE\xDC |0
+<U8B90> \xBD\xB2 |0
+<U8B92> \xEC\xA9 |0
+<U8B93> \xEC\xAA |0
+<U8B94> \x8F\xDE\xDD |0
+<U8B95> \x8F\xDE\xDE |0
+<U8B96> \xEC\xAB |0
+<U8B99> \xEC\xAC |0
+<U8B9A> \xEC\xAD |0
+<U8B9C> \x8F\xDE\xDF |0
+<U8B9E> \x8F\xDE\xE0 |0
+<U8B9F> \x8F\xDE\xE1 |0
+<U8C37> \xC3\xAB |0
+<U8C38> \x8F\xDE\xE2 |0
+<U8C39> \x8F\xDE\xE3 |0
+<U8C3A> \xEC\xAE |0
+<U8C3D> \x8F\xDE\xE4 |0
+<U8C3E> \x8F\xDE\xE5 |0
+<U8C3F> \xEC\xB0 |0
+<U8C41> \xEC\xAF |0
+<U8C45> \x8F\xDE\xE6 |0
+<U8C46> \xC6\xA6 |0
+<U8C47> \x8F\xDE\xE7 |0
+<U8C48> \xEC\xB1 |0
+<U8C49> \x8F\xDE\xE8 |0
+<U8C4A> \xCB\xAD |0
+<U8C4B> \x8F\xDE\xE9 |0
+<U8C4C> \xEC\xB2 |0
+<U8C4E> \xEC\xB3 |0
+<U8C4F> \x8F\xDE\xEA |0
+<U8C50> \xEC\xB4 |0
+<U8C51> \x8F\xDE\xEB |0
+<U8C53> \x8F\xDE\xEC |0
+<U8C54> \x8F\xDE\xED |0
+<U8C55> \xEC\xB5 |0
+<U8C57> \x8F\xDE\xEE |0
+<U8C58> \x8F\xDE\xEF |0
+<U8C59> \x8F\xDE\xF2 |0
+<U8C5A> \xC6\xDA |0
+<U8C5B> \x8F\xDE\xF0 |0
+<U8C5D> \x8F\xDE\xF1 |0
+<U8C61> \xBE\xDD |0
+<U8C62> \xEC\xB6 |0
+<U8C63> \x8F\xDE\xF3 |0
+<U8C64> \x8F\xDE\xF4 |0
+<U8C66> \x8F\xDE\xF5 |0
+<U8C68> \x8F\xDE\xF6 |0
+<U8C69> \x8F\xDE\xF7 |0
+<U8C6A> \xB9\xEB |0
+<U8C6B> \xD0\xAE |0
+<U8C6C> \xEC\xB7 |0
+<U8C6D> \x8F\xDE\xF8 |0
+<U8C73> \x8F\xDE\xF9 |0
+<U8C75> \x8F\xDE\xFA |0
+<U8C76> \x8F\xDE\xFB |0
+<U8C78> \xEC\xB8 |0
+<U8C79> \xC9\xBF |0
+<U8C7A> \xEC\xB9 |0
+<U8C7B> \x8F\xDE\xFC |0
+<U8C7C> \xEC\xC1 |0
+<U8C7E> \x8F\xDE\xFD |0
+<U8C82> \xEC\xBA |0
+<U8C85> \xEC\xBC |0
+<U8C86> \x8F\xDE\xFE |0
+<U8C87> \x8F\xDF\xA1 |0
+<U8C89> \xEC\xBB |0
+<U8C8A> \xEC\xBD |0
+<U8C8B> \x8F\xDF\xA2 |0
+<U8C8C> \xCB\xC6 |0
+<U8C8D> \xEC\xBE |0
+<U8C8E> \xEC\xBF |0
+<U8C90> \x8F\xDF\xA3 |0
+<U8C92> \x8F\xDF\xA4 |0
+<U8C93> \x8F\xDF\xA5 |0
+<U8C94> \xEC\xC0 |0
+<U8C98> \xEC\xC2 |0
+<U8C99> \x8F\xDF\xA6 |0
+<U8C9B> \x8F\xDF\xA7 |0
+<U8C9C> \x8F\xDF\xA8 |0
+<U8C9D> \xB3\xAD |0
+<U8C9E> \xC4\xE7 |0
+<U8CA0> \xC9\xE9 |0
+<U8CA1> \xBA\xE2 |0
+<U8CA2> \xB9\xD7 |0
+<U8CA4> \x8F\xDF\xA9 |0
+<U8CA7> \xC9\xCF |0
+<U8CA8> \xB2\xDF |0
+<U8CA9> \xC8\xCE |0
+<U8CAA> \xEC\xC5 |0
+<U8CAB> \xB4\xD3 |0
+<U8CAC> \xC0\xD5 |0
+<U8CAD> \xEC\xC4 |0
+<U8CAE> \xEC\xC9 |0
+<U8CAF> \xC3\xF9 |0
+<U8CB0> \xCC\xE3 |0
+<U8CB2> \xEC\xC7 |0
+<U8CB3> \xEC\xC8 |0
+<U8CB4> \xB5\xAE |0
+<U8CB6> \xEC\xCA |0
+<U8CB7> \xC7\xE3 |0
+<U8CB8> \xC2\xDF |0
+<U8CB9> \x8F\xDF\xAA |0
+<U8CBA> \x8F\xDF\xAB |0
+<U8CBB> \xC8\xF1 |0
+<U8CBC> \xC5\xBD |0
+<U8CBD> \xEC\xC6 |0
+<U8CBF> \xCB\xC7 |0
+<U8CC0> \xB2\xEC |0
+<U8CC1> \xEC\xCC |0
+<U8CC2> \xCF\xA8 |0
+<U8CC3> \xC4\xC2 |0
+<U8CC4> \xCF\xC5 |0
+<U8CC5> \x8F\xDF\xAC |0
+<U8CC6> \x8F\xDF\xAD |0
+<U8CC7> \xBB\xF1 |0
+<U8CC8> \xEC\xCB |0
+<U8CC9> \x8F\xDF\xAE |0
+<U8CCA> \xC2\xB1 |0
+<U8CCB> \x8F\xDF\xAF |0
+<U8CCD> \xEC\xDC |0
+<U8CCE> \xC1\xA8 |0
+<U8CCF> \x8F\xDF\xB0 |0
+<U8CD1> \xC6\xF8 |0
+<U8CD3> \xC9\xD0 |0
+<U8CD5> \x8F\xDF\xB2 |0
+<U8CD6> \x8F\xDF\xB1 |0
+<U8CD9> \x8F\xDF\xB3 |0
+<U8CDA> \xEC\xCF |0
+<U8CDB> \xBB\xBF |0
+<U8CDC> \xBB\xF2 |0
+<U8CDD> \x8F\xDF\xB4 |0
+<U8CDE> \xBE\xDE |0
+<U8CE0> \xC7\xE5 |0
+<U8CE1> \x8F\xDF\xB5 |0
+<U8CE2> \xB8\xAD |0
+<U8CE3> \xEC\xCE |0
+<U8CE4> \xEC\xCD |0
+<U8CE6> \xC9\xEA |0
+<U8CE8> \x8F\xDF\xB6 |0
+<U8CEA> \xBC\xC1 |0
+<U8CEC> \x8F\xDF\xB7 |0
+<U8CED> \xC5\xD2 |0
+<U8CEF> \x8F\xDF\xB8 |0
+<U8CF0> \x8F\xDF\xB9 |3
+<U8CF0> \xFB\xF1 |0
+<U8CF2> \x8F\xDF\xBA |0
+<U8CF4> \xFB\xF2 |0
+<U8CF5> \x8F\xDF\xBB |0
+<U8CF7> \x8F\xDF\xBC |0
+<U8CF8> \x8F\xDF\xBD |0
+<U8CFA> \xEC\xD1 |0
+<U8CFB> \xEC\xD2 |0
+<U8CFC> \xB9\xD8 |0
+<U8CFD> \xEC\xD0 |0
+<U8CFE> \x8F\xDF\xBE |0
+<U8CFF> \x8F\xDF\xBF |0
+<U8D01> \x8F\xDF\xC0 |0
+<U8D03> \x8F\xDF\xC1 |0
+<U8D04> \xEC\xD3 |0
+<U8D05> \xEC\xD4 |0
+<U8D07> \xEC\xD6 |0
+<U8D08> \xC2\xA3 |0
+<U8D09> \x8F\xDF\xC2 |0
+<U8D0A> \xEC\xD5 |0
+<U8D0B> \xB4\xE6 |0
+<U8D0D> \xEC\xD8 |0
+<U8D0F> \xEC\xD7 |0
+<U8D10> \xEC\xD9 |0
+<U8D12> \x8F\xDF\xC3 |3
+<U8D12> \xFB\xF3 |0
+<U8D13> \xEC\xDB |0
+<U8D14> \xEC\xDD |0
+<U8D16> \xEC\xDE |0
+<U8D17> \x8F\xDF\xC4 |0
+<U8D1B> \x8F\xDF\xC5 |0
+<U8D64> \xC0\xD6 |0
+<U8D65> \x8F\xDF\xC6 |0
+<U8D66> \xBC\xCF |0
+<U8D67> \xEC\xDF |0
+<U8D69> \x8F\xDF\xC7 |0
+<U8D6B> \xB3\xD2 |0
+<U8D6C> \x8F\xDF\xC8 |0
+<U8D6D> \xEC\xE0 |0
+<U8D6E> \x8F\xDF\xC9 |0
+<U8D70> \xC1\xF6 |0
+<U8D71> \xEC\xE1 |0
+<U8D73> \xEC\xE2 |0
+<U8D74> \xC9\xEB |0
+<U8D76> \xFB\xF4 |0
+<U8D77> \xB5\xAF |0
+<U8D7F> \x8F\xDF\xCA |0
+<U8D81> \xEC\xE3 |0
+<U8D82> \x8F\xDF\xCB |0
+<U8D84> \x8F\xDF\xCC |0
+<U8D85> \xC4\xB6 |0
+<U8D88> \x8F\xDF\xCD |0
+<U8D8A> \xB1\xDB |0
+<U8D8D> \x8F\xDF\xCE |0
+<U8D90> \x8F\xDF\xCF |0
+<U8D91> \x8F\xDF\xD0 |0
+<U8D95> \x8F\xDF\xD1 |0
+<U8D99> \xEC\xE4 |0
+<U8D9E> \x8F\xDF\xD2 |0
+<U8D9F> \x8F\xDF\xD3 |0
+<U8DA0> \x8F\xDF\xD4 |0
+<U8DA3> \xBC\xF1 |0
+<U8DA6> \x8F\xDF\xD5 |0
+<U8DA8> \xBF\xF6 |0
+<U8DAB> \x8F\xDF\xD6 |0
+<U8DAC> \x8F\xDF\xD7 |0
+<U8DAF> \x8F\xDF\xD8 |0
+<U8DB2> \x8F\xDF\xD9 |0
+<U8DB3> \xC2\xAD |0
+<U8DB5> \x8F\xDF\xDA |0
+<U8DB7> \x8F\xDF\xDB |0
+<U8DB9> \x8F\xDF\xDC |0
+<U8DBA> \xEC\xE7 |0
+<U8DBB> \x8F\xDF\xDD |0
+<U8DBC> \x8F\xDF\xEF |0
+<U8DBE> \xEC\xE6 |0
+<U8DC0> \x8F\xDF\xDE |0
+<U8DC2> \xEC\xE5 |0
+<U8DC5> \x8F\xDF\xDF |0
+<U8DC6> \x8F\xDF\xE0 |0
+<U8DC7> \x8F\xDF\xE1 |0
+<U8DC8> \x8F\xDF\xE2 |0
+<U8DCA> \x8F\xDF\xE3 |0
+<U8DCB> \xEC\xED |0
+<U8DCC> \xEC\xEB |0
+<U8DCE> \x8F\xDF\xE4 |0
+<U8DCF> \xEC\xE8 |0
+<U8DD1> \x8F\xDF\xE5 |0
+<U8DD4> \x8F\xDF\xE6 |0
+<U8DD5> \x8F\xDF\xE7 |0
+<U8DD6> \xEC\xEA |0
+<U8DD7> \x8F\xDF\xE8 |0
+<U8DD9> \x8F\xDF\xE9 |0
+<U8DDA> \xEC\xE9 |0
+<U8DDB> \xEC\xEC |0
+<U8DDD> \xB5\xF7 |0
+<U8DDF> \xEC\xF0 |0
+<U8DE1> \xC0\xD7 |0
+<U8DE3> \xEC\xF1 |0
+<U8DE4> \x8F\xDF\xEA |0
+<U8DE5> \x8F\xDF\xEB |0
+<U8DE7> \x8F\xDF\xEC |0
+<U8DE8> \xB8\xD9 |0
+<U8DEA> \xEC\xEE |0
+<U8DEB> \xEC\xEF |0
+<U8DEC> \x8F\xDF\xED |0
+<U8DEF> \xCF\xA9 |0
+<U8DF0> \x8F\xDF\xEE |0
+<U8DF1> \x8F\xDF\xF0 |0
+<U8DF2> \x8F\xDF\xF1 |0
+<U8DF3> \xC4\xB7 |0
+<U8DF4> \x8F\xDF\xF2 |0
+<U8DF5> \xC1\xA9 |0
+<U8DFC> \xEC\xF2 |0
+<U8DFD> \x8F\xDF\xF3 |0
+<U8DFF> \xEC\xF5 |0
+<U8E01> \x8F\xDF\xF4 |0
+<U8E04> \x8F\xDF\xF5 |0
+<U8E05> \x8F\xDF\xF6 |0
+<U8E06> \x8F\xDF\xF7 |0
+<U8E08> \xEC\xF3 |0
+<U8E09> \xEC\xF4 |0
+<U8E0A> \xCD\xD9 |0
+<U8E0B> \x8F\xDF\xF8 |0
+<U8E0F> \xC6\xA7 |0
+<U8E10> \xEC\xF8 |0
+<U8E11> \x8F\xDF\xF9 |0
+<U8E14> \x8F\xDF\xFA |0
+<U8E16> \x8F\xDF\xFB |0
+<U8E1D> \xEC\xF6 |0
+<U8E1E> \xEC\xF7 |0
+<U8E1F> \xEC\xF9 |0
+<U8E20> \x8F\xDF\xFC |0
+<U8E21> \x8F\xDF\xFD |0
+<U8E22> \x8F\xDF\xFE |0
+<U8E23> \x8F\xE0\xA1 |0
+<U8E26> \x8F\xE0\xA2 |0
+<U8E27> \x8F\xE0\xA3 |0
+<U8E2A> \xED\xA9 |0
+<U8E30> \xEC\xFC |0
+<U8E31> \x8F\xE0\xA4 |0
+<U8E33> \x8F\xE0\xA5 |0
+<U8E34> \xEC\xFD |0
+<U8E35> \xEC\xFB |0
+<U8E36> \x8F\xE0\xA6 |0
+<U8E37> \x8F\xE0\xA7 |0
+<U8E38> \x8F\xE0\xA8 |0
+<U8E39> \x8F\xE0\xA9 |0
+<U8E3D> \x8F\xE0\xAA |0
+<U8E40> \x8F\xE0\xAB |0
+<U8E41> \x8F\xE0\xAC |0
+<U8E42> \xEC\xFA |0
+<U8E44> \xC4\xFD |0
+<U8E47> \xED\xA1 |0
+<U8E48> \xED\xA5 |0
+<U8E49> \xED\xA2 |0
+<U8E4A> \xEC\xFE |0
+<U8E4B> \x8F\xE0\xAD |0
+<U8E4C> \xED\xA3 |0
+<U8E4D> \x8F\xE0\xAE |0
+<U8E4E> \x8F\xE0\xAF |0
+<U8E4F> \x8F\xE0\xB0 |0
+<U8E50> \xED\xA4 |0
+<U8E54> \x8F\xE0\xB1 |0
+<U8E55> \xED\xAB |0
+<U8E59> \xED\xA6 |0
+<U8E5B> \x8F\xE0\xB2 |0
+<U8E5C> \x8F\xE0\xB3 |0
+<U8E5D> \x8F\xE0\xB4 |0
+<U8E5E> \x8F\xE0\xB5 |0
+<U8E5F> \xC0\xD8 |0
+<U8E60> \xED\xA8 |0
+<U8E61> \x8F\xE0\xB6 |0
+<U8E62> \x8F\xE0\xB7 |0
+<U8E63> \xED\xAA |0
+<U8E64> \xED\xA7 |0
+<U8E69> \x8F\xE0\xB8 |0
+<U8E6C> \x8F\xE0\xB9 |0
+<U8E6D> \x8F\xE0\xBA |0
+<U8E6F> \x8F\xE0\xBB |0
+<U8E70> \x8F\xE0\xBC |0
+<U8E71> \x8F\xE0\xBD |0
+<U8E72> \xED\xAD |0
+<U8E74> \xBD\xB3 |0
+<U8E76> \xED\xAC |0
+<U8E79> \x8F\xE0\xBE |0
+<U8E7A> \x8F\xE0\xBF |0
+<U8E7B> \x8F\xE0\xC0 |0
+<U8E7C> \xED\xAE |0
+<U8E81> \xED\xAF |0
+<U8E82> \x8F\xE0\xC1 |0
+<U8E83> \x8F\xE0\xC2 |0
+<U8E84> \xED\xB2 |0
+<U8E85> \xED\xB1 |0
+<U8E87> \xED\xB0 |0
+<U8E89> \x8F\xE0\xC3 |0
+<U8E8A> \xED\xB4 |0
+<U8E8B> \xED\xB3 |0
+<U8E8D> \xCC\xF6 |0
+<U8E90> \x8F\xE0\xC4 |0
+<U8E91> \xED\xB6 |0
+<U8E92> \x8F\xE0\xC5 |0
+<U8E93> \xED\xB5 |0
+<U8E94> \xED\xB7 |0
+<U8E95> \x8F\xE0\xC6 |0
+<U8E99> \xED\xB8 |0
+<U8E9A> \x8F\xE0\xC7 |0
+<U8E9B> \x8F\xE0\xC8 |0
+<U8E9D> \x8F\xE0\xC9 |0
+<U8E9E> \x8F\xE0\xCA |0
+<U8EA1> \xED\xBA |0
+<U8EA2> \x8F\xE0\xCB |0
+<U8EA7> \x8F\xE0\xCC |0
+<U8EA9> \x8F\xE0\xCD |0
+<U8EAA> \xED\xB9 |0
+<U8EAB> \xBF\xC8 |0
+<U8EAC> \xED\xBB |0
+<U8EAD> \x8F\xE0\xCE |0
+<U8EAE> \x8F\xE0\xCF |0
+<U8EAF> \xB6\xED |0
+<U8EB0> \xED\xBC |0
+<U8EB1> \xED\xBE |0
+<U8EB3> \x8F\xE0\xD0 |0
+<U8EB5> \x8F\xE0\xD1 |0
+<U8EBA> \x8F\xE0\xD2 |0
+<U8EBB> \x8F\xE0\xD3 |0
+<U8EBE> \xED\xBF |0
+<U8EC0> \x8F\xE0\xD4 |0
+<U8EC1> \x8F\xE0\xD5 |0
+<U8EC3> \x8F\xE0\xD6 |0
+<U8EC4> \x8F\xE0\xD7 |0
+<U8EC5> \xED\xC0 |0
+<U8EC6> \xED\xBD |0
+<U8EC7> \x8F\xE0\xD8 |0
+<U8EC8> \xED\xC1 |0
+<U8ECA> \xBC\xD6 |0
+<U8ECB> \xED\xC2 |0
+<U8ECC> \xB5\xB0 |0
+<U8ECD> \xB7\xB3 |0
+<U8ECF> \x8F\xE0\xD9 |3
+<U8ECF> \xFB\xF6 |0
+<U8ED1> \x8F\xE0\xDA |0
+<U8ED2> \xB8\xAE |0
+<U8ED4> \x8F\xE0\xDB |0
+<U8EDB> \xED\xC3 |0
+<U8EDC> \x8F\xE0\xDC |0
+<U8EDF> \xC6\xF0 |0
+<U8EE2> \xC5\xBE |0
+<U8EE3> \xED\xC4 |0
+<U8EE8> \x8F\xE0\xDD |0
+<U8EEB> \xED\xC7 |0
+<U8EED> \x8F\xE0\xE4 |0
+<U8EEE> \x8F\xE0\xDE |0
+<U8EF0> \x8F\xE0\xDF |0
+<U8EF1> \x8F\xE0\xE0 |0
+<U8EF7> \x8F\xE0\xE1 |0
+<U8EF8> \xBC\xB4 |0
+<U8EF9> \x8F\xE0\xE2 |0
+<U8EFA> \x8F\xE0\xE3 |0
+<U8EFB> \xED\xC6 |0
+<U8EFC> \xED\xC5 |0
+<U8EFD> \xB7\xDA |0
+<U8EFE> \xED\xC8 |0
+<U8F00> \x8F\xE0\xE5 |0
+<U8F02> \x8F\xE0\xE6 |0
+<U8F03> \xB3\xD3 |0
+<U8F05> \xED\xCA |0
+<U8F07> \x8F\xE0\xE7 |0
+<U8F08> \x8F\xE0\xE8 |0
+<U8F09> \xBA\xDC |0
+<U8F0A> \xED\xC9 |0
+<U8F0C> \xED\xD2 |0
+<U8F0F> \x8F\xE0\xE9 |0
+<U8F10> \x8F\xE0\xEA |0
+<U8F12> \xED\xCC |0
+<U8F13> \xED\xCE |0
+<U8F14> \xCA\xE5 |0
+<U8F15> \xED\xCB |0
+<U8F16> \x8F\xE0\xEB |0
+<U8F17> \x8F\xE0\xEC |0
+<U8F18> \x8F\xE0\xED |0
+<U8F19> \xED\xCD |0
+<U8F1B> \xED\xD1 |0
+<U8F1C> \xED\xCF |0
+<U8F1D> \xB5\xB1 |0
+<U8F1E> \x8F\xE0\xEE |0
+<U8F1F> \xED\xD0 |0
+<U8F20> \x8F\xE0\xEF |0
+<U8F21> \x8F\xE0\xF0 |0
+<U8F23> \x8F\xE0\xF1 |0
+<U8F25> \x8F\xE0\xF2 |0
+<U8F26> \xED\xD3 |0
+<U8F27> \x8F\xE0\xF3 |0
+<U8F28> \x8F\xE0\xF4 |0
+<U8F29> \xC7\xDA |0
+<U8F2A> \xCE\xD8 |0
+<U8F2C> \x8F\xE0\xF5 |0
+<U8F2D> \x8F\xE0\xF6 |0
+<U8F2E> \x8F\xE0\xF7 |0
+<U8F2F> \xBD\xB4 |0
+<U8F33> \xED\xD4 |0
+<U8F34> \x8F\xE0\xF8 |0
+<U8F35> \x8F\xE0\xF9 |0
+<U8F36> \x8F\xE0\xFA |0
+<U8F37> \x8F\xE0\xFB |0
+<U8F38> \xCD\xA2 |0
+<U8F39> \xED\xD6 |0
+<U8F3A> \x8F\xE0\xFC |0
+<U8F3B> \xED\xD5 |0
+<U8F3E> \xED\xD9 |0
+<U8F3F> \xCD\xC1 |0
+<U8F40> \x8F\xE0\xFD |0
+<U8F41> \x8F\xE0\xFE |0
+<U8F42> \xED\xD8 |0
+<U8F43> \x8F\xE1\xA1 |0
+<U8F44> \xB3\xED |0
+<U8F45> \xED\xD7 |0
+<U8F46> \xED\xDC |0
+<U8F47> \x8F\xE1\xA2 |0
+<U8F49> \xED\xDB |0
+<U8F4C> \xED\xDA |0
+<U8F4D> \xC5\xB2 |0
+<U8F4E> \xED\xDD |0
+<U8F4F> \x8F\xE1\xA3 |0
+<U8F51> \x8F\xE1\xA4 |0
+<U8F52> \x8F\xE1\xA5 |0
+<U8F53> \x8F\xE1\xA6 |0
+<U8F54> \x8F\xE1\xA7 |0
+<U8F55> \x8F\xE1\xA8 |0
+<U8F57> \xED\xDE |0
+<U8F58> \x8F\xE1\xA9 |0
+<U8F5C> \xED\xDF |0
+<U8F5D> \x8F\xE1\xAA |0
+<U8F5E> \x8F\xE1\xAB |0
+<U8F5F> \xB9\xEC |0
+<U8F61> \xB7\xA5 |0
+<U8F62> \xED\xE0 |0
+<U8F63> \xED\xE1 |0
+<U8F64> \xED\xE2 |0
+<U8F65> \x8F\xE1\xAC |0
+<U8F9B> \xBF\xC9 |0
+<U8F9C> \xED\xE3 |0
+<U8F9D> \x8F\xE1\xAD |0
+<U8F9E> \xBC\xAD |0
+<U8F9F> \xED\xE4 |0
+<U8FA0> \x8F\xE1\xAE |0
+<U8FA1> \x8F\xE1\xAF |0
+<U8FA3> \xED\xE5 |0
+<U8FA4> \x8F\xE1\xB0 |0
+<U8FA5> \x8F\xE1\xB1 |0
+<U8FA6> \x8F\xE1\xB2 |0
+<U8FA7> \xD2\xA1 |0
+<U8FA8> \xD1\xFE |0
+<U8FAD> \xED\xE6 |0
+<U8FAE> \xE5\xF0 |0
+<U8FAF> \xED\xE7 |0
+<U8FB0> \xC3\xA4 |0
+<U8FB1> \xBF\xAB |0
+<U8FB2> \xC7\xC0 |0
+<U8FB5> \x8F\xE1\xB3 |0
+<U8FB6> \x8F\xE1\xB4 |0
+<U8FB7> \xED\xE8 |0
+<U8FB8> \x8F\xE1\xB5 |0
+<U8FBA> \xCA\xD5 |0
+<U8FBB> \xC4\xD4 |0
+<U8FBC> \xB9\xFE |0
+<U8FBE> \x8F\xE1\xB6 |0
+<U8FBF> \xC3\xA9 |0
+<U8FC0> \x8F\xE1\xB7 |0
+<U8FC1> \x8F\xE1\xB8 |0
+<U8FC2> \xB1\xAA |0
+<U8FC4> \xCB\xF8 |0
+<U8FC5> \xBF\xD7 |0
+<U8FC6> \x8F\xE1\xB9 |0
+<U8FCA> \x8F\xE1\xBA |0
+<U8FCB> \x8F\xE1\xBB |0
+<U8FCD> \x8F\xE1\xBC |0
+<U8FCE> \xB7\xDE |0
+<U8FD0> \x8F\xE1\xBD |0
+<U8FD1> \xB6\xE1 |0
+<U8FD2> \x8F\xE1\xBE |0
+<U8FD3> \x8F\xE1\xBF |0
+<U8FD4> \xCA\xD6 |0
+<U8FD5> \x8F\xE1\xC0 |0
+<U8FDA> \xED\xE9 |0
+<U8FE0> \x8F\xE1\xC1 |0
+<U8FE2> \xED\xEB |0
+<U8FE3> \x8F\xE1\xC2 |0
+<U8FE4> \x8F\xE1\xC3 |0
+<U8FE5> \xED\xEA |0
+<U8FE6> \xB2\xE0 |0
+<U8FE8> \x8F\xE1\xC4 |0
+<U8FE9> \xC6\xF6 |0
+<U8FEA> \xED\xEC |0
+<U8FEB> \xC7\xF7 |0
+<U8FED> \xC5\xB3 |0
+<U8FEE> \x8F\xE1\xC5 |0
+<U8FEF> \xED\xED |0
+<U8FF0> \xBD\xD2 |0
+<U8FF1> \x8F\xE1\xC6 |0
+<U8FF4> \xED\xEF |0
+<U8FF5> \x8F\xE1\xC7 |0
+<U8FF6> \x8F\xE1\xC8 |0
+<U8FF7> \xCC\xC2 |0
+<U8FF8> \xED\xFE |0
+<U8FF9> \xED\xF1 |0
+<U8FFA> \xED\xF2 |0
+<U8FFB> \x8F\xE1\xC9 |0
+<U8FFD> \xC4\xC9 |0
+<U8FFE> \x8F\xE1\xCA |0
+<U9000> \xC2\xE0 |0
+<U9001> \xC1\xF7 |0
+<U9002> \x8F\xE1\xCB |0
+<U9003> \xC6\xA8 |0
+<U9004> \x8F\xE1\xCC |0
+<U9005> \xED\xF0 |0
+<U9006> \xB5\xD5 |0
+<U9008> \x8F\xE1\xCD |0
+<U900B> \xED\xF9 |0
+<U900C> \x8F\xE1\xCE |0
+<U900D> \xED\xF6 |0
+<U900E> \xEE\xA5 |0
+<U900F> \xC6\xA9 |0
+<U9010> \xC3\xE0 |0
+<U9011> \xED\xF3 |0
+<U9013> \xC4\xFE |0
+<U9014> \xC5\xD3 |0
+<U9015> \xED\xF4 |0
+<U9016> \xED\xF8 |0
+<U9017> \xBF\xE0 |0
+<U9018> \x8F\xE1\xCF |0
+<U9019> \xC7\xE7 |0
+<U901A> \xC4\xCC |0
+<U901B> \x8F\xE1\xD0 |0
+<U901D> \xC0\xC2 |0
+<U901E> \xED\xF7 |0
+<U901F> \xC2\xAE |0
+<U9020> \xC2\xA4 |0
+<U9021> \xED\xF5 |0
+<U9022> \xB0\xA9 |0
+<U9023> \xCF\xA2 |0
+<U9027> \xED\xFA |0
+<U9028> \x8F\xE1\xD1 |0
+<U9029> \x8F\xE1\xD2 |0
+<U902A> \x8F\xE1\xD4 |0
+<U902C> \x8F\xE1\xD5 |0
+<U902D> \x8F\xE1\xD6 |0
+<U902E> \xC2\xE1 |0
+<U902F> \x8F\xE1\xD3 |0
+<U9031> \xBD\xB5 |0
+<U9032> \xBF\xCA |0
+<U9033> \x8F\xE1\xD7 |0
+<U9034> \x8F\xE1\xD8 |0
+<U9035> \xED\xFC |0
+<U9036> \xED\xFB |0
+<U9037> \x8F\xE1\xD9 |0
+<U9038> \xB0\xEF |0
+<U9039> \xED\xFD |0
+<U903C> \xC9\xAF |0
+<U903E> \xEE\xA7 |0
+<U903F> \x8F\xE1\xDA |0
+<U9041> \xC6\xDB |0
+<U9042> \xBF\xEB |0
+<U9043> \x8F\xE1\xDB |0
+<U9044> \x8F\xE1\xDC |0
+<U9045> \xC3\xD9 |0
+<U9047> \xB6\xF8 |0
+<U9049> \xEE\xA6 |0
+<U904A> \xCD\xB7 |0
+<U904B> \xB1\xBF |0
+<U904C> \x8F\xE1\xDD |0
+<U904D> \xCA\xD7 |0
+<U904E> \xB2\xE1 |0
+<U904F> \xEE\xA1 |0
+<U9050> \xEE\xA2 |0
+<U9051> \xEE\xA3 |0
+<U9052> \xEE\xA4 |0
+<U9053> \xC6\xBB |0
+<U9054> \xC3\xA3 |0
+<U9055> \xB0\xE3 |0
+<U9056> \xEE\xA8 |0
+<U9058> \xEE\xA9 |0
+<U9059> \xF4\xA3 |0
+<U905B> \x8F\xE1\xDE |0
+<U905C> \xC2\xBD |0
+<U905D> \x8F\xE1\xDF |0
+<U905E> \xEE\xAA |0
+<U9060> \xB1\xF3 |0
+<U9061> \xC1\xCC |0
+<U9062> \x8F\xE1\xE0 |0
+<U9063> \xB8\xAF |0
+<U9065> \xCD\xDA |0
+<U9066> \x8F\xE1\xE1 |0
+<U9067> \x8F\xE1\xE2 |3
+<U9067> \xFB\xF9 |0
+<U9068> \xEE\xAB |0
+<U9069> \xC5\xAC |0
+<U906C> \x8F\xE1\xE3 |0
+<U906D> \xC1\xF8 |0
+<U906E> \xBC\xD7 |0
+<U906F> \xEE\xAC |0
+<U9070> \x8F\xE1\xE4 |0
+<U9072> \xEE\xAF |0
+<U9074> \x8F\xE1\xE5 |0
+<U9075> \xBD\xE5 |0
+<U9076> \xEE\xAD |0
+<U9077> \xC1\xAB |0
+<U9078> \xC1\xAA |0
+<U9079> \x8F\xE1\xE6 |0
+<U907A> \xB0\xE4 |0
+<U907C> \xCE\xCB |0
+<U907D> \xEE\xB1 |0
+<U907F> \xC8\xF2 |0
+<U9080> \xEE\xB3 |0
+<U9081> \xEE\xB2 |0
+<U9082> \xEE\xB0 |0
+<U9083> \xE3\xE4 |0
+<U9084> \xB4\xD4 |0
+<U9085> \x8F\xE1\xE7 |0
+<U9087> \xED\xEE |0
+<U9088> \x8F\xE1\xE8 |0
+<U9089> \xEE\xB5 |0
+<U908A> \xEE\xB4 |0
+<U908B> \x8F\xE1\xE9 |0
+<U908C> \x8F\xE1\xEA |0
+<U908E> \x8F\xE1\xEB |0
+<U908F> \xEE\xB6 |0
+<U9090> \x8F\xE1\xEC |0
+<U9091> \xCD\xB8 |0
+<U9095> \x8F\xE1\xED |0
+<U9097> \x8F\xE1\xEE |0
+<U9098> \x8F\xE1\xEF |0
+<U9099> \x8F\xE1\xF0 |0
+<U909B> \x8F\xE1\xF1 |0
+<U90A0> \x8F\xE1\xF2 |0
+<U90A1> \x8F\xE1\xF3 |0
+<U90A2> \x8F\xE1\xF4 |0
+<U90A3> \xC6\xE1 |0
+<U90A5> \x8F\xE1\xF5 |0
+<U90A6> \xCB\xAE |0
+<U90A8> \xEE\xB7 |0
+<U90AA> \xBC\xD9 |0
+<U90AF> \xEE\xB8 |0
+<U90B0> \x8F\xE1\xF6 |0
+<U90B1> \xEE\xB9 |0
+<U90B2> \x8F\xE1\xF7 |0
+<U90B3> \x8F\xE1\xF8 |0
+<U90B4> \x8F\xE1\xF9 |0
+<U90B5> \xEE\xBA |0
+<U90B6> \x8F\xE1\xFA |0
+<U90B8> \xC5\xA1 |0
+<U90BD> \x8F\xE1\xFB |0
+<U90BE> \x8F\xE1\xFD |0
+<U90C1> \xB0\xEA |0
+<U90C3> \x8F\xE1\xFE |0
+<U90C4> \x8F\xE2\xA1 |0
+<U90C5> \x8F\xE2\xA2 |0
+<U90C7> \x8F\xE2\xA3 |0
+<U90C8> \x8F\xE2\xA4 |0
+<U90CA> \xB9\xD9 |0
+<U90CC> \x8F\xE1\xFC |0
+<U90CE> \xCF\xBA |0
+<U90D2> \x8F\xE2\xAD |0
+<U90D5> \x8F\xE2\xA5 |0
+<U90D7> \x8F\xE2\xA6 |0
+<U90D8> \x8F\xE2\xA7 |0
+<U90D9> \x8F\xE2\xA8 |0
+<U90DB> \xEE\xBE |0
+<U90DC> \x8F\xE2\xA9 |0
+<U90DD> \x8F\xE2\xAA |0
+<U90DE> \xFB\xFA |0
+<U90DF> \x8F\xE2\xAB |0
+<U90E1> \xB7\xB4 |0
+<U90E2> \xEE\xBB |0
+<U90E4> \xEE\xBC |0
+<U90E5> \x8F\xE2\xAC |0
+<U90E8> \xC9\xF4 |0
+<U90EB> \x8F\xE2\xAF |0
+<U90ED> \xB3\xD4 |0
+<U90EF> \x8F\xE2\xB0 |0
+<U90F0> \x8F\xE2\xB1 |0
+<U90F4> \x8F\xE2\xB2 |0
+<U90F5> \xCD\xB9 |0
+<U90F6> \x8F\xE2\xAE |0
+<U90F7> \xB6\xBF |0
+<U90FD> \xC5\xD4 |0
+<U90FE> \x8F\xE2\xB3 |0
+<U90FF> \x8F\xE2\xB4 |0
+<U9100> \x8F\xE2\xB5 |0
+<U9102> \xEE\xBF |0
+<U9104> \x8F\xE2\xB6 |0
+<U9105> \x8F\xE2\xB7 |0
+<U9106> \x8F\xE2\xB8 |0
+<U9108> \x8F\xE2\xB9 |0
+<U910D> \x8F\xE2\xBA |0
+<U9110> \x8F\xE2\xBB |0
+<U9112> \xEE\xC0 |0
+<U9114> \x8F\xE2\xBC |0
+<U9115> \xFB\xFC |0
+<U9116> \x8F\xE2\xBD |0
+<U9117> \x8F\xE2\xBE |0
+<U9118> \x8F\xE2\xBF |0
+<U9119> \xEE\xC1 |0
+<U911A> \x8F\xE2\xC0 |0
+<U911C> \x8F\xE2\xC1 |0
+<U911E> \x8F\xE2\xC2 |0
+<U9120> \x8F\xE2\xC3 |0
+<U9122> \x8F\xE2\xC5 |0
+<U9123> \x8F\xE2\xC6 |0
+<U9125> \x8F\xE2\xC4 |0
+<U9127> \x8F\xE2\xC7 |3
+<U9127> \xFB\xFD |0
+<U9129> \x8F\xE2\xC8 |0
+<U912D> \xC5\xA2 |0
+<U912E> \x8F\xE2\xC9 |0
+<U912F> \x8F\xE2\xCA |0
+<U9130> \xEE\xC3 |0
+<U9131> \x8F\xE2\xCB |0
+<U9132> \xEE\xC2 |0
+<U9134> \x8F\xE2\xCC |0
+<U9136> \x8F\xE2\xCD |0
+<U9137> \x8F\xE2\xCE |0
+<U9139> \x8F\xE2\xCF |0
+<U913A> \x8F\xE2\xD0 |0
+<U913C> \x8F\xE2\xD1 |0
+<U913D> \x8F\xE2\xD2 |0
+<U9143> \x8F\xE2\xD3 |0
+<U9147> \x8F\xE2\xD4 |0
+<U9148> \x8F\xE2\xD5 |0
+<U9149> \xC6\xD3 |0
+<U914A> \xEE\xC4 |0
+<U914B> \xBD\xB6 |0
+<U914C> \xBC\xE0 |0
+<U914D> \xC7\xDB |0
+<U914E> \xC3\xF1 |0
+<U914F> \x8F\xE2\xD6 |0
+<U9152> \xBC\xF2 |0
+<U9153> \x8F\xE2\xD7 |0
+<U9154> \xBF\xEC |0
+<U9156> \xEE\xC5 |0
+<U9157> \x8F\xE2\xD8 |0
+<U9158> \xEE\xC6 |0
+<U9159> \x8F\xE2\xD9 |0
+<U915A> \x8F\xE2\xDA |0
+<U915B> \x8F\xE2\xDB |0
+<U9161> \x8F\xE2\xDC |0
+<U9162> \xBF\xDD |0
+<U9163> \xEE\xC7 |0
+<U9164> \x8F\xE2\xDD |0
+<U9165> \xEE\xC8 |0
+<U9167> \x8F\xE2\xDE |0
+<U9169> \xEE\xC9 |0
+<U916A> \xCD\xEF |0
+<U916C> \xBD\xB7 |0
+<U916D> \x8F\xE2\xDF |0
+<U9172> \xEE\xCB |0
+<U9173> \xEE\xCA |0
+<U9174> \x8F\xE2\xE0 |0
+<U9175> \xB9\xDA |0
+<U9177> \xB9\xF3 |0
+<U9178> \xBB\xC0 |0
+<U9179> \x8F\xE2\xE1 |0
+<U917A> \x8F\xE2\xE2 |0
+<U917B> \x8F\xE2\xE3 |0
+<U9181> \x8F\xE2\xE4 |0
+<U9182> \xEE\xCE |0
+<U9183> \x8F\xE2\xE5 |0
+<U9185> \x8F\xE2\xE6 |0
+<U9186> \x8F\xE2\xE7 |0
+<U9187> \xBD\xE6 |0
+<U9189> \xEE\xCD |0
+<U918A> \x8F\xE2\xE8 |0
+<U918B> \xEE\xCC |0
+<U918D> \xC2\xE9 |0
+<U918E> \x8F\xE2\xE9 |0
+<U9190> \xB8\xEF |0
+<U9191> \x8F\xE2\xEA |0
+<U9192> \xC0\xC3 |0
+<U9193> \x8F\xE2\xEB |0
+<U9194> \x8F\xE2\xEC |0
+<U9195> \x8F\xE2\xED |0
+<U9197> \xC8\xB0 |0
+<U9198> \x8F\xE2\xEE |0
+<U919C> \xBD\xB9 |0
+<U919E> \x8F\xE2\xEF |0
+<U91A1> \x8F\xE2\xF0 |0
+<U91A2> \xEE\xCF |0
+<U91A4> \xBE\xDF |0
+<U91A6> \x8F\xE2\xF1 |0
+<U91A8> \x8F\xE2\xF2 |0
+<U91AA> \xEE\xD2 |0
+<U91AB> \xEE\xD0 |0
+<U91AC> \x8F\xE2\xF3 |0
+<U91AD> \x8F\xE2\xF4 |0
+<U91AE> \x8F\xE2\xF5 |0
+<U91AF> \xEE\xD1 |0
+<U91B0> \x8F\xE2\xF6 |0
+<U91B1> \x8F\xE2\xF7 |0
+<U91B2> \x8F\xE2\xF8 |0
+<U91B3> \x8F\xE2\xF9 |0
+<U91B4> \xEE\xD4 |0
+<U91B5> \xEE\xD3 |0
+<U91B6> \x8F\xE2\xFA |0
+<U91B8> \xBE\xFA |0
+<U91BA> \xEE\xD5 |0
+<U91BB> \x8F\xE2\xFB |0
+<U91BC> \x8F\xE2\xFC |0
+<U91BD> \x8F\xE2\xFD |0
+<U91BF> \x8F\xE2\xFE |0
+<U91C0> \xEE\xD6 |0
+<U91C1> \xEE\xD7 |0
+<U91C2> \x8F\xE3\xA1 |0
+<U91C3> \x8F\xE3\xA2 |0
+<U91C5> \x8F\xE3\xA3 |0
+<U91C6> \xC8\xD0 |0
+<U91C7> \xBA\xD3 |0
+<U91C8> \xBC\xE1 |0
+<U91C9> \xEE\xD8 |0
+<U91CB> \xEE\xD9 |0
+<U91CC> \xCE\xA4 |0
+<U91CD> \xBD\xC5 |0
+<U91CE> \xCC\xEE |0
+<U91CF> \xCE\xCC |0
+<U91D0> \xEE\xDA |0
+<U91D1> \xB6\xE2 |0
+<U91D3> \x8F\xE3\xA4 |0
+<U91D4> \x8F\xE3\xA5 |0
+<U91D6> \xEE\xDB |0
+<U91D7> \x8F\xE3\xA6 |3
+<U91D7> \xFC\xA1 |0
+<U91D8> \xC5\xA3 |0
+<U91D9> \x8F\xE3\xA7 |0
+<U91DA> \x8F\xE3\xA8 |3
+<U91DA> \xFB\xFE |0
+<U91DB> \xEE\xDE |0
+<U91DC> \xB3\xF8 |0
+<U91DD> \xBF\xCB |0
+<U91DE> \x8F\xE3\xA9 |3
+<U91DE> \xFC\xA2 |0
+<U91DF> \xEE\xDC |0
+<U91E1> \xEE\xDD |0
+<U91E3> \xC4\xE0 |0
+<U91E4> \x8F\xE3\xAA |3
+<U91E4> \xFC\xA5 |0
+<U91E5> \x8F\xE3\xAB |3
+<U91E5> \xFC\xA6 |0
+<U91E6> \xCB\xD5 |0
+<U91E7> \xB6\xFC |0
+<U91E9> \x8F\xE3\xAC |0
+<U91EA> \x8F\xE3\xAD |0
+<U91EC> \x8F\xE3\xAE |0
+<U91ED> \x8F\xE3\xAF |3
+<U91ED> \xFC\xA3 |0
+<U91EE> \x8F\xE3\xB0 |3
+<U91EE> \xFC\xA4 |0
+<U91EF> \x8F\xE3\xB1 |0
+<U91F0> \x8F\xE3\xB2 |0
+<U91F1> \x8F\xE3\xB3 |0
+<U91F5> \xEE\xE0 |0
+<U91F6> \xEE\xE1 |0
+<U91F7> \x8F\xE3\xB4 |0
+<U91F9> \x8F\xE3\xB5 |0
+<U91FB> \x8F\xE3\xB6 |0
+<U91FC> \xEE\xDF |0
+<U91FD> \x8F\xE3\xB7 |0
+<U91FF> \xEE\xE3 |0
+<U9200> \x8F\xE3\xB8 |0
+<U9201> \x8F\xE3\xB9 |0
+<U9204> \x8F\xE3\xBA |0
+<U9205> \x8F\xE3\xBB |0
+<U9206> \x8F\xE3\xBC |3
+<U9206> \xFC\xA7 |0
+<U9207> \x8F\xE3\xBD |0
+<U9209> \x8F\xE3\xBE |0
+<U920A> \x8F\xE3\xBF |3
+<U920A> \xFC\xA9 |0
+<U920C> \x8F\xE3\xC0 |0
+<U920D> \xC6\xDF |0
+<U920E> \xB3\xC3 |0
+<U9210> \x8F\xE3\xC1 |3
+<U9210> \xFC\xA8 |0
+<U9211> \xEE\xE7 |0
+<U9212> \x8F\xE3\xC2 |0
+<U9213> \x8F\xE3\xC3 |0
+<U9214> \xEE\xE4 |0
+<U9215> \xEE\xE6 |0
+<U9216> \x8F\xE3\xC4 |0
+<U9218> \x8F\xE3\xC5 |0
+<U921C> \x8F\xE3\xC6 |0
+<U921D> \x8F\xE3\xC7 |0
+<U921E> \xEE\xE2 |0
+<U9223> \x8F\xE3\xC8 |0
+<U9224> \x8F\xE3\xC9 |0
+<U9225> \x8F\xE3\xCA |0
+<U9226> \x8F\xE3\xCB |0
+<U9228> \x8F\xE3\xCC |0
+<U9229> \xEF\xCF |0
+<U922C> \xEE\xE5 |0
+<U922E> \x8F\xE3\xCD |0
+<U922F> \x8F\xE3\xCE |0
+<U9230> \x8F\xE3\xCF |0
+<U9233> \x8F\xE3\xD0 |0
+<U9234> \xCE\xEB |0
+<U9235> \x8F\xE3\xD1 |0
+<U9236> \x8F\xE3\xD2 |0
+<U9237> \xB8\xDA |0
+<U9238> \x8F\xE3\xD3 |0
+<U9239> \x8F\xE3\xD4 |3
+<U9239> \xFC\xB0 |0
+<U923A> \x8F\xE3\xD5 |3
+<U923A> \xFC\xAA |0
+<U923C> \x8F\xE3\xD6 |3
+<U923C> \xFC\xAC |0
+<U923E> \x8F\xE3\xD7 |0
+<U923F> \xEE\xEF |0
+<U9240> \x8F\xE3\xD8 |3
+<U9240> \xFC\xAB |0
+<U9242> \x8F\xE3\xD9 |0
+<U9243> \x8F\xE3\xDA |0
+<U9244> \xC5\xB4 |0
+<U9245> \xEE\xEA |0
+<U9246> \x8F\xE3\xDB |0
+<U9247> \x8F\xE3\xDC |0
+<U9248> \xEE\xED |0
+<U9249> \xEE\xEB |0
+<U924A> \x8F\xE3\xDD |0
+<U924B> \xEE\xF0 |0
+<U924D> \x8F\xE3\xDE |0
+<U924E> \x8F\xE3\xDF |3
+<U924E> \xFC\xAD |0
+<U924F> \x8F\xE3\xE0 |0
+<U9250> \xEE\xF1 |0
+<U9251> \x8F\xE3\xE1 |3
+<U9251> \xFC\xAF |0
+<U9257> \xEE\xE9 |0
+<U9258> \x8F\xE3\xE2 |0
+<U9259> \x8F\xE3\xE3 |3
+<U9259> \xFC\xAE |0
+<U925A> \xEE\xF6 |0
+<U925B> \xB1\xF4 |0
+<U925C> \x8F\xE3\xE4 |0
+<U925D> \x8F\xE3\xE5 |0
+<U925E> \xEE\xE8 |0
+<U9260> \x8F\xE3\xE6 |0
+<U9261> \x8F\xE3\xE7 |0
+<U9262> \xC8\xAD |0
+<U9264> \xEE\xEC |0
+<U9265> \x8F\xE3\xE8 |0
+<U9266> \xBE\xE0 |0
+<U9267> \x8F\xE3\xE9 |3
+<U9267> \xFC\xB1 |0
+<U9268> \x8F\xE3\xEA |0
+<U9269> \x8F\xE3\xEB |0
+<U926E> \x8F\xE3\xEC |0
+<U926F> \x8F\xE3\xED |0
+<U9270> \x8F\xE3\xEE |0
+<U9271> \xB9\xDB |0
+<U9275> \x8F\xE3\xEF |0
+<U9276> \x8F\xE3\xF0 |0
+<U9277> \x8F\xE3\xF1 |3
+<U9277> \xFC\xB3 |0
+<U9278> \x8F\xE3\xF2 |3
+<U9278> \xFC\xB4 |0
+<U9279> \x8F\xE3\xF3 |0
+<U927B> \x8F\xE3\xF4 |0
+<U927C> \x8F\xE3\xF5 |0
+<U927D> \x8F\xE3\xF6 |0
+<U927E> \xCB\xC8 |0
+<U927F> \x8F\xE3\xF7 |0
+<U9280> \xB6\xE4 |0
+<U9283> \xBD\xC6 |0
+<U9285> \xC6\xBC |0
+<U9288> \x8F\xE3\xF8 |3
+<U9288> \xF9\xA4 |0
+<U9289> \x8F\xE3\xF9 |0
+<U928A> \x8F\xE3\xFA |0
+<U928D> \x8F\xE3\xFB |0
+<U928E> \x8F\xE3\xFC |0
+<U9291> \xC1\xAD |0
+<U9292> \x8F\xE3\xFD |0
+<U9293> \xEE\xF4 |0
+<U9295> \xEE\xEE |0
+<U9296> \xEE\xF3 |0
+<U9297> \x8F\xE3\xFE |0
+<U9298> \xCC\xC3 |0
+<U9299> \x8F\xE4\xA1 |0
+<U929A> \xC4\xB8 |0
+<U929B> \xEE\xF5 |0
+<U929C> \xEE\xF2 |0
+<U929F> \x8F\xE4\xA2 |0
+<U92A0> \x8F\xE4\xA3 |0
+<U92A4> \x8F\xE4\xA4 |0
+<U92A5> \x8F\xE4\xA5 |0
+<U92A7> \x8F\xE4\xA6 |3
+<U92A7> \xFC\xB2 |0
+<U92A8> \x8F\xE4\xA7 |0
+<U92AB> \x8F\xE4\xA8 |0
+<U92AD> \xC1\xAC |0
+<U92AF> \x8F\xE4\xA9 |0
+<U92B2> \x8F\xE4\xAA |0
+<U92B6> \x8F\xE4\xAB |0
+<U92B7> \xEE\xF9 |0
+<U92B8> \x8F\xE4\xAC |0
+<U92B9> \xEE\xF8 |0
+<U92BA> \x8F\xE4\xAD |0
+<U92BB> \x8F\xE4\xAE |0
+<U92BC> \x8F\xE4\xAF |0
+<U92BD> \x8F\xE4\xB0 |0
+<U92BF> \x8F\xE4\xB1 |0
+<U92C0> \x8F\xE4\xB2 |0
+<U92C1> \x8F\xE4\xB3 |0
+<U92C2> \x8F\xE4\xB4 |0
+<U92C3> \x8F\xE4\xB5 |0
+<U92C5> \x8F\xE4\xB6 |0
+<U92C6> \x8F\xE4\xB7 |0
+<U92C7> \x8F\xE4\xB8 |0
+<U92C8> \x8F\xE4\xB9 |0
+<U92CB> \x8F\xE4\xBA |0
+<U92CC> \x8F\xE4\xBB |0
+<U92CD> \x8F\xE4\xBC |0
+<U92CE> \x8F\xE4\xBD |0
+<U92CF> \xEE\xF7 |0
+<U92D0> \x8F\xE4\xBE |3
+<U92D0> \xFC\xB8 |0
+<U92D2> \xCB\xAF |0
+<U92D3> \x8F\xE4\xBF |3
+<U92D3> \xFC\xBC |0
+<U92D5> \x8F\xE4\xC0 |3
+<U92D5> \xFC\xBA |0
+<U92D7> \x8F\xE4\xC1 |3
+<U92D7> \xFC\xB6 |0
+<U92D8> \x8F\xE4\xC2 |0
+<U92D9> \x8F\xE4\xC3 |3
+<U92D9> \xFC\xB7 |0
+<U92DC> \x8F\xE4\xC4 |0
+<U92DD> \x8F\xE4\xC5 |0
+<U92DF> \x8F\xE4\xC6 |0
+<U92E0> \x8F\xE4\xC7 |3
+<U92E0> \xFC\xBB |0
+<U92E1> \x8F\xE4\xC8 |0
+<U92E3> \x8F\xE4\xC9 |0
+<U92E4> \xBD\xFB |0
+<U92E5> \x8F\xE4\xCA |0
+<U92E7> \x8F\xE4\xCB |3
+<U92E7> \xFC\xB5 |0
+<U92E8> \x8F\xE4\xCC |0
+<U92E9> \xEE\xFA |0
+<U92EA> \xCA\xDF |0
+<U92EC> \x8F\xE4\xCD |0
+<U92ED> \xB1\xD4 |0
+<U92EE> \x8F\xE4\xCE |0
+<U92F0> \x8F\xE4\xCF |0
+<U92F2> \xC9\xC6 |0
+<U92F3> \xC3\xF2 |0
+<U92F8> \xB5\xF8 |0
+<U92F9> \x8F\xE4\xD0 |3
+<U92F9> \xF9\xAA |0
+<U92FA> \xEE\xFC |0
+<U92FB> \x8F\xE4\xD1 |3
+<U92FB> \xFC\xBF |0
+<U92FC> \xB9\xDD |0
+<U92FF> \x8F\xE4\xD2 |3
+<U92FF> \xFC\xC2 |0
+<U9300> \x8F\xE4\xD3 |0
+<U9302> \x8F\xE4\xD4 |3
+<U9302> \xFC\xC4 |0
+<U9306> \xBB\xAC |0
+<U9308> \x8F\xE4\xD5 |0
+<U930D> \x8F\xE4\xD6 |0
+<U930F> \xEE\xFB |0
+<U9310> \xBF\xED |0
+<U9311> \x8F\xE4\xD7 |0
+<U9314> \x8F\xE4\xD8 |0
+<U9315> \x8F\xE4\xD9 |0
+<U9318> \xBF\xEE |0
+<U9319> \xEF\xA1 |0
+<U931A> \xEF\xA3 |0
+<U931C> \x8F\xE4\xDA |0
+<U931D> \x8F\xE4\xDB |3
+<U931D> \xFC\xC3 |0
+<U931E> \x8F\xE4\xDC |3
+<U931E> \xFC\xC1 |0
+<U931F> \x8F\xE4\xDD |0
+<U9320> \xBE\xFB |0
+<U9321> \x8F\xE4\xDE |3
+<U9321> \xFC\xBE |0
+<U9322> \xEF\xA2 |0
+<U9323> \xEF\xA4 |0
+<U9324> \x8F\xE4\xDF |0
+<U9325> \x8F\xE4\xE0 |3
+<U9325> \xFC\xBD |0
+<U9326> \xB6\xD3 |0
+<U9327> \x8F\xE4\xE1 |0
+<U9328> \xC9\xC5 |0
+<U9329> \x8F\xE4\xE2 |0
+<U932A> \x8F\xE4\xE3 |0
+<U932B> \xBC\xE2 |0
+<U932C> \xCF\xA3 |0
+<U932E> \xEE\xFE |0
+<U932F> \xBA\xF8 |0
+<U9332> \xCF\xBF |0
+<U9333> \x8F\xE4\xE4 |0
+<U9334> \x8F\xE4\xE5 |0
+<U9335> \xEF\xA6 |0
+<U9336> \x8F\xE4\xE6 |0
+<U9337> \x8F\xE4\xE7 |0
+<U933A> \xEF\xA5 |0
+<U933B> \xEF\xA7 |0
+<U9344> \xEE\xFD |0
+<U9347> \x8F\xE4\xE8 |0
+<U9348> \x8F\xE4\xE9 |3
+<U9348> \xF9\xA3 |0
+<U9349> \x8F\xE4\xEA |0
+<U934B> \xC6\xE9 |0
+<U934D> \xC5\xD5 |0
+<U9350> \x8F\xE4\xEB |0
+<U9351> \x8F\xE4\xEC |0
+<U9352> \x8F\xE4\xED |0
+<U9354> \xC4\xD7 |0
+<U9355> \x8F\xE4\xEE |0
+<U9356> \xEF\xAC |0
+<U9357> \x8F\xE4\xEF |3
+<U9357> \xFC\xC6 |0
+<U9358> \x8F\xE4\xF0 |0
+<U935A> \x8F\xE4\xF1 |0
+<U935B> \xC3\xC3 |0
+<U935C> \xEF\xA8 |0
+<U935E> \x8F\xE4\xF2 |0
+<U9360> \xEF\xA9 |0
+<U9364> \x8F\xE4\xF3 |0
+<U9365> \x8F\xE4\xF4 |0
+<U9367> \x8F\xE4\xF5 |0
+<U9369> \x8F\xE4\xF6 |0
+<U936A> \x8F\xE4\xF7 |0
+<U936C> \xB7\xAD |0
+<U936D> \x8F\xE4\xF8 |0
+<U936E> \xEF\xAB |0
+<U936F> \x8F\xE4\xF9 |0
+<U9370> \x8F\xE4\xFA |3
+<U9370> \xFC\xC5 |0
+<U9371> \x8F\xE4\xFB |0
+<U9373> \x8F\xE4\xFC |0
+<U9374> \x8F\xE4\xFD |0
+<U9375> \xB8\xB0 |0
+<U9376> \x8F\xE4\xFE |0
+<U937A> \x8F\xE5\xA1 |0
+<U937C> \xEF\xAA |0
+<U937D> \x8F\xE5\xA2 |0
+<U937E> \xBE\xE1 |0
+<U937F> \x8F\xE5\xA3 |0
+<U9380> \x8F\xE5\xA4 |0
+<U9381> \x8F\xE5\xA5 |0
+<U9382> \x8F\xE5\xA6 |0
+<U9388> \x8F\xE5\xA7 |0
+<U938A> \x8F\xE5\xA8 |0
+<U938B> \x8F\xE5\xA9 |0
+<U938C> \xB3\xF9 |0
+<U938D> \x8F\xE5\xAA |0
+<U938F> \x8F\xE5\xAB |0
+<U9392> \x8F\xE5\xAC |0
+<U9394> \xEF\xB0 |0
+<U9395> \x8F\xE5\xAD |0
+<U9396> \xBA\xBF |0
+<U9397> \xC1\xF9 |0
+<U9398> \x8F\xE5\xAE |0
+<U939A> \xC4\xCA |0
+<U939B> \x8F\xE5\xAF |0
+<U939E> \x8F\xE5\xB0 |0
+<U93A1> \x8F\xE5\xB1 |0
+<U93A3> \x8F\xE5\xB2 |0
+<U93A4> \x8F\xE5\xB3 |3
+<U93A4> \xFC\xC7 |0
+<U93A6> \x8F\xE5\xB4 |0
+<U93A7> \xB3\xBB |0
+<U93A8> \x8F\xE5\xB5 |0
+<U93A9> \x8F\xE5\xBB |0
+<U93AB> \x8F\xE5\xB6 |0
+<U93AC> \xEF\xAE |0
+<U93AD> \xEF\xAF |0
+<U93AE> \xC4\xC3 |0
+<U93B0> \xEF\xAD |0
+<U93B4> \x8F\xE5\xB7 |0
+<U93B5> \x8F\xE5\xB8 |0
+<U93B6> \x8F\xE5\xB9 |0
+<U93B9> \xEF\xB1 |0
+<U93BA> \x8F\xE5\xBA |0
+<U93C1> \x8F\xE5\xBC |0
+<U93C3> \xEF\xB7 |0
+<U93C4> \x8F\xE5\xBD |0
+<U93C5> \x8F\xE5\xBE |0
+<U93C6> \x8F\xE5\xBF |3
+<U93C6> \xFC\xC8 |0
+<U93C7> \x8F\xE5\xC0 |0
+<U93C8> \xEF\xBA |0
+<U93C9> \x8F\xE5\xC1 |0
+<U93CA> \x8F\xE5\xC2 |0
+<U93CB> \x8F\xE5\xC3 |0
+<U93CC> \x8F\xE5\xC4 |0
+<U93CD> \x8F\xE5\xC5 |0
+<U93D0> \xEF\xB9 |0
+<U93D1> \xC5\xAD |0
+<U93D3> \x8F\xE5\xC6 |0
+<U93D6> \xEF\xB2 |0
+<U93D7> \xEF\xB3 |0
+<U93D8> \xEF\xB6 |0
+<U93D9> \x8F\xE5\xC7 |0
+<U93DC> \x8F\xE5\xC8 |0
+<U93DD> \xEF\xB8 |0
+<U93DE> \x8F\xE5\xC9 |3
+<U93DE> \xFC\xC9 |0
+<U93DF> \x8F\xE5\xCA |0
+<U93E1> \xB6\xC0 |0
+<U93E2> \x8F\xE5\xCB |0
+<U93E4> \xEF\xBB |0
+<U93E5> \xEF\xB5 |0
+<U93E6> \x8F\xE5\xCC |0
+<U93E7> \x8F\xE5\xCD |0
+<U93E8> \xEF\xB4 |0
+<U93F7> \x8F\xE5\xCF |0
+<U93F8> \x8F\xE5\xD0 |3
+<U93F8> \xFC\xCA |0
+<U93F9> \x8F\xE5\xCE |0
+<U93FA> \x8F\xE5\xD1 |0
+<U93FB> \x8F\xE5\xD2 |0
+<U93FD> \x8F\xE5\xD3 |0
+<U9401> \x8F\xE5\xD4 |0
+<U9402> \x8F\xE5\xD5 |0
+<U9403> \xEF\xBF |0
+<U9404> \x8F\xE5\xD6 |0
+<U9407> \xEF\xC0 |0
+<U9408> \x8F\xE5\xD7 |0
+<U9409> \x8F\xE5\xD8 |0
+<U940D> \x8F\xE5\xD9 |0
+<U940E> \x8F\xE5\xDA |0
+<U940F> \x8F\xE5\xDB |0
+<U9410> \xEF\xC1 |0
+<U9413> \xEF\xBE |0
+<U9414> \xEF\xBD |0
+<U9415> \x8F\xE5\xDC |0
+<U9416> \x8F\xE5\xDD |0
+<U9417> \x8F\xE5\xDE |0
+<U9418> \xBE\xE2 |0
+<U9419> \xC6\xAA |0
+<U941A> \xEF\xBC |0
+<U941F> \x8F\xE5\xDF |0
+<U9421> \xEF\xC5 |0
+<U942B> \xEF\xC3 |0
+<U942E> \x8F\xE5\xE0 |0
+<U942F> \x8F\xE5\xE1 |0
+<U9431> \x8F\xE5\xE2 |3
+<U9431> \xFC\xCB |0
+<U9432> \x8F\xE5\xE3 |0
+<U9433> \x8F\xE5\xE4 |0
+<U9434> \x8F\xE5\xE5 |0
+<U9435> \xEF\xC4 |0
+<U9436> \xEF\xC2 |0
+<U9438> \xC2\xF8 |0
+<U943A> \xEF\xC6 |0
+<U943B> \x8F\xE5\xE6 |0
+<U943D> \x8F\xE5\xE8 |0
+<U943F> \x8F\xE5\xE7 |0
+<U9441> \xEF\xC7 |0
+<U9443> \x8F\xE5\xE9 |0
+<U9444> \xEF\xC9 |0
+<U9445> \x8F\xE5\xEA |3
+<U9445> \xFC\xCC |0
+<U9448> \x8F\xE5\xEB |3
+<U9448> \xFC\xCD |0
+<U944A> \x8F\xE5\xEC |0
+<U944C> \x8F\xE5\xED |0
+<U9451> \xB4\xD5 |0
+<U9452> \xEF\xC8 |0
+<U9453> \xCC\xFA |0
+<U9455> \x8F\xE5\xEE |0
+<U9459> \x8F\xE5\xEF |0
+<U945A> \xEF\xD4 |0
+<U945B> \xEF\xCA |0
+<U945C> \x8F\xE5\xF0 |0
+<U945E> \xEF\xCD |0
+<U945F> \x8F\xE5\xF1 |0
+<U9460> \xEF\xCB |0
+<U9461> \x8F\xE5\xF2 |0
+<U9462> \xEF\xCC |0
+<U9463> \x8F\xE5\xF3 |0
+<U9468> \x8F\xE5\xF4 |0
+<U946A> \xEF\xCE |0
+<U946B> \x8F\xE5\xF5 |0
+<U946D> \x8F\xE5\xF6 |0
+<U946E> \x8F\xE5\xF7 |0
+<U946F> \x8F\xE5\xF8 |0
+<U9470> \xEF\xD0 |0
+<U9471> \x8F\xE5\xF9 |0
+<U9472> \x8F\xE5\xFA |0
+<U9475> \xEF\xD1 |0
+<U9477> \xEF\xD2 |0
+<U947C> \xEF\xD5 |0
+<U947D> \xEF\xD3 |0
+<U947E> \xEF\xD6 |0
+<U947F> \xEF\xD8 |0
+<U9481> \xEF\xD7 |0
+<U9483> \x8F\xE5\xFC |0
+<U9484> \x8F\xE5\xFB |0
+<U9577> \xC4\xB9 |0
+<U9578> \x8F\xE5\xFD |0
+<U9579> \x8F\xE5\xFE |0
+<U957E> \x8F\xE6\xA1 |0
+<U9580> \xCC\xE7 |0
+<U9582> \xEF\xD9 |0
+<U9583> \xC1\xAE |0
+<U9584> \x8F\xE6\xA2 |0
+<U9587> \xEF\xDA |0
+<U9588> \x8F\xE6\xA3 |0
+<U9589> \xCA\xC4 |0
+<U958A> \xEF\xDB |0
+<U958B> \xB3\xAB |0
+<U958C> \x8F\xE6\xA4 |0
+<U958D> \x8F\xE6\xA5 |0
+<U958E> \x8F\xE6\xA6 |0
+<U958F> \xB1\xBC |0
+<U9591> \xB4\xD7 |0
+<U9592> \xFC\xCE |0
+<U9593> \xB4\xD6 |0
+<U9594> \xEF\xDC |0
+<U9596> \xEF\xDD |0
+<U9598> \xEF\xDE |0
+<U9599> \xEF\xDF |0
+<U959D> \x8F\xE6\xA7 |0
+<U959E> \x8F\xE6\xA8 |0
+<U959F> \x8F\xE6\xA9 |0
+<U95A0> \xEF\xE0 |0
+<U95A1> \x8F\xE6\xAA |0
+<U95A2> \xB4\xD8 |0
+<U95A3> \xB3\xD5 |0
+<U95A4> \xB9\xDE |0
+<U95A5> \xC8\xB6 |0
+<U95A6> \x8F\xE6\xAB |0
+<U95A7> \xEF\xE2 |0
+<U95A8> \xEF\xE1 |0
+<U95A9> \x8F\xE6\xAC |0
+<U95AB> \x8F\xE6\xAD |0
+<U95AC> \x8F\xE6\xAE |0
+<U95AD> \xEF\xE3 |0
+<U95B2> \xB1\xDC |0
+<U95B4> \x8F\xE6\xAF |0
+<U95B6> \x8F\xE6\xB0 |0
+<U95B9> \xEF\xE6 |0
+<U95BA> \x8F\xE6\xB1 |0
+<U95BB> \xEF\xE5 |0
+<U95BC> \xEF\xE4 |0
+<U95BD> \x8F\xE6\xB2 |0
+<U95BE> \xEF\xE7 |0
+<U95BF> \x8F\xE6\xB3 |0
+<U95C3> \xEF\xEA |0
+<U95C6> \x8F\xE6\xB4 |0
+<U95C7> \xB0\xC7 |0
+<U95C8> \x8F\xE6\xB5 |0
+<U95C9> \x8F\xE6\xB6 |0
+<U95CA> \xEF\xE8 |0
+<U95CB> \x8F\xE6\xB7 |0
+<U95CC> \xEF\xEC |0
+<U95CD> \xEF\xEB |0
+<U95D0> \x8F\xE6\xB8 |0
+<U95D1> \x8F\xE6\xB9 |0
+<U95D2> \x8F\xE6\xBA |0
+<U95D3> \x8F\xE6\xBB |0
+<U95D4> \xEF\xEE |0
+<U95D5> \xEF\xED |0
+<U95D6> \xEF\xEF |0
+<U95D8> \xC6\xAE |0
+<U95D9> \x8F\xE6\xBC |0
+<U95DA> \x8F\xE6\xBD |0
+<U95DC> \xEF\xF0 |0
+<U95DD> \x8F\xE6\xBE |0
+<U95DE> \x8F\xE6\xBF |0
+<U95DF> \x8F\xE6\xC0 |0
+<U95E0> \x8F\xE6\xC1 |0
+<U95E1> \xEF\xF1 |0
+<U95E2> \xEF\xF3 |0
+<U95E4> \x8F\xE6\xC2 |0
+<U95E5> \xEF\xF2 |0
+<U95E6> \x8F\xE6\xC3 |0
+<U961C> \xC9\xEC |0
+<U961D> \x8F\xE6\xC4 |0
+<U961E> \x8F\xE6\xC5 |0
+<U9621> \xEF\xF4 |0
+<U9622> \x8F\xE6\xC6 |0
+<U9624> \x8F\xE6\xC7 |0
+<U9625> \x8F\xE6\xC8 |0
+<U9626> \x8F\xE6\xC9 |0
+<U9628> \xEF\xF5 |0
+<U962A> \xBA\xE5 |0
+<U962C> \x8F\xE6\xCA |0
+<U962E> \xEF\xF6 |0
+<U962F> \xEF\xF7 |0
+<U9631> \x8F\xE6\xCB |0
+<U9632> \xCB\xC9 |0
+<U9633> \x8F\xE6\xCC |0
+<U9637> \x8F\xE6\xCD |0
+<U9638> \x8F\xE6\xCE |0
+<U9639> \x8F\xE6\xCF |0
+<U963A> \x8F\xE6\xD0 |0
+<U963B> \xC1\xCB |0
+<U963C> \x8F\xE6\xD1 |0
+<U963D> \x8F\xE6\xD2 |0
+<U963F> \xB0\xA4 |0
+<U9640> \xC2\xCB |0
+<U9641> \x8F\xE6\xD3 |0
+<U9642> \xEF\xF8 |0
+<U9644> \xC9\xED |0
+<U964B> \xEF\xFB |0
+<U964C> \xEF\xF9 |0
+<U964D> \xB9\xDF |0
+<U964F> \xEF\xFA |0
+<U9650> \xB8\xC2 |0
+<U9652> \x8F\xE6\xD4 |0
+<U9654> \x8F\xE6\xD5 |0
+<U9656> \x8F\xE6\xD6 |0
+<U9657> \x8F\xE6\xD7 |0
+<U9658> \x8F\xE6\xD8 |0
+<U965B> \xCA\xC5 |0
+<U965C> \xEF\xFD |0
+<U965D> \xF0\xA1 |0
+<U965E> \xEF\xFE |0
+<U965F> \xF0\xA2 |0
+<U9661> \x8F\xE6\xD9 |0
+<U9662> \xB1\xA1 |0
+<U9663> \xBF\xD8 |0
+<U9664> \xBD\xFC |0
+<U9665> \xB4\xD9 |0
+<U9666> \xF0\xA3 |0
+<U966A> \xC7\xE6 |0
+<U966C> \xF0\xA5 |0
+<U966E> \x8F\xE6\xDA |0
+<U9670> \xB1\xA2 |0
+<U9672> \xF0\xA4 |0
+<U9673> \xC4\xC4 |0
+<U9674> \x8F\xE6\xDB |0
+<U9675> \xCE\xCD |0
+<U9676> \xC6\xAB |0
+<U9677> \xEF\xFC |0
+<U9678> \xCE\xA6 |0
+<U967A> \xB8\xB1 |0
+<U967B> \x8F\xE6\xDC |0
+<U967C> \x8F\xE6\xDD |0
+<U967D> \xCD\xDB |0
+<U967E> \x8F\xE6\xDE |0
+<U967F> \x8F\xE6\xDF |0
+<U9681> \x8F\xE6\xE0 |0
+<U9682> \x8F\xE6\xE1 |0
+<U9683> \x8F\xE6\xE2 |0
+<U9684> \x8F\xE6\xE3 |0
+<U9685> \xB6\xF9 |0
+<U9686> \xCE\xB4 |0
+<U9688> \xB7\xA8 |0
+<U9689> \x8F\xE6\xE4 |0
+<U968A> \xC2\xE2 |0
+<U968B> \xE7\xA1 |0
+<U968D> \xF0\xA6 |0
+<U968E> \xB3\xAC |0
+<U968F> \xBF\xEF |0
+<U9691> \x8F\xE6\xE5 |0
+<U9694> \xB3\xD6 |0
+<U9695> \xF0\xA8 |0
+<U9696> \x8F\xE6\xE6 |0
+<U9697> \xF0\xA9 |0
+<U9698> \xF0\xA7 |0
+<U9699> \xB7\xE4 |0
+<U969A> \x8F\xE6\xE7 |0
+<U969B> \xBA\xDD |0
+<U969C> \xBE\xE3 |0
+<U969D> \x8F\xE6\xE8 |3
+<U969D> \xFC\xD1 |0
+<U969F> \x8F\xE6\xE9 |0
+<U96A0> \xB1\xA3 |0
+<U96A3> \xCE\xD9 |0
+<U96A4> \x8F\xE6\xEA |0
+<U96A5> \x8F\xE6\xEB |0
+<U96A6> \x8F\xE6\xEC |0
+<U96A7> \xF0\xAB |0
+<U96A8> \xEE\xAE |0
+<U96A9> \x8F\xE6\xED |0
+<U96AA> \xF0\xAA |0
+<U96AE> \x8F\xE6\xEE |0
+<U96AF> \x8F\xE6\xEF |3
+<U96AF> \xFC\xD2 |0
+<U96B0> \xF0\xAE |0
+<U96B1> \xF0\xAC |0
+<U96B2> \xF0\xAD |0
+<U96B3> \x8F\xE6\xF0 |0
+<U96B4> \xF0\xAF |0
+<U96B6> \xF0\xB0 |0
+<U96B7> \xCE\xEC |0
+<U96B8> \xF0\xB1 |0
+<U96B9> \xF0\xB2 |0
+<U96BA> \x8F\xE6\xF1 |0
+<U96BB> \xC0\xC9 |0
+<U96BC> \xC8\xBB |0
+<U96C0> \xBF\xFD |0
+<U96C1> \xB4\xE7 |0
+<U96C4> \xCD\xBA |0
+<U96C5> \xB2\xED |0
+<U96C6> \xBD\xB8 |0
+<U96C7> \xB8\xDB |0
+<U96C9> \xF0\xB5 |0
+<U96CA> \x8F\xE6\xF2 |0
+<U96CB> \xF0\xB4 |0
+<U96CC> \xBB\xF3 |0
+<U96CD> \xF0\xB6 |0
+<U96CE> \xF0\xB3 |0
+<U96D1> \xBB\xA8 |0
+<U96D2> \x8F\xE6\xF3 |0
+<U96D5> \xF0\xBA |0
+<U96D6> \xEA\xAD |0
+<U96D8> \x8F\xE6\xF5 |0
+<U96D9> \xD2\xD6 |0
+<U96DA> \x8F\xE6\xF6 |0
+<U96DB> \xBF\xF7 |0
+<U96DC> \xF0\xB8 |0
+<U96DD> \x8F\xE6\xF7 |0
+<U96DE> \x8F\xE6\xF8 |0
+<U96DF> \x8F\xE6\xF9 |0
+<U96E2> \xCE\xA5 |0
+<U96E3> \xC6\xF1 |0
+<U96E8> \xB1\xAB |0
+<U96E9> \x8F\xE6\xFA |0
+<U96EA> \xC0\xE3 |0
+<U96EB> \xBC\xB6 |0
+<U96EF> \x8F\xE6\xFB |0
+<U96F0> \xCA\xB7 |0
+<U96F1> \x8F\xE6\xFC |0
+<U96F2> \xB1\xC0 |0
+<U96F6> \xCE\xED |0
+<U96F7> \xCD\xEB |0
+<U96F9> \xF0\xBB |0
+<U96FA> \x8F\xE6\xFD |0
+<U96FB> \xC5\xC5 |0
+<U9700> \xBC\xFB |0
+<U9702> \x8F\xE6\xFE |0
+<U9703> \x8F\xE7\xA1 |0
+<U9704> \xF0\xBC |0
+<U9705> \x8F\xE7\xA2 |0
+<U9706> \xF0\xBD |0
+<U9707> \xBF\xCC |0
+<U9708> \xF0\xBE |0
+<U9709> \x8F\xE7\xA3 |0
+<U970A> \xCE\xEE |0
+<U970D> \xF0\xB9 |0
+<U970E> \xF0\xC0 |0
+<U970F> \xF0\xC2 |0
+<U9711> \xF0\xC1 |0
+<U9713> \xF0\xBF |0
+<U9716> \xF0\xC3 |0
+<U9719> \xF0\xC4 |0
+<U971A> \x8F\xE7\xA4 |0
+<U971B> \x8F\xE7\xA5 |0
+<U971C> \xC1\xFA |0
+<U971D> \x8F\xE7\xA6 |0
+<U971E> \xB2\xE2 |0
+<U9721> \x8F\xE7\xA7 |0
+<U9722> \x8F\xE7\xA8 |0
+<U9723> \x8F\xE7\xA9 |0
+<U9724> \xF0\xC5 |0
+<U9727> \xCC\xB8 |0
+<U9728> \x8F\xE7\xAA |0
+<U972A> \xF0\xC6 |0
+<U9730> \xF0\xC7 |0
+<U9731> \x8F\xE7\xAB |0
+<U9732> \xCF\xAA |0
+<U9733> \x8F\xE7\xAC |3
+<U9733> \xFC\xD3 |0
+<U9738> \xDB\xB1 |0
+<U9739> \xF0\xC8 |0
+<U973B> \xFC\xD4 |0
+<U973D> \xF0\xC9 |0
+<U973E> \xF0\xCA |0
+<U9741> \x8F\xE7\xAD |0
+<U9742> \xF0\xCE |0
+<U9743> \x8F\xE7\xAE |3
+<U9743> \xFC\xD5 |0
+<U9744> \xF0\xCB |0
+<U9746> \xF0\xCC |0
+<U9748> \xF0\xCD |0
+<U9749> \xF0\xCF |0
+<U974A> \x8F\xE7\xAF |0
+<U974D> \xFC\xD6 |0
+<U974E> \x8F\xE7\xB0 |0
+<U974F> \x8F\xE7\xB1 |3
+<U974F> \xFC\xD7 |0
+<U9751> \xFC\xD8 |0
+<U9752> \xC0\xC4 |0
+<U9755> \x8F\xE7\xB2 |3
+<U9755> \xFC\xD9 |0
+<U9756> \xCC\xF7 |0
+<U9757> \x8F\xE7\xB3 |0
+<U9758> \x8F\xE7\xB4 |0
+<U9759> \xC0\xC5 |0
+<U975A> \x8F\xE7\xB5 |0
+<U975B> \x8F\xE7\xB6 |0
+<U975C> \xF0\xD0 |0
+<U975E> \xC8\xF3 |0
+<U9760> \xF0\xD1 |0
+<U9761> \xF3\xD3 |0
+<U9762> \xCC\xCC |0
+<U9763> \x8F\xE7\xB7 |0
+<U9764> \xF0\xD2 |0
+<U9766> \xF0\xD3 |0
+<U9767> \x8F\xE7\xB8 |0
+<U9768> \xF0\xD4 |0
+<U9769> \xB3\xD7 |0
+<U976A> \x8F\xE7\xB9 |0
+<U976B> \xF0\xD6 |0
+<U976D> \xBF\xD9 |0
+<U976E> \x8F\xE7\xBA |0
+<U9771> \xF0\xD7 |0
+<U9773> \x8F\xE7\xBB |0
+<U9774> \xB7\xA4 |0
+<U9776> \x8F\xE7\xBC |0
+<U9777> \x8F\xE7\xBD |0
+<U9778> \x8F\xE7\xBE |0
+<U9779> \xF0\xD8 |0
+<U977A> \xF0\xDC |0
+<U977B> \x8F\xE7\xBF |0
+<U977C> \xF0\xDA |0
+<U977D> \x8F\xE7\xC0 |0
+<U977F> \x8F\xE7\xC1 |0
+<U9780> \x8F\xE7\xC2 |0
+<U9781> \xF0\xDB |0
+<U9784> \xB3\xF3 |0
+<U9785> \xF0\xD9 |0
+<U9786> \xF0\xDD |0
+<U9789> \x8F\xE7\xC3 |0
+<U978B> \xF0\xDE |0
+<U978D> \xB0\xC8 |0
+<U978F> \xF0\xDF |0
+<U9790> \xF0\xE0 |0
+<U9795> \x8F\xE7\xC4 |0
+<U9796> \x8F\xE7\xC5 |0
+<U9797> \x8F\xE7\xC6 |0
+<U9798> \xBE\xE4 |0
+<U9799> \x8F\xE7\xC7 |0
+<U979A> \x8F\xE7\xC8 |0
+<U979C> \xF0\xE1 |0
+<U979E> \x8F\xE7\xC9 |0
+<U979F> \x8F\xE7\xCA |0
+<U97A0> \xB5\xC7 |0
+<U97A2> \x8F\xE7\xCB |0
+<U97A3> \xF0\xE4 |0
+<U97A6> \xF0\xE3 |0
+<U97A8> \xF0\xE2 |0
+<U97AB> \xEB\xF1 |0
+<U97AC> \x8F\xE7\xCC |0
+<U97AD> \xCA\xDC |0
+<U97AE> \x8F\xE7\xCD |0
+<U97B1> \x8F\xE7\xCE |0
+<U97B2> \x8F\xE7\xCF |0
+<U97B3> \xF0\xE5 |0
+<U97B4> \xF0\xE6 |0
+<U97B5> \x8F\xE7\xD0 |0
+<U97B6> \x8F\xE7\xD1 |0
+<U97B8> \x8F\xE7\xD2 |0
+<U97B9> \x8F\xE7\xD3 |0
+<U97BA> \x8F\xE7\xD4 |0
+<U97BC> \x8F\xE7\xD5 |0
+<U97BE> \x8F\xE7\xD6 |0
+<U97BF> \x8F\xE7\xD7 |0
+<U97C1> \x8F\xE7\xD8 |0
+<U97C3> \xF0\xE7 |0
+<U97C4> \x8F\xE7\xD9 |0
+<U97C5> \x8F\xE7\xDA |0
+<U97C6> \xF0\xE8 |0
+<U97C7> \x8F\xE7\xDB |0
+<U97C8> \xF0\xE9 |0
+<U97C9> \x8F\xE7\xDC |0
+<U97CA> \x8F\xE7\xDD |0
+<U97CB> \xF0\xEA |0
+<U97CC> \x8F\xE7\xDE |0
+<U97CD> \x8F\xE7\xDF |0
+<U97CE> \x8F\xE7\xE0 |0
+<U97D0> \x8F\xE7\xE1 |0
+<U97D1> \x8F\xE7\xE2 |0
+<U97D3> \xB4\xDA |0
+<U97D4> \x8F\xE7\xE3 |0
+<U97D7> \x8F\xE7\xE4 |0
+<U97D8> \x8F\xE7\xE5 |0
+<U97D9> \x8F\xE7\xE6 |0
+<U97DB> \x8F\xE7\xEA |0
+<U97DC> \xF0\xEB |0
+<U97DD> \x8F\xE7\xE7 |0
+<U97DE> \x8F\xE7\xE8 |0
+<U97E0> \x8F\xE7\xE9 |0
+<U97E1> \x8F\xE7\xEB |0
+<U97E4> \x8F\xE7\xEC |0
+<U97ED> \xF0\xEC |0
+<U97EE> \xC7\xA3 |0
+<U97EF> \x8F\xE7\xED |0
+<U97F1> \x8F\xE7\xEE |0
+<U97F2> \xF0\xEE |0
+<U97F3> \xB2\xBB |0
+<U97F4> \x8F\xE7\xEF |0
+<U97F5> \xF0\xF1 |0
+<U97F6> \xF0\xF0 |0
+<U97F7> \x8F\xE7\xF0 |0
+<U97F8> \x8F\xE7\xF1 |0
+<U97FA> \x8F\xE7\xF2 |0
+<U97FB> \xB1\xA4 |0
+<U97FF> \xB6\xC1 |0
+<U9801> \xCA\xC7 |0
+<U9802> \xC4\xBA |0
+<U9803> \xBA\xA2 |0
+<U9805> \xB9\xE0 |0
+<U9806> \xBD\xE7 |0
+<U9807> \x8F\xE7\xF3 |0
+<U9808> \xBF\xDC |0
+<U980A> \x8F\xE7\xF4 |0
+<U980C> \xF0\xF3 |0
+<U980D> \x8F\xE7\xF6 |0
+<U980E> \x8F\xE7\xF7 |0
+<U980F> \xF0\xF2 |0
+<U9810> \xCD\xC2 |0
+<U9811> \xB4\xE8 |0
+<U9812> \xC8\xD2 |0
+<U9813> \xC6\xDC |0
+<U9814> \x8F\xE7\xF8 |0
+<U9816> \x8F\xE7\xF9 |0
+<U9817> \xBF\xFC |0
+<U9818> \xCE\xCE |0
+<U9819> \x8F\xE7\xF5 |0
+<U981A> \xB7\xDB |0
+<U981C> \x8F\xE7\xFA |0
+<U981E> \x8F\xE7\xFB |0
+<U9820> \x8F\xE7\xFC |0
+<U9821> \xF0\xF6 |0
+<U9823> \x8F\xE7\xFD |0
+<U9824> \xF0\xF5 |0
+<U9825> \x8F\xE8\xA8 |0
+<U9826> \x8F\xE7\xFE |0
+<U982B> \x8F\xE8\xA1 |0
+<U982C> \xCB\xCB |0
+<U982D> \xC6\xAC |0
+<U982E> \x8F\xE8\xA2 |0
+<U982F> \x8F\xE8\xA3 |0
+<U9830> \x8F\xE8\xA4 |0
+<U9832> \x8F\xE8\xA5 |0
+<U9833> \x8F\xE8\xA6 |0
+<U9834> \xB1\xD0 |0
+<U9835> \x8F\xE8\xA7 |0
+<U9837> \xF0\xF7 |0
+<U9838> \xF0\xF4 |0
+<U9839> \xF0\xF8 |1
+<U983B> \xC9\xD1 |0
+<U983C> \xCD\xEA |0
+<U983D> \xF0\xF8 |0
+<U983E> \x8F\xE8\xA9 |0
+<U9844> \x8F\xE8\xAA |0
+<U9846> \xF0\xF9 |0
+<U9847> \x8F\xE8\xAB |0
+<U984A> \x8F\xE8\xAC |0
+<U984B> \xF0\xFB |0
+<U984C> \xC2\xEA |0
+<U984D> \xB3\xDB |0
+<U984E> \xB3\xDC |0
+<U984F> \xF0\xFA |0
+<U9851> \x8F\xE8\xAD |0
+<U9852> \x8F\xE8\xAE |0
+<U9853> \x8F\xE8\xAF |0
+<U9854> \xB4\xE9 |0
+<U9855> \xB8\xB2 |0
+<U9856> \x8F\xE8\xB0 |0
+<U9857> \x8F\xE8\xB1 |3
+<U9857> \xFC\xDA |0
+<U9858> \xB4\xEA |0
+<U9859> \x8F\xE8\xB2 |0
+<U985A> \x8F\xE8\xB3 |0
+<U985B> \xC5\xBF |0
+<U985E> \xCE\xE0 |0
+<U9862> \x8F\xE8\xB4 |0
+<U9863> \x8F\xE8\xB5 |0
+<U9865> \x8F\xE8\xB6 |3
+<U9865> \xFC\xDB |0
+<U9866> \x8F\xE8\xB7 |0
+<U9867> \xB8\xDC |0
+<U986A> \x8F\xE8\xB8 |0
+<U986B> \xF0\xFC |0
+<U986C> \x8F\xE8\xB9 |0
+<U986F> \xF0\xFD |0
+<U9870> \xF0\xFE |0
+<U9871> \xF1\xA1 |0
+<U9873> \xF1\xA3 |0
+<U9874> \xF1\xA2 |0
+<U98A8> \xC9\xF7 |0
+<U98AA> \xF1\xA4 |0
+<U98AB> \x8F\xE8\xBA |0
+<U98AD> \x8F\xE8\xBB |0
+<U98AE> \x8F\xE8\xBC |0
+<U98AF> \xF1\xA5 |0
+<U98B0> \x8F\xE8\xBD |0
+<U98B1> \xF1\xA6 |0
+<U98B4> \x8F\xE8\xBE |0
+<U98B6> \xF1\xA7 |0
+<U98B7> \x8F\xE8\xBF |0
+<U98B8> \x8F\xE8\xC0 |0
+<U98BA> \x8F\xE8\xC1 |0
+<U98BB> \x8F\xE8\xC2 |0
+<U98BF> \x8F\xE8\xC3 |0
+<U98C2> \x8F\xE8\xC4 |0
+<U98C3> \xF1\xA9 |0
+<U98C4> \xF1\xA8 |0
+<U98C5> \x8F\xE8\xC5 |0
+<U98C6> \xF1\xAA |0
+<U98C8> \x8F\xE8\xC6 |0
+<U98CC> \x8F\xE8\xC7 |0
+<U98DB> \xC8\xF4 |0
+<U98DC> \xE6\xCC |0
+<U98DF> \xBF\xA9 |0
+<U98E1> \x8F\xE8\xC8 |0
+<U98E2> \xB5\xB2 |0
+<U98E3> \x8F\xE8\xC9 |0
+<U98E5> \x8F\xE8\xCA |0
+<U98E6> \x8F\xE8\xCB |0
+<U98E7> \x8F\xE8\xCC |0
+<U98E9> \xF1\xAB |0
+<U98EA> \x8F\xE8\xCD |0
+<U98EB> \xF1\xAC |0
+<U98ED> \xD2\xAC |0
+<U98EE> \xDD\xBB |0
+<U98EF> \xC8\xD3 |0
+<U98F2> \xB0\xFB |0
+<U98F3> \x8F\xE8\xCE |0
+<U98F4> \xB0\xBB |0
+<U98F6> \x8F\xE8\xCF |0
+<U98FC> \xBB\xF4 |0
+<U98FD> \xCB\xB0 |0
+<U98FE> \xBE\xFE |0
+<U9902> \x8F\xE8\xD0 |0
+<U9903> \xF1\xAD |0
+<U9905> \xCC\xDF |0
+<U9907> \x8F\xE8\xD1 |0
+<U9908> \x8F\xE8\xD2 |0
+<U9909> \xF1\xAE |0
+<U990A> \xCD\xDC |0
+<U990C> \xB1\xC2 |0
+<U9910> \xBB\xC1 |0
+<U9911> \x8F\xE8\xD3 |0
+<U9912> \xF1\xAF |0
+<U9913> \xB2\xEE |0
+<U9914> \xF1\xB0 |0
+<U9915> \x8F\xE8\xD4 |0
+<U9916> \x8F\xE8\xD5 |0
+<U9917> \x8F\xE8\xD6 |0
+<U9918> \xF1\xB1 |0
+<U991A> \x8F\xE8\xD7 |0
+<U991B> \x8F\xE8\xD8 |0
+<U991C> \x8F\xE8\xD9 |0
+<U991D> \xF1\xB3 |0
+<U991E> \xF1\xB4 |0
+<U991F> \x8F\xE8\xDA |0
+<U9920> \xF1\xB6 |0
+<U9921> \xF1\xB2 |0
+<U9922> \x8F\xE8\xDB |0
+<U9924> \xF1\xB5 |0
+<U9926> \x8F\xE8\xDC |0
+<U9927> \x8F\xE8\xDD |3
+<U9927> \xFC\xDE |0
+<U9928> \xB4\xDB |0
+<U992B> \x8F\xE8\xDE |0
+<U992C> \xF1\xB7 |0
+<U992E> \xF1\xB8 |0
+<U9931> \x8F\xE8\xDF |0
+<U9932> \x8F\xE8\xE0 |0
+<U9933> \x8F\xE8\xE1 |0
+<U9934> \x8F\xE8\xE2 |0
+<U9935> \x8F\xE8\xE3 |0
+<U9939> \x8F\xE8\xE4 |0
+<U993A> \x8F\xE8\xE5 |0
+<U993B> \x8F\xE8\xE6 |0
+<U993C> \x8F\xE8\xE7 |0
+<U993D> \xF1\xB9 |0
+<U993E> \xF1\xBA |0
+<U9940> \x8F\xE8\xE8 |0
+<U9941> \x8F\xE8\xE9 |0
+<U9942> \xF1\xBB |0
+<U9945> \xF1\xBD |0
+<U9946> \x8F\xE8\xEA |0
+<U9947> \x8F\xE8\xEB |0
+<U9948> \x8F\xE8\xEC |0
+<U9949> \xF1\xBC |0
+<U994B> \xF1\xBF |0
+<U994C> \xF1\xC2 |0
+<U994D> \x8F\xE8\xED |0
+<U994E> \x8F\xE8\xEE |0
+<U9950> \xF1\xBE |0
+<U9951> \xF1\xC0 |0
+<U9952> \xF1\xC1 |0
+<U9954> \x8F\xE8\xEF |0
+<U9955> \xF1\xC3 |0
+<U9957> \xB6\xC2 |0
+<U9958> \x8F\xE8\xF0 |0
+<U9959> \x8F\xE8\xF1 |0
+<U995B> \x8F\xE8\xF2 |0
+<U995C> \x8F\xE8\xF3 |0
+<U995E> \x8F\xE8\xF4 |0
+<U995F> \x8F\xE8\xF5 |0
+<U9960> \x8F\xE8\xF6 |0
+<U9996> \xBC\xF3 |0
+<U9997> \xF1\xC4 |0
+<U9998> \xF1\xC5 |0
+<U9999> \xB9\xE1 |0
+<U999B> \x8F\xE8\xF7 |0
+<U999D> \x8F\xE8\xF8 |0
+<U999E> \xFC\xE0 |0
+<U999F> \x8F\xE8\xF9 |0
+<U99A5> \xF1\xC6 |0
+<U99A6> \x8F\xE8\xFA |0
+<U99A8> \xB3\xBE |0
+<U99AC> \xC7\xCF |0
+<U99AD> \xF1\xC7 |0
+<U99AE> \xF1\xC8 |0
+<U99B0> \x8F\xE8\xFB |0
+<U99B1> \x8F\xE8\xFC |0
+<U99B2> \x8F\xE8\xFD |0
+<U99B3> \xC3\xDA |0
+<U99B4> \xC6\xEB |0
+<U99B5> \x8F\xE8\xFE |0
+<U99B9> \x8F\xE9\xA1 |0
+<U99BA> \x8F\xE9\xA2 |0
+<U99BC> \xF1\xC9 |0
+<U99BD> \x8F\xE9\xA3 |0
+<U99BF> \x8F\xE9\xA4 |0
+<U99C1> \xC7\xFD |0
+<U99C3> \x8F\xE9\xA5 |0
+<U99C4> \xC2\xCC |0
+<U99C5> \xB1\xD8 |0
+<U99C6> \xB6\xEE |0
+<U99C8> \xB6\xEF |0
+<U99C9> \x8F\xE9\xA6 |0
+<U99D0> \xC3\xF3 |0
+<U99D1> \xF1\xCE |0
+<U99D2> \xB6\xF0 |0
+<U99D3> \x8F\xE9\xA7 |0
+<U99D4> \x8F\xE9\xA8 |0
+<U99D5> \xB2\xEF |0
+<U99D8> \xF1\xCD |0
+<U99D9> \x8F\xE9\xA9 |0
+<U99DA> \x8F\xE9\xAA |0
+<U99DB> \xF1\xCB |0
+<U99DC> \x8F\xE9\xAB |0
+<U99DD> \xF1\xCC |0
+<U99DE> \x8F\xE9\xAC |0
+<U99DF> \xF1\xCA |0
+<U99E2> \xF1\xD8 |0
+<U99E7> \x8F\xE9\xAD |0
+<U99EA> \x8F\xE9\xAE |0
+<U99EB> \x8F\xE9\xAF |0
+<U99EC> \x8F\xE9\xB0 |0
+<U99ED> \xF1\xCF |0
+<U99EE> \xF1\xD0 |0
+<U99F0> \x8F\xE9\xB1 |0
+<U99F1> \xF1\xD1 |0
+<U99F2> \xF1\xD2 |0
+<U99F4> \x8F\xE9\xB2 |0
+<U99F5> \x8F\xE9\xB3 |0
+<U99F8> \xF1\xD4 |0
+<U99F9> \x8F\xE9\xB4 |0
+<U99FB> \xF1\xD3 |0
+<U99FD> \x8F\xE9\xB5 |0
+<U99FE> \x8F\xE9\xB6 |0
+<U99FF> \xBD\xD9 |0
+<U9A01> \xF1\xD5 |0
+<U9A02> \x8F\xE9\xB7 |0
+<U9A03> \x8F\xE9\xB8 |0
+<U9A04> \x8F\xE9\xB9 |0
+<U9A05> \xF1\xD7 |0
+<U9A0B> \x8F\xE9\xBA |0
+<U9A0C> \x8F\xE9\xBB |0
+<U9A0E> \xB5\xB3 |0
+<U9A0F> \xF1\xD6 |0
+<U9A10> \x8F\xE9\xBC |0
+<U9A11> \x8F\xE9\xBD |0
+<U9A12> \xC1\xFB |0
+<U9A13> \xB8\xB3 |0
+<U9A16> \x8F\xE9\xBE |0
+<U9A19> \xF1\xD9 |0
+<U9A1E> \x8F\xE9\xBF |0
+<U9A20> \x8F\xE9\xC0 |0
+<U9A22> \x8F\xE9\xC1 |0
+<U9A23> \x8F\xE9\xC2 |0
+<U9A24> \x8F\xE9\xC3 |0
+<U9A27> \x8F\xE9\xC4 |0
+<U9A28> \xC2\xCD |0
+<U9A2B> \xF1\xDA |0
+<U9A2D> \x8F\xE9\xC5 |0
+<U9A2E> \x8F\xE9\xC6 |0
+<U9A30> \xC6\xAD |0
+<U9A33> \x8F\xE9\xC7 |0
+<U9A35> \x8F\xE9\xC8 |0
+<U9A36> \x8F\xE9\xC9 |0
+<U9A37> \xF1\xDB |0
+<U9A38> \x8F\xE9\xCA |0
+<U9A3E> \xF1\xE0 |0
+<U9A40> \xF1\xDE |0
+<U9A41> \x8F\xE9\xCC |0
+<U9A42> \xF1\xDD |0
+<U9A43> \xF1\xDF |0
+<U9A44> \x8F\xE9\xCD |0
+<U9A45> \xF1\xDC |0
+<U9A47> \x8F\xE9\xCB |0
+<U9A4A> \x8F\xE9\xCE |0
+<U9A4B> \x8F\xE9\xCF |0
+<U9A4C> \x8F\xE9\xD0 |0
+<U9A4D> \xF1\xE2 |0
+<U9A4E> \x8F\xE9\xD1 |3
+<U9A4E> \xFC\xE1 |0
+<U9A51> \x8F\xE9\xD2 |0
+<U9A52> \xC2\xCD |1
+<U9A54> \x8F\xE9\xD3 |0
+<U9A55> \xF1\xE1 |0
+<U9A56> \x8F\xE9\xD4 |0
+<U9A57> \xF1\xE4 |0
+<U9A5A> \xB6\xC3 |0
+<U9A5B> \xF1\xE3 |0
+<U9A5D> \x8F\xE9\xD5 |0
+<U9A5F> \xF1\xE5 |0
+<U9A62> \xF1\xE6 |0
+<U9A64> \xF1\xE8 |0
+<U9A65> \xF1\xE7 |0
+<U9A69> \xF1\xE9 |0
+<U9A6A> \xF1\xEB |0
+<U9A6B> \xF1\xEA |0
+<U9AA8> \xB9\xFC |0
+<U9AAA> \x8F\xE9\xD6 |0
+<U9AAC> \x8F\xE9\xD7 |0
+<U9AAD> \xF1\xEC |0
+<U9AAE> \x8F\xE9\xD8 |0
+<U9AAF> \x8F\xE9\xD9 |0
+<U9AB0> \xF1\xED |0
+<U9AB2> \x8F\xE9\xDA |0
+<U9AB4> \x8F\xE9\xDB |0
+<U9AB5> \x8F\xE9\xDC |0
+<U9AB6> \x8F\xE9\xDD |0
+<U9AB8> \xB3\xBC |0
+<U9AB9> \x8F\xE9\xDE |0
+<U9ABB> \x8F\xE9\xDF |0
+<U9ABC> \xF1\xEE |0
+<U9ABE> \x8F\xE9\xE0 |0
+<U9ABF> \x8F\xE9\xE1 |0
+<U9AC0> \xF1\xEF |0
+<U9AC1> \x8F\xE9\xE2 |0
+<U9AC3> \x8F\xE9\xE3 |0
+<U9AC4> \xBF\xF1 |0
+<U9AC6> \x8F\xE9\xE4 |0
+<U9AC8> \x8F\xE9\xE5 |0
+<U9ACE> \x8F\xE9\xE6 |0
+<U9ACF> \xF1\xF0 |0
+<U9AD0> \x8F\xE9\xE7 |0
+<U9AD1> \xF1\xF1 |0
+<U9AD2> \x8F\xE9\xE8 |0
+<U9AD3> \xF1\xF2 |0
+<U9AD4> \xF1\xF3 |0
+<U9AD5> \x8F\xE9\xE9 |0
+<U9AD6> \x8F\xE9\xEA |0
+<U9AD7> \x8F\xE9\xEB |0
+<U9AD8> \xB9\xE2 |0
+<U9AD9> \xFC\xE2 |0
+<U9ADB> \x8F\xE9\xEC |0
+<U9ADC> \x8F\xE9\xED |3
+<U9ADC> \xFC\xE3 |0
+<U9ADE> \xF1\xF4 |0
+<U9ADF> \xF1\xF5 |0
+<U9AE0> \x8F\xE9\xEE |0
+<U9AE2> \xF1\xF6 |0
+<U9AE3> \xF1\xF7 |0
+<U9AE4> \x8F\xE9\xEF |0
+<U9AE5> \x8F\xE9\xF0 |0
+<U9AE6> \xF1\xF8 |0
+<U9AE7> \x8F\xE9\xF1 |0
+<U9AE9> \x8F\xE9\xF2 |0
+<U9AEA> \xC8\xB1 |0
+<U9AEB> \xF1\xFA |0
+<U9AEC> \x8F\xE9\xF3 |0
+<U9AED> \xC9\xA6 |0
+<U9AEE> \xF1\xFB |0
+<U9AEF> \xF1\xF9 |0
+<U9AF1> \xF1\xFD |0
+<U9AF2> \x8F\xE9\xF4 |0
+<U9AF3> \x8F\xE9\xF5 |0
+<U9AF4> \xF1\xFC |0
+<U9AF5> \x8F\xE9\xF6 |0
+<U9AF7> \xF1\xFE |0
+<U9AF9> \x8F\xE9\xF7 |0
+<U9AFA> \x8F\xE9\xF8 |0
+<U9AFB> \xF2\xA1 |0
+<U9AFD> \x8F\xE9\xF9 |0
+<U9AFF> \x8F\xE9\xFA |0
+<U9B00> \x8F\xE9\xFB |0
+<U9B01> \x8F\xE9\xFC |0
+<U9B02> \x8F\xE9\xFD |0
+<U9B03> \x8F\xE9\xFE |0
+<U9B04> \x8F\xEA\xA1 |0
+<U9B05> \x8F\xEA\xA2 |0
+<U9B06> \xF2\xA2 |0
+<U9B08> \x8F\xEA\xA3 |0
+<U9B09> \x8F\xEA\xA4 |0
+<U9B0B> \x8F\xEA\xA5 |0
+<U9B0C> \x8F\xEA\xA6 |0
+<U9B0D> \x8F\xEA\xA7 |0
+<U9B0E> \x8F\xEA\xA8 |0
+<U9B10> \x8F\xEA\xA9 |0
+<U9B12> \x8F\xEA\xAA |0
+<U9B16> \x8F\xEA\xAB |0
+<U9B18> \xF2\xA3 |0
+<U9B19> \x8F\xEA\xAC |0
+<U9B1A> \xF2\xA4 |0
+<U9B1B> \x8F\xEA\xAD |0
+<U9B1C> \x8F\xEA\xAE |0
+<U9B1F> \xF2\xA5 |0
+<U9B20> \x8F\xEA\xAF |0
+<U9B22> \xF2\xA6 |0
+<U9B23> \xF2\xA7 |0
+<U9B25> \xF2\xA8 |0
+<U9B26> \x8F\xEA\xB0 |0
+<U9B27> \xF2\xA9 |0
+<U9B28> \xF2\xAA |0
+<U9B29> \xF2\xAB |0
+<U9B2A> \xF2\xAC |0
+<U9B2B> \x8F\xEA\xB1 |0
+<U9B2D> \x8F\xEA\xB2 |0
+<U9B2E> \xF2\xAD |0
+<U9B2F> \xF2\xAE |0
+<U9B31> \xDD\xB5 |0
+<U9B32> \xF2\xAF |0
+<U9B33> \x8F\xEA\xB3 |0
+<U9B34> \x8F\xEA\xB4 |0
+<U9B35> \x8F\xEA\xB5 |0
+<U9B37> \x8F\xEA\xB6 |0
+<U9B39> \x8F\xEA\xB7 |0
+<U9B3A> \x8F\xEA\xB8 |0
+<U9B3B> \xE4\xF8 |0
+<U9B3C> \xB5\xB4 |0
+<U9B3D> \x8F\xEA\xB9 |0
+<U9B41> \xB3\xA1 |0
+<U9B42> \xBA\xB2 |0
+<U9B43> \xF2\xB1 |0
+<U9B44> \xF2\xB0 |0
+<U9B45> \xCC\xA5 |0
+<U9B48> \x8F\xEA\xBA |0
+<U9B4B> \x8F\xEA\xBB |0
+<U9B4C> \x8F\xEA\xBC |0
+<U9B4D> \xF2\xB3 |0
+<U9B4E> \xF2\xB4 |0
+<U9B4F> \xF2\xB2 |0
+<U9B51> \xF2\xB5 |0
+<U9B54> \xCB\xE2 |0
+<U9B55> \x8F\xEA\xBD |0
+<U9B56> \x8F\xEA\xBE |0
+<U9B57> \x8F\xEA\xBF |0
+<U9B58> \xF2\xB6 |0
+<U9B5A> \xB5\xFB |0
+<U9B5B> \x8F\xEA\xC0 |0
+<U9B5E> \x8F\xEA\xC1 |0
+<U9B61> \x8F\xEA\xC2 |0
+<U9B63> \x8F\xEA\xC3 |0
+<U9B65> \x8F\xEA\xC4 |0
+<U9B66> \x8F\xEA\xC5 |0
+<U9B68> \x8F\xEA\xC6 |0
+<U9B6A> \x8F\xEA\xC7 |0
+<U9B6B> \x8F\xEA\xC8 |0
+<U9B6C> \x8F\xEA\xC9 |0
+<U9B6D> \x8F\xEA\xCA |0
+<U9B6E> \x8F\xEA\xCB |0
+<U9B6F> \xCF\xA5 |0
+<U9B72> \xFC\xE5 |0
+<U9B73> \x8F\xEA\xCC |0
+<U9B74> \xF2\xB7 |0
+<U9B75> \x8F\xEA\xCD |3
+<U9B75> \xFC\xE4 |0
+<U9B77> \x8F\xEA\xCE |0
+<U9B78> \x8F\xEA\xCF |0
+<U9B79> \x8F\xEA\xD0 |0
+<U9B7F> \x8F\xEA\xD1 |0
+<U9B80> \x8F\xEA\xD2 |0
+<U9B83> \xF2\xB9 |0
+<U9B84> \x8F\xEA\xD3 |0
+<U9B85> \x8F\xEA\xD4 |0
+<U9B86> \x8F\xEA\xD5 |0
+<U9B87> \x8F\xEA\xD6 |0
+<U9B89> \x8F\xEA\xD7 |0
+<U9B8A> \x8F\xEA\xD8 |0
+<U9B8B> \x8F\xEA\xD9 |0
+<U9B8D> \x8F\xEA\xDA |0
+<U9B8E> \xB0\xBE |0
+<U9B8F> \x8F\xEA\xDB |3
+<U9B8F> \xFC\xE6 |0
+<U9B90> \x8F\xEA\xDC |0
+<U9B91> \xF2\xBA |0
+<U9B92> \xCA\xAB |0
+<U9B93> \xF2\xB8 |0
+<U9B94> \x8F\xEA\xDD |0
+<U9B96> \xF2\xBB |0
+<U9B97> \xF2\xBC |0
+<U9B9A> \x8F\xEA\xDE |0
+<U9B9D> \x8F\xEA\xDF |0
+<U9B9E> \x8F\xEA\xE0 |0
+<U9B9F> \xF2\xBD |0
+<U9BA0> \xF2\xBE |0
+<U9BA6> \x8F\xEA\xE1 |0
+<U9BA7> \x8F\xEA\xE2 |0
+<U9BA8> \xF2\xBF |0
+<U9BA9> \x8F\xEA\xE3 |0
+<U9BAA> \xCB\xEE |0
+<U9BAB> \xBB\xAD |0
+<U9BAC> \x8F\xEA\xE4 |0
+<U9BAD> \xBA\xFA |0
+<U9BAE> \xC1\xAF |0
+<U9BB0> \x8F\xEA\xE5 |0
+<U9BB1> \x8F\xEA\xE6 |3
+<U9BB1> \xFC\xE7 |0
+<U9BB2> \x8F\xEA\xE7 |0
+<U9BB4> \xF2\xC0 |0
+<U9BB7> \x8F\xEA\xE8 |0
+<U9BB8> \x8F\xEA\xE9 |0
+<U9BB9> \xF2\xC3 |0
+<U9BBB> \x8F\xEA\xEA |3
+<U9BBB> \xFC\xE8 |0
+<U9BBC> \x8F\xEA\xEB |0
+<U9BBE> \x8F\xEA\xEC |0
+<U9BBF> \x8F\xEA\xED |0
+<U9BC0> \xF2\xC1 |0
+<U9BC1> \x8F\xEA\xEE |0
+<U9BC6> \xF2\xC4 |0
+<U9BC7> \x8F\xEA\xEF |0
+<U9BC8> \x8F\xEA\xF0 |0
+<U9BC9> \xB8\xF1 |0
+<U9BCA> \xF2\xC2 |0
+<U9BCE> \x8F\xEA\xF1 |0
+<U9BCF> \xF2\xC5 |0
+<U9BD0> \x8F\xEA\xF2 |0
+<U9BD1> \xF2\xC6 |0
+<U9BD2> \xF2\xC7 |0
+<U9BD4> \xF2\xCB |0
+<U9BD6> \xBB\xAA |0
+<U9BD7> \x8F\xEA\xF3 |0
+<U9BD8> \x8F\xEA\xF4 |0
+<U9BDB> \xC2\xE4 |0
+<U9BDD> \x8F\xEA\xF5 |0
+<U9BDF> \x8F\xEA\xF6 |0
+<U9BE1> \xF2\xCC |0
+<U9BE2> \xF2\xC9 |0
+<U9BE3> \xF2\xC8 |0
+<U9BE4> \xF2\xCA |0
+<U9BE5> \x8F\xEA\xF7 |0
+<U9BE7> \x8F\xEA\xF8 |0
+<U9BE8> \xB7\xDF |0
+<U9BEA> \x8F\xEA\xF9 |0
+<U9BEB> \x8F\xEA\xFA |0
+<U9BEF> \x8F\xEA\xFB |0
+<U9BF0> \xF2\xD0 |0
+<U9BF1> \xF2\xCF |0
+<U9BF2> \xF2\xCE |0
+<U9BF3> \x8F\xEA\xFC |0
+<U9BF5> \xB0\xB3 |0
+<U9BF7> \x8F\xEA\xFD |0
+<U9BF8> \x8F\xEA\xFE |0
+<U9BF9> \x8F\xEB\xA1 |0
+<U9BFA> \x8F\xEB\xA2 |0
+<U9BFD> \x8F\xEB\xA3 |0
+<U9BFF> \x8F\xEB\xA4 |0
+<U9C00> \x8F\xEB\xA5 |3
+<U9C00> \xFC\xE9 |0
+<U9C02> \x8F\xEB\xA6 |0
+<U9C04> \xF2\xDA |0
+<U9C06> \xF2\xD6 |0
+<U9C08> \xF2\xD7 |0
+<U9C09> \xF2\xD3 |0
+<U9C0A> \xF2\xD9 |0
+<U9C0B> \x8F\xEB\xA7 |0
+<U9C0C> \xF2\xD5 |0
+<U9C0D> \xB3\xE2 |0
+<U9C0F> \x8F\xEB\xA8 |0
+<U9C10> \xCF\xCC |0
+<U9C11> \x8F\xEB\xA9 |0
+<U9C12> \xF2\xD8 |0
+<U9C13> \xF2\xD4 |0
+<U9C14> \xF2\xD2 |0
+<U9C15> \xF2\xD1 |0
+<U9C16> \x8F\xEB\xAA |0
+<U9C18> \x8F\xEB\xAB |0
+<U9C19> \x8F\xEB\xAC |0
+<U9C1A> \x8F\xEB\xAD |0
+<U9C1B> \xF2\xDC |0
+<U9C1C> \x8F\xEB\xAE |0
+<U9C1E> \x8F\xEB\xAF |0
+<U9C21> \xF2\xDF |0
+<U9C22> \x8F\xEB\xB0 |0
+<U9C23> \x8F\xEB\xB1 |0
+<U9C24> \xF2\xDE |0
+<U9C25> \xF2\xDD |0
+<U9C26> \x8F\xEB\xB2 |0
+<U9C27> \x8F\xEB\xB3 |0
+<U9C28> \x8F\xEB\xB4 |0
+<U9C29> \x8F\xEB\xB5 |0
+<U9C2A> \x8F\xEB\xB6 |0
+<U9C2D> \xC9\xC9 |0
+<U9C2E> \xF2\xDB |0
+<U9C2F> \xB0\xF3 |0
+<U9C30> \xF2\xE0 |0
+<U9C31> \x8F\xEB\xB7 |0
+<U9C32> \xF2\xE2 |0
+<U9C35> \x8F\xEB\xB8 |0
+<U9C36> \x8F\xEB\xB9 |0
+<U9C37> \x8F\xEB\xBA |0
+<U9C39> \xB3\xEF |0
+<U9C3A> \xF2\xCD |0
+<U9C3B> \xB1\xB7 |0
+<U9C3D> \x8F\xEB\xBB |0
+<U9C3E> \xF2\xE4 |0
+<U9C41> \x8F\xEB\xBC |0
+<U9C43> \x8F\xEB\xBD |0
+<U9C44> \x8F\xEB\xBE |0
+<U9C45> \x8F\xEB\xBF |0
+<U9C46> \xF2\xE3 |0
+<U9C47> \xF2\xE1 |0
+<U9C48> \xC3\xAD |0
+<U9C49> \x8F\xEB\xC0 |0
+<U9C4A> \x8F\xEB\xC1 |0
+<U9C4E> \x8F\xEB\xC2 |0
+<U9C4F> \x8F\xEB\xC3 |0
+<U9C50> \x8F\xEB\xC4 |0
+<U9C52> \xCB\xF0 |0
+<U9C53> \x8F\xEB\xC5 |0
+<U9C54> \x8F\xEB\xC6 |0
+<U9C56> \x8F\xEB\xC7 |0
+<U9C57> \xCE\xDA |0
+<U9C58> \x8F\xEB\xC8 |0
+<U9C5A> \xF2\xE5 |0
+<U9C5B> \x8F\xEB\xC9 |0
+<U9C5C> \x8F\xEB\xD0 |0
+<U9C5D> \x8F\xEB\xCA |0
+<U9C5E> \x8F\xEB\xCB |0
+<U9C5F> \x8F\xEB\xCC |0
+<U9C60> \xF2\xE6 |0
+<U9C63> \x8F\xEB\xCD |0
+<U9C67> \xF2\xE7 |0
+<U9C68> \x8F\xEB\xD2 |0
+<U9C69> \x8F\xEB\xCE |0
+<U9C6A> \x8F\xEB\xCF |0
+<U9C6B> \x8F\xEB\xD1 |0
+<U9C6E> \x8F\xEB\xD3 |0
+<U9C70> \x8F\xEB\xD4 |0
+<U9C72> \x8F\xEB\xD5 |0
+<U9C75> \x8F\xEB\xD6 |0
+<U9C76> \xF2\xE8 |0
+<U9C77> \x8F\xEB\xD7 |0
+<U9C78> \xF2\xE9 |0
+<U9C7B> \x8F\xEB\xD8 |0
+<U9CE5> \xC4\xBB |0
+<U9CE6> \x8F\xEB\xD9 |0
+<U9CE7> \xF2\xEA |0
+<U9CE9> \xC8\xB7 |0
+<U9CEB> \xF2\xEF |0
+<U9CEC> \xF2\xEB |0
+<U9CF0> \xF2\xEC |0
+<U9CF2> \x8F\xEB\xDA |0
+<U9CF3> \xCB\xB1 |0
+<U9CF4> \xCC\xC4 |0
+<U9CF6> \xC6\xD0 |0
+<U9CF7> \x8F\xEB\xDB |0
+<U9CF9> \x8F\xEB\xDC |0
+<U9D02> \x8F\xEB\xDE |0
+<U9D03> \xF2\xF0 |0
+<U9D06> \xF2\xF1 |0
+<U9D07> \xC6\xBE |0
+<U9D08> \xF2\xEE |0
+<U9D09> \xF2\xED |0
+<U9D0B> \x8F\xEB\xDD |0
+<U9D0E> \xB2\xAA |0
+<U9D11> \x8F\xEB\xDF |0
+<U9D12> \xF2\xF9 |0
+<U9D15> \xF2\xF8 |0
+<U9D17> \x8F\xEB\xE0 |0
+<U9D18> \x8F\xEB\xE1 |0
+<U9D1B> \xB1\xF5 |0
+<U9D1C> \x8F\xEB\xE2 |0
+<U9D1D> \x8F\xEB\xE3 |0
+<U9D1E> \x8F\xEB\xE4 |0
+<U9D1F> \xF2\xF6 |0
+<U9D23> \xF2\xF5 |0
+<U9D26> \xF2\xF3 |0
+<U9D28> \xB3\xFB |0
+<U9D2A> \xF2\xF2 |0
+<U9D2B> \xBC\xB2 |0
+<U9D2C> \xB2\xA9 |0
+<U9D2F> \x8F\xEB\xE5 |0
+<U9D30> \x8F\xEB\xE6 |0
+<U9D32> \x8F\xEB\xE7 |0
+<U9D33> \x8F\xEB\xE8 |0
+<U9D34> \x8F\xEB\xE9 |0
+<U9D3A> \x8F\xEB\xEA |0
+<U9D3B> \xB9\xE3 |0
+<U9D3C> \x8F\xEB\xEB |0
+<U9D3D> \x8F\xEB\xED |0
+<U9D3E> \xF2\xFC |0
+<U9D3F> \xF2\xFB |0
+<U9D41> \xF2\xFA |0
+<U9D42> \x8F\xEB\xEE |0
+<U9D43> \x8F\xEB\xEF |0
+<U9D44> \xF2\xF7 |0
+<U9D45> \x8F\xEB\xEC |0
+<U9D46> \xF2\xFD |0
+<U9D47> \x8F\xEB\xF0 |0
+<U9D48> \xF2\xFE |0
+<U9D4A> \x8F\xEB\xF1 |0
+<U9D50> \xF3\xA5 |0
+<U9D51> \xF3\xA4 |0
+<U9D53> \x8F\xEB\xF2 |0
+<U9D54> \x8F\xEB\xF3 |0
+<U9D59> \xF3\xA6 |0
+<U9D5C> \xB1\xAD |0
+<U9D5D> \xF3\xA1 |0
+<U9D5E> \xF3\xA2 |0
+<U9D5F> \x8F\xEB\xF4 |0
+<U9D60> \xB9\xF4 |0
+<U9D61> \xCC\xB9 |0
+<U9D62> \x8F\xEB\xF6 |0
+<U9D63> \x8F\xEB\xF5 |0
+<U9D64> \xF3\xA3 |0
+<U9D65> \x8F\xEB\xF7 |0
+<U9D69> \x8F\xEB\xF8 |0
+<U9D6A> \x8F\xEB\xF9 |0
+<U9D6B> \x8F\xEB\xFA |3
+<U9D6B> \xFC\xEB |0
+<U9D6C> \xCB\xB2 |0
+<U9D6F> \xF3\xAB |0
+<U9D70> \x8F\xEB\xFB |3
+<U9D70> \xFC\xEA |0
+<U9D72> \xF3\xA7 |0
+<U9D76> \x8F\xEB\xFC |0
+<U9D77> \x8F\xEB\xFD |0
+<U9D7A> \xF3\xAC |0
+<U9D7B> \x8F\xEB\xFE |0
+<U9D7C> \x8F\xEC\xA1 |0
+<U9D7E> \x8F\xEC\xA2 |0
+<U9D83> \x8F\xEC\xA3 |0
+<U9D84> \x8F\xEC\xA4 |0
+<U9D86> \x8F\xEC\xA5 |0
+<U9D87> \xF3\xA9 |0
+<U9D89> \xF3\xA8 |0
+<U9D8A> \x8F\xEC\xA6 |0
+<U9D8D> \x8F\xEC\xA7 |0
+<U9D8E> \x8F\xEC\xA8 |0
+<U9D8F> \xB7\xDC |0
+<U9D92> \x8F\xEC\xA9 |0
+<U9D93> \x8F\xEC\xAA |0
+<U9D95> \x8F\xEC\xAB |0
+<U9D96> \x8F\xEC\xAC |0
+<U9D97> \x8F\xEC\xAD |0
+<U9D98> \x8F\xEC\xAE |0
+<U9D9A> \xF3\xAD |0
+<U9DA1> \x8F\xEC\xAF |0
+<U9DA4> \xF3\xAE |0
+<U9DA9> \xF3\xAF |0
+<U9DAA> \x8F\xEC\xB0 |0
+<U9DAB> \xF3\xAA |0
+<U9DAC> \x8F\xEC\xB1 |0
+<U9DAE> \x8F\xEC\xB2 |0
+<U9DAF> \xF2\xF4 |0
+<U9DB1> \x8F\xEC\xB3 |0
+<U9DB2> \xF3\xB0 |0
+<U9DB4> \xC4\xE1 |0
+<U9DB5> \x8F\xEC\xB4 |0
+<U9DB8> \xF3\xB4 |0
+<U9DB9> \x8F\xEC\xB5 |0
+<U9DBA> \xF3\xB5 |0
+<U9DBB> \xF3\xB3 |0
+<U9DBC> \x8F\xEC\xB6 |0
+<U9DBF> \x8F\xEC\xB7 |0
+<U9DC1> \xF3\xB2 |0
+<U9DC2> \xF3\xB8 |0
+<U9DC3> \x8F\xEC\xB8 |0
+<U9DC4> \xF3\xB1 |0
+<U9DC6> \xF3\xB6 |0
+<U9DC7> \x8F\xEC\xB9 |0
+<U9DC9> \x8F\xEC\xBA |0
+<U9DCA> \x8F\xEC\xBB |0
+<U9DCF> \xF3\xB7 |0
+<U9DD3> \xF3\xBA |0
+<U9DD4> \x8F\xEC\xBC |0
+<U9DD5> \x8F\xEC\xBD |0
+<U9DD6> \x8F\xEC\xBE |0
+<U9DD7> \x8F\xEC\xBF |0
+<U9DD9> \xF3\xB9 |0
+<U9DDA> \x8F\xEC\xC0 |0
+<U9DDE> \x8F\xEC\xC1 |0
+<U9DDF> \x8F\xEC\xC2 |0
+<U9DE0> \x8F\xEC\xC3 |0
+<U9DE5> \x8F\xEC\xC4 |0
+<U9DE6> \xF3\xBC |0
+<U9DE7> \x8F\xEC\xC5 |0
+<U9DE9> \x8F\xEC\xC6 |0
+<U9DEB> \x8F\xEC\xC7 |0
+<U9DED> \xF3\xBD |0
+<U9DEE> \x8F\xEC\xC8 |0
+<U9DEF> \xF3\xBE |0
+<U9DF0> \x8F\xEC\xC9 |0
+<U9DF2> \xCF\xC9 |0
+<U9DF3> \x8F\xEC\xCA |0
+<U9DF4> \x8F\xEC\xCB |0
+<U9DF8> \xF3\xBB |0
+<U9DF9> \xC2\xEB |0
+<U9DFA> \xBA\xED |0
+<U9DFD> \xF3\xBF |0
+<U9DFE> \x8F\xEC\xCC |0
+<U9E02> \x8F\xEC\xCE |0
+<U9E07> \x8F\xEC\xCF |0
+<U9E0A> \x8F\xEC\xCD |0
+<U9E0E> \x8F\xEC\xD0 |0
+<U9E10> \x8F\xEC\xD1 |0
+<U9E11> \x8F\xEC\xD2 |0
+<U9E12> \x8F\xEC\xD3 |0
+<U9E15> \x8F\xEC\xD4 |0
+<U9E16> \x8F\xEC\xD5 |0
+<U9E19> \x8F\xEC\xD6 |3
+<U9E19> \xFC\xED |0
+<U9E1A> \xF3\xC0 |0
+<U9E1B> \xF3\xC1 |0
+<U9E1C> \x8F\xEC\xD7 |0
+<U9E1D> \x8F\xEC\xD8 |0
+<U9E1E> \xF3\xC2 |0
+<U9E75> \xF3\xC3 |0
+<U9E78> \xB8\xB4 |0
+<U9E79> \xF3\xC4 |0
+<U9E7A> \x8F\xEC\xD9 |0
+<U9E7B> \x8F\xEC\xDA |0
+<U9E7C> \x8F\xEC\xDB |0
+<U9E7D> \xF3\xC5 |0
+<U9E7F> \xBC\xAF |0
+<U9E80> \x8F\xEC\xDC |0
+<U9E81> \xF3\xC6 |0
+<U9E82> \x8F\xEC\xDD |0
+<U9E83> \x8F\xEC\xDE |0
+<U9E84> \x8F\xEC\xDF |0
+<U9E85> \x8F\xEC\xE0 |0
+<U9E87> \x8F\xEC\xE1 |0
+<U9E88> \xF3\xC7 |0
+<U9E8B> \xF3\xC8 |0
+<U9E8C> \xF3\xC9 |0
+<U9E8E> \x8F\xEC\xE2 |0
+<U9E8F> \x8F\xEC\xE3 |0
+<U9E91> \xF3\xCC |0
+<U9E92> \xF3\xCA |0
+<U9E93> \xCF\xBC |0
+<U9E95> \xF3\xCB |0
+<U9E96> \x8F\xEC\xE4 |0
+<U9E97> \xCE\xEF |0
+<U9E98> \x8F\xEC\xE5 |0
+<U9E9B> \x8F\xEC\xE6 |0
+<U9E9D> \xF3\xCD |0
+<U9E9E> \x8F\xEC\xE7 |0
+<U9E9F> \xCE\xDB |0
+<U9EA4> \x8F\xEC\xE8 |0
+<U9EA5> \xF3\xCE |0
+<U9EA6> \xC7\xFE |0
+<U9EA8> \x8F\xEC\xE9 |0
+<U9EA9> \xF3\xCF |0
+<U9EAA> \xF3\xD1 |0
+<U9EAC> \x8F\xEC\xEA |0
+<U9EAD> \xF3\xD2 |0
+<U9EAE> \x8F\xEC\xEB |0
+<U9EAF> \x8F\xEC\xEC |0
+<U9EB0> \x8F\xEC\xED |0
+<U9EB3> \x8F\xEC\xEE |0
+<U9EB4> \x8F\xEC\xEF |0
+<U9EB5> \x8F\xEC\xF0 |0
+<U9EB8> \xF3\xD0 |0
+<U9EB9> \xB9\xED |0
+<U9EBA> \xCC\xCD |0
+<U9EBB> \xCB\xE3 |0
+<U9EBC> \xD6\xF7 |0
+<U9EBE> \xDD\xE0 |0
+<U9EBF> \xCB\xFB |0
+<U9EC4> \xB2\xAB |0
+<U9EC6> \x8F\xEC\xF1 |0
+<U9EC8> \x8F\xEC\xF2 |0
+<U9ECB> \x8F\xEC\xF3 |0
+<U9ECC> \xF3\xD4 |0
+<U9ECD> \xB5\xD0 |0
+<U9ECE> \xF3\xD5 |0
+<U9ECF> \xF3\xD6 |0
+<U9ED0> \xF3\xD7 |0
+<U9ED1> \xFC\xEE |0
+<U9ED2> \xB9\xF5 |0
+<U9ED4> \xF3\xD8 |0
+<U9ED5> \x8F\xEC\xF4 |0
+<U9ED8> \xE0\xD4 |0
+<U9ED9> \xCC\xDB |0
+<U9EDB> \xC2\xE3 |0
+<U9EDC> \xF3\xD9 |0
+<U9EDD> \xF3\xDB |0
+<U9EDE> \xF3\xDA |0
+<U9EDF> \x8F\xEC\xF5 |0
+<U9EE0> \xF3\xDC |0
+<U9EE4> \x8F\xEC\xF6 |0
+<U9EE5> \xF3\xDD |0
+<U9EE7> \x8F\xEC\xF7 |0
+<U9EE8> \xF3\xDE |0
+<U9EEC> \x8F\xEC\xF8 |0
+<U9EED> \x8F\xEC\xF9 |0
+<U9EEE> \x8F\xEC\xFA |0
+<U9EEF> \xF3\xDF |0
+<U9EF0> \x8F\xEC\xFB |0
+<U9EF1> \x8F\xEC\xFC |0
+<U9EF2> \x8F\xEC\xFD |0
+<U9EF4> \xF3\xE0 |0
+<U9EF5> \x8F\xEC\xFE |0
+<U9EF6> \xF3\xE1 |0
+<U9EF7> \xF3\xE2 |0
+<U9EF8> \x8F\xED\xA1 |0
+<U9EF9> \xF3\xE3 |0
+<U9EFB> \xF3\xE4 |0
+<U9EFC> \xF3\xE5 |0
+<U9EFD> \xF3\xE6 |0
+<U9EFF> \x8F\xED\xA2 |0
+<U9F02> \x8F\xED\xA3 |0
+<U9F03> \x8F\xED\xA4 |0
+<U9F07> \xF3\xE7 |0
+<U9F08> \xF3\xE8 |0
+<U9F09> \x8F\xED\xA5 |0
+<U9F0E> \xC5\xA4 |0
+<U9F0F> \x8F\xED\xA6 |0
+<U9F10> \x8F\xED\xA7 |0
+<U9F11> \x8F\xED\xA8 |0
+<U9F12> \x8F\xED\xA9 |0
+<U9F13> \xB8\xDD |0
+<U9F14> \x8F\xED\xAA |0
+<U9F15> \xF3\xEA |0
+<U9F16> \x8F\xED\xAB |0
+<U9F17> \x8F\xED\xAC |0
+<U9F19> \x8F\xED\xAD |0
+<U9F1A> \x8F\xED\xAE |0
+<U9F1B> \x8F\xED\xAF |0
+<U9F1F> \x8F\xED\xB0 |0
+<U9F20> \xC1\xCD |0
+<U9F21> \xF3\xEB |0
+<U9F22> \x8F\xED\xB1 |0
+<U9F26> \x8F\xED\xB2 |0
+<U9F2A> \x8F\xED\xB3 |0
+<U9F2B> \x8F\xED\xB4 |0
+<U9F2C> \xF3\xEC |0
+<U9F2F> \x8F\xED\xB5 |0
+<U9F31> \x8F\xED\xB6 |0
+<U9F32> \x8F\xED\xB7 |0
+<U9F34> \x8F\xED\xB8 |0
+<U9F37> \x8F\xED\xB9 |0
+<U9F39> \x8F\xED\xBA |0
+<U9F3A> \x8F\xED\xBB |0
+<U9F3B> \xC9\xA1 |0
+<U9F3C> \x8F\xED\xBC |0
+<U9F3D> \x8F\xED\xBD |0
+<U9F3E> \xF3\xED |0
+<U9F3F> \x8F\xED\xBE |0
+<U9F41> \x8F\xED\xBF |0
+<U9F43> \x8F\xED\xC0 |0
+<U9F44> \x8F\xED\xC1 |0
+<U9F45> \x8F\xED\xC2 |0
+<U9F46> \x8F\xED\xC3 |0
+<U9F47> \x8F\xED\xC4 |0
+<U9F4A> \xF3\xEE |0
+<U9F4B> \xE3\xB7 |0
+<U9F4E> \xEC\xDA |0
+<U9F4F> \xF0\xED |0
+<U9F52> \xF3\xEF |0
+<U9F53> \x8F\xED\xC5 |0
+<U9F54> \xF3\xF0 |0
+<U9F55> \x8F\xED\xC6 |0
+<U9F56> \x8F\xED\xC7 |0
+<U9F57> \x8F\xED\xC8 |0
+<U9F58> \x8F\xED\xC9 |0
+<U9F5A> \x8F\xED\xCA |0
+<U9F5D> \x8F\xED\xCB |0
+<U9F5E> \x8F\xED\xCC |0
+<U9F5F> \xF3\xF2 |0
+<U9F60> \xF3\xF3 |0
+<U9F61> \xF3\xF4 |0
+<U9F62> \xCE\xF0 |0
+<U9F63> \xF3\xF1 |0
+<U9F66> \xF3\xF5 |0
+<U9F67> \xF3\xF6 |0
+<U9F68> \x8F\xED\xCD |0
+<U9F69> \x8F\xED\xCE |0
+<U9F6A> \xF3\xF8 |0
+<U9F6C> \xF3\xF7 |0
+<U9F6D> \x8F\xED\xCF |0
+<U9F6E> \x8F\xED\xD0 |0
+<U9F6F> \x8F\xED\xD1 |0
+<U9F70> \x8F\xED\xD2 |0
+<U9F71> \x8F\xED\xD3 |0
+<U9F72> \xF3\xFA |0
+<U9F73> \x8F\xED\xD4 |0
+<U9F75> \x8F\xED\xD5 |0
+<U9F76> \xF3\xFB |0
+<U9F77> \xF3\xF9 |0
+<U9F7A> \x8F\xED\xD6 |0
+<U9F7D> \x8F\xED\xD7 |0
+<U9F8D> \xCE\xB6 |0
+<U9F8F> \x8F\xED\xD8 |0
+<U9F90> \x8F\xED\xD9 |0
+<U9F91> \x8F\xED\xDA |0
+<U9F92> \x8F\xED\xDB |0
+<U9F94> \x8F\xED\xDC |0
+<U9F95> \xF3\xFC |0
+<U9F96> \x8F\xED\xDD |0
+<U9F97> \x8F\xED\xDE |0
+<U9F9C> \xF3\xFD |0
+<U9F9D> \xE3\xD4 |0
+<U9F9E> \x8F\xED\xDF |0
+<U9FA0> \xF3\xFE |0
+<U9FA1> \x8F\xED\xE0 |0
+<U9FA2> \x8F\xED\xE1 |0
+<U9FA3> \x8F\xED\xE2 |0
+<U9FA5> \x8F\xED\xE3 |0
+<UF929> \xFA\xC6 |0
+<UF9DC> \xFC\xCF |0
+<UFA0E> \xF9\xD4 |0
+<UFA0F> \xF9\xDF |0
+<UFA10> \xF9\xE0 |0
+<UFA11> \xF9\xF5 |0
+<UFA12> \xFA\xBE |0
+<UFA13> \xFA\xCE |0
+<UFA14> \xFA\xD0 |0
+<UFA15> \xFA\xFB |0
+<UFA16> \xFB\xA3 |0
+<UFA17> \xFB\xBA |0
+<UFA18> \xFB\xC2 |0
+<UFA19> \xFB\xC3 |0
+<UFA1A> \xFB\xC4 |0
+<UFA1B> \xFB\xC6 |0
+<UFA1C> \xFB\xCA |0
+<UFA1D> \xFB\xCD |0
+<UFA1E> \xFB\xD6 |0
+<UFA1F> \xFB\xE1 |0
+<UFA20> \xFB\xE3 |0
+<UFA21> \xFB\xE4 |0
+<UFA22> \xFB\xED |0
+<UFA23> \xFB\xF5 |0
+<UFA24> \xFB\xF7 |0
+<UFA25> \xFB\xF8 |0
+<UFA26> \xFB\xFB |0
+<UFA27> \xFC\xB9 |0
+<UFA28> \xFC\xC0 |0
+<UFA29> \xFC\xD0 |0
+<UFA2A> \xFC\xDC |0
+<UFA2B> \xFC\xDD |0
+<UFA2C> \xFC\xDF |0
+<UFA2D> \xFC\xEC |0
+<UFF01> \xA1\xAA |0
+<UFF02> \xFC\xFE |0
+<UFF03> \xA1\xF4 |0
+<UFF04> \xA1\xF0 |0
+<UFF05> \xA1\xF3 |0
+<UFF06> \xA1\xF5 |0
+<UFF07> \xFC\xFD |0
+<UFF08> \xA1\xCA |0
+<UFF09> \xA1\xCB |0
+<UFF0A> \xA1\xF6 |0
+<UFF0B> \xA1\xDC |0
+<UFF0C> \xA1\xA4 |0
+<UFF0D> \xA1\xDD |0
+<UFF0E> \xA1\xA5 |0
+<UFF0F> \xA1\xBF |0
+<UFF10> \xA3\xB0 |0
+<UFF11> \xA3\xB1 |0
+<UFF12> \xA3\xB2 |0
+<UFF13> \xA3\xB3 |0
+<UFF14> \xA3\xB4 |0
+<UFF15> \xA3\xB5 |0
+<UFF16> \xA3\xB6 |0
+<UFF17> \xA3\xB7 |0
+<UFF18> \xA3\xB8 |0
+<UFF19> \xA3\xB9 |0
+<UFF1A> \xA1\xA7 |0
+<UFF1B> \xA1\xA8 |0
+<UFF1C> \xA1\xE3 |0
+<UFF1D> \xA1\xE1 |0
+<UFF1E> \xA1\xE4 |0
+<UFF1F> \xA1\xA9 |0
+<UFF20> \xA1\xF7 |0
+<UFF21> \xA3\xC1 |0
+<UFF22> \xA3\xC2 |0
+<UFF23> \xA3\xC3 |0
+<UFF24> \xA3\xC4 |0
+<UFF25> \xA3\xC5 |0
+<UFF26> \xA3\xC6 |0
+<UFF27> \xA3\xC7 |0
+<UFF28> \xA3\xC8 |0
+<UFF29> \xA3\xC9 |0
+<UFF2A> \xA3\xCA |0
+<UFF2B> \xA3\xCB |0
+<UFF2C> \xA3\xCC |0
+<UFF2D> \xA3\xCD |0
+<UFF2E> \xA3\xCE |0
+<UFF2F> \xA3\xCF |0
+<UFF30> \xA3\xD0 |0
+<UFF31> \xA3\xD1 |0
+<UFF32> \xA3\xD2 |0
+<UFF33> \xA3\xD3 |0
+<UFF34> \xA3\xD4 |0
+<UFF35> \xA3\xD5 |0
+<UFF36> \xA3\xD6 |0
+<UFF37> \xA3\xD7 |0
+<UFF38> \xA3\xD8 |0
+<UFF39> \xA3\xD9 |0
+<UFF3A> \xA3\xDA |0
+<UFF3B> \xA1\xCE |0
+<UFF3C> \xA1\xC0 |0
+<UFF3D> \xA1\xCF |0
+<UFF3E> \xA1\xB0 |0
+<UFF3F> \xA1\xB2 |0
+<UFF40> \xA1\xAE |0
+<UFF41> \xA3\xE1 |0
+<UFF42> \xA3\xE2 |0
+<UFF43> \xA3\xE3 |0
+<UFF44> \xA3\xE4 |0
+<UFF45> \xA3\xE5 |0
+<UFF46> \xA3\xE6 |0
+<UFF47> \xA3\xE7 |0
+<UFF48> \xA3\xE8 |0
+<UFF49> \xA3\xE9 |0
+<UFF4A> \xA3\xEA |0
+<UFF4B> \xA3\xEB |0
+<UFF4C> \xA3\xEC |0
+<UFF4D> \xA3\xED |0
+<UFF4E> \xA3\xEE |0
+<UFF4F> \xA3\xEF |0
+<UFF50> \xA3\xF0 |0
+<UFF51> \xA3\xF1 |0
+<UFF52> \xA3\xF2 |0
+<UFF53> \xA3\xF3 |0
+<UFF54> \xA3\xF4 |0
+<UFF55> \xA3\xF5 |0
+<UFF56> \xA3\xF6 |0
+<UFF57> \xA3\xF7 |0
+<UFF58> \xA3\xF8 |0
+<UFF59> \xA3\xF9 |0
+<UFF5A> \xA3\xFA |0
+<UFF5B> \xA1\xD0 |0
+<UFF5C> \xA1\xC3 |0
+<UFF5D> \xA1\xD1 |0
+<UFF5E> \x8F\xA2\xB7 |3
+<UFF5E> \xA1\xC1 |0
+<UFF61> \x8E\xA1 |0
+<UFF62> \x8E\xA2 |0
+<UFF63> \x8E\xA3 |0
+<UFF64> \x8E\xA4 |0
+<UFF65> \x8E\xA5 |0
+<UFF66> \x8E\xA6 |0
+<UFF67> \x8E\xA7 |0
+<UFF68> \x8E\xA8 |0
+<UFF69> \x8E\xA9 |0
+<UFF6A> \x8E\xAA |0
+<UFF6B> \x8E\xAB |0
+<UFF6C> \x8E\xAC |0
+<UFF6D> \x8E\xAD |0
+<UFF6E> \x8E\xAE |0
+<UFF6F> \x8E\xAF |0
+<UFF70> \x8E\xB0 |0
+<UFF71> \x8E\xB1 |0
+<UFF72> \x8E\xB2 |0
+<UFF73> \x8E\xB3 |0
+<UFF74> \x8E\xB4 |0
+<UFF75> \x8E\xB5 |0
+<UFF76> \x8E\xB6 |0
+<UFF77> \x8E\xB7 |0
+<UFF78> \x8E\xB8 |0
+<UFF79> \x8E\xB9 |0
+<UFF7A> \x8E\xBA |0
+<UFF7B> \x8E\xBB |0
+<UFF7C> \x8E\xBC |0
+<UFF7D> \x8E\xBD |0
+<UFF7E> \x8E\xBE |0
+<UFF7F> \x8E\xBF |0
+<UFF80> \x8E\xC0 |0
+<UFF81> \x8E\xC1 |0
+<UFF82> \x8E\xC2 |0
+<UFF83> \x8E\xC3 |0
+<UFF84> \x8E\xC4 |0
+<UFF85> \x8E\xC5 |0
+<UFF86> \x8E\xC6 |0
+<UFF87> \x8E\xC7 |0
+<UFF88> \x8E\xC8 |0
+<UFF89> \x8E\xC9 |0
+<UFF8A> \x8E\xCA |0
+<UFF8B> \x8E\xCB |0
+<UFF8C> \x8E\xCC |0
+<UFF8D> \x8E\xCD |0
+<UFF8E> \x8E\xCE |0
+<UFF8F> \x8E\xCF |0
+<UFF90> \x8E\xD0 |0
+<UFF91> \x8E\xD1 |0
+<UFF92> \x8E\xD2 |0
+<UFF93> \x8E\xD3 |0
+<UFF94> \x8E\xD4 |0
+<UFF95> \x8E\xD5 |0
+<UFF96> \x8E\xD6 |0
+<UFF97> \x8E\xD7 |0
+<UFF98> \x8E\xD8 |0
+<UFF99> \x8E\xD9 |0
+<UFF9A> \x8E\xDA |0
+<UFF9B> \x8E\xDB |0
+<UFF9C> \x8E\xDC |0
+<UFF9D> \x8E\xDD |0
+<UFF9E> \x8E\xDE |0
+<UFF9F> \x8E\xDF |0
+<UFFE0> \xA1\xF1 |0
+<UFFE1> \xA1\xF2 |0
+<UFFE2> \xA2\xCC |0
+<UFFE2> \xFC\xFB |3
+<UFFE3> \xA1\xB1 |0
+<UFFE4> \xFC\xFC |0
+<UFFE5> \xA1\xEF |0
+END CHARMAP
diff --git a/data/mappings/gsm-03.38-2000.ucm b/data/mappings/gsm-03.38-2000.ucm
new file mode 100644
index 0000000..9963de8
--- /dev/null
+++ b/data/mappings/gsm-03.38-2000.ucm
@@ -0,0 +1,216 @@
+# Copyright (c) 2000 Unicode, Inc. All Rights reserved.
+#
+# Name: GSM 03.38 to Unicode
+# Unicode version: 3.0
+# Table version: 1.1
+# Date: 2000 May 30
+# Authors: Ken Whistler
+# Kent Karlsson
+# Markus Kuhn
+#
+# Source: http://www.unicode.org/Public/MAPPINGS/ETSI/GSM0338.TXT
+# See there for the license and for a description of the charset.
+# Formatted into ICU .ucm format by Markus Scherer on 2006-nov-02.
+# Commented-out mappings are turned into fallbacks (|1), all others are turned
+# into round-trips (|0).
+# Multi-byte mappings are preserved as multi-single-byte character mappings,
+# using ICU's m:n conversion capability.
+#
+# The substitution character is not documented in the Unicode file.
+# \x3F is chosen here because \x1A is a graphic character.
+#
+# Other deviations from the Unicode file:
+# a)
+# The GSM standard specifies that one or two ESC bytes (\x1B), if not followed
+# by a recognized final byte, be mapped to spaces (that is, reverse fallbacks
+# to U+0020).
+# The Unicode file round-trips a single \x1B to U+00A0 (NBSP) and has no mapping
+# for \x1B\x1B.
+# (Reverse fallbacks to U+00A0 would result in Unicode text that cannot be
+# converted back to GSM 03.38. A roundtrip for U+00A0 adds a character that is
+# not mappable in the standard.)
+#
+# See the ietf-charsets list email "Re: GSM 03.38 substitution character?"
+# at http://mail.apps.ietf.org/ietf/charsets/msg01696.html
+#
+# b)
+# The GSM standard maps U+00C7 capital C-cedilla to \x09 but the Unicode file
+# contains and documents a "fix" to map U+00E7 small c-cedilla instead, based on
+# an interpretation of the intent of the standard. Prevailing implementations
+# in mobile phones follow the standard.
+#
+# This file follows the GSM standard.
+#
+# See the GSM standard at
+# http://www.3gpp.org/ftp/Specs/archive/03_series/03.38/0338-720.zip
+#
+# For problems with the table format please submit a bug
+# at http://www.icu-project.org/ .
+# For issues with the mappings please contact Unicode
+# at http://www.unicode.org/reporting.html
+
+<code_set_name> "gsm-03.38-2000"
+<char_name_mask> "AXXXX"
+<mb_cur_max> 1
+<mb_cur_min> 1
+<uconv_class> "SBCS"
+<icu:state> 0-7f
+<subchar> \x3F
+<icu:charsetFamily> "ASCII"
+
+CHARMAP
+<U0000> \x00 |1
+<U000A> \x0A |0
+<U000C> \x1B\x0A |0
+<U000D> \x0D |0
+<U0020> \x20 |0
+<U0020> \x1B |3
+<U0020> \x1B\x1B |3
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x02 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x00 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x1B\x3C |0
+<U005C> \x1B\x2F |0
+<U005D> \x1B\x3E |0
+<U005E> \x1B\x14 |0
+<U005F> \x11 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x1B\x28 |0
+<U007C> \x1B\x40 |0
+<U007D> \x1B\x29 |0
+<U007E> \x1B\x3D |0
+<U00A1> \x40 |0
+<U00A3> \x01 |0
+<U00A4> \x24 |0
+<U00A5> \x03 |0
+<U00A7> \x5F |0
+<U00BF> \x60 |0
+<U00C4> \x5B |0
+<U00C5> \x0E |0
+<U00C6> \x1C |0
+<U00C7> \x09 |0
+<U00C9> \x1F |0
+<U00D1> \x5D |0
+<U00D6> \x5C |0
+<U00D8> \x0B |0
+<U00DC> \x5E |0
+<U00DF> \x1E |0
+<U00E0> \x7F |0
+<U00E4> \x7B |0
+<U00E5> \x0F |0
+<U00E6> \x1D |0
+<U00E8> \x04 |0
+<U00E9> \x05 |0
+<U00EC> \x07 |0
+<U00F1> \x7D |0
+<U00F2> \x08 |0
+<U00F6> \x7C |0
+<U00F8> \x0C |0
+<U00F9> \x06 |0
+<U00FC> \x7E |0
+<U0391> \x41 |1
+<U0392> \x42 |1
+<U0393> \x13 |0
+<U0394> \x10 |0
+<U0395> \x45 |1
+<U0396> \x5A |1
+<U0397> \x48 |1
+<U0398> \x19 |0
+<U0399> \x49 |1
+<U039A> \x4B |1
+<U039B> \x14 |0
+<U039C> \x4D |1
+<U039D> \x4E |1
+<U039E> \x1A |0
+<U039F> \x4F |1
+<U03A0> \x16 |0
+<U03A1> \x50 |1
+<U03A3> \x18 |0
+<U03A4> \x54 |1
+<U03A5> \x55 |1
+<U03A6> \x12 |0
+<U03A7> \x58 |1
+<U03A8> \x17 |0
+<U03A9> \x15 |0
+<U20AC> \x1B\x65 |0
+END CHARMAP
diff --git a/data/mappings/ibm-1026_P100-1995.ucm b/data/mappings/ibm-1026_P100-1995.ucm
index 7c092e1..2b8b1c8 100644
--- a/data/mappings/ibm-1026_P100-1995.ucm
+++ b/data/mappings/ibm-1026_P100-1995.ucm
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 1995-2002, International Business Machines
+# * Copyright (C) 1995-2013, International Business Machines
# * Corporation and others. All Rights Reserved.
# *
# ***************************************************************************
@@ -188,7 +188,7 @@
<U00A7> \xB5 |0
<U00A8> \xBD |0
<U00A9> \xB4 |0
-<U00AA> \x9A |0
+<U00AA> \x9A |1
<U00AB> \x8A |0
<U00AC> \xBA |0
<U00AD> \xCA |0
@@ -275,6 +275,7 @@
<U015E> \x7C |0
<U015F> \x6A |0
<U203E> \xBC |1
+<U20BA> \x9A |0
<UFF01> \x4F |1
<UFF02> \xFC |1
<UFF03> \xEC |1
diff --git a/data/mappings/ibm-1155_P100-1999.ucm b/data/mappings/ibm-1155_P100-1999.ucm
index e5ee3bd..b2f038e 100644
--- a/data/mappings/ibm-1155_P100-1999.ucm
+++ b/data/mappings/ibm-1155_P100-1999.ucm
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 1995-2002, International Business Machines
+# * Copyright (C) 1995-2013, International Business Machines
# * Corporation and others. All Rights Reserved.
# *
# ***************************************************************************
@@ -187,7 +187,7 @@
<U00A7> \xB5 |0
<U00A8> \xBD |0
<U00A9> \xB4 |0
-<U00AA> \x9A |0
+<U00AA> \x9A |1
<U00AB> \x8A |0
<U00AC> \xBA |0
<U00AD> \xCA |0
@@ -274,6 +274,7 @@
<U015E> \x7C |0
<U015F> \x6A |0
<U20AC> \x9F |0
+<U20BA> \x9A |0
<UFF01> \x4F |1
<UFF02> \xFC |1
<UFF03> \xEC |1
diff --git a/data/mappings/softbank-shift_jis-2007.ucm b/data/mappings/jisx-208.ucm
similarity index 82%
copy from data/mappings/softbank-shift_jis-2007.ucm
copy to data/mappings/jisx-208.ucm
index 27c8c28..9ad0914 100644
--- a/data/mappings/softbank-shift_jis-2007.ucm
+++ b/data/mappings/jisx-208.ucm
@@ -1,232 +1,39 @@
-# SoftBank's Shift_JIS. See README.emoji for details.
-<code_set_name> "softbank-shift_jis-2007"
-<mb_cur_max> 2
-<mb_cur_min> 1
-<uconv_class> "MBCS"
-<subchar> \x3F # ?
-<icu:state> 0-80, 81-9f:1, a0-df, e0-fc:1, f7:2, f9:2, fb:2, fd-ff
-<icu:state> 40-7e, 80-fc
-<icu:state> 40-7e.p, 80-fc.p
+# Copyright (C) 2008, International Business Machines
+# Corporation and others. All Rights Reserved.
+#
+# JIS X 0208 table with mappings like in windows-50220 (ISO-2022-JP).
+# Modified to use Shift-JIS encoding scheme for ICU's ISO-2022-JP converter.
+# See http://bugs.icu-project.org/trac/ticket/5797 .
+# Mappings of Shift-JIS codes outside the portion corresponding to JIS X 0208
+# are not used and can be omitted from this table.
+# (In particular, single-byte codes and those with lead bytes of F0 and above.)
+#
+<code_set_name> "jisx-208"
+<char_name_mask> "AXXXX"
+<mb_cur_max> 2
+<mb_cur_min> 1
+<uconv_class> "MBCS"
+<icu:state> 0-80, 81-9f:1, a0-df, e0-fc:1, fd-ff
+<icu:state> 40-7e, 80-fc
+<subchar> \xEF\xFC
CHARMAP
-<U0000> \x00 |0
-<U0001> \x01 |0
-<U0002> \x02 |0
-<U0003> \x03 |0
-<U0004> \x04 |0
-<U0005> \x05 |0
-<U0006> \x06 |0
-<U0007> \x07 |0
-<U0008> \x08 |0
-<U0009> \x09 |0
-<U000A> \x0A |0
-<U000B> \x0B |0
-<U000C> \x0C |0
-<U000D> \x0D |0
-<U000E> \x0E |0
-<U000F> \x0F |0
-<U0010> \x10 |0
-<U0011> \x11 |0
-<U0012> \x12 |0
-<U0013> \x13 |0
-<U0014> \x14 |0
-<U0015> \x15 |0
-<U0016> \x16 |0
-<U0017> \x17 |0
-<U0018> \x18 |0
-<U0019> \x19 |0
-<U001A> \x1A |0
-<U001B> \x1B |0
-<U001C> \x1C |0
-<U001D> \x1D |0
-<U001E> \x1E |0
-<U001F> \x1F |0
-<U0020> \x20 |0
-<U0021> \x21 |0
-<U0022> \x22 |0
-<U0023> \x23 |0
-<U0024> \x24 |0
-<U0025> \x25 |0
-<U0026> \x26 |0
-<U0027> \x27 |0
-<U0028> \x28 |0
-<U0029> \x29 |0
-<U002A> \x2A |0
-<U002B> \x2B |0
-<U002C> \x2C |0
-<U002D> \x2D |0
-<U002E> \x2E |0
-<U002F> \x2F |0
-<U0030> \x30 |0
-<U0031> \x31 |0
-<U0032> \x32 |0
-<U0033> \x33 |0
-<U0034> \x34 |0
-<U0035> \x35 |0
-<U0036> \x36 |0
-<U0037> \x37 |0
-<U0038> \x38 |0
-<U0039> \x39 |0
-<U003A> \x3A |0
-<U003B> \x3B |0
-<U003C> \x3C |0
-<U003D> \x3D |0
-<U003E> \x3E |0
-<U003F> \x3F |0
-<U0040> \x40 |0
-<U0041> \x41 |0
-<U0042> \x42 |0
-<U0043> \x43 |0
-<U0044> \x44 |0
-<U0045> \x45 |0
-<U0046> \x46 |0
-<U0047> \x47 |0
-<U0048> \x48 |0
-<U0049> \x49 |0
-<U004A> \x4A |0
-<U004B> \x4B |0
-<U004C> \x4C |0
-<U004D> \x4D |0
-<U004E> \x4E |0
-<U004F> \x4F |0
-<U0050> \x50 |0
-<U0051> \x51 |0
-<U0052> \x52 |0
-<U0053> \x53 |0
-<U0054> \x54 |0
-<U0055> \x55 |0
-<U0056> \x56 |0
-<U0057> \x57 |0
-<U0058> \x58 |0
-<U0059> \x59 |0
-<U005A> \x5A |0
-<U005B> \x5B |0
-<U005C> \x5C |0
-<U005D> \x5D |0
-<U005E> \x5E |0
-<U005F> \x5F |0
-<U0060> \x60 |0
-<U0061> \x61 |0
-<U0062> \x62 |0
-<U0063> \x63 |0
-<U0064> \x64 |0
-<U0065> \x65 |0
-<U0066> \x66 |0
-<U0067> \x67 |0
-<U0068> \x68 |0
-<U0069> \x69 |0
-<U006A> \x6A |0
-<U006B> \x6B |0
-<U006C> \x6C |0
-<U006D> \x6D |0
-<U006E> \x6E |0
-<U006F> \x6F |0
-<U0070> \x70 |0
-<U0071> \x71 |0
-<U0072> \x72 |0
-<U0073> \x73 |0
-<U0074> \x74 |0
-<U0075> \x75 |0
-<U0076> \x76 |0
-<U0077> \x77 |0
-<U0078> \x78 |0
-<U0079> \x79 |0
-<U007A> \x7A |0
-<U007B> \x7B |0
-<U007C> \x7C |0
-<U007D> \x7D |0
-<U007E> \x7E |0
-<U007F> \x7F |0
-<U0080> \x80 |0
-<U00A1> \x21 |1
<U00A2> \x81\x91 |1
<U00A3> \x81\x92 |1
-<U00A5> \x5C |1
-<U00A6> \x7C |1
<U00A7> \x81\x98 |0
<U00A8> \x81\x4E |0
-<U00A9> \x63 |1
-<U00AA> \x61 |1
<U00AB> \x81\xE1 |1
<U00AC> \x81\xCA |1
-<U00AD> \x2D |1
-<U00AE> \x52 |1
<U00AF> \x81\x50 |1
<U00B0> \x81\x8B |0
<U00B1> \x81\x7D |0
-<U00B2> \x32 |1
-<U00B3> \x33 |1
<U00B4> \x81\x4C |0
<U00B5> \x83\xCA |1
<U00B6> \x81\xF7 |0
<U00B7> \x81\x45 |1
<U00B8> \x81\x43 |1
-<U00B9> \x31 |1
-<U00BA> \x6F |1
<U00BB> \x81\xE2 |1
-<U00C0> \x41 |1
-<U00C1> \x41 |1
-<U00C2> \x41 |1
-<U00C3> \x41 |1
-<U00C4> \x41 |1
-<U00C5> \x41 |1
-<U00C6> \x41 |1
-<U00C7> \x43 |1
-<U00C8> \x45 |1
-<U00C9> \x45 |1
-<U00CA> \x45 |1
-<U00CB> \x45 |1
-<U00CC> \x49 |1
-<U00CD> \x49 |1
-<U00CE> \x49 |1
-<U00CF> \x49 |1
-<U00D0> \x44 |1
-<U00D1> \x4E |1
-<U00D2> \x4F |1
-<U00D3> \x4F |1
-<U00D4> \x4F |1
-<U00D5> \x4F |1
-<U00D6> \x4F |1
<U00D7> \x81\x7E |0
-<U00D8> \x4F |1
-<U00D9> \x55 |1
-<U00DA> \x55 |1
-<U00DB> \x55 |1
-<U00DC> \x55 |1
-<U00DD> \x59 |1
-<U00DE> \x54 |1
-<U00DF> \x73 |1
-<U00E0> \x61 |1
-<U00E1> \x61 |1
-<U00E2> \x61 |1
-<U00E3> \x61 |1
-<U00E4> \x61 |1
-<U00E5> \x61 |1
-<U00E6> \x61 |1
-<U00E7> \x63 |1
-<U00E8> \x65 |1
-<U00E9> \x65 |1
-<U00EA> \x65 |1
-<U00EB> \x65 |1
-<U00EC> \x69 |1
-<U00ED> \x69 |1
-<U00EE> \x69 |1
-<U00EF> \x69 |1
-<U00F0> \x64 |1
-<U00F1> \x6E |1
-<U00F2> \x6F |1
-<U00F3> \x6F |1
-<U00F4> \x6F |1
-<U00F5> \x6F |1
-<U00F6> \x6F |1
<U00F7> \x81\x80 |0
-<U00F8> \x6F |1
-<U00F9> \x75 |1
-<U00FA> \x75 |1
-<U00FB> \x75 |1
-<U00FC> \x75 |1
-<U00FD> \x79 |1
-<U00FE> \x74 |1
-<U00FF> \x79 |1
<U0391> \x83\x9F |0
<U0392> \x83\xA0 |0
<U0393> \x83\xA1 |0
@@ -357,50 +164,28 @@
<U203B> \x81\xA6 |0
<U2103> \x81\x8E |0
<U2116> \x87\x82 |0
-<U2116> \xFA\x59 |3
<U2121> \x87\x84 |0
-<U2121> \xFA\x5A |3
<U212B> \x81\xF0 |0
<U2160> \x87\x54 |0
-<U2160> \xFA\x4A |3
<U2161> \x87\x55 |0
-<U2161> \xFA\x4B |3
<U2162> \x87\x56 |0
-<U2162> \xFA\x4C |3
<U2163> \x87\x57 |0
-<U2163> \xFA\x4D |3
<U2164> \x87\x58 |0
-<U2164> \xFA\x4E |3
<U2165> \x87\x59 |0
-<U2165> \xFA\x4F |3
<U2166> \x87\x5A |0
-<U2166> \xFA\x50 |3
<U2167> \x87\x5B |0
-<U2167> \xFA\x51 |3
<U2168> \x87\x5C |0
-<U2168> \xFA\x52 |3
<U2169> \x87\x5D |0
-<U2169> \xFA\x53 |3
-<U2170> \xFA\x40 |0
-<U2170> \xEE\xEF |3
-<U2171> \xFA\x41 |0
-<U2171> \xEE\xF0 |3
-<U2172> \xFA\x42 |0
-<U2172> \xEE\xF1 |3
-<U2173> \xFA\x43 |0
-<U2173> \xEE\xF2 |3
-<U2174> \xFA\x44 |0
-<U2174> \xEE\xF3 |3
-<U2175> \xFA\x45 |0
-<U2175> \xEE\xF4 |3
-<U2176> \xFA\x46 |0
-<U2176> \xEE\xF5 |3
-<U2177> \xFA\x47 |0
-<U2177> \xEE\xF6 |3
-<U2178> \xFA\x48 |0
-<U2178> \xEE\xF7 |3
-<U2179> \xFA\x49 |0
-<U2179> \xEE\xF8 |3
+<U2170> \xEE\xEF |0
+<U2171> \xEE\xF0 |0
+<U2172> \xEE\xF1 |0
+<U2173> \xEE\xF2 |0
+<U2174> \xEE\xF3 |0
+<U2175> \xEE\xF4 |0
+<U2176> \xEE\xF5 |0
+<U2177> \xEE\xF6 |0
+<U2178> \xEE\xF7 |0
+<U2179> \xEE\xF8 |0
<U2190> \x81\xA9 |0
<U2191> \x81\xAA |0
<U2192> \x81\xA8 |0
@@ -435,7 +220,6 @@
<U2234> \x81\x88 |0
<U2235> \x81\xE6 |0
<U2235> \x87\x9A |3
-<U2235> \xFA\x5B |3
<U223D> \x81\xE4 |0
<U2252> \x81\xE0 |0
<U2252> \x87\x90 |3
@@ -727,7 +511,6 @@
<U30FD> \x81\x52 |0
<U30FE> \x81\x53 |0
<U3231> \x87\x8A |0
-<U3231> \xFA\x58 |3
<U3232> \x87\x8B |0
<U3239> \x87\x8C |0
<U32A4> \x87\x85 |0
@@ -784,8 +567,7 @@
<U4E1E> \x8F\xE5 |0
<U4E21> \x97\xBC |0
<U4E26> \x95\xC0 |0
-<U4E28> \xFA\x68 |0
-<U4E28> \xED\x4C |3
+<U4E28> \xED\x4C |0
<U4E2A> \x98\xA2 |0
<U4E2D> \x92\x86 |0
<U4E31> \x98\xA3 |0
@@ -870,8 +652,7 @@
<U4EDD> \x81\x57 |0
<U4EDE> \x98\xBE |0
<U4EDF> \x98\xC0 |0
-<U4EE1> \xFA\x69 |0
-<U4EE1> \xED\x4D |3
+<U4EE1> \xED\x4D |0
<U4EE3> \x91\xE3 |0
<U4EE4> \x97\xDF |0
<U4EE5> \x88\xC8 |0
@@ -882,13 +663,10 @@
<U4EF6> \x8C\x8F |0
<U4EF7> \x98\xC1 |0
<U4EFB> \x94\x43 |0
-<U4EFC> \xFA\x6A |0
-<U4EFC> \xED\x4E |3
-<U4F00> \xFA\x6B |0
-<U4F00> \xED\x4F |3
+<U4EFC> \xED\x4E |0
+<U4F00> \xED\x4F |0
<U4F01> \x8A\xE9 |0
-<U4F03> \xFA\x6C |0
-<U4F03> \xED\x50 |3
+<U4F03> \xED\x50 |0
<U4F09> \x98\xC2 |0
<U4F0A> \x88\xC9 |0
<U4F0D> \x8C\xDE |0
@@ -904,8 +682,7 @@
<U4F34> \x94\xBA |0
<U4F36> \x97\xE0 |0
<U4F38> \x90\x4C |0
-<U4F39> \xFA\x6D |0
-<U4F39> \xED\x51 |3
+<U4F39> \xED\x51 |0
<U4F3A> \x8E\x66 |0
<U4F3C> \x8E\x97 |0
<U4F3D> \x89\xBE |0
@@ -919,8 +696,7 @@
<U4F51> \x97\x43 |0
<U4F53> \x91\xCC |0
<U4F55> \x89\xBD |0
-<U4F56> \xFA\x6E |0
-<U4F56> \xED\x52 |3
+<U4F56> \xED\x52 |0
<U4F57> \x98\xC7 |0
<U4F59> \x97\x5D |0
<U4F5A> \x98\xC3 |0
@@ -940,20 +716,16 @@
<U4F83> \x8A\xA4 |0
<U4F86> \x98\xD2 |0
<U4F88> \x98\xCA |0
-<U4F8A> \xFA\x70 |0
-<U4F8A> \xED\x54 |3
+<U4F8A> \xED\x54 |0
<U4F8B> \x97\xE1 |0
<U4F8D> \x8E\x98 |0
<U4F8F> \x98\xCB |0
<U4F91> \x98\xD0 |0
-<U4F92> \xFA\x6F |0
-<U4F92> \xED\x53 |3
-<U4F94> \xFA\x72 |0
-<U4F94> \xED\x56 |3
+<U4F92> \xED\x53 |0
+<U4F94> \xED\x56 |0
<U4F96> \x98\xD3 |0
<U4F98> \x98\xCC |0
-<U4F9A> \xFA\x71 |0
-<U4F9A> \xED\x55 |3
+<U4F9A> \xED\x55 |0
<U4F9B> \x8B\x9F |0
<U4F9D> \x88\xCB |0
<U4FA0> \x8B\xA0 |0
@@ -968,11 +740,9 @@
<U4FC2> \x8C\x57 |0
<U4FC3> \x91\xA3 |0
<U4FC4> \x89\xE2 |0
-<U4FC9> \xFA\x61 |0
-<U4FC9> \xED\x45 |3
+<U4FC9> \xED\x45 |0
<U4FCA> \x8F\x72 |0
-<U4FCD> \xFA\x73 |0
-<U4FCD> \xED\x57 |3
+<U4FCD> \xED\x57 |0
<U4FCE> \x98\xD7 |0
<U4FD0> \x98\xDC |0
<U4FD1> \x98\xDA |0
@@ -995,8 +765,7 @@
<U4FF8> \x95\xEE |0
<U4FFA> \x89\xB4 |0
<U4FFE> \x98\xEA |0
-<U4FFF> \xFA\x76 |0
-<U4FFF> \xED\x5A |3
+<U4FFF> \xED\x5A |0
<U5005> \x98\xE4 |0
<U5006> \x98\xED |0
<U5009> \x91\x71 |0
@@ -1009,12 +778,10 @@
<U5016> \x8C\xF4 |0
<U5019> \x8C\xF3 |0
<U501A> \x98\xDF |0
-<U501E> \xFA\x77 |0
-<U501E> \xED\x5B |3
+<U501E> \xED\x5B |0
<U501F> \x8E\xD8 |0
<U5021> \x98\xE7 |0
-<U5022> \xFA\x75 |0
-<U5022> \xED\x59 |3
+<U5022> \xED\x59 |0
<U5023> \x95\xED |0
<U5024> \x92\x6C |0
<U5025> \x98\xE3 |0
@@ -1027,13 +794,10 @@
<U502D> \x98\x60 |0
<U5036> \x8B\xE4 |0
<U5039> \x8C\x90 |0
-<U5040> \xFA\x74 |0
-<U5040> \xED\x58 |3
-<U5042> \xFA\x7A |0
-<U5042> \xED\x5E |3
+<U5040> \xED\x58 |0
+<U5042> \xED\x5E |0
<U5043> \x98\xEE |0
-<U5046> \xFA\x78 |0
-<U5046> \xED\x5C |3
+<U5046> \xED\x5C |0
<U5047> \x98\xEF |0
<U5048> \x98\xF3 |0
<U5049> \x88\xCC |0
@@ -1045,8 +809,7 @@
<U505C> \x92\xE2 |0
<U5065> \x8C\x92 |0
<U506C> \x98\xF6 |0
-<U5070> \xFA\x79 |0
-<U5070> \xED\x5D |3
+<U5070> \xED\x5D |0
<U5072> \x8E\xC3 |0
<U5074> \x91\xA4 |0
<U5075> \x92\xE3 |0
@@ -1057,8 +820,7 @@
<U5085> \x98\xFA |0
<U508D> \x96\x54 |0
<U5091> \x8C\x86 |0
-<U5094> \xFA\x7B |0
-<U5094> \xED\x5F |3
+<U5094> \xED\x5F |0
<U5098> \x8E\x50 |0
<U5099> \x94\xF5 |0
<U509A> \x98\xF9 |0
@@ -1079,8 +841,7 @@
<U50D1> \x8B\xA1 |0
<U50D5> \x96\x6C |0
<U50D6> \x99\x44 |0
-<U50D8> \xFA\x7D |0
-<U50D8> \xED\x61 |3
+<U50D8> \xED\x61 |0
<U50DA> \x97\xBB |0
<U50DE> \x99\x45 |0
<U50E3> \x99\x48 |0
@@ -1088,8 +849,7 @@
<U50E7> \x91\x6D |0
<U50ED> \x99\x47 |0
<U50EE> \x99\x49 |0
-<U50F4> \xFA\x7C |0
-<U50F4> \xED\x60 |3
+<U50F4> \xED\x60 |0
<U50F5> \x99\x4B |0
<U50F9> \x99\x4A |0
<U50FB> \x95\xC6 |0
@@ -1122,8 +882,7 @@
<U5147> \x8B\xA2 |0
<U5148> \x90\xE6 |0
<U5149> \x8C\xF5 |0
-<U514A> \xFA\x7E |0
-<U514A> \xED\x62 |3
+<U514A> \xED\x62 |0
<U514B> \x8D\x8E |0
<U514C> \x99\x5B |0
<U514D> \x96\xC6 |0
@@ -1134,8 +893,7 @@
<U515A> \x93\x7D |0
<U515C> \x8A\x95 |0
<U5162> \x99\x5D |0
-<U5164> \xFA\x80 |0
-<U5164> \xED\x63 |3
+<U5164> \xED\x63 |0
<U5165> \x93\xFC |0
<U5168> \x91\x53 |0
<U5169> \x99\x5F |0
@@ -1167,8 +925,7 @@
<U5196> \x99\x6B |0
<U5197> \x8F\xE7 |0
<U5199> \x8E\xCA |0
-<U519D> \xFA\x81 |0
-<U519D> \xED\x64 |3
+<U519D> \xED\x64 |0
<U51A0> \x8A\xA5 |0
<U51A2> \x99\x6E |0
<U51A4> \x99\x6C |0
@@ -1188,8 +945,7 @@
<U51B6> \x96\xE8 |0
<U51B7> \x97\xE2 |0
<U51BD> \x99\x77 |0
-<U51BE> \xFA\x82 |0
-<U51BE> \xED\x65 |3
+<U51BE> \xED\x65 |0
<U51C4> \x90\xA6 |0
<U51C5> \x99\x78 |0
<U51C6> \x8F\x79 |0
@@ -1207,8 +963,7 @@
<U51E7> \x91\xFA |0
<U51E9> \x99\x7D |0
<U51EA> \x93\xE2 |0
-<U51EC> \xFA\x83 |0
-<U51EC> \xED\x66 |3
+<U51EC> \xED\x66 |0
<U51ED> \x99\x7E |0
<U51F0> \x99\x80 |0
<U51F1> \x8A\x4D |0
@@ -1230,8 +985,7 @@
<U520E> \x99\x86 |0
<U5211> \x8C\x59 |0
<U5214> \x99\x85 |0
-<U5215> \xFA\x84 |0
-<U5215> \xED\x67 |3
+<U5215> \xED\x67 |0
<U5217> \x97\xF1 |0
<U521D> \x8F\x89 |0
<U5224> \x94\xBB |0
@@ -1283,27 +1037,24 @@
<U5292> \x99\x9A |0
<U5294> \x99\x99 |0
<U529B> \x97\xCD |0
-<U529C> \xFA\x85 |0
-<U529C> \xED\x68 |3
+<U529C> \xED\x68 |0
<U529F> \x8C\xF7 |0
<U52A0> \x89\xC1 |0
<U52A3> \x97\xF2 |0
-<U52A6> \xFA\x86 |0
-<U52A6> \xED\x69 |3
+<U52A6> \xED\x69 |0
<U52A9> \x8F\x95 |0
<U52AA> \x93\x77 |0
<U52AB> \x8D\x85 |0
<U52AC> \x99\xA0 |0
<U52AD> \x99\xA1 |0
-<U52AF> \xEE\x5B |3
+<U52AF> \xEE\x5B |0
<U52B1> \x97\xE3 |0
<U52B4> \x98\x4A |0
<U52B5> \x99\xA3 |0
<U52B9> \x8C\xF8 |0
<U52BC> \x99\xA2 |0
<U52BE> \x8A\x4E |0
-<U52C0> \xFA\x87 |0
-<U52C0> \xED\x6A |3
+<U52C0> \xED\x6A |0
<U52C1> \x99\xA4 |0
<U52C3> \x96\x75 |0
<U52C5> \x92\xBA |0
@@ -1315,8 +1066,7 @@
<U52D7> \x99\xA6 |0
<U52D8> \x8A\xA8 |0
<U52D9> \x96\xB1 |0
-<U52DB> \xFA\x88 |0
-<U52DB> \xED\x6B |3
+<U52DB> \xED\x6B |0
<U52DD> \x8F\x9F |0
<U52DE> \x99\xA7 |0
<U52DF> \x95\xE5 |0
@@ -1334,14 +1084,12 @@
<U52FA> \x8E\xD9 |0
<U52FE> \x8C\xF9 |0
<U52FF> \x96\xDC |0
-<U5300> \xFA\x89 |0
-<U5300> \xED\x6C |3
+<U5300> \xED\x6C |0
<U5301> \x96\xE6 |0
<U5302> \x93\xF5 |0
<U5305> \x95\xEF |0
<U5306> \x99\xB0 |0
-<U5307> \xFA\x8A |0
-<U5307> \xED\x6D |3
+<U5307> \xED\x6D |0
<U5308> \x99\xB1 |0
<U530D> \x99\xB3 |0
<U530F> \x99\xB5 |0
@@ -1355,8 +1103,7 @@
<U5320> \x8F\xA0 |0
<U5321> \x8B\xA7 |0
<U5323> \x99\xB8 |0
-<U5324> \xFA\x8B |0
-<U5324> \xED\x6E |3
+<U5324> \xED\x6E |0
<U532A> \x94\xD9 |0
<U532F> \x99\xB9 |0
<U5331> \x99\xBA |0
@@ -1392,8 +1139,7 @@
<U536F> \x89\x4B |0
<U5370> \x88\xF3 |0
<U5371> \x8A\xEB |0
-<U5372> \xFA\x8C |0
-<U5372> \xED\x6F |3
+<U5372> \xED\x6F |0
<U5373> \x91\xA6 |0
<U5374> \x8B\x70 |0
<U5375> \x97\x91 |0
@@ -1403,8 +1149,7 @@
<U537F> \x8B\xA8 |0
<U5382> \x99\xCA |0
<U5384> \x96\xEF |0
-<U5393> \xFA\x8D |0
-<U5393> \xED\x70 |3
+<U5393> \xED\x70 |0
<U5396> \x99\xCB |0
<U5398> \x97\xD0 |0
<U539A> \x8C\xFA |0
@@ -1417,8 +1162,7 @@
<U53AD> \x89\x7D |0
<U53AE> \x99\xCF |0
<U53B0> \x99\xD0 |0
-<U53B2> \xFA\x8E |0
-<U53B2> \xED\x71 |3
+<U53B2> \xED\x71 |0
<U53B3> \x8C\xB5 |0
<U53B6> \x99\xD1 |0
<U53BB> \x8B\x8E |0
@@ -1436,8 +1180,7 @@
<U53D7> \x8E\xF3 |0
<U53D9> \x8F\x96 |0
<U53DB> \x94\xBE |0
-<U53DD> \xFA\x8F |0
-<U53DD> \xED\x72 |3
+<U53DD> \xED\x72 |0
<U53DF> \x99\xD5 |0
<U53E1> \x89\x62 |0
<U53E2> \x91\x70 |0
@@ -1513,22 +1256,19 @@
<U5480> \x99\xF0 |0
<U5484> \x99\xF2 |0
<U5486> \x99\xF4 |0
-<U548A> \xFA\x92 |0
-<U548A> \xED\x75 |3
+<U548A> \xED\x75 |0
<U548B> \x8D\xEE |0
<U548C> \x98\x61 |0
<U548E> \x99\xE9 |0
<U548F> \x99\xE7 |0
<U5490> \x99\xF3 |0
<U5492> \x99\xEE |0
-<U549C> \xFA\x91 |0
-<U549C> \xED\x74 |3
+<U549C> \xED\x74 |0
<U54A2> \x99\xF6 |0
<U54A4> \x9A\x42 |0
<U54A5> \x99\xF8 |0
<U54A8> \x99\xFC |0
-<U54A9> \xFA\x93 |0
-<U54A9> \xED\x76 |3
+<U54A9> \xED\x76 |0
<U54AB> \x9A\x40 |0
<U54AC> \x99\xF9 |0
<U54AF> \x9A\x5D |0
@@ -1557,8 +1297,7 @@
<U54F2> \x93\x4E |0
<U54FA> \x9A\x4D |0
<U54FD> \x9A\x4A |0
-<U54FF> \xFA\x94 |0
-<U54FF> \xED\x77 |3
+<U54FF> \xED\x77 |0
<U5504> \x89\x53 |0
<U5506> \x8D\xB4 |0
<U5507> \x90\x4F |0
@@ -1591,8 +1330,7 @@
<U5580> \x9A\x5C |0
<U5583> \x9A\x66 |0
<U5584> \x91\x50 |0
-<U5586> \xFA\x95 |0
-<U5586> \xED\x78 |3
+<U5586> \xED\x78 |0
<U5587> \x9A\x68 |0
<U5589> \x8D\x41 |0
<U558A> \x9A\x5E |0
@@ -1719,12 +1457,10 @@
<U574F> \x9A\xAD |0
<U5750> \x8D\xBF |0
<U5751> \x8D\x42 |0
-<U5759> \xFA\x96 |0
-<U5759> \xED\x79 |3
+<U5759> \xED\x79 |0
<U5761> \x9A\xB1 |0
<U5764> \x8D\xA3 |0
-<U5765> \xFA\x97 |0
-<U5765> \xED\x7A |3
+<U5765> \xED\x7A |0
<U5766> \x92\x52 |0
<U5769> \x9A\xAE |0
<U576A> \x92\xD8 |0
@@ -1739,17 +1475,14 @@
<U57A3> \x8A\x5F |0
<U57A4> \x9A\xB7 |0
<U57AA> \x9A\xB8 |0
-<U57AC> \xFA\x98 |0
-<U57AC> \xED\x7B |3
+<U57AC> \xED\x7B |0
<U57B0> \x9A\xB9 |0
<U57B3> \x9A\xB6 |0
<U57C0> \x9A\xAF |0
<U57C3> \x9A\xBA |0
<U57C6> \x9A\xBB |0
-<U57C7> \xFA\x9A |0
-<U57C7> \xED\x7D |3
-<U57C8> \xFA\x99 |0
-<U57C8> \xED\x7C |3
+<U57C7> \xED\x7D |0
+<U57C8> \xED\x7C |0
<U57CB> \x96\x84 |0
<U57CE> \x8F\xE9 |0
<U57D2> \x9A\xBD |0
@@ -1809,14 +1542,12 @@
<U5893> \x95\xE6 |0
<U5897> \x91\x9D |0
<U589C> \x92\xC4 |0
-<U589E> \xFA\x9D |0
-<U589E> \xED\x81 |3
+<U589E> \xED\x81 |0
<U589F> \x9A\xD0 |0
<U58A8> \x96\x6E |0
<U58AB> \x9A\xD1 |0
<U58AE> \x9A\xD6 |0
-<U58B2> \xFA\x9E |0
-<U58B2> \xED\x82 |3
+<U58B2> \xED\x82 |0
<U58B3> \x95\xAD |0
<U58B8> \x9A\xD5 |0
<U58B9> \x9A\xCF |0
@@ -1855,8 +1586,7 @@
<U5902> \x9A\xE7 |0
<U5909> \x95\xCF |0
<U590A> \x9A\xE8 |0
-<U590B> \xFA\x9F |0
-<U590B> \xED\x83 |3
+<U590B> \xED\x83 |0
<U590F> \x89\xC4 |0
<U5910> \x9A\xE9 |0
<U5915> \x97\x5B |0
@@ -1888,21 +1618,17 @@
<U594F> \x91\x74 |0
<U5950> \x9A\xF4 |0
<U5951> \x8C\x5F |0
-<U5953> \xFA\xA0 |0
-<U5953> \xED\x84 |3
+<U5953> \xED\x84 |0
<U5954> \x96\x7A |0
<U5955> \x9A\xF3 |0
<U5957> \x93\x85 |0
<U5958> \x9A\xF7 |0
<U595A> \x9A\xF6 |0
-<U595B> \xFA\xA1 |0
-<U595B> \xED\x85 |3
-<U595D> \xFA\xA2 |0
-<U595D> \xED\x86 |3
+<U595B> \xED\x85 |0
+<U595D> \xED\x86 |0
<U5960> \x9A\xF9 |0
<U5962> \x9A\xF8 |0
-<U5963> \xFA\xA3 |0
-<U5963> \xED\x87 |3
+<U5963> \xED\x87 |0
<U5965> \x89\x9C |0
<U5967> \x9A\xFA |0
<U5968> \x8F\xA7 |0
@@ -1926,15 +1652,13 @@
<U599B> \x9B\xAA |0
<U599D> \x9B\x42 |0
<U59A3> \x9B\x45 |0
-<U59A4> \xFA\xA4 |0
-<U59A4> \xED\x88 |3
+<U59A4> \xED\x88 |0
<U59A5> \x91\xC3 |0
<U59A8> \x96\x57 |0
<U59AC> \x93\x69 |0
<U59B2> \x9B\x46 |0
<U59B9> \x96\x85 |0
-<U59BA> \xFA\xA5 |0
-<U59BA> \xED\x89 |3
+<U59BA> \xED\x89 |0
<U59BB> \x8D\xC8 |0
<U59BE> \x8F\xA8 |0
<U59C6> \x9B\x47 |0
@@ -2018,8 +1742,7 @@
<U5B51> \x9B\x72 |0
<U5B54> \x8D\x45 |0
<U5B55> \x9B\x73 |0
-<U5B56> \xFA\xA6 |0
-<U5B56> \xED\x8A |3
+<U5B56> \xED\x8A |0
<U5B57> \x8E\x9A |0
<U5B58> \x91\xB6 |0
<U5B5A> \x9B\x74 |0
@@ -2072,8 +1795,7 @@
<U5BB8> \x9B\x82 |0
<U5BB9> \x97\x65 |0
<U5BBF> \x8F\x68 |0
-<U5BC0> \xFA\xA7 |0
-<U5BC0> \xED\x8B |3
+<U5BC0> \xED\x8B |0
<U5BC2> \x8E\xE2 |0
<U5BC3> \x9B\x83 |0
<U5BC4> \x8A\xF1 |0
@@ -2086,8 +1808,7 @@
<U5BD2> \x8A\xA6 |0
<U5BD3> \x8B\xF5 |0
<U5BD4> \x9B\x86 |0
-<U5BD8> \xFA\xA9 |0
-<U5BD8> \xED\x8D |3
+<U5BD8> \xED\x8D |0
<U5BDB> \x8A\xB0 |0
<U5BDD> \x90\x51 |0
<U5BDE> \x9B\x8B |0
@@ -2101,8 +1822,7 @@
<U5BE8> \x9E\xCB |0
<U5BE9> \x90\x52 |0
<U5BEB> \x9B\x8D |0
-<U5BEC> \xFA\xAA |0
-<U5BEC> \xED\x8E |3
+<U5BEC> \xED\x8E |0
<U5BEE> \x97\xBE |0
<U5BF0> \x9B\x8E |0
<U5BF3> \x9B\x90 |0
@@ -2129,8 +1849,7 @@
<U5C13> \x9B\x95 |0
<U5C16> \x90\xEB |0
<U5C1A> \x8F\xAE |0
-<U5C1E> \xFA\xAB |0
-<U5C1E> \xED\x8F |3
+<U5C1E> \xED\x8F |0
<U5C20> \x9B\x96 |0
<U5C22> \x9B\x97 |0
<U5C24> \x96\xDE |0
@@ -2175,8 +1894,7 @@
<U5C91> \x9B\xA8 |0
<U5C94> \x9B\xA9 |0
<U5CA1> \x89\xAA |0
-<U5CA6> \xFA\xAC |0
-<U5CA6> \xED\x90 |3
+<U5CA6> \xED\x90 |0
<U5CA8> \x91\x5A |0
<U5CA9> \x8A\xE2 |0
<U5CAB> \x9B\xAB |0
@@ -2186,8 +1904,7 @@
<U5CB6> \x9B\xAD |0
<U5CB7> \x9B\xAF |0
<U5CB8> \x8A\xDD |0
-<U5CBA> \xFA\xAD |0
-<U5CBA> \xED\x91 |3
+<U5CBA> \xED\x91 |0
<U5CBB> \x9B\xAC |0
<U5CBC> \x9B\xAE |0
<U5CBE> \x9B\xB1 |0
@@ -2202,8 +1919,7 @@
<U5CED> \x9B\xB7 |0
<U5CEF> \x95\xF5 |0
<U5CF0> \x95\xF4 |0
-<U5CF5> \xFA\xAE |0
-<U5CF5> \xED\x92 |3
+<U5CF5> \xED\x92 |0
<U5CF6> \x93\x87 |0
<U5CFA> \x9B\xB6 |0
<U5CFB> \x8F\x73 |0
@@ -2222,23 +1938,19 @@
<U5D1B> \x9B\xBF |0
<U5D1F> \x9B\xBE |0
<U5D22> \x9B\xC2 |0
-<U5D27> \xFA\xAF |0
-<U5D27> \xED\x93 |3
+<U5D27> \xED\x93 |0
<U5D29> \x95\xF6 |0
-<U5D42> \xFA\xB2 |0
-<U5D42> \xED\x96 |3
+<U5D42> \xED\x96 |0
<U5D4B> \x9B\xC9 |0
<U5D4C> \x9B\xC6 |0
<U5D4E> \x9B\xC8 |0
<U5D50> \x97\x92 |0
<U5D52> \x9B\xC7 |0
-<U5D53> \xFA\xB0 |0
-<U5D53> \xED\x94 |3
+<U5D53> \xED\x94 |0
<U5D5C> \x9B\xBD |0
<U5D69> \x90\x93 |0
<U5D6C> \x9B\xCA |0
-<U5D6D> \xFA\xB3 |0
-<U5D6D> \xED\x97 |3
+<U5D6D> \xED\x97 |0
<U5D6F> \x8D\xB5 |0
<U5D73> \x9B\xCB |0
<U5D76> \x9B\xCC |0
@@ -2253,18 +1965,15 @@
<U5DAC> \x9B\xD2 |0
<U5DAE> \x9B\xD3 |0
<U5DB7> \x9B\xD6 |0
-<U5DB8> \xFA\xB4 |0
-<U5DB8> \xED\x98 |3
-<U5DB9> \xFA\xB5 |0
-<U5DB9> \xED\x99 |3
+<U5DB8> \xED\x98 |0
+<U5DB9> \xED\x99 |0
<U5DBA> \x97\xE4 |0
<U5DBC> \x9B\xD7 |0
<U5DBD> \x9B\xD4 |0
<U5DC9> \x9B\xD8 |0
<U5DCC> \x8A\xDE |0
<U5DCD> \x9B\xD9 |0
-<U5DD0> \xFA\xB6 |0
-<U5DD0> \xED\x9A |3
+<U5DD0> \xED\x9A |0
<U5DD2> \x9B\xDB |0
<U5DD3> \x9B\xDA |0
<U5DD6> \x9B\xDC |0
@@ -2409,8 +2118,7 @@
<U5F18> \x8D\x4F |0
<U5F1B> \x92\x6F |0
<U5F1F> \x92\xED |0
-<U5F21> \xFA\xB7 |0
-<U5F21> \xED\x9B |3
+<U5F21> \xED\x9B |0
<U5F25> \x96\xED |0
<U5F26> \x8C\xB7 |0
<U5F27> \x8C\xCA |0
@@ -2418,16 +2126,14 @@
<U5F2D> \x9C\x58 |0
<U5F2F> \x9C\x5E |0
<U5F31> \x8E\xE3 |0
-<U5F34> \xFA\xB8 |0
-<U5F34> \xED\x9C |3
+<U5F34> \xED\x9C |0
<U5F35> \x92\xA3 |0
<U5F37> \x8B\xAD |0
<U5F38> \x9C\x59 |0
<U5F3C> \x95\x4A |0
<U5F3E> \x92\x65 |0
<U5F41> \x9C\x5A |0
-<U5F45> \xFA\x67 |0
-<U5F45> \xED\x4B |3
+<U5F45> \xED\x4B |0
<U5F48> \x9C\x5B |0
<U5F4A> \x8B\xAE |0
<U5F4C> \x9C\x5C |0
@@ -2442,8 +2148,7 @@
<U5F61> \x9C\x63 |0
<U5F62> \x8C\x60 |0
<U5F66> \x95\x46 |0
-<U5F67> \xFA\xB9 |0
-<U5F67> \xED\x9D |3
+<U5F67> \xED\x9D |0
<U5F69> \x8D\xCA |0
<U5F6A> \x95\x56 |0
<U5F6B> \x92\xA4 |0
@@ -2484,8 +2189,7 @@
<U5FAE> \x94\xF7 |0
<U5FB3> \x93\xBF |0
<U5FB4> \x92\xA5 |0
-<U5FB7> \xFA\xBA |0
-<U5FB7> \xED\x9E |3
+<U5FB7> \xED\x9E |0
<U5FB9> \x93\x4F |0
<U5FBC> \x9C\x74 |0
<U5FBD> \x8B\x4A |0
@@ -2499,8 +2203,7 @@
<U5FD9> \x96\x5A |0
<U5FDC> \x89\x9E |0
<U5FDD> \x9C\x7A |0
-<U5FDE> \xFA\xBB |0
-<U5FDE> \xED\x9F |3
+<U5FDE> \xED\x9F |0
<U5FE0> \x92\x89 |0
<U5FE4> \x9C\x77 |0
<U5FEB> \x89\xF5 |0
@@ -2545,8 +2248,7 @@
<U6055> \x8F\x9A |0
<U6059> \x9C\x99 |0
<U605A> \x9C\x8B |0
-<U605D> \xFA\xBC |0
-<U605D> \xED\xA0 |3
+<U605D> \xED\xA0 |0
<U605F> \x9C\x8F |0
<U6060> \x9C\x7E |0
<U6062> \x89\xF8 |0
@@ -2566,11 +2268,9 @@
<U6081> \x9C\x9A |0
<U6083> \x9C\x9D |0
<U6084> \x9C\x9F |0
-<U6085> \xFA\xBD |0
-<U6085> \xED\xA1 |3
+<U6085> \xED\xA1 |0
<U6089> \x8E\xBB |0
-<U608A> \xFA\xBE |0
-<U608A> \xED\xA2 |3
+<U608A> \xED\xA2 |0
<U608B> \x9C\xA5 |0
<U608C> \x92\xEE |0
<U608D> \x9C\x9B |0
@@ -2600,13 +2300,11 @@
<U60C7> \x93\xD5 |0
<U60D1> \x98\x66 |0
<U60D3> \x9C\xA9 |0
-<U60D5> \xFA\xC0 |0
-<U60D5> \xED\xA4 |3
+<U60D5> \xED\xA4 |0
<U60D8> \x9C\xAF |0
<U60DA> \x8D\x9B |0
<U60DC> \x90\xC9 |0
-<U60DE> \xFA\xBF |0
-<U60DE> \xED\xA3 |3
+<U60DE> \xED\xA3 |0
<U60DF> \x88\xD2 |0
<U60E0> \x9C\xA8 |0
<U60E1> \x9C\xA6 |0
@@ -2615,8 +2313,7 @@
<U60E8> \x8E\x53 |0
<U60F0> \x91\xC4 |0
<U60F1> \x9C\xBB |0
-<U60F2> \xFA\xC2 |0
-<U60F2> \xED\xA6 |3
+<U60F2> \xED\xA6 |0
<U60F3> \x91\x7A |0
<U60F4> \x9C\xB6 |0
<U60F6> \x9C\xB3 |0
@@ -2633,23 +2330,19 @@
<U610D> \x9C\xBC |0
<U610E> \x9C\xBD |0
<U610F> \x88\xD3 |0
-<U6111> \xFA\xC3 |0
-<U6111> \xED\xA7 |3
+<U6111> \xED\xA7 |0
<U6115> \x9C\xB1 |0
<U611A> \x8B\xF0 |0
<U611B> \x88\xA4 |0
<U611F> \x8A\xB4 |0
-<U6120> \xFA\xC1 |0
-<U6120> \xED\xA5 |3
+<U6120> \xED\xA5 |0
<U6121> \x9C\xB9 |0
<U6127> \x9C\xC1 |0
<U6128> \x9C\xC0 |0
<U612C> \x9C\xC5 |0
-<U6130> \xFA\xC5 |0
-<U6130> \xED\xA9 |3
+<U6130> \xED\xA9 |0
<U6134> \x9C\xC6 |0
-<U6137> \xFA\xC4 |0
-<U6137> \xED\xA8 |3
+<U6137> \xED\xA8 |0
<U613C> \x9C\xC4 |0
<U613D> \x9C\xC7 |0
<U613E> \x9C\xBF |0
@@ -2694,8 +2387,7 @@
<U6191> \x9C\xDF |0
<U6194> \x9C\xDC |0
<U6196> \x9C\xD9 |0
-<U6198> \xFA\xC6 |0
-<U6198> \xED\xAA |3
+<U6198> \xED\xAA |0
<U6199> \x9C\xD8 |0
<U619A> \x9C\xDD |0
<U61A4> \x95\xAE |0
@@ -2740,8 +2432,7 @@
<U6210> \x90\xAC |0
<U6211> \x89\xE4 |0
<U6212> \x89\xFA |0
-<U6213> \xFA\xC7 |0
-<U6213> \xED\xAB |3
+<U6213> \xED\xAB |0
<U6214> \x9C\xFB |0
<U6216> \x88\xBD |0
<U621A> \x90\xCA |0
@@ -2801,8 +2492,7 @@
<U629B> \x9D\x65 |0
<U629C> \x94\xB2 |0
<U629E> \x91\xF0 |0
-<U62A6> \xFA\xC8 |0
-<U62A6> \xED\xAC |3
+<U62A6> \xED\xAC |0
<U62AB> \x94\xE2 |0
<U62AC> \x9D\xAB |0
<U62B1> \x95\xF8 |0
@@ -2924,8 +2614,7 @@
<U63E9> \x9D\x82 |0
<U63EE> \x8A\xF6 |0
<U63F4> \x89\x87 |0
-<U63F5> \xFA\xC9 |0
-<U63F5> \xED\xAD |3
+<U63F5> \xED\xAD |0
<U63F6> \x9D\x88 |0
<U63FA> \x97\x68 |0
<U6406> \x9D\x8C |0
@@ -2946,8 +2635,7 @@
<U6442> \x90\xDB |0
<U644E> \x9D\x97 |0
<U6458> \x93\x45 |0
-<U6460> \xFA\xCA |0
-<U6460> \xED\xAE |3
+<U6460> \xED\xAE |0
<U6467> \x9D\x94 |0
<U6469> \x96\x80 |0
<U646F> \x9D\x95 |0
@@ -2960,8 +2648,7 @@
<U6493> \x9D\x9A |0
<U6495> \x9D\x99 |0
<U649A> \x94\x51 |0
-<U649D> \xFA\xCB |0
-<U649D> \xED\xAF |3
+<U649D> \xED\xAF |0
<U649E> \x93\xB3 |0
<U64A4> \x93\x50 |0
<U64A5> \x9D\x9B |0
@@ -2979,8 +2666,7 @@
<U64C5> \x9D\xA1 |0
<U64C7> \x9D\xA2 |0
<U64CD> \x91\x80 |0
-<U64CE> \xFA\xCC |0
-<U64CE> \xED\xB0 |3
+<U64CE> \xED\xB0 |0
<U64D2> \x9D\xA0 |0
<U64D4> \x9D\x5E |0
<U64D8> \x9D\xA4 |0
@@ -3023,8 +2709,7 @@
<U6545> \x8C\xCC |0
<U6548> \x9D\xC1 |0
<U654D> \x9D\xC4 |0
-<U654E> \xFA\xCD |0
-<U654E> \xED\xB1 |3
+<U654E> \xED\xB1 |0
<U654F> \x95\x71 |0
<U6551> \x8B\x7E |0
<U6555> \x9D\xC3 |0
@@ -3096,43 +2781,35 @@
<U65F1> \x9D\xDB |0
<U65FA> \x89\xA0 |0
<U65FB> \x9D\xDF |0
-<U6600> \xFA\xCE |0
-<U6600> \xED\xB2 |3
+<U6600> \xED\xB2 |0
<U6602> \x8D\x56 |0
<U6603> \x9D\xDE |0
<U6606> \x8D\xA9 |0
<U6607> \x8F\xB8 |0
-<U6609> \xFA\xD1 |0
-<U6609> \xED\xB5 |3
+<U6609> \xED\xB5 |0
<U660A> \x9D\xDD |0
<U660C> \x8F\xB9 |0
<U660E> \x96\xBE |0
<U660F> \x8D\xA8 |0
<U6613> \x88\xD5 |0
<U6614> \x90\xCC |0
-<U6615> \xFA\xCF |0
-<U6615> \xED\xB3 |3
+<U6615> \xED\xB3 |0
<U661C> \x9D\xE4 |0
-<U661E> \xFA\xD3 |0
-<U661E> \xED\xB7 |3
+<U661E> \xED\xB7 |0
<U661F> \x90\xAF |0
<U6620> \x89\x66 |0
-<U6624> \xFA\xD4 |0
-<U6624> \xED\xB8 |3
+<U6624> \xED\xB8 |0
<U6625> \x8F\x74 |0
<U6627> \x96\x86 |0
<U6628> \x8D\xF0 |0
<U662D> \x8F\xBA |0
-<U662E> \xFA\xD2 |0
-<U662E> \xED\xB6 |3
+<U662E> \xED\xB6 |0
<U662F> \x90\xA5 |0
-<U6631> \xFA\x63 |0
-<U6631> \xED\x47 |3
+<U6631> \xED\x47 |0
<U6634> \x9D\xE3 |0
<U6635> \x9D\xE1 |0
<U6636> \x9D\xE2 |0
-<U663B> \xFA\xD0 |0
-<U663B> \xED\xB4 |3
+<U663B> \xED\xB4 |0
<U663C> \x92\x8B |0
<U663F> \x9E\x45 |0
<U6641> \x9D\xE8 |0
@@ -3143,17 +2820,14 @@
<U664B> \x90\x57 |0
<U664F> \x9D\xE5 |0
<U6652> \x8E\x4E |0
-<U6657> \xFA\xD6 |0
-<U6657> \xED\xBA |3
-<U6659> \xFA\xD7 |0
-<U6659> \xED\xBB |3
+<U6657> \xED\xBA |0
+<U6659> \xED\xBB |0
<U665D> \x9D\xEA |0
<U665E> \x9D\xE9 |0
<U665F> \x9D\xEE |0
<U6662> \x9D\xEF |0
<U6664> \x9D\xEB |0
-<U6665> \xFA\xD5 |0
-<U6665> \xED\xB9 |3
+<U6665> \xED\xB9 |0
<U6666> \x8A\x41 |0
<U6667> \x9D\xEC |0
<U6668> \x9D\xED |0
@@ -3161,8 +2835,7 @@
<U666E> \x95\x81 |0
<U666F> \x8C\x69 |0
<U6670> \x9D\xF0 |0
-<U6673> \xFA\xD9 |0
-<U6673> \xED\xBD |3
+<U6673> \xED\xBD |0
<U6674> \x90\xB0 |0
<U6676> \x8F\xBB |0
<U667A> \x92\x71 |0
@@ -3177,24 +2850,20 @@
<U6696> \x92\x67 |0
<U6697> \x88\xC3 |0
<U6698> \x9D\xF6 |0
-<U6699> \xFA\xDA |0
-<U6699> \xED\xBE |3
+<U6699> \xED\xBE |0
<U669D> \x9D\xF7 |0
-<U66A0> \xFA\xDB |0
-<U66A0> \xED\xBF |3
+<U66A0> \xED\xBF |0
<U66A2> \x92\xA8 |0
<U66A6> \x97\xEF |0
<U66AB> \x8E\x62 |0
<U66AE> \x95\xE9 |0
-<U66B2> \xFA\xDC |0
-<U66B2> \xED\xC0 |3
+<U66B2> \xED\xC0 |0
<U66B4> \x96\x5C |0
<U66B8> \x9E\x41 |0
<U66B9> \x9D\xF9 |0
<U66BC> \x9D\xFC |0
<U66BE> \x9D\xFB |0
-<U66BF> \xFA\xDD |0
-<U66BF> \xED\xC1 |3
+<U66BF> \xED\xC1 |0
<U66C1> \x9D\xF8 |0
<U66C4> \x9E\x40 |0
<U66C7> \x93\xDC |0
@@ -3215,10 +2884,8 @@
<U66F7> \x9E\x4A |0
<U66F8> \x8F\x91 |0
<U66F9> \x91\x82 |0
-<U66FA> \xFA\xDE |0
-<U66FA> \xED\xC2 |3
-<U66FB> \xFA\x66 |0
-<U66FB> \xED\x4A |3
+<U66FA> \xED\xC2 |0
+<U66FB> \xED\x4A |0
<U66FC> \x99\xD6 |0
<U66FD> \x91\x5D |0
<U66FE> \x91\x5C |0
@@ -3229,8 +2896,7 @@
<U6709> \x97\x4C |0
<U670B> \x95\xFC |0
<U670D> \x95\x9E |0
-<U670E> \xFA\xDF |0
-<U670E> \xED\xC3 |3
+<U670E> \xED\xC3 |0
<U670F> \x9E\x4B |0
<U6714> \x8D\xF1 |0
<U6715> \x92\xBD |0
@@ -3275,8 +2941,7 @@
<U6763> \x9E\x5B |0
<U6764> \x9E\x5C |0
<U6765> \x97\x88 |0
-<U6766> \xFA\xE1 |0
-<U6766> \xED\xC5 |3
+<U6766> \xED\xC5 |0
<U676A> \x9E\x61 |0
<U676D> \x8D\x59 |0
<U676F> \x94\x74 |0
@@ -3312,10 +2977,8 @@
<U67B7> \x9E\x67 |0
<U67B8> \x9E\x6D |0
<U67B9> \x9E\x73 |0
-<U67BB> \xFA\xE2 |0
-<U67BB> \xED\xC6 |3
-<U67C0> \xFA\xE4 |0
-<U67C0> \xED\xC8 |3
+<U67BB> \xED\xC6 |0
+<U67C0> \xED\xC8 |0
<U67C1> \x91\xC6 |0
<U67C4> \x95\xBF |0
<U67C6> \x9E\x75 |0
@@ -3344,8 +3007,7 @@
<U67FB> \x8D\xB8 |0
<U67FE> \x96\x8F |0
<U67FF> \x8A\x60 |0
-<U6801> \xFA\xE5 |0
-<U6801> \xED\xC9 |3
+<U6801> \xED\xC9 |0
<U6802> \x92\xCC |0
<U6803> \x93\xC8 |0
<U6804> \x89\x68 |0
@@ -3368,16 +3030,14 @@
<U6841> \x8C\x85 |0
<U6842> \x8C\x6A |0
<U6843> \x93\x8D |0
-<U6844> \xFA\xE6 |0
-<U6844> \xED\xCA |3
+<U6844> \xED\xCA |0
<U6846> \x9E\x79 |0
<U6848> \x88\xC4 |0
<U684D> \x9E\x7C |0
<U684E> \x9E\x7E |0
<U6850> \x8B\xCB |0
<U6851> \x8C\x4B |0
-<U6852> \xFA\xE3 |0
-<U6852> \xED\xC7 |3
+<U6852> \xED\xC7 |0
<U6853> \x8A\xBA |0
<U6854> \x8B\x6A |0
<U6859> \x9E\x82 |0
@@ -3419,14 +3079,12 @@
<U68BC> \x93\x8E |0
<U68C4> \x8A\xFC |0
<U68C6> \x9E\xB0 |0
-<U68C8> \xFA\x64 |0
-<U68C8> \xED\x48 |3
+<U68C8> \xED\x48 |0
<U68C9> \x96\xC7 |0
<U68CA> \x9E\x97 |0
<U68CB> \x8A\xFB |0
<U68CD> \x9E\x9E |0
-<U68CF> \xFA\xE7 |0
-<U68CF> \xED\xCB |3
+<U68CF> \xED\xCB |0
<U68D2> \x96\x5F |0
<U68D4> \x9E\x9F |0
<U68D5> \x9E\xA1 |0
@@ -3483,8 +3141,7 @@
<U6960> \x93\xED |0
<U6961> \x9E\xBE |0
<U6962> \x93\xE8 |0
-<U6968> \xFA\xE9 |0
-<U6968> \xED\xCD |3
+<U6968> \xED\xCD |0
<U696A> \x9E\xC2 |0
<U696B> \x9E\xB5 |0
<U696D> \x8B\xC6 |0
@@ -3506,8 +3163,7 @@
<U6991> \x9E\xD2 |0
<U6994> \x98\x50 |0
<U6995> \x9E\xD5 |0
-<U6998> \xFA\xEB |0
-<U6998> \xED\xCF |3
+<U6998> \xED\xCF |0
<U699B> \x90\x59 |0
<U699C> \x9E\xD4 |0
<U69A0> \x9E\xD3 |0
@@ -3533,8 +3189,7 @@
<U69D9> \x96\x8A |0
<U69DD> \x9E\xCD |0
<U69DE> \x9E\xD7 |0
-<U69E2> \xFA\xEC |0
-<U69E2> \xED\xD0 |3
+<U69E2> \xED\xD0 |0
<U69E7> \x9E\xDF |0
<U69E8> \x9E\xD8 |0
<U69EB> \x9E\xE5 |0
@@ -3564,8 +3219,7 @@
<U6A2A> \x89\xA1 |0
<U6A2B> \x8A\x7E |0
<U6A2E> \x9E\xD1 |0
-<U6A30> \xFA\xED |0
-<U6A30> \xED\xD1 |3
+<U6A30> \xED\xD1 |0
<U6A35> \x8F\xBF |0
<U6A36> \x9E\xEE |0
<U6A38> \x9E\xF5 |0
@@ -3573,8 +3227,7 @@
<U6A3A> \x8A\x92 |0
<U6A3D> \x92\x4D |0
<U6A44> \x9E\xEB |0
-<U6A46> \xFA\xEF |0
-<U6A46> \xED\xD3 |3
+<U6A46> \xED\xD3 |0
<U6A47> \x9E\xF0 |0
<U6A48> \x9E\xF4 |0
<U6A4B> \x8B\xB4 |0
@@ -3584,14 +3237,11 @@
<U6A61> \x93\xC9 |0
<U6A62> \x9E\xF1 |0
<U6A66> \x9E\xF3 |0
-<U6A6B> \xFA\xEE |0
-<U6A6B> \xED\xD2 |3
+<U6A6B> \xED\xD2 |0
<U6A72> \x9E\xED |0
-<U6A73> \xFA\xF0 |0
-<U6A73> \xED\xD4 |3
+<U6A73> \xED\xD4 |0
<U6A78> \x9E\xEF |0
-<U6A7E> \xFA\xF1 |0
-<U6A7E> \xED\xD5 |3
+<U6A7E> \xED\xD5 |0
<U6A7F> \x8A\x80 |0
<U6A80> \x92\x68 |0
<U6A84> \x9E\xFA |0
@@ -3618,10 +3268,8 @@
<U6ADB> \x8B\xF9 |0
<U6ADE> \x9F\x48 |0
<U6ADF> \x9F\x4A |0
-<U6AE2> \xFA\xF2 |0
-<U6AE2> \xED\xD6 |3
-<U6AE4> \xFA\xF3 |0
-<U6AE4> \xED\xD7 |3
+<U6AE2> \xED\xD6 |0
+<U6AE4> \xED\xD7 |0
<U6AE8> \x94\xA5 |0
<U6AEA> \x9F\x4D |0
<U6AFA> \x9F\x51 |0
@@ -3704,8 +3352,7 @@
<U6BD2> \x93\xC5 |0
<U6BD3> \x9F\x79 |0
<U6BD4> \x94\xE4 |0
-<U6BD6> \xFA\xF4 |0
-<U6BD6> \xED\xD8 |3
+<U6BD6> \xED\xD8 |0
<U6BD8> \x94\xF9 |0
<U6BDB> \x96\xD1 |0
<U6BDF> \x9F\x7A |0
@@ -3726,8 +3373,7 @@
<U6C37> \x95\x58 |0
<U6C38> \x89\x69 |0
<U6C3E> \x94\xC3 |0
-<U6C3F> \xFA\xF5 |0
-<U6C3F> \xED\xD9 |3
+<U6C3F> \xED\xD9 |0
<U6C40> \x92\xF3 |0
<U6C41> \x8F\x60 |0
<U6C42> \x8B\x81 |0
@@ -3736,8 +3382,7 @@
<U6C55> \x9F\x88 |0
<U6C57> \x8A\xBE |0
<U6C5A> \x89\x98 |0
-<U6C5C> \xFA\xF6 |0
-<U6C5C> \xED\xDA |3
+<U6C5C> \xED\xDA |0
<U6C5D> \x93\xF0 |0
<U6C5E> \x9F\x87 |0
<U6C5F> \x8D\x5D |0
@@ -3745,8 +3390,7 @@
<U6C62> \x9F\x89 |0
<U6C68> \x9F\x91 |0
<U6C6A> \x9F\x8A |0
-<U6C6F> \xFA\xF8 |0
-<U6C6F> \xED\xDC |3
+<U6C6F> \xED\xDC |0
<U6C70> \x91\xBF |0
<U6C72> \x8B\x82 |0
<U6C73> \x9F\x92 |0
@@ -3756,8 +3400,7 @@
<U6C81> \x9F\x8E |0
<U6C82> \x9F\x8B |0
<U6C83> \x97\x80 |0
-<U6C86> \xFA\xF7 |0
-<U6C86> \xED\xDB |3
+<U6C86> \xED\xDB |0
<U6C88> \x92\xBE |0
<U6C8C> \x93\xD7 |0
<U6C8D> \x9F\x8C |0
@@ -3792,8 +3435,7 @@
<U6CD5> \x96\x40 |0
<U6CD7> \x9F\x99 |0
<U6CD9> \x9F\xA2 |0
-<U6CDA> \xFA\xF9 |0
-<U6CDA> \xED\xDD |3
+<U6CDA> \xED\xDD |0
<U6CDB> \x9F\xA0 |0
<U6CDD> \x9F\x9B |0
<U6CE1> \x96\x41 |0
@@ -3806,8 +3448,7 @@
<U6CF0> \x91\xD7 |0
<U6CF1> \x9F\x96 |0
<U6CF3> \x89\x6A |0
-<U6D04> \xFA\xFA |0
-<U6D04> \xED\xDE |3
+<U6D04> \xED\xDE |0
<U6D0B> \x97\x6D |0
<U6D0C> \x9F\xAE |0
<U6D12> \x9F\xAD |0
@@ -3841,25 +3482,23 @@
<U6D6A> \x98\x51 |0
<U6D6C> \x8A\x5C |0
<U6D6E> \x95\x82 |0
-<U6D6F> \xFA\xFC |0
-<U6D6F> \xED\xE0 |3
+<U6D6F> \xED\xE0 |0
<U6D74> \x97\x81 |0
<U6D77> \x8A\x43 |0
<U6D78> \x90\x5A |0
<U6D79> \x9F\xB3 |0
<U6D85> \x9F\xB8 |0
-<U6D87> \xFA\xFB |0
-<U6D87> \xED\xDF |3
+<U6D87> \xED\xDF |0
<U6D88> \x8F\xC1 |0
<U6D8C> \x97\x4F |0
<U6D8E> \x9F\xB5 |0
<U6D93> \x9F\xB0 |0
<U6D95> \x9F\xB6 |0
-<U6D96> \xED\xE1 |3
+<U6D96> \xED\xE1 |0
<U6D99> \x97\xDC |0
<U6D9B> \x93\x93 |0
<U6D9C> \x93\xC0 |0
-<U6DAC> \xED\xE2 |3
+<U6DAC> \xED\xE2 |0
<U6DAF> \x8A\x55 |0
<U6DB2> \x89\x74 |0
<U6DB5> \x9F\xBC |0
@@ -3871,7 +3510,7 @@
<U6DC7> \x9F\xBD |0
<U6DCB> \x97\xD2 |0
<U6DCC> \x9F\xC3 |0
-<U6DCF> \xED\xE3 |3
+<U6DCF> \xED\xE3 |0
<U6DD1> \x8F\x69 |0
<U6DD2> \x9F\xC5 |0
<U6DD5> \x9F\xCA |0
@@ -3887,15 +3526,15 @@
<U6DEC> \x9F\xC1 |0
<U6DEE> \x9F\xCC |0
<U6DF1> \x90\x5B |0
-<U6DF2> \xED\xE5 |3
+<U6DF2> \xED\xE5 |0
<U6DF3> \x8F\x7E |0
<U6DF5> \x95\xA3 |0
<U6DF7> \x8D\xAC |0
-<U6DF8> \xED\xE4 |3
+<U6DF8> \xED\xE4 |0
<U6DF9> \x9F\xB9 |0
<U6DFA> \x9F\xC7 |0
<U6DFB> \x93\x59 |0
-<U6DFC> \xED\xE6 |3
+<U6DFC> \xED\xE6 |0
<U6E05> \x90\xB4 |0
<U6E07> \x8A\x89 |0
<U6E08> \x8D\xCF |0
@@ -3915,7 +3554,7 @@
<U6E24> \x9F\xDD |0
<U6E25> \x88\xAD |0
<U6E26> \x89\x51 |0
-<U6E27> \xED\xE9 |3
+<U6E27> \xED\xE9 |0
<U6E29> \x89\xB7 |0
<U6E2B> \x9F\xD6 |0
<U6E2C> \x91\xAA |0
@@ -3923,9 +3562,9 @@
<U6E2E> \x9F\xCF |0
<U6E2F> \x8D\x60 |0
<U6E38> \x9F\xE0 |0
-<U6E39> \xED\xE7 |3
+<U6E39> \xED\xE7 |0
<U6E3A> \x9F\xDB |0
-<U6E3C> \xED\xEA |3
+<U6E3C> \xED\xEA |0
<U6E3E> \x9F\xD3 |0
<U6E43> \x9F\xDA |0
<U6E4A> \x96\xA9 |0
@@ -3934,7 +3573,7 @@
<U6E56> \x8C\xCE |0
<U6E58> \x8F\xC3 |0
<U6E5B> \x92\x58 |0
-<U6E5C> \xED\xE8 |3
+<U6E5C> \xED\xE8 |0
<U6E5F> \x9F\xD2 |0
<U6E67> \x97\x4E |0
<U6E6B> \x9F\xD5 |0
@@ -3963,7 +3602,7 @@
<U6EB7> \x9F\xE5 |0
<U6EBA> \x93\x4D |0
<U6EBD> \x9F\xE7 |0
-<U6EBF> \xED\xEB |3
+<U6EBF> \xED\xEB |0
<U6EC2> \x9F\xEF |0
<U6EC4> \x9F\xE9 |0
<U6EC5> \x96\xC5 |0
@@ -4025,7 +3664,7 @@
<U6F82> \xE0\x4C |0
<U6F84> \x90\x9F |0
<U6F86> \xE0\x43 |0
-<U6F88> \xED\xEC |3
+<U6F88> \xED\xEC |0
<U6F8E> \xE0\x4F |0
<U6F91> \xE0\x50 |0
<U6F97> \x8A\xC0 |0
@@ -4035,7 +3674,7 @@
<U6FAA> \xE0\x59 |0
<U6FB1> \x93\x62 |0
<U6FB3> \xE0\x53 |0
-<U6FB5> \xED\xED |3
+<U6FB5> \xED\xED |0
<U6FB9> \xE0\x57 |0
<U6FC0> \x8C\x83 |0
<U6FC1> \x91\xF7 |0
@@ -4056,13 +3695,13 @@
<U6FEF> \x91\xF3 |0
<U6FF1> \xE0\x5F |0
<U6FF3> \xE0\x4A |0
-<U6FF5> \xED\xEE |3
+<U6FF5> \xED\xEE |0
<U6FF6> \xE8\x89 |0
<U6FFA> \xE0\x64 |0
<U6FFE> \xE0\x68 |0
<U7001> \xE0\x66 |0
-<U7005> \xED\xEF |3
-<U7007> \xED\xF0 |3
+<U7005> \xED\xEF |0
+<U7007> \xED\xF0 |0
<U7009> \xE0\x62 |0
<U700B> \xE0\x63 |0
<U700F> \xE0\x67 |0
@@ -4076,7 +3715,7 @@
<U701F> \xE0\x6E |0
<U7026> \x92\x95 |0
<U7027> \x91\xEB |0
-<U7028> \xED\xF1 |3
+<U7028> \xED\xF1 |0
<U702C> \x90\xA3 |0
<U7030> \xE0\x6F |0
<U7032> \xE0\x71 |0
@@ -4091,13 +3730,13 @@
<U7078> \x8B\x84 |0
<U707C> \x8E\xDC |0
<U707D> \x8D\xD0 |0
-<U7085> \xED\xF2 |3
+<U7085> \xED\xF2 |0
<U7089> \x98\x46 |0
<U708A> \x90\x86 |0
<U708E> \x89\x8A |0
<U7092> \xE0\x75 |0
<U7099> \xE0\x74 |0
-<U70AB> \xED\xF3 |3
+<U70AB> \xED\xF3 |0
<U70AC> \xE0\x78 |0
<U70AD> \x92\x59 |0
<U70AE> \xE0\x7B |0
@@ -4106,8 +3745,7 @@
<U70B8> \xE0\x79 |0
<U70B9> \x93\x5F |0
<U70BA> \x88\xD7 |0
-<U70BB> \xFA\x62 |0
-<U70BB> \xED\x46 |3
+<U70BB> \xED\x46 |0
<U70C8> \x97\xF3 |0
<U70CB> \xE0\x7D |0
<U70CF> \x89\x47 |0
@@ -4117,9 +3755,9 @@
<U70F1> \xE0\x77 |0
<U70F9> \x96\x42 |0
<U70FD> \xE0\x82 |0
-<U7104> \xED\xF5 |3
+<U7104> \xED\xF5 |0
<U7109> \xE0\x81 |0
-<U710F> \xED\xF4 |3
+<U710F> \xED\xF4 |0
<U7114> \x89\x8B |0
<U7119> \xE0\x84 |0
<U711A> \x95\xB0 |0
@@ -4128,15 +3766,15 @@
<U7126> \x8F\xC5 |0
<U7136> \x91\x52 |0
<U713C> \x8F\xC4 |0
-<U7146> \xED\xF7 |3
-<U7147> \xED\xF8 |3
+<U7146> \xED\xF7 |0
+<U7147> \xED\xF8 |0
<U7149> \x97\xF9 |0
<U714C> \xE0\x8A |0
<U714E> \x90\xF7 |0
<U7155> \xE0\x86 |0
<U7156> \xE0\x8B |0
<U7159> \x89\x8C |0
-<U715C> \xED\xF6 |3
+<U715C> \xED\xF6 |0
<U7162> \xE0\x89 |0
<U7164> \x94\x81 |0
<U7165> \xE0\x85 |0
@@ -4159,7 +3797,7 @@
<U71B1> \x94\x4D |0
<U71B9> \xE0\x94 |0
<U71BE> \xE0\x95 |0
-<U71C1> \xED\xFA |3
+<U71C1> \xED\xFA |0
<U71C3> \x94\x52 |0
<U71C8> \x93\x95 |0
<U71C9> \xE0\x97 |0
@@ -4181,7 +3819,7 @@
<U71F9> \xE0\x9F |0
<U71FB> \xE0\x8E |0
<U71FC> \xE0\x9E |0
-<U71FE> \xED\xFB |3
+<U71FE> \xED\xFB |0
<U71FF> \xE0\xA0 |0
<U7206> \x94\x9A |0
<U720D> \xE0\xA1 |0
@@ -4233,11 +3871,11 @@
<U72A7> \xE0\xB8 |0
<U72AC> \x8C\xA2 |0
<U72AF> \x94\xC6 |0
-<U72B1> \xED\xFC |3
+<U72B1> \xED\xFC |0
<U72B2> \xE0\xBA |0
<U72B6> \x8F\xF3 |0
<U72B9> \xE0\xB9 |0
-<U72BE> \xEE\x40 |3
+<U72BE> \xEE\x40 |0
<U72C2> \x8B\xB6 |0
<U72C3> \xE0\xBB |0
<U72C4> \xE0\xBD |0
@@ -4266,7 +3904,7 @@
<U731C> \xE0\xC8 |0
<U731D> \xE0\xCA |0
<U731F> \x97\xC2 |0
-<U7324> \xEE\x41 |3
+<U7324> \xEE\x41 |0
<U7325> \xE0\xCE |0
<U7329> \xE0\xCD |0
<U732A> \x92\x96 |0
@@ -4289,7 +3927,7 @@
<U7370> \xE0\xD6 |0
<U7372> \x8A\x6C |0
<U7375> \xE0\xD8 |0
-<U7377> \xEE\x43 |3
+<U7377> \xEE\x43 |0
<U7378> \xE0\xD7 |0
<U737A> \xE0\xDA |0
<U737B> \xE0\xD9 |0
@@ -4302,38 +3940,38 @@
<U73B2> \x97\xE6 |0
<U73B3> \xE0\xDC |0
<U73BB> \xE0\xDE |0
-<U73BD> \xEE\x44 |3
+<U73BD> \xEE\x44 |0
<U73C0> \xE0\xDF |0
<U73C2> \x89\xCF |0
<U73C8> \xE0\xDB |0
-<U73C9> \xEE\x45 |3
+<U73C9> \xEE\x45 |0
<U73CA> \x8E\x58 |0
<U73CD> \x92\xBF |0
<U73CE> \xE0\xDD |0
-<U73D2> \xEE\x48 |3
-<U73D6> \xEE\x46 |3
+<U73D2> \xEE\x48 |0
+<U73D6> \xEE\x46 |0
<U73DE> \xE0\xE2 |0
<U73E0> \x8E\xEC |0
-<U73E3> \xEE\x47 |3
+<U73E3> \xEE\x47 |0
<U73E5> \xE0\xE0 |0
<U73EA> \x8C\x5D |0
<U73ED> \x94\xC7 |0
<U73EE> \xE0\xE1 |0
<U73F1> \xE0\xFC |0
-<U73F5> \xEE\x4A |3
+<U73F5> \xEE\x4A |0
<U73F8> \xE0\xE7 |0
<U73FE> \x8C\xBB |0
<U7403> \x8B\x85 |0
<U7405> \xE0\xE4 |0
<U7406> \x97\x9D |0
-<U7407> \xEE\x49 |3
+<U7407> \xEE\x49 |0
<U7409> \x97\xAE |0
<U7422> \x91\xF4 |0
<U7425> \xE0\xE6 |0
-<U7426> \xEE\x4B |3
-<U7429> \xEE\x4D |3
-<U742A> \xEE\x4C |3
-<U742E> \xEE\x4E |3
+<U7426> \xEE\x4B |0
+<U7429> \xEE\x4D |0
+<U742A> \xEE\x4C |0
+<U742E> \xEE\x4E |0
<U7432> \xE0\xE8 |0
<U7433> \x97\xD4 |0
<U7434> \x8B\xD5 |0
@@ -4350,7 +3988,7 @@
<U745E> \x90\x90 |0
<U745F> \xE0\xEC |0
<U7460> \x97\xDA |0
-<U7462> \xEE\x4F |3
+<U7462> \xEE\x4F |0
<U7463> \xE0\xF2 |0
<U7464> \xEA\xA2 |0
<U7469> \xE0\xF0 |0
@@ -4361,10 +3999,10 @@
<U7476> \xE0\xF4 |0
<U747E> \xE0\xF5 |0
<U7483> \x97\x9E |0
-<U7489> \xEE\x50 |3
+<U7489> \xEE\x50 |0
<U748B> \xE0\xF6 |0
<U749E> \xE0\xF7 |0
-<U749F> \xEE\x51 |3
+<U749F> \xEE\x51 |0
<U74A2> \xE0\xE3 |0
<U74A7> \xE0\xF8 |0
<U74B0> \x8A\xC2 |0
@@ -4386,7 +4024,7 @@
<U74F6> \x95\x72 |0
<U74F7> \xE1\x49 |0
<U74F8> \xE1\x48 |0
-<U7501> \xEE\x52 |3
+<U7501> \xEE\x52 |0
<U7503> \xE1\x4B |0
<U7504> \xE1\x4A |0
<U7505> \xE1\x4C |0
@@ -4407,8 +4045,7 @@
<U7528> \x97\x70 |0
<U752B> \x95\xE1 |0
<U752C> \xE1\x54 |0
-<U752F> \xFA\xA8 |0
-<U752F> \xED\x8C |3
+<U752F> \xED\x8C |0
<U7530> \x93\x63 |0
<U7531> \x97\x52 |0
<U7532> \x8D\x62 |0
@@ -4443,7 +4080,7 @@
<U756A> \x94\xD4 |0
<U756B> \xE1\x60 |0
<U756D> \xE1\x61 |0
-<U756F> \xEE\x53 |3
+<U756F> \xEE\x53 |0
<U7570> \x88\xD9 |0
<U7573> \x8F\xF4 |0
<U7574> \xE1\x66 |0
@@ -4538,7 +4175,7 @@
<U767D> \x94\x92 |0
<U767E> \x95\x53 |0
<U7680> \xE1\xA3 |0
-<U7682> \xEE\x54 |3
+<U7682> \xEE\x54 |0
<U7683> \xE1\xA4 |0
<U7684> \x93\x49 |0
<U7686> \x8A\x46 |0
@@ -4551,10 +4188,10 @@
<U7696> \xE1\xA8 |0
<U7699> \xE1\xAA |0
<U769A> \xE1\xAB |0
-<U769B> \xEE\x57 |3
-<U769C> \xEE\x55 |3
-<U769E> \xEE\x56 |3
-<U76A6> \xEE\x58 |3
+<U769B> \xEE\x57 |0
+<U769C> \xEE\x55 |0
+<U769E> \xEE\x56 |0
+<U76A6> \xEE\x58 |0
<U76AE> \x94\xE7 |0
<U76B0> \xE1\xAC |0
<U76B4> \xE1\xAD |0
@@ -4608,7 +4245,7 @@
<U773A> \x92\xAD |0
<U773C> \x8A\xE1 |0
<U7740> \x92\x85 |0
-<U7746> \xEE\x5A |3
+<U7746> \xEE\x5A |0
<U7747> \xE1\xC7 |0
<U775A> \xE1\xC8 |0
<U775B> \xE1\xCB |0
@@ -4659,7 +4296,7 @@
<U7814> \x8C\xA4 |0
<U7815> \x8D\xD3 |0
<U7820> \xE1\xE7 |0
-<U7821> \xEE\x5C |3
+<U7821> \xEE\x5C |0
<U7825> \x93\x75 |0
<U7826> \x8D\xD4 |0
<U7827> \x8B\x6D |0
@@ -4668,15 +4305,15 @@
<U783A> \x93\x76 |0
<U783F> \x8D\x7B |0
<U7845> \xE1\xE9 |0
-<U784E> \xEE\x5D |3
+<U784E> \xEE\x5D |0
<U785D> \x8F\xC9 |0
-<U7864> \xEE\x5E |3
+<U7864> \xEE\x5E |0
<U786B> \x97\xB0 |0
<U786C> \x8D\x64 |0
<U786F> \x8C\xA5 |0
<U7872> \x94\xA1 |0
<U7874> \xE1\xEB |0
-<U787A> \xEE\x5F |3
+<U787A> \xEE\x5F |0
<U787C> \xE1\xED |0
<U7881> \x8C\xE9 |0
<U7886> \xE1\xEC |0
@@ -4723,7 +4360,7 @@
<U792A> \xE1\xE8 |0
<U792B> \xE2\x49 |0
<U792C> \xE2\x48 |0
-<U7930> \xEE\x60 |3
+<U7930> \xEE\x60 |0
<U793A> \x8E\xA6 |0
<U793C> \x97\xE7 |0
<U793E> \x8E\xD0 |0
@@ -4757,8 +4394,8 @@
<U798D> \x89\xD0 |0
<U798E> \x92\xF5 |0
<U798F> \x95\x9F |0
-<U7994> \xEE\x64 |3
-<U799B> \xEE\x66 |3
+<U7994> \xEE\x64 |0
+<U799B> \xEE\x66 |0
<U799D> \xE2\x54 |0
<U79A6> \x8B\x9A |0
<U79A7> \xE2\x55 |0
@@ -4861,7 +4498,7 @@
<U7ACB> \x97\xA7 |0
<U7ACD> \xE2\x87 |0
<U7ACF> \xE2\x88 |0
-<U7AD1> \xEE\x67 |3
+<U7AD1> \xEE\x67 |0
<U7AD2> \x9A\xF2 |0
<U7AD3> \xE2\x8A |0
<U7AD5> \xE2\x89 |0
@@ -4876,9 +4513,9 @@
<U7AE3> \x8F\x76 |0
<U7AE5> \x93\xB6 |0
<U7AE6> \xE2\x90 |0
-<U7AE7> \xEE\x68 |3
+<U7AE7> \xEE\x68 |0
<U7AEA> \x92\x47 |0
-<U7AEB> \xEE\x6A |3
+<U7AEB> \xEE\x6A |0
<U7AED> \xE2\x91 |0
<U7AEF> \x92\x5B |0
<U7AF0> \xE2\x92 |0
@@ -4945,7 +4582,7 @@
<U7B9A> \xE2\xB2 |0
<U7B9C> \xE2\xB1 |0
<U7B9D> \xE2\xAD |0
-<U7B9E> \xEE\x6B |3
+<U7B9E> \xEE\x6B |0
<U7B9F> \xE2\xAF |0
<U7BA1> \x8A\xC7 |0
<U7BAA> \x92\x5C |0
@@ -5094,7 +4731,7 @@
<U7D44> \x91\x67 |0
<U7D45> \xE3\x44 |0
<U7D46> \xE3\x4A |0
-<U7D48> \xEE\x6D |3
+<U7D48> \xEE\x6D |0
<U7D4B> \xE3\x45 |0
<U7D4C> \x8C\x6F |0
<U7D4E> \xE3\x4D |0
@@ -5102,7 +4739,7 @@
<U7D50> \x8C\x8B |0
<U7D56> \xE3\x4C |0
<U7D5B> \xE3\x55 |0
-<U7D5C> \xEE\x6E |3
+<U7D5C> \xEE\x6E |0
<U7D5E> \x8D\x69 |0
<U7D61> \x97\x8D |0
<U7D62> \x88\xBA |0
@@ -5125,7 +4762,7 @@
<U7D9B> \xE3\x58 |0
<U7D9C> \x91\x8E |0
<U7D9F> \xE3\x65 |0
-<U7DA0> \xEE\x70 |3
+<U7DA0> \xEE\x70 |0
<U7DA2> \xE3\x61 |0
<U7DA3> \xE3\x5B |0
<U7DAB> \xE3\x5F |0
@@ -5138,7 +4775,7 @@
<U7DB2> \x96\xD4 |0
<U7DB4> \x92\xD4 |0
<U7DB5> \xE3\x5C |0
-<U7DB7> \xEE\x6F |3
+<U7DB7> \xEE\x6F |0
<U7DB8> \xE3\x64 |0
<U7DBA> \xE3\x59 |0
<U7DBB> \x92\x5D |0
@@ -5152,7 +4789,7 @@
<U7DD1> \x97\xCE |0
<U7DD2> \x8F\x8F |0
<U7DD5> \xE3\x8E |0
-<U7DD6> \xEE\x71 |3
+<U7DD6> \xEE\x71 |0
<U7DD8> \xE3\x67 |0
<U7DDA> \x90\xFC |0
<U7DDC> \xE3\x63 |0
@@ -5199,7 +4836,7 @@
<U7E4A> \x91\x40 |0
<U7E4B> \x8C\x71 |0
<U7E4D> \x8F\x4A |0
-<U7E52> \xEE\x72 |3
+<U7E52> \xEE\x72 |0
<U7E54> \x90\x44 |0
<U7E55> \x91\x55 |0
<U7E56> \xE3\x84 |0
@@ -5222,8 +4859,7 @@
<U7E83> \xE3\x8D |0
<U7E88> \xE3\x92 |0
<U7E89> \xE3\x93 |0
-<U7E8A> \xFA\x5C |0
-<U7E8A> \xED\x40 |3
+<U7E8A> \xED\x40 |0
<U7E8C> \xE3\x94 |0
<U7E8E> \xE3\x9A |0
<U7E8F> \x93\x5A |0
@@ -5238,7 +4874,7 @@
<U7F38> \xE3\x9D |0
<U7F3A> \xE3\x9E |0
<U7F45> \xE3\x9F |0
-<U7F47> \xEE\x73 |3
+<U7F47> \xEE\x73 |0
<U7F4C> \xE3\xA0 |0
<U7F4D> \xE3\xA1 |0
<U7F4E> \xE3\xA2 |0
@@ -5274,7 +4910,7 @@
<U7F9A> \xE3\xB7 |0
<U7F9D> \xE3\xB6 |0
<U7F9E> \xE3\xB5 |0
-<U7FA1> \xEE\x74 |3
+<U7FA1> \xEE\x74 |0
<U7FA3> \xE3\xB8 |0
<U7FA4> \x8C\x51 |0
<U7FA8> \x91\x41 |0
@@ -5570,7 +5206,7 @@
<U82F9> \xE4\x99 |0
<U82FA> \xE4\x95 |0
<U82FB> \xE4\x98 |0
-<U8301> \xEE\x76 |3
+<U8301> \xEE\x76 |0
<U8302> \x96\xCE |0
<U8303> \xE4\x97 |0
<U8304> \x89\xD6 |0
@@ -5601,13 +5237,13 @@
<U8350> \xE4\xA6 |0
<U8352> \x8D\x72 |0
<U8358> \x91\x91 |0
-<U8362> \xEE\x77 |3
+<U8362> \xEE\x77 |0
<U8373> \xE4\xB8 |0
<U8375> \xE4\xB9 |0
<U8377> \x89\xD7 |0
<U837B> \x89\xAC |0
<U837C> \xE4\xB6 |0
-<U837F> \xEE\x78 |3
+<U837F> \xEE\x78 |0
<U8385> \xE4\xAC |0
<U8387> \xE4\xB4 |0
<U8389> \xE4\xBB |0
@@ -5628,7 +5264,7 @@
<U83BD> \xE4\xCD |0
<U83C1> \xE4\xC5 |0
<U83C5> \x90\x9B |0
-<U83C7> \xEE\x79 |3
+<U83C7> \xEE\x79 |0
<U83CA> \x8B\x65 |0
<U83CC> \x8B\xDB |0
<U83CE> \xE4\xC0 |0
@@ -5645,7 +5281,7 @@
<U83F1> \x95\x48 |0
<U83F2> \xE4\xC9 |0
<U83F4> \xE4\xBD |0
-<U83F6> \xEE\x7A |3
+<U83F6> \xEE\x7A |0
<U83F7> \xE4\xC6 |0
<U83FB> \xE4\xD0 |0
<U83FD> \xE4\xC1 |0
@@ -5668,7 +5304,7 @@
<U843C> \xE4\xD3 |0
<U843D> \x97\x8E |0
<U8446> \xE4\xDC |0
-<U8448> \xEE\x7B |3
+<U8448> \xEE\x7B |0
<U8449> \x97\x74 |0
<U844E> \x97\xA8 |0
<U8457> \x92\x98 |0
@@ -5699,7 +5335,7 @@
<U84A1> \xE4\xEE |0
<U84AD> \xE4\xD8 |0
<U84B2> \x8A\x97 |0
-<U84B4> \xEE\x7C |3
+<U84B4> \xEE\x7C |0
<U84B8> \x8F\xF6 |0
<U84B9> \xE4\xE3 |0
<U84BB> \xE4\xE8 |0
@@ -5717,8 +5353,7 @@
<U84D6> \xE4\xED |0
<U84D9> \xE4\xE6 |0
<U84DA> \xE4\xE9 |0
-<U84DC> \xFA\x60 |0
-<U84DC> \xED\x44 |3
+<U84DC> \xED\x44 |0
<U84EC> \x96\x48 |0
<U84EE> \x98\x40 |0
<U84F4> \xE4\xF1 |0
@@ -5748,17 +5383,17 @@
<U854A> \x8E\xC7 |0
<U854B> \xE5\x42 |0
<U854E> \x8B\xBC |0
-<U8553> \xEE\x7D |3
+<U8553> \xEE\x7D |0
<U8555> \xE5\x43 |0
<U8557> \x95\x99 |0
<U8558> \xE4\xFB |0
-<U8559> \xEE\x7E |3
+<U8559> \xEE\x7E |0
<U855A> \xE4\xD4 |0
<U8563> \xE4\xFA |0
<U8568> \x98\x6E |0
<U8569> \x93\xA0 |0
<U856A> \x95\x93 |0
-<U856B> \xEE\x80 |3
+<U856B> \xEE\x80 |0
<U856D> \xE5\x4A |0
<U8577> \xE5\x50 |0
<U857E> \xE5\x51 |0
@@ -5783,7 +5418,7 @@
<U85AC> \x96\xF2 |0
<U85AE> \x96\xF7 |0
<U85AF> \x8F\x92 |0
-<U85B0> \xEE\x82 |3
+<U85B0> \xEE\x82 |0
<U85B9> \xE5\x56 |0
<U85BA> \xE5\x54 |0
<U85C1> \x98\x6D |0
@@ -5930,7 +5565,7 @@
<U87FB> \x8B\x61 |0
<U87FE> \xE5\xB7 |0
<U8805> \xE5\xA2 |0
-<U8807> \xEE\x85 |3
+<U8807> \xEE\x85 |0
<U880D> \xE5\xB6 |0
<U880E> \xE5\xBA |0
<U880F> \xE5\xB5 |0
@@ -6008,7 +5643,7 @@
<U88F2> \xE5\xEA |0
<U88F3> \x8F\xD6 |0
<U88F4> \xE5\xE8 |0
-<U88F5> \xEE\x86 |3
+<U88F5> \xEE\x86 |0
<U88F8> \x97\x87 |0
<U88F9> \xE5\xE5 |0
<U88FC> \xE5\xE7 |0
@@ -6022,8 +5657,7 @@
<U8910> \x8A\x8C |0
<U8912> \x96\x4A |0
<U8913> \xE5\xEE |0
-<U891C> \xFA\x5D |0
-<U891C> \xED\x41 |3
+<U891C> \xED\x41 |0
<U891D> \xE5\xFA |0
<U891E> \xE5\xF0 |0
<U8925> \xE5\xF1 |0
@@ -6094,7 +5728,7 @@
<U8A0C> \xE6\x60 |0
<U8A0E> \x93\xA2 |0
<U8A10> \xE6\x5F |0
-<U8A12> \xEE\x87 |3
+<U8A12> \xEE\x87 |0
<U8A13> \x8C\x50 |0
<U8A16> \xE6\x5E |0
<U8A17> \x91\xF5 |0
@@ -6110,7 +5744,7 @@
<U8A33> \x96\xF3 |0
<U8A34> \x91\x69 |0
<U8A36> \xE6\x64 |0
-<U8A37> \xEE\x88 |3
+<U8A37> \xEE\x88 |0
<U8A3A> \x90\x66 |0
<U8A3B> \x92\x90 |0
<U8A3C> \x8F\xD8 |0
@@ -6137,7 +5771,7 @@
<U8A71> \x98\x62 |0
<U8A72> \x8A\x59 |0
<U8A73> \x8F\xDA |0
-<U8A79> \xEE\x89 |3
+<U8A79> \xEE\x89 |0
<U8A7C> \xE6\x6A |0
<U8A82> \xE6\x6F |0
<U8A84> \xE6\x70 |0
@@ -6158,7 +5792,7 @@
<U8AA4> \x8C\xEB |0
<U8AA5> \xE6\x74 |0
<U8AA6> \xE6\x75 |0
-<U8AA7> \xEE\x8A |3
+<U8AA7> \xEE\x8A |0
<U8AA8> \xE6\x71 |0
<U8AAC> \x90\xE0 |0
<U8AAD> \x93\xC7 |0
@@ -6166,7 +5800,7 @@
<U8AB2> \x89\xDB |0
<U8AB9> \x94\xEE |0
<U8ABC> \x8B\x62 |0
-<U8ABE> \xEE\x8B |3
+<U8ABE> \xEE\x8B |0
<U8ABF> \x92\xB2 |0
<U8AC2> \xE6\x7A |0
<U8AC4> \xE6\x78 |0
@@ -6181,7 +5815,7 @@
<U8ADB> \xE6\x87 |0
<U8ADC> \x92\xB3 |0
<U8ADE> \xE6\x86 |0
-<U8ADF> \xEE\x8C |3
+<U8ADF> \xEE\x8C |0
<U8AE0> \xE6\x83 |0
<U8AE1> \xE6\x8B |0
<U8AE2> \xE6\x84 |0
@@ -6193,7 +5827,7 @@
<U8AEE> \x8E\x90 |0
<U8AF1> \xE6\x81 |0
<U8AF3> \xE6\x7D |0
-<U8AF6> \xEE\x8E |3
+<U8AF6> \xEE\x8E |0
<U8AF7> \xE6\x85 |0
<U8AF8> \x8F\x94 |0
<U8AFA> \x8C\xBF |0
@@ -6227,7 +5861,7 @@
<U8B4C> \xE6\x97 |0
<U8B4E> \xE6\x99 |0
<U8B4F> \xE6\x98 |0
-<U8B53> \xEE\x8F |3
+<U8B53> \xEE\x8F |0
<U8B56> \xE6\x9B |0
<U8B58> \x8E\xAF |0
<U8B5A> \xE6\x9D |0
@@ -6244,7 +5878,7 @@
<U8B74> \xE6\xA2 |0
<U8B77> \x8C\xEC |0
<U8B7D> \xE6\xA3 |0
-<U8B7F> \xEE\x90 |3
+<U8B7F> \xEE\x90 |0
<U8B80> \xE6\xA4 |0
<U8B83> \x8E\x5D |0
<U8B8A> \x9D\xCC |0
@@ -6334,8 +5968,8 @@
<U8CE6> \x95\x8A |0
<U8CEA> \x8E\xBF |0
<U8CED> \x93\x71 |0
-<U8CF0> \xEE\x91 |3
-<U8CF4> \xEE\x92 |3
+<U8CF0> \xEE\x91 |0
+<U8CF4> \xEE\x92 |0
<U8CFA> \xE6\xCF |0
<U8CFB> \xE6\xD0 |0
<U8CFC> \x8D\x77 |0
@@ -6349,7 +5983,7 @@
<U8D0D> \xE6\xD6 |0
<U8D0F> \xE6\xD5 |0
<U8D10> \xE6\xD7 |0
-<U8D12> \xEE\x93 |3
+<U8D12> \xEE\x93 |0
<U8D13> \xE6\xD9 |0
<U8D14> \xE6\xDB |0
<U8D16> \xE6\xDC |0
@@ -6362,7 +5996,7 @@
<U8D71> \xE6\xDF |0
<U8D73> \xE6\xE0 |0
<U8D74> \x95\x8B |0
-<U8D76> \xEE\x94 |3
+<U8D76> \xEE\x94 |0
<U8D77> \x8B\x4E |0
<U8D81> \xE6\xE1 |0
<U8D85> \x92\xB4 |0
@@ -6448,7 +6082,7 @@
<U8ECB> \xE7\x61 |0
<U8ECC> \x8B\x4F |0
<U8ECD> \x8C\x52 |0
-<U8ECF> \xEE\x96 |3
+<U8ECF> \xEE\x96 |0
<U8ED2> \x8C\xAC |0
<U8EDB> \xE7\x62 |0
<U8EDF> \x93\xEE |0
@@ -6599,7 +6233,7 @@
<U9061> \x91\x6B |0
<U9063> \x8C\xAD |0
<U9065> \x97\x79 |0
-<U9067> \xEE\x99 |3
+<U9067> \xEE\x99 |0
<U9068> \xE7\xA9 |0
<U9069> \x93\x4B |0
<U906D> \x91\x98 |0
@@ -6636,7 +6270,7 @@
<U90CA> \x8D\x78 |0
<U90CE> \x98\x59 |0
<U90DB> \xE7\xBC |0
-<U90DE> \xEE\x9A |3
+<U90DE> \xEE\x9A |0
<U90E1> \x8C\x53 |0
<U90E2> \xE7\xB9 |0
<U90E4> \xE7\xBA |0
@@ -6647,9 +6281,9 @@
<U90FD> \x93\x73 |0
<U9102> \xE7\xBD |0
<U9112> \xE7\xBE |0
-<U9115> \xEE\x9C |3
+<U9115> \xEE\x9C |0
<U9119> \xE7\xBF |0
-<U9127> \xEE\x9D |3
+<U9127> \xEE\x9D |0
<U912D> \x93\x41 |0
<U9130> \xE7\xC1 |0
<U9132> \xE7\xC0 |0
@@ -6706,31 +6340,31 @@
<U91D0> \xE7\xD8 |0
<U91D1> \x8B\xE0 |0
<U91D6> \xE7\xD9 |0
-<U91D7> \xEE\x9F |3
+<U91D7> \xEE\x9F |0
<U91D8> \x93\x42 |0
-<U91DA> \xEE\x9E |3
+<U91DA> \xEE\x9E |0
<U91DB> \xE7\xDC |0
<U91DC> \x8A\x98 |0
<U91DD> \x90\x6A |0
-<U91DE> \xEE\xA0 |3
+<U91DE> \xEE\xA0 |0
<U91DF> \xE7\xDA |0
<U91E1> \xE7\xDB |0
<U91E3> \x92\xDE |0
-<U91E4> \xEE\xA3 |3
-<U91E5> \xEE\xA4 |3
+<U91E4> \xEE\xA3 |0
+<U91E5> \xEE\xA4 |0
<U91E6> \x96\x74 |0
<U91E7> \x8B\xFA |0
-<U91ED> \xEE\xA1 |3
-<U91EE> \xEE\xA2 |3
+<U91ED> \xEE\xA1 |0
+<U91EE> \xEE\xA2 |0
<U91F5> \xE7\xDE |0
<U91F6> \xE7\xDF |0
<U91FC> \xE7\xDD |0
<U91FF> \xE7\xE1 |0
-<U9206> \xEE\xA5 |3
-<U920A> \xEE\xA7 |3
+<U9206> \xEE\xA5 |0
+<U920A> \xEE\xA7 |0
<U920D> \x93\xDD |0
<U920E> \x8A\x62 |0
-<U9210> \xEE\xA6 |3
+<U9210> \xEE\xA6 |0
<U9211> \xE7\xE5 |0
<U9214> \xE7\xE2 |0
<U9215> \xE7\xE4 |0
@@ -6739,37 +6373,36 @@
<U922C> \xE7\xE3 |0
<U9234> \x97\xE9 |0
<U9237> \x8C\xD8 |0
-<U9239> \xEE\xAE |3
-<U923A> \xEE\xA8 |3
-<U923C> \xEE\xAA |3
+<U9239> \xEE\xAE |0
+<U923A> \xEE\xA8 |0
+<U923C> \xEE\xAA |0
<U923F> \xE7\xED |0
-<U9240> \xEE\xA9 |3
+<U9240> \xEE\xA9 |0
<U9244> \x93\x53 |0
<U9245> \xE7\xE8 |0
<U9248> \xE7\xEB |0
<U9249> \xE7\xE9 |0
<U924B> \xE7\xEE |0
-<U924E> \xEE\xAB |3
+<U924E> \xEE\xAB |0
<U9250> \xE7\xEF |0
-<U9251> \xEE\xAD |3
+<U9251> \xEE\xAD |0
<U9257> \xE7\xE7 |0
-<U9259> \xEE\xAC |3
+<U9259> \xEE\xAC |0
<U925A> \xE7\xF4 |0
<U925B> \x89\x94 |0
<U925E> \xE7\xE6 |0
<U9262> \x94\xAB |0
<U9264> \xE7\xEA |0
<U9266> \x8F\xDE |0
-<U9267> \xEE\xAF |3
+<U9267> \xEE\xAF |0
<U9271> \x8D\x7A |0
-<U9277> \xEE\xB1 |3
-<U9278> \xEE\xB2 |3
+<U9277> \xEE\xB1 |0
+<U9278> \xEE\xB2 |0
<U927E> \x96\x67 |0
<U9280> \x8B\xE2 |0
<U9283> \x8F\x65 |0
<U9285> \x93\xBA |0
-<U9288> \xFA\x5F |0
-<U9288> \xED\x43 |3
+<U9288> \xED\x43 |0
<U9291> \x91\x4C |0
<U9293> \xE7\xF2 |0
<U9295> \xE7\xEC |0
@@ -6778,46 +6411,45 @@
<U929A> \x92\xB6 |0
<U929B> \xE7\xF3 |0
<U929C> \xE7\xF0 |0
-<U92A7> \xEE\xB0 |3
+<U92A7> \xEE\xB0 |0
<U92AD> \x91\x4B |0
<U92B7> \xE7\xF7 |0
<U92B9> \xE7\xF6 |0
<U92CF> \xE7\xF5 |0
-<U92D0> \xEE\xB6 |3
+<U92D0> \xEE\xB6 |0
<U92D2> \x96\x4E |0
-<U92D3> \xEE\xBA |3
-<U92D5> \xEE\xB8 |3
-<U92D7> \xEE\xB4 |3
-<U92D9> \xEE\xB5 |3
-<U92E0> \xEE\xB9 |3
+<U92D3> \xEE\xBA |0
+<U92D5> \xEE\xB8 |0
+<U92D7> \xEE\xB4 |0
+<U92D9> \xEE\xB5 |0
+<U92E0> \xEE\xB9 |0
<U92E4> \x8F\x9B |0
-<U92E7> \xEE\xB3 |3
+<U92E7> \xEE\xB3 |0
<U92E9> \xE7\xF8 |0
<U92EA> \x95\xDD |0
<U92ED> \x89\x73 |0
<U92F2> \x95\x65 |0
<U92F3> \x92\x92 |0
<U92F8> \x8B\x98 |0
-<U92F9> \xFA\x65 |0
-<U92F9> \xED\x49 |3
+<U92F9> \xED\x49 |0
<U92FA> \xE7\xFA |0
-<U92FB> \xEE\xBD |3
+<U92FB> \xEE\xBD |0
<U92FC> \x8D\x7C |0
-<U92FF> \xEE\xC0 |3
-<U9302> \xEE\xC2 |3
+<U92FF> \xEE\xC0 |0
+<U9302> \xEE\xC2 |0
<U9306> \x8E\x4B |0
<U930F> \xE7\xF9 |0
<U9310> \x90\x8D |0
<U9318> \x90\x8E |0
<U9319> \xE8\x40 |0
<U931A> \xE8\x42 |0
-<U931D> \xEE\xC1 |3
-<U931E> \xEE\xBF |3
+<U931D> \xEE\xC1 |0
+<U931E> \xEE\xBF |0
<U9320> \x8F\xF9 |0
-<U9321> \xEE\xBC |3
+<U9321> \xEE\xBC |0
<U9322> \xE8\x41 |0
<U9323> \xE8\x43 |0
-<U9325> \xEE\xBB |3
+<U9325> \xEE\xBB |0
<U9326> \x8B\xD1 |0
<U9328> \x95\x64 |0
<U932B> \x8E\xE0 |0
@@ -6829,19 +6461,18 @@
<U933A> \xE8\x44 |0
<U933B> \xE8\x46 |0
<U9344> \xE7\xFB |0
-<U9348> \xFA\x5E |0
-<U9348> \xED\x42 |3
+<U9348> \xED\x42 |0
<U934B> \x93\xE7 |0
<U934D> \x93\x74 |0
<U9354> \x92\xD5 |0
<U9356> \xE8\x4B |0
-<U9357> \xEE\xC4 |3
+<U9357> \xEE\xC4 |0
<U935B> \x92\x62 |0
<U935C> \xE8\x47 |0
<U9360> \xE8\x48 |0
<U936C> \x8C\x4C |0
<U936E> \xE8\x4A |0
-<U9370> \xEE\xC3 |3
+<U9370> \xEE\xC3 |0
<U9375> \x8C\xAE |0
<U937C> \xE8\x49 |0
<U937E> \x8F\xDF |0
@@ -6850,7 +6481,7 @@
<U9396> \x8D\xBD |0
<U9397> \x91\x99 |0
<U939A> \x92\xC8 |0
-<U93A4> \xEE\xC5 |3
+<U93A4> \xEE\xC5 |0
<U93A7> \x8A\x5A |0
<U93AC> \xE8\x4D |0
<U93AD> \xE8\x4E |0
@@ -6858,7 +6489,7 @@
<U93B0> \xE8\x4C |0
<U93B9> \xE8\x50 |0
<U93C3> \xE8\x56 |0
-<U93C6> \xEE\xC6 |3
+<U93C6> \xEE\xC6 |0
<U93C8> \xE8\x59 |0
<U93D0> \xE8\x58 |0
<U93D1> \x93\x4C |0
@@ -6866,12 +6497,12 @@
<U93D7> \xE8\x52 |0
<U93D8> \xE8\x55 |0
<U93DD> \xE8\x57 |0
-<U93DE> \xEE\xC7 |3
+<U93DE> \xEE\xC7 |0
<U93E1> \x8B\xBE |0
<U93E4> \xE8\x5A |0
<U93E5> \xE8\x54 |0
<U93E8> \xE8\x53 |0
-<U93F8> \xEE\xC8 |3
+<U93F8> \xEE\xC8 |0
<U9403> \xE8\x5E |0
<U9407> \xE8\x5F |0
<U9410> \xE8\x60 |0
@@ -6882,15 +6513,15 @@
<U941A> \xE8\x5B |0
<U9421> \xE8\x64 |0
<U942B> \xE8\x62 |0
-<U9431> \xEE\xC9 |3
+<U9431> \xEE\xC9 |0
<U9435> \xE8\x63 |0
<U9436> \xE8\x61 |0
<U9438> \x91\xF6 |0
<U943A> \xE8\x65 |0
<U9441> \xE8\x66 |0
<U9444> \xE8\x68 |0
-<U9445> \xEE\xCA |3
-<U9448> \xEE\xCB |3
+<U9445> \xEE\xCA |0
+<U9448> \xEE\xCB |0
<U9451> \x8A\xD3 |0
<U9452> \xE8\x67 |0
<U9453> \x96\xF8 |0
@@ -6918,7 +6549,7 @@
<U958B> \x8A\x4A |0
<U958F> \x89\x5B |0
<U9591> \x8A\xD5 |0
-<U9592> \xEE\xCC |3
+<U9592> \xEE\xCC |0
<U9593> \x8A\xD4 |0
<U9594> \xE8\x7B |0
<U9596> \xE8\x7C |0
@@ -7003,13 +6634,13 @@
<U9699> \x8C\x84 |0
<U969B> \x8D\xDB |0
<U969C> \x8F\xE1 |0
-<U969D> \xEE\xCF |3
+<U969D> \xEE\xCF |0
<U96A0> \x89\x42 |0
<U96A3> \x97\xD7 |0
<U96A7> \xE8\xA9 |0
<U96A8> \xE7\xAC |0
<U96AA> \xE8\xA8 |0
-<U96AF> \xEE\xD0 |3
+<U96AF> \xEE\xD0 |0
<U96B0> \xE8\xAC |0
<U96B1> \xE8\xAA |0
<U96B2> \xE8\xAB |0
@@ -7068,23 +6699,23 @@
<U972A> \xE8\xC4 |0
<U9730> \xE8\xC5 |0
<U9732> \x98\x49 |0
-<U9733> \xEE\xD1 |3
+<U9733> \xEE\xD1 |0
<U9738> \x9E\x50 |0
<U9739> \xE8\xC6 |0
-<U973B> \xEE\xD2 |3
+<U973B> \xEE\xD2 |0
<U973D> \xE8\xC7 |0
<U973E> \xE8\xC8 |0
<U9742> \xE8\xCC |0
-<U9743> \xEE\xD3 |3
+<U9743> \xEE\xD3 |0
<U9744> \xE8\xC9 |0
<U9746> \xE8\xCA |0
<U9748> \xE8\xCB |0
<U9749> \xE8\xCD |0
-<U974D> \xEE\xD4 |3
-<U974F> \xEE\xD5 |3
-<U9751> \xEE\xD6 |3
+<U974D> \xEE\xD4 |0
+<U974F> \xEE\xD5 |0
+<U9751> \xEE\xD6 |0
<U9752> \x90\xC2 |0
-<U9755> \xEE\xD7 |3
+<U9755> \xEE\xD7 |0
<U9756> \x96\xF5 |0
<U9759> \x90\xC3 |0
<U975C> \xE8\xCE |0
@@ -7168,11 +6799,11 @@
<U984F> \xE8\xF8 |0
<U9854> \x8A\xE7 |0
<U9855> \x8C\xB0 |0
-<U9857> \xEE\xD8 |3
+<U9857> \xEE\xD8 |0
<U9858> \x8A\xE8 |0
<U985B> \x93\x5E |0
<U985E> \x97\xDE |0
-<U9865> \xEE\xD9 |3
+<U9865> \xEE\xD9 |0
<U9867> \x8C\xDA |0
<U986B> \xE8\xFA |0
<U986F> \xE8\xFB |0
@@ -7217,7 +6848,7 @@
<U9920> \xE9\x55 |0
<U9921> \xE9\x51 |0
<U9924> \xE9\x54 |0
-<U9927> \xEE\xDC |3
+<U9927> \xEE\xDC |0
<U9928> \x8A\xD9 |0
<U992C> \xE9\x56 |0
<U992E> \xE9\x57 |0
@@ -7237,7 +6868,7 @@
<U9997> \xE9\x63 |0
<U9998> \xE9\x64 |0
<U9999> \x8D\x81 |0
-<U999E> \xEE\xDE |3
+<U999E> \xEE\xDE |0
<U99A5> \xE9\x65 |0
<U99A8> \x8A\x5D |0
<U99AC> \x94\x6E |0
@@ -7284,7 +6915,7 @@
<U9A43> \xE9\x7E |0
<U9A45> \xE9\x7B |0
<U9A4D> \xE9\x82 |0
-<U9A4E> \xEE\xDF |3
+<U9A4E> \xEE\xDF |0
<U9A55> \xE9\x81 |0
<U9A57> \xE9\x84 |0
<U9A5A> \x8B\xC1 |0
@@ -7308,9 +6939,8 @@
<U9AD3> \xE9\x92 |0
<U9AD4> \xE9\x93 |0
<U9AD8> \x8D\x82 |0
-<U9AD9> \xEE\xE0 |3
-<U9ADC> \xFC\x40 |0
-<U9ADC> \xEE\xE1 |3
+<U9AD9> \xEE\xE0 |0
+<U9ADC> \xEE\xE1 |0
<U9ADE> \xE9\x94 |0
<U9ADF> \xE9\x95 |0
<U9AE2> \xE9\x96 |0
@@ -7355,15 +6985,12 @@
<U9B58> \xE9\xB4 |0
<U9B5A> \x8B\x9B |0
<U9B6F> \x98\x44 |0
-<U9B72> \xFC\x42 |0
-<U9B72> \xEE\xE3 |3
+<U9B72> \xEE\xE3 |0
<U9B74> \xE9\xB5 |0
-<U9B75> \xFC\x41 |0
-<U9B75> \xEE\xE2 |3
+<U9B75> \xEE\xE2 |0
<U9B83> \xE9\xB7 |0
<U9B8E> \x88\xBC |0
-<U9B8F> \xFC\x43 |0
-<U9B8F> \xEE\xE4 |3
+<U9B8F> \xEE\xE4 |0
<U9B91> \xE9\xB8 |0
<U9B92> \x95\xA9 |0
<U9B93> \xE9\xB6 |0
@@ -7376,12 +7003,10 @@
<U9BAB> \x8E\x4C |0
<U9BAD> \x8D\xF8 |0
<U9BAE> \x91\x4E |0
-<U9BB1> \xFC\x44 |0
-<U9BB1> \xEE\xE5 |3
+<U9BB1> \xEE\xE5 |0
<U9BB4> \xE9\xBE |0
<U9BB9> \xE9\xC1 |0
-<U9BBB> \xFC\x45 |0
-<U9BBB> \xEE\xE6 |3
+<U9BBB> \xEE\xE6 |0
<U9BC0> \xE9\xBF |0
<U9BC6> \xE9\xC2 |0
<U9BC9> \x8C\xEF |0
@@ -7401,8 +7026,7 @@
<U9BF1> \xE9\xCD |0
<U9BF2> \xE9\xCC |0
<U9BF5> \x88\xB1 |0
-<U9C00> \xFC\x46 |0
-<U9C00> \xEE\xE7 |3
+<U9C00> \xEE\xE7 |0
<U9C04> \xE9\xD8 |0
<U9C06> \xE9\xD4 |0
<U9C08> \xE9\xD5 |0
@@ -7479,12 +7103,10 @@
<U9D60> \x8D\x94 |0
<U9D61> \x96\xB7 |0
<U9D64> \xEA\x42 |0
-<U9D6B> \xFC\x48 |0
-<U9D6B> \xEE\xE9 |3
+<U9D6B> \xEE\xE9 |0
<U9D6C> \x96\x51 |0
<U9D6F> \xEA\x4A |0
-<U9D70> \xFC\x47 |0
-<U9D70> \xEE\xE8 |3
+<U9D70> \xEE\xE8 |0
<U9D72> \xEA\x46 |0
<U9D7A> \xEA\x4B |0
<U9D87> \xEA\x48 |0
@@ -7515,8 +7137,7 @@
<U9DF9> \x91\xE9 |0
<U9DFA> \x8D\xEB |0
<U9DFD> \xEA\x5E |0
-<U9E19> \xFC\x4A |0
-<U9E19> \xEE\xEB |3
+<U9E19> \xEE\xEB |0
<U9E1A> \xEA\x5F |0
<U9E1B> \xEA\x60 |0
<U9E1E> \xEA\x61 |0
@@ -7554,8 +7175,7 @@
<U9ECE> \xEA\x74 |0
<U9ECF> \xEA\x75 |0
<U9ED0> \xEA\x76 |0
-<U9ED1> \xFC\x4B |0
-<U9ED1> \xEE\xEC |3
+<U9ED1> \xEE\xEC |0
<U9ED2> \x8D\x95 |0
<U9ED4> \xEA\x77 |0
<U9ED8> \xE0\xD2 |0
@@ -7608,62 +7228,49 @@
<U9F9C> \xEA\x9D |0
<U9F9D> \xE2\x73 |0
<U9FA0> \xEA\x9E |0
-<UF8F0> \xA0 |0
-<UF8F1> \xFD |0
-<UF8F2> \xFE |0
-<UF8F3> \xFF |0
-<UF929> \xFA\xE0 |0
-<UF929> \xED\xC4 |3
-<UF9DC> \xEE\xCD |3
-<UFA0E> \xFA\x90 |0
-<UFA0E> \xED\x73 |3
-<UFA0F> \xFA\x9B |0
-<UFA0F> \xED\x7E |3
-<UFA10> \xFA\x9C |0
-<UFA10> \xED\x80 |3
-<UFA11> \xFA\xB1 |0
-<UFA11> \xED\x95 |3
-<UFA12> \xFA\xD8 |0
-<UFA12> \xED\xBC |3
-<UFA13> \xFA\xE8 |0
-<UFA13> \xED\xCC |3
-<UFA14> \xFA\xEA |0
-<UFA14> \xED\xCE |3
-<UFA15> \xED\xF9 |3
-<UFA16> \xEE\x42 |3
-<UFA17> \xEE\x59 |3
-<UFA18> \xEE\x61 |3
-<UFA19> \xEE\x62 |3
-<UFA1A> \xEE\x63 |3
-<UFA1B> \xEE\x65 |3
-<UFA1C> \xEE\x69 |3
-<UFA1D> \xEE\x6C |3
-<UFA1E> \xEE\x75 |3
-<UFA1F> \xEE\x81 |3
-<UFA20> \xEE\x83 |3
-<UFA21> \xEE\x84 |3
-<UFA22> \xEE\x8D |3
-<UFA23> \xEE\x95 |3
-<UFA24> \xEE\x97 |3
-<UFA25> \xEE\x98 |3
-<UFA26> \xEE\x9B |3
-<UFA27> \xEE\xB7 |3
-<UFA28> \xEE\xBE |3
-<UFA29> \xEE\xCE |3
-<UFA2A> \xEE\xDA |3
-<UFA2B> \xEE\xDB |3
-<UFA2C> \xEE\xDD |3
-<UFA2D> \xFC\x49 |0
-<UFA2D> \xEE\xEA |3
+<UF8F1> \x85\xFB |3
+<UF8F2> \x85\xFC |3
+<UF929> \xED\xC4 |0
+<UF9DC> \xEE\xCD |0
+<UFA0E> \xED\x73 |0
+<UFA0F> \xED\x7E |0
+<UFA10> \xED\x80 |0
+<UFA11> \xED\x95 |0
+<UFA12> \xED\xBC |0
+<UFA13> \xED\xCC |0
+<UFA14> \xED\xCE |0
+<UFA15> \xED\xF9 |0
+<UFA16> \xEE\x42 |0
+<UFA17> \xEE\x59 |0
+<UFA18> \xEE\x61 |0
+<UFA19> \xEE\x62 |0
+<UFA1A> \xEE\x63 |0
+<UFA1B> \xEE\x65 |0
+<UFA1C> \xEE\x69 |0
+<UFA1D> \xEE\x6C |0
+<UFA1E> \xEE\x75 |0
+<UFA1F> \xEE\x81 |0
+<UFA20> \xEE\x83 |0
+<UFA21> \xEE\x84 |0
+<UFA22> \xEE\x8D |0
+<UFA23> \xEE\x95 |0
+<UFA24> \xEE\x97 |0
+<UFA25> \xEE\x98 |0
+<UFA26> \xEE\x9B |0
+<UFA27> \xEE\xB7 |0
+<UFA28> \xEE\xBE |0
+<UFA29> \xEE\xCE |0
+<UFA2A> \xEE\xDA |0
+<UFA2B> \xEE\xDB |0
+<UFA2C> \xEE\xDD |0
+<UFA2D> \xEE\xEA |0
<UFF01> \x81\x49 |0
-<UFF02> \xFA\x57 |0
-<UFF02> \xEE\xFC |3
+<UFF02> \xEE\xFC |0
<UFF03> \x81\x94 |0
<UFF04> \x81\x90 |0
<UFF05> \x81\x93 |0
<UFF06> \x81\x95 |0
-<UFF07> \xFA\x56 |0
-<UFF07> \xEE\xFB |3
+<UFF07> \xEE\xFB |0
<UFF08> \x81\x69 |0
<UFF09> \x81\x6A |0
<UFF0A> \x81\x96 |0
@@ -7751,673 +7358,142 @@
<UFF5C> \x81\x62 |0
<UFF5D> \x81\x70 |0
<UFF5E> \x81\x60 |0
-<UFF61> \xA1 |0
-<UFF62> \xA2 |0
-<UFF63> \xA3 |0
-<UFF64> \xA4 |0
-<UFF65> \xA5 |0
-<UFF66> \xA6 |0
-<UFF67> \xA7 |0
-<UFF68> \xA8 |0
-<UFF69> \xA9 |0
-<UFF6A> \xAA |0
-<UFF6B> \xAB |0
-<UFF6C> \xAC |0
-<UFF6D> \xAD |0
-<UFF6E> \xAE |0
-<UFF6F> \xAF |0
-<UFF70> \xB0 |0
-<UFF71> \xB1 |0
-<UFF72> \xB2 |0
-<UFF73> \xB3 |0
-<UFF74> \xB4 |0
-<UFF75> \xB5 |0
-<UFF76> \xB6 |0
-<UFF77> \xB7 |0
-<UFF78> \xB8 |0
-<UFF79> \xB9 |0
-<UFF7A> \xBA |0
-<UFF7B> \xBB |0
-<UFF7C> \xBC |0
-<UFF7D> \xBD |0
-<UFF7E> \xBE |0
-<UFF7F> \xBF |0
-<UFF80> \xC0 |0
-<UFF81> \xC1 |0
-<UFF82> \xC2 |0
-<UFF83> \xC3 |0
-<UFF84> \xC4 |0
-<UFF85> \xC5 |0
-<UFF86> \xC6 |0
-<UFF87> \xC7 |0
-<UFF88> \xC8 |0
-<UFF89> \xC9 |0
-<UFF8A> \xCA |0
-<UFF8B> \xCB |0
-<UFF8C> \xCC |0
-<UFF8D> \xCD |0
-<UFF8E> \xCE |0
-<UFF8F> \xCF |0
-<UFF90> \xD0 |0
-<UFF91> \xD1 |0
-<UFF92> \xD2 |0
-<UFF93> \xD3 |0
-<UFF94> \xD4 |0
-<UFF95> \xD5 |0
-<UFF96> \xD6 |0
-<UFF97> \xD7 |0
-<UFF98> \xD8 |0
-<UFF99> \xD9 |0
-<UFF9A> \xDA |0
-<UFF9B> \xDB |0
-<UFF9C> \xDC |0
-<UFF9D> \xDD |0
-<UFF9E> \xDE |0
-<UFF9F> \xDF |0
+<UFF61> \x81\x42 |1
+<UFF61> \x85\x9F |3
+<UFF62> \x81\x75 |1
+<UFF62> \x85\xA0 |3
+<UFF63> \x81\x76 |1
+<UFF63> \x85\xA1 |3
+<UFF64> \x81\x41 |1
+<UFF64> \x85\xA2 |3
+<UFF65> \x81\x45 |1
+<UFF65> \x85\xA3 |3
+<UFF66> \x83\x92 |1
+<UFF66> \x85\xA4 |3
+<UFF67> \x83\x40 |1
+<UFF67> \x85\xA5 |3
+<UFF68> \x83\x42 |1
+<UFF68> \x85\xA6 |3
+<UFF69> \x83\x44 |1
+<UFF69> \x85\xA7 |3
+<UFF6A> \x83\x46 |1
+<UFF6A> \x85\xA8 |3
+<UFF6B> \x83\x48 |1
+<UFF6B> \x85\xA9 |3
+<UFF6C> \x83\x83 |1
+<UFF6C> \x85\xAA |3
+<UFF6D> \x83\x85 |1
+<UFF6D> \x85\xAB |3
+<UFF6E> \x83\x87 |1
+<UFF6E> \x85\xAC |3
+<UFF6F> \x83\x62 |1
+<UFF6F> \x85\xAD |3
+<UFF70> \x81\x5B |1
+<UFF70> \x85\xAE |3
+<UFF71> \x83\x41 |1
+<UFF71> \x85\xAF |3
+<UFF72> \x83\x43 |1
+<UFF72> \x85\xB0 |3
+<UFF73> \x83\x45 |1
+<UFF73> \x85\xB1 |3
+<UFF74> \x83\x47 |1
+<UFF74> \x85\xB2 |3
+<UFF75> \x83\x49 |1
+<UFF75> \x85\xB3 |3
+<UFF76> \x83\x4A |1
+<UFF76> \x85\xB4 |3
+<UFF77> \x83\x4C |1
+<UFF77> \x85\xB5 |3
+<UFF78> \x83\x4E |1
+<UFF78> \x85\xB6 |3
+<UFF79> \x83\x50 |1
+<UFF79> \x85\xB7 |3
+<UFF7A> \x83\x52 |1
+<UFF7A> \x85\xB8 |3
+<UFF7B> \x83\x54 |1
+<UFF7B> \x85\xB9 |3
+<UFF7C> \x83\x56 |1
+<UFF7C> \x85\xBA |3
+<UFF7D> \x83\x58 |1
+<UFF7D> \x85\xBB |3
+<UFF7E> \x83\x5A |1
+<UFF7E> \x85\xBC |3
+<UFF7F> \x83\x5C |1
+<UFF7F> \x85\xBD |3
+<UFF80> \x83\x5E |1
+<UFF80> \x85\xBE |3
+<UFF81> \x83\x60 |1
+<UFF81> \x85\xBF |3
+<UFF82> \x83\x63 |1
+<UFF82> \x85\xC0 |3
+<UFF83> \x83\x65 |1
+<UFF83> \x85\xC1 |3
+<UFF84> \x83\x67 |1
+<UFF84> \x85\xC2 |3
+<UFF85> \x83\x69 |1
+<UFF85> \x85\xC3 |3
+<UFF86> \x83\x6A |1
+<UFF86> \x85\xC4 |3
+<UFF87> \x83\x6B |1
+<UFF87> \x85\xC5 |3
+<UFF88> \x83\x6C |1
+<UFF88> \x85\xC6 |3
+<UFF89> \x83\x6D |1
+<UFF89> \x85\xC7 |3
+<UFF8A> \x83\x6E |1
+<UFF8A> \x85\xC8 |3
+<UFF8B> \x83\x71 |1
+<UFF8B> \x85\xC9 |3
+<UFF8C> \x83\x74 |1
+<UFF8C> \x85\xCA |3
+<UFF8D> \x83\x77 |1
+<UFF8D> \x85\xCB |3
+<UFF8E> \x83\x7A |1
+<UFF8E> \x85\xCC |3
+<UFF8F> \x83\x7D |1
+<UFF8F> \x85\xCD |3
+<UFF90> \x83\x7E |1
+<UFF90> \x85\xCE |3
+<UFF91> \x83\x80 |1
+<UFF91> \x85\xCF |3
+<UFF92> \x83\x81 |1
+<UFF92> \x85\xD0 |3
+<UFF93> \x83\x82 |1
+<UFF93> \x85\xD1 |3
+<UFF94> \x83\x84 |1
+<UFF94> \x85\xD2 |3
+<UFF95> \x83\x86 |1
+<UFF95> \x85\xD3 |3
+<UFF96> \x83\x88 |1
+<UFF96> \x85\xD4 |3
+<UFF97> \x83\x89 |1
+<UFF97> \x85\xD5 |3
+<UFF98> \x83\x8A |1
+<UFF98> \x85\xD6 |3
+<UFF99> \x83\x8B |1
+<UFF99> \x85\xD7 |3
+<UFF9A> \x83\x8C |1
+<UFF9A> \x85\xD8 |3
+<UFF9B> \x83\x8D |1
+<UFF9B> \x85\xD9 |3
+<UFF9C> \x83\x8F |1
+<UFF9C> \x85\xDA |3
+<UFF9D> \x83\x93 |1
+<UFF9D> \x85\xDB |3
+<UFF9E> \x81\x4A |1
+<UFF9E> \x85\xDC |3
+<UFF9F> \x81\x4B |1
+<UFF9F> \x85\xDD |3
<UFFE0> \x81\x91 |0
<UFFE1> \x81\x92 |0
<UFFE2> \x81\xCA |0
<UFFE2> \xEE\xF9 |3
-<UFFE2> \xFA\x54 |3
<UFFE3> \x81\x50 |0
-<UFFE4> \xFA\x55 |0
-<UFFE4> \xEE\xFA |3
+<UFFE4> \xEE\xFA |0
<UFFE5> \x81\x8F |0
+# Fallbacks for code points used by non-Windows platforms.
<U2014> \x81\x5C |1
<U2016> \x81\x61 |1
<U2212> \x81\x7C |1
<U301C> \x81\x60 |1
-<UFE000> \xF9\x8B |0
-<UFE001> \xF9\x8A |0
-<UFE002> \xF9\x8C |0
-<UFE003> \xF9\x89 |0
-<UFE004> \xF7\x7D |0
-<UFE005> \xFB\x84 |0
-<UFE007> \xFB\x7C |0
-<UFE008> \xFB\x8C |0
-<UFE009> \xF9\x8E |0
-<UFE00A> \xFB\x8A |0
-<UFE00B> \xF7\x87 |0
-<UFE00C> \xFB\x8B |0
-<UFE00D> \xFB\x8D |0
-<UFE00F> \xF9\x8B\xF9\x8A |1
-<UFE010> \xFB\x8C |1
-<UFE012> \xF9\x8D |1
-<UFE013> \xF9\x8D |1
-<UFE014> \xF9\x8D |0
-<UFE016> \xF9\x8D |1
-<UFE017> \xFB\x87 |0
-<UFE01E> \xF9\x64 |0
-<UFE01F> \xF9\x65 |0
-<UFE020> \xF9\x66 |0
-<UFE021> \xF9\x67 |0
-<UFE022> \xF9\x68 |0
-<UFE023> \xF9\x69 |0
-<UFE024> \xF9\x6A |0
-<UFE025> \xF9\x6B |0
-<UFE026> \xF9\x6C |0
-<UFE027> \xF9\x6D |0
-<UFE028> \xF9\x6E |0
-<UFE029> \xF9\x6F |0
-<UFE02A> \xF9\x6D |1
-<UFE02B> \xF7\xDF |0
-<UFE02C> \xF7\xE0 |0
-<UFE02D> \xF7\xE1 |0
-<UFE02E> \xF7\xE2 |0
-<UFE02F> \xF7\xE3 |0
-<UFE030> \xF7\xE4 |0
-<UFE031> \xF7\xE5 |0
-<UFE032> \xF7\xE6 |0
-<UFE033> \xF7\xE7 |0
-<UFE034> \xF7\xE8 |0
-<UFE035> \xF7\xE9 |0
-<UFE036> \xF7\xEA |0
-<UFE037> \xF7\xEB |0
-<UFE038> \xFB\x7E |0
-<UFE03B> \xFB\x8C |1
-<UFE03C> \xF7\x50 |0
-<UFE03D> \xF9\xA4 |0
-<UFE03E> \xF7\x50 |1
-<UFE03F> \xF7\x58 |0
-<UFE040> \xF9\x70 |0
-<UFE041> \xF9\x72 |0
-<UFE042> \xF7\x59 |0
-<UFE043> \xFB\x88 |0
-<UFE044> \xF7\xA9 |0
-<UFE045> \xF9\xA3 |0
-<UFE046> \xF9\xA5 |0
-<UFE047> \xF9\xA7 |0
-<UFE048> \xF9\xA8 |0
-<UFE049> \xFB\x85 |0
-<UFE04D> \xF9\xA5 |1
-<UFE04E> \xF7\x50 |1
-<UFE051> \xF9\xE5 |0
-<UFE052> \xF9\xE6 |0
-<UFE053> \xF9\xE7 |0
-<UFE054> \xF9\xE8 |0
-<UFE055> \xF9\xE9 |0
-<UFE056> \xF9\xEA |0
-<UFE05B> \xF9\xE5 |1
-<UFE190> \xFB\x59 |0
-<UFE191> \xFB\x5B |0
-<UFE192> \xFB\x5A |0
-<UFE193> \xFB\x5C |0
-<UFE194> \xFB\x49 |1
-<UFE195> \xF9\xBC |0
-<UFE196> \xF9\xBD |0
-<UFE197> \xF9\xBE |0
-<UFE198> \xF9\xBF |0
-<UFE199> \xF9\xC0 |0
-<UFE19B> \xF9\x41 |0
-<UFE19C> \xF9\x42 |0
-<UFE19D> \xF9\x44 |0
-<UFE19E> \xF9\x45 |0
-<UFE1A0> \xFB\x68 |0
-<UFE1A1> \xF7\x93 |0
-<UFE1A2> \xFB\x69 |0
-<UFE1A4> \xFB\xB5 |0
-<UFE1A5> \xFB\xB6 |0
-<UFE1A6> \xFB\xB7 |0
-<UFE1A7> \xFB\xB8 |0
-<UFE1A8> \xFB\xB9 |0
-<UFE1A9> \xFB\xBA |0
-<UFE1AA> \xFB\xBB |0
-<UFE1AB> \xFB\xBC |0
-<UFE1AE> \xF7\x5B |0
-<UFE1AF> \xF9\x8F |0
-<UFE1B0> \xF7\x4C |0
-<UFE1B1> \xF7\x6B |0
-<UFE1B2> \xF7\x5A |0
-<UFE1B3> \xF7\x5C |0
-<UFE1B4> \xF7\xF3 |0
-<UFE1B5> \xFB\xBE |0
-<UFE1B6> \xFB\xBF |0
-<UFE1B7> \xF9\x93 |0
-<UFE1B8> \xF9\x90 |0
-<UFE1BA> \xFB\xC3 |0
-<UFE1BB> \xFB\xC3 |1
-<UFE1BC> \xF9\x96 |0
-<UFE1BD> \xF9\x59 |0
-<UFE1BE> \xF9\x5A |0
-<UFE1BF> \xF7\x4B |0
-<UFE1C0> \xF9\x91 |0
-<UFE1C1> \xF9\x92 |0
-<UFE1C2> \xF9\x94 |0
-<UFE1C3> \xF9\x95 |0
-<UFE1C4> \xF7\x49 |0
-<UFE1C5> \xF7\x4A |0
-<UFE1C6> \xFB\x82 |0
-<UFE1C7> \xFB\xC0 |0
-<UFE1C8> \xFB\xC1 |0
-<UFE1C9> \xFB\xC2 |0
-<UFE1CA> \xFB\xC4 |0
-<UFE1CB> \xFB\xC5 |0
-<UFE1CC> \xFB\xC6 |0
-<UFE1CD> \xFB\xC7 |0
-<UFE1CE> \xFB\xC8 |0
-<UFE1CF> \xFB\xC9 |0
-<UFE1D0> \xFB\xCA |0
-<UFE1D1> \xFB\xCB |0
-<UFE1D2> \xFB\xCC |0
-<UFE1D3> \xFB\xCD |0
-<UFE1D4> \xFB\xCE |0
-<UFE1D5> \xFB\xCF |0
-<UFE1D6> \xFB\xD0 |0
-<UFE1D7> \xFB\xD1 |0
-<UFE1D8> \xF9\x93 |1
-<UFE1D9> \xF9\x59 |1
-<UFE1DB> \xFB\xD6 |1
-<UFE1DD> \xFB\xC3 |1
-<UFE1E0> \xF7\x4B |1
-<UFE320> \xF9\x9A |0
-<UFE321> \xFB\x43 |1
-<UFE322> \xFB\x50 |0
-<UFE323> \xF9\x99 |0
-<UFE324> \xFB\x46 |1
-<UFE325> \xFB\x4F |0
-<UFE326> \xFB\x4E |0
-<UFE327> \xF7\x46 |0
-<UFE328> \xFB\x44 |0
-<UFE329> \xF7\x45 |0
-<UFE32A> \xFB\x49 |0
-<UFE32B> \xF9\x97 |1
-<UFE32C> \xFB\x58 |0
-<UFE32D> \xFB\x57 |0
-<UFE32E> \xFB\x4C |0
-<UFE32F> \xFB\x4D |0
-<UFE330> \xF9\x98 |0
-<UFE331> \xFB\x55\xF9\xD1 |1
-<UFE332> \xFB\x4A |1
-<UFE333> \xFB\x44 |1
-<UFE334> \xFB\x52 |0
-<UFE335> \xF9\x97 |0
-<UFE336> \xF9\x97 |1
-<UFE337> \xFB\x54 |0
-<UFE338> \xFB\x55 |0
-<UFE339> \xFB\x53 |0
-<UFE33A> \xFB\x51 |0
-<UFE33B> \xFB\x4B |0
-<UFE33C> \xFB\x46 |0
-<UFE33D> \xFB\x56 |0
-<UFE33E> \xFB\x4A |0
-<UFE33F> \xFB\x47 |0
-<UFE340> \xFB\x43 |0
-<UFE341> \xF7\x47 |0
-<UFE342> \xFB\x48 |0
-<UFE343> \xFB\x42 |0
-<UFE344> \xF7\x48 |0
-<UFE345> \xFB\x41 |0
-<UFE346> \xFB\x46 |1
-<UFE347> \xFB\x45 |0
-<UFE348> \xF9\x98 |1
-<UFE349> \xFB\x44 |1
-<UFE34A> \xFB\x52 |1
-<UFE34B> \xFB\x58 |1
-<UFE34C> \xF7\x46 |1
-<UFE34D> \xFB\x53 |1
-<UFE34E> \xFB\x56 |1
-<UFE34F> \xFB\x44 |1
-<UFE350> \xFB\x43 |1
-<UFE351> \xFB\x63 |0
-<UFE352> \xFB\x64 |0
-<UFE353> \xFB\x66 |0
-<UFE357> \xF9\x52 |1
-<UFE358> \xFB\x67 |0
-<UFE359> \xFB\x43 |1
-<UFE35A> \xFB\x56 |1
-<UFE35B> \xFB\x5D |0
-<UFE4B0> \xF9\x76 |0
-<UFE4B1> \xF9\x76 |1
-<UFE4B2> \xF9\x78 |0
-<UFE4B3> \xF7\x94 |0
-<UFE4B4> \xF7\x96 |0
-<UFE4B5> \xF7\x8E |0
-<UFE4B6> \xF7\x95 |0
-<UFE4B7> \xF7\x99 |0
-<UFE4B8> \xFB\xA1 |0
-<UFE4B9> \xF7\x97 |0
-<UFE4BA> \xF7\x98 |0
-<UFE4BB> \xF9\x77 |0
-<UFE4BC> \xF7\x61 |0
-<UFE4BD> \xFB\xA4 |0
-<UFE4BE> \xFB\xA5 |0
-<UFE4BF> \xFB\xA6 |0
-<UFE4C0> \xFB\xA8 |0
-<UFE4C1> \xF7\xA2 |1
-<UFE4C2> \xF9\xAB |1
-<UFE4C3> \xF9\x7B |0
-<UFE4C4> \xFB\xA9 |0
-<UFE4C5> \xFB\xAA |0
-<UFE4C6> \xFB\xBD |0
-<UFE4CA> \xF7\x56 |0
-<UFE4CC> \xF9\x47 |0
-<UFE4CD> \xF9\x47 |1
-<UFE4CF> \xF9\x46 |0
-<UFE4D1> \xF7\x4E |0
-<UFE4D2> \xF9\x71 |0
-<UFE4D3> \xF9\xA2 |0
-<UFE4D4> \xF9\xB8 |0
-<UFE4D5> \xF9\xB9 |0
-<UFE4D6> \xF7\x7E |0
-<UFE4D7> \xF9\xBA |0
-<UFE4D8> \xF9\xBB |0
-<UFE4D9> \xF9\xC1 |0
-<UFE4DA> \xF9\xC2 |0
-<UFE4DB> \xF9\x46 |1
-<UFE4DD> \xF7\x6F |0
-<UFE4DE> \xF7\x8A |0
-<UFE4DF> \xF7\x8B |0
-<UFE4E0> \xF7\x6F |1
-<UFE4E3> \xF7\x6F |1
-<UFE4E5> \xFB\xAB |0
-<UFE4E6> \xFB\xAC |0
-<UFE4E7> \xFB\xAD |0
-<UFE4E8> \xFB\xAE |0
-<UFE4E9> \xFB\xAF |0
-<UFE4EA> \xFB\xB0 |0
-<UFE4EB> \xFB\xB1 |0
-<UFE4EC> \xFB\xB2 |0
-<UFE4ED> \xFB\xB3 |0
-<UFE4EE> \xFB\xB4 |0
-<UFE4EF> \xF9\x48 |0
-<UFE4F0> \xF9\xC3 |0
-<UFE4F2> \xF9\xC5 |0
-<UFE4F4> \xF9\x9B |0
-<UFE4F5> \xF7\x53 |0
-<UFE4F6> \xF7\x5D |0
-<UFE4F7> \xF7\xDE |1
-<UFE4F8> \xF7\xDE |0
-<UFE4F9> \xF9\x7D |1
-<UFE4FF> \xF7\x89 |1
-<UFE500> \xF7\x89 |1
-<UFE501> \xF7\x89 |1
-<UFE502> \xF7\x89 |1
-<UFE503> \xF7\x89 |1
-<UFE505> \xF7\x80 |0
-<UFE506> \xF7\x92 |0
-<UFE507> \xF7\x81 |0
-<UFE508> \xF9\xA9 |0
-<UFE509> \xF7\x7B |0
-<UFE50A> \xF9\xAF |0
-<UFE50B> \xFB\xD2 |0
-<UFE50C> \xFB\xD3 |0
-<UFE50D> \xFB\xD4 |0
-<UFE50E> \xFB\xD5 |0
-<UFE50F> \xF9\xB4 |0
-<UFE510> \xF7\x52 |0
-<UFE511> \xF9\xEB |0
-<UFE512> \xF9\x73 |0
-<UFE513> \xFB\x89 |0
-<UFE514> \xF7\x84 |0
-<UFE515> \xF7\x57 |0
-<UFE516> \xF9\xB0 |0
-<UFE517> \xF9\xB2 |0
-<UFE518> \xFB\x76 |0
-<UFE519> \xFB\x78 |0
-<UFE51A> \xFB\x79 |0
-<UFE51B> \xFB\x7A |0
-<UFE51C> \xFB\x7B |0
-<UFE51D> \xFB\x81 |0
-<UFE51E> \xFB\x83 |0
-<UFE51F> \xFB\x86 |0
-<UFE523> \xF9\x49 |0
-<UFE524> \xF9\x49 |1
-<UFE525> \xF9\x4A |0
-<UFE526> \xF7\x44 |0
-<UFE527> \xF9\xA1 |0
-<UFE528> \xF9\x4B |0
-<UFE529> \xF7\x43 |1
-<UFE52A> \xF7\x43 |1
-<UFE52B> \xF7\x43 |0
-<UFE52C> \xF7\x41 |0
-<UFE52D> \xF7\x41 |1
-<UFE52E> \xF7\x42 |0
-<UFE52F> \xF7\x83 |0
-<UFE530> \xF9\xB7 |0
-<UFE531> \xF7\x8C |0
-<UFE535> \xF7\x52 |1
-<UFE537> \xF7\x5F |0
-<UFE538> \xF9\x4C |0
-<UFE539> \xF9\xA1 |1
-<UFE53B> \xF7\x5E |0
-<UFE53C> \xF9\xB6 |0
-<UFE53D> \xF9\xB6 |1
-<UFE53E> \xF9\xB3 |0
-<UFE540> \xF9\xA1 |1
-<UFE541> \xF9\xA1 |1
-<UFE545> \xF7\x89 |1
-<UFE546> \xF7\x89 |0
-<UFE547> \xF7\x89 |1
-<UFE548> \xF9\xA1 |1
-<UFE54A> \xF7\x8B |1
-<UFE54B> \xF7\x8B |1
-<UFE54D> \xF7\x89 |1
-<UFE54F> \xF7\x89 |1
-<UFE552> \xF9\xA1 |1
-<UFE553> \xFB\xD6 |0
-<UFE7D1> \xF9\x56 |0
-<UFE7D2> \xF9\x54 |0
-<UFE7D3> \xF9\x55 |0
-<UFE7D4> \xF9\x58 |0
-<UFE7D5> \xF9\x53 |0
-<UFE7D6> \xFB\x6A |0
-<UFE7D7> \xF7\x72 |0
-<UFE7D9> \xF7\x55 |0
-<UFE7DA> \xF9\x57 |0
-<UFE7DB> \xF7\x71 |0
-<UFE7DC> \xF7\x74 |0
-<UFE7DD> \xFB\x6B |0
-<UFE7DE> \xFB\x6D |0
-<UFE7DF> \xF9\x5E |0
-<UFE7E0> \xFB\x74 |0
-<UFE7E1> \xFB\x74 |1
-<UFE7E2> \xFB\x75 |0
-<UFE7E3> \xF9\x5F |0
-<UFE7E4> \xF9\x5B |0
-<UFE7E5> \xFB\x6E |0
-<UFE7E6> \xF7\x9A |0
-<UFE7E7> \xF7\x91 |0
-<UFE7E8> \xF7\xA2 |0
-<UFE7E9> \xF9\x5D |0
-<UFE7EA> \xF9\x5C |0
-<UFE7EB> \xF7\x76 |0
-<UFE7EC> \xF9\x79 |0
-<UFE7ED> \xF7\x4D |0
-<UFE7EE> \xF7\x75 |0
-<UFE7EF> \xF7\x9B |0
-<UFE7F0> \xF7\xA1 |0
-<UFE7F1> \xFB\x6F |0
-<UFE7F2> \xFB\x70 |0
-<UFE7F3> \xFB\x71 |0
-<UFE7F4> \xFB\x72 |0
-<UFE7F5> \xF9\x7A |0
-<UFE7F6> \xF7\x90 |0
-<UFE7F7> \xF7\x8F |0
-<UFE7F8> \xF7\x77 |0
-<UFE7F9> \xFB\x72 |1
-<UFE7FA> \xF7\x63 |0
-<UFE7FB> \xF7\x62 |0
-<UFE7FD> \xF7\x64 |0
-<UFE7FE> \xFB\x73 |0
-<UFE7FF> \xF9\x59 |1
-<UFE800> \xF9\x7C |0
-<UFE801> \xF9\x7D |0
-<UFE802> \xFB\xA7 |0
-<UFE803> \xF9\xAA |0
-<UFE804> \xFB\xA2 |0
-<UFE805> \xFB\xA3 |0
-<UFE807> \xF7\x65 |0
-<UFE808> \xF9\xC4 |0
-<UFE809> \xFB\xA3 |1
-<UFE80B> \xF7\x6D |0
-<UFE80C> \xF7\x70 |0
-<UFE80D> \xF7\x73 |0
-<UFE80E> \xFB\x6C |0
-<UFE813> \xF9\x7E |0
-<UFE814> \xF9\xC6 |0
-<UFE815> \xF9\x81 |0
-<UFE816> \xF9\x82 |0
-<UFE818> \xF9\x83 |0
-<UFE81A> \xF9\xC6 |1
-<UFE81B> \xF7\x6C |0
-<UFE81C> \xF7\x6A |0
-<UFE81D> \xF7\x66 |0
-<UFE81E> \xF7\x67 |0
-<UFE81F> \xF7\x68 |0
-<UFE820> \xF7\x69 |0
-<UFE821> \xF7\x82 |0
-<UFE823> \xF9\x43 |0
-<UFE824> \xF7\x43\xF9\xC8 |1
-<UFE825> \xF9\x74 |0
-<UFE826> \xF9\x75 |0
-<UFE827> \xF7\x51 |0
-<UFE828> \xF9\xA6 |0
-<UFE829> \xFB\x65 |0
-<UFE82A> \xFB\x7D |0
-<UFE82B> \xF7\xB1 |0
-<UFE82C> \xF7\xB0 |0
-<UFE82E> \xF7\xBC |0
-<UFE82F> \xF7\xBD |0
-<UFE830> \xF7\xBE |0
-<UFE831> \xF7\xBF |0
-<UFE832> \xF7\xC0 |0
-<UFE833> \xF7\xC1 |0
-<UFE834> \xF7\xC2 |0
-<UFE835> \xF7\xC3 |0
-<UFE836> \xF7\xC4 |0
-<UFE837> \xF7\xC5 |0
-<UFE838> \xF7\xAB |0
-<UFE839> \xF7\xF0 |0
-<UFE83A> \xF7\xF1 |0
-<UFE960> \xF7\x60 |0
-<UFE961> \xF9\xE2 |0
-<UFE962> \xF9\x87 |0
-<UFE963> \xF9\xE0 |0
-<UFE964> \xF9\xD9 |0
-<UFE965> \xF7\x88 |0
-<UFE966> \xF9\xDA |0
-<UFE967> \xF9\xDB |0
-<UFE968> \xF9\xDC |0
-<UFE969> \xF9\xDD |0
-<UFE96A> \xF9\xDE |0
-<UFE96B> \xF9\xDF |0
-<UFE96C> \xF9\xE1 |0
-<UFE96D> \xF9\xE3 |0
-<UFE96E> \xF9\xE4 |0
-<UFE96F> \xF9\xEC |0
-<UFE970> \xF9\xED |0
-<UFE971> \xFB\x80 |0
-<UFE980> \xF9\x84 |0
-<UFE981> \xF9\x86 |0
-<UFE982> \xF9\x85 |0
-<UFE983> \xF9\x88 |0
-<UFE984> \xF9\xD8 |0
-<UFE985> \xF9\xAB |0
-<UFE986> \xF9\x85 |1
-<UFE987> \xF9\xAC |0
-<UFE988> \xF9\x85 |1
-<UFEAF0> \xF7\xD6 |0
-<UFEAF1> \xF7\xD8 |0
-<UFEAF2> \xF7\xD7 |0
-<UFEAF3> \xF7\xD9 |0
-<UFEAF4> \xF7\xD6 |1
-<UFEAF5> \xF7\xD8 |1
-<UFEAF8> \xF7\xD2 |0
-<UFEAF9> \xF7\xD3 |0
-<UFEAFA> \xF7\xD4 |0
-<UFEAFB> \xF7\xD5 |0
-<UFEAFC> \xF7\xDA |0
-<UFEAFD> \xF7\xDB |0
-<UFEAFE> \xF7\xDC |0
-<UFEAFF> \xF7\xDD |0
-<UFEB04> \xF9\x61 |0
-<UFEB09> \xF9\x60 |0
-<UFEB0A> \xF9\xD6 |0
-<UFEB0B> \xF9\xD7 |0
-<UFEB0C> \xF9\x62 |0
-<UFEB0D> \xF9\xC7 |0
-<UFEB0E> \xF9\x63 |0
-<UFEB0F> \xF9\xC7 |1
-<UFEB10> \xF9\xC7 |1
-<UFEB11> \xF9\xC8 |0
-<UFEB12> \xF9\xC9 |0
-<UFEB13> \xF9\xCA |0
-<UFEB14> \xF9\xCB |0
-<UFEB15> \xF9\xCC |0
-<UFEB16> \xF9\xCD |0
-<UFEB17> \xFB\x77 |0
-<UFEB18> \xF9\xC7 |1
-<UFEB19> \xF7\xA4 |0
-<UFEB1A> \xF7\xAC |0
-<UFEB1B> \xF7\xAE |0
-<UFEB1C> \xF7\xAD |0
-<UFEB1D> \xF7\xAF |0
-<UFEB1E> \xF9\xAE |0
-<UFEB1F> \xF7\xA8 |0
-<UFEB20> \xF7\xAA |0
-<UFEB23> \xF7\xF2 |0
-<UFEB24> \xF7\xA3 |0
-<UFEB25> \xF7\xA7 |0
-<UFEB26> \xF7\x77 |1
-<UFEB27> \xF7\xED |0
-<UFEB29> \xF7\xEE |0
-<UFEB2A> \xFB\xD7 |0
-<UFEB2B> \xF9\xB5 |0
-<UFEB2D> \xF7\xEF |0
-<UFEB2F> \xF7\xCB |0
-<UFEB31> \xF7\xCA |0
-<UFEB32> \xF7\x6E |0
-<UFEB33> \xF7\x78 |0
-<UFEB34> \xF7\x79 |0
-<UFEB35> \xF7\x7A |0
-<UFEB36> \xF7\xB2 |0
-<UFEB37> \xF7\xB3 |0
-<UFEB38> \xF7\xB4 |0
-<UFEB39> \xF7\xB5 |0
-<UFEB3A> \xF7\xB6 |0
-<UFEB3B> \xF7\xB7 |0
-<UFEB3C> \xF7\xB8 |0
-<UFEB3D> \xF7\xC6 |0
-<UFEB3E> \xF7\xC7 |0
-<UFEB3F> \xF7\xC8 |0
-<UFEB40> \xF7\xCC |0
-<UFEB41> \xF7\xCD |0
-<UFEB42> \xF7\xEC |0
-<UFEB43> \xF9\xAD |0
-<UFEB44> \xF9\xD2 |0
-<UFEB45> \xF9\xD3 |0
-<UFEB46> \xF9\xD3 |1
-<UFEB53> \xF9\xD3 |1
-<UFEB56> \xF7\x4F |0
-<UFEB57> \xF9\xD4 |0
-<UFEB58> \xF9\xB1 |0
-<UFEB59> \xF7\x7C |0
-<UFEB5B> \xF9\xD1 |0
-<UFEB5C> \xF9\xD1 |1
-<UFEB5D> \xF9\xD0 |0
-<UFEB5E> \xF7\x8D |0
-<UFEB5F> \xFB\x47 |1
-<UFEB60> \xF9\xCE |0
-<UFEB61> \xF7\xA5 |0
-<UFEB62> \xF7\xA6 |0
-<UFEB63> \xF7\xB9 |0
-<UFEB64> \xF7\xBA |0
-<UFEB65> \xF7\xB9 |1
-<UFEB66> \xF7\xB9 |1
-<UFEB67> \xF7\xBB |0
-<UFEB68> \xF9\xCF |0
-<UFEB69> \xF9\xD5 |0
-<UFEB6B> \xF7\xBB |1
-<UFEB6C> \xF7\xBA |1
-<UFEB6D> \xF7\xBB |1
-<UFEB6E> \xF7\xBA |1
-<UFEB6F> \xF7\xBB |1
-<UFEB70> \xF7\xBA |1
-<UFEB71> \xF7\xBB |1
-<UFEB72> \xF7\xBA |1
-<UFEB73> \xF7\xBB |1
-<UFEB74> \xF7\xBB |1
-<UFEB75> \xF7\xBB |1
-<UFEB76> \xF7\xBB |1
-<UFEB77> \xF9\xCE |1
-<UFEB81> \xF7\xC9 |0
-<UFEB82> \xF9\x80 |0
-<UFEB85> \xF7\x54 |0
-<UFEB86> \xF7\x85 |0
-<UFEB87> \xF7\x86 |0
-<UFEB8A> \xF7\x85 |1
-<UFEB8D> \xF7\x54 |1
-<UFEB8E> \xF7\xD5 |1
-<UFEB90> \xF7\x85 |1
-<UFEB92> \xF7\x43 |1
-<UFEB93> \xF9\x50 |0
-<UFEB94> \xF9\x51 |0
-<UFEB95> \xF9\x52 |0
-<UFEB96> \xF9\x4D |0
-<UFEB97> \xF9\x4E |0
-<UFEB98> \xF9\x4F |0
-<UFEB99> \xF7\xCE |0
-<UFEB9A> \xF7\xCF |0
-<UFEB9B> \xF7\xD0 |0
-<UFEB9C> \xF7\xD1 |0
-<UFEB9D> \xFB\x5E |0
-<UFEB9E> \xFB\x5F |0
-<UFEB9F> \xFB\x60 |0
-<UFEBA0> \xFB\x61 |0
-<UFEBA1> \xFB\x62 |0
-<UFEE1C> \xF9\x7D |1
-<UFEE70> \xFB\xD8 |0
-<UFEE71> \xFB\xD9 |0
-<UFEE72> \xFB\xDA |0
-<UFEE73> \xFB\xDB |0
-<UFEE74> \xFB\xDC |0
-<UFEE75> \xFB\xDD |0
-<UFEE76> \xFB\xDE |0
-<UFEE77> \xF7\xF4 |0
-<UFEE78> \xF7\xF5 |0
-<UFEE79> \xF7\xF6 |0
-<UFEE7A> \xF7\xF7 |0
-<UFEE7B> \xF7\xF8 |0
-<UFEE7C> \xF7\xF9 |0
-<UFEE7D> \xF7\xFA |0
END CHARMAP
diff --git a/data/mappings/kddi-shift_jis-2007.ucm b/data/mappings/kddi-shift_jis-2012.ucm
similarity index 84%
rename from data/mappings/kddi-shift_jis-2007.ucm
rename to data/mappings/kddi-shift_jis-2012.ucm
index 26c6713..7d4ef2b 100644
--- a/data/mappings/kddi-shift_jis-2007.ucm
+++ b/data/mappings/kddi-shift_jis-2012.ucm
@@ -1,5 +1,5 @@
# KDDI's Shift_JIS. See README.emoji for details.
-<code_set_name> "kddi-shift_jis-2007"
+<code_set_name> "kddi-shift_jis-2012"
<mb_cur_max> 2
<mb_cur_min> 1
<uconv_class> "MBCS"
@@ -7641,56 +7641,1411 @@
<U2016> \x81\x61 |1
<U2212> \x81\x7C |1
<U301C> \x81\x60 |1
-<UFE000> \xF6\x60 |0
<UFE000> \xEB\x60 |3
-<UFE001> \xF6\x65 |0
<UFE001> \xEB\x65 |3
-<UFE002> \xF6\x64 |0
<UFE002> \xEB\x64 |3
-<UFE003> \xF6\x5D |0
<UFE003> \xEB\x5D |3
-<UFE004> \xF6\x5F |0
<UFE004> \xEB\x5F |3
-<UFE005> \xF6\x41 |0
<UFE005> \xEB\x41 |3
-<UFE006> \xF7\xB5 |0
<UFE006> \xEC\xB5 |3
-<UFE007> \xF3\xBC |0
<UFE007> \xED\xBC |3
-<UFE008> \xF3\xC5 |0
<UFE008> \xED\xC5 |3
-<UFE009> \xF3\xC8 |1
-<UFE00A> \xF3\xC8 |0
<UFE00A> \xED\xC8 |3
-<UFE00B> \xF3\x4D |0
<UFE00B> \xED\x4D |3
-<UFE00C> \xF3\x4D |1
-<UFE00D> \xF3\xC6 |0
<UFE00D> \xED\xC6 |3
-<UFE00E> \xF6\x62 |0
<UFE00E> \xEB\x62 |3
-<UFE00F> \xF6\x66 |0
<UFE00F> \xEB\x66 |3
-<UFE010> \xF6\x98 |0
<UFE010> \xEB\x98 |3
-<UFE011> \xF7\xC5 |0
<UFE011> \xEC\xC5 |3
-<UFE012> \xF7\xC6 |0
<UFE012> \xEC\xC6 |3
-<UFE013> \xF7\xC7 |0
<UFE013> \xEC\xC7 |3
-<UFE014> \xF6\x5E |0
<UFE014> \xEB\x5E |3
-<UFE016> \xF6\x61 |0
<UFE016> \xEB\x61 |3
-<UFE017> \xF3\xC3 |0
<UFE017> \xED\xC3 |3
-<UFE01B> \xF6\x54 |0
<UFE01B> \xEB\x54 |3
-<UFE01C> \xF7\x98 |0
<UFE01C> \xEC\x98 |3
-<UFE01D> \xF7\x97 |0
<UFE01D> \xEC\x97 |3
+<UFE02A> \xEC\xB1 |3
+<UFE02B> \xEB\x67 |3
+<UFE02C> \xEB\x68 |3
+<UFE02D> \xEB\x69 |3
+<UFE02E> \xEB\x6A |3
+<UFE02F> \xEB\x6B |3
+<UFE030> \xEB\x6C |3
+<UFE031> \xEB\x6D |3
+<UFE032> \xEB\x6E |3
+<UFE033> \xEB\x6F |3
+<UFE034> \xEB\x70 |3
+<UFE035> \xEB\x71 |3
+<UFE036> \xEB\x72 |3
+<UFE037> \xEB\x73 |3
+<UFE038> \xEE\x81 |3
+<UFE039> \xEC\xD0 |3
+<UFE03A> \xEE\x57 |3
+<UFE03B> \xEE\x63 |3
+<UFE03C> \xEB\xEC |3
+<UFE03D> \xEB\xBD |3
+<UFE03E> \xEE\x82 |3
+<UFE03F> \xEB\xA7 |3
+<UFE040> \xEB\xA3 |3
+<UFE041> \xEC\xEA |3
+<UFE042> \xED\x40 |3
+<UFE044> \xEB\x58 |3
+<UFE045> \xED\x67 |3
+<UFE046> \xEB\xBC |3
+<UFE047> \xEB\xBB |3
+<UFE048> \xED\x69 |3
+<UFE04A> \xED\xF7 |3
+<UFE04B> \xED\xF8 |3
+<UFE04C> \xED\xF9 |3
+<UFE04D> \xEE\x4D |3
+<UFE04E> \xEE\x87 |3
+<UFE04F> \xEB\xAB |3
+<UFE050> \xED\xF6 |3
+<UFE051> \xED\x8D |3
+<UFE052> \xED\x8E |3
+<UFE053> \xEB\xAD |3
+<UFE054> \xEB\xA6 |3
+<UFE055> \xED\x8F |3
+<UFE056> \xED\x90 |3
+<UFE057> \xED\xF3 |3
+<UFE058> \xED\xF4 |3
+<UFE059> \xED\xF5 |3
+<UFE05A> \xED\xFA |3
+<UFE05B> \xEE\x5E |3
+<UFE190> \xEC\xC1 |3
+<UFE191> \xEC\xC2 |3
+<UFE192> \xED\xA4 |3
+<UFE193> \xED\xA5 |3
+<UFE194> \xEE\x4B |3
+<UFE195> \xEB\xE2 |3
+<UFE196> \xED\x73 |3
+<UFE197> \xEB\xE4 |3
+<UFE198> \xED\x74 |3
+<UFE199> \xED\x75 |3
+<UFE19B> \xEB\xD5 |3
+<UFE19C> \xEB\xD3 |3
+<UFE19F> \xEB\xDA |3
+<UFE1A1> \xED\x50 |3
+<UFE1A2> \xED\xAF |3
+<UFE1A3> \xED\xBD |3
+<UFE1A4> \xED\xD4 |3
+<UFE1A5> \xED\xD5 |3
+<UFE1A6> \xED\xD6 |3
+<UFE1A7> \xED\xD7 |3
+<UFE1A8> \xED\xD8 |3
+<UFE1A9> \xED\xD9 |3
+<UFE1AA> \xED\xDA |3
+<UFE1AB> \xED\xDB |3
+<UFE1AC> \xEE\x48 |3
+<UFE1AD> \xEE\x49 |3
+<UFE1AE> \xEB\xA4 |3
+<UFE1AF> \xEC\xEF |3
+<UFE1B0> \xEB\xE7 |3
+<UFE1B1> \xEB\xC5 |3
+<UFE1B2> \xEB\xC8 |3
+<UFE1B3> \xEB\xD1 |3
+<UFE1B6> \xED\xDD |3
+<UFE1B7> \xEB\xBA |3
+<UFE1B8> \xEB\xB4 |3
+<UFE1B9> \xEE\x83 |3
+<UFE1BA> \xEB\xB9 |3
+<UFE1BB> \xEE\x7A |3
+<UFE1BC> \xEB\xB5 |3
+<UFE1BE> \xEB\xB1 |3
+<UFE1BF> \xEB\xB7 |3
+<UFE1C0> \xEC\xF0 |3
+<UFE1C1> \xEC\xF1 |3
+<UFE1C2> \xEC\xF2 |3
+<UFE1C3> \xEB\x48 |3
+<UFE1C4> \xEB\xB2 |3
+<UFE1C5> \xEC\xF7 |3
+<UFE1C6> \xED\xC0 |3
+<UFE1C7> \xED\xDC |3
+<UFE1C9> \xED\xDE |3
+<UFE1CB> \xED\xDF |3
+<UFE1CC> \xED\xE0 |3
+<UFE1CD> \xED\xE1 |3
+<UFE1D1> \xED\xE2 |3
+<UFE1D2> \xEB\xB0 |3
+<UFE1D3> \xED\xE3 |3
+<UFE1D4> \xED\xE4 |3
+<UFE1D5> \xED\xE5 |3
+<UFE1D6> \xED\xE6 |3
+<UFE1D7> \xEB\xB3 |3
+<UFE1D8> \xEB\xB8 |3
+<UFE1D9> \xEB\xAC |3
+<UFE1DA> \xEB\xB6 |3
+<UFE1DB> \xEB\xC7 |3
+<UFE1DC> \xED\x47 |3
+<UFE1DD> \xED\x4E |3
+<UFE1DE> \xEE\x43 |3
+<UFE1DF> \xEE\x4A |3
+<UFE1E0> \xEE\x4C |3
+<UFE1E1> \xEE\x5B |3
+<UFE1E2> \xEE\x5C |3
+<UFE320> \xEB\x4A |3
+<UFE321> \xEE\x6B |3
+<UFE322> \xED\x9E |3
+<UFE324> \xEC\xCB |3
+<UFE325> \xED\x9F |3
+<UFE326> \xED\x9D |3
+<UFE327> \xEC\xF4 |3
+<UFE328> \xED\x95 |3
+<UFE329> \xEB\xC0 |3
+<UFE32C> \xED\xA3 |3
+<UFE32D> \xED\xA2 |3
+<UFE32E> \xED\x9B |3
+<UFE32F> \xED\x9C |3
+<UFE330> \xEB\x49 |3
+<UFE333> \xEE\x85 |3
+<UFE334> \xEE\x68 |3
+<UFE335> \xED\xA1 |3
+<UFE336> \xEB\xD4 |3
+<UFE339> \xEE\x6D |3
+<UFE33A> \xEB\x4B |3
+<UFE33B> \xED\x9A |3
+<UFE33C> \xED\x96 |3
+<UFE33D> \xEE\x61 |3
+<UFE33E> \xED\x99 |3
+<UFE33F> \xED\x97 |3
+<UFE340> \xED\x94 |3
+<UFE341> \xEC\xF5 |3
+<UFE342> \xED\x98 |3
+<UFE343> \xED\x93 |3
+<UFE344> \xEC\xF6 |3
+<UFE346> \xEB\x4C |3
+<UFE347> \xEC\xF3 |3
+<UFE348> \xEE\x65 |3
+<UFE349> \xEE\x84 |3
+<UFE34A> \xEE\x67 |3
+<UFE34B> \xEE\x64 |3
+<UFE34C> \xEE\x69 |3
+<UFE34D> \xEE\x6C |3
+<UFE34E> \xEE\x62 |3
+<UFE34F> \xEE\x6E |3
+<UFE350> \xEE\x6A |3
+<UFE351> \xED\xAB |3
+<UFE352> \xED\xAC |3
+<UFE353> \xED\xAD |3
+<UFE354> \xEE\x54 |3
+<UFE355> \xEE\x55 |3
+<UFE356> \xEE\x56 |3
+<UFE357> \xEE\x8A |3
+<UFE358> \xEE\x8B |3
+<UFE359> \xEE\x8C |3
+<UFE35A> \xEE\x8D |3
+<UFE35B> \xED\xA6 |3
+<UFE4B0> \xEB\x84 |3
+<UFE4B1> \xEC\xE0 |3
+<UFE4B2> \xEB\x86 |3
+<UFE4B3> \xED\x51 |3
+<UFE4B4> \xED\x52 |3
+<UFE4B5> \xEB\x83 |3
+<UFE4B6> \xEB\x7B |3
+<UFE4B7> \xED\x54 |3
+<UFE4B8> \xED\xC7 |3
+<UFE4B9> \xEB\x7C |3
+<UFE4BA> \xED\x53 |3
+<UFE4BB> \xEC\xEB |3
+<UFE4BC> \xED\x42 |3
+<UFE4BD> \xED\xCA |3
+<UFE4BE> \xED\xCB |3
+<UFE4BF> \xED\xCC |3
+<UFE4C0> \xED\xCD |3
+<UFE4C1> \xEB\x82 |3
+<UFE4C2> \xEB\x96 |3
+<UFE4C3> \xEC\xED |3
+<UFE4C4> \xEB\x99 |3
+<UFE4C7> \xEC\x8F |3
+<UFE4C8> \xEE\x70 |3
+<UFE4C9> \xEC\xA4 |3
+<UFE4CA> \xEC\xFB |3
+<UFE4CB> \xEC\x9E |3
+<UFE4CC> \xEC\xE7 |3
+<UFE4CD> \xED\xEC |3
+<UFE4CE> \xEB\xD7 |3
+<UFE4CF> \xEC\xE6 |3
+<UFE4D0> \xEE\x7B |3
+<UFE4D1> \xEC\xF9 |3
+<UFE4D3> \xED\x66 |3
+<UFE4D4> \xED\x71 |3
+<UFE4D5> \xEE\x6F |3
+<UFE4D6> \xEB\xF3 |3
+<UFE4D8> \xED\x72 |3
+<UFE4D9> \xED\x76 |3
+<UFE4DA> \xED\x77 |3
+<UFE4DB> \xEB\xE6 |3
+<UFE4DC> \xEB\xDD |3
+<UFE4DD> \xEB\xA0 |3
+<UFE4DF> \xED\x4F |3
+<UFE4E0> \xEC\x96 |3
+<UFE4E1> \xEC\x99 |3
+<UFE4E2> \xEC\x9A |3
+<UFE4E3> \xEC\xA2 |3
+<UFE4E4> \xEE\x5F |3
+<UFE4E5> \xEB\xA5 |3
+<UFE4E6> \xEC\x90 |3
+<UFE4E7> \xED\xCE |3
+<UFE4E8> \xED\xCF |3
+<UFE4E9> \xED\xD0 |3
+<UFE4EA> \xED\xD1 |3
+<UFE4EB> \xED\x48 |3
+<UFE4EC> \xED\x49 |3
+<UFE4ED> \xED\xD2 |3
+<UFE4EE> \xED\xD3 |3
+<UFE4EF> \xEB\xEE |3
+<UFE4F0> \xEB\x74 |3
+<UFE4F2> \xEB\xEB |3
+<UFE4F4> \xEB\xCE |3
+<UFE4F5> \xEB\xE3 |3
+<UFE4F6> \xEB\x53 |3
+<UFE4F7> \xED\x62 |3
+<UFE4F9> \xEC\x9B |3
+<UFE4FA> \xEC\x9C |3
+<UFE4FB> \xEC\xA0 |3
+<UFE4FC> \xEC\xA1 |3
+<UFE4FD> \xEC\x7B |3
+<UFE4FE> \xEC\xA6 |3
+<UFE4FF> \xEC\x82 |3
+<UFE500> \xEC\x83 |3
+<UFE501> \xEC\x84 |3
+<UFE502> \xEC\x85 |3
+<UFE503> \xEC\x8C |3
+<UFE504> \xEB\xF6 |3
+<UFE505> \xED\x4B |3
+<UFE506> \xEB\x7D |3
+<UFE509> \xEB\xE9 |3
+<UFE50A> \xED\x6D |3
+<UFE50B> \xED\xE7 |3
+<UFE50C> \xED\xE8 |3
+<UFE50D> \xED\xEA |3
+<UFE50E> \xED\xE9 |3
+<UFE50F> \xEC\xBC |3
+<UFE510> \xEB\xA8 |3
+<UFE511> \xEC\xBD |3
+<UFE512> \xEB\xA2 |3
+<UFE513> \xED\xC4 |3
+<UFE514> \xED\x4C |3
+<UFE515> \xEC\xFC |3
+<UFE516> \xED\x6E |3
+<UFE517> \xED\x6F |3
+<UFE518> \xED\xB7 |3
+<UFE519> \xED\xB8 |3
+<UFE51A> \xED\xB9 |3
+<UFE51B> \xED\xBA |3
+<UFE51C> \xED\xBB |3
+<UFE51D> \xED\xBF |3
+<UFE51E> \xED\xC1 |3
+<UFE51F> \xED\xC2 |3
+<UFE520> \xEB\x47 |3
+<UFE521> \xEE\x41 |3
+<UFE522> \xEC\xB8 |3
+<UFE523> \xEC\xB3 |3
+<UFE524> \xEB\xF7 |3
+<UFE525> \xEC\xA5 |3
+<UFE526> \xEC\xDF |3
+<UFE527> \xED\x65 |3
+<UFE528> \xEB\xF9 |3
+<UFE529> \xEB\xFA |3
+<UFE52A> \xEC\xAE |3
+<UFE52B> \xEE\x66 |3
+<UFE52C> \xEB\xF4 |3
+<UFE52D> \xEC\xE1 |3
+<UFE530> \xEB\xEA |3
+<UFE531> \xEB\x81 |3
+<UFE532> \xEB\xD6 |3
+<UFE533> \xEC\xAF |3
+<UFE534> \xEC\xB0 |3
+<UFE535> \xEB\xF8 |3
+<UFE536> \xEC\xDA |3
+<UFE538> \xEC\xE8 |3
+<UFE539> \xEB\x79 |3
+<UFE53A> \xEB\x78 |3
+<UFE53B> \xED\x41 |3
+<UFE53C> \xEC\x9F |3
+<UFE53D> \xEC\x7E |3
+<UFE53E> \xEB\xEF |3
+<UFE53F> \xEC\x7C |3
+<UFE540> \xEC\x7D |3
+<UFE541> \xEC\x86 |3
+<UFE542> \xEC\x80 |3
+<UFE543> \xEC\xAC |3
+<UFE544> \xEC\xAD |3
+<UFE545> \xEC\x88 |3
+<UFE546> \xEB\x77 |3
+<UFE547> \xEB\x75 |3
+<UFE548> \xEC\x81 |3
+<UFE549> \xEC\x87 |3
+<UFE54A> \xEC\x91 |3
+<UFE54B> \xEC\x92 |3
+<UFE54C> \xEC\x93 |3
+<UFE54D> \xEC\x89 |3
+<UFE54E> \xEC\x8A |3
+<UFE54F> \xEC\x8B |3
+<UFE550> \xEC\x8D |3
+<UFE551> \xEB\x7A |3
+<UFE552> \xEC\xE2 |3
+<UFE553> \xED\xEB |3
+<UFE7D1> \xEB\x93 |3
+<UFE7D2> \xEC\xB6 |3
+<UFE7D3> \xEB\x90 |3
+<UFE7D4> \xEB\x8F |3
+<UFE7D5> \xED\x80 |3
+<UFE7D6> \xEC\xB7 |3
+<UFE7D7> \xEB\x92 |3
+<UFE7D8> \xEB\x91 |3
+<UFE7D9> \xEB\x43 |3
+<UFE7DA> \xEE\x45 |3
+<UFE7DB> \xED\x46 |3
+<UFE7DD> \xEB\x94 |3
+<UFE7DE> \xED\xB2 |3
+<UFE7DF> \xEB\x8E |3
+<UFE7E0> \xEC\xEC |3
+<UFE7E3> \xEB\x89 |3
+<UFE7E4> \xEB\x8A |3
+<UFE7E6> \xEB\x88 |3
+<UFE7E7> \xEB\x80 |3
+<UFE7E8> \xED\x55 |3
+<UFE7E9> \xEB\x8C |3
+<UFE7EA> \xEB\x8D |3
+<UFE7EB> \xEB\x87 |3
+<UFE7EC> \xEE\x71 |3
+<UFE7ED> \xEC\xF8 |3
+<UFE7F0> \xEE\x76 |3
+<UFE7F1> \xEB\x8B |3
+<UFE7F2> \xED\xB3 |3
+<UFE7F3> \xED\xB4 |3
+<UFE7F4> \xED\xB5 |3
+<UFE7F5> \xEC\x8E |3
+<UFE7F6> \xEB\x7E |3
+<UFE7F7> \xEB\x42 |3
+<UFE7F8> \xED\x4A |3
+<UFE7F9> \xEE\x77 |3
+<UFE7FA> \xEB\x95 |3
+<UFE7FB> \xED\x43 |3
+<UFE7FD> \xEB\x45 |3
+<UFE7FE> \xED\xB6 |3
+<UFE7FF> \xEE\x46 |3
+<UFE800> \xEB\xDC |3
+<UFE801> \xEB\xF0 |3
+<UFE803> \xEB\xE1 |3
+<UFE804> \xEC\xB9 |3
+<UFE805> \xED\xC9 |3
+<UFE806> \xEC\xBB |3
+<UFE807> \xEB\x76 |3
+<UFE808> \xEB\x97 |3
+<UFE809> \xEC\xBA |3
+<UFE80A> \xEB\x9F |3
+<UFE80B> \xED\x44 |3
+<UFE80C> \xEB\x9E |3
+<UFE80D> \xEB\x46 |3
+<UFE80E> \xED\xB1 |3
+<UFE80F> \xEB\xA1 |3
+<UFE810> \xEE\x47 |3
+<UFE811> \xEE\x72 |3
+<UFE812> \xEE\x73 |3
+<UFE813> \xEC\xEE |3
+<UFE814> \xEB\xDE |3
+<UFE816> \xEB\xDF |3
+<UFE817> \xEE\x44 |3
+<UFE818> \xED\xB0 |3
+<UFE819> \xEB\xE0 |3
+<UFE81A> \xED\xA0 |3
+<UFE81C> \xEB\xDB |3
+<UFE81D> \xEB\xE5 |3
+<UFE81F> \xEC\xE9 |3
+<UFE820> \xEC\x9D |3
+<UFE822> \xEC\xA8 |3
+<UFE823> \xEB\xC4 |3
+<UFE824> \xEE\x7C |3
+<UFE825> \xEB\xED |3
+<UFE827> \xEC\xFA |3
+<UFE828> \xED\x68 |3
+<UFE829> \xED\xAE |3
+<UFE82C> \xEE\x89 |3
+<UFE82D> \xEC\x48 |3
+<UFE82E> \xEB\xFB |3
+<UFE82F> \xEB\xFC |3
+<UFE830> \xEC\x40 |3
+<UFE831> \xEC\x41 |3
+<UFE832> \xEC\x42 |3
+<UFE833> \xEC\x43 |3
+<UFE834> \xEC\x44 |3
+<UFE835> \xEC\x45 |3
+<UFE836> \xEC\x46 |3
+<UFE837> \xEC\xC9 |3
+<UFE838> \xED\x57 |3
+<UFE839> \xED\x63 |3
+<UFE83A> \xED\x64 |3
+<UFE83B> \xEC\x47 |3
+<UFE83C> \xEC\xA3 |3
+<UFE960> \xEB\xAF |3
+<UFE961> \xEB\xAE |3
+<UFE962> \xEB\xA9 |3
+<UFE963> \xEC\xD1 |3
+<UFE964> \xED\x83 |3
+<UFE965> \xEB\xAA |3
+<UFE966> \xED\x84 |3
+<UFE967> \xED\x85 |3
+<UFE968> \xED\x86 |3
+<UFE969> \xED\x87 |3
+<UFE96A> \xED\x88 |3
+<UFE96B> \xED\x89 |3
+<UFE96C> \xED\x8A |3
+<UFE96D> \xED\x8B |3
+<UFE96E> \xED\x8C |3
+<UFE96F> \xED\x91 |3
+<UFE970> \xED\x92 |3
+<UFE971> \xED\xBE |3
+<UFE972> \xEB\x9D |3
+<UFE973> \xEB\xC6 |3
+<UFE974> \xED\xFB |3
+<UFE975> \xED\xFC |3
+<UFE976> \xEE\x40 |3
+<UFE977> \xEE\x4E |3
+<UFE978> \xEE\x4F |3
+<UFE979> \xEE\x50 |3
+<UFE97A> \xEE\x51 |3
+<UFE97B> \xEE\x52 |3
+<UFE97C> \xEE\x53 |3
+<UFE97D> \xEE\x5A |3
+<UFE97E> \xEE\x5D |3
+<UFE97F> \xEE\x74 |3
+<UFE980> \xEB\x85 |3
+<UFE981> \xEC\xB4 |3
+<UFE982> \xEB\x9B |3
+<UFE983> \xEB\x9C |3
+<UFE984> \xED\x82 |3
+<UFE985> \xED\x6A |3
+<UFE986> \xEB\x9A |3
+<UFE987> \xED\x6B |3
+<UFE988> \xEE\x42 |3
+<UFEAF0> \xEC\x71 |3
+<UFEAF1> \xEC\x69 |3
+<UFEAF2> \xEC\x68 |3
+<UFEAF3> \xEC\x72 |3
+<UFEAF4> \xED\xEE |3
+<UFEAF5> \xED\xEF |3
+<UFEAF6> \xEE\x7E |3
+<UFEAF7> \xEE\x80 |3
+<UFEAF8> \xEC\x5B |3
+<UFEAF9> \xEC\x5C |3
+<UFEAFA> \xEC\x6E |3
+<UFEAFB> \xEC\x6F |3
+<UFEAFC> \xEC\x4A |3
+<UFEAFD> \xEC\x49 |3
+<UFEAFE> \xEC\x4C |3
+<UFEAFF> \xEC\x4B |3
+<UFEB00> \xEC\x5E |3
+<UFEB01> \xEC\x5F |3
+<UFEB02> \xEC\x60 |3
+<UFEB03> \xEC\x61 |3
+<UFEB04> \xEB\x5A |3
+<UFEB05> \xED\xF0 |3
+<UFEB06> \xED\xF1 |3
+<UFEB08> \xED\xF2 |3
+<UFEB09> \xEB\x5B |3
+<UFEB0C> \xEC\xB2 |3
+<UFEB0D> \xEE\x79 |3
+<UFEB0E> \xEB\x4F |3
+<UFEB0F> \xEB\x50 |3
+<UFEB10> \xED\x79 |3
+<UFEB12> \xEB\xC3 |3
+<UFEB13> \xED\x7A |3
+<UFEB14> \xED\x7B |3
+<UFEB15> \xED\x7C |3
+<UFEB16> \xED\x7D |3
+<UFEB17> \xEE\x58 |3
+<UFEB18> \xEC\xCC |3
+<UFEB1A> \xED\x78 |3
+<UFEB1B> \xEC\xBE |3
+<UFEB1C> \xEC\xBF |3
+<UFEB1D> \xEC\xC0 |3
+<UFEB1E> \xEB\x55 |3
+<UFEB1F> \xEB\x56 |3
+<UFEB20> \xEB\x57 |3
+<UFEB21> \xEC\x95 |3
+<UFEB22> \xED\xED |3
+<UFEB23> \xEB\x59 |3
+<UFEB25> \xED\x56 |3
+<UFEB26> \xEB\x5C |3
+<UFEB27> \xEC\xCA |3
+<UFEB29> \xEC\x74 |3
+<UFEB2A> \xEC\x6A |3
+<UFEB2B> \xEB\xCA |3
+<UFEB2C> \xEE\x7D |3
+<UFEB2D> \xEC\x75 |3
+<UFEB2F> \xED\x5D |3
+<UFEB31> \xED\x5C |3
+<UFEB32> \xED\x45 |3
+<UFEB36> \xEC\xE5 |3
+<UFEB37> \xEB\xE8 |3
+<UFEB38> \xED\x58 |3
+<UFEB3D> \xEB\xD0 |3
+<UFEB3E> \xED\x59 |3
+<UFEB3F> \xED\x5A |3
+<UFEB40> \xED\x5E |3
+<UFEB41> \xED\x5F |3
+<UFEB43> \xED\x6C |3
+<UFEB44> \xED\x81 |3
+<UFEB45> \xEC\x6C |3
+<UFEB46> \xEC\x6D |3
+<UFEB47> \xEC\x4F |3
+<UFEB48> \xEC\x5D |3
+<UFEB49> \xEC\x73 |3
+<UFEB4A> \xEC\x7A |3
+<UFEB4B> \xEC\xA7 |3
+<UFEB4C> \xEC\xA9 |3
+<UFEB4D> \xEC\xAA |3
+<UFEB4E> \xEC\xAB |3
+<UFEB4F> \xEB\xC1 |3
+<UFEB50> \xEC\xD8 |3
+<UFEB51> \xEC\x58 |3
+<UFEB52> \xEC\x59 |3
+<UFEB53> \xEC\x6B |3
+<UFEB54> \xEC\x70 |3
+<UFEB56> \xEB\x4E |3
+<UFEB57> \xEB\xBE |3
+<UFEB58> \xEB\x52 |3
+<UFEB59> \xEB\x4D |3
+<UFEB5A> \xEC\xCD |3
+<UFEB5B> \xEC\xCE |3
+<UFEB5C> \xEB\xBF |3
+<UFEB5D> \xEB\xCD |3
+<UFEB5E> \xEB\xC2 |3
+<UFEB5F> \xEE\x60 |3
+<UFEB60> \xED\x7E |3
+<UFEB61> \xEB\x51 |3
+<UFEB62> \xEC\x5A |3
+<UFEB63> \xEC\x66 |3
+<UFEB64> \xEC\x67 |3
+<UFEB65> \xEC\x56 |3
+<UFEB66> \xEC\x57 |3
+<UFEB68> \xEB\x63 |3
+<UFEB6A> \xEB\x40 |3
+<UFEB6B> \xEC\x64 |3
+<UFEB6C> \xEC\x65 |3
+<UFEB6D> \xEC\x4D |3
+<UFEB6E> \xEC\x4E |3
+<UFEB6F> \xEC\x50 |3
+<UFEB70> \xEC\x51 |3
+<UFEB71> \xEC\x54 |3
+<UFEB72> \xEC\x55 |3
+<UFEB73> \xEC\x62 |3
+<UFEB74> \xEC\x63 |3
+<UFEB75> \xEC\x52 |3
+<UFEB76> \xEC\x53 |3
+<UFEB77> \xEB\x44 |3
+<UFEB78> \xEC\x76 |3
+<UFEB79> \xEC\x77 |3
+<UFEB7A> \xEB\xC9 |3
+<UFEB7B> \xEB\xCB |3
+<UFEB7C> \xEC\xD4 |3
+<UFEB7D> \xEC\xD5 |3
+<UFEB7E> \xEC\xD6 |3
+<UFEB7F> \xEC\xD7 |3
+<UFEB80> \xEE\x59 |3
+<UFEB81> \xED\x5B |3
+<UFEB82> \xEB\xF2 |3
+<UFEB83> \xEC\x79 |3
+<UFEB84> \xEC\xC8 |3
+<UFEB85> \xEB\xF1 |3
+<UFEB86> \xEB\xF5 |3
+<UFEB88> \xEC\x78 |3
+<UFEB89> \xEC\xD2 |3
+<UFEB8A> \xEC\xD3 |3
+<UFEB8B> \xEC\xD9 |3
+<UFEB8C> \xEC\xDB |3
+<UFEB8D> \xEC\xDC |3
+<UFEB8E> \xEC\xDD |3
+<UFEB8F> \xEC\xDE |3
+<UFEB90> \xEC\xE3 |3
+<UFEB91> \xEC\xE4 |3
+<UFEB92> \xEE\x75 |3
+<UFEB93> \xEE\x88 |3
+<UFEB94> \xEC\xC3 |3
+<UFEB95> \xEC\xC4 |3
+<UFEB96> \xEB\xCC |3
+<UFEB97> \xEB\xD2 |3
+<UFEB98> \xEB\xCF |3
+<UFEB99> \xED\x60 |3
+<UFEB9A> \xED\x61 |3
+<UFEB9B> \xEB\xD8 |3
+<UFEB9C> \xEB\xD9 |3
+<UFEB9D> \xED\xAA |3
+<UFEB9E> \xED\xA7 |3
+<UFEB9F> \xED\xA8 |3
+<UFEBA0> \xED\xA9 |3
+<UFEE40> \xEC\x94 |3
+<UFEE41> \xEC\xCF |3
+<UFEE42> \xED\x70 |3
+<UFEE43> \xEE\x78 |3
+<UFEE44> \xEE\x86 |3
+<UFEE45> \xEE\x8E |3
+<UFEE46> \xEE\x8F |3
+<UFEE47> \xEE\x90 |3
+<UFEE48> \xEE\x91 |3
+<UFEE49> \xEE\x92 |3
+<UFEE4A> \xEE\x93 |3
+# Mappings for Unicode Standard Emoji symbols.
+<U0023>+<U20E3> \xF4\x89 |4
+<U0023>+<UFE0E>+<U20E3> \xF4\x89 |4
+<U0023>+<UFE0F>+<U20E3> \xF4\x89 |0
+<U0030>+<U20E3> \xF7\xC9 |4
+<U0030>+<UFE0E>+<U20E3> \xF7\xC9 |4
+<U0030>+<UFE0F>+<U20E3> \xF7\xC9 |0
+<U0031>+<U20E3> \xF6\xFB |4
+<U0031>+<UFE0E>+<U20E3> \xF6\xFB |4
+<U0031>+<UFE0F>+<U20E3> \xF6\xFB |0
+<U0032>+<U20E3> \xF6\xFC |4
+<U0032>+<UFE0E>+<U20E3> \xF6\xFC |4
+<U0032>+<UFE0F>+<U20E3> \xF6\xFC |0
+<U0033>+<U20E3> \xF7\x40 |4
+<U0033>+<UFE0E>+<U20E3> \xF7\x40 |4
+<U0033>+<UFE0F>+<U20E3> \xF7\x40 |0
+<U0034>+<U20E3> \xF7\x41 |4
+<U0034>+<UFE0E>+<U20E3> \xF7\x41 |4
+<U0034>+<UFE0F>+<U20E3> \xF7\x41 |0
+<U0035>+<U20E3> \xF7\x42 |4
+<U0035>+<UFE0E>+<U20E3> \xF7\x42 |4
+<U0035>+<UFE0F>+<U20E3> \xF7\x42 |0
+<U0036>+<U20E3> \xF7\x43 |4
+<U0036>+<UFE0E>+<U20E3> \xF7\x43 |4
+<U0036>+<UFE0F>+<U20E3> \xF7\x43 |0
+<U0037>+<U20E3> \xF7\x44 |4
+<U0037>+<UFE0E>+<U20E3> \xF7\x44 |4
+<U0037>+<UFE0F>+<U20E3> \xF7\x44 |0
+<U0038>+<U20E3> \xF7\x45 |4
+<U0038>+<UFE0E>+<U20E3> \xF7\x45 |4
+<U0038>+<UFE0F>+<U20E3> \xF7\x45 |0
+<U0039>+<U20E3> \xF7\x46 |4
+<U0039>+<UFE0E>+<U20E3> \xF7\x46 |4
+<U0039>+<UFE0F>+<U20E3> \xF7\x46 |0
+<U00A9> \xF7\x74 |0
+<U00AE> \xF7\x75 |0
+<U2002> \xF7\xAA |0
+<U2003> \xF7\xA9 |0
+<U2005> \xF7\xAB |0
+<U203C> \xF3\xF1 |0
+<U2049> \xF3\xF0 |0
+<U2122> \xF7\x6A |0
+<U2139> \xF7\x4F |0
+<U2194> \xF4\x7E |0
+<U2195> \xF4\x80 |0
+<U2196> \xF7\x68 |0
+<U2197> \xF7\x71 |0
+<U2198> \xF7\x69 |0
+<U2199> \xF7\x72 |0
+<U21A9> \xF7\x79 |0
+<U21AA> \xF7\x78 |0
+<U231A> \xF7\x97 |0
+<U231B> \xF7\x98 |0
+<U23E9> \xF7\x4C |0
+<U23EA> \xF7\x4B |0
+<U23EB> \xF7\x61 |0
+<U23EC> \xF7\x60 |0
+<U23F0> \xF7\xB1 |0
+<U23F3> \xF6\x54 |0
+<U24C2> \xF7\xEC |1
+<U25AA> \xF7\x4E |0
+<U25AB> \xF7\x4D |0
+<U25B6> \xF7\x4A |0
+<U25C0> \xF7\x49 |0
+<U25FB> \xF7\x54 |0
+<U25FC> \xF7\x55 |0
+<U25FD> \xF7\x50 |0
+<U25FE> \xF7\x51 |0
+<U2600> \xF6\x60 |0
+<U2601> \xF6\x65 |0
+<U260E> \xF7\xB3 |0
+<U2611> \xF7\xD9 |0
+<U2614> \xF6\x64 |0
+<U2615> \xF7\xB4 |0
+<U261D> \xF6\xCF |0
+<U263A> \xF6\xD4 |0
+<U2648> \xF6\x67 |0
+<U2649> \xF6\x68 |0
+<U264A> \xF6\x69 |0
+<U264B> \xF6\x6A |0
+<U264C> \xF6\x6B |0
+<U264D> \xF6\x6C |0
+<U264E> \xF6\x6D |0
+<U264F> \xF6\x6E |0
+<U2650> \xF6\x6F |0
+<U2651> \xF6\x70 |0
+<U2652> \xF6\x71 |0
+<U2653> \xF6\x72 |0
+<U2660> \xF7\xBE |0
+<U2663> \xF7\xC0 |0
+<U2665> \xF3\x78 |0
+<U2666> \xF7\xBF |0
+<U2668> \xF6\x95 |0
+<U267B> \xF4\x7D |0
+<U267F> \xF6\x57 |0
+<U2693> \xF6\x82 |0
+<U26A0> \xF6\x59 |0
+<U26A1> \xF6\x5F |0
+<U26AA> \xF7\x56 |0
+<U26AB> \xF7\x57 |0
+<U26BD> \xF6\x8F |0
+<U26BE> \xF6\x93 |0
+<U26C4> \xF6\x5D |0
+<U26C5> \xF6\x66 |0
+<U26CE> \xF6\x73 |0
+<U26D4> \xF6\x5C |0
+<U26EA> \xF7\xEB |0
+<U26F2> \xF3\x42 |0
+<U26F3> \xF7\xB6 |0
+<U26F5> \xF6\x8D |0
+<U26FA> \xF3\x43 |0
+<U26FD> \xF7\x8E |0
+<U2702> \xF6\xEF |0
+<U2705> \xF7\x7A |0
+<U2708> \xF6\x8C |0
+<U2709> \xF6\xFA |0
+<U270A> \xF4\x88 |0
+<U270B> \xF7\xC4 |0
+<U270C> \xF7\xC3 |0
+<U270F> \xF6\x79 |0
+<U2712> \xF7\xDA |0
+<U2714> \xF7\x73 |0
+<U2716> \xF7\x6B |0
+<U2728> \xF3\x7E |0
+<U2733> \xF7\x5A |0
+<U2734> \xF6\x51 |0
+<U2744> \xF6\x62 |0
+<U2747> \xF6\x44 |0
+<U274C> \xF7\x6C |0
+<U274E> \xF7\x6D |0
+<U2753> \xF6\x5B |0
+<U2754> \xF6\x5B |1
+<U2755> \xF6\x5A |1
+<U2757> \xF6\x5A |0
+<U2764> \xF7\xB2 |0
+<U2795> \xF7\x58 |0
+<U2796> \xF7\x59 |0
+<U2797> \xF7\x70 |0
+<U27A1> \xF7\x6E |0
+<U27B0> \xF3\xF2 |0
+<U2934> \xF3\xEE |0
+<U2935> \xF3\xEF |0
+<U2B05> \xF7\x6F |0
+<U2B06> \xF7\x5B |0
+<U2B07> \xF7\x5C |0
+<U2B1B> \xF7\x65 |0
+<U2B1C> \xF7\x64 |0
+<U2B50> \xF6\x63 |0
+<U2B55> \xF3\x81 |0
+<U3297> \xF3\x6C |0
+<U3299> \xF6\xCA |0
+<U1F004> \xF3\x44 |0
+<U1F0CF> \xF4\x73 |0
+<U1F170> \xF3\xE7 |0
+<U1F171> \xF3\xE8 |0
+<U1F17E> \xF3\xE9 |0
+<U1F17F> \xF6\x7E |0
+<U1F18E> \xF3\xEA |0
+<U1F191> \xF7\xC8 |0
+<U1F192> \xF3\x58 |0
+<U1F193> \xF7\x95 |0
+<U1F194> \xF3\x5B |0
+<U1F195> \xF7\xE5 |0
+<U1F197> \xF7\xCA |0
+<U1F198> \xF6\xC1 |0
+<U1F199> \xF6\xE8 |0
+<U1F19A> \xF3\x45 |0
+<U1F1E8>+<U1F1F3> \xF3\xD2 |0
+<U1F1E9>+<U1F1EA> \xF3\xCF |0
+<U1F1EA>+<U1F1F8> \xF3\x48 |0
+<U1F1EB>+<U1F1F7> \xF3\xCE |0
+<U1F1EC>+<U1F1E7> \xF3\xD1 |0
+<U1F1EE>+<U1F1F9> \xF3\xD0 |0
+<U1F1EF>+<U1F1F5> \xF6\xA5 |0
+<U1F1F0>+<U1F1F7> \xF3\xD3 |0
+<U1F1F7>+<U1F1FA> \xF3\x49 |0
+<U1F1FA>+<U1F1F8> \xF7\x90 |0
+<U1F202> \xF3\x5A |0
+<U1F22F> \xF3\x5E |0
+<U1F233> \xF3\x5D |0
+<U1F235> \xF3\x5C |0
+<U1F239> \xF3\x59 |0
+<U1F23A> \xF3\x5F |0
+<U1F250> \xF6\xD0 |0
+<U1F251> \xF7\xD8 |0
+<U1F300> \xF6\x41 |0
+<U1F301> \xF7\xB5 |0
+<U1F302> \xF3\xBC |0
+<U1F303> \xF3\xC5 |0
+<U1F304> \xF3\xC8 |1
+<U1F305> \xF3\xC8 |0
+<U1F306> \xF3\x4D |0
+<U1F307> \xF3\x4D |1
+<U1F308> \xF3\xC6 |0
+<U1F309> \xF6\x98 |0
+<U1F30A> \xF4\x81 |0
+<U1F30B> \xF4\x57 |0
+<U1F30C> \xF4\x63 |0
+<U1F30F> \xF7\xD0 |0
+<U1F311> \xF7\xC5 |0
+<U1F313> \xF7\xC7 |0
+<U1F314> \xF7\xC6 |0
+<U1F319> \xF6\x5E |0
+<U1F31B> \xF6\x61 |0
+<U1F31F> \xF6\x63 |1
+<U1F320> \xF6\x40 |0
+<U1F330> \xF3\xF9 |0
+<U1F331> \xF4\x82 |0
+<U1F334> \xF6\xBB |0
+<U1F335> \xF3\x69 |0
+<U1F337> \xF6\xBD |0
+<U1F338> \xF6\xA3 |0
+<U1F339> \xF7\xEA |0
+<U1F33A> \xF3\x67 |0
+<U1F33B> \xF6\xBC |0
+<U1F33C> \xF4\x4D |0
+<U1F33D> \xF3\xF7 |0
+<U1F33F> \xF4\x87 |0
+<U1F340> \xF6\xEC |0
+<U1F341> \xF6\xA7 |0
+<U1F342> \xF3\x40 |0
+<U1F343> \xF3\x40 |1
+<U1F344> \xF3\xF8 |0
+<U1F345> \xF3\x8F |0
+<U1F346> \xF3\x90 |0
+<U1F347> \xF3\xF5 |0
+<U1F348> \xF3\xF3 |0
+<U1F349> \xF6\xA6 |0
+<U1F34A> \xF3\x8E |0
+<U1F34C> \xF3\xF6 |0
+<U1F34D> \xF3\xF4 |0
+<U1F34E> \xF3\x8D |0
+<U1F34F> \xF4\x5E |0
+<U1F351> \xF3\xFA |0
+<U1F352> \xF6\xAB |0
+<U1F353> \xF6\xAD |0
+<U1F354> \xF6\xAF |0
+<U1F355> \xF3\xFC |0
+<U1F356> \xF6\x9D |0
+<U1F357> \xF4\x40 |0
+<U1F358> \xF3\x87 |0
+<U1F359> \xF6\xAE |0
+<U1F35A> \xF3\x88 |0
+<U1F35B> \xF3\x8A |0
+<U1F35C> \xF7\xD1 |0
+<U1F35D> \xF3\x89 |0
+<U1F35E> \xF3\x83 |0
+<U1F35F> \xF3\x85 |0
+<U1F360> \xF3\xFB |0
+<U1F361> \xF3\x86 |0
+<U1F362> \xF3\x8B |0
+<U1F363> \xF3\x8C |0
+<U1F364> \xF4\x74 |0
+<U1F365> \xF6\xC6 |0
+<U1F366> \xF3\x84 |0
+<U1F367> \xF3\xBE |0
+<U1F368> \xF4\x4E |0
+<U1F369> \xF4\x4F |0
+<U1F36A> \xF4\x50 |0
+<U1F36B> \xF4\x51 |0
+<U1F36C> \xF4\x52 |0
+<U1F36D> \xF4\x53 |0
+<U1F36E> \xF4\x5A |0
+<U1F36F> \xF4\x5D |0
+<U1F370> \xF6\xA9 |0
+<U1F371> \xF3\x91 |0
+<U1F372> \xF3\x92 |0
+<U1F373> \xF6\xAA |0
+<U1F374> \xF6\x85 |0
+<U1F375> \xF3\x82 |0
+<U1F376> \xF3\x6A |0
+<U1F377> \xF6\x9A |0
+<U1F378> \xF6\x9B |0
+<U1F379> \xF4\x42 |0
+<U1F37A> \xF6\x9C |0
+<U1F37B> \xF3\x6B |0
+<U1F380> \xF7\xBC |0
+<U1F381> \xF6\xA8 |0
+<U1F382> \xF7\xBD |0
+<U1F383> \xF3\xC2 |0
+<U1F384> \xF6\xA2 |0
+<U1F385> \xF3\xC4 |0
+<U1F386> \xF7\xFC |0
+<U1F387> \xF3\xBF |0
+<U1F388> \xF3\x6E |0
+<U1F389> \xF3\x6F |0
+<U1F38A> \xF6\x47 |0
+<U1F38B> \xF4\x41 |0
+<U1F38C> \xF3\x4C |0
+<U1F38D> \xF3\xB7 |0
+<U1F38E> \xF3\xB8 |0
+<U1F38F> \xF3\xBB |0
+<U1F390> \xF3\xC1 |0
+<U1F391> \xF3\xC3 |0
+<U1F392> \xF3\xBA |0
+<U1F393> \xF3\xB9 |0
+<U1F3A1> \xF6\x45 |0
+<U1F3A2> \xF3\xB6 |0
+<U1F3A3> \xF4\x46 |0
+<U1F3A4> \xF6\xDC |0
+<U1F3A5> \xF6\xF0 |0
+<U1F3A6> \xF6\xF0 |1
+<U1F3A7> \xF6\xE1 |0
+<U1F3A8> \xF7\xB9 |0
+<U1F3A9> \xF3\xC9 |0
+<U1F3AA> \xF7\xBB |0
+<U1F3AB> \xF6\x76 |0
+<U1F3AC> \xF6\x97 |0
+<U1F3AD> \xF7\xBA |0
+<U1F3AE> \xF6\x9F |0
+<U1F3AF> \xF6\x9E |0
+<U1F3B0> \xF6\x46 |0
+<U1F3B1> \xF3\xB1 |0
+<U1F3B2> \xF6\xA1 |0
+<U1F3B3> \xF4\x47 |0
+<U1F3B4> \xF4\x72 |0
+<U1F3B5> \xF7\xEE |0
+<U1F3B6> \xF6\xDE |0
+<U1F3B8> \xF6\xDF |0
+<U1F3B9> \xF4\x44 |0
+<U1F3BA> \xF3\xB0 |0
+<U1F3BB> \xF6\xE0 |0
+<U1F3BC> \xF3\xA0 |0
+<U1F3BE> \xF6\x90 |0
+<U1F3BF> \xF3\x80 |0
+<U1F3C0> \xF7\xB7 |0
+<U1F3C1> \xF6\x92 |0
+<U1F3C2> \xF6\x91 |0
+<U1F3C3> \xF6\x43 |0
+<U1F3C4> \xF4\x45 |0
+<U1F3C6> \xF3\x46 |0
+<U1F3C8> \xF6\x94 |0
+<U1F3CA> \xF3\xB2 |0
+<U1F3E0> \xF6\x84 |0
+<U1F3E1> \xF7\xE0 |0
+<U1F3E2> \xF6\x86 |0
+<U1F3E3> \xF3\x51 |0
+<U1F3E5> \xF3\x52 |0
+<U1F3E6> \xF6\x83 |0
+<U1F3E7> \xF6\x7B |0
+<U1F3E8> \xF3\x54 |0
+<U1F3E9> \xF3\xC7 |0
+<U1F3EA> \xF6\x7C |0
+<U1F3EB> \xF3\x53 |0
+<U1F3EC> \xF3\xCA |0
+<U1F3ED> \xF3\xCD |0
+<U1F3EE> \xF6\x96 |0
+<U1F3EF> \xF3\xCB |0
+<U1F3F0> \xF3\xCC |0
+<U1F40C> \xF4\x83 |0
+<U1F40D> \xF3\xE3 |0
+<U1F40E> \xF6\xB1 |1
+<U1F411> \xF6\x67 |1
+<U1F412> \xF6\xB2 |1
+<U1F414> \xF3\xE4 |0
+<U1F417> \xF3\xE5 |0
+<U1F418> \xF3\xE0 |0
+<U1F419> \xF7\xF7 |0
+<U1F41A> \xF3\xC0 |0
+<U1F41B> \xF3\xDF |0
+<U1F41C> \xF6\xB6 |0
+<U1F41D> \xF4\x5B |0
+<U1F41E> \xF4\x5C |0
+<U1F41F> \xF6\x72 |1
+<U1F420> \xF3\xDE |0
+<U1F421> \xF6\xAC |0
+<U1F422> \xF3\x47 |0
+<U1F423> \xF3\x4E |0
+<U1F424> \xF6\xB9 |0
+<U1F425> \xF4\x7A |0
+<U1F426> \xF6\xB9 |1
+<U1F427> \xF6\xB5 |0
+<U1F428> \xF3\xE1 |0
+<U1F429> \xF6\xB8 |0
+<U1F42B> \xF3\xE6 |0
+<U1F42C> \xF3\xDC |0
+<U1F42D> \xF7\xF2 |0
+<U1F42E> \xF3\xE2 |0
+<U1F42F> \xF7\xF0 |0
+<U1F430> \xF6\xB0 |0
+<U1F431> \xF6\xB4 |0
+<U1F432> \xF4\x43 |0
+<U1F433> \xF6\x48 |0
+<U1F434> \xF6\xB1 |0
+<U1F435> \xF6\xB2 |0
+<U1F436> \xF6\xBA |0
+<U1F437> \xF6\xB7 |0
+<U1F438> \xF6\xB3 |0
+<U1F43A> \xF6\xBA |1
+<U1F43B> \xF7\xF1 |0
+<U1F43C> \xF4\x4A |0
+<U1F43D> \xF4\x4C |0
+<U1F43E> \xF6\xC7 |0
+<U1F440> \xF7\xC1 |0
+<U1F442> \xF7\xC2 |0
+<U1F443> \xF3\xA4 |0
+<U1F444> \xF3\xA5 |0
+<U1F445> \xF4\x4B |0
+<U1F446> \xF3\x60 |0
+<U1F447> \xF3\x61 |0
+<U1F448> \xF6\xD8 |0
+<U1F449> \xF6\xD9 |0
+<U1F44A> \xF6\xCC |0
+<U1F44B> \xF3\xAA |0
+<U1F44C> \xF3\xA8 |0
+<U1F44D> \xF6\xD2 |0
+<U1F44E> \xF3\xA9 |0
+<U1F44F> \xF3\xA7 |0
+<U1F450> \xF3\xAA |1
+<U1F451> \xF7\xF9 |0
+<U1F452> \xF3\x71 |0
+<U1F453> \xF6\xD7 |0
+<U1F454> \xF3\x66 |0
+<U1F455> \xF7\xE6 |0
+<U1F456> \xF4\x7B |0
+<U1F457> \xF4\x6F |0
+<U1F458> \xF3\x76 |0
+<U1F459> \xF3\x77 |0
+<U1F45A> \xF6\xE6 |0
+<U1F45B> \xF6\xDD |0
+<U1F45C> \xF6\x74 |0
+<U1F45E> \xF7\xE7 |0
+<U1F45F> \xF3\xEC |0
+<U1F460> \xF6\xF3 |0
+<U1F461> \xF6\xF3 |1
+<U1F462> \xF3\x72 |0
+<U1F463> \xF3\xEB |0
+<U1F466> \xF6\xD5 |1
+<U1F467> \xF6\xD3 |1
+<U1F468> \xF6\xD5 |0
+<U1F469> \xF6\xD3 |0
+<U1F46A> \xF6\xDA |0
+<U1F46E> \xF3\x50 |0
+<U1F46F> \xF3\xAF |0
+<U1F470> \xF3\xBD |0
+<U1F471> \xF3\xD4 |0
+<U1F472> \xF3\xD5 |0
+<U1F473> \xF3\xD6 |0
+<U1F474> \xF3\xD7 |0
+<U1F475> \xF3\xD8 |0
+<U1F476> \xF3\xD9 |0
+<U1F477> \xF3\xDA |0
+<U1F478> \xF3\xDB |0
+<U1F479> \xF4\x48 |0
+<U1F47A> \xF4\x49 |0
+<U1F47B> \xF6\xA4 |0
+<U1F47C> \xF7\xEF |0
+<U1F47D> \xF6\xE7 |0
+<U1F47E> \xF6\xC5 |0
+<U1F47F> \xF6\xC8 |0
+<U1F480> \xF6\xD1 |0
+<U1F483> \xF3\xDD |0
+<U1F484> \xF6\xE2 |0
+<U1F485> \xF3\x73 |0
+<U1F486> \xF6\xE4 |0
+<U1F487> \xF3\x74 |0
+<U1F488> \xF3\x75 |0
+<U1F489> \xF6\xE9 |0
+<U1F48A> \xF3\x6D |0
+<U1F48B> \xF6\xC4 |0
+<U1F48C> \xF4\x7C |0
+<U1F48D> \xF6\xED |0
+<U1F48E> \xF6\xED |1
+<U1F48F> \xF7\xFA |0
+<U1F490> \xF3\x68 |0
+<U1F491> \xF3\xAE |0
+<U1F492> \xF7\xEB |1
+<U1F493> \xF4\x79 |0
+<U1F494> \xF6\x4F |0
+<U1F495> \xF6\x50 |0
+<U1F496> \xF3\x79 |0
+<U1F497> \xF4\x79 |1
+<U1F498> \xF6\xC3 |0
+<U1F499> \xF3\x7A |0
+<U1F49A> \xF3\x7B |0
+<U1F49B> \xF3\x7C |0
+<U1F49C> \xF3\x7D |0
+<U1F49D> \xF4\x58 |0
+<U1F49E> \xF7\xCC |0
+<U1F49F> \xF7\xB2 |1
+<U1F4A1> \xF6\x4E |0
+<U1F4A2> \xF6\xBE |0
+<U1F4A3> \xF6\x52 |0
+<U1F4A4> \xF6\x4D |0
+<U1F4A5> \xF7\xCD |0
+<U1F4A6> \xF7\xCE |0
+<U1F4A7> \xF6\xBF |0
+<U1F4A8> \xF6\xCD |0
+<U1F4A9> \xF6\xCE |0
+<U1F4AA> \xF6\xC2 |0
+<U1F4AB> \xF4\x60 |0
+<U1F4AC> \xF6\xD6 |0
+<U1F4AE> \xF6\xC9 |0
+<U1F4AF> \xF6\xCB |0
+<U1F4B0> \xF6\xA0 |0
+<U1F4B2> \xF7\x96 |0
+<U1F4B3> \xF7\x99 |0
+<U1F4B4> \xF7\x9A |0
+<U1F4B5> \xF7\xA2 |0
+<U1F4B8> \xF4\x5F |0
+<U1F4B9> \xF3\x4F |0
+<U1F4BB> \xF7\xE8 |0
+<U1F4BC> \xF3\x41 |0
+<U1F4BD> \xF7\x9F |0
+<U1F4BE> \xF7\x7E |0
+<U1F4BF> \xF6\xE5 |0
+<U1F4C0> \xF6\xE5 |1
+<U1F4C1> \xF7\xAC |0
+<U1F4C2> \xF7\xAD |0
+<U1F4C3> \xF7\x7D |0
+<U1F4C4> \xF7\x86 |0
+<U1F4C5> \xF7\x80 |0
+<U1F4C6> \xF7\x87 |0
+<U1F4C7> \xF7\x89 |0
+<U1F4C8> \xF7\x92 |0
+<U1F4C9> \xF7\x93 |0
+<U1F4CA> \xF7\x91 |0
+<U1F4CB> \xF7\x81 |0
+<U1F4CC> \xF7\x8A |0
+<U1F4CD> \xF7\x7C |0
+<U1F4CE> \xF6\x78 |0
+<U1F4CF> \xF7\x8D |0
+<U1F4D0> \xF6\x7A |0
+<U1F4D1> \xF7\xE2 |0
+<U1F4D2> \xF7\x8B |0
+<U1F4D3> \xF7\x88 |0
+<U1F4D4> \xF6\x75 |0
+<U1F4D5> \xF7\x85 |0
+<U1F4D6> \xF6\x77 |0
+<U1F4D7> \xF7\x82 |0
+<U1F4D8> \xF7\x83 |0
+<U1F4D9> \xF7\x84 |0
+<U1F4DA> \xF7\x8C |0
+<U1F4DB> \xF6\xF6 |0
+<U1F4DC> \xF7\x7B |0
+<U1F4DD> \xF3\x65 |0
+<U1F4DE> \xF6\xF7 |0
+<U1F4DF> \xF7\xB8 |0
+<U1F4E0> \xF6\xF9 |0
+<U1F4E1> \xF6\x81 |0
+<U1F4E2> \xF6\xEA |1
+<U1F4E3> \xF6\xEA |1
+<U1F4E4> \xF7\xAF |0
+<U1F4E5> \xF7\xB0 |0
+<U1F4E6> \xF6\xF8 |0
+<U1F4E7> \xF4\x75 |0
+<U1F4E8> \xF7\xAE |0
+<U1F4E9> \xF4\x66 |0
+<U1F4EA> \xF6\xF4 |0
+<U1F4EB> \xF7\xE1 |0
+<U1F4EE> \xF6\xF4 |1
+<U1F4F0> \xF7\xA8 |0
+<U1F4F1> \xF7\xA5 |0
+<U1F4F2> \xF7\xDF |0
+<U1F4F3> \xF3\x63 |0
+<U1F4F4> \xF3\x64 |0
+<U1F4F6> \xF3\x57 |0
+<U1F4F7> \xF6\xEE |0
+<U1F4F9> \xF7\x9B |0
+<U1F4FA> \xF6\xDB |0
+<U1F4FB> \xF7\xE9 |0
+<U1F4FC> \xF7\x9D |0
+<U1F503> \xF7\xE4 |0
+<U1F50A> \xF6\xEA |0
+<U1F50B> \xF7\xA1 |0
+<U1F50C> \xF7\xA6 |0
+<U1F50D> \xF6\xF1 |0
+<U1F50E> \xF7\xDC |0
+<U1F50F> \xF7\xE3 |0
+<U1F510> \xF7\xD3 |0
+<U1F511> \xF6\xF2 |0
+<U1F512> \xF6\xF5 |0
+<U1F513> \xF6\xF5 |1
+<U1F514> \xF6\xEB |0
+<U1F516> \xF7\xDE |0
+<U1F517> \xF7\xA7 |0
+<U1F518> \xF7\xDB |0
+<U1F519> \xF7\xDD |0
+<U1F51E> \xF3\x56 |0
+<U1F51F> \xF7\x47 |0
+<U1F520> \xF7\xD4 |0
+<U1F521> \xF7\xD5 |0
+<U1F522> \xF7\xD6 |0
+<U1F523> \xF7\xD7 |0
+<U1F524> \xF4\x59 |0
+<U1F525> \xF6\x53 |0
+<U1F526> \xF7\xA0 |0
+<U1F527> \xF7\xA4 |0
+<U1F528> \xF7\xFB |0
+<U1F529> \xF7\x9E |0
+<U1F52A> \xF7\x9C |0
+<U1F52B> \xF6\xE3 |0
+<U1F52E> \xF3\x62 |0
+<U1F52F> \xF3\x62 |1
+<U1F530> \xF6\x58 |0
+<U1F531> \xF7\xF9 |1
+<U1F532> \xF7\x67 |1
+<U1F533> \xF7\x67 |1
+<U1F534> \xF7\x66 |0
+<U1F535> \xF7\x67 |0
+<U1F536> \xF7\x62 |0
+<U1F537> \xF7\x63 |0
+<U1F538> \xF7\x52 |0
+<U1F539> \xF7\x53 |0
+<U1F53A> \xF7\x76 |0
+<U1F53B> \xF7\x77 |0
+<U1F53C> \xF7\x5F |0
+<U1F53D> \xF7\x5E |0
+<U1F550> \xF7\xB1 |1
+<U1F551> \xF7\xB1 |1
+<U1F552> \xF7\xB1 |1
+<U1F553> \xF7\xB1 |1
+<U1F554> \xF7\xB1 |1
+<U1F555> \xF7\xB1 |1
+<U1F556> \xF7\xB1 |1
+<U1F557> \xF7\xB1 |1
+<U1F558> \xF7\xB1 |1
+<U1F559> \xF7\xB1 |1
+<U1F55A> \xF7\xB1 |1
+<U1F55B> \xF7\xB1 |1
+<U1F5FB> \xF7\xED |0
+<U1F5FC> \xF6\x99 |0
+<U1F5FE> \xF7\x8F |0
+<U1F5FF> \xF4\x70 |0
+<U1F601> \xF4\x85 |0
+<U1F602> \xF4\x68 |0
+<U1F603> \xF6\x49 |0
+<U1F604> \xF6\x49 |1
+<U1F605> \xF6\x49+\xF7\xCE |1
+<U1F606> \xF3\x99 |1
+<U1F609> \xF7\xF3 |0
+<U1F60A> \xF3\xA1 |0
+<U1F60B> \xF3\xA1 |1
+<U1F60C> \xF3\x99 |0
+<U1F60D> \xF7\xF4 |0
+<U1F60F> \xF3\x93 |0
+<U1F612> \xF3\x9D |0
+<U1F613> \xF7\xF6 |0
+<U1F614> \xF3\x94 |0
+<U1F616> \xF3\x97 |0
+<U1F618> \xF3\xA3 |0
+<U1F61A> \xF3\xA2 |0
+<U1F61C> \xF6\xC0 |0
+<U1F61D> \xF6\xC0 |1
+<U1F61E> \xF3\x94 |1
+<U1F620> \xF6\x4A |0
+<U1F621> \xF4\x61 |0
+<U1F622> \xF4\x6D |0
+<U1F623> \xF3\x96 |0
+<U1F624> \xF3\x95 |0
+<U1F625> \xF7\xF6 |1
+<U1F628> \xF3\x9A |0
+<U1F629> \xF4\x6B |0
+<U1F62A> \xF3\x98 |0
+<U1F62B> \xF6\x4C |0
+<U1F62D> \xF6\x4B |0
+<U1F630> \xF3\x9F |0
+<U1F631> \xF7\xF5 |0
+<U1F632> \xF3\x9E |0
+<U1F633> \xF3\x9C |0
+<U1F635> \xF7\xCB |0
+<U1F637> \xF3\x9B |0
+<U1F638> \xF4\x84 |0
+<U1F639> \xF4\x67 |0
+<U1F63A> \xF4\x65 |0
+<U1F63B> \xF4\x69 |0
+<U1F63C> \xF4\x6E |0
+<U1F63D> \xF4\x64 |0
+<U1F63E> \xF4\x62 |0
+<U1F63F> \xF4\x6C |0
+<U1F640> \xF4\x6A |0
+<U1F645> \xF3\xAB |0
+<U1F646> \xF3\xAC |0
+<U1F647> \xF3\xAD |0
+<U1F648> \xF4\x54 |0
+<U1F649> \xF4\x56 |0
+<U1F64A> \xF4\x55 |0
+<U1F64B> \xF4\x8A |0
+<U1F64C> \xF4\x8B |0
+<U1F64D> \xF4\x8C |0
+<U1F64E> \xF4\x8D |0
+<U1F64F> \xF3\xA6 |0
+<U1F680> \xF7\xF8 |0
+<U1F683> \xF6\x8E |0
+<U1F684> \xF6\x89 |1
+<U1F685> \xF6\x89 |0
+<U1F687> \xF7\xEC |0
+<U1F689> \xF4\x71 |0
+<U1F68C> \xF6\x88 |0
+<U1F68F> \xF6\x80 |0
+<U1F691> \xF3\xB4 |0
+<U1F692> \xF3\xB3 |0
+<U1F693> \xF3\xB5 |0
+<U1F695> \xF6\x8A |1
+<U1F697> \xF6\x8A |0
+<U1F699> \xF6\x8A |1
+<U1F69A> \xF6\x8B |0
+<U1F6A2> \xF3\x55 |0
+<U1F6A4> \xF6\x8D |1
+<U1F6A5> \xF6\x42 |0
+<U1F6A7> \xF3\x4A |0
+<U1F6A8> \xF4\x77 |0
+<U1F6A9> \xF3\xED |0
+<U1F6AB> \xF7\x5D |0
+<U1F6AC> \xF6\x55 |0
+<U1F6AD> \xF6\x56 |0
+<U1F6B2> \xF6\x87 |0
+<U1F6B6> \xF4\x76 |0
+<U1F6BB> \xF6\x7D |0
+<U1F6BC> \xF3\xD9 |1
+<U1F6BD> \xF6\x7D |1
+<U1F6BE> \xF6\x7D |1
+<U1F6C0> \xF3\x4B |0
+<UFE1E3> \xF6\x6A |1
+<UFE337> \xF3\xA1 |1
+<UFE82D> \xF7\x48 |0
+<UFE83C> \xF7\xA3 |0
+<UFEB89> \xF7\xD2 |0
+<UFEE1C> \xF6\xF0 |1
+<UFEE33> \xF7\xD9 |1
+<UFEE40> \xF7\x94 |0
+<UFEE41> \xF7\xCF |0
+<UFEE42> \xF3\x70 |0
+<UFEE43> \xF4\x78 |0
+<UFEE44> \xF4\x86 |0
+<UFEE45> \xF4\x8E |0
+<UFEE46> \xF4\x8F |0
+<UFEE47> \xF4\x90 |0
+<UFEE48> \xF4\x91 |0
+<UFEE49> \xF4\x92 |0
+<UFEE4A> \xF4\x93 |0
+# Fallbacks for Google PUA code points, for Unicode Standard Emoji symbols.
+<UFE000> \xF6\x60 |1
+<UFE001> \xF6\x65 |1
+<UFE002> \xF6\x64 |1
+<UFE003> \xF6\x5D |1
+<UFE004> \xF6\x5F |1
+<UFE005> \xF6\x41 |1
+<UFE006> \xF7\xB5 |1
+<UFE007> \xF3\xBC |1
+<UFE008> \xF3\xC5 |1
+<UFE009> \xF3\xC8 |1
+<UFE00A> \xF3\xC8 |1
+<UFE00B> \xF3\x4D |1
+<UFE00C> \xF3\x4D |1
+<UFE00D> \xF3\xC6 |1
+<UFE00E> \xF6\x62 |1
+<UFE00F> \xF6\x66 |1
+<UFE010> \xF6\x98 |1
+<UFE011> \xF7\xC5 |1
+<UFE012> \xF7\xC6 |1
+<UFE013> \xF7\xC7 |1
+<UFE014> \xF6\x5E |1
+<UFE016> \xF6\x61 |1
+<UFE017> \xF3\xC3 |1
+<UFE01B> \xF6\x54 |1
+<UFE01C> \xF7\x98 |1
+<UFE01D> \xF7\x97 |1
<UFE01E> \xF7\xB1 |1
<UFE01F> \xF7\xB1 |1
<UFE020> \xF7\xB1 |1
@@ -7703,1295 +9058,655 @@
<UFE027> \xF7\xB1 |1
<UFE028> \xF7\xB1 |1
<UFE029> \xF7\xB1 |1
-<UFE02A> \xF7\xB1 |0
-<UFE02A> \xEC\xB1 |3
-<UFE02B> \xF6\x67 |0
-<UFE02B> \xEB\x67 |3
-<UFE02C> \xF6\x68 |0
-<UFE02C> \xEB\x68 |3
-<UFE02D> \xF6\x69 |0
-<UFE02D> \xEB\x69 |3
-<UFE02E> \xF6\x6A |0
-<UFE02E> \xEB\x6A |3
-<UFE02F> \xF6\x6B |0
-<UFE02F> \xEB\x6B |3
-<UFE030> \xF6\x6C |0
-<UFE030> \xEB\x6C |3
-<UFE031> \xF6\x6D |0
-<UFE031> \xEB\x6D |3
-<UFE032> \xF6\x6E |0
-<UFE032> \xEB\x6E |3
-<UFE033> \xF6\x6F |0
-<UFE033> \xEB\x6F |3
-<UFE034> \xF6\x70 |0
-<UFE034> \xEB\x70 |3
-<UFE035> \xF6\x71 |0
-<UFE035> \xEB\x71 |3
-<UFE036> \xF6\x72 |0
-<UFE036> \xEB\x72 |3
-<UFE037> \xF6\x73 |0
-<UFE037> \xEB\x73 |3
-<UFE038> \xF4\x81 |0
-<UFE038> \xEE\x81 |3
-<UFE039> \xF7\xD0 |0
-<UFE039> \xEC\xD0 |3
-<UFE03A> \xF4\x57 |0
-<UFE03A> \xEE\x57 |3
-<UFE03B> \xF4\x63 |0
-<UFE03B> \xEE\x63 |3
-<UFE03C> \xF6\xEC |0
-<UFE03C> \xEB\xEC |3
-<UFE03D> \xF6\xBD |0
-<UFE03D> \xEB\xBD |3
-<UFE03E> \xF4\x82 |0
-<UFE03E> \xEE\x82 |3
-<UFE03F> \xF6\xA7 |0
-<UFE03F> \xEB\xA7 |3
-<UFE040> \xF6\xA3 |0
-<UFE040> \xEB\xA3 |3
-<UFE041> \xF7\xEA |0
-<UFE041> \xEC\xEA |3
-<UFE042> \xF3\x40 |0
-<UFE042> \xED\x40 |3
+<UFE02A> \xF7\xB1 |1
+<UFE02B> \xF6\x67 |1
+<UFE02C> \xF6\x68 |1
+<UFE02D> \xF6\x69 |1
+<UFE02E> \xF6\x6A |1
+<UFE02F> \xF6\x6B |1
+<UFE030> \xF6\x6C |1
+<UFE031> \xF6\x6D |1
+<UFE032> \xF6\x6E |1
+<UFE033> \xF6\x6F |1
+<UFE034> \xF6\x70 |1
+<UFE035> \xF6\x71 |1
+<UFE036> \xF6\x72 |1
+<UFE037> \xF6\x73 |1
+<UFE038> \xF4\x81 |1
+<UFE039> \xF7\xD0 |1
+<UFE03A> \xF4\x57 |1
+<UFE03B> \xF4\x63 |1
+<UFE03C> \xF6\xEC |1
+<UFE03D> \xF6\xBD |1
+<UFE03E> \xF4\x82 |1
+<UFE03F> \xF6\xA7 |1
+<UFE040> \xF6\xA3 |1
+<UFE041> \xF7\xEA |1
+<UFE042> \xF3\x40 |1
<UFE043> \xF3\x40 |1
-<UFE044> \xF6\x58 |0
-<UFE044> \xEB\x58 |3
-<UFE045> \xF3\x67 |0
-<UFE045> \xED\x67 |3
-<UFE046> \xF6\xBC |0
-<UFE046> \xEB\xBC |3
-<UFE047> \xF6\xBB |0
-<UFE047> \xEB\xBB |3
-<UFE048> \xF3\x69 |0
-<UFE048> \xED\x69 |3
-<UFE04A> \xF3\xF7 |0
-<UFE04A> \xED\xF7 |3
-<UFE04B> \xF3\xF8 |0
-<UFE04B> \xED\xF8 |3
-<UFE04C> \xF3\xF9 |0
-<UFE04C> \xED\xF9 |3
-<UFE04D> \xF4\x4D |0
-<UFE04D> \xEE\x4D |3
-<UFE04E> \xF4\x87 |0
-<UFE04E> \xEE\x87 |3
-<UFE04F> \xF6\xAB |0
-<UFE04F> \xEB\xAB |3
-<UFE050> \xF3\xF6 |0
-<UFE050> \xED\xF6 |3
-<UFE051> \xF3\x8D |0
-<UFE051> \xED\x8D |3
-<UFE052> \xF3\x8E |0
-<UFE052> \xED\x8E |3
-<UFE053> \xF6\xAD |0
-<UFE053> \xEB\xAD |3
-<UFE054> \xF6\xA6 |0
-<UFE054> \xEB\xA6 |3
-<UFE055> \xF3\x8F |0
-<UFE055> \xED\x8F |3
-<UFE056> \xF3\x90 |0
-<UFE056> \xED\x90 |3
-<UFE057> \xF3\xF3 |0
-<UFE057> \xED\xF3 |3
-<UFE058> \xF3\xF4 |0
-<UFE058> \xED\xF4 |3
-<UFE059> \xF3\xF5 |0
-<UFE059> \xED\xF5 |3
-<UFE05A> \xF3\xFA |0
-<UFE05A> \xED\xFA |3
-<UFE05B> \xF4\x5E |0
-<UFE05B> \xEE\x5E |3
-<UFE190> \xF7\xC1 |0
-<UFE190> \xEC\xC1 |3
-<UFE191> \xF7\xC2 |0
-<UFE191> \xEC\xC2 |3
-<UFE192> \xF3\xA4 |0
-<UFE192> \xED\xA4 |3
-<UFE193> \xF3\xA5 |0
-<UFE193> \xED\xA5 |3
-<UFE194> \xF4\x4B |0
-<UFE194> \xEE\x4B |3
-<UFE195> \xF6\xE2 |0
-<UFE195> \xEB\xE2 |3
-<UFE196> \xF3\x73 |0
-<UFE196> \xED\x73 |3
-<UFE197> \xF6\xE4 |0
-<UFE197> \xEB\xE4 |3
-<UFE198> \xF3\x74 |0
-<UFE198> \xED\x74 |3
-<UFE199> \xF3\x75 |0
-<UFE199> \xED\x75 |3
-<UFE19B> \xF6\xD5 |0
-<UFE19B> \xEB\xD5 |3
-<UFE19C> \xF6\xD3 |0
-<UFE19C> \xEB\xD3 |3
+<UFE044> \xF6\x58 |1
+<UFE045> \xF3\x67 |1
+<UFE046> \xF6\xBC |1
+<UFE047> \xF6\xBB |1
+<UFE048> \xF3\x69 |1
+<UFE04A> \xF3\xF7 |1
+<UFE04B> \xF3\xF8 |1
+<UFE04C> \xF3\xF9 |1
+<UFE04D> \xF4\x4D |1
+<UFE04E> \xF4\x87 |1
+<UFE04F> \xF6\xAB |1
+<UFE050> \xF3\xF6 |1
+<UFE051> \xF3\x8D |1
+<UFE052> \xF3\x8E |1
+<UFE053> \xF6\xAD |1
+<UFE054> \xF6\xA6 |1
+<UFE055> \xF3\x8F |1
+<UFE056> \xF3\x90 |1
+<UFE057> \xF3\xF3 |1
+<UFE058> \xF3\xF4 |1
+<UFE059> \xF3\xF5 |1
+<UFE05A> \xF3\xFA |1
+<UFE05B> \xF4\x5E |1
+<UFE190> \xF7\xC1 |1
+<UFE191> \xF7\xC2 |1
+<UFE192> \xF3\xA4 |1
+<UFE193> \xF3\xA5 |1
+<UFE194> \xF4\x4B |1
+<UFE195> \xF6\xE2 |1
+<UFE196> \xF3\x73 |1
+<UFE197> \xF6\xE4 |1
+<UFE198> \xF3\x74 |1
+<UFE199> \xF3\x75 |1
+<UFE19B> \xF6\xD5 |1
+<UFE19C> \xF6\xD3 |1
<UFE19D> \xF6\xD5 |1
<UFE19E> \xF6\xD3 |1
-<UFE19F> \xF6\xDA |0
-<UFE19F> \xEB\xDA |3
-<UFE1A1> \xF3\x50 |0
-<UFE1A1> \xED\x50 |3
-<UFE1A2> \xF3\xAF |0
-<UFE1A2> \xED\xAF |3
-<UFE1A3> \xF3\xBD |0
-<UFE1A3> \xED\xBD |3
-<UFE1A4> \xF3\xD4 |0
-<UFE1A4> \xED\xD4 |3
-<UFE1A5> \xF3\xD5 |0
-<UFE1A5> \xED\xD5 |3
-<UFE1A6> \xF3\xD6 |0
-<UFE1A6> \xED\xD6 |3
-<UFE1A7> \xF3\xD7 |0
-<UFE1A7> \xED\xD7 |3
-<UFE1A8> \xF3\xD8 |0
-<UFE1A8> \xED\xD8 |3
-<UFE1A9> \xF3\xD9 |0
-<UFE1A9> \xED\xD9 |3
-<UFE1AA> \xF3\xDA |0
-<UFE1AA> \xED\xDA |3
-<UFE1AB> \xF3\xDB |0
-<UFE1AB> \xED\xDB |3
-<UFE1AC> \xF4\x48 |0
-<UFE1AC> \xEE\x48 |3
-<UFE1AD> \xF4\x49 |0
-<UFE1AD> \xEE\x49 |3
-<UFE1AE> \xF6\xA4 |0
-<UFE1AE> \xEB\xA4 |3
-<UFE1AF> \xF7\xEF |0
-<UFE1AF> \xEC\xEF |3
-<UFE1B0> \xF6\xE7 |0
-<UFE1B0> \xEB\xE7 |3
-<UFE1B1> \xF6\xC5 |0
-<UFE1B1> \xEB\xC5 |3
-<UFE1B2> \xF6\xC8 |0
-<UFE1B2> \xEB\xC8 |3
-<UFE1B3> \xF6\xD1 |0
-<UFE1B3> \xEB\xD1 |3
-<UFE1B6> \xF3\xDD |0
-<UFE1B6> \xED\xDD |3
-<UFE1B7> \xF6\xBA |0
-<UFE1B7> \xEB\xBA |3
-<UFE1B8> \xF6\xB4 |0
-<UFE1B8> \xEB\xB4 |3
-<UFE1B9> \xF4\x83 |0
-<UFE1B9> \xEE\x83 |3
-<UFE1BA> \xF6\xB9 |0
-<UFE1BA> \xEB\xB9 |3
-<UFE1BB> \xF4\x7A |0
-<UFE1BB> \xEE\x7A |3
-<UFE1BC> \xF6\xB5 |0
-<UFE1BC> \xEB\xB5 |3
+<UFE19F> \xF6\xDA |1
+<UFE1A1> \xF3\x50 |1
+<UFE1A2> \xF3\xAF |1
+<UFE1A3> \xF3\xBD |1
+<UFE1A4> \xF3\xD4 |1
+<UFE1A5> \xF3\xD5 |1
+<UFE1A6> \xF3\xD6 |1
+<UFE1A7> \xF3\xD7 |1
+<UFE1A8> \xF3\xD8 |1
+<UFE1A9> \xF3\xD9 |1
+<UFE1AA> \xF3\xDA |1
+<UFE1AB> \xF3\xDB |1
+<UFE1AC> \xF4\x48 |1
+<UFE1AD> \xF4\x49 |1
+<UFE1AE> \xF6\xA4 |1
+<UFE1AF> \xF7\xEF |1
+<UFE1B0> \xF6\xE7 |1
+<UFE1B1> \xF6\xC5 |1
+<UFE1B2> \xF6\xC8 |1
+<UFE1B3> \xF6\xD1 |1
+<UFE1B6> \xF3\xDD |1
+<UFE1B7> \xF6\xBA |1
+<UFE1B8> \xF6\xB4 |1
+<UFE1B9> \xF4\x83 |1
+<UFE1BA> \xF6\xB9 |1
+<UFE1BB> \xF4\x7A |1
+<UFE1BC> \xF6\xB5 |1
<UFE1BD> \xF6\x72 |1
-<UFE1BE> \xF6\xB1 |0
-<UFE1BE> \xEB\xB1 |3
-<UFE1BF> \xF6\xB7 |0
-<UFE1BF> \xEB\xB7 |3
-<UFE1C0> \xF7\xF0 |0
-<UFE1C0> \xEC\xF0 |3
-<UFE1C1> \xF7\xF1 |0
-<UFE1C1> \xEC\xF1 |3
-<UFE1C2> \xF7\xF2 |0
-<UFE1C2> \xEC\xF2 |3
-<UFE1C3> \xF6\x48 |0
-<UFE1C3> \xEB\x48 |3
-<UFE1C4> \xF6\xB2 |0
-<UFE1C4> \xEB\xB2 |3
-<UFE1C5> \xF7\xF7 |0
-<UFE1C5> \xEC\xF7 |3
-<UFE1C6> \xF3\xC0 |0
-<UFE1C6> \xED\xC0 |3
-<UFE1C7> \xF3\xDC |0
-<UFE1C7> \xED\xDC |3
+<UFE1BE> \xF6\xB1 |1
+<UFE1BF> \xF6\xB7 |1
+<UFE1C0> \xF7\xF0 |1
+<UFE1C1> \xF7\xF1 |1
+<UFE1C2> \xF7\xF2 |1
+<UFE1C3> \xF6\x48 |1
+<UFE1C4> \xF6\xB2 |1
+<UFE1C5> \xF7\xF7 |1
+<UFE1C6> \xF3\xC0 |1
+<UFE1C7> \xF3\xDC |1
<UFE1C8> \xF6\xB9 |1
-<UFE1C9> \xF3\xDE |0
-<UFE1C9> \xED\xDE |3
-<UFE1CB> \xF3\xDF |0
-<UFE1CB> \xED\xDF |3
-<UFE1CC> \xF3\xE0 |0
-<UFE1CC> \xED\xE0 |3
-<UFE1CD> \xF3\xE1 |0
-<UFE1CD> \xED\xE1 |3
+<UFE1C9> \xF3\xDE |1
+<UFE1CB> \xF3\xDF |1
+<UFE1CC> \xF3\xE0 |1
+<UFE1CD> \xF3\xE1 |1
<UFE1CE> \xF6\xB2 |1
<UFE1CF> \xF6\x67 |1
<UFE1D0> \xF6\xBA |1
-<UFE1D1> \xF3\xE2 |0
-<UFE1D1> \xED\xE2 |3
-<UFE1D2> \xF6\xB0 |0
-<UFE1D2> \xEB\xB0 |3
-<UFE1D3> \xF3\xE3 |0
-<UFE1D3> \xED\xE3 |3
-<UFE1D4> \xF3\xE4 |0
-<UFE1D4> \xED\xE4 |3
-<UFE1D5> \xF3\xE5 |0
-<UFE1D5> \xED\xE5 |3
-<UFE1D6> \xF3\xE6 |0
-<UFE1D6> \xED\xE6 |3
-<UFE1D7> \xF6\xB3 |0
-<UFE1D7> \xEB\xB3 |3
-<UFE1D8> \xF6\xB8 |0
-<UFE1D8> \xEB\xB8 |3
-<UFE1D9> \xF6\xAC |0
-<UFE1D9> \xEB\xAC |3
-<UFE1DA> \xF6\xB6 |0
-<UFE1DA> \xEB\xB6 |3
-<UFE1DB> \xF6\xC7 |0
-<UFE1DB> \xEB\xC7 |3
-<UFE1DC> \xF3\x47 |0
-<UFE1DC> \xED\x47 |3
-<UFE1DD> \xF3\x4E |0
-<UFE1DD> \xED\x4E |3
-<UFE1DE> \xF4\x43 |0
-<UFE1DE> \xEE\x43 |3
-<UFE1DF> \xF4\x4A |0
-<UFE1DF> \xEE\x4A |3
-<UFE1E0> \xF4\x4C |0
-<UFE1E0> \xEE\x4C |3
-<UFE1E1> \xF4\x5B |0
-<UFE1E1> \xEE\x5B |3
-<UFE1E2> \xF4\x5C |0
-<UFE1E2> \xEE\x5C |3
-<UFE320> \xF6\x4A |0
-<UFE320> \xEB\x4A |3
-<UFE321> \xF4\x6B |0
-<UFE321> \xEE\x6B |3
-<UFE322> \xF3\x9E |0
-<UFE322> \xED\x9E |3
+<UFE1D1> \xF3\xE2 |1
+<UFE1D2> \xF6\xB0 |1
+<UFE1D3> \xF3\xE3 |1
+<UFE1D4> \xF3\xE4 |1
+<UFE1D5> \xF3\xE5 |1
+<UFE1D6> \xF3\xE6 |1
+<UFE1D7> \xF6\xB3 |1
+<UFE1D8> \xF6\xB8 |1
+<UFE1D9> \xF6\xAC |1
+<UFE1DA> \xF6\xB6 |1
+<UFE1DB> \xF6\xC7 |1
+<UFE1DC> \xF3\x47 |1
+<UFE1DD> \xF3\x4E |1
+<UFE1DE> \xF4\x43 |1
+<UFE1DF> \xF4\x4A |1
+<UFE1E0> \xF4\x4C |1
+<UFE1E1> \xF4\x5B |1
+<UFE1E2> \xF4\x5C |1
+<UFE320> \xF6\x4A |1
+<UFE321> \xF4\x6B |1
+<UFE322> \xF3\x9E |1
<UFE323> \xF3\x94 |1
-<UFE324> \xF7\xCB |0
-<UFE324> \xEC\xCB |3
-<UFE325> \xF3\x9F |0
-<UFE325> \xED\x9F |3
-<UFE326> \xF3\x9D |0
-<UFE326> \xED\x9D |3
-<UFE327> \xF7\xF4 |0
-<UFE327> \xEC\xF4 |3
-<UFE328> \xF3\x95 |0
-<UFE328> \xED\x95 |3
-<UFE329> \xF6\xC0 |0
-<UFE329> \xEB\xC0 |3
+<UFE324> \xF7\xCB |1
+<UFE325> \xF3\x9F |1
+<UFE326> \xF3\x9D |1
+<UFE327> \xF7\xF4 |1
+<UFE328> \xF3\x95 |1
+<UFE329> \xF6\xC0 |1
<UFE32A> \xF6\xC0 |1
<UFE32B> \xF3\xA1 |1
-<UFE32C> \xF3\xA3 |0
-<UFE32C> \xED\xA3 |3
-<UFE32D> \xF3\xA2 |0
-<UFE32D> \xED\xA2 |3
-<UFE32E> \xF3\x9B |0
-<UFE32E> \xED\x9B |3
-<UFE32F> \xF3\x9C |0
-<UFE32F> \xED\x9C |3
-<UFE330> \xF6\x49 |0
-<UFE330> \xEB\x49 |3
-<UFE331> \xF6\x49\xF7\xCE |1
+<UFE32C> \xF3\xA3 |1
+<UFE32D> \xF3\xA2 |1
+<UFE32E> \xF3\x9B |1
+<UFE32F> \xF3\x9C |1
+<UFE330> \xF6\x49 |1
+<UFE331> \xF6\x49+\xF7\xCE |1
<UFE332> \xF3\x99 |1
-<UFE333> \xF4\x85 |0
-<UFE333> \xEE\x85 |3
-<UFE334> \xF4\x68 |0
-<UFE334> \xEE\x68 |3
-<UFE335> \xF3\xA1 |0
-<UFE335> \xED\xA1 |3
-<UFE336> \xF6\xD4 |0
-<UFE336> \xEB\xD4 |3
-<UFE337> \xF3\xA1 |1
+<UFE333> \xF4\x85 |1
+<UFE334> \xF4\x68 |1
+<UFE335> \xF3\xA1 |1
+<UFE336> \xF6\xD4 |1
<UFE338> \xF6\x49 |1
-<UFE339> \xF4\x6D |0
-<UFE339> \xEE\x6D |3
-<UFE33A> \xF6\x4B |0
-<UFE33A> \xEB\x4B |3
-<UFE33B> \xF3\x9A |0
-<UFE33B> \xED\x9A |3
-<UFE33C> \xF3\x96 |0
-<UFE33C> \xED\x96 |3
-<UFE33D> \xF4\x61 |0
-<UFE33D> \xEE\x61 |3
-<UFE33E> \xF3\x99 |0
-<UFE33E> \xED\x99 |3
-<UFE33F> \xF3\x97 |0
-<UFE33F> \xED\x97 |3
-<UFE340> \xF3\x94 |0
-<UFE340> \xED\x94 |3
-<UFE341> \xF7\xF5 |0
-<UFE341> \xEC\xF5 |3
-<UFE342> \xF3\x98 |0
-<UFE342> \xED\x98 |3
-<UFE343> \xF3\x93 |0
-<UFE343> \xED\x93 |3
-<UFE344> \xF7\xF6 |0
-<UFE344> \xEC\xF6 |3
+<UFE339> \xF4\x6D |1
+<UFE33A> \xF6\x4B |1
+<UFE33B> \xF3\x9A |1
+<UFE33C> \xF3\x96 |1
+<UFE33D> \xF4\x61 |1
+<UFE33E> \xF3\x99 |1
+<UFE33F> \xF3\x97 |1
+<UFE340> \xF3\x94 |1
+<UFE341> \xF7\xF5 |1
+<UFE342> \xF3\x98 |1
+<UFE343> \xF3\x93 |1
+<UFE344> \xF7\xF6 |1
<UFE345> \xF7\xF6 |1
-<UFE346> \xF6\x4C |0
-<UFE346> \xEB\x4C |3
-<UFE347> \xF7\xF3 |0
-<UFE347> \xEC\xF3 |3
-<UFE348> \xF4\x65 |0
-<UFE348> \xEE\x65 |3
-<UFE349> \xF4\x84 |0
-<UFE349> \xEE\x84 |3
-<UFE34A> \xF4\x67 |0
-<UFE34A> \xEE\x67 |3
-<UFE34B> \xF4\x64 |0
-<UFE34B> \xEE\x64 |3
-<UFE34C> \xF4\x69 |0
-<UFE34C> \xEE\x69 |3
-<UFE34D> \xF4\x6C |0
-<UFE34D> \xEE\x6C |3
-<UFE34E> \xF4\x62 |0
-<UFE34E> \xEE\x62 |3
-<UFE34F> \xF4\x6E |0
-<UFE34F> \xEE\x6E |3
-<UFE350> \xF4\x6A |0
-<UFE350> \xEE\x6A |3
-<UFE351> \xF3\xAB |0
-<UFE351> \xED\xAB |3
-<UFE352> \xF3\xAC |0
-<UFE352> \xED\xAC |3
-<UFE353> \xF3\xAD |0
-<UFE353> \xED\xAD |3
-<UFE354> \xF4\x54 |0
-<UFE354> \xEE\x54 |3
-<UFE355> \xF4\x55 |0
-<UFE355> \xEE\x55 |3
-<UFE356> \xF4\x56 |0
-<UFE356> \xEE\x56 |3
-<UFE357> \xF4\x8A |0
-<UFE357> \xEE\x8A |3
-<UFE358> \xF4\x8B |0
-<UFE358> \xEE\x8B |3
-<UFE359> \xF4\x8C |0
-<UFE359> \xEE\x8C |3
-<UFE35A> \xF4\x8D |0
-<UFE35A> \xEE\x8D |3
-<UFE35B> \xF3\xA6 |0
-<UFE35B> \xED\xA6 |3
-<UFE4B0> \xF6\x84 |0
-<UFE4B0> \xEB\x84 |3
-<UFE4B1> \xF7\xE0 |0
-<UFE4B1> \xEC\xE0 |3
-<UFE4B2> \xF6\x86 |0
-<UFE4B2> \xEB\x86 |3
-<UFE4B3> \xF3\x51 |0
-<UFE4B3> \xED\x51 |3
-<UFE4B4> \xF3\x52 |0
-<UFE4B4> \xED\x52 |3
-<UFE4B5> \xF6\x83 |0
-<UFE4B5> \xEB\x83 |3
-<UFE4B6> \xF6\x7B |0
-<UFE4B6> \xEB\x7B |3
-<UFE4B7> \xF3\x54 |0
-<UFE4B7> \xED\x54 |3
-<UFE4B8> \xF3\xC7 |0
-<UFE4B8> \xED\xC7 |3
-<UFE4B9> \xF6\x7C |0
-<UFE4B9> \xEB\x7C |3
-<UFE4BA> \xF3\x53 |0
-<UFE4BA> \xED\x53 |3
-<UFE4BB> \xF7\xEB |0
-<UFE4BB> \xEC\xEB |3
-<UFE4BC> \xF3\x42 |0
-<UFE4BC> \xED\x42 |3
-<UFE4BD> \xF3\xCA |0
-<UFE4BD> \xED\xCA |3
-<UFE4BE> \xF3\xCB |0
-<UFE4BE> \xED\xCB |3
-<UFE4BF> \xF3\xCC |0
-<UFE4BF> \xED\xCC |3
-<UFE4C0> \xF3\xCD |0
-<UFE4C0> \xED\xCD |3
-<UFE4C1> \xF6\x82 |0
-<UFE4C1> \xEB\x82 |3
-<UFE4C2> \xF6\x96 |0
-<UFE4C2> \xEB\x96 |3
-<UFE4C3> \xF7\xED |0
-<UFE4C3> \xEC\xED |3
-<UFE4C4> \xF6\x99 |0
-<UFE4C4> \xEB\x99 |3
-<UFE4C7> \xF7\x8F |0
-<UFE4C7> \xEC\x8F |3
-<UFE4C8> \xF4\x70 |0
-<UFE4C8> \xEE\x70 |3
-<UFE4C9> \xF7\xA4 |0
-<UFE4C9> \xEC\xA4 |3
-<UFE4CA> \xF7\xFB |0
-<UFE4CA> \xEC\xFB |3
-<UFE4CB> \xF7\x9E |0
-<UFE4CB> \xEC\x9E |3
-<UFE4CC> \xF7\xE7 |0
-<UFE4CC> \xEC\xE7 |3
-<UFE4CD> \xF3\xEC |0
-<UFE4CD> \xED\xEC |3
-<UFE4CE> \xF6\xD7 |0
-<UFE4CE> \xEB\xD7 |3
-<UFE4CF> \xF7\xE6 |0
-<UFE4CF> \xEC\xE6 |3
-<UFE4D0> \xF4\x7B |0
-<UFE4D0> \xEE\x7B |3
-<UFE4D1> \xF7\xF9 |0
-<UFE4D1> \xEC\xF9 |3
+<UFE346> \xF6\x4C |1
+<UFE347> \xF7\xF3 |1
+<UFE348> \xF4\x65 |1
+<UFE349> \xF4\x84 |1
+<UFE34A> \xF4\x67 |1
+<UFE34B> \xF4\x64 |1
+<UFE34C> \xF4\x69 |1
+<UFE34D> \xF4\x6C |1
+<UFE34E> \xF4\x62 |1
+<UFE34F> \xF4\x6E |1
+<UFE350> \xF4\x6A |1
+<UFE351> \xF3\xAB |1
+<UFE352> \xF3\xAC |1
+<UFE353> \xF3\xAD |1
+<UFE354> \xF4\x54 |1
+<UFE355> \xF4\x55 |1
+<UFE356> \xF4\x56 |1
+<UFE357> \xF4\x8A |1
+<UFE358> \xF4\x8B |1
+<UFE359> \xF4\x8C |1
+<UFE35A> \xF4\x8D |1
+<UFE35B> \xF3\xA6 |1
+<UFE4B0> \xF6\x84 |1
+<UFE4B1> \xF7\xE0 |1
+<UFE4B2> \xF6\x86 |1
+<UFE4B3> \xF3\x51 |1
+<UFE4B4> \xF3\x52 |1
+<UFE4B5> \xF6\x83 |1
+<UFE4B6> \xF6\x7B |1
+<UFE4B7> \xF3\x54 |1
+<UFE4B8> \xF3\xC7 |1
+<UFE4B9> \xF6\x7C |1
+<UFE4BA> \xF3\x53 |1
+<UFE4BB> \xF7\xEB |1
+<UFE4BC> \xF3\x42 |1
+<UFE4BD> \xF3\xCA |1
+<UFE4BE> \xF3\xCB |1
+<UFE4BF> \xF3\xCC |1
+<UFE4C0> \xF3\xCD |1
+<UFE4C1> \xF6\x82 |1
+<UFE4C2> \xF6\x96 |1
+<UFE4C3> \xF7\xED |1
+<UFE4C4> \xF6\x99 |1
+<UFE4C7> \xF7\x8F |1
+<UFE4C8> \xF4\x70 |1
+<UFE4C9> \xF7\xA4 |1
+<UFE4CA> \xF7\xFB |1
+<UFE4CB> \xF7\x9E |1
+<UFE4CC> \xF7\xE7 |1
+<UFE4CD> \xF3\xEC |1
+<UFE4CE> \xF6\xD7 |1
+<UFE4CF> \xF7\xE6 |1
+<UFE4D0> \xF4\x7B |1
+<UFE4D1> \xF7\xF9 |1
<UFE4D2> \xF7\xF9 |1
-<UFE4D3> \xF3\x66 |0
-<UFE4D3> \xED\x66 |3
-<UFE4D4> \xF3\x71 |0
-<UFE4D4> \xED\x71 |3
-<UFE4D5> \xF4\x6F |0
-<UFE4D5> \xEE\x6F |3
-<UFE4D6> \xF6\xF3 |0
-<UFE4D6> \xEB\xF3 |3
+<UFE4D3> \xF3\x66 |1
+<UFE4D4> \xF3\x71 |1
+<UFE4D5> \xF4\x6F |1
+<UFE4D6> \xF6\xF3 |1
<UFE4D7> \xF6\xF3 |1
-<UFE4D8> \xF3\x72 |0
-<UFE4D8> \xED\x72 |3
-<UFE4D9> \xF3\x76 |0
-<UFE4D9> \xED\x76 |3
-<UFE4DA> \xF3\x77 |0
-<UFE4DA> \xED\x77 |3
-<UFE4DB> \xF6\xE6 |0
-<UFE4DB> \xEB\xE6 |3
-<UFE4DC> \xF6\xDD |0
-<UFE4DC> \xEB\xDD |3
-<UFE4DD> \xF6\xA0 |0
-<UFE4DD> \xEB\xA0 |3
-<UFE4DF> \xF3\x4F |0
-<UFE4DF> \xED\x4F |3
-<UFE4E0> \xF7\x96 |0
-<UFE4E0> \xEC\x96 |3
-<UFE4E1> \xF7\x99 |0
-<UFE4E1> \xEC\x99 |3
-<UFE4E2> \xF7\x9A |0
-<UFE4E2> \xEC\x9A |3
-<UFE4E3> \xF7\xA2 |0
-<UFE4E3> \xEC\xA2 |3
-<UFE4E4> \xF4\x5F |0
-<UFE4E4> \xEE\x5F |3
-<UFE4E5> \xF6\xA5 |0
-<UFE4E5> \xEB\xA5 |3
-<UFE4E6> \xF7\x90 |0
-<UFE4E6> \xEC\x90 |3
-<UFE4E7> \xF3\xCE |0
-<UFE4E7> \xED\xCE |3
-<UFE4E8> \xF3\xCF |0
-<UFE4E8> \xED\xCF |3
-<UFE4E9> \xF3\xD0 |0
-<UFE4E9> \xED\xD0 |3
-<UFE4EA> \xF3\xD1 |0
-<UFE4EA> \xED\xD1 |3
-<UFE4EB> \xF3\x48 |0
-<UFE4EB> \xED\x48 |3
-<UFE4EC> \xF3\x49 |0
-<UFE4EC> \xED\x49 |3
-<UFE4ED> \xF3\xD2 |0
-<UFE4ED> \xED\xD2 |3
-<UFE4EE> \xF3\xD3 |0
-<UFE4EE> \xED\xD3 |3
-<UFE4EF> \xF6\xEE |0
-<UFE4EF> \xEB\xEE |3
-<UFE4F0> \xF6\x74 |0
-<UFE4F0> \xEB\x74 |3
-<UFE4F2> \xF6\xEB |0
-<UFE4F2> \xEB\xEB |3
-<UFE4F4> \xF6\xCE |0
-<UFE4F4> \xEB\xCE |3
-<UFE4F5> \xF6\xE3 |0
-<UFE4F5> \xEB\xE3 |3
-<UFE4F6> \xF6\x53 |0
-<UFE4F6> \xEB\x53 |3
-<UFE4F7> \xF3\x62 |0
-<UFE4F7> \xED\x62 |3
+<UFE4D8> \xF3\x72 |1
+<UFE4D9> \xF3\x76 |1
+<UFE4DA> \xF3\x77 |1
+<UFE4DB> \xF6\xE6 |1
+<UFE4DC> \xF6\xDD |1
+<UFE4DD> \xF6\xA0 |1
+<UFE4DF> \xF3\x4F |1
+<UFE4E0> \xF7\x96 |1
+<UFE4E1> \xF7\x99 |1
+<UFE4E2> \xF7\x9A |1
+<UFE4E3> \xF7\xA2 |1
+<UFE4E4> \xF4\x5F |1
+<UFE4E5> \xF6\xA5 |1
+<UFE4E6> \xF7\x90 |1
+<UFE4E7> \xF3\xCE |1
+<UFE4E8> \xF3\xCF |1
+<UFE4E9> \xF3\xD0 |1
+<UFE4EA> \xF3\xD1 |1
+<UFE4EB> \xF3\x48 |1
+<UFE4EC> \xF3\x49 |1
+<UFE4ED> \xF3\xD2 |1
+<UFE4EE> \xF3\xD3 |1
+<UFE4EF> \xF6\xEE |1
+<UFE4F0> \xF6\x74 |1
+<UFE4F2> \xF6\xEB |1
+<UFE4F4> \xF6\xCE |1
+<UFE4F5> \xF6\xE3 |1
+<UFE4F6> \xF6\x53 |1
+<UFE4F7> \xF3\x62 |1
<UFE4F8> \xF3\x62 |1
-<UFE4F9> \xF7\x9B |0
-<UFE4F9> \xEC\x9B |3
-<UFE4FA> \xF7\x9C |0
-<UFE4FA> \xEC\x9C |3
-<UFE4FB> \xF7\xA0 |0
-<UFE4FB> \xEC\xA0 |3
-<UFE4FC> \xF7\xA1 |0
-<UFE4FC> \xEC\xA1 |3
-<UFE4FD> \xF7\x7B |0
-<UFE4FD> \xEC\x7B |3
-<UFE4FE> \xF7\xA6 |0
-<UFE4FE> \xEC\xA6 |3
-<UFE4FF> \xF7\x82 |0
-<UFE4FF> \xEC\x82 |3
-<UFE500> \xF7\x83 |0
-<UFE500> \xEC\x83 |3
-<UFE501> \xF7\x84 |0
-<UFE501> \xEC\x84 |3
-<UFE502> \xF7\x85 |0
-<UFE502> \xEC\x85 |3
-<UFE503> \xF7\x8C |0
-<UFE503> \xEC\x8C |3
-<UFE504> \xF6\xF6 |0
-<UFE504> \xEB\xF6 |3
-<UFE505> \xF3\x4B |0
-<UFE505> \xED\x4B |3
-<UFE506> \xF6\x7D |0
-<UFE506> \xEB\x7D |3
+<UFE4F9> \xF7\x9B |1
+<UFE4FA> \xF7\x9C |1
+<UFE4FB> \xF7\xA0 |1
+<UFE4FC> \xF7\xA1 |1
+<UFE4FD> \xF7\x7B |1
+<UFE4FE> \xF7\xA6 |1
+<UFE4FF> \xF7\x82 |1
+<UFE500> \xF7\x83 |1
+<UFE501> \xF7\x84 |1
+<UFE502> \xF7\x85 |1
+<UFE503> \xF7\x8C |1
+<UFE504> \xF6\xF6 |1
+<UFE505> \xF3\x4B |1
+<UFE506> \xF6\x7D |1
<UFE507> \xF6\x7D |1
<UFE508> \xF6\x7D |1
-<UFE509> \xF6\xE9 |0
-<UFE509> \xEB\xE9 |3
-<UFE50A> \xF3\x6D |0
-<UFE50A> \xED\x6D |3
-<UFE50B> \xF3\xE7 |0
-<UFE50B> \xED\xE7 |3
-<UFE50C> \xF3\xE8 |0
-<UFE50C> \xED\xE8 |3
-<UFE50D> \xF3\xEA |0
-<UFE50D> \xED\xEA |3
-<UFE50E> \xF3\xE9 |0
-<UFE50E> \xED\xE9 |3
-<UFE50F> \xF7\xBC |0
-<UFE50F> \xEC\xBC |3
-<UFE510> \xF6\xA8 |0
-<UFE510> \xEB\xA8 |3
-<UFE511> \xF7\xBD |0
-<UFE511> \xEC\xBD |3
-<UFE512> \xF6\xA2 |0
-<UFE512> \xEB\xA2 |3
-<UFE513> \xF3\xC4 |0
-<UFE513> \xED\xC4 |3
-<UFE514> \xF3\x4C |0
-<UFE514> \xED\x4C |3
-<UFE515> \xF7\xFC |0
-<UFE515> \xEC\xFC |3
-<UFE516> \xF3\x6E |0
-<UFE516> \xED\x6E |3
-<UFE517> \xF3\x6F |0
-<UFE517> \xED\x6F |3
-<UFE518> \xF3\xB7 |0
-<UFE518> \xED\xB7 |3
-<UFE519> \xF3\xB8 |0
-<UFE519> \xED\xB8 |3
-<UFE51A> \xF3\xB9 |0
-<UFE51A> \xED\xB9 |3
-<UFE51B> \xF3\xBA |0
-<UFE51B> \xED\xBA |3
-<UFE51C> \xF3\xBB |0
-<UFE51C> \xED\xBB |3
-<UFE51D> \xF3\xBF |0
-<UFE51D> \xED\xBF |3
-<UFE51E> \xF3\xC1 |0
-<UFE51E> \xED\xC1 |3
-<UFE51F> \xF3\xC2 |0
-<UFE51F> \xED\xC2 |3
-<UFE520> \xF6\x47 |0
-<UFE520> \xEB\x47 |3
-<UFE521> \xF4\x41 |0
-<UFE521> \xEE\x41 |3
-<UFE522> \xF7\xB8 |0
-<UFE522> \xEC\xB8 |3
-<UFE523> \xF7\xB3 |0
-<UFE523> \xEC\xB3 |3
-<UFE524> \xF6\xF7 |0
-<UFE524> \xEB\xF7 |3
-<UFE525> \xF7\xA5 |0
-<UFE525> \xEC\xA5 |3
-<UFE526> \xF7\xDF |0
-<UFE526> \xEC\xDF |3
-<UFE527> \xF3\x65 |0
-<UFE527> \xED\x65 |3
-<UFE528> \xF6\xF9 |0
-<UFE528> \xEB\xF9 |3
-<UFE529> \xF6\xFA |0
-<UFE529> \xEB\xFA |3
-<UFE52A> \xF7\xAE |0
-<UFE52A> \xEC\xAE |3
-<UFE52B> \xF4\x66 |0
-<UFE52B> \xEE\x66 |3
-<UFE52C> \xF6\xF4 |0
-<UFE52C> \xEB\xF4 |3
-<UFE52D> \xF7\xE1 |0
-<UFE52D> \xEC\xE1 |3
+<UFE509> \xF6\xE9 |1
+<UFE50A> \xF3\x6D |1
+<UFE50B> \xF3\xE7 |1
+<UFE50C> \xF3\xE8 |1
+<UFE50D> \xF3\xEA |1
+<UFE50E> \xF3\xE9 |1
+<UFE50F> \xF7\xBC |1
+<UFE510> \xF6\xA8 |1
+<UFE511> \xF7\xBD |1
+<UFE512> \xF6\xA2 |1
+<UFE513> \xF3\xC4 |1
+<UFE514> \xF3\x4C |1
+<UFE515> \xF7\xFC |1
+<UFE516> \xF3\x6E |1
+<UFE517> \xF3\x6F |1
+<UFE518> \xF3\xB7 |1
+<UFE519> \xF3\xB8 |1
+<UFE51A> \xF3\xB9 |1
+<UFE51B> \xF3\xBA |1
+<UFE51C> \xF3\xBB |1
+<UFE51D> \xF3\xBF |1
+<UFE51E> \xF3\xC1 |1
+<UFE51F> \xF3\xC2 |1
+<UFE520> \xF6\x47 |1
+<UFE521> \xF4\x41 |1
+<UFE522> \xF7\xB8 |1
+<UFE523> \xF7\xB3 |1
+<UFE524> \xF6\xF7 |1
+<UFE525> \xF7\xA5 |1
+<UFE526> \xF7\xDF |1
+<UFE527> \xF3\x65 |1
+<UFE528> \xF6\xF9 |1
+<UFE529> \xF6\xFA |1
+<UFE52A> \xF7\xAE |1
+<UFE52B> \xF4\x66 |1
+<UFE52C> \xF6\xF4 |1
+<UFE52D> \xF7\xE1 |1
<UFE52E> \xF6\xF4 |1
<UFE52F> \xF6\xEA |1
-<UFE530> \xF6\xEA |0
-<UFE530> \xEB\xEA |3
-<UFE531> \xF6\x81 |0
-<UFE531> \xEB\x81 |3
-<UFE532> \xF6\xD6 |0
-<UFE532> \xEB\xD6 |3
-<UFE533> \xF7\xAF |0
-<UFE533> \xEC\xAF |3
-<UFE534> \xF7\xB0 |0
-<UFE534> \xEC\xB0 |3
-<UFE535> \xF6\xF8 |0
-<UFE535> \xEB\xF8 |3
-<UFE536> \xF7\xDA |0
-<UFE536> \xEC\xDA |3
-<UFE538> \xF7\xE8 |0
-<UFE538> \xEC\xE8 |3
-<UFE539> \xF6\x79 |0
-<UFE539> \xEB\x79 |3
-<UFE53A> \xF6\x78 |0
-<UFE53A> \xEB\x78 |3
-<UFE53B> \xF3\x41 |0
-<UFE53B> \xED\x41 |3
-<UFE53C> \xF7\x9F |0
-<UFE53C> \xEC\x9F |3
-<UFE53D> \xF7\x7E |0
-<UFE53D> \xEC\x7E |3
-<UFE53E> \xF6\xEF |0
-<UFE53E> \xEB\xEF |3
-<UFE53F> \xF7\x7C |0
-<UFE53F> \xEC\x7C |3
-<UFE540> \xF7\x7D |0
-<UFE540> \xEC\x7D |3
-<UFE541> \xF7\x86 |0
-<UFE541> \xEC\x86 |3
-<UFE542> \xF7\x80 |0
-<UFE542> \xEC\x80 |3
-<UFE543> \xF7\xAC |0
-<UFE543> \xEC\xAC |3
-<UFE544> \xF7\xAD |0
-<UFE544> \xEC\xAD |3
-<UFE545> \xF7\x88 |0
-<UFE545> \xEC\x88 |3
-<UFE546> \xF6\x77 |0
-<UFE546> \xEB\x77 |3
-<UFE547> \xF6\x75 |0
-<UFE547> \xEB\x75 |3
-<UFE548> \xF7\x81 |0
-<UFE548> \xEC\x81 |3
-<UFE549> \xF7\x87 |0
-<UFE549> \xEC\x87 |3
-<UFE54A> \xF7\x91 |0
-<UFE54A> \xEC\x91 |3
-<UFE54B> \xF7\x92 |0
-<UFE54B> \xEC\x92 |3
-<UFE54C> \xF7\x93 |0
-<UFE54C> \xEC\x93 |3
-<UFE54D> \xF7\x89 |0
-<UFE54D> \xEC\x89 |3
-<UFE54E> \xF7\x8A |0
-<UFE54E> \xEC\x8A |3
-<UFE54F> \xF7\x8B |0
-<UFE54F> \xEC\x8B |3
-<UFE550> \xF7\x8D |0
-<UFE550> \xEC\x8D |3
-<UFE551> \xF6\x7A |0
-<UFE551> \xEB\x7A |3
-<UFE552> \xF7\xE2 |0
-<UFE552> \xEC\xE2 |3
-<UFE553> \xF3\xEB |0
-<UFE553> \xED\xEB |3
-<UFE7D1> \xF6\x93 |0
-<UFE7D1> \xEB\x93 |3
-<UFE7D2> \xF7\xB6 |0
-<UFE7D2> \xEC\xB6 |3
-<UFE7D3> \xF6\x90 |0
-<UFE7D3> \xEB\x90 |3
-<UFE7D4> \xF6\x8F |0
-<UFE7D4> \xEB\x8F |3
-<UFE7D5> \xF3\x80 |0
-<UFE7D5> \xED\x80 |3
-<UFE7D6> \xF7\xB7 |0
-<UFE7D6> \xEC\xB7 |3
-<UFE7D7> \xF6\x92 |0
-<UFE7D7> \xEB\x92 |3
-<UFE7D8> \xF6\x91 |0
-<UFE7D8> \xEB\x91 |3
-<UFE7D9> \xF6\x43 |0
-<UFE7D9> \xEB\x43 |3
-<UFE7DA> \xF4\x45 |0
-<UFE7DA> \xEE\x45 |3
-<UFE7DB> \xF3\x46 |0
-<UFE7DB> \xED\x46 |3
+<UFE530> \xF6\xEA |1
+<UFE531> \xF6\x81 |1
+<UFE532> \xF6\xD6 |1
+<UFE533> \xF7\xAF |1
+<UFE534> \xF7\xB0 |1
+<UFE535> \xF6\xF8 |1
+<UFE536> \xF7\xDA |1
+<UFE538> \xF7\xE8 |1
+<UFE539> \xF6\x79 |1
+<UFE53A> \xF6\x78 |1
+<UFE53B> \xF3\x41 |1
+<UFE53C> \xF7\x9F |1
+<UFE53D> \xF7\x7E |1
+<UFE53E> \xF6\xEF |1
+<UFE53F> \xF7\x7C |1
+<UFE540> \xF7\x7D |1
+<UFE541> \xF7\x86 |1
+<UFE542> \xF7\x80 |1
+<UFE543> \xF7\xAC |1
+<UFE544> \xF7\xAD |1
+<UFE545> \xF7\x88 |1
+<UFE546> \xF6\x77 |1
+<UFE547> \xF6\x75 |1
+<UFE548> \xF7\x81 |1
+<UFE549> \xF7\x87 |1
+<UFE54A> \xF7\x91 |1
+<UFE54B> \xF7\x92 |1
+<UFE54C> \xF7\x93 |1
+<UFE54D> \xF7\x89 |1
+<UFE54E> \xF7\x8A |1
+<UFE54F> \xF7\x8B |1
+<UFE550> \xF7\x8D |1
+<UFE551> \xF6\x7A |1
+<UFE552> \xF7\xE2 |1
+<UFE553> \xF3\xEB |1
+<UFE7D1> \xF6\x93 |1
+<UFE7D2> \xF7\xB6 |1
+<UFE7D3> \xF6\x90 |1
+<UFE7D4> \xF6\x8F |1
+<UFE7D5> \xF3\x80 |1
+<UFE7D6> \xF7\xB7 |1
+<UFE7D7> \xF6\x92 |1
+<UFE7D8> \xF6\x91 |1
+<UFE7D9> \xF6\x43 |1
+<UFE7DA> \xF4\x45 |1
+<UFE7DB> \xF3\x46 |1
<UFE7DC> \xF6\xB1 |1
-<UFE7DD> \xF6\x94 |0
-<UFE7DD> \xEB\x94 |3
-<UFE7DE> \xF3\xB2 |0
-<UFE7DE> \xED\xB2 |3
-<UFE7DF> \xF6\x8E |0
-<UFE7DF> \xEB\x8E |3
-<UFE7E0> \xF7\xEC |0
-<UFE7E0> \xEC\xEC |3
+<UFE7DD> \xF6\x94 |1
+<UFE7DE> \xF3\xB2 |1
+<UFE7DF> \xF6\x8E |1
+<UFE7E0> \xF7\xEC |1
<UFE7E1> \xF7\xEC |1
<UFE7E2> \xF6\x89 |1
-<UFE7E3> \xF6\x89 |0
-<UFE7E3> \xEB\x89 |3
-<UFE7E4> \xF6\x8A |0
-<UFE7E4> \xEB\x8A |3
+<UFE7E3> \xF6\x89 |1
+<UFE7E4> \xF6\x8A |1
<UFE7E5> \xF6\x8A |1
-<UFE7E6> \xF6\x88 |0
-<UFE7E6> \xEB\x88 |3
-<UFE7E7> \xF6\x80 |0
-<UFE7E7> \xEB\x80 |3
-<UFE7E8> \xF3\x55 |0
-<UFE7E8> \xED\x55 |3
-<UFE7E9> \xF6\x8C |0
-<UFE7E9> \xEB\x8C |3
-<UFE7EA> \xF6\x8D |0
-<UFE7EA> \xEB\x8D |3
-<UFE7EB> \xF6\x87 |0
-<UFE7EB> \xEB\x87 |3
-<UFE7EC> \xF4\x71 |0
-<UFE7EC> \xEE\x71 |3
-<UFE7ED> \xF7\xF8 |0
-<UFE7ED> \xEC\xF8 |3
+<UFE7E6> \xF6\x88 |1
+<UFE7E7> \xF6\x80 |1
+<UFE7E8> \xF3\x55 |1
+<UFE7E9> \xF6\x8C |1
+<UFE7EA> \xF6\x8D |1
+<UFE7EB> \xF6\x87 |1
+<UFE7EC> \xF4\x71 |1
+<UFE7ED> \xF7\xF8 |1
<UFE7EE> \xF6\x8D |1
<UFE7EF> \xF6\x8A |1
-<UFE7F0> \xF4\x76 |0
-<UFE7F0> \xEE\x76 |3
-<UFE7F1> \xF6\x8B |0
-<UFE7F1> \xEB\x8B |3
-<UFE7F2> \xF3\xB3 |0
-<UFE7F2> \xED\xB3 |3
-<UFE7F3> \xF3\xB4 |0
-<UFE7F3> \xED\xB4 |3
-<UFE7F4> \xF3\xB5 |0
-<UFE7F4> \xED\xB5 |3
-<UFE7F5> \xF7\x8E |0
-<UFE7F5> \xEC\x8E |3
-<UFE7F6> \xF6\x7E |0
-<UFE7F6> \xEB\x7E |3
-<UFE7F7> \xF6\x42 |0
-<UFE7F7> \xEB\x42 |3
-<UFE7F8> \xF3\x4A |0
-<UFE7F8> \xED\x4A |3
-<UFE7F9> \xF4\x77 |0
-<UFE7F9> \xEE\x77 |3
-<UFE7FA> \xF6\x95 |0
-<UFE7FA> \xEB\x95 |3
-<UFE7FB> \xF3\x43 |0
-<UFE7FB> \xED\x43 |3
-<UFE7FD> \xF6\x45 |0
-<UFE7FD> \xEB\x45 |3
-<UFE7FE> \xF3\xB6 |0
-<UFE7FE> \xED\xB6 |3
-<UFE7FF> \xF4\x46 |0
-<UFE7FF> \xEE\x46 |3
-<UFE800> \xF6\xDC |0
-<UFE800> \xEB\xDC |3
-<UFE801> \xF6\xF0 |0
-<UFE801> \xEB\xF0 |3
+<UFE7F0> \xF4\x76 |1
+<UFE7F1> \xF6\x8B |1
+<UFE7F2> \xF3\xB3 |1
+<UFE7F3> \xF3\xB4 |1
+<UFE7F4> \xF3\xB5 |1
+<UFE7F5> \xF7\x8E |1
+<UFE7F6> \xF6\x7E |1
+<UFE7F7> \xF6\x42 |1
+<UFE7F8> \xF3\x4A |1
+<UFE7F9> \xF4\x77 |1
+<UFE7FA> \xF6\x95 |1
+<UFE7FB> \xF3\x43 |1
+<UFE7FD> \xF6\x45 |1
+<UFE7FE> \xF3\xB6 |1
+<UFE7FF> \xF4\x46 |1
+<UFE800> \xF6\xDC |1
+<UFE801> \xF6\xF0 |1
<UFE802> \xF6\xF0 |1
-<UFE803> \xF6\xE1 |0
-<UFE803> \xEB\xE1 |3
-<UFE804> \xF7\xB9 |0
-<UFE804> \xEC\xB9 |3
-<UFE805> \xF3\xC9 |0
-<UFE805> \xED\xC9 |3
-<UFE806> \xF7\xBB |0
-<UFE806> \xEC\xBB |3
-<UFE807> \xF6\x76 |0
-<UFE807> \xEB\x76 |3
-<UFE808> \xF6\x97 |0
-<UFE808> \xEB\x97 |3
-<UFE809> \xF7\xBA |0
-<UFE809> \xEC\xBA |3
-<UFE80A> \xF6\x9F |0
-<UFE80A> \xEB\x9F |3
-<UFE80B> \xF3\x44 |0
-<UFE80B> \xED\x44 |3
-<UFE80C> \xF6\x9E |0
-<UFE80C> \xEB\x9E |3
-<UFE80D> \xF6\x46 |0
-<UFE80D> \xEB\x46 |3
-<UFE80E> \xF3\xB1 |0
-<UFE80E> \xED\xB1 |3
-<UFE80F> \xF6\xA1 |0
-<UFE80F> \xEB\xA1 |3
-<UFE810> \xF4\x47 |0
-<UFE810> \xEE\x47 |3
-<UFE811> \xF4\x72 |0
-<UFE811> \xEE\x72 |3
-<UFE812> \xF4\x73 |0
-<UFE812> \xEE\x73 |3
-<UFE813> \xF7\xEE |0
-<UFE813> \xEC\xEE |3
-<UFE814> \xF6\xDE |0
-<UFE814> \xEB\xDE |3
-<UFE816> \xF6\xDF |0
-<UFE816> \xEB\xDF |3
-<UFE817> \xF4\x44 |0
-<UFE817> \xEE\x44 |3
-<UFE818> \xF3\xB0 |0
-<UFE818> \xED\xB0 |3
-<UFE819> \xF6\xE0 |0
-<UFE819> \xEB\xE0 |3
-<UFE81A> \xF3\xA0 |0
-<UFE81A> \xED\xA0 |3
-<UFE81C> \xF6\xDB |0
-<UFE81C> \xEB\xDB |3
-<UFE81D> \xF6\xE5 |0
-<UFE81D> \xEB\xE5 |3
+<UFE803> \xF6\xE1 |1
+<UFE804> \xF7\xB9 |1
+<UFE805> \xF3\xC9 |1
+<UFE806> \xF7\xBB |1
+<UFE807> \xF6\x76 |1
+<UFE808> \xF6\x97 |1
+<UFE809> \xF7\xBA |1
+<UFE80A> \xF6\x9F |1
+<UFE80B> \xF3\x44 |1
+<UFE80C> \xF6\x9E |1
+<UFE80D> \xF6\x46 |1
+<UFE80E> \xF3\xB1 |1
+<UFE80F> \xF6\xA1 |1
+<UFE810> \xF4\x47 |1
+<UFE811> \xF4\x72 |1
+<UFE812> \xF4\x73 |1
+<UFE813> \xF7\xEE |1
+<UFE814> \xF6\xDE |1
+<UFE816> \xF6\xDF |1
+<UFE817> \xF4\x44 |1
+<UFE818> \xF3\xB0 |1
+<UFE819> \xF6\xE0 |1
+<UFE81A> \xF3\xA0 |1
+<UFE81C> \xF6\xDB |1
+<UFE81D> \xF6\xE5 |1
<UFE81E> \xF6\xE5 |1
-<UFE81F> \xF7\xE9 |0
-<UFE81F> \xEC\xE9 |3
-<UFE820> \xF7\x9D |0
-<UFE820> \xEC\x9D |3
+<UFE81F> \xF7\xE9 |1
+<UFE820> \xF7\x9D |1
<UFE821> \xF6\xEA |1
-<UFE822> \xF7\xA8 |0
-<UFE822> \xEC\xA8 |3
-<UFE823> \xF6\xC4 |0
-<UFE823> \xEB\xC4 |3
-<UFE824> \xF4\x7C |0
-<UFE824> \xEE\x7C |3
-<UFE825> \xF6\xED |0
-<UFE825> \xEB\xED |3
+<UFE822> \xF7\xA8 |1
+<UFE823> \xF6\xC4 |1
+<UFE824> \xF4\x7C |1
+<UFE825> \xF6\xED |1
<UFE826> \xF6\xED |1
-<UFE827> \xF7\xFA |0
-<UFE827> \xEC\xFA |3
-<UFE828> \xF3\x68 |0
-<UFE828> \xED\x68 |3
-<UFE829> \xF3\xAE |0
-<UFE829> \xED\xAE |3
+<UFE827> \xF7\xFA |1
+<UFE828> \xF3\x68 |1
+<UFE829> \xF3\xAE |1
<UFE82A> \xF7\xEB |1
-<UFE82C> \xF4\x89 |0
-<UFE82C> \xEE\x89 |3
-<UFE82D> \xF7\x48 |0
-<UFE82D> \xEC\x48 |3
-<UFE82E> \xF6\xFB |0
-<UFE82E> \xEB\xFB |3
-<UFE82F> \xF6\xFC |0
-<UFE82F> \xEB\xFC |3
-<UFE830> \xF7\x40 |0
-<UFE830> \xEC\x40 |3
-<UFE831> \xF7\x41 |0
-<UFE831> \xEC\x41 |3
-<UFE832> \xF7\x42 |0
-<UFE832> \xEC\x42 |3
-<UFE833> \xF7\x43 |0
-<UFE833> \xEC\x43 |3
-<UFE834> \xF7\x44 |0
-<UFE834> \xEC\x44 |3
-<UFE835> \xF7\x45 |0
-<UFE835> \xEC\x45 |3
-<UFE836> \xF7\x46 |0
-<UFE836> \xEC\x46 |3
-<UFE837> \xF7\xC9 |0
-<UFE837> \xEC\xC9 |3
-<UFE838> \xF3\x57 |0
-<UFE838> \xED\x57 |3
-<UFE839> \xF3\x63 |0
-<UFE839> \xED\x63 |3
-<UFE83A> \xF3\x64 |0
-<UFE83A> \xED\x64 |3
-<UFE83B> \xF7\x47 |0
-<UFE83B> \xEC\x47 |3
-<UFE83C> \xF7\xA3 |0
-<UFE83C> \xEC\xA3 |3
-<UFE960> \xF6\xAF |0
-<UFE960> \xEB\xAF |3
-<UFE961> \xF6\xAE |0
-<UFE961> \xEB\xAE |3
-<UFE962> \xF6\xA9 |0
-<UFE962> \xEB\xA9 |3
-<UFE963> \xF7\xD1 |0
-<UFE963> \xEC\xD1 |3
-<UFE964> \xF3\x83 |0
-<UFE964> \xED\x83 |3
-<UFE965> \xF6\xAA |0
-<UFE965> \xEB\xAA |3
-<UFE966> \xF3\x84 |0
-<UFE966> \xED\x84 |3
-<UFE967> \xF3\x85 |0
-<UFE967> \xED\x85 |3
-<UFE968> \xF3\x86 |0
-<UFE968> \xED\x86 |3
-<UFE969> \xF3\x87 |0
-<UFE969> \xED\x87 |3
-<UFE96A> \xF3\x88 |0
-<UFE96A> \xED\x88 |3
-<UFE96B> \xF3\x89 |0
-<UFE96B> \xED\x89 |3
-<UFE96C> \xF3\x8A |0
-<UFE96C> \xED\x8A |3
-<UFE96D> \xF3\x8B |0
-<UFE96D> \xED\x8B |3
-<UFE96E> \xF3\x8C |0
-<UFE96E> \xED\x8C |3
-<UFE96F> \xF3\x91 |0
-<UFE96F> \xED\x91 |3
-<UFE970> \xF3\x92 |0
-<UFE970> \xED\x92 |3
-<UFE971> \xF3\xBE |0
-<UFE971> \xED\xBE |3
-<UFE972> \xF6\x9D |0
-<UFE972> \xEB\x9D |3
-<UFE973> \xF6\xC6 |0
-<UFE973> \xEB\xC6 |3
-<UFE974> \xF3\xFB |0
-<UFE974> \xED\xFB |3
-<UFE975> \xF3\xFC |0
-<UFE975> \xED\xFC |3
-<UFE976> \xF4\x40 |0
-<UFE976> \xEE\x40 |3
-<UFE977> \xF4\x4E |0
-<UFE977> \xEE\x4E |3
-<UFE978> \xF4\x4F |0
-<UFE978> \xEE\x4F |3
-<UFE979> \xF4\x50 |0
-<UFE979> \xEE\x50 |3
-<UFE97A> \xF4\x51 |0
-<UFE97A> \xEE\x51 |3
-<UFE97B> \xF4\x52 |0
-<UFE97B> \xEE\x52 |3
-<UFE97C> \xF4\x53 |0
-<UFE97C> \xEE\x53 |3
-<UFE97D> \xF4\x5A |0
-<UFE97D> \xEE\x5A |3
-<UFE97E> \xF4\x5D |0
-<UFE97E> \xEE\x5D |3
-<UFE97F> \xF4\x74 |0
-<UFE97F> \xEE\x74 |3
-<UFE980> \xF6\x85 |0
-<UFE980> \xEB\x85 |3
-<UFE981> \xF7\xB4 |0
-<UFE981> \xEC\xB4 |3
-<UFE982> \xF6\x9B |0
-<UFE982> \xEB\x9B |3
-<UFE983> \xF6\x9C |0
-<UFE983> \xEB\x9C |3
-<UFE984> \xF3\x82 |0
-<UFE984> \xED\x82 |3
-<UFE985> \xF3\x6A |0
-<UFE985> \xED\x6A |3
-<UFE986> \xF6\x9A |0
-<UFE986> \xEB\x9A |3
-<UFE987> \xF3\x6B |0
-<UFE987> \xED\x6B |3
-<UFE988> \xF4\x42 |0
-<UFE988> \xEE\x42 |3
-<UFEAF0> \xF7\x71 |0
-<UFEAF0> \xEC\x71 |3
-<UFEAF1> \xF7\x69 |0
-<UFEAF1> \xEC\x69 |3
-<UFEAF2> \xF7\x68 |0
-<UFEAF2> \xEC\x68 |3
-<UFEAF3> \xF7\x72 |0
-<UFEAF3> \xEC\x72 |3
-<UFEAF4> \xF3\xEE |0
-<UFEAF4> \xED\xEE |3
-<UFEAF5> \xF3\xEF |0
-<UFEAF5> \xED\xEF |3
-<UFEAF6> \xF4\x7E |0
-<UFEAF6> \xEE\x7E |3
-<UFEAF7> \xF4\x80 |0
-<UFEAF7> \xEE\x80 |3
-<UFEAF8> \xF7\x5B |0
-<UFEAF8> \xEC\x5B |3
-<UFEAF9> \xF7\x5C |0
-<UFEAF9> \xEC\x5C |3
-<UFEAFA> \xF7\x6E |0
-<UFEAFA> \xEC\x6E |3
-<UFEAFB> \xF7\x6F |0
-<UFEAFB> \xEC\x6F |3
-<UFEAFC> \xF7\x4A |0
-<UFEAFC> \xEC\x4A |3
-<UFEAFD> \xF7\x49 |0
-<UFEAFD> \xEC\x49 |3
-<UFEAFE> \xF7\x4C |0
-<UFEAFE> \xEC\x4C |3
-<UFEAFF> \xF7\x4B |0
-<UFEAFF> \xEC\x4B |3
-<UFEB00> \xF7\x5E |0
-<UFEB00> \xEC\x5E |3
-<UFEB01> \xF7\x5F |0
-<UFEB01> \xEC\x5F |3
-<UFEB02> \xF7\x60 |0
-<UFEB02> \xEC\x60 |3
-<UFEB03> \xF7\x61 |0
-<UFEB03> \xEC\x61 |3
-<UFEB04> \xF6\x5A |0
-<UFEB04> \xEB\x5A |3
-<UFEB05> \xF3\xF0 |0
-<UFEB05> \xED\xF0 |3
-<UFEB06> \xF3\xF1 |0
-<UFEB06> \xED\xF1 |3
-<UFEB08> \xF3\xF2 |0
-<UFEB08> \xED\xF2 |3
-<UFEB09> \xF6\x5B |0
-<UFEB09> \xEB\x5B |3
+<UFE82C> \xF4\x89 |1
+<UFE82E> \xF6\xFB |1
+<UFE82F> \xF6\xFC |1
+<UFE830> \xF7\x40 |1
+<UFE831> \xF7\x41 |1
+<UFE832> \xF7\x42 |1
+<UFE833> \xF7\x43 |1
+<UFE834> \xF7\x44 |1
+<UFE835> \xF7\x45 |1
+<UFE836> \xF7\x46 |1
+<UFE837> \xF7\xC9 |1
+<UFE838> \xF3\x57 |1
+<UFE839> \xF3\x63 |1
+<UFE83A> \xF3\x64 |1
+<UFE83B> \xF7\x47 |1
+<UFE960> \xF6\xAF |1
+<UFE961> \xF6\xAE |1
+<UFE962> \xF6\xA9 |1
+<UFE963> \xF7\xD1 |1
+<UFE964> \xF3\x83 |1
+<UFE965> \xF6\xAA |1
+<UFE966> \xF3\x84 |1
+<UFE967> \xF3\x85 |1
+<UFE968> \xF3\x86 |1
+<UFE969> \xF3\x87 |1
+<UFE96A> \xF3\x88 |1
+<UFE96B> \xF3\x89 |1
+<UFE96C> \xF3\x8A |1
+<UFE96D> \xF3\x8B |1
+<UFE96E> \xF3\x8C |1
+<UFE96F> \xF3\x91 |1
+<UFE970> \xF3\x92 |1
+<UFE971> \xF3\xBE |1
+<UFE972> \xF6\x9D |1
+<UFE973> \xF6\xC6 |1
+<UFE974> \xF3\xFB |1
+<UFE975> \xF3\xFC |1
+<UFE976> \xF4\x40 |1
+<UFE977> \xF4\x4E |1
+<UFE978> \xF4\x4F |1
+<UFE979> \xF4\x50 |1
+<UFE97A> \xF4\x51 |1
+<UFE97B> \xF4\x52 |1
+<UFE97C> \xF4\x53 |1
+<UFE97D> \xF4\x5A |1
+<UFE97E> \xF4\x5D |1
+<UFE97F> \xF4\x74 |1
+<UFE980> \xF6\x85 |1
+<UFE981> \xF7\xB4 |1
+<UFE982> \xF6\x9B |1
+<UFE983> \xF6\x9C |1
+<UFE984> \xF3\x82 |1
+<UFE985> \xF3\x6A |1
+<UFE986> \xF6\x9A |1
+<UFE987> \xF3\x6B |1
+<UFE988> \xF4\x42 |1
+<UFEAF0> \xF7\x71 |1
+<UFEAF1> \xF7\x69 |1
+<UFEAF2> \xF7\x68 |1
+<UFEAF3> \xF7\x72 |1
+<UFEAF4> \xF3\xEE |1
+<UFEAF5> \xF3\xEF |1
+<UFEAF6> \xF4\x7E |1
+<UFEAF7> \xF4\x80 |1
+<UFEAF8> \xF7\x5B |1
+<UFEAF9> \xF7\x5C |1
+<UFEAFA> \xF7\x6E |1
+<UFEAFB> \xF7\x6F |1
+<UFEAFC> \xF7\x4A |1
+<UFEAFD> \xF7\x49 |1
+<UFEAFE> \xF7\x4C |1
+<UFEAFF> \xF7\x4B |1
+<UFEB00> \xF7\x5E |1
+<UFEB01> \xF7\x5F |1
+<UFEB02> \xF7\x60 |1
+<UFEB03> \xF7\x61 |1
+<UFEB04> \xF6\x5A |1
+<UFEB05> \xF3\xF0 |1
+<UFEB06> \xF3\xF1 |1
+<UFEB08> \xF3\xF2 |1
+<UFEB09> \xF6\x5B |1
<UFEB0A> \xF6\x5B |1
<UFEB0B> \xF6\x5A |1
-<UFEB0C> \xF7\xB2 |0
-<UFEB0C> \xEC\xB2 |3
-<UFEB0D> \xF4\x79 |0
-<UFEB0D> \xEE\x79 |3
-<UFEB0E> \xF6\x4F |0
-<UFEB0E> \xEB\x4F |3
-<UFEB0F> \xF6\x50 |0
-<UFEB0F> \xEB\x50 |3
-<UFEB10> \xF3\x79 |0
-<UFEB10> \xED\x79 |3
+<UFEB0C> \xF7\xB2 |1
+<UFEB0D> \xF4\x79 |1
+<UFEB0E> \xF6\x4F |1
+<UFEB0F> \xF6\x50 |1
+<UFEB10> \xF3\x79 |1
<UFEB11> \xF4\x79 |1
-<UFEB12> \xF6\xC3 |0
-<UFEB12> \xEB\xC3 |3
-<UFEB13> \xF3\x7A |0
-<UFEB13> \xED\x7A |3
-<UFEB14> \xF3\x7B |0
-<UFEB14> \xED\x7B |3
-<UFEB15> \xF3\x7C |0
-<UFEB15> \xED\x7C |3
-<UFEB16> \xF3\x7D |0
-<UFEB16> \xED\x7D |3
-<UFEB17> \xF4\x58 |0
-<UFEB17> \xEE\x58 |3
-<UFEB18> \xF7\xCC |0
-<UFEB18> \xEC\xCC |3
+<UFEB12> \xF6\xC3 |1
+<UFEB13> \xF3\x7A |1
+<UFEB14> \xF3\x7B |1
+<UFEB15> \xF3\x7C |1
+<UFEB16> \xF3\x7D |1
+<UFEB17> \xF4\x58 |1
+<UFEB18> \xF7\xCC |1
<UFEB19> \xF7\xB2 |1
-<UFEB1A> \xF3\x78 |0
-<UFEB1A> \xED\x78 |3
-<UFEB1B> \xF7\xBE |0
-<UFEB1B> \xEC\xBE |3
-<UFEB1C> \xF7\xBF |0
-<UFEB1C> \xEC\xBF |3
-<UFEB1D> \xF7\xC0 |0
-<UFEB1D> \xEC\xC0 |3
-<UFEB1E> \xF6\x55 |0
-<UFEB1E> \xEB\x55 |3
-<UFEB1F> \xF6\x56 |0
-<UFEB1F> \xEB\x56 |3
-<UFEB20> \xF6\x57 |0
-<UFEB20> \xEB\x57 |3
-<UFEB21> \xF7\x95 |0
-<UFEB21> \xEC\x95 |3
-<UFEB22> \xF3\xED |0
-<UFEB22> \xED\xED |3
-<UFEB23> \xF6\x59 |0
-<UFEB23> \xEB\x59 |3
-<UFEB25> \xF3\x56 |0
-<UFEB25> \xED\x56 |3
-<UFEB26> \xF6\x5C |0
-<UFEB26> \xEB\x5C |3
-<UFEB27> \xF7\xCA |0
-<UFEB27> \xEC\xCA |3
-<UFEB29> \xF7\x74 |0
-<UFEB29> \xEC\x74 |3
-<UFEB2A> \xF7\x6A |0
-<UFEB2A> \xEC\x6A |3
-<UFEB2B> \xF6\xCA |0
-<UFEB2B> \xEB\xCA |3
-<UFEB2C> \xF4\x7D |0
-<UFEB2C> \xEE\x7D |3
-<UFEB2D> \xF7\x75 |0
-<UFEB2D> \xEC\x75 |3
-<UFEB2F> \xF3\x5D |0
-<UFEB2F> \xED\x5D |3
-<UFEB31> \xF3\x5C |0
-<UFEB31> \xED\x5C |3
-<UFEB32> \xF3\x45 |0
-<UFEB32> \xED\x45 |3
+<UFEB1A> \xF3\x78 |1
+<UFEB1B> \xF7\xBE |1
+<UFEB1C> \xF7\xBF |1
+<UFEB1D> \xF7\xC0 |1
+<UFEB1E> \xF6\x55 |1
+<UFEB1F> \xF6\x56 |1
+<UFEB20> \xF6\x57 |1
+<UFEB21> \xF7\x95 |1
+<UFEB22> \xF3\xED |1
+<UFEB23> \xF6\x59 |1
+<UFEB25> \xF3\x56 |1
+<UFEB26> \xF6\x5C |1
+<UFEB27> \xF7\xCA |1
+<UFEB29> \xF7\x74 |1
+<UFEB2A> \xF7\x6A |1
+<UFEB2B> \xF6\xCA |1
+<UFEB2C> \xF4\x7D |1
+<UFEB2D> \xF7\x75 |1
+<UFEB2F> \xF3\x5D |1
+<UFEB31> \xF3\x5C |1
+<UFEB32> \xF3\x45 |1
<UFEB35> \xF3\xD9 |1
-<UFEB36> \xF7\xE5 |0
-<UFEB36> \xEC\xE5 |3
-<UFEB37> \xF6\xE8 |0
-<UFEB37> \xEB\xE8 |3
-<UFEB38> \xF3\x58 |0
-<UFEB38> \xED\x58 |3
-<UFEB3D> \xF6\xD0 |0
-<UFEB3D> \xEB\xD0 |3
-<UFEB3E> \xF3\x59 |0
-<UFEB3E> \xED\x59 |3
-<UFEB3F> \xF3\x5A |0
-<UFEB3F> \xED\x5A |3
-<UFEB40> \xF3\x5E |0
-<UFEB40> \xED\x5E |3
-<UFEB41> \xF3\x5F |0
-<UFEB41> \xED\x5F |3
-<UFEB43> \xF3\x6C |0
-<UFEB43> \xED\x6C |3
-<UFEB44> \xF3\x81 |0
-<UFEB44> \xED\x81 |3
-<UFEB45> \xF7\x6C |0
-<UFEB45> \xEC\x6C |3
-<UFEB46> \xF7\x6D |0
-<UFEB46> \xEC\x6D |3
-<UFEB47> \xF7\x4F |0
-<UFEB47> \xEC\x4F |3
-<UFEB48> \xF7\x5D |0
-<UFEB48> \xEC\x5D |3
-<UFEB49> \xF7\x73 |0
-<UFEB49> \xEC\x73 |3
-<UFEB4A> \xF7\x7A |0
-<UFEB4A> \xEC\x7A |3
-<UFEB4B> \xF7\xA7 |0
-<UFEB4B> \xEC\xA7 |3
-<UFEB4C> \xF7\xA9 |0
-<UFEB4C> \xEC\xA9 |3
-<UFEB4D> \xF7\xAA |0
-<UFEB4D> \xEC\xAA |3
-<UFEB4E> \xF7\xAB |0
-<UFEB4E> \xEC\xAB |3
-<UFEB4F> \xF6\xC1 |0
-<UFEB4F> \xEB\xC1 |3
-<UFEB50> \xF7\xD8 |0
-<UFEB50> \xEC\xD8 |3
-<UFEB51> \xF7\x58 |0
-<UFEB51> \xEC\x58 |3
-<UFEB52> \xF7\x59 |0
-<UFEB52> \xEC\x59 |3
-<UFEB53> \xF7\x6B |0
-<UFEB53> \xEC\x6B |3
-<UFEB54> \xF7\x70 |0
-<UFEB54> \xEC\x70 |3
-<UFEB56> \xF6\x4E |0
-<UFEB56> \xEB\x4E |3
-<UFEB57> \xF6\xBE |0
-<UFEB57> \xEB\xBE |3
-<UFEB58> \xF6\x52 |0
-<UFEB58> \xEB\x52 |3
-<UFEB59> \xF6\x4D |0
-<UFEB59> \xEB\x4D |3
-<UFEB5A> \xF7\xCD |0
-<UFEB5A> \xEC\xCD |3
-<UFEB5B> \xF7\xCE |0
-<UFEB5B> \xEC\xCE |3
-<UFEB5C> \xF6\xBF |0
-<UFEB5C> \xEB\xBF |3
-<UFEB5D> \xF6\xCD |0
-<UFEB5D> \xEB\xCD |3
-<UFEB5E> \xF6\xC2 |0
-<UFEB5E> \xEB\xC2 |3
-<UFEB5F> \xF4\x60 |0
-<UFEB5F> \xEE\x60 |3
-<UFEB60> \xF3\x7E |0
-<UFEB60> \xED\x7E |3
-<UFEB61> \xF6\x51 |0
-<UFEB61> \xEB\x51 |3
-<UFEB62> \xF7\x5A |0
-<UFEB62> \xEC\x5A |3
-<UFEB63> \xF7\x66 |0
-<UFEB63> \xEC\x66 |3
-<UFEB64> \xF7\x67 |0
-<UFEB64> \xEC\x67 |3
-<UFEB65> \xF7\x56 |0
-<UFEB65> \xEC\x56 |3
-<UFEB66> \xF7\x57 |0
-<UFEB66> \xEC\x57 |3
+<UFEB36> \xF7\xE5 |1
+<UFEB37> \xF6\xE8 |1
+<UFEB38> \xF3\x58 |1
+<UFEB3D> \xF6\xD0 |1
+<UFEB3E> \xF3\x59 |1
+<UFEB3F> \xF3\x5A |1
+<UFEB40> \xF3\x5E |1
+<UFEB41> \xF3\x5F |1
+<UFEB43> \xF3\x6C |1
+<UFEB44> \xF3\x81 |1
+<UFEB45> \xF7\x6C |1
+<UFEB46> \xF7\x6D |1
+<UFEB47> \xF7\x4F |1
+<UFEB48> \xF7\x5D |1
+<UFEB49> \xF7\x73 |1
+<UFEB4A> \xF7\x7A |1
+<UFEB4B> \xF7\xA7 |1
+<UFEB4C> \xF7\xA9 |1
+<UFEB4D> \xF7\xAA |1
+<UFEB4E> \xF7\xAB |1
+<UFEB4F> \xF6\xC1 |1
+<UFEB50> \xF7\xD8 |1
+<UFEB51> \xF7\x58 |1
+<UFEB52> \xF7\x59 |1
+<UFEB53> \xF7\x6B |1
+<UFEB54> \xF7\x70 |1
+<UFEB56> \xF6\x4E |1
+<UFEB57> \xF6\xBE |1
+<UFEB58> \xF6\x52 |1
+<UFEB59> \xF6\x4D |1
+<UFEB5A> \xF7\xCD |1
+<UFEB5B> \xF7\xCE |1
+<UFEB5C> \xF6\xBF |1
+<UFEB5D> \xF6\xCD |1
+<UFEB5E> \xF6\xC2 |1
+<UFEB5F> \xF4\x60 |1
+<UFEB60> \xF3\x7E |1
+<UFEB61> \xF6\x51 |1
+<UFEB62> \xF7\x5A |1
+<UFEB63> \xF7\x66 |1
+<UFEB64> \xF7\x67 |1
+<UFEB65> \xF7\x56 |1
+<UFEB66> \xF7\x57 |1
<UFEB67> \xF7\x67 |1
-<UFEB68> \xF6\x63 |0
-<UFEB68> \xEB\x63 |3
+<UFEB68> \xF6\x63 |1
<UFEB69> \xF6\x63 |1
-<UFEB6A> \xF6\x40 |0
-<UFEB6A> \xEB\x40 |3
-<UFEB6B> \xF7\x64 |0
-<UFEB6B> \xEC\x64 |3
-<UFEB6C> \xF7\x65 |0
-<UFEB6C> \xEC\x65 |3
-<UFEB6D> \xF7\x4D |0
-<UFEB6D> \xEC\x4D |3
-<UFEB6E> \xF7\x4E |0
-<UFEB6E> \xEC\x4E |3
-<UFEB6F> \xF7\x50 |0
-<UFEB6F> \xEC\x50 |3
-<UFEB70> \xF7\x51 |0
-<UFEB70> \xEC\x51 |3
-<UFEB71> \xF7\x54 |0
-<UFEB71> \xEC\x54 |3
-<UFEB72> \xF7\x55 |0
-<UFEB72> \xEC\x55 |3
-<UFEB73> \xF7\x62 |0
-<UFEB73> \xEC\x62 |3
-<UFEB74> \xF7\x63 |0
-<UFEB74> \xEC\x63 |3
-<UFEB75> \xF7\x52 |0
-<UFEB75> \xEC\x52 |3
-<UFEB76> \xF7\x53 |0
-<UFEB76> \xEC\x53 |3
-<UFEB77> \xF6\x44 |0
-<UFEB77> \xEB\x44 |3
-<UFEB78> \xF7\x76 |0
-<UFEB78> \xEC\x76 |3
-<UFEB79> \xF7\x77 |0
-<UFEB79> \xEC\x77 |3
-<UFEB7A> \xF6\xC9 |0
-<UFEB7A> \xEB\xC9 |3
-<UFEB7B> \xF6\xCB |0
-<UFEB7B> \xEB\xCB |3
-<UFEB7C> \xF7\xD4 |0
-<UFEB7C> \xEC\xD4 |3
-<UFEB7D> \xF7\xD5 |0
-<UFEB7D> \xEC\xD5 |3
-<UFEB7E> \xF7\xD6 |0
-<UFEB7E> \xEC\xD6 |3
-<UFEB7F> \xF7\xD7 |0
-<UFEB7F> \xEC\xD7 |3
-<UFEB80> \xF4\x59 |0
-<UFEB80> \xEE\x59 |3
-<UFEB81> \xF3\x5B |0
-<UFEB81> \xED\x5B |3
-<UFEB82> \xF6\xF2 |0
-<UFEB82> \xEB\xF2 |3
-<UFEB83> \xF7\x79 |0
-<UFEB83> \xEC\x79 |3
-<UFEB84> \xF7\xC8 |0
-<UFEB84> \xEC\xC8 |3
-<UFEB85> \xF6\xF1 |0
-<UFEB85> \xEB\xF1 |3
-<UFEB86> \xF6\xF5 |0
-<UFEB86> \xEB\xF5 |3
+<UFEB6A> \xF6\x40 |1
+<UFEB6B> \xF7\x64 |1
+<UFEB6C> \xF7\x65 |1
+<UFEB6D> \xF7\x4D |1
+<UFEB6E> \xF7\x4E |1
+<UFEB6F> \xF7\x50 |1
+<UFEB70> \xF7\x51 |1
+<UFEB71> \xF7\x54 |1
+<UFEB72> \xF7\x55 |1
+<UFEB73> \xF7\x62 |1
+<UFEB74> \xF7\x63 |1
+<UFEB75> \xF7\x52 |1
+<UFEB76> \xF7\x53 |1
+<UFEB77> \xF6\x44 |1
+<UFEB78> \xF7\x76 |1
+<UFEB79> \xF7\x77 |1
+<UFEB7A> \xF6\xC9 |1
+<UFEB7B> \xF6\xCB |1
+<UFEB7C> \xF7\xD4 |1
+<UFEB7D> \xF7\xD5 |1
+<UFEB7E> \xF7\xD6 |1
+<UFEB7F> \xF7\xD7 |1
+<UFEB80> \xF4\x59 |1
+<UFEB81> \xF3\x5B |1
+<UFEB82> \xF6\xF2 |1
+<UFEB83> \xF7\x79 |1
+<UFEB84> \xF7\xC8 |1
+<UFEB85> \xF6\xF1 |1
+<UFEB86> \xF6\xF5 |1
<UFEB87> \xF6\xF5 |1
-<UFEB88> \xF7\x78 |0
-<UFEB88> \xEC\x78 |3
-<UFEB89> \xF7\xD2 |0
-<UFEB89> \xEC\xD2 |3
-<UFEB8A> \xF7\xD3 |0
-<UFEB8A> \xEC\xD3 |3
-<UFEB8B> \xF7\xD9 |0
-<UFEB8B> \xEC\xD9 |3
-<UFEB8C> \xF7\xDB |0
-<UFEB8C> \xEC\xDB |3
-<UFEB8D> \xF7\xDC |0
-<UFEB8D> \xEC\xDC |3
-<UFEB8E> \xF7\xDD |0
-<UFEB8E> \xEC\xDD |3
-<UFEB8F> \xF7\xDE |0
-<UFEB8F> \xEC\xDE |3
-<UFEB90> \xF7\xE3 |0
-<UFEB90> \xEC\xE3 |3
-<UFEB91> \xF7\xE4 |0
-<UFEB91> \xEC\xE4 |3
-<UFEB92> \xF4\x75 |0
-<UFEB92> \xEE\x75 |3
-<UFEB93> \xF4\x88 |0
-<UFEB93> \xEE\x88 |3
-<UFEB94> \xF7\xC3 |0
-<UFEB94> \xEC\xC3 |3
-<UFEB95> \xF7\xC4 |0
-<UFEB95> \xEC\xC4 |3
-<UFEB96> \xF6\xCC |0
-<UFEB96> \xEB\xCC |3
-<UFEB97> \xF6\xD2 |0
-<UFEB97> \xEB\xD2 |3
-<UFEB98> \xF6\xCF |0
-<UFEB98> \xEB\xCF |3
-<UFEB99> \xF3\x60 |0
-<UFEB99> \xED\x60 |3
-<UFEB9A> \xF3\x61 |0
-<UFEB9A> \xED\x61 |3
-<UFEB9B> \xF6\xD8 |0
-<UFEB9B> \xEB\xD8 |3
-<UFEB9C> \xF6\xD9 |0
-<UFEB9C> \xEB\xD9 |3
-<UFEB9D> \xF3\xAA |0
-<UFEB9D> \xED\xAA |3
-<UFEB9E> \xF3\xA7 |0
-<UFEB9E> \xED\xA7 |3
-<UFEB9F> \xF3\xA8 |0
-<UFEB9F> \xED\xA8 |3
-<UFEBA0> \xF3\xA9 |0
-<UFEBA0> \xED\xA9 |3
+<UFEB88> \xF7\x78 |1
+<UFEB8A> \xF7\xD3 |1
+<UFEB8B> \xF7\xD9 |1
+<UFEB8C> \xF7\xDB |1
+<UFEB8D> \xF7\xDC |1
+<UFEB8E> \xF7\xDD |1
+<UFEB8F> \xF7\xDE |1
+<UFEB90> \xF7\xE3 |1
+<UFEB91> \xF7\xE4 |1
+<UFEB92> \xF4\x75 |1
+<UFEB93> \xF4\x88 |1
+<UFEB94> \xF7\xC3 |1
+<UFEB95> \xF7\xC4 |1
+<UFEB96> \xF6\xCC |1
+<UFEB97> \xF6\xD2 |1
+<UFEB98> \xF6\xCF |1
+<UFEB99> \xF3\x60 |1
+<UFEB9A> \xF3\x61 |1
+<UFEB9B> \xF6\xD8 |1
+<UFEB9C> \xF6\xD9 |1
+<UFEB9D> \xF3\xAA |1
+<UFEB9E> \xF3\xA7 |1
+<UFEB9F> \xF3\xA8 |1
+<UFEBA0> \xF3\xA9 |1
<UFEBA1> \xF3\xAA |1
-<UFEE1C> \xF6\xF0 |1
-<UFEE33> \xF7\xD9 |1
-<UFEE40> \xF7\x94 |0
-<UFEE40> \xEC\x94 |3
-<UFEE41> \xF7\xCF |0
-<UFEE41> \xEC\xCF |3
-<UFEE42> \xF3\x70 |0
-<UFEE42> \xED\x70 |3
-<UFEE43> \xF4\x78 |0
-<UFEE43> \xEE\x78 |3
-<UFEE44> \xF4\x86 |0
-<UFEE44> \xEE\x86 |3
-<UFEE45> \xF4\x8E |0
-<UFEE45> \xEE\x8E |3
-<UFEE46> \xF4\x8F |0
-<UFEE46> \xEE\x8F |3
-<UFEE47> \xF4\x90 |0
-<UFEE47> \xEE\x90 |3
-<UFEE48> \xF4\x91 |0
-<UFEE48> \xEE\x91 |3
-<UFEE49> \xF4\x92 |0
-<UFEE49> \xEE\x92 |3
-<UFEE4A> \xF4\x93 |0
-<UFEE4A> \xEE\x93 |3
END CHARMAP
diff --git a/data/mappings/softbank-shift_jis-2007.ucm b/data/mappings/softbank-shift_jis-2012.ucm
similarity index 86%
rename from data/mappings/softbank-shift_jis-2007.ucm
rename to data/mappings/softbank-shift_jis-2012.ucm
index 27c8c28..206882f 100644
--- a/data/mappings/softbank-shift_jis-2007.ucm
+++ b/data/mappings/softbank-shift_jis-2012.ucm
@@ -1,5 +1,5 @@
# SoftBank's Shift_JIS. See README.emoji for details.
-<code_set_name> "softbank-shift_jis-2007"
+<code_set_name> "softbank-shift_jis-2012"
<mb_cur_max> 2
<mb_cur_min> 1
<uconv_class> "MBCS"
@@ -7827,584 +7827,608 @@
<U2016> \x81\x61 |1
<U2212> \x81\x7C |1
<U301C> \x81\x60 |1
-<UFE000> \xF9\x8B |0
-<UFE001> \xF9\x8A |0
-<UFE002> \xF9\x8C |0
-<UFE003> \xF9\x89 |0
-<UFE004> \xF7\x7D |0
-<UFE005> \xFB\x84 |0
-<UFE007> \xFB\x7C |0
-<UFE008> \xFB\x8C |0
-<UFE009> \xF9\x8E |0
-<UFE00A> \xFB\x8A |0
-<UFE00B> \xF7\x87 |0
-<UFE00C> \xFB\x8B |0
-<UFE00D> \xFB\x8D |0
-<UFE00F> \xF9\x8B\xF9\x8A |1
-<UFE010> \xFB\x8C |1
-<UFE012> \xF9\x8D |1
-<UFE013> \xF9\x8D |1
-<UFE014> \xF9\x8D |0
-<UFE016> \xF9\x8D |1
-<UFE017> \xFB\x87 |0
-<UFE01E> \xF9\x64 |0
-<UFE01F> \xF9\x65 |0
-<UFE020> \xF9\x66 |0
-<UFE021> \xF9\x67 |0
-<UFE022> \xF9\x68 |0
-<UFE023> \xF9\x69 |0
-<UFE024> \xF9\x6A |0
-<UFE025> \xF9\x6B |0
-<UFE026> \xF9\x6C |0
-<UFE027> \xF9\x6D |0
-<UFE028> \xF9\x6E |0
-<UFE029> \xF9\x6F |0
-<UFE02A> \xF9\x6D |1
-<UFE02B> \xF7\xDF |0
-<UFE02C> \xF7\xE0 |0
-<UFE02D> \xF7\xE1 |0
-<UFE02E> \xF7\xE2 |0
-<UFE02F> \xF7\xE3 |0
-<UFE030> \xF7\xE4 |0
-<UFE031> \xF7\xE5 |0
-<UFE032> \xF7\xE6 |0
-<UFE033> \xF7\xE7 |0
-<UFE034> \xF7\xE8 |0
-<UFE035> \xF7\xE9 |0
-<UFE036> \xF7\xEA |0
-<UFE037> \xF7\xEB |0
-<UFE038> \xFB\x7E |0
-<UFE03B> \xFB\x8C |1
-<UFE03C> \xF7\x50 |0
-<UFE03D> \xF9\xA4 |0
-<UFE03E> \xF7\x50 |1
-<UFE03F> \xF7\x58 |0
-<UFE040> \xF9\x70 |0
-<UFE041> \xF9\x72 |0
-<UFE042> \xF7\x59 |0
-<UFE043> \xFB\x88 |0
-<UFE044> \xF7\xA9 |0
-<UFE045> \xF9\xA3 |0
-<UFE046> \xF9\xA5 |0
-<UFE047> \xF9\xA7 |0
-<UFE048> \xF9\xA8 |0
-<UFE049> \xFB\x85 |0
-<UFE04D> \xF9\xA5 |1
-<UFE04E> \xF7\x50 |1
-<UFE051> \xF9\xE5 |0
-<UFE052> \xF9\xE6 |0
-<UFE053> \xF9\xE7 |0
-<UFE054> \xF9\xE8 |0
-<UFE055> \xF9\xE9 |0
-<UFE056> \xF9\xEA |0
-<UFE05B> \xF9\xE5 |1
-<UFE190> \xFB\x59 |0
-<UFE191> \xFB\x5B |0
-<UFE192> \xFB\x5A |0
-<UFE193> \xFB\x5C |0
-<UFE194> \xFB\x49 |1
-<UFE195> \xF9\xBC |0
-<UFE196> \xF9\xBD |0
-<UFE197> \xF9\xBE |0
-<UFE198> \xF9\xBF |0
-<UFE199> \xF9\xC0 |0
-<UFE19B> \xF9\x41 |0
-<UFE19C> \xF9\x42 |0
-<UFE19D> \xF9\x44 |0
-<UFE19E> \xF9\x45 |0
-<UFE1A0> \xFB\x68 |0
-<UFE1A1> \xF7\x93 |0
-<UFE1A2> \xFB\x69 |0
-<UFE1A4> \xFB\xB5 |0
-<UFE1A5> \xFB\xB6 |0
-<UFE1A6> \xFB\xB7 |0
-<UFE1A7> \xFB\xB8 |0
-<UFE1A8> \xFB\xB9 |0
-<UFE1A9> \xFB\xBA |0
-<UFE1AA> \xFB\xBB |0
-<UFE1AB> \xFB\xBC |0
-<UFE1AE> \xF7\x5B |0
-<UFE1AF> \xF9\x8F |0
-<UFE1B0> \xF7\x4C |0
-<UFE1B1> \xF7\x6B |0
-<UFE1B2> \xF7\x5A |0
-<UFE1B3> \xF7\x5C |0
-<UFE1B4> \xF7\xF3 |0
-<UFE1B5> \xFB\xBE |0
-<UFE1B6> \xFB\xBF |0
-<UFE1B7> \xF9\x93 |0
-<UFE1B8> \xF9\x90 |0
-<UFE1BA> \xFB\xC3 |0
-<UFE1BB> \xFB\xC3 |1
-<UFE1BC> \xF9\x96 |0
-<UFE1BD> \xF9\x59 |0
-<UFE1BE> \xF9\x5A |0
-<UFE1BF> \xF7\x4B |0
-<UFE1C0> \xF9\x91 |0
-<UFE1C1> \xF9\x92 |0
-<UFE1C2> \xF9\x94 |0
-<UFE1C3> \xF9\x95 |0
-<UFE1C4> \xF7\x49 |0
-<UFE1C5> \xF7\x4A |0
-<UFE1C6> \xFB\x82 |0
-<UFE1C7> \xFB\xC0 |0
-<UFE1C8> \xFB\xC1 |0
-<UFE1C9> \xFB\xC2 |0
-<UFE1CA> \xFB\xC4 |0
-<UFE1CB> \xFB\xC5 |0
-<UFE1CC> \xFB\xC6 |0
-<UFE1CD> \xFB\xC7 |0
-<UFE1CE> \xFB\xC8 |0
-<UFE1CF> \xFB\xC9 |0
-<UFE1D0> \xFB\xCA |0
-<UFE1D1> \xFB\xCB |0
-<UFE1D2> \xFB\xCC |0
-<UFE1D3> \xFB\xCD |0
-<UFE1D4> \xFB\xCE |0
-<UFE1D5> \xFB\xCF |0
-<UFE1D6> \xFB\xD0 |0
-<UFE1D7> \xFB\xD1 |0
-<UFE1D8> \xF9\x93 |1
-<UFE1D9> \xF9\x59 |1
-<UFE1DB> \xFB\xD6 |1
-<UFE1DD> \xFB\xC3 |1
-<UFE1E0> \xF7\x4B |1
-<UFE320> \xF9\x9A |0
-<UFE321> \xFB\x43 |1
-<UFE322> \xFB\x50 |0
-<UFE323> \xF9\x99 |0
-<UFE324> \xFB\x46 |1
-<UFE325> \xFB\x4F |0
-<UFE326> \xFB\x4E |0
-<UFE327> \xF7\x46 |0
-<UFE328> \xFB\x44 |0
-<UFE329> \xF7\x45 |0
-<UFE32A> \xFB\x49 |0
-<UFE32B> \xF9\x97 |1
-<UFE32C> \xFB\x58 |0
-<UFE32D> \xFB\x57 |0
-<UFE32E> \xFB\x4C |0
-<UFE32F> \xFB\x4D |0
-<UFE330> \xF9\x98 |0
-<UFE331> \xFB\x55\xF9\xD1 |1
-<UFE332> \xFB\x4A |1
-<UFE333> \xFB\x44 |1
-<UFE334> \xFB\x52 |0
-<UFE335> \xF9\x97 |0
-<UFE336> \xF9\x97 |1
-<UFE337> \xFB\x54 |0
-<UFE338> \xFB\x55 |0
-<UFE339> \xFB\x53 |0
-<UFE33A> \xFB\x51 |0
-<UFE33B> \xFB\x4B |0
-<UFE33C> \xFB\x46 |0
-<UFE33D> \xFB\x56 |0
-<UFE33E> \xFB\x4A |0
-<UFE33F> \xFB\x47 |0
-<UFE340> \xFB\x43 |0
-<UFE341> \xF7\x47 |0
-<UFE342> \xFB\x48 |0
-<UFE343> \xFB\x42 |0
-<UFE344> \xF7\x48 |0
-<UFE345> \xFB\x41 |0
-<UFE346> \xFB\x46 |1
-<UFE347> \xFB\x45 |0
-<UFE348> \xF9\x98 |1
-<UFE349> \xFB\x44 |1
-<UFE34A> \xFB\x52 |1
-<UFE34B> \xFB\x58 |1
-<UFE34C> \xF7\x46 |1
-<UFE34D> \xFB\x53 |1
-<UFE34E> \xFB\x56 |1
-<UFE34F> \xFB\x44 |1
-<UFE350> \xFB\x43 |1
-<UFE351> \xFB\x63 |0
-<UFE352> \xFB\x64 |0
-<UFE353> \xFB\x66 |0
-<UFE357> \xF9\x52 |1
-<UFE358> \xFB\x67 |0
-<UFE359> \xFB\x43 |1
-<UFE35A> \xFB\x56 |1
-<UFE35B> \xFB\x5D |0
-<UFE4B0> \xF9\x76 |0
-<UFE4B1> \xF9\x76 |1
-<UFE4B2> \xF9\x78 |0
-<UFE4B3> \xF7\x94 |0
-<UFE4B4> \xF7\x96 |0
-<UFE4B5> \xF7\x8E |0
-<UFE4B6> \xF7\x95 |0
-<UFE4B7> \xF7\x99 |0
-<UFE4B8> \xFB\xA1 |0
-<UFE4B9> \xF7\x97 |0
-<UFE4BA> \xF7\x98 |0
-<UFE4BB> \xF9\x77 |0
-<UFE4BC> \xF7\x61 |0
-<UFE4BD> \xFB\xA4 |0
-<UFE4BE> \xFB\xA5 |0
-<UFE4BF> \xFB\xA6 |0
-<UFE4C0> \xFB\xA8 |0
-<UFE4C1> \xF7\xA2 |1
-<UFE4C2> \xF9\xAB |1
-<UFE4C3> \xF9\x7B |0
-<UFE4C4> \xFB\xA9 |0
+# Mappings for Unicode Standard Emoji symbols.
+<U0023>+<U20E3> \xF7\xB0 |4
+<U0023>+<UFE0E>+<U20E3> \xF7\xB0 |4
+<U0023>+<UFE0F>+<U20E3> \xF7\xB0 |0
+<U0030>+<U20E3> \xF7\xC5 |4
+<U0030>+<UFE0E>+<U20E3> \xF7\xC5 |4
+<U0030>+<UFE0F>+<U20E3> \xF7\xC5 |0
+<U0031>+<U20E3> \xF7\xBC |4
+<U0031>+<UFE0E>+<U20E3> \xF7\xBC |4
+<U0031>+<UFE0F>+<U20E3> \xF7\xBC |0
+<U0032>+<U20E3> \xF7\xBD |4
+<U0032>+<UFE0E>+<U20E3> \xF7\xBD |4
+<U0032>+<UFE0F>+<U20E3> \xF7\xBD |0
+<U0033>+<U20E3> \xF7\xBE |4
+<U0033>+<UFE0E>+<U20E3> \xF7\xBE |4
+<U0033>+<UFE0F>+<U20E3> \xF7\xBE |0
+<U0034>+<U20E3> \xF7\xBF |4
+<U0034>+<UFE0E>+<U20E3> \xF7\xBF |4
+<U0034>+<UFE0F>+<U20E3> \xF7\xBF |0
+<U0035>+<U20E3> \xF7\xC0 |4
+<U0035>+<UFE0E>+<U20E3> \xF7\xC0 |4
+<U0035>+<UFE0F>+<U20E3> \xF7\xC0 |0
+<U0036>+<U20E3> \xF7\xC1 |4
+<U0036>+<UFE0E>+<U20E3> \xF7\xC1 |4
+<U0036>+<UFE0F>+<U20E3> \xF7\xC1 |0
+<U0037>+<U20E3> \xF7\xC2 |4
+<U0037>+<UFE0E>+<U20E3> \xF7\xC2 |4
+<U0037>+<UFE0F>+<U20E3> \xF7\xC2 |0
+<U0038>+<U20E3> \xF7\xC3 |4
+<U0038>+<UFE0E>+<U20E3> \xF7\xC3 |4
+<U0038>+<UFE0F>+<U20E3> \xF7\xC3 |0
+<U0039>+<U20E3> \xF7\xC4 |4
+<U0039>+<UFE0E>+<U20E3> \xF7\xC4 |4
+<U0039>+<UFE0F>+<U20E3> \xF7\xC4 |0
+<U00A9> \xF7\xEE |0
+<U00AE> \xF7\xEF |0
+<U2122> \xFB\xD7 |0
+<U2196> \xF7\xD7 |0
+<U2197> \xF7\xD6 |0
+<U2198> \xF7\xD8 |0
+<U2199> \xF7\xD9 |0
+<U23E9> \xF7\xDC |0
+<U23EA> \xF7\xDD |0
+<U23F0> \xF9\x6D |1
+<U24C2> \xFB\x74 |1
+<U25AA> \xF7\xBA |1
+<U25AB> \xF7\xBB |1
+<U25B6> \xF7\xDA |0
+<U25C0> \xF7\xDB |0
+<U25FB> \xF7\xBB |1
+<U25FC> \xF7\xBA |1
+<U25FD> \xF7\xBB |1
+<U25FE> \xF7\xBA |1
+<U2600> \xF9\x8B |0
+<U2601> \xF9\x8A |0
+<U260E> \xF9\x49 |0
+<U2614> \xF9\x8C |0
+<U2615> \xF9\x86 |0
+<U261D> \xF9\x4F |0
+<U263A> \xFB\x54 |0
+<U2648> \xF7\xDF |0
+<U2649> \xF7\xE0 |0
+<U264A> \xF7\xE1 |0
+<U264B> \xF7\xE2 |0
+<U264C> \xF7\xE3 |0
+<U264D> \xF7\xE4 |0
+<U264E> \xF7\xE5 |0
+<U264F> \xF7\xE6 |0
+<U2650> \xF7\xE7 |0
+<U2651> \xF7\xE8 |0
+<U2652> \xF7\xE9 |0
+<U2653> \xF7\xEA |0
+<U2660> \xF7\xAE |0
+<U2663> \xF7\xAF |0
+<U2665> \xF7\xAC |0
+<U2666> \xF7\xAD |0
+<U2668> \xF7\x63 |0
+<U267F> \xF7\xAA |0
+<U2693> \xF7\xA2 |1
+<U26A0> \xF7\xF2 |0
+<U26A1> \xF7\x7D |0
+<U26AA> \xF7\xB9 |1
+<U26AB> \xF7\xB9 |1
+<U26BD> \xF9\x58 |0
+<U26BE> \xF9\x56 |0
+<U26C4> \xF9\x89 |0
+<U26C5> \xF9\x8B+\xF9\x8A |1
+<U26CE> \xF7\xEB |0
+<U26D4> \xF7\x77 |1
+<U26EA> \xF9\x77 |0
+<U26F2> \xF7\x61 |0
+<U26F3> \xF9\x54 |0
+<U26F5> \xF9\x5C |0
+<U26FA> \xF7\x62 |0
+<U26FD> \xF9\x7A |0
+<U2702> \xF9\xB3 |0
+<U2708> \xF9\x5D |0
+<U2709> \xF7\x43 |1
+<U270A> \xF9\x50 |0
+<U270B> \xF9\x52 |0
+<U270C> \xF9\x51 |0
+<U270F> \xF9\xA1 |1
+<U2716> \xF9\xD3 |1
+<U2728> \xF9\xCE |0
+<U2733> \xF7\xA6 |0
+<U2734> \xF7\xA5 |0
+<U2747> \xF9\xCE |1
+<U274C> \xF9\xD3 |0
+<U274E> \xF9\xD3 |1
+<U2753> \xF9\x60 |0
+<U2754> \xF9\xD6 |0
+<U2755> \xF9\xD7 |0
+<U2757> \xF9\x61 |0
+<U2764> \xF9\x62 |0
+<U27A1> \xF7\xD4 |0
+<U27BF> \xF7\xB1 |0
+<U2934> \xF7\xD6 |1
+<U2935> \xF7\xD8 |1
+<U2B05> \xF7\xD5 |0
+<U2B06> \xF7\xD2 |0
+<U2B07> \xF7\xD3 |0
+<U2B1B> \xF7\xBA |1
+<U2B1C> \xF7\xBB |1
+<U2B50> \xF9\xCF |0
+<U2B55> \xF9\xD2 |0
+<U303D> \xF7\x6C |0
+<U3297> \xF9\xAD |0
+<U3299> \xF9\xB5 |0
+<U1F004> \xF7\x6D |0
+<U1F170> \xFB\xD2 |0
+<U1F171> \xFB\xD3 |0
+<U1F17E> \xFB\xD5 |0
+<U1F17F> \xF7\x90 |0
+<U1F18E> \xFB\xD4 |0
+<U1F192> \xF7\xB4 |0
+<U1F194> \xF7\xC9 |0
+<U1F195> \xF7\xB2 |0
+<U1F197> \xF7\xED |0
+<U1F199> \xF7\xB3 |0
+<U1F19A> \xF7\x6E |0
+<U1F1E8>+<U1F1F3> \xFB\xB3 |0
+<U1F1E9>+<U1F1EA> \xFB\xAE |0
+<U1F1EA>+<U1F1F8> \xFB\xB1 |0
+<U1F1EB>+<U1F1F7> \xFB\xAD |0
+<U1F1EC>+<U1F1E7> \xFB\xB0 |0
+<U1F1EE>+<U1F1F9> \xFB\xAF |0
+<U1F1EF>+<U1F1F5> \xFB\xAB |0
+<U1F1F0>+<U1F1F7> \xFB\xB4 |0
+<U1F1F7>+<U1F1FA> \xFB\xB2 |0
+<U1F1FA>+<U1F1F8> \xFB\xAC |0
+<U1F201> \xF7\xA3 |0
+<U1F202> \xF7\xC8 |0
+<U1F21A> \xF7\xB6 |0
+<U1F22F> \xF7\xCC |0
+<U1F233> \xF7\xCB |0
+<U1F235> \xF7\xCA |0
+<U1F236> \xF7\xB5 |0
+<U1F237> \xF7\xB7 |0
+<U1F238> \xF7\xB8 |0
+<U1F239> \xF7\xC7 |0
+<U1F23A> \xF7\xCD |0
+<U1F250> \xF7\xC6 |0
+<U1F300> \xFB\x84 |0
+<U1F302> \xFB\x7C |0
+<U1F303> \xFB\x8C |0
+<U1F304> \xF9\x8E |0
+<U1F305> \xFB\x8A |0
+<U1F306> \xF7\x87 |0
+<U1F307> \xFB\x8B |0
+<U1F308> \xFB\x8D |0
+<U1F309> \xFB\x8C |1
+<U1F30A> \xFB\x7E |0
+<U1F30C> \xFB\x8C |1
+<U1F313> \xF9\x8D |1
+<U1F314> \xF9\x8D |1
+<U1F319> \xF9\x8D |0
+<U1F31B> \xF9\x8D |1
+<U1F31F> \xF9\xD5 |0
+<U1F331> \xF7\x50 |1
+<U1F334> \xF9\xA7 |0
+<U1F335> \xF9\xA8 |0
+<U1F337> \xF9\xA4 |0
+<U1F338> \xF9\x70 |0
+<U1F339> \xF9\x72 |0
+<U1F33A> \xF9\xA3 |0
+<U1F33B> \xF9\xA5 |0
+<U1F33C> \xF9\xA5 |1
+<U1F33E> \xFB\x85 |0
+<U1F33F> \xF7\x50 |1
+<U1F340> \xF7\x50 |0
+<U1F341> \xF7\x58 |0
+<U1F342> \xF7\x59 |0
+<U1F343> \xFB\x88 |0
+<U1F345> \xF9\xE9 |0
+<U1F346> \xF9\xEA |0
+<U1F349> \xF9\xE8 |0
+<U1F34A> \xF9\xE6 |0
+<U1F34E> \xF9\xE5 |0
+<U1F34F> \xF9\xE5 |1
+<U1F353> \xF9\xE7 |0
+<U1F354> \xF7\x60 |0
+<U1F358> \xF9\xDD |0
+<U1F359> \xF9\xE2 |0
+<U1F35A> \xF9\xDE |0
+<U1F35B> \xF9\xE1 |0
+<U1F35C> \xF9\xE0 |0
+<U1F35D> \xF9\xDF |0
+<U1F35E> \xF9\xD9 |0
+<U1F35F> \xF9\xDB |0
+<U1F361> \xF9\xDC |0
+<U1F362> \xF9\xE3 |0
+<U1F363> \xF9\xE4 |0
+<U1F366> \xF9\xDA |0
+<U1F367> \xFB\x80 |0
+<U1F370> \xF9\x87 |0
+<U1F371> \xF9\xEC |0
+<U1F372> \xF9\xED |0
+<U1F373> \xF7\x88 |0
+<U1F374> \xF9\x84 |0
+<U1F375> \xF9\xD8 |0
+<U1F376> \xF9\xAB |0
+<U1F377> \xF9\x85 |1
+<U1F378> \xF9\x85 |0
+<U1F379> \xF9\x85 |1
+<U1F37A> \xF9\x88 |0
+<U1F37B> \xF9\xAC |0
+<U1F380> \xF9\xB4 |0
+<U1F381> \xF7\x52 |0
+<U1F382> \xF9\xEB |0
+<U1F383> \xFB\x86 |0
+<U1F384> \xF9\x73 |0
+<U1F385> \xFB\x89 |0
+<U1F386> \xF7\x57 |0
+<U1F387> \xFB\x81 |0
+<U1F388> \xF9\xB0 |0
+<U1F389> \xF9\xB2 |0
+<U1F38C> \xF7\x84 |0
+<U1F38D> \xFB\x76 |0
+<U1F38E> \xFB\x78 |0
+<U1F38F> \xFB\x7B |0
+<U1F390> \xFB\x83 |0
+<U1F391> \xFB\x87 |0
+<U1F392> \xFB\x7A |0
+<U1F393> \xFB\x79 |0
+<U1F3A1> \xF7\x64 |0
+<U1F3A2> \xFB\x73 |0
+<U1F3A3> \xF9\x59 |1
+<U1F3A4> \xF9\x7C |0
+<U1F3A5> \xF9\x7D |0
+<U1F3A6> \xFB\xA7 |0
+<U1F3A7> \xF9\xAA |0
+<U1F3A8> \xFB\xA2 |0
+<U1F3A9> \xFB\xA3 |0
+<U1F3AB> \xF7\x65 |0
+<U1F3AC> \xF9\xC4 |0
+<U1F3AD> \xFB\xA3 |1
+<U1F3AF> \xF7\x70 |0
+<U1F3B0> \xF7\x73 |0
+<U1F3B1> \xFB\x6C |0
+<U1F3B5> \xF9\x7E |0
+<U1F3B6> \xF9\xC6 |0
+<U1F3B7> \xF9\x81 |0
+<U1F3B8> \xF9\x82 |0
+<U1F3BA> \xF9\x83 |0
+<U1F3BC> \xF9\xC6 |1
+<U1F3BE> \xF9\x55 |0
+<U1F3BF> \xF9\x53 |0
+<U1F3C0> \xFB\x6A |0
+<U1F3C1> \xF7\x72 |0
+<U1F3C3> \xF7\x55 |0
+<U1F3C4> \xF9\x57 |0
+<U1F3C6> \xF7\x71 |0
+<U1F3C8> \xFB\x6B |0
+<U1F3CA> \xFB\x6D |0
+<U1F3E0> \xF9\x76 |0
+<U1F3E1> \xF9\x76 |1
+<U1F3E2> \xF9\x78 |0
+<U1F3E3> \xF7\x94 |0
+<U1F3E5> \xF7\x96 |0
+<U1F3E6> \xF7\x8E |0
+<U1F3E7> \xF7\x95 |0
+<U1F3E8> \xF7\x99 |0
+<U1F3E9> \xFB\xA1 |0
+<U1F3EA> \xF7\x97 |0
+<U1F3EB> \xF7\x98 |0
+<U1F3EC> \xFB\xA4 |0
+<U1F3ED> \xFB\xA8 |0
+<U1F3EE> \xF9\xAB |1
+<U1F3EF> \xFB\xA5 |0
+<U1F3F0> \xFB\xA6 |0
+<U1F40D> \xFB\xCD |0
+<U1F40E> \xF7\x74 |0
+<U1F411> \xFB\xC9 |0
+<U1F412> \xFB\xC8 |0
+<U1F414> \xFB\xCE |0
+<U1F417> \xFB\xCF |0
+<U1F418> \xFB\xC6 |0
+<U1F419> \xF7\x4A |0
+<U1F41A> \xFB\x82 |0
+<U1F41B> \xFB\xC5 |0
+<U1F41F> \xF9\x59 |0
+<U1F420> \xFB\xC2 |0
+<U1F421> \xF9\x59 |1
+<U1F423> \xFB\xC3 |1
+<U1F424> \xFB\xC3 |0
+<U1F425> \xFB\xC3 |1
+<U1F426> \xFB\xC1 |0
+<U1F427> \xF9\x96 |0
+<U1F428> \xFB\xC7 |0
+<U1F429> \xF9\x93 |1
+<U1F42B> \xFB\xD0 |0
+<U1F42C> \xFB\xC0 |0
+<U1F42D> \xF9\x94 |0
+<U1F42E> \xFB\xCB |0
+<U1F42F> \xF9\x91 |0
+<U1F430> \xFB\xCC |0
+<U1F431> \xF9\x90 |0
+<U1F433> \xF9\x95 |0
+<U1F434> \xF9\x5A |0
+<U1F435> \xF7\x49 |0
+<U1F436> \xF9\x93 |0
+<U1F437> \xF7\x4B |0
+<U1F438> \xFB\xD1 |0
+<U1F439> \xFB\xC4 |0
+<U1F43A> \xFB\xCA |0
+<U1F43B> \xF9\x92 |0
+<U1F43D> \xF7\x4B |1
+<U1F43E> \xFB\xD6 |1
+<U1F440> \xFB\x59 |0
+<U1F442> \xFB\x5B |0
+<U1F443> \xFB\x5A |0
+<U1F444> \xFB\x5C |0
+<U1F445> \xFB\x49 |1
+<U1F446> \xF7\xCE |0
+<U1F447> \xF7\xCF |0
+<U1F448> \xF7\xD0 |0
+<U1F449> \xF7\xD1 |0
+<U1F44A> \xF9\x4D |0
+<U1F44B> \xFB\x5E |0
+<U1F44C> \xFB\x60 |0
+<U1F44D> \xF9\x4E |0
+<U1F44E> \xFB\x61 |0
+<U1F44F> \xFB\x5F |0
+<U1F450> \xFB\x62 |0
+<U1F451> \xF7\x4E |0
+<U1F452> \xF9\xB8 |0
+<U1F454> \xF9\xA2 |0
+<U1F455> \xF9\x46 |0
+<U1F457> \xF9\xB9 |0
+<U1F458> \xF9\xC1 |0
+<U1F459> \xF9\xC2 |0
+<U1F45A> \xF9\x46 |1
+<U1F45C> \xF9\xC3 |0
+<U1F45E> \xF9\x47 |1
+<U1F45F> \xF9\x47 |0
+<U1F460> \xF7\x7E |0
+<U1F461> \xF9\xBA |0
+<U1F462> \xF9\xBB |0
+<U1F463> \xFB\xD6 |0
+<U1F466> \xF9\x41 |0
+<U1F467> \xF9\x42 |0
+<U1F468> \xF9\x44 |0
+<U1F469> \xF9\x45 |0
+<U1F46B> \xFB\x68 |0
+<U1F46E> \xF7\x93 |0
+<U1F46F> \xFB\x69 |0
+<U1F471> \xFB\xB5 |0
+<U1F472> \xFB\xB6 |0
+<U1F473> \xFB\xB7 |0
+<U1F474> \xFB\xB8 |0
+<U1F475> \xFB\xB9 |0
+<U1F476> \xFB\xBA |0
+<U1F477> \xFB\xBB |0
+<U1F478> \xFB\xBC |0
+<U1F47B> \xF7\x5B |0
+<U1F47C> \xF9\x8F |0
+<U1F47D> \xF7\x4C |0
+<U1F47E> \xF7\x6B |0
+<U1F47F> \xF7\x5A |0
+<U1F480> \xF7\x5C |0
+<U1F481> \xF7\xF3 |0
+<U1F482> \xFB\xBE |0
+<U1F483> \xFB\xBF |0
+<U1F484> \xF9\xBC |0
+<U1F485> \xF9\xBD |0
+<U1F486> \xF9\xBE |0
+<U1F487> \xF9\xBF |0
+<U1F488> \xF9\xC0 |0
+<U1F489> \xF7\x7B |0
+<U1F48A> \xF9\xAF |0
+<U1F48B> \xF9\x43 |0
+<U1F48C> \xF7\x43+\xF9\xC8 |1
+<U1F48D> \xF9\x74 |0
+<U1F48E> \xF9\x75 |0
+<U1F48F> \xF7\x51 |0
+<U1F490> \xF9\xA6 |0
+<U1F491> \xFB\x65 |0
+<U1F492> \xFB\x7D |0
+<U1F493> \xF9\xC7 |0
+<U1F494> \xF9\x63 |0
+<U1F495> \xF9\xC7 |1
+<U1F496> \xF9\xC7 |1
+<U1F497> \xF9\xC8 |0
+<U1F498> \xF9\xC9 |0
+<U1F499> \xF9\xCA |0
+<U1F49A> \xF9\xCB |0
+<U1F49B> \xF9\xCC |0
+<U1F49C> \xF9\xCD |0
+<U1F49D> \xFB\x77 |0
+<U1F49E> \xF9\xC7 |1
+<U1F49F> \xF7\xA4 |0
+<U1F4A1> \xF7\x4F |0
+<U1F4A2> \xF9\xD4 |0
+<U1F4A3> \xF9\xB1 |0
+<U1F4A4> \xF7\x7C |0
+<U1F4A6> \xF9\xD1 |0
+<U1F4A7> \xF9\xD1 |1
+<U1F4A8> \xF9\xD0 |0
+<U1F4A9> \xF9\x9B |0
+<U1F4AA> \xF7\x8D |0
+<U1F4AB> \xFB\x47 |1
+<U1F4B0> \xF7\x6F |0
+<U1F4B1> \xF7\x8A |0
+<U1F4B2> \xF7\x6F |1
+<U1F4B5> \xF7\x6F |1
+<U1F4B9> \xF7\x8B |0
+<U1F4BA> \xF7\x5F |0
+<U1F4BB> \xF9\x4C |0
+<U1F4BC> \xF7\x5E |0
+<U1F4BD> \xF9\xB6 |0
+<U1F4BE> \xF9\xB6 |1
+<U1F4BF> \xF7\x66 |0
+<U1F4C0> \xF7\x67 |0
+<U1F4C3> \xF9\xA1 |1
+<U1F4C4> \xF9\xA1 |1
+<U1F4C7> \xF7\x89 |1
+<U1F4C8> \xF7\x8B |1
+<U1F4CA> \xF7\x8B |1
+<U1F4CB> \xF9\xA1 |1
+<U1F4D1> \xF9\xA1 |1
+<U1F4D2> \xF7\x89 |1
+<U1F4D3> \xF7\x89 |1
+<U1F4D4> \xF7\x89 |1
+<U1F4D5> \xF7\x89 |1
+<U1F4D6> \xF7\x89 |0
+<U1F4D7> \xF7\x89 |1
+<U1F4D8> \xF7\x89 |1
+<U1F4D9> \xF7\x89 |1
+<U1F4DA> \xF7\x89 |1
+<U1F4DD> \xF9\xA1 |0
+<U1F4DE> \xF9\x49 |1
+<U1F4E0> \xF9\x4B |0
+<U1F4E1> \xF7\x8C |0
+<U1F4E2> \xF7\x83 |0
+<U1F4E3> \xF9\xB7 |0
+<U1F4E6> \xF7\x52 |1
+<U1F4E7> \xF7\x43 |1
+<U1F4E8> \xF7\x43 |1
+<U1F4E9> \xF7\x43 |0
+<U1F4EA> \xF7\x41 |1
+<U1F4EB> \xF7\x41 |0
+<U1F4EE> \xF7\x42 |0
+<U1F4F1> \xF9\x4A |0
+<U1F4F2> \xF7\x44 |0
+<U1F4F3> \xF7\xF0 |0
+<U1F4F4> \xF7\xF1 |0
+<U1F4F6> \xF7\xAB |0
+<U1F4F7> \xF9\x48 |0
+<U1F4F9> \xF9\x7D |1
+<U1F4FA> \xF7\x6A |0
+<U1F4FB> \xF7\x68 |0
+<U1F4FC> \xF7\x69 |0
+<U1F50A> \xF7\x82 |0
+<U1F50D> \xF7\x54 |0
+<U1F50E> \xF7\x54 |1
+<U1F50F> \xF7\x85 |1
+<U1F510> \xF7\x85 |1
+<U1F511> \xF9\x80 |0
+<U1F512> \xF7\x85 |0
+<U1F513> \xF7\x86 |0
+<U1F514> \xF9\xC5 |0
+<U1F519> \xF7\xD5 |1
+<U1F51D> \xF7\xEC |0
+<U1F51E> \xF7\xA7 |0
+<U1F525> \xF7\x5D |0
+<U1F528> \xF7\x56 |0
+<U1F52B> \xF7\x53 |0
+<U1F52E> \xF7\xDE |1
+<U1F52F> \xF7\xDE |0
+<U1F530> \xF7\xA9 |0
+<U1F531> \xF9\x71 |0
+<U1F532> \xF7\xBA |0
+<U1F533> \xF7\xBB |0
+<U1F534> \xF7\xB9 |0
+<U1F535> \xF7\xBA |1
+<U1F536> \xF7\xBB |1
+<U1F537> \xF7\xBB |1
+<U1F538> \xF7\xBB |1
+<U1F539> \xF7\xBB |1
+<U1F550> \xF9\x64 |0
+<U1F551> \xF9\x65 |0
+<U1F552> \xF9\x66 |0
+<U1F553> \xF9\x67 |0
+<U1F554> \xF9\x68 |0
+<U1F555> \xF9\x69 |0
+<U1F556> \xF9\x6A |0
+<U1F557> \xF9\x6B |0
+<U1F558> \xF9\x6C |0
+<U1F559> \xF9\x6D |0
+<U1F55A> \xF9\x6E |0
+<U1F55B> \xF9\x6F |0
+<U1F5FB> \xF9\x7B |0
+<U1F5FC> \xFB\xA9 |0
+<U1F5FD> \xFB\xBD |0
+<U1F601> \xFB\x44 |0
+<U1F602> \xFB\x52 |0
+<U1F603> \xF9\x98 |0
+<U1F604> \xFB\x55 |0
+<U1F605> \xFB\x55+\xF9\xD1 |1
+<U1F606> \xFB\x4A |1
+<U1F609> \xFB\x45 |0
+<U1F60A> \xF9\x97 |0
+<U1F60B> \xF9\x97 |1
+<U1F60C> \xFB\x4A |0
+<U1F60D> \xF7\x46 |0
+<U1F60F> \xFB\x42 |0
+<U1F612> \xFB\x4E |0
+<U1F613> \xF7\x48 |0
+<U1F614> \xFB\x43 |0
+<U1F616> \xFB\x47 |0
+<U1F618> \xFB\x58 |0
+<U1F61A> \xFB\x57 |0
+<U1F61C> \xF7\x45 |0
+<U1F61D> \xFB\x49 |0
+<U1F61E> \xF9\x99 |0
+<U1F620> \xF9\x9A |0
+<U1F621> \xFB\x56 |0
+<U1F622> \xFB\x53 |0
+<U1F623> \xFB\x46 |0
+<U1F624> \xFB\x44 |1
+<U1F625> \xFB\x41 |0
+<U1F628> \xFB\x4B |0
+<U1F629> \xFB\x43 |1
+<U1F62A> \xFB\x48 |0
+<U1F62B> \xFB\x46 |1
+<U1F62D> \xFB\x51 |0
+<U1F630> \xFB\x4F |0
+<U1F631> \xF7\x47 |0
+<U1F632> \xFB\x50 |0
+<U1F633> \xFB\x4D |0
+<U1F635> \xFB\x46 |1
+<U1F637> \xFB\x4C |0
+<U1F638> \xFB\x44 |1
+<U1F639> \xFB\x52 |1
+<U1F63A> \xF9\x98 |1
+<U1F63B> \xF7\x46 |1
+<U1F63C> \xFB\x44 |1
+<U1F63D> \xFB\x58 |1
+<U1F63E> \xFB\x56 |1
+<U1F63F> \xFB\x53 |1
+<U1F640> \xFB\x43 |1
+<U1F645> \xFB\x63 |0
+<U1F646> \xFB\x64 |0
+<U1F647> \xFB\x66 |0
+<U1F64B> \xF9\x52 |1
+<U1F64C> \xFB\x67 |0
+<U1F64D> \xFB\x43 |1
+<U1F64E> \xFB\x56 |1
+<U1F64F> \xFB\x5D |0
+<U1F680> \xF7\x4D |0
+<U1F683> \xF9\x5E |0
+<U1F684> \xFB\x75 |0
+<U1F685> \xF9\x5F |0
+<U1F687> \xFB\x74 |0
+<U1F689> \xF9\x79 |0
+<U1F68C> \xF7\x9A |0
+<U1F68F> \xF7\x91 |0
+<U1F691> \xFB\x71 |0
+<U1F692> \xFB\x70 |0
+<U1F693> \xFB\x72 |0
+<U1F695> \xF7\x9B |0
+<U1F697> \xF9\x5B |0
+<U1F699> \xFB\x6E |0
+<U1F69A> \xFB\x6F |0
+<U1F6A2> \xF7\xA2 |0
+<U1F6A4> \xF7\x75 |0
+<U1F6A5> \xF7\x8F |0
+<U1F6A7> \xF7\x77 |0
+<U1F6A8> \xFB\x72 |1
+<U1F6AC> \xF9\xAE |0
+<U1F6AD> \xF7\xA8 |0
+<U1F6B2> \xF7\x76 |0
+<U1F6B6> \xF7\xA1 |0
+<U1F6B9> \xF7\x78 |0
+<U1F6BA> \xF7\x79 |0
+<U1F6BB> \xF7\x92 |0
+<U1F6BC> \xF7\x7A |0
+<U1F6BD> \xF7\x81 |0
+<U1F6BE> \xF9\xA9 |0
+<U1F6C0> \xF7\x80 |0
+<UFE337> \xF9\x97 |1
<UFE4C5> \xFB\xAA |0
-<UFE4C6> \xFB\xBD |0
-<UFE4CA> \xF7\x56 |0
-<UFE4CC> \xF9\x47 |0
-<UFE4CD> \xF9\x47 |1
-<UFE4CF> \xF9\x46 |0
-<UFE4D1> \xF7\x4E |0
-<UFE4D2> \xF9\x71 |0
-<UFE4D3> \xF9\xA2 |0
-<UFE4D4> \xF9\xB8 |0
-<UFE4D5> \xF9\xB9 |0
-<UFE4D6> \xF7\x7E |0
-<UFE4D7> \xF9\xBA |0
-<UFE4D8> \xF9\xBB |0
-<UFE4D9> \xF9\xC1 |0
-<UFE4DA> \xF9\xC2 |0
-<UFE4DB> \xF9\x46 |1
-<UFE4DD> \xF7\x6F |0
-<UFE4DE> \xF7\x8A |0
-<UFE4DF> \xF7\x8B |0
-<UFE4E0> \xF7\x6F |1
-<UFE4E3> \xF7\x6F |1
-<UFE4E5> \xFB\xAB |0
-<UFE4E6> \xFB\xAC |0
-<UFE4E7> \xFB\xAD |0
-<UFE4E8> \xFB\xAE |0
-<UFE4E9> \xFB\xAF |0
-<UFE4EA> \xFB\xB0 |0
-<UFE4EB> \xFB\xB1 |0
-<UFE4EC> \xFB\xB2 |0
-<UFE4ED> \xFB\xB3 |0
-<UFE4EE> \xFB\xB4 |0
-<UFE4EF> \xF9\x48 |0
-<UFE4F0> \xF9\xC3 |0
-<UFE4F2> \xF9\xC5 |0
-<UFE4F4> \xF9\x9B |0
-<UFE4F5> \xF7\x53 |0
-<UFE4F6> \xF7\x5D |0
-<UFE4F7> \xF7\xDE |1
-<UFE4F8> \xF7\xDE |0
-<UFE4F9> \xF9\x7D |1
-<UFE4FF> \xF7\x89 |1
-<UFE500> \xF7\x89 |1
-<UFE501> \xF7\x89 |1
-<UFE502> \xF7\x89 |1
-<UFE503> \xF7\x89 |1
-<UFE505> \xF7\x80 |0
-<UFE506> \xF7\x92 |0
-<UFE507> \xF7\x81 |0
-<UFE508> \xF9\xA9 |0
-<UFE509> \xF7\x7B |0
-<UFE50A> \xF9\xAF |0
-<UFE50B> \xFB\xD2 |0
-<UFE50C> \xFB\xD3 |0
-<UFE50D> \xFB\xD4 |0
-<UFE50E> \xFB\xD5 |0
-<UFE50F> \xF9\xB4 |0
-<UFE510> \xF7\x52 |0
-<UFE511> \xF9\xEB |0
-<UFE512> \xF9\x73 |0
-<UFE513> \xFB\x89 |0
-<UFE514> \xF7\x84 |0
-<UFE515> \xF7\x57 |0
-<UFE516> \xF9\xB0 |0
-<UFE517> \xF9\xB2 |0
-<UFE518> \xFB\x76 |0
-<UFE519> \xFB\x78 |0
-<UFE51A> \xFB\x79 |0
-<UFE51B> \xFB\x7A |0
-<UFE51C> \xFB\x7B |0
-<UFE51D> \xFB\x81 |0
-<UFE51E> \xFB\x83 |0
-<UFE51F> \xFB\x86 |0
-<UFE523> \xF9\x49 |0
-<UFE524> \xF9\x49 |1
-<UFE525> \xF9\x4A |0
-<UFE526> \xF7\x44 |0
-<UFE527> \xF9\xA1 |0
-<UFE528> \xF9\x4B |0
-<UFE529> \xF7\x43 |1
-<UFE52A> \xF7\x43 |1
-<UFE52B> \xF7\x43 |0
-<UFE52C> \xF7\x41 |0
-<UFE52D> \xF7\x41 |1
-<UFE52E> \xF7\x42 |0
-<UFE52F> \xF7\x83 |0
-<UFE530> \xF9\xB7 |0
-<UFE531> \xF7\x8C |0
-<UFE535> \xF7\x52 |1
-<UFE537> \xF7\x5F |0
-<UFE538> \xF9\x4C |0
-<UFE539> \xF9\xA1 |1
-<UFE53B> \xF7\x5E |0
-<UFE53C> \xF9\xB6 |0
-<UFE53D> \xF9\xB6 |1
-<UFE53E> \xF9\xB3 |0
-<UFE540> \xF9\xA1 |1
-<UFE541> \xF9\xA1 |1
-<UFE545> \xF7\x89 |1
-<UFE546> \xF7\x89 |0
-<UFE547> \xF7\x89 |1
-<UFE548> \xF9\xA1 |1
-<UFE54A> \xF7\x8B |1
-<UFE54B> \xF7\x8B |1
-<UFE54D> \xF7\x89 |1
-<UFE54F> \xF7\x89 |1
-<UFE552> \xF9\xA1 |1
-<UFE553> \xFB\xD6 |0
-<UFE7D1> \xF9\x56 |0
-<UFE7D2> \xF9\x54 |0
-<UFE7D3> \xF9\x55 |0
-<UFE7D4> \xF9\x58 |0
-<UFE7D5> \xF9\x53 |0
-<UFE7D6> \xFB\x6A |0
-<UFE7D7> \xF7\x72 |0
-<UFE7D9> \xF7\x55 |0
-<UFE7DA> \xF9\x57 |0
-<UFE7DB> \xF7\x71 |0
-<UFE7DC> \xF7\x74 |0
-<UFE7DD> \xFB\x6B |0
-<UFE7DE> \xFB\x6D |0
-<UFE7DF> \xF9\x5E |0
-<UFE7E0> \xFB\x74 |0
-<UFE7E1> \xFB\x74 |1
-<UFE7E2> \xFB\x75 |0
-<UFE7E3> \xF9\x5F |0
-<UFE7E4> \xF9\x5B |0
-<UFE7E5> \xFB\x6E |0
-<UFE7E6> \xF7\x9A |0
-<UFE7E7> \xF7\x91 |0
-<UFE7E8> \xF7\xA2 |0
-<UFE7E9> \xF9\x5D |0
-<UFE7EA> \xF9\x5C |0
-<UFE7EB> \xF7\x76 |0
-<UFE7EC> \xF9\x79 |0
-<UFE7ED> \xF7\x4D |0
-<UFE7EE> \xF7\x75 |0
-<UFE7EF> \xF7\x9B |0
-<UFE7F0> \xF7\xA1 |0
-<UFE7F1> \xFB\x6F |0
-<UFE7F2> \xFB\x70 |0
-<UFE7F3> \xFB\x71 |0
-<UFE7F4> \xFB\x72 |0
-<UFE7F5> \xF9\x7A |0
-<UFE7F6> \xF7\x90 |0
-<UFE7F7> \xF7\x8F |0
-<UFE7F8> \xF7\x77 |0
-<UFE7F9> \xFB\x72 |1
-<UFE7FA> \xF7\x63 |0
-<UFE7FB> \xF7\x62 |0
-<UFE7FD> \xF7\x64 |0
-<UFE7FE> \xFB\x73 |0
-<UFE7FF> \xF9\x59 |1
-<UFE800> \xF9\x7C |0
-<UFE801> \xF9\x7D |0
-<UFE802> \xFB\xA7 |0
-<UFE803> \xF9\xAA |0
-<UFE804> \xFB\xA2 |0
-<UFE805> \xFB\xA3 |0
-<UFE807> \xF7\x65 |0
-<UFE808> \xF9\xC4 |0
-<UFE809> \xFB\xA3 |1
-<UFE80B> \xF7\x6D |0
-<UFE80C> \xF7\x70 |0
-<UFE80D> \xF7\x73 |0
-<UFE80E> \xFB\x6C |0
-<UFE813> \xF9\x7E |0
-<UFE814> \xF9\xC6 |0
-<UFE815> \xF9\x81 |0
-<UFE816> \xF9\x82 |0
-<UFE818> \xF9\x83 |0
-<UFE81A> \xF9\xC6 |1
-<UFE81B> \xF7\x6C |0
-<UFE81C> \xF7\x6A |0
-<UFE81D> \xF7\x66 |0
-<UFE81E> \xF7\x67 |0
-<UFE81F> \xF7\x68 |0
-<UFE820> \xF7\x69 |0
-<UFE821> \xF7\x82 |0
-<UFE823> \xF9\x43 |0
-<UFE824> \xF7\x43\xF9\xC8 |1
-<UFE825> \xF9\x74 |0
-<UFE826> \xF9\x75 |0
-<UFE827> \xF7\x51 |0
-<UFE828> \xF9\xA6 |0
-<UFE829> \xFB\x65 |0
-<UFE82A> \xFB\x7D |0
-<UFE82B> \xF7\xB1 |0
-<UFE82C> \xF7\xB0 |0
-<UFE82E> \xF7\xBC |0
-<UFE82F> \xF7\xBD |0
-<UFE830> \xF7\xBE |0
-<UFE831> \xF7\xBF |0
-<UFE832> \xF7\xC0 |0
-<UFE833> \xF7\xC1 |0
-<UFE834> \xF7\xC2 |0
-<UFE835> \xF7\xC3 |0
-<UFE836> \xF7\xC4 |0
-<UFE837> \xF7\xC5 |0
-<UFE838> \xF7\xAB |0
-<UFE839> \xF7\xF0 |0
-<UFE83A> \xF7\xF1 |0
-<UFE960> \xF7\x60 |0
-<UFE961> \xF9\xE2 |0
-<UFE962> \xF9\x87 |0
-<UFE963> \xF9\xE0 |0
-<UFE964> \xF9\xD9 |0
-<UFE965> \xF7\x88 |0
-<UFE966> \xF9\xDA |0
-<UFE967> \xF9\xDB |0
-<UFE968> \xF9\xDC |0
-<UFE969> \xF9\xDD |0
-<UFE96A> \xF9\xDE |0
-<UFE96B> \xF9\xDF |0
-<UFE96C> \xF9\xE1 |0
-<UFE96D> \xF9\xE3 |0
-<UFE96E> \xF9\xE4 |0
-<UFE96F> \xF9\xEC |0
-<UFE970> \xF9\xED |0
-<UFE971> \xFB\x80 |0
-<UFE980> \xF9\x84 |0
-<UFE981> \xF9\x86 |0
-<UFE982> \xF9\x85 |0
-<UFE983> \xF9\x88 |0
-<UFE984> \xF9\xD8 |0
-<UFE985> \xF9\xAB |0
-<UFE986> \xF9\x85 |1
-<UFE987> \xF9\xAC |0
-<UFE988> \xF9\x85 |1
-<UFEAF0> \xF7\xD6 |0
-<UFEAF1> \xF7\xD8 |0
-<UFEAF2> \xF7\xD7 |0
-<UFEAF3> \xF7\xD9 |0
-<UFEAF4> \xF7\xD6 |1
-<UFEAF5> \xF7\xD8 |1
-<UFEAF8> \xF7\xD2 |0
-<UFEAF9> \xF7\xD3 |0
-<UFEAFA> \xF7\xD4 |0
-<UFEAFB> \xF7\xD5 |0
-<UFEAFC> \xF7\xDA |0
-<UFEAFD> \xF7\xDB |0
-<UFEAFE> \xF7\xDC |0
-<UFEAFF> \xF7\xDD |0
-<UFEB04> \xF9\x61 |0
-<UFEB09> \xF9\x60 |0
-<UFEB0A> \xF9\xD6 |0
-<UFEB0B> \xF9\xD7 |0
-<UFEB0C> \xF9\x62 |0
-<UFEB0D> \xF9\xC7 |0
-<UFEB0E> \xF9\x63 |0
-<UFEB0F> \xF9\xC7 |1
-<UFEB10> \xF9\xC7 |1
-<UFEB11> \xF9\xC8 |0
-<UFEB12> \xF9\xC9 |0
-<UFEB13> \xF9\xCA |0
-<UFEB14> \xF9\xCB |0
-<UFEB15> \xF9\xCC |0
-<UFEB16> \xF9\xCD |0
-<UFEB17> \xFB\x77 |0
-<UFEB18> \xF9\xC7 |1
-<UFEB19> \xF7\xA4 |0
-<UFEB1A> \xF7\xAC |0
-<UFEB1B> \xF7\xAE |0
-<UFEB1C> \xF7\xAD |0
-<UFEB1D> \xF7\xAF |0
-<UFEB1E> \xF9\xAE |0
-<UFEB1F> \xF7\xA8 |0
-<UFEB20> \xF7\xAA |0
-<UFEB23> \xF7\xF2 |0
-<UFEB24> \xF7\xA3 |0
-<UFEB25> \xF7\xA7 |0
-<UFEB26> \xF7\x77 |1
-<UFEB27> \xF7\xED |0
-<UFEB29> \xF7\xEE |0
-<UFEB2A> \xFB\xD7 |0
-<UFEB2B> \xF9\xB5 |0
-<UFEB2D> \xF7\xEF |0
-<UFEB2F> \xF7\xCB |0
-<UFEB31> \xF7\xCA |0
-<UFEB32> \xF7\x6E |0
-<UFEB33> \xF7\x78 |0
-<UFEB34> \xF7\x79 |0
-<UFEB35> \xF7\x7A |0
-<UFEB36> \xF7\xB2 |0
-<UFEB37> \xF7\xB3 |0
-<UFEB38> \xF7\xB4 |0
-<UFEB39> \xF7\xB5 |0
-<UFEB3A> \xF7\xB6 |0
-<UFEB3B> \xF7\xB7 |0
-<UFEB3C> \xF7\xB8 |0
-<UFEB3D> \xF7\xC6 |0
-<UFEB3E> \xF7\xC7 |0
-<UFEB3F> \xF7\xC8 |0
-<UFEB40> \xF7\xCC |0
-<UFEB41> \xF7\xCD |0
-<UFEB42> \xF7\xEC |0
-<UFEB43> \xF9\xAD |0
-<UFEB44> \xF9\xD2 |0
-<UFEB45> \xF9\xD3 |0
-<UFEB46> \xF9\xD3 |1
-<UFEB53> \xF9\xD3 |1
-<UFEB56> \xF7\x4F |0
-<UFEB57> \xF9\xD4 |0
-<UFEB58> \xF9\xB1 |0
-<UFEB59> \xF7\x7C |0
-<UFEB5B> \xF9\xD1 |0
-<UFEB5C> \xF9\xD1 |1
-<UFEB5D> \xF9\xD0 |0
-<UFEB5E> \xF7\x8D |0
-<UFEB5F> \xFB\x47 |1
-<UFEB60> \xF9\xCE |0
-<UFEB61> \xF7\xA5 |0
-<UFEB62> \xF7\xA6 |0
-<UFEB63> \xF7\xB9 |0
-<UFEB64> \xF7\xBA |0
-<UFEB65> \xF7\xB9 |1
-<UFEB66> \xF7\xB9 |1
-<UFEB67> \xF7\xBB |0
-<UFEB68> \xF9\xCF |0
-<UFEB69> \xF9\xD5 |0
-<UFEB6B> \xF7\xBB |1
-<UFEB6C> \xF7\xBA |1
-<UFEB6D> \xF7\xBB |1
-<UFEB6E> \xF7\xBA |1
-<UFEB6F> \xF7\xBB |1
-<UFEB70> \xF7\xBA |1
-<UFEB71> \xF7\xBB |1
-<UFEB72> \xF7\xBA |1
-<UFEB73> \xF7\xBB |1
-<UFEB74> \xF7\xBB |1
-<UFEB75> \xF7\xBB |1
-<UFEB76> \xF7\xBB |1
-<UFEB77> \xF9\xCE |1
-<UFEB81> \xF7\xC9 |0
-<UFEB82> \xF9\x80 |0
-<UFEB85> \xF7\x54 |0
-<UFEB86> \xF7\x85 |0
-<UFEB87> \xF7\x86 |0
-<UFEB8A> \xF7\x85 |1
-<UFEB8D> \xF7\x54 |1
-<UFEB8E> \xF7\xD5 |1
-<UFEB90> \xF7\x85 |1
-<UFEB92> \xF7\x43 |1
-<UFEB93> \xF9\x50 |0
-<UFEB94> \xF9\x51 |0
-<UFEB95> \xF9\x52 |0
-<UFEB96> \xF9\x4D |0
-<UFEB97> \xF9\x4E |0
-<UFEB98> \xF9\x4F |0
-<UFEB99> \xF7\xCE |0
-<UFEB9A> \xF7\xCF |0
-<UFEB9B> \xF7\xD0 |0
-<UFEB9C> \xF7\xD1 |0
-<UFEB9D> \xFB\x5E |0
-<UFEB9E> \xFB\x5F |0
-<UFEB9F> \xFB\x60 |0
-<UFEBA0> \xFB\x61 |0
-<UFEBA1> \xFB\x62 |0
<UFEE1C> \xF9\x7D |1
<UFEE70> \xFB\xD8 |0
<UFEE71> \xFB\xD9 |0
@@ -8420,4 +8444,581 @@
<UFEE7B> \xF7\xF8 |0
<UFEE7C> \xF7\xF9 |0
<UFEE7D> \xF7\xFA |0
+# Fallbacks for Google PUA code points, for Unicode Standard Emoji symbols.
+<UFE000> \xF9\x8B |1
+<UFE001> \xF9\x8A |1
+<UFE002> \xF9\x8C |1
+<UFE003> \xF9\x89 |1
+<UFE004> \xF7\x7D |1
+<UFE005> \xFB\x84 |1
+<UFE007> \xFB\x7C |1
+<UFE008> \xFB\x8C |1
+<UFE009> \xF9\x8E |1
+<UFE00A> \xFB\x8A |1
+<UFE00B> \xF7\x87 |1
+<UFE00C> \xFB\x8B |1
+<UFE00D> \xFB\x8D |1
+<UFE00F> \xF9\x8B+\xF9\x8A |1
+<UFE010> \xFB\x8C |1
+<UFE012> \xF9\x8D |1
+<UFE013> \xF9\x8D |1
+<UFE014> \xF9\x8D |1
+<UFE016> \xF9\x8D |1
+<UFE017> \xFB\x87 |1
+<UFE01E> \xF9\x64 |1
+<UFE01F> \xF9\x65 |1
+<UFE020> \xF9\x66 |1
+<UFE021> \xF9\x67 |1
+<UFE022> \xF9\x68 |1
+<UFE023> \xF9\x69 |1
+<UFE024> \xF9\x6A |1
+<UFE025> \xF9\x6B |1
+<UFE026> \xF9\x6C |1
+<UFE027> \xF9\x6D |1
+<UFE028> \xF9\x6E |1
+<UFE029> \xF9\x6F |1
+<UFE02A> \xF9\x6D |1
+<UFE02B> \xF7\xDF |1
+<UFE02C> \xF7\xE0 |1
+<UFE02D> \xF7\xE1 |1
+<UFE02E> \xF7\xE2 |1
+<UFE02F> \xF7\xE3 |1
+<UFE030> \xF7\xE4 |1
+<UFE031> \xF7\xE5 |1
+<UFE032> \xF7\xE6 |1
+<UFE033> \xF7\xE7 |1
+<UFE034> \xF7\xE8 |1
+<UFE035> \xF7\xE9 |1
+<UFE036> \xF7\xEA |1
+<UFE037> \xF7\xEB |1
+<UFE038> \xFB\x7E |1
+<UFE03B> \xFB\x8C |1
+<UFE03C> \xF7\x50 |1
+<UFE03D> \xF9\xA4 |1
+<UFE03E> \xF7\x50 |1
+<UFE03F> \xF7\x58 |1
+<UFE040> \xF9\x70 |1
+<UFE041> \xF9\x72 |1
+<UFE042> \xF7\x59 |1
+<UFE043> \xFB\x88 |1
+<UFE044> \xF7\xA9 |1
+<UFE045> \xF9\xA3 |1
+<UFE046> \xF9\xA5 |1
+<UFE047> \xF9\xA7 |1
+<UFE048> \xF9\xA8 |1
+<UFE049> \xFB\x85 |1
+<UFE04D> \xF9\xA5 |1
+<UFE04E> \xF7\x50 |1
+<UFE051> \xF9\xE5 |1
+<UFE052> \xF9\xE6 |1
+<UFE053> \xF9\xE7 |1
+<UFE054> \xF9\xE8 |1
+<UFE055> \xF9\xE9 |1
+<UFE056> \xF9\xEA |1
+<UFE05B> \xF9\xE5 |1
+<UFE190> \xFB\x59 |1
+<UFE191> \xFB\x5B |1
+<UFE192> \xFB\x5A |1
+<UFE193> \xFB\x5C |1
+<UFE194> \xFB\x49 |1
+<UFE195> \xF9\xBC |1
+<UFE196> \xF9\xBD |1
+<UFE197> \xF9\xBE |1
+<UFE198> \xF9\xBF |1
+<UFE199> \xF9\xC0 |1
+<UFE19B> \xF9\x41 |1
+<UFE19C> \xF9\x42 |1
+<UFE19D> \xF9\x44 |1
+<UFE19E> \xF9\x45 |1
+<UFE1A0> \xFB\x68 |1
+<UFE1A1> \xF7\x93 |1
+<UFE1A2> \xFB\x69 |1
+<UFE1A4> \xFB\xB5 |1
+<UFE1A5> \xFB\xB6 |1
+<UFE1A6> \xFB\xB7 |1
+<UFE1A7> \xFB\xB8 |1
+<UFE1A8> \xFB\xB9 |1
+<UFE1A9> \xFB\xBA |1
+<UFE1AA> \xFB\xBB |1
+<UFE1AB> \xFB\xBC |1
+<UFE1AE> \xF7\x5B |1
+<UFE1AF> \xF9\x8F |1
+<UFE1B0> \xF7\x4C |1
+<UFE1B1> \xF7\x6B |1
+<UFE1B2> \xF7\x5A |1
+<UFE1B3> \xF7\x5C |1
+<UFE1B4> \xF7\xF3 |1
+<UFE1B5> \xFB\xBE |1
+<UFE1B6> \xFB\xBF |1
+<UFE1B7> \xF9\x93 |1
+<UFE1B8> \xF9\x90 |1
+<UFE1BA> \xFB\xC3 |1
+<UFE1BB> \xFB\xC3 |1
+<UFE1BC> \xF9\x96 |1
+<UFE1BD> \xF9\x59 |1
+<UFE1BE> \xF9\x5A |1
+<UFE1BF> \xF7\x4B |1
+<UFE1C0> \xF9\x91 |1
+<UFE1C1> \xF9\x92 |1
+<UFE1C2> \xF9\x94 |1
+<UFE1C3> \xF9\x95 |1
+<UFE1C4> \xF7\x49 |1
+<UFE1C5> \xF7\x4A |1
+<UFE1C6> \xFB\x82 |1
+<UFE1C7> \xFB\xC0 |1
+<UFE1C8> \xFB\xC1 |1
+<UFE1C9> \xFB\xC2 |1
+<UFE1CA> \xFB\xC4 |1
+<UFE1CB> \xFB\xC5 |1
+<UFE1CC> \xFB\xC6 |1
+<UFE1CD> \xFB\xC7 |1
+<UFE1CE> \xFB\xC8 |1
+<UFE1CF> \xFB\xC9 |1
+<UFE1D0> \xFB\xCA |1
+<UFE1D1> \xFB\xCB |1
+<UFE1D2> \xFB\xCC |1
+<UFE1D3> \xFB\xCD |1
+<UFE1D4> \xFB\xCE |1
+<UFE1D5> \xFB\xCF |1
+<UFE1D6> \xFB\xD0 |1
+<UFE1D7> \xFB\xD1 |1
+<UFE1D8> \xF9\x93 |1
+<UFE1D9> \xF9\x59 |1
+<UFE1DB> \xFB\xD6 |1
+<UFE1DD> \xFB\xC3 |1
+<UFE1E0> \xF7\x4B |1
+<UFE320> \xF9\x9A |1
+<UFE321> \xFB\x43 |1
+<UFE322> \xFB\x50 |1
+<UFE323> \xF9\x99 |1
+<UFE324> \xFB\x46 |1
+<UFE325> \xFB\x4F |1
+<UFE326> \xFB\x4E |1
+<UFE327> \xF7\x46 |1
+<UFE328> \xFB\x44 |1
+<UFE329> \xF7\x45 |1
+<UFE32A> \xFB\x49 |1
+<UFE32B> \xF9\x97 |1
+<UFE32C> \xFB\x58 |1
+<UFE32D> \xFB\x57 |1
+<UFE32E> \xFB\x4C |1
+<UFE32F> \xFB\x4D |1
+<UFE330> \xF9\x98 |1
+<UFE331> \xFB\x55+\xF9\xD1 |1
+<UFE332> \xFB\x4A |1
+<UFE333> \xFB\x44 |1
+<UFE334> \xFB\x52 |1
+<UFE335> \xF9\x97 |1
+<UFE336> \xFB\x54 |1
+<UFE338> \xFB\x55 |1
+<UFE339> \xFB\x53 |1
+<UFE33A> \xFB\x51 |1
+<UFE33B> \xFB\x4B |1
+<UFE33C> \xFB\x46 |1
+<UFE33D> \xFB\x56 |1
+<UFE33E> \xFB\x4A |1
+<UFE33F> \xFB\x47 |1
+<UFE340> \xFB\x43 |1
+<UFE341> \xF7\x47 |1
+<UFE342> \xFB\x48 |1
+<UFE343> \xFB\x42 |1
+<UFE344> \xF7\x48 |1
+<UFE345> \xFB\x41 |1
+<UFE346> \xFB\x46 |1
+<UFE347> \xFB\x45 |1
+<UFE348> \xF9\x98 |1
+<UFE349> \xFB\x44 |1
+<UFE34A> \xFB\x52 |1
+<UFE34B> \xFB\x58 |1
+<UFE34C> \xF7\x46 |1
+<UFE34D> \xFB\x53 |1
+<UFE34E> \xFB\x56 |1
+<UFE34F> \xFB\x44 |1
+<UFE350> \xFB\x43 |1
+<UFE351> \xFB\x63 |1
+<UFE352> \xFB\x64 |1
+<UFE353> \xFB\x66 |1
+<UFE357> \xF9\x52 |1
+<UFE358> \xFB\x67 |1
+<UFE359> \xFB\x43 |1
+<UFE35A> \xFB\x56 |1
+<UFE35B> \xFB\x5D |1
+<UFE4B0> \xF9\x76 |1
+<UFE4B1> \xF9\x76 |1
+<UFE4B2> \xF9\x78 |1
+<UFE4B3> \xF7\x94 |1
+<UFE4B4> \xF7\x96 |1
+<UFE4B5> \xF7\x8E |1
+<UFE4B6> \xF7\x95 |1
+<UFE4B7> \xF7\x99 |1
+<UFE4B8> \xFB\xA1 |1
+<UFE4B9> \xF7\x97 |1
+<UFE4BA> \xF7\x98 |1
+<UFE4BB> \xF9\x77 |1
+<UFE4BC> \xF7\x61 |1
+<UFE4BD> \xFB\xA4 |1
+<UFE4BE> \xFB\xA5 |1
+<UFE4BF> \xFB\xA6 |1
+<UFE4C0> \xFB\xA8 |1
+<UFE4C1> \xF7\xA2 |1
+<UFE4C2> \xF9\xAB |1
+<UFE4C3> \xF9\x7B |1
+<UFE4C4> \xFB\xA9 |1
+<UFE4C6> \xFB\xBD |1
+<UFE4CA> \xF7\x56 |1
+<UFE4CC> \xF9\x47 |1
+<UFE4CD> \xF9\x47 |1
+<UFE4CF> \xF9\x46 |1
+<UFE4D1> \xF7\x4E |1
+<UFE4D2> \xF9\x71 |1
+<UFE4D3> \xF9\xA2 |1
+<UFE4D4> \xF9\xB8 |1
+<UFE4D5> \xF9\xB9 |1
+<UFE4D6> \xF7\x7E |1
+<UFE4D7> \xF9\xBA |1
+<UFE4D8> \xF9\xBB |1
+<UFE4D9> \xF9\xC1 |1
+<UFE4DA> \xF9\xC2 |1
+<UFE4DB> \xF9\x46 |1
+<UFE4DD> \xF7\x6F |1
+<UFE4DE> \xF7\x8A |1
+<UFE4DF> \xF7\x8B |1
+<UFE4E0> \xF7\x6F |1
+<UFE4E3> \xF7\x6F |1
+<UFE4E5> \xFB\xAB |1
+<UFE4E6> \xFB\xAC |1
+<UFE4E7> \xFB\xAD |1
+<UFE4E8> \xFB\xAE |1
+<UFE4E9> \xFB\xAF |1
+<UFE4EA> \xFB\xB0 |1
+<UFE4EB> \xFB\xB1 |1
+<UFE4EC> \xFB\xB2 |1
+<UFE4ED> \xFB\xB3 |1
+<UFE4EE> \xFB\xB4 |1
+<UFE4EF> \xF9\x48 |1
+<UFE4F0> \xF9\xC3 |1
+<UFE4F2> \xF9\xC5 |1
+<UFE4F4> \xF9\x9B |1
+<UFE4F5> \xF7\x53 |1
+<UFE4F6> \xF7\x5D |1
+<UFE4F7> \xF7\xDE |1
+<UFE4F8> \xF7\xDE |1
+<UFE4F9> \xF9\x7D |1
+<UFE4FF> \xF7\x89 |1
+<UFE500> \xF7\x89 |1
+<UFE501> \xF7\x89 |1
+<UFE502> \xF7\x89 |1
+<UFE503> \xF7\x89 |1
+<UFE505> \xF7\x80 |1
+<UFE506> \xF7\x92 |1
+<UFE507> \xF7\x81 |1
+<UFE508> \xF9\xA9 |1
+<UFE509> \xF7\x7B |1
+<UFE50A> \xF9\xAF |1
+<UFE50B> \xFB\xD2 |1
+<UFE50C> \xFB\xD3 |1
+<UFE50D> \xFB\xD4 |1
+<UFE50E> \xFB\xD5 |1
+<UFE50F> \xF9\xB4 |1
+<UFE510> \xF7\x52 |1
+<UFE511> \xF9\xEB |1
+<UFE512> \xF9\x73 |1
+<UFE513> \xFB\x89 |1
+<UFE514> \xF7\x84 |1
+<UFE515> \xF7\x57 |1
+<UFE516> \xF9\xB0 |1
+<UFE517> \xF9\xB2 |1
+<UFE518> \xFB\x76 |1
+<UFE519> \xFB\x78 |1
+<UFE51A> \xFB\x79 |1
+<UFE51B> \xFB\x7A |1
+<UFE51C> \xFB\x7B |1
+<UFE51D> \xFB\x81 |1
+<UFE51E> \xFB\x83 |1
+<UFE51F> \xFB\x86 |1
+<UFE523> \xF9\x49 |1
+<UFE524> \xF9\x49 |1
+<UFE525> \xF9\x4A |1
+<UFE526> \xF7\x44 |1
+<UFE527> \xF9\xA1 |1
+<UFE528> \xF9\x4B |1
+<UFE529> \xF7\x43 |1
+<UFE52A> \xF7\x43 |1
+<UFE52B> \xF7\x43 |1
+<UFE52C> \xF7\x41 |1
+<UFE52D> \xF7\x41 |1
+<UFE52E> \xF7\x42 |1
+<UFE52F> \xF7\x83 |1
+<UFE530> \xF9\xB7 |1
+<UFE531> \xF7\x8C |1
+<UFE535> \xF7\x52 |1
+<UFE537> \xF7\x5F |1
+<UFE538> \xF9\x4C |1
+<UFE539> \xF9\xA1 |1
+<UFE53B> \xF7\x5E |1
+<UFE53C> \xF9\xB6 |1
+<UFE53D> \xF9\xB6 |1
+<UFE53E> \xF9\xB3 |1
+<UFE540> \xF9\xA1 |1
+<UFE541> \xF9\xA1 |1
+<UFE545> \xF7\x89 |1
+<UFE546> \xF7\x89 |1
+<UFE547> \xF7\x89 |1
+<UFE548> \xF9\xA1 |1
+<UFE54A> \xF7\x8B |1
+<UFE54B> \xF7\x8B |1
+<UFE54D> \xF7\x89 |1
+<UFE54F> \xF7\x89 |1
+<UFE552> \xF9\xA1 |1
+<UFE553> \xFB\xD6 |1
+<UFE7D1> \xF9\x56 |1
+<UFE7D2> \xF9\x54 |1
+<UFE7D3> \xF9\x55 |1
+<UFE7D4> \xF9\x58 |1
+<UFE7D5> \xF9\x53 |1
+<UFE7D6> \xFB\x6A |1
+<UFE7D7> \xF7\x72 |1
+<UFE7D9> \xF7\x55 |1
+<UFE7DA> \xF9\x57 |1
+<UFE7DB> \xF7\x71 |1
+<UFE7DC> \xF7\x74 |1
+<UFE7DD> \xFB\x6B |1
+<UFE7DE> \xFB\x6D |1
+<UFE7DF> \xF9\x5E |1
+<UFE7E0> \xFB\x74 |1
+<UFE7E1> \xFB\x74 |1
+<UFE7E2> \xFB\x75 |1
+<UFE7E3> \xF9\x5F |1
+<UFE7E4> \xF9\x5B |1
+<UFE7E5> \xFB\x6E |1
+<UFE7E6> \xF7\x9A |1
+<UFE7E7> \xF7\x91 |1
+<UFE7E8> \xF7\xA2 |1
+<UFE7E9> \xF9\x5D |1
+<UFE7EA> \xF9\x5C |1
+<UFE7EB> \xF7\x76 |1
+<UFE7EC> \xF9\x79 |1
+<UFE7ED> \xF7\x4D |1
+<UFE7EE> \xF7\x75 |1
+<UFE7EF> \xF7\x9B |1
+<UFE7F0> \xF7\xA1 |1
+<UFE7F1> \xFB\x6F |1
+<UFE7F2> \xFB\x70 |1
+<UFE7F3> \xFB\x71 |1
+<UFE7F4> \xFB\x72 |1
+<UFE7F5> \xF9\x7A |1
+<UFE7F6> \xF7\x90 |1
+<UFE7F7> \xF7\x8F |1
+<UFE7F8> \xF7\x77 |1
+<UFE7F9> \xFB\x72 |1
+<UFE7FA> \xF7\x63 |1
+<UFE7FB> \xF7\x62 |1
+<UFE7FD> \xF7\x64 |1
+<UFE7FE> \xFB\x73 |1
+<UFE7FF> \xF9\x59 |1
+<UFE800> \xF9\x7C |1
+<UFE801> \xF9\x7D |1
+<UFE802> \xFB\xA7 |1
+<UFE803> \xF9\xAA |1
+<UFE804> \xFB\xA2 |1
+<UFE805> \xFB\xA3 |1
+<UFE807> \xF7\x65 |1
+<UFE808> \xF9\xC4 |1
+<UFE809> \xFB\xA3 |1
+<UFE80B> \xF7\x6D |1
+<UFE80C> \xF7\x70 |1
+<UFE80D> \xF7\x73 |1
+<UFE80E> \xFB\x6C |1
+<UFE813> \xF9\x7E |1
+<UFE814> \xF9\xC6 |1
+<UFE815> \xF9\x81 |1
+<UFE816> \xF9\x82 |1
+<UFE818> \xF9\x83 |1
+<UFE81A> \xF9\xC6 |1
+<UFE81B> \xF7\x6C |1
+<UFE81C> \xF7\x6A |1
+<UFE81D> \xF7\x66 |1
+<UFE81E> \xF7\x67 |1
+<UFE81F> \xF7\x68 |1
+<UFE820> \xF7\x69 |1
+<UFE821> \xF7\x82 |1
+<UFE823> \xF9\x43 |1
+<UFE824> \xF7\x43+\xF9\xC8 |1
+<UFE825> \xF9\x74 |1
+<UFE826> \xF9\x75 |1
+<UFE827> \xF7\x51 |1
+<UFE828> \xF9\xA6 |1
+<UFE829> \xFB\x65 |1
+<UFE82A> \xFB\x7D |1
+<UFE82B> \xF7\xB1 |1
+<UFE82C> \xF7\xB0 |1
+<UFE82E> \xF7\xBC |1
+<UFE82F> \xF7\xBD |1
+<UFE830> \xF7\xBE |1
+<UFE831> \xF7\xBF |1
+<UFE832> \xF7\xC0 |1
+<UFE833> \xF7\xC1 |1
+<UFE834> \xF7\xC2 |1
+<UFE835> \xF7\xC3 |1
+<UFE836> \xF7\xC4 |1
+<UFE837> \xF7\xC5 |1
+<UFE838> \xF7\xAB |1
+<UFE839> \xF7\xF0 |1
+<UFE83A> \xF7\xF1 |1
+<UFE960> \xF7\x60 |1
+<UFE961> \xF9\xE2 |1
+<UFE962> \xF9\x87 |1
+<UFE963> \xF9\xE0 |1
+<UFE964> \xF9\xD9 |1
+<UFE965> \xF7\x88 |1
+<UFE966> \xF9\xDA |1
+<UFE967> \xF9\xDB |1
+<UFE968> \xF9\xDC |1
+<UFE969> \xF9\xDD |1
+<UFE96A> \xF9\xDE |1
+<UFE96B> \xF9\xDF |1
+<UFE96C> \xF9\xE1 |1
+<UFE96D> \xF9\xE3 |1
+<UFE96E> \xF9\xE4 |1
+<UFE96F> \xF9\xEC |1
+<UFE970> \xF9\xED |1
+<UFE971> \xFB\x80 |1
+<UFE980> \xF9\x84 |1
+<UFE981> \xF9\x86 |1
+<UFE982> \xF9\x85 |1
+<UFE983> \xF9\x88 |1
+<UFE984> \xF9\xD8 |1
+<UFE985> \xF9\xAB |1
+<UFE986> \xF9\x85 |1
+<UFE987> \xF9\xAC |1
+<UFE988> \xF9\x85 |1
+<UFEAF0> \xF7\xD6 |1
+<UFEAF1> \xF7\xD8 |1
+<UFEAF2> \xF7\xD7 |1
+<UFEAF3> \xF7\xD9 |1
+<UFEAF4> \xF7\xD6 |1
+<UFEAF5> \xF7\xD8 |1
+<UFEAF8> \xF7\xD2 |1
+<UFEAF9> \xF7\xD3 |1
+<UFEAFA> \xF7\xD4 |1
+<UFEAFB> \xF7\xD5 |1
+<UFEAFC> \xF7\xDA |1
+<UFEAFD> \xF7\xDB |1
+<UFEAFE> \xF7\xDC |1
+<UFEAFF> \xF7\xDD |1
+<UFEB04> \xF9\x61 |1
+<UFEB09> \xF9\x60 |1
+<UFEB0A> \xF9\xD6 |1
+<UFEB0B> \xF9\xD7 |1
+<UFEB0C> \xF9\x62 |1
+<UFEB0D> \xF9\xC7 |1
+<UFEB0E> \xF9\x63 |1
+<UFEB0F> \xF9\xC7 |1
+<UFEB10> \xF9\xC7 |1
+<UFEB11> \xF9\xC8 |1
+<UFEB12> \xF9\xC9 |1
+<UFEB13> \xF9\xCA |1
+<UFEB14> \xF9\xCB |1
+<UFEB15> \xF9\xCC |1
+<UFEB16> \xF9\xCD |1
+<UFEB17> \xFB\x77 |1
+<UFEB18> \xF9\xC7 |1
+<UFEB19> \xF7\xA4 |1
+<UFEB1A> \xF7\xAC |1
+<UFEB1B> \xF7\xAE |1
+<UFEB1C> \xF7\xAD |1
+<UFEB1D> \xF7\xAF |1
+<UFEB1E> \xF9\xAE |1
+<UFEB1F> \xF7\xA8 |1
+<UFEB20> \xF7\xAA |1
+<UFEB23> \xF7\xF2 |1
+<UFEB24> \xF7\xA3 |1
+<UFEB25> \xF7\xA7 |1
+<UFEB26> \xF7\x77 |1
+<UFEB27> \xF7\xED |1
+<UFEB29> \xF7\xEE |1
+<UFEB2A> \xFB\xD7 |1
+<UFEB2B> \xF9\xB5 |1
+<UFEB2D> \xF7\xEF |1
+<UFEB2F> \xF7\xCB |1
+<UFEB31> \xF7\xCA |1
+<UFEB32> \xF7\x6E |1
+<UFEB33> \xF7\x78 |1
+<UFEB34> \xF7\x79 |1
+<UFEB35> \xF7\x7A |1
+<UFEB36> \xF7\xB2 |1
+<UFEB37> \xF7\xB3 |1
+<UFEB38> \xF7\xB4 |1
+<UFEB39> \xF7\xB5 |1
+<UFEB3A> \xF7\xB6 |1
+<UFEB3B> \xF7\xB7 |1
+<UFEB3C> \xF7\xB8 |1
+<UFEB3D> \xF7\xC6 |1
+<UFEB3E> \xF7\xC7 |1
+<UFEB3F> \xF7\xC8 |1
+<UFEB40> \xF7\xCC |1
+<UFEB41> \xF7\xCD |1
+<UFEB42> \xF7\xEC |1
+<UFEB43> \xF9\xAD |1
+<UFEB44> \xF9\xD2 |1
+<UFEB45> \xF9\xD3 |1
+<UFEB46> \xF9\xD3 |1
+<UFEB53> \xF9\xD3 |1
+<UFEB56> \xF7\x4F |1
+<UFEB57> \xF9\xD4 |1
+<UFEB58> \xF9\xB1 |1
+<UFEB59> \xF7\x7C |1
+<UFEB5B> \xF9\xD1 |1
+<UFEB5C> \xF9\xD1 |1
+<UFEB5D> \xF9\xD0 |1
+<UFEB5E> \xF7\x8D |1
+<UFEB5F> \xFB\x47 |1
+<UFEB60> \xF9\xCE |1
+<UFEB61> \xF7\xA5 |1
+<UFEB62> \xF7\xA6 |1
+<UFEB63> \xF7\xB9 |1
+<UFEB64> \xF7\xBA |1
+<UFEB65> \xF7\xB9 |1
+<UFEB66> \xF7\xB9 |1
+<UFEB67> \xF7\xBB |1
+<UFEB68> \xF9\xCF |1
+<UFEB69> \xF9\xD5 |1
+<UFEB6B> \xF7\xBB |1
+<UFEB6C> \xF7\xBA |1
+<UFEB6D> \xF7\xBB |1
+<UFEB6E> \xF7\xBA |1
+<UFEB6F> \xF7\xBB |1
+<UFEB70> \xF7\xBA |1
+<UFEB71> \xF7\xBB |1
+<UFEB72> \xF7\xBA |1
+<UFEB73> \xF7\xBB |1
+<UFEB74> \xF7\xBB |1
+<UFEB75> \xF7\xBB |1
+<UFEB76> \xF7\xBB |1
+<UFEB77> \xF9\xCE |1
+<UFEB81> \xF7\xC9 |1
+<UFEB82> \xF9\x80 |1
+<UFEB85> \xF7\x54 |1
+<UFEB86> \xF7\x85 |1
+<UFEB87> \xF7\x86 |1
+<UFEB8A> \xF7\x85 |1
+<UFEB8D> \xF7\x54 |1
+<UFEB8E> \xF7\xD5 |1
+<UFEB90> \xF7\x85 |1
+<UFEB92> \xF7\x43 |1
+<UFEB93> \xF9\x50 |1
+<UFEB94> \xF9\x51 |1
+<UFEB95> \xF9\x52 |1
+<UFEB96> \xF9\x4D |1
+<UFEB97> \xF9\x4E |1
+<UFEB98> \xF9\x4F |1
+<UFEB99> \xF7\xCE |1
+<UFEB9A> \xF7\xCF |1
+<UFEB9B> \xF7\xD0 |1
+<UFEB9C> \xF7\xD1 |1
+<UFEB9D> \xFB\x5E |1
+<UFEB9E> \xFB\x5F |1
+<UFEB9F> \xFB\x60 |1
+<UFEBA0> \xFB\x61 |1
+<UFEBA1> \xFB\x62 |1
END CHARMAP
diff --git a/data/mappings/ucmfiles.mk b/data/mappings/ucmfiles.mk
index 5988121..4ab3961 100644
--- a/data/mappings/ucmfiles.mk
+++ b/data/mappings/ucmfiles.mk
@@ -1,4 +1,4 @@
-# Copyright (c) 1999-2012, International Business Machines Corporation and
+# Copyright (c) 1999-2013, International Business Machines Corporation and
# others. All Rights Reserved.
# A list of UCM's to build
# Note:
@@ -32,7 +32,6 @@
# If you are planning to exclude EBCDIC mappings in you data then please delete
# ucmebcdic.mk from the <icu>/source/data directory
#
-# Note: noop-*.ucm are for Android only to prevent 2022 security attack.
UCM_SOURCE_FILES = ibm-437_P100-1995.ucm\
ibm-737_P100-1997.ucm\
@@ -112,11 +111,11 @@
windows-949-2000.ucm\
windows-950-2000.ucm\
jisx-212.ucm\
-noop-cns-11643.ucm noop-gb2312_gl.ucm noop-iso-ir-165.ucm\
iso-ir-165.ucm cns-11643-1992.ucm\
ibm-5478_P100-1995.ucm\
icu-internal-25546.ucm lmb-excp.ucm \
icu-internal-compound-d1.ucm icu-internal-compound-d2.ucm icu-internal-compound-d3.ucm icu-internal-compound-d4.ucm\
icu-internal-compound-d5.ucm icu-internal-compound-d6.ucm icu-internal-compound-d7.ucm \
-icu-internal-compound-s1.ucm icu-internal-compound-s2.ucm icu-internal-compound-s3.ucm icu-internal-compound-t.ucm
+icu-internal-compound-s1.ucm icu-internal-compound-s2.ucm icu-internal-compound-s3.ucm icu-internal-compound-t.ucm \
+euc-jp-2007.ucm
diff --git a/data/mappings/ucmlocal.mk b/data/mappings/ucmlocal.mk
new file mode 100644
index 0000000..a32ae0a
--- /dev/null
+++ b/data/mappings/ucmlocal.mk
@@ -0,0 +1,16 @@
+# Copyright 2008 Google Inc. All Rights Reserved.
+# Author: mscherer@google.com (Markus Scherer)
+
+# A list of additional .ucm files to build for Google.
+# Note: noop-*.ucm are for Android only to prevent 2022 security attack.
+
+UCM_SOURCE_LOCAL=gsm-03.38-2000.ucm \
+ docomo-shift_jis-2012.ucm \
+ jisx-208.ucm \
+ kddi-jisx-208-2007.ucm \
+ kddi-shift_jis-2012.ucm \
+ softbank-jisx-208-2007.ucm \
+ softbank-shift_jis-2012.ucm \
+ noop-cns-11643.ucm \
+ noop-gb2312_gl.ucm \
+ noop-iso-ir-165.ucm
diff --git a/data/mappings/windows-936-2000.ucm b/data/mappings/windows-936-2000.ucm
index 73c82d6..6cfafab 100644
--- a/data/mappings/windows-936-2000.ucm
+++ b/data/mappings/windows-936-2000.ucm
@@ -37,9 +37,7 @@
# build an extension-only (delta) .cnv file
# requires the base .cnv file at runtime
-# BEGIN android-removed
-# <icu:base> "ibm-1386_P100-2001"
-# END android-removed
+<icu:base> "ibm-1386_P100-2001"
# The following was the generated state table.
# This does not account for unassigned characters
diff --git a/data/mappings/windows-949-2000.ucm b/data/mappings/windows-949-2000.ucm
index adc8b33..290080a 100644
--- a/data/mappings/windows-949-2000.ucm
+++ b/data/mappings/windows-949-2000.ucm
@@ -37,9 +37,7 @@
# build an extension-only (delta) .cnv file
# requires the base .cnv file at runtime
-# BEGIN android-removed
-# <icu:base> "ibm-1363_P11B-1998"
-# END android-removed
+<icu:base> "ibm-1363_P11B-1998"
# The following was the generated state table.
# This does not account for unassigned characters
diff --git a/data/mappings/windows-950-2000.ucm b/data/mappings/windows-950-2000.ucm
index 2918cc6..99df879 100644
--- a/data/mappings/windows-950-2000.ucm
+++ b/data/mappings/windows-950-2000.ucm
@@ -37,9 +37,7 @@
# build an extension-only (delta) .cnv file
# requires the base .cnv file at runtime
-# BEGIN android-removed
-# base<icu:base> "ibm-1373_P100-2002"
-# END android-removed
+<icu:base> "ibm-1373_P100-2002"
# The following was the generated state table.
# This does not account for unassigned characters
diff --git a/data/misc/currencyNumericCodes.txt b/data/misc/currencyNumericCodes.txt
index 5b7658e..6062796 100644
--- a/data/misc/currencyNumericCodes.txt
+++ b/data/misc/currencyNumericCodes.txt
@@ -1,9 +1,9 @@
//---------------------------------------------------------
-// Copyright (C) 2012, International Business Machines
+// Copyright (C) 2013, International Business Machines
// Corporation and others. All Rights Reserved.
//---------------------------------------------------------
// Build tool: com.ibm.icu.dev.tool.currency.NumericCodeData
-// Build date: 2012-01-20T21:51:47Z
+// Build date: 2013-02-14T23:20:42Z
//---------------------------------------------------------
// >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! <<
// >> !!! >>> DO NOT EDIT <<< !!! <<
@@ -264,6 +264,7 @@
ZAL:int{991}
ZAR:int{710}
ZMK:int{894}
+ ZMW:int{967}
ZRN:int{180}
ZRZ:int{180}
ZWD:int{716}
diff --git a/data/misc/dayPeriods.txt b/data/misc/dayPeriods.txt
index 78ebb0c..b4e36f6 100644
--- a/data/misc/dayPeriods.txt
+++ b/data/misc/dayPeriods.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/dayPeriods.xml
// *
diff --git a/data/misc/genderList.txt b/data/misc/genderList.txt
index 50575ad..64e033c 100644
--- a/data/misc/genderList.txt
+++ b/data/misc/genderList.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/genderList.xml
// *
diff --git a/data/misc/icuver.txt b/data/misc/icuver.txt
index 21416f4..49095cd 100644
--- a/data/misc/icuver.txt
+++ b/data/misc/icuver.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2010-2012 International Business Machines
+// * Copyright (C) 2010-2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// *
// ***************************************************************************
icuver:table(nofallback){
- DataVersion { "50.1.1.0" }
- ICUVersion { "50.1.1.0" }
+ DataVersion { "51.1.0.0" }
+ ICUVersion { "51.1.0.0" }
}
diff --git a/data/misc/keyTypeData.txt b/data/misc/keyTypeData.txt
index 82a9839..ee5c1ab 100644
--- a/data/misc/keyTypeData.txt
+++ b/data/misc/keyTypeData.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/bcp47/*.xml
// *
diff --git a/data/misc/likelySubtags.txt b/data/misc/likelySubtags.txt
index 45c195b..c234e07 100644
--- a/data/misc/likelySubtags.txt
+++ b/data/misc/likelySubtags.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/likelySubtags.xml
// *
@@ -9,53 +9,93 @@
likelySubtags:table(nofallback){
aa{"aa_Latn_ET"}
ab{"ab_Cyrl_GE"}
+ ace{"ace_Latn_ID"}
ady{"ady_Cyrl_RU"}
af{"af_Latn_ZA"}
agq{"agq_Latn_CM"}
ak{"ak_Latn_GH"}
+ alt{"alt_Cyrl_RU"}
am{"am_Ethi_ET"}
+ amo{"amo_Latn_NG"}
ar{"ar_Arab_EG"}
as{"as_Beng_IN"}
asa{"asa_Latn_TZ"}
ast{"ast_Latn_ES"}
av{"av_Cyrl_RU"}
+ awa{"awa_Deva_IN"}
ay{"ay_Latn_BO"}
az{"az_Latn_AZ"}
az_Arab{"az_Arab_IR"}
az_IR{"az_Arab_IR"}
ba{"ba_Cyrl_RU"}
+ bal{"bal_Arab_PK"}
+ ban{"ban_Latn_ID"}
bas{"bas_Latn_CM"}
+ bax{"bax_Bamu_CM"}
+ bbc{"bbc_Latn_ID"}
be{"be_Cyrl_BY"}
bem{"bem_Latn_ZM"}
bez{"bez_Latn_TZ"}
+ bfq{"bfq_Taml_IN"}
+ bft{"bft_Arab_PK"}
+ bfy{"bfy_Deva_IN"}
bg{"bg_Cyrl_BG"}
+ bhb{"bhb_Deva_IN"}
+ bho{"bho_Deva_IN"}
bi{"bi_Latn_VU"}
+ bik{"bik_Latn_PH"}
+ bin{"bin_Latn_NG"}
+ bjj{"bjj_Deva_IN"}
+ bku{"bku_Latn_PH"}
bm{"bm_Latn_ML"}
bn{"bn_Beng_BD"}
bo{"bo_Tibt_CN"}
+ bqv{"bqv_Latn_CI"}
br{"br_Latn_FR"}
+ bra{"bra_Deva_IN"}
brx{"brx_Deva_IN"}
bs{"bs_Latn_BA"}
+ bss{"bss_Latn_CM"}
+ btv{"btv_Deva_PK"}
+ bua{"bua_Cyrl_RU"}
+ buc{"buc_Latn_YT"}
+ bug{"bug_Latn_ID"}
+ bya{"bya_Latn_ID"}
byn{"byn_Ethi_ER"}
ca{"ca_Latn_ES"}
cch{"cch_Latn_NG"}
+ ccp{"ccp_Beng_IN"}
ce{"ce_Cyrl_RU"}
ceb{"ceb_Latn_PH"}
cgg{"cgg_Latn_UG"}
ch{"ch_Latn_GU"}
chk{"chk_Latn_FM"}
+ chm{"chm_Cyrl_RU"}
+ chp{"chp_Latn_CA"}
chr{"chr_Cher_US"}
+ cja{"cja_Arab_KH"}
+ cjm{"cjm_Cham_VN"}
ckb{"ckb_Arab_IQ"}
+ co{"co_Latn_FR"}
+ cr{"cr_Cans_CA"}
+ crk{"crk_Cans_CA"}
cs{"cs_Latn_CZ"}
csb{"csb_Latn_PL"}
+ cv{"cv_Cyrl_RU"}
cy{"cy_Latn_GB"}
da{"da_Latn_DK"}
+ dar{"dar_Cyrl_RU"}
dav{"dav_Latn_KE"}
de{"de_Latn_DE"}
+ den{"den_Latn_CA"}
+ dgr{"dgr_Latn_CA"}
dje{"dje_Latn_NE"}
+ doi{"doi_Arab_IN"}
+ dsb{"dsb_Latn_DE"}
dua{"dua_Latn_CM"}
dv{"dv_Thaa_MV"}
dyo{"dyo_Latn_SN"}
+ dyu{"dyu_Latn_BF"}
dz{"dz_Tibt_BT"}
ebu{"ebu_Latn_KE"}
ee{"ee_Latn_GH"}
@@ -63,113 +103,174 @@
el{"el_Grek_GR"}
en{"en_Latn_US"}
eo{"eo_Latn_001"}
+ eo_Latn{"eo_Latn_SM"}
es{"es_Latn_ES"}
et{"et_Latn_EE"}
eu{"eu_Latn_ES"}
ewo{"ewo_Latn_CM"}
fa{"fa_Arab_IR"}
+ fan{"fan_Latn_GQ"}
ff{"ff_Latn_SN"}
fi{"fi_Latn_FI"}
fil{"fil_Latn_PH"}
fj{"fj_Latn_FJ"}
fo{"fo_Latn_FO"}
+ fon{"fon_Latn_BJ"}
fr{"fr_Latn_FR"}
fur{"fur_Latn_IT"}
fy{"fy_Latn_NL"}
ga{"ga_Latn_IE"}
gaa{"gaa_Latn_GH"}
gag{"gag_Latn_MD"}
+ gbm{"gbm_Deva_IN"}
+ gcr{"gcr_Latn_GF"}
gd{"gd_Latn_GB"}
+ gez{"gez_Ethi_ET"}
gil{"gil_Latn_KI"}
gl{"gl_Latn_ES"}
gn{"gn_Latn_PY"}
+ gon{"gon_Deva_IN"}
+ gor{"gor_Latn_ID"}
+ grt{"grt_Beng_IN"}
gsw{"gsw_Latn_CH"}
gu{"gu_Gujr_IN"}
guz{"guz_Latn_KE"}
gv{"gv_Latn_GB"}
gv_Latn{"gv_Latn_IM"}
+ gwi{"gwi_Latn_CA"}
ha{"ha_Latn_NG"}
+ ha_CM{"ha_Arab_CM"}
+ ha_SD{"ha_Arab_SD"}
haw{"haw_Latn_US"}
he{"he_Hebr_IL"}
hi{"hi_Deva_IN"}
hil{"hil_Latn_PH"}
+ hne{"hne_Deva_IN"}
+ hnn{"hnn_Latn_PH"}
ho{"ho_Latn_PG"}
+ hoc{"hoc_Deva_IN"}
+ hoj{"hoj_Deva_IN"}
hr{"hr_Latn_HR"}
ht{"ht_Latn_HT"}
hu{"hu_Latn_HU"}
hy{"hy_Armn_AM"}
- ia{"ia_Latn_001"}
+ ia{"ia_Latn_FR"}
+ ia_Latn{"ia_Latn_SE"}
+ ibb{"ibb_Latn_NG"}
id{"id_Latn_ID"}
ig{"ig_Latn_NG"}
ii{"ii_Yiii_CN"}
+ ik{"ik_Latn_US"}
ilo{"ilo_Latn_PH"}
in{"in_Latn_ID"}
inh{"inh_Cyrl_RU"}
is{"is_Latn_IS"}
it{"it_Latn_IT"}
- // BEGIN android-added
+ iu{"iu_Cans_CA"}
iw{"iw_Hebr_IL"}
- // END android-added
ja{"ja_Jpan_JP"}
jgo{"jgo_Latn_CM"}
+ ji{"ji_Hebr_IL"}
jmc{"jmc_Latn_TZ"}
jv{"jv_Latn_ID"}
+ jw{"jw_Latn_ID"}
ka{"ka_Geor_GE"}
+ kaa{"kaa_Cyrl_UZ"}
kab{"kab_Latn_DZ"}
kaj{"kaj_Latn_NG"}
kam{"kam_Latn_KE"}
kbd{"kbd_Cyrl_RU"}
kcg{"kcg_Latn_NG"}
kde{"kde_Latn_TZ"}
+ kdt{"kdt_Thai_TH"}
kea{"kea_Latn_CV"}
+ ken{"ken_Latn_CM"}
+ kfo{"kfo_Latn_CI"}
+ kfr{"kfr_Deva_IN"}
kg{"kg_Latn_CD"}
kha{"kha_Latn_IN"}
+ khb{"khb_Talu_CN"}
khq{"khq_Latn_ML"}
+ kht{"kht_Mymr_IN"}
ki{"ki_Latn_KE"}
kj{"kj_Latn_NA"}
kk{"kk_Cyrl_KZ"}
+ kk_AF{"kk_Arab_AF"}
+ kk_Arab{"kk_Arab_CN"}
+ kk_CN{"kk_Arab_CN"}
+ kk_IR{"kk_Arab_IR"}
+ kk_MN{"kk_Arab_MN"}
kkj{"kkj_Latn_CM"}
kl{"kl_Latn_GL"}
kln{"kln_Latn_KE"}
km{"km_Khmr_KH"}
+ kmb{"kmb_Latn_AO"}
kn{"kn_Knda_IN"}
ko{"ko_Kore_KR"}
koi{"koi_Cyrl_RU"}
kok{"kok_Deva_IN"}
kos{"kos_Latn_FM"}
kpe{"kpe_Latn_LR"}
- kpv{"kpv_Cyrl_RU"}
krc{"krc_Cyrl_RU"}
+ kri{"kri_Latn_SL"}
+ krl{"krl_Cyrl_RU"}
+ kru{"kru_Deva_IN"}
ks{"ks_Arab_IN"}
ksb{"ksb_Latn_TZ"}
ksf{"ksf_Latn_CM"}
ksh{"ksh_Latn_DE"}
ku{"ku_Latn_TR"}
+ ku_AM{"ku_Arab_AM"}
+ ku_AZ{"ku_Arab_AZ"}
ku_Arab{"ku_Arab_IQ"}
+ ku_DE{"ku_Arab_DE"}
+ ku_GE{"ku_Arab_GE"}
ku_IQ{"ku_Arab_IQ"}
+ ku_IR{"ku_Arab_IR"}
+ ku_LB{"ku_Arab_LB"}
+ ku_TM{"ku_Arab_TM"}
kum{"kum_Cyrl_RU"}
kv{"kv_Cyrl_RU"}
kw{"kw_Latn_GB"}
ky{"ky_Cyrl_KG"}
+ ky_Arab{"ky_Arab_CN"}
+ ky_CN{"ky_Arab_CN"}
+ ky_Latn{"ky_Latn_TR"}
+ ky_TR{"ky_Latn_TR"}
la{"la_Latn_VA"}
lag{"lag_Latn_TZ"}
lah{"lah_Arab_PK"}
lb{"lb_Latn_LU"}
lbe{"lbe_Cyrl_RU"}
+ lcp{"lcp_Thai_CN"}
+ lep{"lep_Lepc_IN"}
lez{"lez_Cyrl_RU"}
lg{"lg_Latn_UG"}
+ li{"li_Latn_NL"}
+ lif{"lif_Deva_NP"}
+ lis{"lis_Lisu_CN"}
+ lki{"lki_Arab_IR"}
+ lmn{"lmn_Telu_IN"}
ln{"ln_Latn_CD"}
lo{"lo_Laoo_LA"}
+ lol{"lol_Latn_CD"}
lt{"lt_Latn_LT"}
lu{"lu_Latn_CD"}
lua{"lua_Latn_CD"}
luo{"luo_Latn_KE"}
luy{"luy_Latn_KE"}
lv{"lv_Latn_LV"}
+ lwl{"lwl_Thai_TH"}
+ mad{"mad_Latn_ID"}
+ mag{"mag_Deva_IN"}
mai{"mai_Deva_IN"}
+ mak{"mak_Latn_ID"}
+ man{"man_Latn_GN"}
mas{"mas_Latn_KE"}
mdf{"mdf_Cyrl_RU"}
mdh{"mdh_Latn_PH"}
+ mdr{"mdr_Latn_ID"}
+ men{"men_Latn_SL"}
mer{"mer_Latn_KE"}
mfe{"mfe_Latn_MU"}
mg{"mg_Latn_MG"}
@@ -177,32 +278,49 @@
mgo{"mgo_Latn_CM"}
mh{"mh_Latn_MH"}
mi{"mi_Latn_NZ"}
+ min{"min_Latn_ID"}
mk{"mk_Cyrl_MK"}
ml{"ml_Mlym_IN"}
mn{"mn_Cyrl_MN"}
mn_CN{"mn_Mong_CN"}
mn_Mong{"mn_Mong_CN"}
+ mni{"mni_Beng_IN"}
+ mnk{"mnk_Latn_GM"}
+ mnw{"mnw_Mymr_MM"}
+ mo{"mo_Latn_RO"}
+ mos{"mos_Latn_BF"}
mr{"mr_Deva_IN"}
ms{"ms_Latn_MY"}
+ ms_Arab{"ms_Arab_ID"}
+ ms_CC{"ms_Arab_CC"}
+ ms_ID{"ms_Arab_ID"}
mt{"mt_Latn_MT"}
mua{"mua_Latn_CM"}
+ mwr{"mwr_Deva_IN"}
my{"my_Mymr_MM"}
myv{"myv_Cyrl_RU"}
na{"na_Latn_NR"}
+ nap{"nap_Latn_IT"}
naq{"naq_Latn_NA"}
nb{"nb_Latn_NO"}
nd{"nd_Latn_ZW"}
nds{"nds_Latn_DE"}
ne{"ne_Deva_NP"}
+ new{"new_Deva_NP"}
+ ng{"ng_Latn_NA"}
niu{"niu_Latn_NU"}
nl{"nl_Latn_NL"}
nmg{"nmg_Latn_CM"}
nn{"nn_Latn_NO"}
nnh{"nnh_Latn_CM"}
+ no{"no_Latn_NO"}
+ nod{"nod_Lana_TH"}
nr{"nr_Latn_ZA"}
nso{"nso_Latn_ZA"}
nus{"nus_Latn_SD"}
+ nv{"nv_Latn_US"}
ny{"ny_Latn_MW"}
+ nym{"nym_Latn_TZ"}
nyn{"nyn_Latn_UG"}
oc{"oc_Latn_FR"}
om{"om_Latn_ET"}
@@ -212,13 +330,21 @@
pa_Arab{"pa_Arab_PK"}
pa_PK{"pa_Arab_PK"}
pag{"pag_Latn_PH"}
- pap{"pap_Latn_AN"}
+ pam{"pam_Latn_PH"}
+ pap{"pap_Latn_BQ"}
+ pap_Latn{"pap_Latn_CW"}
pau{"pau_Latn_PW"}
pl{"pl_Latn_PL"}
pon{"pon_Latn_FM"}
+ prd{"prd_Arab_IR"}
ps{"ps_Arab_AF"}
pt{"pt_Latn_BR"}
qu{"qu_Latn_PE"}
+ raj{"raj_Latn_IN"}
+ rcf{"rcf_Latn_RE"}
+ rej{"rej_Latn_ID"}
+ rjs{"rjs_Deva_NP"}
+ rkt{"rkt_Beng_IN"}
rm{"rm_Latn_CH"}
rn{"rn_Latn_BI"}
ro{"ro_Latn_RO"}
@@ -227,45 +353,77 @@
rw{"rw_Latn_RW"}
rwk{"rwk_Latn_TZ"}
sa{"sa_Deva_IN"}
+ saf{"saf_Latn_GH"}
sah{"sah_Cyrl_RU"}
saq{"saq_Latn_KE"}
+ sas{"sas_Latn_ID"}
sat{"sat_Latn_IN"}
+ saz{"saz_Saur_IN"}
sbp{"sbp_Latn_TZ"}
+ scn{"scn_Latn_IT"}
+ sco{"sco_Latn_GB"}
sd{"sd_Arab_IN"}
+ sd_Deva{"sd_Deva_IN"}
+ sdh{"sdh_Arab_IR"}
se{"se_Latn_NO"}
seh{"seh_Latn_MZ"}
ses{"ses_Latn_ML"}
sg{"sg_Latn_CF"}
+ sh{"sr_Latn_RS"}
shi{"shi_Tfng_MA"}
shi_MA{"shi_Latn_MA"}
+ shn{"shn_Mymr_MM"}
si{"si_Sinh_LK"}
sid{"sid_Latn_ET"}
sk{"sk_Latn_SK"}
sl{"sl_Latn_SI"}
sm{"sm_Latn_WS"}
+ sma{"sma_Latn_SE"}
+ smj{"smj_Latn_SE"}
+ smn{"smn_Latn_FI"}
+ sms{"sms_Latn_FI"}
sn{"sn_Latn_ZW"}
+ snk{"snk_Latn_ML"}
so{"so_Latn_SO"}
sq{"sq_Latn_AL"}
sr{"sr_Cyrl_RS"}
sr_ME{"sr_Latn_ME"}
+ sr_RO{"sr_Latn_RO"}
+ sr_RU{"sr_Latn_RU"}
+ sr_TR{"sr_Latn_TR"}
+ srn{"srn_Latn_SR"}
+ srr{"srr_Latn_SN"}
ss{"ss_Latn_ZA"}
ssy{"ssy_Latn_ER"}
st{"st_Latn_ZA"}
su{"su_Latn_ID"}
+ suk{"suk_Latn_TZ"}
+ sus{"sus_Latn_GN"}
sv{"sv_Latn_SE"}
sw{"sw_Latn_TZ"}
+ swb{"swb_Arab_YT"}
swc{"swc_Latn_CD"}
+ syl{"syl_Beng_BD"}
+ syr{"syr_Syrc_SY"}
ta{"ta_Taml_IN"}
+ tbw{"tbw_Latn_PH"}
+ tcy{"tcy_Knda_IN"}
+ tdd{"tdd_Tale_CN"}
te{"te_Telu_IN"}
+ tem{"tem_Latn_SL"}
teo{"teo_Latn_UG"}
tet{"tet_Latn_TL"}
tg{"tg_Cyrl_TJ"}
+ tg_Arab{"tg_Arab_PK"}
+ tg_PK{"tg_Arab_PK"}
th{"th_Thai_TH"}
ti{"ti_Ethi_ET"}
tig{"tig_Ethi_ER"}
+ tiv{"tiv_Latn_NG"}
tk{"tk_Latn_TM"}
tkl{"tkl_Latn_TK"}
tl{"tl_Latn_PH"}
+ tmh{"tmh_Latn_NE"}
tn{"tn_Latn_ZA"}
to{"to_Latn_TO"}
tpi{"tpi_Latn_PG"}
@@ -274,6 +432,8 @@
ts{"ts_Latn_ZA"}
tsg{"tsg_Latn_PH"}
tt{"tt_Cyrl_RU"}
+ tts{"tts_Thai_TH"}
+ tum{"tum_Latn_MW"}
tvl{"tvl_Latn_TV"}
twq{"twq_Latn_NE"}
ty{"ty_Latn_PF"}
@@ -281,8 +441,12 @@
tzm{"tzm_Latn_MA"}
udm{"udm_Cyrl_RU"}
ug{"ug_Arab_CN"}
+ ug_Cyrl{"ug_Cyrl_KZ"}
+ ug_KZ{"ug_Cyrl_KZ"}
+ ug_MN{"ug_Cyrl_MN"}
uk{"uk_Cyrl_UA"}
uli{"uli_Latn_FM"}
+ umb{"umb_Latn_AO"}
und{"en_Latn_US"}
und_AD{"ca_Latn_AD"}
und_AE{"ar_Arab_AE"}
@@ -291,6 +455,7 @@
und_AM{"hy_Armn_AM"}
und_AN{"pap_Latn_AN"}
und_AO{"pt_Latn_AO"}
+ und_AQ{"und_Latn_AQ"}
und_AR{"es_Latn_AR"}
und_AS{"sm_Latn_AS"}
und_AT{"de_Latn_AT"}
@@ -298,10 +463,25 @@
und_AX{"sv_Latn_AX"}
und_AZ{"az_Latn_AZ"}
und_Arab{"ar_Arab_EG"}
+ und_Arab_AM{"ku_Arab_AM"}
+ und_Arab_AZ{"ku_Arab_AZ"}
+ und_Arab_CC{"ms_Arab_CC"}
und_Arab_CN{"ug_Arab_CN"}
+ und_Arab_DE{"ku_Arab_DE"}
+ und_Arab_GB{"ks_Arab_GB"}
+ und_Arab_GE{"ku_Arab_GE"}
+ und_Arab_ID{"ms_Arab_ID"}
und_Arab_IN{"ur_Arab_IN"}
+ und_Arab_KH{"cja_Arab_KH"}
+ und_Arab_MN{"kk_Arab_MN"}
+ und_Arab_MU{"ur_Arab_MU"}
und_Arab_NG{"ha_Arab_NG"}
und_Arab_PK{"ur_Arab_PK"}
+ und_Arab_SN{"wo_Arab_SN"}
+ und_Arab_TJ{"fa_Arab_TJ"}
+ und_Arab_TM{"ku_Arab_TM"}
+ und_Arab_TR{"ku_Arab_TR"}
+ und_Arab_YT{"swb_Arab_YT"}
und_Armi{"arc_Armi_IR"}
und_Armn{"hy_Armn_AM"}
und_Avst{"ae_Avst_IR"}
@@ -316,13 +496,16 @@
und_BL{"fr_Latn_BL"}
und_BN{"ms_Latn_BN"}
und_BO{"es_Latn_BO"}
+ und_BQ{"pap_Latn_BQ"}
und_BR{"pt_Latn_BR"}
und_BT{"dz_Tibt_BT"}
+ und_BV{"und_Latn_BV"}
und_BY{"be_Cyrl_BY"}
und_Bali{"ban_Bali_ID"}
und_Bamu{"bax_Bamu_CM"}
und_Batk{"bbc_Batk_ID"}
und_Beng{"bn_Beng_BD"}
+ und_Beng_IN{"bn_Beng_IN"}
und_Bopo{"zh_Bopo_TW"}
und_Brah{"pra_Brah_IN"}
und_Brai{"und_Brai_FR"}
@@ -341,6 +524,7 @@
und_CR{"es_Latn_CR"}
und_CU{"es_Latn_CU"}
und_CV{"pt_Latn_CV"}
+ und_CW{"pap_Latn_CW"}
und_CY{"el_Grek_CY"}
und_CZ{"cs_Latn_CZ"}
und_Cakm{"ccp_Cakm_BD"}
@@ -351,14 +535,25 @@
und_Copt{"cop_Copt_EG"}
und_Cprt{"grc_Cprt_CY"}
und_Cyrl{"ru_Cyrl_RU"}
+ und_Cyrl_AL{"mk_Cyrl_AL"}
und_Cyrl_BA{"sr_Cyrl_BA"}
und_Cyrl_GE{"ab_Cyrl_GE"}
+ und_Cyrl_GR{"mk_Cyrl_GR"}
+ und_Cyrl_KZ{"kk_Cyrl_KZ"}
+ und_Cyrl_MD{"bg_Cyrl_MD"}
+ und_Cyrl_PL{"be_Cyrl_PL"}
+ und_Cyrl_RO{"bg_Cyrl_RO"}
+ und_Cyrl_SK{"uk_Cyrl_SK"}
+ und_Cyrl_TR{"kbd_Cyrl_TR"}
und_DE{"de_Latn_DE"}
und_DJ{"aa_Latn_DJ"}
und_DK{"da_Latn_DK"}
und_DO{"es_Latn_DO"}
und_DZ{"ar_Arab_DZ"}
und_Deva{"hi_Deva_IN"}
+ und_Deva_BT{"ne_Deva_BT"}
+ und_Deva_MU{"bho_Deva_MU"}
+ und_Deva_PK{"btv_Deva_PK"}
und_EA{"es_Latn_EA"}
und_EC{"es_Latn_EC"}
und_EE{"et_Latn_EE"}
@@ -366,9 +561,12 @@
und_EH{"ar_Arab_EH"}
und_ER{"ti_Ethi_ER"}
und_ES{"es_Latn_ES"}
+ und_ET{"am_Ethi_ET"}
und_Egyp{"egy_Egyp_EG"}
und_Ethi{"am_Ethi_ET"}
+ und_Ethi_ER{"ti_Ethi_ER"}
und_FI{"fi_Latn_FI"}
+ und_FJ{"fj_Latn_FJ"}
und_FM{"chk_Latn_FM"}
und_FO{"fo_Latn_FO"}
und_FR{"fr_Latn_FR"}
@@ -381,7 +579,9 @@
und_GP{"fr_Latn_GP"}
und_GQ{"es_Latn_GQ"}
und_GR{"el_Grek_GR"}
+ und_GS{"und_Latn_GS"}
und_GT{"es_Latn_GT"}
+ und_GU{"ch_Latn_GU"}
und_GW{"pt_Latn_GW"}
und_Geor{"ka_Geor_GE"}
und_Glag{"cu_Glag_BG"}
@@ -390,6 +590,7 @@
und_Gujr{"gu_Gujr_IN"}
und_Guru{"pa_Guru_IN"}
und_HK{"zh_Hant_HK"}
+ und_HM{"und_Latn_HM"}
und_HN{"es_Latn_HN"}
und_HR{"hr_Latn_HR"}
und_HT{"ht_Latn_HT"}
@@ -400,6 +601,7 @@
und_Hans{"zh_Hans_CN"}
und_Hant{"zh_Hant_TW"}
und_Hebr{"he_Hebr_IL"}
+ und_Hebr_UA{"yi_Hebr_UA"}
und_Hira{"ja_Hira_JP"}
und_IC{"es_Latn_IC"}
und_ID{"id_Latn_ID"}
@@ -439,16 +641,38 @@
und_LY{"ar_Arab_LY"}
und_Lana{"nod_Lana_TH"}
und_Laoo{"lo_Laoo_LA"}
+ und_Latn_AF{"tk_Latn_AF"}
+ und_Latn_AM{"az_Latn_AM"}
+ und_Latn_BG{"tr_Latn_BG"}
und_Latn_CN{"za_Latn_CN"}
und_Latn_CY{"tr_Latn_CY"}
und_Latn_DZ{"fr_Latn_DZ"}
und_Latn_ER{"aa_Latn_ER"}
+ und_Latn_ES{"es_Latn_ES"}
+ und_Latn_ET{"en_Latn_ET"}
+ und_Latn_GB{"en_Latn_GB"}
+ und_Latn_GE{"ku_Latn_GE"}
+ und_Latn_GH{"ak_Latn_GH"}
+ und_Latn_GR{"tr_Latn_GR"}
+ und_Latn_ID{"id_Latn_ID"}
+ und_Latn_IL{"ro_Latn_IL"}
+ und_Latn_IR{"tk_Latn_IR"}
+ und_Latn_IT{"it_Latn_IT"}
und_Latn_KM{"fr_Latn_KM"}
+ und_Latn_KZ{"de_Latn_KZ"}
+ und_Latn_LB{"fr_Latn_LB"}
und_Latn_MA{"fr_Latn_MA"}
und_Latn_MK{"sq_Latn_MK"}
+ und_Latn_MO{"pt_Latn_MO"}
und_Latn_MR{"fr_Latn_MR"}
+ und_Latn_RU{"fi_Latn_RU"}
+ und_Latn_SO{"so_Latn_SO"}
und_Latn_SY{"fr_Latn_SY"}
und_Latn_TN{"fr_Latn_TN"}
+ und_Latn_TR{"tr_Latn_TR"}
+ und_Latn_TW{"trv_Latn_TW"}
+ und_Latn_UA{"pl_Latn_UA"}
+ und_Latn_ZA{"af_Latn_ZA"}
und_Lepc{"lep_Lepc_IN"}
und_Limb{"lif_Limb_IN"}
und_Linb{"grc_Linb_GR"}
@@ -461,6 +685,7 @@
und_ME{"sr_Latn_ME"}
und_MF{"fr_Latn_MF"}
und_MG{"mg_Latn_MG"}
+ und_MH{"mh_Latn_MH"}
und_MK{"mk_Cyrl_MK"}
und_ML{"bm_Latn_ML"}
und_MM{"my_Mymr_MM"}
@@ -481,13 +706,17 @@
und_Mong{"mn_Mong_CN"}
und_Mtei{"mni_Mtei_IN"}
und_Mymr{"my_Mymr_MM"}
+ und_Mymr_IN{"kht_Mymr_IN"}
+ und_Mymr_TH{"mnw_Mymr_TH"}
und_NA{"kj_Latn_NA"}
und_NC{"fr_Latn_NC"}
und_NE{"ha_Latn_NE"}
und_NI{"es_Latn_NI"}
und_NL{"nl_Latn_NL"}
- und_NO{"nb_Latn_NO"}
+ und_NO{"no_Latn_NO"}
und_NP{"ne_Deva_NP"}
+ und_NR{"na_Latn_NR"}
+ und_NU{"niu_Latn_NU"}
und_Nkoo{"man_Nkoo_GN"}
und_OM{"ar_Arab_OM"}
und_Ogam{"sga_Ogam_IE"}
@@ -526,7 +755,7 @@
und_SD{"ar_Arab_SD"}
und_SE{"sv_Latn_SE"}
und_SI{"sl_Latn_SI"}
- und_SJ{"nb_Latn_SJ"}
+ und_SJ{"no_Latn_SJ"}
und_SK{"sk_Latn_SK"}
und_SM{"it_Latn_SM"}
und_SN{"fr_Latn_SN"}
@@ -546,6 +775,7 @@
und_Sylo{"syl_Sylo_BD"}
und_Syrc{"syr_Syrc_SY"}
und_TD{"fr_Latn_TD"}
+ und_TF{"fr_Latn_TF"}
und_TG{"fr_Latn_TG"}
und_TH{"th_Thai_TH"}
und_TJ{"tg_Cyrl_TJ"}
@@ -569,6 +799,9 @@
und_Tglg{"fil_Tglg_PH"}
und_Thaa{"dv_Thaa_MV"}
und_Thai{"th_Thai_TH"}
+ und_Thai_CN{"lcp_Thai_CN"}
+ und_Thai_KH{"kdt_Thai_KH"}
+ und_Thai_LA{"kdt_Thai_LA"}
und_Tibt{"bo_Tibt_CN"}
und_UA{"uk_Cyrl_UA"}
und_UG{"sw_Latn_UG"}
@@ -587,31 +820,52 @@
und_YE{"ar_Arab_YE"}
und_YT{"fr_Latn_YT"}
und_Yiii{"ii_Yiii_CN"}
+ unr{"unr_Beng_IN"}
+ unx{"unx_Beng_IN"}
ur{"ur_Arab_PK"}
uz{"uz_Cyrl_UZ"}
uz_AF{"uz_Arab_AF"}
uz_Arab{"uz_Arab_AF"}
+ uz_TM{"uz_Latn_TM"}
+ uz_TR{"uz_Latn_TR"}
vai{"vai_Vaii_LR"}
ve{"ve_Latn_ZA"}
vi{"vi_Latn_VN"}
vo{"vo_Latn_001"}
vun{"vun_Latn_TZ"}
+ wa{"wa_Latn_BE"}
wae{"wae_Latn_CH"}
wal{"wal_Ethi_ET"}
war{"war_Latn_PH"}
wo{"wo_Latn_SN"}
xh{"xh_Latn_ZA"}
xog{"xog_Latn_UG"}
+ xsr{"xsr_Deva_NP"}
+ yao{"yao_Latn_MZ"}
yap{"yap_Latn_FM"}
yav{"yav_Latn_CM"}
yi{"yi_Hebr_IL"}
yo{"yo_Latn_NG"}
za{"za_Latn_CN"}
zh{"zh_Hans_CN"}
+ zh_AU{"zh_Hant_AU"}
+ zh_BN{"zh_Hant_BN"}
+ zh_GB{"zh_Hant_GB"}
+ zh_GF{"zh_Hant_GF"}
zh_HK{"zh_Hant_HK"}
zh_Hani{"zh_Hans_CN"}
zh_Hant{"zh_Hant_TW"}
+ zh_ID{"zh_Hant_ID"}
zh_MO{"zh_Hant_MO"}
+ zh_MY{"zh_Hant_MY"}
+ zh_PA{"zh_Hant_PA"}
+ zh_PF{"zh_Hant_PF"}
+ zh_PH{"zh_Hant_PH"}
+ zh_SR{"zh_Hant_SR"}
+ zh_TH{"zh_Hant_TH"}
zh_TW{"zh_Hant_TW"}
+ zh_US{"zh_Hant_US"}
+ zh_VN{"zh_Hant_VN"}
zu{"zu_Latn_ZA"}
+ zza{"zza_Arab_TR"}
}
diff --git a/data/misc/metaZones.txt b/data/misc/metaZones.txt
index d1906a9..61cbb75 100644
--- a/data/misc/metaZones.txt
+++ b/data/misc/metaZones.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/metaZones.xml
// *
@@ -223,7 +223,6 @@
}
China{
001{"Asia/Shanghai"}
- MO{"Asia/Macau"}
}
Choibalsan{
001{"Asia/Choibalsan"}
@@ -302,6 +301,7 @@
SM{"Europe/San_Marino"}
TN{"Africa/Tunis"}
VA{"Europe/Vatican"}
+ XK{"Europe/Belgrade"}
}
Europe_Eastern{
001{"Europe/Bucharest"}
@@ -2905,6 +2905,23 @@
"Nepal",
}
}
+ "Asia:Khandyga"{
+ {
+ "Yakutsk",
+ "1970-01-01 00:00",
+ "2003-12-31 15:00",
+ }
+ {
+ "Vladivostok",
+ "2003-12-31 15:00",
+ "2011-09-12 13:00",
+ }
+ {
+ "Yakutsk",
+ "2011-09-12 13:00",
+ "9999-12-31 23:59",
+ }
+ }
"Asia:Krasnoyarsk"{
{
"Krasnoyarsk",
@@ -3191,6 +3208,23 @@
"9999-12-31 23:59",
}
}
+ "Asia:Ust-Nera"{
+ {
+ "Yakutsk",
+ "1970-01-01 00:00",
+ "1981-03-31 15:00",
+ }
+ {
+ "Magadan",
+ "1981-03-31 15:00",
+ "2011-09-12 12:00",
+ }
+ {
+ "Vladivostok",
+ "2011-09-12 12:00",
+ "9999-12-31 23:59",
+ }
+ }
"Asia:Vientiane"{
{
"Indochina",
@@ -3414,6 +3448,11 @@
"Europe_Central",
}
}
+ "Europe:Busingen"{
+ {
+ "Europe_Central",
+ }
+ }
"Europe:Chisinau"{
{
"Moscow",
@@ -4146,4 +4185,17 @@
}
}
}
+ primaryZones{
+ CL{"America/Santiago"}
+ CN{"Asia/Shanghai"}
+ DE{"Europe/Berlin"}
+ EC{"America/Guayaquil"}
+ ES{"Europe/Madrid"}
+ MH{"Pacific/Majuro"}
+ MY{"Asia/Kuala_Lumpur"}
+ NZ{"Pacific/Auckland"}
+ PT{"Europe/Lisbon"}
+ UA{"Europe/Kiev"}
+ UZ{"Asia/Tashkent"}
+ }
}
diff --git a/data/misc/metadata.txt b/data/misc/metadata.txt
index b27e2eb..8ae8859 100755
--- a/data/misc/metadata.txt
+++ b/data/misc/metadata.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/supplementalMetadata.xml
// *
@@ -192,12 +192,14 @@
no_NYNORSK{"nn"}
nob{"nb"}
nor{"nb"}
+ npi{"ne"}
nya{"ny"}
oci{"oc"}
ojg{"oj"}
oji{"oj"}
ori{"or"}
orm{"om"}
+ ory{"or"}
oss{"os"}
pan{"pa"}
pbu{"ps"}
@@ -352,7 +354,6 @@
"BR",
"BS",
"BT",
- "BU",
"BV",
"BW",
"BY",
@@ -371,14 +372,12 @@
"CO",
"CP",
"CR",
- "CS",
"CU",
"CV",
"CW",
"CX",
"CY",
"CZ",
- "DD",
"DE",
"DG",
"DJ",
@@ -401,7 +400,6 @@
"FM",
"FO",
"FR",
- "FX",
"GA",
"GB",
"GD",
@@ -497,7 +495,6 @@
"NO",
"NP",
"NR",
- "NT",
"NU",
"NZ",
"OM",
@@ -517,7 +514,6 @@
"PY",
"QA",
"QO",
- "QU",
"RE",
"RO",
"RS",
@@ -540,7 +536,6 @@
"SR",
"SS",
"ST",
- "SU",
"SV",
"SX",
"SY",
@@ -557,7 +552,6 @@
"TM",
"TN",
"TO",
- "TP",
"TR",
"TT",
"TV",
@@ -578,13 +572,11 @@
"VU",
"WF",
"WS",
- "YD",
+ "XK",
"YE",
"YT",
- "YU",
"ZA",
"ZM",
- "ZR",
"ZW",
"ZZ",
}
@@ -1146,7 +1138,7 @@
}
variantAlias{
AALAND{"AX"}
- HEPLOC{"alalc97"}
+ HEPLOC{"ALALC97"}
POLYTONI{"POLYTON"}
}
}
diff --git a/data/misc/numberingSystems.txt b/data/misc/numberingSystems.txt
index 062016b..25123db 100644
--- a/data/misc/numberingSystems.txt
+++ b/data/misc/numberingSystems.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/numberingSystems.xml
// *
diff --git a/data/misc/plurals.txt b/data/misc/plurals.txt
index 7c4867d..edf08d8 100644
--- a/data/misc/plurals.txt
+++ b/data/misc/plurals.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/plurals.xml, ordinals.xml
// *
@@ -64,16 +64,20 @@
hi{"set4"}
hr{"set11"}
hu{""}
+ hy{"set3"}
id{""}
ig{""}
ii{""}
+ in{""}
is{"set3"}
it{"set3"}
iu{"set7"}
+ iw{"set2"}
ja{""}
jgo{"set3"}
jmc{"set3"}
jv{""}
+ jw{""}
ka{""}
kab{"set5"}
kaj{"set3"}
@@ -210,10 +214,12 @@
fr{"set3"}
gl{""}
gu{"set31"}
+ he{""}
hi{"set31"}
hr{""}
hu{"set25"}
id{""}
+ in{""}
is{""}
it{"set28"}
iw{""}
diff --git a/data/misc/postalCodeData.txt b/data/misc/postalCodeData.txt
index 239797c..5aa1175 100644
--- a/data/misc/postalCodeData.txt
+++ b/data/misc/postalCodeData.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/postalCodeData.xml
// *
@@ -168,6 +168,7 @@
VE{"\d{4}"}
VI{"008(([0-4]\d)|(5[01]))([ \-]\d{4})?"}
WF{"986\d{2}"}
+ XK{"\d{5}"}
YT{"976\d{2}"}
YU{"\d{5}"}
ZA{"\d{4}"}
diff --git a/data/misc/supplementalData.txt b/data/misc/supplementalData.txt
index 9bd7bdf..513f195 100644
--- a/data/misc/supplementalData.txt
+++ b/data/misc/supplementalData.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/supplementalData.xml
// *
@@ -17,8 +17,8 @@
"islamic-civil",
}
AF{
- "gregorian",
"persian",
+ "gregorian",
"islamic",
"islamic-civil",
}
@@ -85,8 +85,8 @@
"islamic-civil",
}
IR{
- "gregorian",
"persian",
+ "gregorian",
"islamic",
"islamic-civil",
}
@@ -196,7 +196,7 @@
"islamic-civil",
}
}
- cldrVersion{"22.1.1"}
+ cldrVersion{"23.0"}
codeMappings{
{
"AA",
@@ -1782,7 +1782,6 @@
agq{
primary{
scripts{"Latn"}
- territories{"CM"}
}
}
aii{
@@ -1870,6 +1869,8 @@
"QA",
"SA",
"SD",
+ "SO",
+ "SS",
"SY",
"TD",
"TN",
@@ -1878,10 +1879,7 @@
}
secondary{
scripts{"Syrc"}
- territories{
- "IR",
- "SS",
- }
+ territories{"IR"}
}
}
arc{
@@ -1994,11 +1992,10 @@
bas{
primary{
scripts{"Latn"}
- territories{"CM"}
}
}
bax{
- secondary{
+ primary{
scripts{"Bamu"}
}
}
@@ -2016,11 +2013,6 @@
territories{"CI"}
}
}
- bcl{
- secondary{
- territories{"PH"}
- }
- }
be{
primary{
scripts{"Cyrl"}
@@ -2127,6 +2119,9 @@
primary{
scripts{"Latn"}
}
+ secondary{
+ territories{"PH"}
+ }
}
bin{
primary{
@@ -2166,7 +2161,7 @@
}
}
blt{
- secondary{
+ primary{
scripts{"Tavt"}
}
}
@@ -2209,9 +2204,6 @@
primary{
scripts{"Latn"}
}
- secondary{
- territories{"FR"}
- }
}
bra{
primary{
@@ -2237,12 +2229,6 @@
territories{"BA"}
}
}
- bss{
- primary{
- scripts{"Latn"}
- territories{"CM"}
- }
- }
btv{
primary{
scripts{"Deva"}
@@ -2270,17 +2256,11 @@
territories{"ID"}
}
}
- bxr{
- primary{
- scripts{"Cyrl"}
- }
- }
bya{
primary{
scripts{"Latn"}
}
secondary{
- scripts{"Batk"}
territories{"ID"}
}
}
@@ -2427,7 +2407,10 @@
scripts{"Arab"}
}
secondary{
- territories{"IR"}
+ territories{
+ "IQ",
+ "IR",
+ }
}
}
ckt{
@@ -2502,11 +2485,6 @@
territories{"RU"}
}
}
- cwd{
- primary{
- scripts{"Cans"}
- }
- }
cy{
primary{
scripts{"Latn"}
@@ -2561,6 +2539,7 @@
scripts{"Runr"}
territories{
"BR",
+ "KZ",
"US",
}
}
@@ -2583,21 +2562,11 @@
scripts{"Latn"}
}
}
- dhd{
- secondary{
- territories{"IN"}
- }
- }
din{
primary{
scripts{"Latn"}
}
}
- diq{
- secondary{
- territories{"TR"}
- }
- }
dje{
primary{
scripts{"Latn"}
@@ -2627,7 +2596,6 @@
dua{
primary{
scripts{"Latn"}
- territories{"CM"}
}
}
dv{
@@ -2704,14 +2672,6 @@
}
}
}
- emk{
- primary{
- scripts{"Nkoo"}
- }
- secondary{
- territories{"GN"}
- }
- }
en{
primary{
scripts{"Latn"}
@@ -2778,10 +2738,12 @@
"RW",
"SB",
"SC",
+ "SD",
"SG",
"SH",
"SL",
"SS",
+ "SX",
"SZ",
"TC",
"TK",
@@ -2895,7 +2857,6 @@
ewo{
primary{
scripts{"Latn"}
- territories{"CM"}
}
}
fa{
@@ -2918,11 +2879,6 @@
territories{"GQ"}
}
}
- fat{
- primary{
- scripts{"Latn"}
- }
- }
ff{
primary{
scripts{"Latn"}
@@ -2955,6 +2911,7 @@
}
secondary{
scripts{"Tglg"}
+ territories{"US"}
}
}
fiu{
@@ -3175,11 +3132,6 @@
territories{"PY"}
}
}
- gno{
- secondary{
- territories{"IN"}
- }
- }
gon{
primary{
scripts{
@@ -3226,11 +3178,9 @@
gsw{
primary{
scripts{"Latn"}
- }
- secondary{
territories{
- "LI",
"CH",
+ "LI",
}
}
}
@@ -3314,13 +3264,15 @@
territories{"PH"}
}
}
+ hit{
+ secondary{
+ scripts{"Xsux"}
+ }
+ }
hmn{
primary{
scripts{"Latn"}
}
- secondary{
- scripts{"Hmng"}
- }
}
hne{
primary{
@@ -3354,7 +3306,6 @@
scripts{"Deva"}
}
secondary{
- scripts{"Wara"}
territories{"IN"}
}
}
@@ -3467,21 +3418,11 @@
scripts{"Latn"}
}
}
- ike{
- secondary{
- territories{"CA"}
- }
- }
ikt{
secondary{
territories{"CA"}
}
}
- iku{
- secondary{
- territories{"CA"}
- }
- }
ilo{
primary{
scripts{"Latn"}
@@ -3532,7 +3473,7 @@
}
secondary{
scripts{"Latn"}
- territories{"GL"}
+ territories{"CA"}
}
}
ja{
@@ -3541,12 +3482,6 @@
territories{"JP"}
}
}
- jgo{
- primary{
- scripts{"Latn"}
- territories{"CM"}
- }
- }
jmc{
primary{
scripts{"Latn"}
@@ -3592,7 +3527,7 @@
}
kac{
primary{
- scripts{"Mymr"}
+ scripts{"Latn"}
}
}
kaj{
@@ -3647,12 +3582,6 @@
territories{"CV"}
}
}
- ken{
- primary{
- scripts{"Latn"}
- territories{"CM"}
- }
- }
kfo{
primary{
scripts{"Latn"}
@@ -3734,12 +3663,6 @@
territories{"CN"}
}
}
- kkj{
- primary{
- scripts{"Latn"}
- territories{"CM"}
- }
- }
kl{
primary{
scripts{"Latn"}
@@ -3771,11 +3694,6 @@
territories{"AO"}
}
}
- kmr{
- primary{
- scripts{"Latn"}
- }
- }
kn{
primary{
scripts{"Knda"}
@@ -3786,7 +3704,10 @@
}
ko{
primary{
- scripts{"Kore"}
+ scripts{
+ "Hang",
+ "Kore",
+ }
territories{
"KP",
"KR",
@@ -3823,14 +3744,6 @@
scripts{"Latn"}
}
}
- kpv{
- primary{
- scripts{"Cyrl"}
- }
- secondary{
- territories{"RU"}
- }
- }
kpy{
primary{
scripts{"Cyrl"}
@@ -3892,7 +3805,6 @@
ksf{
primary{
scripts{"Latn"}
- territories{"CM"}
}
}
ksh{
@@ -3903,16 +3815,15 @@
ku{
primary{
scripts{
- "Latn",
"Arab",
"Cyrl",
+ "Latn",
}
}
secondary{
territories{
- "TR",
- "IQ",
"SY",
+ "TR",
}
}
}
@@ -3936,6 +3847,9 @@
"Latn",
}
}
+ secondary{
+ territories{"RU"}
+ }
}
kw{
primary{
@@ -3970,11 +3884,6 @@
territories{"VA"}
}
}
- lab{
- secondary{
- scripts{"Lina"}
- }
- }
lad{
primary{
scripts{"Hebr"}
@@ -4057,7 +3966,7 @@
}
}
lis{
- secondary{
+ primary{
scripts{"Lisu"}
}
}
@@ -4216,7 +4125,13 @@
}
man{
primary{
- scripts{"Latn"}
+ scripts{
+ "Latn",
+ "Nkoo",
+ }
+ }
+ secondary{
+ territories{"GN"}
}
}
mas{
@@ -4288,12 +4203,6 @@
scripts{"Latn"}
}
}
- mgo{
- primary{
- scripts{"Latn"}
- territories{"CM"}
- }
- }
mh{
primary{
scripts{"Latn"}
@@ -4360,6 +4269,14 @@
territories{"IN"}
}
}
+ mnk{
+ primary{
+ scripts{"Latn"}
+ }
+ secondary{
+ territories{"GM"}
+ }
+ }
mns{
primary{
scripts{"Cyrl"}
@@ -4422,12 +4339,6 @@
mua{
primary{
scripts{"Latn"}
- territories{"CM"}
- }
- }
- mup{
- secondary{
- territories{"IN"}
}
}
mus{
@@ -4462,11 +4373,6 @@
territories{"RU"}
}
}
- myx{
- secondary{
- territories{"UG"}
- }
- }
myz{
secondary{
scripts{"Mand"}
@@ -4500,11 +4406,6 @@
}
}
}
- nbf{
- secondary{
- scripts{"Nkgb"}
- }
- }
nd{
primary{
scripts{"Latn"}
@@ -4568,15 +4469,17 @@
territories{
"AW",
"BE",
+ "BQ",
+ "CW",
"NL",
"SR",
+ "SX",
}
}
}
nmg{
primary{
scripts{"Latn"}
- territories{"CM"}
}
}
nn{
@@ -4585,20 +4488,11 @@
territories{"NO"}
}
}
- nnh{
- primary{
- scripts{"Latn"}
- territories{"CM"}
- }
- }
- no{
- primary{
- scripts{"Latn"}
- }
- }
nod{
- secondary{
+ primary{
scripts{"Lana"}
+ }
+ secondary{
territories{"TH"}
}
}
@@ -4772,6 +4666,10 @@
pap{
primary{
scripts{"Latn"}
+ territories{
+ "BQ",
+ "CW",
+ }
}
secondary{
territories{"AW"}
@@ -4835,6 +4733,11 @@
scripts{"Latn"}
}
}
+ prs{
+ primary{
+ scripts{"Arab"}
+ }
+ }
ps{
primary{
scripts{"Arab"}
@@ -4852,15 +4755,13 @@
"BR",
"CV",
"GW",
+ "MO",
"MZ",
"PT",
"ST",
"TL",
}
}
- secondary{
- territories{"FR"}
- }
}
qu{
primary{
@@ -4875,6 +4776,9 @@
primary{
scripts{"Latn"}
}
+ secondary{
+ territories{"IN"}
+ }
}
rap{
primary{
@@ -4895,6 +4799,9 @@
}
}
rej{
+ primary{
+ scripts{"Latn"}
+ }
secondary{
scripts{"Rjng"}
territories{"ID"}
@@ -4905,12 +4812,15 @@
territories{"MA"}
}
}
- ril{
+ rjs{
+ primary{
+ scripts{"Deva"}
+ }
+ }
+ rkt{
primary{
scripts{"Beng"}
}
- }
- rjb{
secondary{
territories{"IN"}
}
@@ -5010,6 +4920,11 @@
scripts{"Latn"}
}
}
+ saf{
+ primary{
+ scripts{"Latn"}
+ }
+ }
sah{
primary{
scripts{"Cyrl"}
@@ -5157,20 +5072,12 @@
}
}
}
- sh{
- primary{
- scripts{"Latn"}
- }
- }
shi{
primary{
- scripts{"Tfng"}
+ scripts{"Arab"}
}
secondary{
- scripts{
- "Arab",
- "Latn",
- }
+ scripts{"Tfng"}
territories{"MA"}
}
}
@@ -5296,6 +5203,7 @@
territories{
"AL",
"MK",
+ "XK",
}
}
secondary{
@@ -5312,6 +5220,7 @@
"BA",
"ME",
"RS",
+ "XK",
}
}
}
@@ -5342,7 +5251,7 @@
}
ssy{
primary{
- scripts{"Ethi"}
+ scripts{"Latn"}
}
}
st{
@@ -5572,17 +5481,6 @@
territories{"TK"}
}
}
- tl{
- primary{
- scripts{"Latn"}
- }
- secondary{
- territories{
- "PH",
- "US",
- }
- }
- }
tli{
primary{
scripts{"Latn"}
@@ -5647,9 +5545,6 @@
primary{
scripts{"Latn"}
}
- secondary{
- territories{"TW"}
- }
}
ts{
primary{
@@ -5689,11 +5584,6 @@
territories{"TH"}
}
}
- ttt{
- primary{
- scripts{"Cyrl"}
- }
- }
tum{
primary{
scripts{"Latn"}
@@ -5713,11 +5603,6 @@
territories{"TV"}
}
}
- tw{
- primary{
- scripts{"Latn"}
- }
- }
twq{
primary{
scripts{"Latn"}
@@ -5852,10 +5737,6 @@
primary{
scripts{"Vaii"}
}
- secondary{
- scripts{"Latn"}
- territories{"LR"}
- }
}
ve{
primary{
@@ -5903,6 +5784,11 @@
scripts{"Latn"}
}
}
+ wak{
+ secondary{
+ scripts{"Latn"}
+ }
+ }
wal{
primary{
scripts{"Ethi"}
@@ -5969,16 +5855,6 @@
territories{"ZA"}
}
}
- xlc{
- secondary{
- scripts{"Lyci"}
- }
- }
- xld{
- secondary{
- scripts{"Lydi"}
- }
- }
xnr{
secondary{
territories{"IN"}
@@ -6029,7 +5905,6 @@
yav{
primary{
scripts{"Latn"}
- territories{"CM"}
}
}
yi{
@@ -6067,11 +5942,6 @@
scripts{"Latn"}
}
}
- zbl{
- primary{
- scripts{"Blis"}
- }
- }
zdj{
primary{
territories{"KM"}
@@ -6124,6 +5994,9 @@
primary{
scripts{"Arab"}
}
+ secondary{
+ territories{"TR"}
+ }
}
}
languageMatching{
@@ -7497,6 +7370,17 @@
code{"685"}
}
}
+ XK{
+ {
+ code{"377"}
+ }
+ {
+ code{"381"}
+ }
+ {
+ code{"386"}
+ }
+ }
YE{
{
code{"967"}
@@ -7740,6 +7624,7 @@
"SI",
"SM",
"VA",
+ "XK",
}
053{
"AU",
@@ -7910,6 +7795,7402 @@
"EU",
}
}
+ territoryInfo{
+ AC{
+ en{
+ populationShareF:int{49990000}
+ }
+ territoryF:intvector{
+ 57346300,
+ 49990000,
+ 52940000,
+ }
+ }
+ AD{
+ ca{
+ officialStatus{"official"}
+ populationShareF:int{49510000}
+ }
+ es{
+ populationShareF:int{49430000}
+ }
+ fr{
+ populationShareF:int{48680000}
+ }
+ territoryF:intvector{
+ 59311900,
+ 50100000,
+ 54850820,
+ }
+ }
+ AE{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49780000}
+ }
+ bal{
+ populationShareF:int{48230000}
+ }
+ fa{
+ populationShareF:int{48190000}
+ }
+ ml{
+ populationShareF:int{48700000}
+ }
+ ps{
+ populationShareF:int{48290000}
+ }
+ territoryF:intvector{
+ 61271200,
+ 49779000,
+ 56531432,
+ }
+ }
+ AF{
+ bal{
+ populationShareF:int{47670000}
+ }
+ fa{
+ officialStatus{"official"}
+ populationShareF:int{49500000}
+ }
+ haz{
+ populationShareF:int{48590000}
+ }
+ kk_Arab{
+ populationShareF:int{45660000}
+ }
+ prd{
+ populationShareF:int{48120000}
+ }
+ ps{
+ officialStatus{"official"}
+ populationShareF:int{49430000}
+ }
+ territoryF:intvector{
+ 60335500,
+ 49281000,
+ 57304199,
+ }
+ tk{
+ populationShareF:int{48170000}
+ }
+ ug_Arab{
+ populationShareF:int{45990000}
+ }
+ uz_Arab{
+ populationShareF:int{48470000}
+ }
+ }
+ AG{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49860000}
+ }
+ pt{
+ populationShareF:int{48180000}
+ }
+ territoryF:intvector{
+ 59153500,
+ 49858000,
+ 54890180,
+ }
+ }
+ AI{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49950000}
+ }
+ territoryF:intvector{
+ 58175400,
+ 49950000,
+ 54154230,
+ }
+ }
+ AL{
+ el{
+ populationShareF:int{48190000}
+ }
+ mk{
+ populationShareF:int{47470000}
+ }
+ sq{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 60258600,
+ 49987000,
+ 56300286,
+ }
+ }
+ AM{
+ az_Latn{
+ populationShareF:int{48530000}
+ }
+ hy{
+ officialStatus{"official"}
+ populationShareF:int{49980000}
+ }
+ ku_Latn{
+ populationShareF:int{48330000}
+ }
+ territoryF:intvector{
+ 60189500,
+ 49996000,
+ 56297050,
+ }
+ }
+ AO{
+ kmb{
+ populationShareF:int{49250000}
+ }
+ ln{
+ populationShareF:int{47670000}
+ }
+ pt{
+ officialStatus{"official"}
+ populationShareF:int{49670000}
+ }
+ territoryF:intvector{
+ 61126200,
+ 49701000,
+ 57180561,
+ }
+ umb{
+ populationShareF:int{49290000}
+ }
+ }
+ AQ{
+ territoryF:intvector{
+ 57149700,
+ 49990000,
+ 52300000,
+ }
+ und{
+ populationShareF:int{50100000}
+ }
+ }
+ AR{
+ cy{
+ populationShareF:int{46650000}
+ }
+ es{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ gn{
+ populationShareF:int{46470000}
+ }
+ territoryF:intvector{
+ 61746900,
+ 49981000,
+ 57421925,
+ }
+ }
+ AS{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49970000}
+ }
+ sm{
+ officialStatus{"official"}
+ populationShareF:int{49990000}
+ }
+ territoryF:intvector{
+ 58575300,
+ 49970000,
+ 54549470,
+ }
+ }
+ AT{
+ de{
+ officialStatus{"official"}
+ populationShareF:int{49970000}
+ }
+ hr{
+ officialStatus{"official_regional"}
+ populationShareF:int{48120000}
+ }
+ hu{
+ officialStatus{"official_regional"}
+ populationShareF:int{47270000}
+ }
+ sl{
+ officialStatus{"official_regional"}
+ populationShareF:int{47370000}
+ }
+ territoryF:intvector{
+ 61357800,
+ 49980000,
+ 56821974,
+ }
+ }
+ AU{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49960000}
+ }
+ it{
+ populationShareF:int{48190000}
+ }
+ territoryF:intvector{
+ 61960700,
+ 49990000,
+ 57220156,
+ }
+ zh_Hant{
+ populationShareF:int{48210000}
+ }
+ }
+ AW{
+ en{
+ populationShareF:int{48280000}
+ }
+ nl{
+ officialStatus{"official"}
+ populationShareF:int{49970000}
+ }
+ pap{
+ populationShareF:int{49610000}
+ }
+ territoryF:intvector{
+ 59225800,
+ 49973000,
+ 55107635,
+ }
+ }
+ AX{
+ sv{
+ officialStatus{"official"}
+ populationShareF:int{49990000}
+ }
+ territoryF:intvector{
+ 58929800,
+ 50100000,
+ 54262000,
+ }
+ }
+ AZ{
+ az_Cyrl{
+ officialStatus{"official"}
+ populationShareF:int{48990000}
+ }
+ az_Latn{
+ officialStatus{"official"}
+ populationShareF:int{49890000}
+ }
+ ku_Latn{
+ populationShareF:int{47240000}
+ }
+ territoryF:intvector{
+ 60981600,
+ 49998000,
+ 56949360,
+ }
+ }
+ BA{
+ bs_Cyrl{
+ officialStatus{"official"}
+ populationShareF:int{49990000}
+ writingShareF:int{48500000}
+ }
+ bs_Latn{
+ officialStatus{"official"}
+ populationShareF:int{49990000}
+ }
+ hr{
+ officialStatus{"official"}
+ populationShareF:int{49120000}
+ }
+ sr_Cyrl{
+ officialStatus{"official"}
+ populationShareF:int{49100000}
+ }
+ sr_Latn{
+ officialStatus{"official"}
+ populationShareF:int{49100000}
+ writingShareF:int{48500000}
+ }
+ territoryF:intvector{
+ 60320800,
+ 49979000,
+ 56387930,
+ }
+ }
+ BB{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 59709100,
+ 49997000,
+ 55287733,
+ }
+ }
+ BD{
+ bn{
+ officialStatus{"official"}
+ populationShareF:int{49980000}
+ }
+ ccp{
+ populationShareF:int{47220000}
+ }
+ grt{
+ populationShareF:int{46730000}
+ }
+ mni{
+ populationShareF:int{46110000}
+ }
+ my{
+ populationShareF:int{47210000}
+ }
+ rkt{
+ populationShareF:int{0}
+ writingShareF:int{49200000}
+ }
+ syl{
+ populationShareF:int{48500000}
+ }
+ territoryF:intvector{
+ 61305500,
+ 49568000,
+ 58161084,
+ }
+ }
+ BE{
+ de{
+ officialStatus{"official"}
+ populationShareF:int{48140000}
+ }
+ en{
+ populationShareF:int{49490000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49380000}
+ }
+ nl{
+ officialStatus{"official"}
+ populationShareF:int{49550000}
+ }
+ territoryF:intvector{
+ 61420600,
+ 49990000,
+ 57104384,
+ }
+ wa{
+ populationShareF:int{48580000}
+ writingShareF:int{48500000}
+ }
+ }
+ BF{
+ dyu{
+ populationShareF:int{49320000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49220000}
+ }
+ mos{
+ populationShareF:int{49400000}
+ }
+ territoryF:intvector{
+ 60240300,
+ 49218000,
+ 57172751,
+ }
+ }
+ BG{
+ bg{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 61103700,
+ 49984000,
+ 56703794,
+ }
+ tr{
+ populationShareF:int{49110000}
+ }
+ }
+ BH{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49870000}
+ }
+ ml{
+ populationShareF:int{48330000}
+ }
+ territoryF:intvector{
+ 60324400,
+ 49946000,
+ 56124835,
+ }
+ }
+ BI{
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49590000}
+ }
+ rn{
+ officialStatus{"official"}
+ populationShareF:int{49630000}
+ }
+ sw{
+ populationShareF:int{46600000}
+ }
+ territoryF:intvector{
+ 59548900,
+ 49672000,
+ 57105573,
+ }
+ }
+ BJ{
+ fon{
+ populationShareF:int{49250000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49350000}
+ }
+ territoryF:intvector{
+ 60155100,
+ 49424000,
+ 56959879,
+ }
+ yo{
+ populationShareF:int{48670000}
+ }
+ }
+ BL{
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49930000}
+ }
+ territoryF:intvector{
+ 58255000,
+ 49990000,
+ 53733200,
+ }
+ }
+ BM{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49920000}
+ }
+ territoryF:intvector{
+ 59450000,
+ 49980000,
+ 54690800,
+ }
+ }
+ BN{
+ en{
+ populationShareF:int{48200000}
+ }
+ ms_Arab{
+ officialStatus{"official"}
+ populationShareF:int{48500000}
+ }
+ ms_Latn{
+ officialStatus{"official"}
+ populationShareF:int{49930000}
+ }
+ territoryF:intvector{
+ 60219400,
+ 49927000,
+ 55408786,
+ }
+ zh_Hant{
+ populationShareF:int{49110000}
+ }
+ }
+ BO{
+ ay{
+ officialStatus{"official"}
+ populationShareF:int{49200000}
+ }
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49610000}
+ }
+ gn{
+ populationShareF:int{47450000}
+ }
+ qu{
+ officialStatus{"official"}
+ populationShareF:int{49320000}
+ }
+ territoryF:intvector{
+ 60543600,
+ 49867000,
+ 57102900,
+ }
+ }
+ BQ{
+ nl{
+ officialStatus{"official"}
+ populationShareF:int{48800000}
+ }
+ pap{
+ officialStatus{"official"}
+ populationShareF:int{49810000}
+ }
+ territoryF:intvector{
+ 58389200,
+ 49990000,
+ 54200000,
+ }
+ }
+ BR{
+ de{
+ populationShareF:int{47840000}
+ }
+ gub{
+ populationShareF:int{45840000}
+ }
+ it{
+ populationShareF:int{47280000}
+ }
+ ja{
+ populationShareF:int{47210000}
+ }
+ kgp{
+ populationShareF:int{46100000}
+ }
+ ko{
+ populationShareF:int{46210000}
+ }
+ pt{
+ officialStatus{"official"}
+ populationShareF:int{49910000}
+ }
+ territoryF:intvector{
+ 62236200,
+ 49886000,
+ 58199321,
+ }
+ xav{
+ populationShareF:int{45500000}
+ }
+ }
+ BS{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 60110400,
+ 49956000,
+ 55316182,
+ }
+ }
+ BT{
+ dz{
+ officialStatus{"official"}
+ populationShareF:int{49470000}
+ }
+ lep{
+ populationShareF:int{48390000}
+ }
+ ne{
+ populationShareF:int{49170000}
+ }
+ territoryF:intvector{
+ 59481300,
+ 49470000,
+ 55716896,
+ }
+ tsj{
+ populationShareF:int{49150000}
+ }
+ }
+ BV{
+ territoryF:intvector{
+ 54368500,
+ 49990000,
+ 50100000,
+ }
+ und{
+ populationShareF:int{50100000}
+ }
+ }
+ BW{
+ af{
+ populationShareF:int{47290000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49810000}
+ }
+ territoryF:intvector{
+ 60314900,
+ 49845000,
+ 56209802,
+ }
+ tn{
+ officialStatus{"official"}
+ populationShareF:int{49620000}
+ }
+ }
+ BY{
+ be{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ ru{
+ officialStatus{"official"}
+ populationShareF:int{49120000}
+ }
+ territoryF:intvector{
+ 61150300,
+ 49996000,
+ 56964357,
+ }
+ }
+ BZ{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ es{
+ populationShareF:int{49280000}
+ }
+ territoryF:intvector{
+ 59289600,
+ 49769000,
+ 55327719,
+ }
+ }
+ CA{
+ atj{
+ populationShareF:int{46160000}
+ }
+ chp{
+ populationShareF:int{45220000}
+ }
+ cr{
+ populationShareF:int{47110000}
+ }
+ crj{
+ populationShareF:int{46210000}
+ }
+ crk{
+ populationShareF:int{47110000}
+ }
+ crl{
+ populationShareF:int{46150000}
+ }
+ crm{
+ populationShareF:int{46130000}
+ }
+ csw{
+ populationShareF:int{46150000}
+ }
+ de{
+ populationShareF:int{48190000}
+ }
+ den{
+ populationShareF:int{45670000}
+ }
+ dgr{
+ populationShareF:int{45770000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49850000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49220000}
+ }
+ gwi{
+ populationShareF:int{45170000}
+ }
+ ikt{
+ officialStatus{"official_regional"}
+ populationShareF:int{46120000}
+ writingShareF:int{49300000}
+ }
+ it{
+ populationShareF:int{48200000}
+ }
+ iu{
+ officialStatus{"official_regional"}
+ populationShareF:int{46420000}
+ writingShareF:int{49300000}
+ }
+ moe{
+ populationShareF:int{46330000}
+ }
+ nsk{
+ populationShareF:int{45340000}
+ }
+ scs{
+ populationShareF:int{45360000}
+ }
+ territoryF:intvector{
+ 62144600,
+ 49990000,
+ 57343001,
+ }
+ }
+ CC{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49170000}
+ }
+ ms_Arab{
+ populationShareF:int{49830000}
+ }
+ territoryF:intvector{
+ 57260100,
+ 49990000,
+ 52596000,
+ }
+ }
+ CD{
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{48380000}
+ }
+ kg{
+ officialStatus{"official_regional"}
+ populationShareF:int{48150000}
+ }
+ ln{
+ officialStatus{"official_regional"}
+ populationShareF:int{48310000}
+ }
+ lol{
+ populationShareF:int{47610000}
+ }
+ lu{
+ populationShareF:int{48230000}
+ }
+ lua{
+ officialStatus{"official_regional"}
+ populationShareF:int{48960000}
+ }
+ rw{
+ populationShareF:int{47380000}
+ }
+ sw{
+ officialStatus{"official_regional"}
+ populationShareF:int{49500000}
+ }
+ territoryF:intvector{
+ 60275300,
+ 49668000,
+ 57735992,
+ }
+ }
+ CF{
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49490000}
+ }
+ ln{
+ populationShareF:int{47240000}
+ }
+ sg{
+ officialStatus{"official"}
+ populationShareF:int{49490000}
+ }
+ territoryF:intvector{
+ 59384700,
+ 49560000,
+ 56505721,
+ }
+ }
+ CG{
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49840000}
+ }
+ ln{
+ officialStatus{"official"}
+ populationShareF:int{48240000}
+ }
+ territoryF:intvector{
+ 60192700,
+ 49838000,
+ 56436627,
+ }
+ }
+ CH{
+ de{
+ officialStatus{"official"}
+ populationShareF:int{49730000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49210000}
+ }
+ gsw{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49120000}
+ writingShareF:int{48500000}
+ }
+ it{
+ officialStatus{"official"}
+ populationShareF:int{48430000}
+ }
+ lmo{
+ populationShareF:int{48410000}
+ writingShareF:int{48500000}
+ }
+ rm{
+ officialStatus{"official_regional"}
+ populationShareF:int{47500000}
+ }
+ rmo{
+ populationShareF:int{47280000}
+ }
+ territoryF:intvector{
+ 61362400,
+ 49990000,
+ 56792552,
+ }
+ wae{
+ populationShareF:int{47130000}
+ }
+ }
+ CI{
+ bci{
+ populationShareF:int{49110000}
+ writingShareF:int{49100000}
+ }
+ bqv{
+ populationShareF:int{47170000}
+ writingShareF:int{49100000}
+ }
+ daf{
+ populationShareF:int{48400000}
+ writingShareF:int{48100000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49490000}
+ }
+ kfo{
+ populationShareF:int{47230000}
+ }
+ sef{
+ populationShareF:int{48430000}
+ writingShareF:int{48500000}
+ }
+ territoryF:intvector{
+ 60396400,
+ 49562000,
+ 57219521,
+ }
+ }
+ CK{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49950000}
+ }
+ territoryF:intvector{
+ 58183200,
+ 49950000,
+ 54107770,
+ }
+ }
+ CL{
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49980000}
+ }
+ territoryF:intvector{
+ 61319400,
+ 49957000,
+ 57170674,
+ }
+ }
+ CM{
+ agq{
+ populationShareF:int{47140000}
+ }
+ ar{
+ populationShareF:int{47390000}
+ }
+ bas{
+ populationShareF:int{48120000}
+ }
+ bax{
+ populationShareF:int{48120000}
+ }
+ bbj{
+ populationShareF:int{48140000}
+ }
+ bfd{
+ populationShareF:int{47570000}
+ }
+ bkm{
+ populationShareF:int{48130000}
+ }
+ bss{
+ populationShareF:int{47540000}
+ }
+ bum{
+ populationShareF:int{48460000}
+ }
+ byv{
+ populationShareF:int{48110000}
+ }
+ dua{
+ populationShareF:int{47470000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49140000}
+ }
+ ewo{
+ populationShareF:int{48310000}
+ }
+ ff{
+ populationShareF:int{48360000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49680000}
+ }
+ ha_Arab{
+ populationShareF:int{47140000}
+ }
+ kkj{
+ populationShareF:int{47540000}
+ }
+ ksf{
+ populationShareF:int{47320000}
+ }
+ maf{
+ populationShareF:int{47740000}
+ }
+ mua{
+ populationShareF:int{48100000}
+ }
+ nmg{
+ populationShareF:int{46450000}
+ }
+ nnh{
+ populationShareF:int{48140000}
+ }
+ territoryF:intvector{
+ 60503200,
+ 49759000,
+ 57201299,
+ }
+ yav{
+ populationShareF:int{46110000}
+ }
+ ybb{
+ populationShareF:int{48160000}
+ }
+ }
+ CN{
+ bo{
+ officialStatus{"official_regional"}
+ populationShareF:int{47200000}
+ }
+ en{
+ populationShareF:int{45450000}
+ }
+ ii{
+ populationShareF:int{47600000}
+ }
+ khb{
+ populationShareF:int{46190000}
+ }
+ kk_Arab{
+ populationShareF:int{46860000}
+ }
+ ko{
+ officialStatus{"official_regional"}
+ populationShareF:int{47150000}
+ }
+ ky_Arab{
+ populationShareF:int{46340000}
+ }
+ lcp{
+ populationShareF:int{45580000}
+ }
+ lis{
+ populationShareF:int{46450000}
+ }
+ mn_Mong{
+ officialStatus{"official_regional"}
+ populationShareF:int{47260000}
+ }
+ nbf{
+ populationShareF:int{46240000}
+ }
+ ru{
+ populationShareF:int{45100000}
+ }
+ tdd{
+ populationShareF:int{46190000}
+ }
+ territoryF:intvector{
+ 63123800,
+ 49922000,
+ 59134324,
+ }
+ ug_Arab{
+ officialStatus{"official_regional"}
+ populationShareF:int{47550000}
+ }
+ uz_Cyrl{
+ populationShareF:int{44400000}
+ }
+ vi{
+ populationShareF:int{44500000}
+ }
+ za{
+ officialStatus{"official_regional"}
+ populationShareF:int{47310000}
+ }
+ zh_Hans{
+ officialStatus{"official"}
+ populationShareF:int{49900000}
+ }
+ }
+ CO{
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49930000}
+ }
+ territoryF:intvector{
+ 61500000,
+ 49904000,
+ 57452391,
+ }
+ }
+ CP{
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 54343300,
+ 49990000,
+ 50100000,
+ }
+ }
+ CR{
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49950000}
+ }
+ territoryF:intvector{
+ 60586000,
+ 49949000,
+ 56463635,
+ }
+ }
+ CU{
+ es{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 61114100,
+ 49998000,
+ 57110752,
+ }
+ }
+ CV{
+ kea{
+ populationShareF:int{49920000}
+ }
+ pt{
+ officialStatus{"official"}
+ populationShareF:int{49760000}
+ }
+ territoryF:intvector{
+ 59218800,
+ 49843000,
+ 55523568,
+ }
+ }
+ CW{
+ es{
+ populationShareF:int{48390000}
+ }
+ nl{
+ officialStatus{"official"}
+ populationShareF:int{48800000}
+ }
+ pap{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49810000}
+ }
+ territoryF:intvector{
+ 59283800,
+ 49990000,
+ 55145834,
+ }
+ }
+ CX{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49940000}
+ }
+ territoryF:intvector{
+ 57652800,
+ 49990000,
+ 53149600,
+ }
+ }
+ CY{
+ ar{
+ populationShareF:int{47110000}
+ }
+ el{
+ officialStatus{"official"}
+ populationShareF:int{49750000}
+ }
+ hy{
+ populationShareF:int{47230000}
+ }
+ territoryF:intvector{
+ 60235700,
+ 49976000,
+ 56116947,
+ }
+ tr{
+ officialStatus{"official"}
+ populationShareF:int{49230000}
+ }
+ }
+ CZ{
+ cs{
+ officialStatus{"official"}
+ populationShareF:int{49980000}
+ }
+ de{
+ populationShareF:int{47490000}
+ }
+ pl{
+ populationShareF:int{47490000}
+ }
+ territoryF:intvector{
+ 61286700,
+ 49990000,
+ 57101773,
+ }
+ }
+ DE{
+ da{
+ populationShareF:int{46610000}
+ }
+ de{
+ officialStatus{"official"}
+ populationShareF:int{49910000}
+ }
+ dsb{
+ populationShareF:int{45860000}
+ writingShareF:int{48500000}
+ }
+ el{
+ populationShareF:int{47380000}
+ }
+ en{
+ populationShareF:int{49440000}
+ }
+ es{
+ populationShareF:int{47160000}
+ }
+ hr{
+ populationShareF:int{47790000}
+ }
+ it{
+ populationShareF:int{47660000}
+ }
+ ksh{
+ populationShareF:int{47300000}
+ }
+ ku_Latn{
+ populationShareF:int{47660000}
+ }
+ nds{
+ populationShareF:int{49120000}
+ writingShareF:int{48500000}
+ }
+ nl{
+ populationShareF:int{47120000}
+ }
+ pl{
+ populationShareF:int{47290000}
+ }
+ ru{
+ populationShareF:int{47440000}
+ }
+ territoryF:intvector{
+ 62319400,
+ 49990000,
+ 57813059,
+ }
+ tr{
+ populationShareF:int{48250000}
+ }
+ }
+ DG{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49990000}
+ }
+ territoryF:intvector{
+ 57184200,
+ 49990000,
+ 52500000,
+ }
+ }
+ DJ{
+ aa{
+ populationShareF:int{49420000}
+ }
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{48730000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{48220000}
+ }
+ so{
+ populationShareF:int{49410000}
+ }
+ territoryF:intvector{
+ 59237700,
+ 49679000,
+ 55774389,
+ }
+ }
+ DK{
+ da{
+ officialStatus{"official"}
+ populationShareF:int{49930000}
+ }
+ de{
+ populationShareF:int{47430000}
+ }
+ kl{
+ officialStatus{"official_regional"}
+ populationShareF:int{47130000}
+ }
+ territoryF:intvector{
+ 61208500,
+ 49990000,
+ 56554345,
+ }
+ }
+ DM{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49940000}
+ }
+ territoryF:intvector{
+ 59103500,
+ 49940000,
+ 54731260,
+ }
+ }
+ DO{
+ en{
+ populationShareF:int{46790000}
+ }
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49780000}
+ }
+ territoryF:intvector{
+ 60987400,
+ 49870000,
+ 57100886,
+ }
+ }
+ DZ{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49740000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49200000}
+ }
+ kab{
+ populationShareF:int{48780000}
+ }
+ territoryF:intvector{
+ 61274500,
+ 49699000,
+ 57373672,
+ }
+ }
+ EA{
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49980000}
+ }
+ territoryF:intvector{
+ 59448600,
+ 49977000,
+ 55150000,
+ }
+ }
+ EC{
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49960000}
+ }
+ territoryF:intvector{
+ 61134700,
+ 49910000,
+ 57152237,
+ }
+ }
+ EE{
+ et{
+ officialStatus{"official"}
+ populationShareF:int{49710000}
+ }
+ ru{
+ populationShareF:int{49300000}
+ }
+ territoryF:intvector{
+ 60284400,
+ 49998000,
+ 56127471,
+ }
+ }
+ EG{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49940000}
+ }
+ el{
+ populationShareF:int{46610000}
+ }
+ territoryF:intvector{
+ 61537800,
+ 49720000,
+ 57836882,
+ }
+ }
+ EH{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 58906500,
+ 49500000,
+ 55522928,
+ }
+ }
+ ER{
+ aa{
+ populationShareF:int{48360000}
+ }
+ ar{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{48490000}
+ writingShareF:int{48500000}
+ }
+ byn{
+ populationShareF:int{45120000}
+ }
+ ssy{
+ populationShareF:int{48360000}
+ }
+ territoryF:intvector{
+ 59441200,
+ 49678000,
+ 56608650,
+ }
+ ti{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49600000}
+ }
+ tig{
+ populationShareF:int{49180000}
+ }
+ }
+ ES{
+ ast{
+ officialStatus{"official_regional"}
+ populationShareF:int{48130000}
+ }
+ ca{
+ officialStatus{"official_regional"}
+ populationShareF:int{49170000}
+ }
+ en{
+ populationShareF:int{49240000}
+ }
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49990000}
+ }
+ eu{
+ officialStatus{"official_regional"}
+ populationShareF:int{48200000}
+ }
+ gl{
+ officialStatus{"official_regional"}
+ populationShareF:int{48700000}
+ }
+ territoryF:intvector{
+ 62140700,
+ 49977000,
+ 57470430,
+ }
+ }
+ ET{
+ aa{
+ populationShareF:int{48140000}
+ }
+ am{
+ officialStatus{"official"}
+ populationShareF:int{49330000}
+ }
+ en{
+ populationShareF:int{49430000}
+ }
+ om{
+ populationShareF:int{49320000}
+ }
+ sid{
+ populationShareF:int{48350000}
+ }
+ so{
+ populationShareF:int{48600000}
+ }
+ territoryF:intvector{
+ 61103100,
+ 49427000,
+ 57911957,
+ }
+ ti{
+ populationShareF:int{48600000}
+ }
+ wal{
+ populationShareF:int{48180000}
+ }
+ }
+ FI{
+ en{
+ populationShareF:int{47180000}
+ }
+ et{
+ populationShareF:int{47110000}
+ }
+ fi{
+ officialStatus{"official"}
+ populationShareF:int{49940000}
+ }
+ rmf{
+ populationShareF:int{46950000}
+ }
+ ru{
+ populationShareF:int{47810000}
+ }
+ se{
+ populationShareF:int{46380000}
+ }
+ smn{
+ populationShareF:int{46110000}
+ }
+ sms{
+ populationShareF:int{46110000}
+ }
+ sv{
+ officialStatus{"official"}
+ populationShareF:int{48570000}
+ }
+ territoryF:intvector{
+ 61198100,
+ 50100000,
+ 56526293,
+ }
+ }
+ FJ{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49940000}
+ }
+ fj{
+ officialStatus{"official"}
+ populationShareF:int{49390000}
+ }
+ hi{
+ populationShareF:int{49440000}
+ }
+ territoryF:intvector{
+ 59430700,
+ 49937000,
+ 55890057,
+ }
+ }
+ FK{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49990000}
+ }
+ territoryF:intvector{
+ 58164500,
+ 49990000,
+ 53314000,
+ }
+ }
+ FM{
+ chk{
+ officialStatus{"official"}
+ populationShareF:int{49300000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{48500000}
+ }
+ kos{
+ officialStatus{"official"}
+ populationShareF:int{48750000}
+ }
+ pon{
+ officialStatus{"official"}
+ populationShareF:int{49230000}
+ }
+ territoryF:intvector{
+ 58238100,
+ 49890000,
+ 55106487,
+ }
+ uli{
+ officialStatus{"official"}
+ populationShareF:int{48280000}
+ }
+ yap{
+ officialStatus{"official"}
+ populationShareF:int{48620000}
+ }
+ }
+ FO{
+ fo{
+ officialStatus{"official"}
+ populationShareF:int{49950000}
+ }
+ territoryF:intvector{
+ 59147100,
+ 49990000,
+ 54494830,
+ }
+ }
+ FR{
+ br{
+ populationShareF:int{47830000}
+ writingShareF:int{48300000}
+ }
+ ca{
+ populationShareF:int{47170000}
+ }
+ co{
+ populationShareF:int{47570000}
+ writingShareF:int{48500000}
+ }
+ en{
+ populationShareF:int{49270000}
+ }
+ eu{
+ populationShareF:int{47130000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49990000}
+ }
+ gsw{
+ populationShareF:int{47910000}
+ writingShareF:int{48500000}
+ }
+ it{
+ populationShareF:int{48170000}
+ }
+ nl{
+ populationShareF:int{47130000}
+ }
+ oc{
+ populationShareF:int{48300000}
+ writingShareF:int{48500000}
+ }
+ pt{
+ populationShareF:int{48130000}
+ }
+ territoryF:intvector{
+ 62225300,
+ 49990000,
+ 57656307,
+ }
+ }
+ GA{
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49630000}
+ }
+ mdt{
+ populationShareF:int{48800000}
+ }
+ puu{
+ populationShareF:int{48900000}
+ }
+ territoryF:intvector{
+ 60267100,
+ 49884000,
+ 56160832,
+ }
+ }
+ GB{
+ bn{
+ populationShareF:int{47670000}
+ }
+ cy{
+ officialStatus{"official_regional"}
+ populationShareF:int{47770000}
+ }
+ el{
+ populationShareF:int{47340000}
+ }
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49990000}
+ }
+ fr{
+ officialStatus{"official_regional"}
+ populationShareF:int{46240000}
+ }
+ ga{
+ officialStatus{"official_regional"}
+ populationShareF:int{46260000}
+ }
+ gd{
+ officialStatus{"official_regional"}
+ populationShareF:int{46990000}
+ writingShareF:int{48500000}
+ }
+ it{
+ populationShareF:int{47340000}
+ }
+ ks{
+ populationShareF:int{47190000}
+ }
+ kw{
+ populationShareF:int{45320000}
+ }
+ ml{
+ populationShareF:int{46350000}
+ }
+ pa_Guru{
+ populationShareF:int{47790000}
+ }
+ sco{
+ populationShareF:int{48270000}
+ writingShareF:int{48500000}
+ }
+ syl{
+ populationShareF:int{47510000}
+ }
+ territoryF:intvector{
+ 62232300,
+ 49990000,
+ 57630472,
+ }
+ zh_Hant{
+ populationShareF:int{47540000}
+ }
+ }
+ GD{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49960000}
+ }
+ territoryF:intvector{
+ 59147100,
+ 49960000,
+ 55109011,
+ }
+ }
+ GE{
+ ab{
+ officialStatus{"official_regional"}
+ populationShareF:int{48220000}
+ }
+ hy{
+ populationShareF:int{48700000}
+ }
+ ka{
+ officialStatus{"official"}
+ populationShareF:int{49860000}
+ }
+ ku_Latn{
+ populationShareF:int{47890000}
+ }
+ os{
+ officialStatus{"official_regional"}
+ populationShareF:int{48220000}
+ }
+ ru{
+ populationShareF:int{48900000}
+ }
+ territoryF:intvector{
+ 60264000,
+ 49997000,
+ 56457093,
+ }
+ }
+ GF{
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49770000}
+ }
+ gcr{
+ populationShareF:int{49260000}
+ }
+ territoryF:intvector{
+ 59155100,
+ 49830000,
+ 55199509,
+ }
+ zh_Hant{
+ populationShareF:int{48250000}
+ }
+ }
+ GG{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 59274200,
+ 50100000,
+ 54653450,
+ }
+ }
+ GH{
+ abr{
+ populationShareF:int{48500000}
+ }
+ ak{
+ officialStatus{"official_regional"}
+ populationShareF:int{49390000}
+ }
+ ee{
+ officialStatus{"official_regional"}
+ populationShareF:int{49110000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49360000}
+ }
+ gaa{
+ officialStatus{"official_regional"}
+ populationShareF:int{48280000}
+ }
+ ha_Latn{
+ populationShareF:int{47860000}
+ }
+ saf{
+ populationShareF:int{46160000}
+ }
+ territoryF:intvector{
+ 60831800,
+ 49673000,
+ 57246524,
+ }
+ }
+ GI{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49800000}
+ }
+ territoryF:intvector{
+ 59127500,
+ 49800000,
+ 54290340,
+ }
+ }
+ GL{
+ da{
+ officialStatus{"official"}
+ populationShareF:int{49140000}
+ }
+ kl{
+ officialStatus{"official"}
+ populationShareF:int{49840000}
+ }
+ territoryF:intvector{
+ 59213300,
+ 50100000,
+ 54576950,
+ }
+ }
+ GM{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49400000}
+ }
+ mnk{
+ populationShareF:int{49290000}
+ }
+ territoryF:intvector{
+ 59349500,
+ 49500000,
+ 56184045,
+ }
+ }
+ GN{
+ ff{
+ populationShareF:int{49260000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49290000}
+ }
+ kpe{
+ populationShareF:int{48380000}
+ }
+ man{
+ populationShareF:int{49230000}
+ }
+ sus{
+ populationShareF:int{49110000}
+ }
+ territoryF:intvector{
+ 60122500,
+ 49410000,
+ 57108850,
+ }
+ }
+ GP{
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49900000}
+ }
+ territoryF:intvector{
+ 59351300,
+ 49900000,
+ 55452776,
+ }
+ }
+ GQ{
+ bvb{
+ populationShareF:int{48790000}
+ }
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49870000}
+ }
+ fan{
+ populationShareF:int{49510000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{48880000}
+ }
+ syi{
+ populationShareF:int{48220000}
+ }
+ territoryF:intvector{
+ 60280300,
+ 49939000,
+ 55685991,
+ }
+ }
+ GR{
+ bg{
+ populationShareF:int{47270000}
+ }
+ el{
+ officialStatus{"official"}
+ populationShareF:int{49990000}
+ }
+ mk{
+ populationShareF:int{48160000}
+ }
+ sq{
+ populationShareF:int{46930000}
+ }
+ territoryF:intvector{
+ 61280800,
+ 49960000,
+ 57107678,
+ }
+ tr{
+ populationShareF:int{48120000}
+ }
+ }
+ GS{
+ territoryF:intvector{
+ 55736900,
+ 49990000,
+ 51200000,
+ }
+ und{
+ populationShareF:int{50100000}
+ writingShareF:int{50100000}
+ }
+ }
+ GT{
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49930000}
+ }
+ territoryF:intvector{
+ 60784200,
+ 49691000,
+ 57140990,
+ }
+ }
+ GU{
+ ch{
+ officialStatus{"official"}
+ populationShareF:int{49220000}
+ }
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49380000}
+ }
+ territoryF:intvector{
+ 59250000,
+ 49990000,
+ 55159914,
+ }
+ }
+ GW{
+ pt{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 59190200,
+ 49542000,
+ 56162860,
+ }
+ }
+ GY{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 59616400,
+ 49918000,
+ 55741908,
+ }
+ }
+ HK{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49510000}
+ }
+ territoryF:intvector{
+ 61363700,
+ 49935000,
+ 56715352,
+ }
+ zh_Hans{
+ populationShareF:int{48500000}
+ }
+ zh_Hant{
+ officialStatus{"official"}
+ populationShareF:int{49950000}
+ }
+ }
+ HM{
+ territoryF:intvector{
+ 54436400,
+ 49990000,
+ 50100000,
+ }
+ und{
+ populationShareF:int{50100000}
+ writingShareF:int{50100000}
+ }
+ }
+ HN{
+ en{
+ populationShareF:int{47440000}
+ }
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49780000}
+ }
+ territoryF:intvector{
+ 60376700,
+ 49800000,
+ 56829669,
+ }
+ }
+ HR{
+ hr{
+ officialStatus{"official"}
+ populationShareF:int{49990000}
+ }
+ it{
+ officialStatus{"official_regional"}
+ populationShareF:int{48160000}
+ }
+ territoryF:intvector{
+ 60796700,
+ 49988000,
+ 56448004,
+ }
+ }
+ HT{
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{48470000}
+ writingShareF:int{50100000}
+ }
+ ht{
+ officialStatus{"official"}
+ populationShareF:int{49810000}
+ }
+ territoryF:intvector{
+ 60131300,
+ 49529000,
+ 56980166,
+ }
+ }
+ HU{
+ de{
+ populationShareF:int{48250000}
+ }
+ hr{
+ populationShareF:int{47320000}
+ }
+ hu{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ ro{
+ populationShareF:int{47990000}
+ }
+ sk{
+ populationShareF:int{47110000}
+ }
+ sl{
+ populationShareF:int{46500000}
+ }
+ territoryF:intvector{
+ 61196800,
+ 49990000,
+ 56995845,
+ }
+ }
+ IC{
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49980000}
+ }
+ territoryF:intvector{
+ 60627700,
+ 49977000,
+ 56209859,
+ }
+ }
+ ID{
+ ace{
+ populationShareF:int{48140000}
+ }
+ aoz{
+ populationShareF:int{47270000}
+ }
+ ban{
+ populationShareF:int{48180000}
+ }
+ bbc{
+ populationShareF:int{47920000}
+ }
+ bew{
+ populationShareF:int{48120000}
+ }
+ bjn{
+ populationShareF:int{48230000}
+ }
+ bug{
+ populationShareF:int{48160000}
+ }
+ bya{
+ populationShareF:int{48230000}
+ }
+ gor{
+ populationShareF:int{47410000}
+ }
+ id{
+ officialStatus{"official"}
+ populationShareF:int{49640000}
+ }
+ jv{
+ populationShareF:int{49340000}
+ }
+ kge{
+ populationShareF:int{47320000}
+ }
+ kvr{
+ populationShareF:int{47140000}
+ }
+ lbw{
+ populationShareF:int{47130000}
+ }
+ ljp{
+ populationShareF:int{47690000}
+ }
+ mad{
+ populationShareF:int{48630000}
+ }
+ mak{
+ populationShareF:int{47730000}
+ }
+ mdr{
+ populationShareF:int{46920000}
+ }
+ mgy{
+ populationShareF:int{47230000}
+ }
+ min{
+ populationShareF:int{48300000}
+ }
+ ms_Arab{
+ populationShareF:int{48460000}
+ }
+ nij{
+ populationShareF:int{47370000}
+ }
+ rej{
+ populationShareF:int{47460000}
+ }
+ rob{
+ populationShareF:int{47110000}
+ }
+ sas{
+ populationShareF:int{47960000}
+ }
+ su{
+ officialStatus{"official"}
+ populationShareF:int{49120000}
+ }
+ sxn{
+ populationShareF:int{46920000}
+ }
+ territoryF:intvector{
+ 62121200,
+ 49904000,
+ 58248645,
+ }
+ zh_Hant{
+ populationShareF:int{47920000}
+ }
+ }
+ IE{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49940000}
+ }
+ ga{
+ officialStatus{"official"}
+ populationShareF:int{49110000}
+ }
+ territoryF:intvector{
+ 61191500,
+ 49990000,
+ 56472203,
+ }
+ }
+ IL{
+ am{
+ populationShareF:int{47590000}
+ }
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49200000}
+ }
+ en{
+ populationShareF:int{48150000}
+ }
+ he{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ hu{
+ populationShareF:int{48100000}
+ }
+ ml{
+ populationShareF:int{47110000}
+ }
+ pl{
+ populationShareF:int{48150000}
+ }
+ ro{
+ populationShareF:int{48370000}
+ }
+ ru{
+ populationShareF:int{49110000}
+ }
+ territoryF:intvector{
+ 61247900,
+ 49971000,
+ 56759076,
+ }
+ ti{
+ populationShareF:int{47130000}
+ }
+ }
+ IM{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{50100000}
+ }
+ gv{
+ officialStatus{"official"}
+ populationShareF:int{48200000}
+ }
+ territoryF:intvector{
+ 59271900,
+ 49990000,
+ 54854210,
+ }
+ }
+ IN{
+ as{
+ officialStatus{"official_regional"}
+ populationShareF:int{48130000}
+ }
+ awa{
+ populationShareF:int{48190000}
+ writingShareF:int{48500000}
+ }
+ bfq{
+ populationShareF:int{46230000}
+ }
+ bft{
+ populationShareF:int{45620000}
+ }
+ bfy{
+ populationShareF:int{46370000}
+ }
+ bgc{
+ populationShareF:int{48120000}
+ writingShareF:int{49550000}
+ }
+ bhb{
+ populationShareF:int{47120000}
+ }
+ bhi{
+ populationShareF:int{46920000}
+ }
+ bho{
+ populationShareF:int{48230000}
+ }
+ bjj{
+ populationShareF:int{47560000}
+ }
+ bn{
+ officialStatus{"official_regional"}
+ populationShareF:int{48810000}
+ }
+ bo{
+ populationShareF:int{46110000}
+ }
+ bra{
+ populationShareF:int{45410000}
+ }
+ brx{
+ populationShareF:int{47140000}
+ }
+ btv{
+ populationShareF:int{45260000}
+ }
+ ccp{
+ populationShareF:int{46280000}
+ }
+ dcc{
+ populationShareF:int{47990000}
+ }
+ doi{
+ populationShareF:int{47200000}
+ }
+ dv{
+ populationShareF:int{44400000}
+ }
+ dz{
+ populationShareF:int{44200000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49110000}
+ }
+ gbm{
+ populationShareF:int{47270000}
+ }
+ gon{
+ populationShareF:int{47240000}
+ }
+ grt{
+ populationShareF:int{46530000}
+ }
+ gu{
+ officialStatus{"official_regional"}
+ populationShareF:int{48450000}
+ }
+ hi{
+ officialStatus{"official"}
+ populationShareF:int{49410000}
+ }
+ hne{
+ populationShareF:int{48110000}
+ }
+ hoc{
+ populationShareF:int{46990000}
+ }
+ hoj{
+ populationShareF:int{46820000}
+ }
+ kfr{
+ populationShareF:int{46750000}
+ }
+ kfy{
+ populationShareF:int{47220000}
+ }
+ kha{
+ officialStatus{"official_regional"}
+ populationShareF:int{46800000}
+ writingShareF:int{49290000}
+ }
+ khn{
+ populationShareF:int{47150000}
+ }
+ kht{
+ populationShareF:int{44700000}
+ }
+ kn{
+ officialStatus{"official_regional"}
+ populationShareF:int{48370000}
+ }
+ kok{
+ officialStatus{"official_regional"}
+ populationShareF:int{47370000}
+ }
+ kru{
+ populationShareF:int{47190000}
+ }
+ ks{
+ officialStatus{"official_regional"}
+ populationShareF:int{47410000}
+ }
+ lah{
+ populationShareF:int{45250000}
+ }
+ lep{
+ populationShareF:int{45350000}
+ }
+ lif{
+ populationShareF:int{45260000}
+ }
+ lmn{
+ populationShareF:int{47270000}
+ }
+ mag{
+ populationShareF:int{48120000}
+ }
+ mai{
+ officialStatus{"official_regional"}
+ populationShareF:int{48120000}
+ }
+ ml{
+ officialStatus{"official_regional"}
+ populationShareF:int{48320000}
+ }
+ mni{
+ populationShareF:int{47110000}
+ }
+ mr{
+ officialStatus{"official_regional"}
+ populationShareF:int{48700000}
+ }
+ mtr{
+ populationShareF:int{46980000}
+ }
+ mwr{
+ populationShareF:int{48120000}
+ }
+ ne{
+ officialStatus{"official_regional"}
+ populationShareF:int{47560000}
+ }
+ noe{
+ populationShareF:int{47130000}
+ }
+ or{
+ officialStatus{"official_regional"}
+ populationShareF:int{48320000}
+ }
+ pa_Guru{
+ officialStatus{"official_regional"}
+ populationShareF:int{48280000}
+ }
+ raj{
+ populationShareF:int{47100000}
+ }
+ ria{
+ populationShareF:int{46130000}
+ }
+ rkt{
+ populationShareF:int{47440000}
+ writingShareF:int{49200000}
+ }
+ sa{
+ officialStatus{"official_regional"}
+ populationShareF:int{45120000}
+ }
+ sat{
+ officialStatus{"official_regional"}
+ populationShareF:int{47550000}
+ }
+ saz{
+ populationShareF:int{46290000}
+ }
+ sck{
+ populationShareF:int{47180000}
+ }
+ sd_Arab{
+ officialStatus{"official_regional"}
+ populationShareF:int{47260000}
+ }
+ sd_Deva{
+ officialStatus{"official_regional"}
+ populationShareF:int{46260000}
+ }
+ srx{
+ populationShareF:int{46350000}
+ }
+ swv{
+ populationShareF:int{47280000}
+ }
+ ta{
+ officialStatus{"official_regional"}
+ populationShareF:int{48590000}
+ }
+ tcy{
+ populationShareF:int{47180000}
+ }
+ te{
+ officialStatus{"official_regional"}
+ populationShareF:int{48720000}
+ }
+ territoryF:intvector{
+ 62473500,
+ 49610000,
+ 59120507,
+ }
+ unr{
+ populationShareF:int{46950000}
+ }
+ unx{
+ populationShareF:int{46480000}
+ }
+ ur{
+ officialStatus{"official_regional"}
+ populationShareF:int{48500000}
+ }
+ wbq{
+ populationShareF:int{47180000}
+ }
+ wbr{
+ populationShareF:int{47150000}
+ }
+ wtm{
+ populationShareF:int{47460000}
+ }
+ xnr{
+ populationShareF:int{47160000}
+ }
+ }
+ IO{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ writingShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 58129000,
+ 49990000,
+ 53350000,
+ }
+ }
+ IQ{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49680000}
+ }
+ ckb{
+ officialStatus{"official_regional"}
+ populationShareF:int{49200000}
+ }
+ fa{
+ populationShareF:int{47870000}
+ }
+ syr{
+ populationShareF:int{47500000}
+ }
+ territoryF:intvector{
+ 61155400,
+ 49782000,
+ 57311292,
+ }
+ }
+ IR{
+ ar{
+ populationShareF:int{48200000}
+ }
+ az_Arab{
+ populationShareF:int{49240000}
+ }
+ bal{
+ populationShareF:int{48200000}
+ }
+ bqi{
+ populationShareF:int{48140000}
+ }
+ ckb{
+ populationShareF:int{48390000}
+ }
+ fa{
+ officialStatus{"official"}
+ populationShareF:int{49750000}
+ }
+ glk{
+ populationShareF:int{48460000}
+ }
+ hy{
+ populationShareF:int{47240000}
+ }
+ ka{
+ populationShareF:int{46710000}
+ }
+ kk_Arab{
+ populationShareF:int{45380000}
+ }
+ lki{
+ populationShareF:int{47760000}
+ }
+ lrc{
+ populationShareF:int{48210000}
+ }
+ luz{
+ populationShareF:int{48120000}
+ }
+ prd{
+ populationShareF:int{47500000}
+ }
+ ps{
+ populationShareF:int{47160000}
+ }
+ rmt{
+ populationShareF:int{48190000}
+ }
+ sdh{
+ populationShareF:int{48240000}
+ }
+ territoryF:intvector{
+ 61997400,
+ 49770000,
+ 57788687,
+ }
+ tk{
+ populationShareF:int{48280000}
+ }
+ }
+ IS{
+ da{
+ populationShareF:int{47720000}
+ }
+ is{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 60129500,
+ 49990000,
+ 55313183,
+ }
+ }
+ IT{
+ ca{
+ populationShareF:int{46350000}
+ }
+ de{
+ populationShareF:int{47390000}
+ }
+ el{
+ populationShareF:int{46350000}
+ }
+ en{
+ populationShareF:int{49240000}
+ }
+ fr{
+ populationShareF:int{47170000}
+ }
+ fur{
+ populationShareF:int{48140000}
+ writingShareF:int{48500000}
+ }
+ hr{
+ populationShareF:int{45570000}
+ }
+ it{
+ officialStatus{"official"}
+ populationShareF:int{49950000}
+ }
+ nap{
+ populationShareF:int{49120000}
+ writingShareF:int{48500000}
+ }
+ scn{
+ populationShareF:int{48840000}
+ writingShareF:int{48500000}
+ }
+ sl{
+ populationShareF:int{47170000}
+ }
+ territoryF:intvector{
+ 62183400,
+ 49984000,
+ 57612613,
+ }
+ }
+ JE{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49950000}
+ }
+ territoryF:intvector{
+ 59510000,
+ 49990000,
+ 54949490,
+ }
+ }
+ JM{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49980000}
+ }
+ territoryF:intvector{
+ 60251800,
+ 49879000,
+ 56288919,
+ }
+ }
+ JO{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 60386700,
+ 49926000,
+ 56650889,
+ }
+ }
+ JP{
+ ja{
+ officialStatus{"official"}
+ populationShareF:int{49950000}
+ }
+ ko{
+ populationShareF:int{47520000}
+ }
+ ryu{
+ populationShareF:int{47770000}
+ writingShareF:int{48500000}
+ }
+ territoryF:intvector{
+ 62461700,
+ 49990000,
+ 58127368,
+ }
+ }
+ KE{
+ ar{
+ populationShareF:int{46460000}
+ }
+ dav{
+ populationShareF:int{47820000}
+ writingShareF:int{48500000}
+ }
+ ebu{
+ populationShareF:int{48150000}
+ writingShareF:int{48100000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49850000}
+ }
+ gu{
+ populationShareF:int{46120000}
+ }
+ guz{
+ populationShareF:int{48490000}
+ }
+ kam{
+ populationShareF:int{48760000}
+ }
+ ki{
+ populationShareF:int{49170000}
+ }
+ kln{
+ populationShareF:int{48760000}
+ }
+ luo{
+ populationShareF:int{48980000}
+ }
+ luy{
+ populationShareF:int{49110000}
+ }
+ mas{
+ populationShareF:int{48160000}
+ writingShareF:int{49500000}
+ }
+ mer{
+ populationShareF:int{48400000}
+ }
+ om{
+ populationShareF:int{47470000}
+ }
+ pa_Guru{
+ populationShareF:int{46230000}
+ }
+ pko{
+ populationShareF:int{47700000}
+ writingShareF:int{48100000}
+ }
+ saq{
+ populationShareF:int{47460000}
+ writingShareF:int{48100000}
+ }
+ so{
+ populationShareF:int{48130000}
+ }
+ sw{
+ officialStatus{"official"}
+ populationShareF:int{49660000}
+ }
+ teo{
+ populationShareF:int{47740000}
+ }
+ territoryF:intvector{
+ 60760700,
+ 49874000,
+ 57430133,
+ }
+ }
+ KG{
+ ky_Cyrl{
+ officialStatus{"official"}
+ populationShareF:int{49480000}
+ }
+ ru{
+ officialStatus{"official"}
+ populationShareF:int{49280000}
+ }
+ territoryF:intvector{
+ 60134700,
+ 49987000,
+ 56549674,
+ }
+ }
+ KH{
+ cja{
+ populationShareF:int{48160000}
+ }
+ kdt{
+ populationShareF:int{47110000}
+ }
+ km{
+ officialStatus{"official"}
+ populationShareF:int{49890000}
+ }
+ territoryF:intvector{
+ 60365900,
+ 49736000,
+ 57149527,
+ }
+ }
+ KI{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ gil{
+ officialStatus{"official"}
+ populationShareF:int{49600000}
+ }
+ territoryF:intvector{
+ 58624000,
+ 49900000,
+ 55101998,
+ }
+ }
+ KM{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49660000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49560000}
+ }
+ territoryF:intvector{
+ 58872000,
+ 49749000,
+ 55737284,
+ }
+ zdj{
+ officialStatus{"official"}
+ populationShareF:int{49370000}
+ }
+ }
+ KN{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49980000}
+ }
+ territoryF:intvector{
+ 58890000,
+ 49978000,
+ 54507260,
+ }
+ }
+ KP{
+ ko{
+ officialStatus{"official"}
+ populationShareF:int{49880000}
+ }
+ territoryF:intvector{
+ 60400000,
+ 49990000,
+ 57245891,
+ }
+ }
+ KR{
+ ko{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 62162200,
+ 49979000,
+ 57488605,
+ }
+ }
+ KW{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 61165900,
+ 49933000,
+ 56264631,
+ }
+ }
+ KY{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49980000}
+ }
+ territoryF:intvector{
+ 59225000,
+ 49980000,
+ 54525600,
+ }
+ }
+ KZ{
+ de{
+ populationShareF:int{48640000}
+ }
+ kk_Cyrl{
+ officialStatus{"official"}
+ populationShareF:int{49640000}
+ }
+ ru{
+ officialStatus{"official"}
+ populationShareF:int{49950000}
+ }
+ territoryF:intvector{
+ 61232300,
+ 49995000,
+ 57175220,
+ }
+ ug_Cyrl{
+ populationShareF:int{48200000}
+ }
+ }
+ LA{
+ kdt{
+ populationShareF:int{47960000}
+ }
+ kjg{
+ populationShareF:int{48580000}
+ }
+ lo{
+ officialStatus{"official"}
+ populationShareF:int{49690000}
+ }
+ territoryF:intvector{
+ 60191600,
+ 49730000,
+ 56658627,
+ }
+ }
+ LB{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49860000}
+ }
+ en{
+ populationShareF:int{46800000}
+ }
+ fr{
+ populationShareF:int{47370000}
+ }
+ hy{
+ populationShareF:int{48520000}
+ }
+ ku_Arab{
+ populationShareF:int{48160000}
+ }
+ territoryF:intvector{
+ 60636900,
+ 49874000,
+ 56414029,
+ }
+ }
+ LC{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49900000}
+ }
+ territoryF:intvector{
+ 59223400,
+ 49901000,
+ 55162178,
+ }
+ }
+ LI{
+ de{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ gsw{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49850000}
+ writingShareF:int{48500000}
+ }
+ territoryF:intvector{
+ 59320000,
+ 50100000,
+ 54367130,
+ }
+ wae{
+ populationShareF:int{48350000}
+ }
+ }
+ LK{
+ en{
+ populationShareF:int{47380000}
+ }
+ si{
+ officialStatus{"official"}
+ populationShareF:int{49680000}
+ }
+ ta{
+ officialStatus{"official"}
+ populationShareF:int{49150000}
+ }
+ territoryF:intvector{
+ 61126200,
+ 49912000,
+ 57214813,
+ }
+ }
+ LR{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49200000}
+ }
+ kpe{
+ populationShareF:int{49140000}
+ }
+ men{
+ populationShareF:int{47570000}
+ }
+ territoryF:intvector{
+ 59269300,
+ 49608000,
+ 56388789,
+ }
+ vai{
+ populationShareF:int{48260000}
+ }
+ }
+ LS{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{48230000}
+ }
+ ss{
+ populationShareF:int{48240000}
+ }
+ st{
+ officialStatus{"official"}
+ populationShareF:int{49980000}
+ }
+ territoryF:intvector{
+ 59394500,
+ 49896000,
+ 56193049,
+ }
+ xh{
+ populationShareF:int{48100000}
+ }
+ zu{
+ populationShareF:int{49140000}
+ }
+ }
+ LT{
+ lt{
+ officialStatus{"official"}
+ populationShareF:int{49860000}
+ }
+ ru{
+ populationShareF:int{48800000}
+ }
+ territoryF:intvector{
+ 60643200,
+ 49997000,
+ 56352576,
+ }
+ }
+ LU{
+ de{
+ officialStatus{"official"}
+ populationShareF:int{49630000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49870000}
+ }
+ lb{
+ officialStatus{"official"}
+ populationShareF:int{49670000}
+ writingShareF:int{48500000}
+ }
+ territoryF:intvector{
+ 60421900,
+ 50100000,
+ 55509074,
+ }
+ }
+ LV{
+ lv{
+ officialStatus{"official"}
+ populationShareF:int{49610000}
+ }
+ ru{
+ populationShareF:int{49380000}
+ }
+ territoryF:intvector{
+ 60370400,
+ 49998000,
+ 56219158,
+ }
+ }
+ LY{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49740000}
+ }
+ territoryF:intvector{
+ 60879100,
+ 49892000,
+ 56561338,
+ }
+ }
+ MA{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49620000}
+ }
+ es{
+ populationShareF:int{46650000}
+ }
+ fr{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49200000}
+ }
+ rif{
+ populationShareF:int{48490000}
+ }
+ shi_Latn{
+ populationShareF:int{48870000}
+ }
+ shi_Tfng{
+ populationShareF:int{48870000}
+ }
+ territoryF:intvector{
+ 61171000,
+ 49561000,
+ 57323092,
+ }
+ tzm{
+ officialStatus{"official"}
+ populationShareF:int{48980000}
+ }
+ }
+ MC{
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49990000}
+ }
+ territoryF:intvector{
+ 59547000,
+ 49990000,
+ 54305100,
+ }
+ }
+ MD{
+ bg{
+ populationShareF:int{48940000}
+ }
+ gag{
+ officialStatus{"official_regional"}
+ populationShareF:int{48330000}
+ }
+ ro{
+ officialStatus{"official"}
+ populationShareF:int{49630000}
+ }
+ ru{
+ populationShareF:int{48300000}
+ }
+ territoryF:intvector{
+ 60125600,
+ 49985000,
+ 56365684,
+ }
+ }
+ ME{
+ sq{
+ populationShareF:int{48790000}
+ }
+ sr_Latn{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 59728800,
+ 49984000,
+ 55657394,
+ }
+ }
+ MF{
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 58449000,
+ 49990000,
+ 54309590,
+ }
+ }
+ MG{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{48500000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49690000}
+ }
+ mg{
+ officialStatus{"official"}
+ populationShareF:int{49900000}
+ }
+ territoryF:intvector{
+ 60213700,
+ 49645000,
+ 57220052,
+ }
+ }
+ MH{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49930000}
+ }
+ mh{
+ officialStatus{"official"}
+ populationShareF:int{49730000}
+ }
+ territoryF:intvector{
+ 58133500,
+ 49937000,
+ 54684800,
+ }
+ }
+ MK{
+ mk{
+ officialStatus{"official"}
+ populationShareF:int{49670000}
+ }
+ sq{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49250000}
+ }
+ territoryF:intvector{
+ 60221500,
+ 49973000,
+ 56208237,
+ }
+ tr{
+ officialStatus{"official_regional"}
+ populationShareF:int{48970000}
+ }
+ }
+ ML{
+ ar{
+ populationShareF:int{47890000}
+ }
+ bm{
+ populationShareF:int{49460000}
+ }
+ bmq{
+ populationShareF:int{47860000}
+ }
+ bze{
+ populationShareF:int{47840000}
+ }
+ bzx{
+ populationShareF:int{47990000}
+ }
+ dtm{
+ populationShareF:int{48110000}
+ }
+ ffm{
+ populationShareF:int{48770000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49460000}
+ }
+ kao{
+ populationShareF:int{48100000}
+ }
+ khq{
+ populationShareF:int{48170000}
+ }
+ mwk{
+ populationShareF:int{48500000}
+ }
+ ses{
+ populationShareF:int{48340000}
+ }
+ snk{
+ populationShareF:int{48590000}
+ }
+ territoryF:intvector{
+ 60173500,
+ 49311000,
+ 57154945,
+ }
+ tmh{
+ populationShareF:int{48210000}
+ }
+ }
+ MM{
+ kht{
+ populationShareF:int{45780000}
+ }
+ mnw{
+ populationShareF:int{48150000}
+ }
+ my{
+ officialStatus{"official"}
+ populationShareF:int{49640000}
+ }
+ shn{
+ populationShareF:int{48640000}
+ }
+ territoryF:intvector{
+ 60892300,
+ 49899000,
+ 57545847,
+ }
+ }
+ MN{
+ kk_Arab{
+ populationShareF:int{48720000}
+ }
+ mn_Cyrl{
+ officialStatus{"official"}
+ populationShareF:int{49930000}
+ }
+ ru{
+ populationShareF:int{47130000}
+ }
+ territoryF:intvector{
+ 60152200,
+ 49974000,
+ 56318000,
+ }
+ ug_Cyrl{
+ populationShareF:int{46310000}
+ }
+ zh_Hans{
+ populationShareF:int{48140000}
+ }
+ }
+ MO{
+ pt{
+ officialStatus{"official"}
+ populationShareF:int{48500000}
+ }
+ territoryF:intvector{
+ 60429000,
+ 49913000,
+ 55578025,
+ }
+ zh_Hans{
+ populationShareF:int{48500000}
+ }
+ zh_Hant{
+ officialStatus{"official"}
+ populationShareF:int{49980000}
+ }
+ }
+ MP{
+ ch{
+ populationShareF:int{49180000}
+ }
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49970000}
+ }
+ territoryF:intvector{
+ 58900000,
+ 49970000,
+ 54513950,
+ }
+ }
+ MQ{
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49980000}
+ }
+ territoryF:intvector{
+ 59611700,
+ 49980000,
+ 55436131,
+ }
+ }
+ MR{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49850000}
+ }
+ ff{
+ populationShareF:int{48570000}
+ }
+ fr{
+ populationShareF:int{49170000}
+ }
+ territoryF:intvector{
+ 59761500,
+ 49580000,
+ 56335919,
+ }
+ wo_Latn{
+ populationShareF:int{47300000}
+ }
+ }
+ MS{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49980000}
+ }
+ territoryF:intvector{
+ 57437800,
+ 49970000,
+ 53516400,
+ }
+ }
+ MT{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49880000}
+ }
+ mt{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 60111400,
+ 49928000,
+ 55409836,
+ }
+ }
+ MU{
+ bho{
+ populationShareF:int{49270000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49720000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{48300000}
+ }
+ mfe{
+ populationShareF:int{49900000}
+ }
+ ta{
+ populationShareF:int{48250000}
+ }
+ territoryF:intvector{
+ 60202600,
+ 49885000,
+ 56131310,
+ }
+ ur{
+ populationShareF:int{48520000}
+ }
+ }
+ MV{
+ dv{
+ officialStatus{"official"}
+ populationShareF:int{49940000}
+ }
+ territoryF:intvector{
+ 59294500,
+ 49938000,
+ 55394451,
+ }
+ }
+ MW{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49630000}
+ }
+ ny{
+ officialStatus{"official"}
+ populationShareF:int{49630000}
+ }
+ territoryF:intvector{
+ 60145800,
+ 49748000,
+ 57163230,
+ }
+ tum{
+ populationShareF:int{48840000}
+ }
+ zu{
+ populationShareF:int{47330000}
+ }
+ }
+ MX{
+ es{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49830000}
+ }
+ maz{
+ populationShareF:int{47340000}
+ }
+ nch{
+ populationShareF:int{47190000}
+ }
+ nhe{
+ populationShareF:int{47390000}
+ }
+ nhw{
+ populationShareF:int{47380000}
+ }
+ territoryF:intvector{
+ 62175800,
+ 49861000,
+ 58114975,
+ }
+ yua{
+ populationShareF:int{47670000}
+ }
+ }
+ MY{
+ bjn{
+ populationShareF:int{48360000}
+ }
+ bug{
+ populationShareF:int{46800000}
+ }
+ en{
+ populationShareF:int{49290000}
+ }
+ jv{
+ populationShareF:int{48120000}
+ }
+ ml{
+ populationShareF:int{47150000}
+ }
+ ms_Latn{
+ officialStatus{"official"}
+ populationShareF:int{49750000}
+ }
+ ta{
+ populationShareF:int{48420000}
+ }
+ territoryF:intvector{
+ 61492000,
+ 49887000,
+ 57291800,
+ }
+ zh_Hant{
+ populationShareF:int{49170000}
+ }
+ zmi{
+ populationShareF:int{48120000}
+ }
+ }
+ MZ{
+ ndc{
+ populationShareF:int{48990000}
+ }
+ ngl{
+ populationShareF:int{48680000}
+ }
+ ny{
+ populationShareF:int{48260000}
+ }
+ pt{
+ officialStatus{"official"}
+ populationShareF:int{49270000}
+ }
+ rng{
+ populationShareF:int{48340000}
+ }
+ seh{
+ populationShareF:int{48460000}
+ }
+ sw{
+ populationShareF:int{46390000}
+ }
+ territoryF:intvector{
+ 60262200,
+ 49561000,
+ 57235159,
+ }
+ ts{
+ populationShareF:int{48790000}
+ }
+ vmw{
+ populationShareF:int{49130000}
+ }
+ yao{
+ populationShareF:int{48240000}
+ }
+ zu{
+ populationShareF:int{45770000}
+ }
+ }
+ NA{
+ af{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{48660000}
+ }
+ de{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{47630000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{48700000}
+ }
+ kj{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49350000}
+ }
+ naq{
+ populationShareF:int{48960000}
+ }
+ ng{
+ populationShareF:int{49210000}
+ }
+ territoryF:intvector{
+ 60168400,
+ 49888000,
+ 56216583,
+ }
+ tn{
+ populationShareF:int{47280000}
+ }
+ }
+ NC{
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49960000}
+ }
+ territoryF:intvector{
+ 59315800,
+ 49962000,
+ 55260166,
+ }
+ }
+ NE{
+ ar{
+ populationShareF:int{47210000}
+ }
+ dje{
+ populationShareF:int{49170000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49290000}
+ }
+ fuq{
+ populationShareF:int{48700000}
+ }
+ ha_Latn{
+ populationShareF:int{49410000}
+ }
+ territoryF:intvector{
+ 60135300,
+ 49287000,
+ 57163447,
+ }
+ tmh{
+ populationShareF:int{48600000}
+ }
+ twq{
+ populationShareF:int{46490000}
+ }
+ }
+ NF{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49770000}
+ }
+ territoryF:intvector{
+ 57952200,
+ 49990000,
+ 53218200,
+ }
+ }
+ NG{
+ amo{
+ populationShareF:int{45880000}
+ }
+ ar{
+ populationShareF:int{46710000}
+ }
+ bin{
+ populationShareF:int{47710000}
+ }
+ cch{
+ populationShareF:int{46210000}
+ }
+ efi{
+ officialStatus{"official"}
+ populationShareF:int{48140000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49750000}
+ }
+ fuv{
+ populationShareF:int{48670000}
+ }
+ ha_Arab{
+ officialStatus{"official"}
+ populationShareF:int{48100000}
+ }
+ ha_Latn{
+ officialStatus{"official"}
+ populationShareF:int{49130000}
+ }
+ ibb{
+ populationShareF:int{48140000}
+ }
+ ig{
+ officialStatus{"official"}
+ populationShareF:int{49130000}
+ }
+ kaj{
+ populationShareF:int{47210000}
+ }
+ kcg{
+ populationShareF:int{46930000}
+ }
+ territoryF:intvector{
+ 61450500,
+ 49613000,
+ 58170124,
+ }
+ tiv{
+ populationShareF:int{48160000}
+ writingShareF:int{49250000}
+ }
+ yo{
+ officialStatus{"official"}
+ populationShareF:int{49130000}
+ }
+ }
+ NI{
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49780000}
+ }
+ territoryF:intvector{
+ 60198900,
+ 49675000,
+ 56572771,
+ }
+ }
+ NL{
+ en{
+ populationShareF:int{49740000}
+ }
+ fy{
+ officialStatus{"official_regional"}
+ populationShareF:int{48430000}
+ }
+ gos{
+ populationShareF:int{48360000}
+ }
+ id{
+ populationShareF:int{48180000}
+ }
+ li{
+ populationShareF:int{48550000}
+ writingShareF:int{48500000}
+ }
+ nl{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ rif{
+ populationShareF:int{48120000}
+ }
+ territoryF:intvector{
+ 61709500,
+ 49990000,
+ 57167306,
+ }
+ tr{
+ populationShareF:int{48120000}
+ }
+ zea{
+ populationShareF:int{48140000}
+ }
+ }
+ NO{
+ nb{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ nn{
+ officialStatus{"official"}
+ populationShareF:int{49250000}
+ }
+ se{
+ officialStatus{"official_regional"}
+ populationShareF:int{48330000}
+ }
+ territoryF:intvector{
+ 61278100,
+ 50100000,
+ 56470727,
+ }
+ }
+ NP{
+ awa{
+ populationShareF:int{48220000}
+ }
+ bap{
+ populationShareF:int{48150000}
+ }
+ bfy{
+ populationShareF:int{47540000}
+ }
+ bho{
+ populationShareF:int{48680000}
+ }
+ bn{
+ populationShareF:int{46930000}
+ }
+ bo{
+ populationShareF:int{47240000}
+ }
+ ggn{
+ populationShareF:int{47420000}
+ }
+ gvr{
+ populationShareF:int{47290000}
+ }
+ hi{
+ populationShareF:int{47420000}
+ }
+ jml{
+ populationShareF:int{48320000}
+ }
+ lep{
+ populationShareF:int{45950000}
+ }
+ lif{
+ populationShareF:int{48130000}
+ }
+ mai{
+ populationShareF:int{49110000}
+ }
+ mgp{
+ populationShareF:int{48110000}
+ }
+ mrd{
+ populationShareF:int{47830000}
+ }
+ ne{
+ officialStatus{"official"}
+ populationShareF:int{49440000}
+ }
+ new{
+ populationShareF:int{48330000}
+ }
+ rjs{
+ populationShareF:int{47440000}
+ writingShareF:int{49670000}
+ }
+ taj{
+ populationShareF:int{48300000}
+ }
+ tdg{
+ populationShareF:int{48130000}
+ }
+ tdh{
+ populationShareF:int{47120000}
+ }
+ territoryF:intvector{
+ 60404900,
+ 49603000,
+ 57298907,
+ }
+ thl{
+ populationShareF:int{48200000}
+ }
+ thq{
+ populationShareF:int{48100000}
+ }
+ thr{
+ populationShareF:int{48120000}
+ }
+ tkt{
+ populationShareF:int{47240000}
+ }
+ tsf{
+ populationShareF:int{47430000}
+ }
+ unr{
+ populationShareF:int{46190000}
+ }
+ xsr{
+ populationShareF:int{47510000}
+ }
+ }
+ NR{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49990000}
+ }
+ na{
+ officialStatus{"official"}
+ populationShareF:int{49730000}
+ }
+ territoryF:intvector{
+ 57600000,
+ 49990000,
+ 53937800,
+ }
+ }
+ NU{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ niu{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 57100100,
+ 49950000,
+ 53126900,
+ }
+ }
+ NZ{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49910000}
+ }
+ mi{
+ officialStatus{"official"}
+ populationShareF:int{48250000}
+ }
+ territoryF:intvector{
+ 61128500,
+ 49990000,
+ 56432794,
+ }
+ }
+ OM{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49810000}
+ }
+ bal{
+ populationShareF:int{48490000}
+ }
+ fa{
+ populationShareF:int{47940000}
+ }
+ territoryF:intvector{
+ 60906600,
+ 49814000,
+ 56309015,
+ }
+ }
+ PA{
+ en{
+ populationShareF:int{49140000}
+ }
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49690000}
+ }
+ territoryF:intvector{
+ 60558000,
+ 49919000,
+ 56351005,
+ }
+ zh_Hant{
+ populationShareF:int{47170000}
+ }
+ }
+ PE{
+ ay{
+ populationShareF:int{48160000}
+ }
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49730000}
+ }
+ qu{
+ officialStatus{"official"}
+ populationShareF:int{49150000}
+ }
+ territoryF:intvector{
+ 61325400,
+ 49929000,
+ 57295495,
+ }
+ }
+ PF{
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49610000}
+ }
+ territoryF:intvector{
+ 59471800,
+ 49980000,
+ 55274512,
+ }
+ ty{
+ officialStatus{"official"}
+ populationShareF:int{49310000}
+ }
+ zh_Hant{
+ populationShareF:int{48780000}
+ }
+ }
+ PG{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49200000}
+ }
+ ho{
+ officialStatus{"official"}
+ populationShareF:int{48210000}
+ writingShareF:int{48500000}
+ }
+ territoryF:intvector{
+ 60184500,
+ 49573000,
+ 56631013,
+ }
+ tpi{
+ officialStatus{"official"}
+ populationShareF:int{49710000}
+ writingShareF:int{49450000}
+ }
+ }
+ PH{
+ bhk{
+ populationShareF:int{48230000}
+ }
+ bik{
+ populationShareF:int{48300000}
+ }
+ bku{
+ populationShareF:int{45770000}
+ }
+ bto{
+ populationShareF:int{47280000}
+ }
+ ceb{
+ officialStatus{"official_regional"}
+ populationShareF:int{49240000}
+ writingShareF:int{49130000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49640000}
+ }
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49310000}
+ }
+ fil{
+ officialStatus{"official"}
+ populationShareF:int{49600000}
+ }
+ hil{
+ officialStatus{"official_regional"}
+ populationShareF:int{48840000}
+ writingShareF:int{48800000}
+ }
+ hnn{
+ populationShareF:int{46160000}
+ }
+ ilo{
+ officialStatus{"official_regional"}
+ populationShareF:int{48960000}
+ writingShareF:int{49100000}
+ }
+ mdh{
+ officialStatus{"official_regional"}
+ populationShareF:int{48120000}
+ }
+ pag{
+ officialStatus{"official_regional"}
+ populationShareF:int{48140000}
+ }
+ pam{
+ populationShareF:int{48230000}
+ }
+ tbw{
+ populationShareF:int{45960000}
+ writingShareF:int{49360000}
+ }
+ territoryF:intvector{
+ 61416700,
+ 49926000,
+ 58103775,
+ }
+ tsg{
+ officialStatus{"official_regional"}
+ populationShareF:int{48110000}
+ }
+ war{
+ officialStatus{"official_regional"}
+ populationShareF:int{48290000}
+ }
+ zh_Hant{
+ populationShareF:int{47730000}
+ }
+ }
+ PK{
+ bal{
+ populationShareF:int{48370000}
+ }
+ bft{
+ populationShareF:int{47180000}
+ }
+ brh{
+ populationShareF:int{48130000}
+ }
+ btv{
+ populationShareF:int{46190000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49500000}
+ }
+ fa{
+ populationShareF:int{47660000}
+ }
+ gjk{
+ populationShareF:int{47110000}
+ }
+ gju{
+ populationShareF:int{47200000}
+ }
+ hnd{
+ populationShareF:int{47410000}
+ }
+ hno{
+ populationShareF:int{48120000}
+ }
+ khw{
+ populationShareF:int{47150000}
+ }
+ ks{
+ populationShareF:int{46690000}
+ }
+ kvx{
+ populationShareF:int{47160000}
+ }
+ kxp{
+ populationShareF:int{47120000}
+ }
+ lah{
+ populationShareF:int{49400000}
+ }
+ mvy{
+ populationShareF:int{47140000}
+ }
+ pa_Arab{
+ populationShareF:int{49700000}
+ }
+ ps{
+ populationShareF:int{49150000}
+ }
+ sd_Arab{
+ populationShareF:int{49120000}
+ }
+ skr{
+ populationShareF:int{48910000}
+ writingShareF:int{48100000}
+ }
+ territoryF:intvector{
+ 61514600,
+ 49549000,
+ 58190291,
+ }
+ tg_Arab{
+ populationShareF:int{47330000}
+ }
+ ur{
+ officialStatus{"official"}
+ populationShareF:int{49950000}
+ }
+ }
+ PL{
+ be{
+ populationShareF:int{47580000}
+ }
+ csb{
+ officialStatus{"official_regional"}
+ populationShareF:int{44100000}
+ }
+ de{
+ populationShareF:int{48130000}
+ }
+ pl{
+ officialStatus{"official"}
+ populationShareF:int{49960000}
+ }
+ territoryF:intvector{
+ 61802000,
+ 49995000,
+ 57384153,
+ }
+ uk{
+ populationShareF:int{47390000}
+ }
+ }
+ PM{
+ en{
+ populationShareF:int{48320000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49880000}
+ }
+ territoryF:intvector{
+ 57483000,
+ 49990000,
+ 53583100,
+ }
+ }
+ PN{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49960000}
+ }
+ territoryF:intvector{
+ 56176900,
+ 49990000,
+ 51480000,
+ }
+ }
+ PR{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49490000}
+ }
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49870000}
+ }
+ territoryF:intvector{
+ 60648400,
+ 49941000,
+ 56369092,
+ }
+ }
+ PS{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 59802000,
+ 49924000,
+ 56433280,
+ }
+ }
+ PT{
+ gl{
+ populationShareF:int{47140000}
+ }
+ pt{
+ officialStatus{"official"}
+ populationShareF:int{49960000}
+ }
+ territoryF:intvector{
+ 61245000,
+ 49952000,
+ 57107815,
+ }
+ }
+ PW{
+ en{
+ officialStatus{"official_regional"}
+ populationShareF:int{48890000}
+ }
+ pau{
+ officialStatus{"official"}
+ populationShareF:int{49740000}
+ }
+ territoryF:intvector{
+ 58164000,
+ 49920000,
+ 54210320,
+ }
+ }
+ PY{
+ de{
+ populationShareF:int{48290000}
+ }
+ es{
+ officialStatus{"official"}
+ populationShareF:int{48320000}
+ }
+ gn{
+ officialStatus{"official"}
+ populationShareF:int{49800000}
+ }
+ territoryF:intvector{
+ 60411000,
+ 49940000,
+ 56654159,
+ }
+ }
+ QA{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49890000}
+ }
+ fa{
+ populationShareF:int{49110000}
+ }
+ ml{
+ populationShareF:int{47330000}
+ }
+ territoryF:intvector{
+ 61189000,
+ 49963000,
+ 56195159,
+ }
+ }
+ RE{
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49890000}
+ }
+ rcf{
+ populationShareF:int{49710000}
+ }
+ ta{
+ populationShareF:int{49150000}
+ }
+ territoryF:intvector{
+ 59479100,
+ 49880000,
+ 55787584,
+ }
+ }
+ RO{
+ bg{
+ populationShareF:int{46310000}
+ }
+ de{
+ populationShareF:int{47210000}
+ }
+ el{
+ populationShareF:int{46190000}
+ }
+ hu{
+ populationShareF:int{48660000}
+ }
+ pl{
+ populationShareF:int{46130000}
+ }
+ ro{
+ officialStatus{"official"}
+ populationShareF:int{49900000}
+ }
+ sr_Latn{
+ populationShareF:int{47120000}
+ }
+ territoryF:intvector{
+ 61274100,
+ 49977000,
+ 57218485,
+ }
+ tr{
+ populationShareF:int{47130000}
+ }
+ }
+ RS{
+ hu{
+ officialStatus{"official_regional"}
+ populationShareF:int{48480000}
+ }
+ ro{
+ officialStatus{"official_regional"}
+ populationShareF:int{48210000}
+ }
+ sk{
+ officialStatus{"official_regional"}
+ populationShareF:int{47850000}
+ }
+ sq{
+ officialStatus{"official_regional"}
+ populationShareF:int{49190000}
+ }
+ sr_Cyrl{
+ officialStatus{"official"}
+ populationShareF:int{49990000}
+ }
+ sr_Latn{
+ officialStatus{"official"}
+ populationShareF:int{49990000}
+ writingShareF:int{48500000}
+ }
+ territoryF:intvector{
+ 60796500,
+ 49919000,
+ 56724301,
+ }
+ }
+ RU{
+ ady{
+ officialStatus{"official_regional"}
+ populationShareF:int{46870000}
+ }
+ alt{
+ populationShareF:int{46140000}
+ }
+ av{
+ officialStatus{"official_regional"}
+ populationShareF:int{47390000}
+ }
+ ba{
+ officialStatus{"official_regional"}
+ populationShareF:int{48130000}
+ }
+ bua{
+ populationShareF:int{47220000}
+ }
+ ce{
+ officialStatus{"official_regional"}
+ populationShareF:int{47660000}
+ }
+ chm{
+ populationShareF:int{47370000}
+ }
+ cv{
+ populationShareF:int{48130000}
+ }
+ dar{
+ populationShareF:int{47260000}
+ }
+ fi{
+ populationShareF:int{46120000}
+ }
+ inh{
+ officialStatus{"official_regional"}
+ populationShareF:int{47160000}
+ }
+ kbd{
+ officialStatus{"official_regional"}
+ populationShareF:int{47310000}
+ }
+ koi{
+ officialStatus{"official_regional"}
+ populationShareF:int{46810000}
+ }
+ krc{
+ officialStatus{"official_regional"}
+ populationShareF:int{47160000}
+ }
+ krl{
+ populationShareF:int{46820000}
+ }
+ kum{
+ officialStatus{"official_regional"}
+ populationShareF:int{47200000}
+ }
+ kv{
+ officialStatus{"official_regional"}
+ populationShareF:int{47180000}
+ }
+ lbe{
+ officialStatus{"official_regional"}
+ populationShareF:int{46780000}
+ }
+ lez{
+ officialStatus{"official_regional"}
+ populationShareF:int{47180000}
+ }
+ mdf{
+ officialStatus{"official_regional"}
+ populationShareF:int{47210000}
+ }
+ mn_Cyrl{
+ populationShareF:int{45150000}
+ }
+ mrj{
+ populationShareF:int{46460000}
+ }
+ myv{
+ officialStatus{"official_regional"}
+ populationShareF:int{47310000}
+ }
+ os{
+ populationShareF:int{47320000}
+ }
+ ru{
+ officialStatus{"official"}
+ populationShareF:int{49940000}
+ }
+ sah{
+ officialStatus{"official_regional"}
+ populationShareF:int{47320000}
+ }
+ sr_Latn{
+ populationShareF:int{45350000}
+ }
+ territoryF:intvector{
+ 62250900,
+ 49996000,
+ 58142518,
+ }
+ tt{
+ officialStatus{"official_regional"}
+ populationShareF:int{48140000}
+ }
+ tyv{
+ officialStatus{"official_regional"}
+ populationShareF:int{47130000}
+ }
+ udm{
+ officialStatus{"official_regional"}
+ populationShareF:int{47380000}
+ }
+ }
+ RW{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{45260000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{46200000}
+ }
+ rw{
+ officialStatus{"official"}
+ populationShareF:int{49770000}
+ }
+ territoryF:intvector{
+ 60149100,
+ 49711000,
+ 57116897,
+ }
+ }
+ SA{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 61740500,
+ 49866000,
+ 57265345,
+ }
+ }
+ SB{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 59192200,
+ 49770000,
+ 55584578,
+ }
+ }
+ SC{
+ crs{
+ populationShareF:int{49980000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{48460000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49600000}
+ }
+ territoryF:intvector{
+ 59241000,
+ 49918000,
+ 54900240,
+ }
+ }
+ SD{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49610000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49610000}
+ }
+ ha_Arab{
+ populationShareF:int{48140000}
+ }
+ territoryF:intvector{
+ 60804300,
+ 49611000,
+ 57342067,
+ }
+ }
+ SE{
+ fi{
+ officialStatus{"official_regional"}
+ populationShareF:int{48220000}
+ }
+ ia{
+ populationShareF:int{45110000}
+ }
+ se{
+ populationShareF:int{47330000}
+ }
+ sma{
+ populationShareF:int{45330000}
+ writingShareF:int{49750000}
+ }
+ smj{
+ populationShareF:int{46160000}
+ }
+ sv{
+ officialStatus{"official"}
+ populationShareF:int{49950000}
+ }
+ territoryF:intvector{
+ 61395800,
+ 49990000,
+ 56910379,
+ }
+ }
+ SG{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49930000}
+ }
+ ml{
+ populationShareF:int{47190000}
+ }
+ ms_Latn{
+ officialStatus{"official"}
+ populationShareF:int{49140000}
+ }
+ pa_Guru{
+ populationShareF:int{47180000}
+ }
+ ta{
+ officialStatus{"official"}
+ populationShareF:int{48210000}
+ }
+ territoryF:intvector{
+ 61326700,
+ 49925000,
+ 56535349,
+ }
+ zh_Hans{
+ officialStatus{"official"}
+ populationShareF:int{49770000}
+ }
+ }
+ SH{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49700000}
+ }
+ territoryF:intvector{
+ 57180000,
+ 49970000,
+ 53772800,
+ }
+ }
+ SI{
+ hu{
+ populationShareF:int{47460000}
+ }
+ it{
+ populationShareF:int{47200000}
+ }
+ sl{
+ officialStatus{"official"}
+ populationShareF:int{49870000}
+ }
+ territoryF:intvector{
+ 60579300,
+ 49997000,
+ 56199662,
+ }
+ }
+ SJ{
+ nb{
+ officialStatus{"official"}
+ populationShareF:int{49760000}
+ }
+ ru{
+ populationShareF:int{49610000}
+ }
+ territoryF:intvector{
+ 58116400,
+ 50100000,
+ 53197000,
+ }
+ }
+ SK{
+ de{
+ populationShareF:int{47280000}
+ }
+ hu{
+ populationShareF:int{49110000}
+ }
+ pl{
+ populationShareF:int{47930000}
+ }
+ sk{
+ officialStatus{"official"}
+ populationShareF:int{49900000}
+ }
+ territoryF:intvector{
+ 61132400,
+ 49996000,
+ 56548309,
+ }
+ uk{
+ populationShareF:int{48190000}
+ }
+ }
+ SL{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49350000}
+ }
+ kri{
+ populationShareF:int{49950000}
+ }
+ men{
+ populationShareF:int{49270000}
+ }
+ tem{
+ populationShareF:int{49260000}
+ writingShareF:int{48600000}
+ }
+ territoryF:intvector{
+ 59837600,
+ 49351000,
+ 56548600,
+ }
+ }
+ SM{
+ eo{
+ populationShareF:int{47930000}
+ }
+ it{
+ officialStatus{"official"}
+ populationShareF:int{49890000}
+ }
+ territoryF:intvector{
+ 59135700,
+ 49960000,
+ 54321400,
+ }
+ }
+ SN{
+ ff{
+ populationShareF:int{49210000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49390000}
+ }
+ srr{
+ populationShareF:int{49110000}
+ }
+ territoryF:intvector{
+ 60265000,
+ 49393000,
+ 57129696,
+ }
+ wo_Latn{
+ officialStatus{"official"}
+ populationShareF:int{49340000}
+ }
+ }
+ SO{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49340000}
+ writingShareF:int{49990000}
+ }
+ om{
+ populationShareF:int{47420000}
+ }
+ so{
+ officialStatus{"official"}
+ populationShareF:int{49780000}
+ }
+ sw{
+ populationShareF:int{48200000}
+ }
+ territoryF:intvector{
+ 59589600,
+ 49378000,
+ 57100856,
+ }
+ }
+ SR{
+ nl{
+ officialStatus{"official"}
+ populationShareF:int{49900000}
+ }
+ srn{
+ populationShareF:int{49680000}
+ writingShareF:int{49750000}
+ }
+ territoryF:intvector{
+ 59668500,
+ 49896000,
+ 55560157,
+ }
+ zh_Hant{
+ populationShareF:int{48130000}
+ }
+ }
+ SS{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49270000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49270000}
+ }
+ territoryF:intvector{
+ 59966400,
+ 49270000,
+ 57106252,
+ }
+ }
+ ST{
+ pt{
+ officialStatus{"official"}
+ populationShareF:int{49850000}
+ }
+ territoryF:intvector{
+ 58403000,
+ 49849000,
+ 55183176,
+ }
+ }
+ SV{
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49890000}
+ }
+ territoryF:intvector{
+ 60459800,
+ 49811000,
+ 56609065,
+ }
+ }
+ SX{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49680000}
+ }
+ es{
+ populationShareF:int{49120000}
+ }
+ nl{
+ officialStatus{"official"}
+ populationShareF:int{48410000}
+ }
+ territoryF:intvector{
+ 58794700,
+ 49990000,
+ 54390880,
+ }
+ vic{
+ populationShareF:int{48790000}
+ }
+ }
+ SY{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49800000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{48590000}
+ }
+ hy{
+ populationShareF:int{48180000}
+ }
+ ku_Latn{
+ populationShareF:int{48800000}
+ }
+ syr{
+ populationShareF:int{46840000}
+ writingShareF:int{48500000}
+ }
+ territoryF:intvector{
+ 61107600,
+ 49796000,
+ 57225307,
+ }
+ }
+ SZ{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49800000}
+ }
+ ss{
+ officialStatus{"official"}
+ populationShareF:int{49580000}
+ }
+ territoryF:intvector{
+ 59614800,
+ 49816000,
+ 56138691,
+ }
+ ts{
+ populationShareF:int{48170000}
+ }
+ zu{
+ populationShareF:int{48680000}
+ }
+ }
+ TA{
+ en{
+ populationShareF:int{49990000}
+ }
+ territoryF:intvector{
+ 57101300,
+ 49990000,
+ 52275000,
+ }
+ }
+ TC{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49980000}
+ }
+ territoryF:intvector{
+ 58216000,
+ 49980000,
+ 54463350,
+ }
+ }
+ TD{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49170000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49260000}
+ }
+ territoryF:intvector{
+ 60213400,
+ 49345000,
+ 57109756,
+ }
+ }
+ TF{
+ fr{
+ populationShareF:int{50100000}
+ writingShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 56480600,
+ 49990000,
+ 52140000,
+ }
+ }
+ TG{
+ ee{
+ populationShareF:int{49170000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49610000}
+ }
+ territoryF:intvector{
+ 59689900,
+ 49609000,
+ 56696105,
+ }
+ }
+ TH{
+ kdt{
+ populationShareF:int{47480000}
+ writingShareF:int{49500000}
+ }
+ kxm{
+ populationShareF:int{48170000}
+ }
+ lcp{
+ populationShareF:int{46100000}
+ writingShareF:int{49250000}
+ }
+ lwl{
+ populationShareF:int{46100000}
+ }
+ mfa{
+ populationShareF:int{48500000}
+ }
+ mnw{
+ populationShareF:int{47170000}
+ }
+ nod{
+ populationShareF:int{48960000}
+ writingShareF:int{48500000}
+ }
+ shn{
+ populationShareF:int{46960000}
+ }
+ sou{
+ populationShareF:int{48800000}
+ writingShareF:int{48500000}
+ }
+ territoryF:intvector{
+ 61646100,
+ 49926000,
+ 57670911,
+ }
+ th{
+ officialStatus{"official"}
+ populationShareF:int{49800000}
+ writingShareF:int{49930000}
+ }
+ tts{
+ populationShareF:int{49240000}
+ writingShareF:int{48500000}
+ }
+ zh_Hant{
+ populationShareF:int{48180000}
+ }
+ }
+ TJ{
+ ar{
+ populationShareF:int{46130000}
+ }
+ fa{
+ populationShareF:int{47780000}
+ }
+ territoryF:intvector{
+ 60176100,
+ 49997000,
+ 56776839,
+ }
+ tg_Cyrl{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ }
+ TK{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 56150000,
+ 49940000,
+ 53136800,
+ }
+ tkl{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ writingShareF:int{48500000}
+ }
+ }
+ TL{
+ pt{
+ officialStatus{"official"}
+ populationShareF:int{49590000}
+ writingShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 60106300,
+ 49586000,
+ 56114367,
+ }
+ tet{
+ officialStatus{"official"}
+ populationShareF:int{49590000}
+ }
+ }
+ TM{
+ ku_Latn{
+ populationShareF:int{47410000}
+ }
+ ru{
+ populationShareF:int{49120000}
+ }
+ territoryF:intvector{
+ 60475500,
+ 49988000,
+ 56505483,
+ }
+ tk{
+ officialStatus{"official"}
+ populationShareF:int{49700000}
+ }
+ uz_Latn{
+ populationShareF:int{48900000}
+ }
+ }
+ TN{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49900000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49740000}
+ }
+ territoryF:intvector{
+ 61104400,
+ 49743000,
+ 57107329,
+ }
+ }
+ TO{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49280000}
+ }
+ territoryF:intvector{
+ 58786000,
+ 49989000,
+ 55106146,
+ }
+ to{
+ officialStatus{"official"}
+ populationShareF:int{49950000}
+ }
+ }
+ TR{
+ ab{
+ populationShareF:int{45500000}
+ }
+ ady{
+ populationShareF:int{47390000}
+ }
+ ar{
+ populationShareF:int{47560000}
+ }
+ az_Latn{
+ populationShareF:int{47740000}
+ }
+ bg{
+ populationShareF:int{47420000}
+ }
+ bgx{
+ populationShareF:int{47460000}
+ }
+ el{
+ populationShareF:int{45500000}
+ }
+ hy{
+ populationShareF:int{46560000}
+ }
+ ka{
+ populationShareF:int{46560000}
+ }
+ kbd{
+ populationShareF:int{47770000}
+ }
+ kk_Cyrl{
+ populationShareF:int{44700000}
+ }
+ ku{
+ populationShareF:int{48550000}
+ }
+ ky_Latn{
+ populationShareF:int{45140000}
+ }
+ sq{
+ populationShareF:int{46210000}
+ }
+ sr_Latn{
+ populationShareF:int{46280000}
+ writingShareF:int{48500000}
+ }
+ territoryF:intvector{
+ 62112500,
+ 49874000,
+ 57797495,
+ }
+ tr{
+ officialStatus{"official"}
+ populationShareF:int{49930000}
+ }
+ uz_Latn{
+ populationShareF:int{45250000}
+ }
+ zza{
+ populationShareF:int{48140000}
+ }
+ }
+ TT{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49990000}
+ }
+ es{
+ populationShareF:int{47330000}
+ }
+ territoryF:intvector{
+ 60271200,
+ 49986000,
+ 56122638,
+ }
+ }
+ TV{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49100000}
+ }
+ territoryF:intvector{
+ 57370000,
+ 49950000,
+ 54106190,
+ }
+ tvl{
+ officialStatus{"official"}
+ populationShareF:int{49920000}
+ }
+ }
+ TW{
+ territoryF:intvector{
+ 61901900,
+ 49961000,
+ 57232349,
+ }
+ trv{
+ populationShareF:int{46200000}
+ }
+ zh_Hant{
+ officialStatus{"official"}
+ populationShareF:int{49950000}
+ }
+ }
+ TZ{
+ asa{
+ populationShareF:int{48120000}
+ }
+ bez{
+ populationShareF:int{48170000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49690000}
+ }
+ jmc{
+ populationShareF:int{47750000}
+ }
+ kde{
+ populationShareF:int{48240000}
+ }
+ ksb{
+ populationShareF:int{48170000}
+ }
+ lag{
+ populationShareF:int{47870000}
+ }
+ mas{
+ populationShareF:int{48150000}
+ writingShareF:int{49500000}
+ }
+ nym{
+ populationShareF:int{48330000}
+ }
+ rof{
+ populationShareF:int{47750000}
+ }
+ rwk{
+ populationShareF:int{47220000}
+ }
+ suk{
+ populationShareF:int{48870000}
+ }
+ sw{
+ officialStatus{"official"}
+ populationShareF:int{49900000}
+ }
+ territoryF:intvector{
+ 60735000,
+ 49694000,
+ 57469128,
+ }
+ vun{
+ populationShareF:int{47750000}
+ }
+ }
+ UA{
+ be{
+ populationShareF:int{47830000}
+ }
+ bg{
+ populationShareF:int{47490000}
+ }
+ el{
+ populationShareF:int{46160000}
+ }
+ hu{
+ populationShareF:int{47370000}
+ }
+ pl{
+ populationShareF:int{48240000}
+ }
+ ro{
+ populationShareF:int{47520000}
+ }
+ ru{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49460000}
+ }
+ rue{
+ populationShareF:int{48120000}
+ }
+ territoryF:intvector{
+ 61344700,
+ 49997000,
+ 57448541,
+ }
+ tr{
+ populationShareF:int{47420000}
+ }
+ uk{
+ officialStatus{"official"}
+ populationShareF:int{49650000}
+ }
+ yi{
+ populationShareF:int{48130000}
+ }
+ }
+ UG{
+ cgg{
+ populationShareF:int{48540000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{48390000}
+ }
+ hi{
+ populationShareF:int{45650000}
+ }
+ laj{
+ populationShareF:int{48380000}
+ }
+ lg{
+ populationShareF:int{49130000}
+ }
+ myx{
+ populationShareF:int{48290000}
+ }
+ nyn{
+ populationShareF:int{48630000}
+ }
+ rw{
+ populationShareF:int{48210000}
+ }
+ sw{
+ officialStatus{"official"}
+ populationShareF:int{49750000}
+ }
+ teo{
+ populationShareF:int{48390000}
+ }
+ territoryF:intvector{
+ 60505900,
+ 49668000,
+ 57336408,
+ }
+ ttj{
+ populationShareF:int{48190000}
+ }
+ xog{
+ populationShareF:int{48530000}
+ }
+ }
+ UM{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 57157700,
+ 49990000,
+ 52316000,
+ }
+ }
+ US{
+ chr{
+ populationShareF:int{45770000}
+ writingShareF:int{48500000}
+ }
+ de{
+ populationShareF:int{47470000}
+ }
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49960000}
+ }
+ es{
+ officialStatus{"official_regional"}
+ populationShareF:int{48960000}
+ }
+ fil{
+ populationShareF:int{47420000}
+ }
+ fr{
+ populationShareF:int{47560000}
+ }
+ haw{
+ officialStatus{"official_regional"}
+ populationShareF:int{45890000}
+ }
+ ik{
+ populationShareF:int{45250000}
+ writingShareF:int{48500000}
+ }
+ it{
+ populationShareF:int{47340000}
+ }
+ ko{
+ populationShareF:int{47300000}
+ }
+ lkt{
+ populationShareF:int{45260000}
+ }
+ nv{
+ populationShareF:int{46500000}
+ }
+ ru{
+ populationShareF:int{47240000}
+ }
+ territoryF:intvector{
+ 63156600,
+ 49990000,
+ 58313847,
+ }
+ vi{
+ populationShareF:int{47340000}
+ }
+ zh_Hant{
+ populationShareF:int{47690000}
+ }
+ }
+ UY{
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49880000}
+ }
+ territoryF:intvector{
+ 60535500,
+ 49980000,
+ 56331633,
+ }
+ }
+ UZ{
+ kaa{
+ populationShareF:int{48160000}
+ }
+ ru{
+ populationShareF:int{49140000}
+ }
+ territoryF:intvector{
+ 61103900,
+ 49993000,
+ 57283942,
+ }
+ tr{
+ populationShareF:int{47760000}
+ }
+ uz_Cyrl{
+ officialStatus{"official"}
+ populationShareF:int{49560000}
+ }
+ uz_Latn{
+ officialStatus{"official"}
+ populationShareF:int{49190000}
+ }
+ }
+ VA{
+ it{
+ populationShareF:int{49990000}
+ }
+ la{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49990000}
+ }
+ territoryF:intvector{
+ 57250300,
+ 50100000,
+ 52836000,
+ }
+ }
+ VC{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49960000}
+ }
+ territoryF:intvector{
+ 59130100,
+ 49960000,
+ 55103537,
+ }
+ }
+ VE{
+ es{
+ officialStatus{"official"}
+ populationShareF:int{49820000}
+ }
+ territoryF:intvector{
+ 61402100,
+ 49930000,
+ 57280479,
+ }
+ }
+ VG{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49980000}
+ }
+ territoryF:intvector{
+ 58853400,
+ 49978000,
+ 54311480,
+ }
+ }
+ VI{
+ en{
+ officialStatus{"de_facto_official"}
+ populationShareF:int{49750000}
+ }
+ territoryF:intvector{
+ 59157700,
+ 49950000,
+ 55105275,
+ }
+ }
+ VN{
+ cjm{
+ populationShareF:int{46890000}
+ writingShareF:int{49600000}
+ }
+ territoryF:intvector{
+ 61320500,
+ 49940000,
+ 57915193,
+ }
+ vi{
+ officialStatus{"official"}
+ populationShareF:int{49860000}
+ }
+ zh_Hant{
+ populationShareF:int{48100000}
+ }
+ }
+ VU{
+ bi{
+ officialStatus{"official"}
+ populationShareF:int{49900000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49740000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49500000}
+ }
+ territoryF:intvector{
+ 59123700,
+ 49740000,
+ 55256155,
+ }
+ }
+ WF{
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49490000}
+ }
+ fud{
+ populationShareF:int{49310000}
+ }
+ territoryF:intvector{
+ 57600000,
+ 49500000,
+ 54154530,
+ }
+ wls{
+ populationShareF:int{49610000}
+ }
+ }
+ WS{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{48220000}
+ }
+ sm{
+ officialStatus{"official"}
+ populationShareF:int{50100000}
+ }
+ territoryF:intvector{
+ 59112800,
+ 49997000,
+ 55194320,
+ }
+ }
+ XK{
+ sq{
+ officialStatus{"official"}
+ populationShareF:int{49920000}
+ }
+ sr_Cyrl{
+ officialStatus{"official"}
+ populationShareF:int{48500000}
+ }
+ sr_Latn{
+ officialStatus{"official"}
+ populationShareF:int{49990000}
+ writingShareF:int{48500000}
+ }
+ territoryF:intvector{
+ 60135600,
+ 49919000,
+ 56184771,
+ }
+ }
+ YE{
+ ar{
+ officialStatus{"official"}
+ populationShareF:int{49740000}
+ }
+ territoryF:intvector{
+ 60577600,
+ 49639000,
+ 57247718,
+ }
+ }
+ YT{
+ buc{
+ populationShareF:int{49230000}
+ }
+ fr{
+ officialStatus{"official"}
+ populationShareF:int{49570000}
+ }
+ sw{
+ populationShareF:int{48140000}
+ }
+ swb{
+ populationShareF:int{49880000}
+ }
+ territoryF:intvector{
+ 58953600,
+ 49920000,
+ 55194000,
+ }
+ }
+ ZA{
+ af{
+ officialStatus{"official"}
+ populationShareF:int{49130000}
+ writingShareF:int{49990000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49300000}
+ writingShareF:int{49990000}
+ }
+ hi{
+ populationShareF:int{48200000}
+ writingShareF:int{49690000}
+ }
+ nr{
+ officialStatus{"official"}
+ populationShareF:int{48160000}
+ writingShareF:int{49500000}
+ }
+ nso{
+ officialStatus{"official"}
+ populationShareF:int{48940000}
+ writingShareF:int{49500000}
+ }
+ ss{
+ officialStatus{"official"}
+ populationShareF:int{48270000}
+ writingShareF:int{49500000}
+ }
+ st{
+ officialStatus{"official"}
+ populationShareF:int{48790000}
+ writingShareF:int{49500000}
+ }
+ sw{
+ populationShareF:int{45200000}
+ writingShareF:int{49500000}
+ }
+ territoryF:intvector{
+ 61578600,
+ 49864000,
+ 57488104,
+ }
+ tn{
+ officialStatus{"official"}
+ populationShareF:int{48820000}
+ writingShareF:int{49500000}
+ }
+ ts{
+ officialStatus{"official"}
+ populationShareF:int{48440000}
+ writingShareF:int{49500000}
+ }
+ ve{
+ officialStatus{"official"}
+ populationShareF:int{48230000}
+ writingShareF:int{49500000}
+ }
+ xh{
+ officialStatus{"official"}
+ populationShareF:int{49180000}
+ writingShareF:int{49500000}
+ }
+ zu{
+ officialStatus{"official"}
+ populationShareF:int{49240000}
+ writingShareF:int{49500000}
+ }
+ }
+ ZM{
+ bem{
+ populationShareF:int{49310000}
+ }
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49810000}
+ }
+ ny{
+ populationShareF:int{49150000}
+ }
+ territoryF:intvector{
+ 60236800,
+ 49806000,
+ 57138175,
+ }
+ }
+ ZW{
+ en{
+ officialStatus{"official"}
+ populationShareF:int{49910000}
+ }
+ kck{
+ populationShareF:int{48530000}
+ }
+ mxc{
+ populationShareF:int{48650000}
+ }
+ nd{
+ officialStatus{"official"}
+ populationShareF:int{49120000}
+ }
+ ndc{
+ populationShareF:int{48610000}
+ }
+ ny{
+ populationShareF:int{48190000}
+ }
+ sn{
+ officialStatus{"official"}
+ populationShareF:int{49810000}
+ }
+ territoryF:intvector{
+ 59690900,
+ 49907000,
+ 57126196,
+ }
+ tn{
+ populationShareF:int{47220000}
+ }
+ ve{
+ populationShareF:int{47640000}
+ }
+ }
+ ZZ{
+ territoryF:intvector{
+ 0,
+ 0,
+ 0,
+ }
+ }
+ }
+ timeData{
+ 001{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ AD{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ AE{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ AF{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ AG{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ AL{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ AM{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ AO{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ AR{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ AS{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ AT{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ AU{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ AW{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ AX{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ AZ{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ BA{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ BB{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ BD{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ BE{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ BF{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ BG{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ BH{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ BI{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ BJ{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ BL{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ BM{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ BN{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ BO{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ BR{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ BS{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ BT{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ BW{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ BY{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ BZ{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ CA{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ CD{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ CF{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ CG{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ CH{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ CI{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ CL{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ CM{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ CN{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ CO{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ CR{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ CU{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ CV{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ CW{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ CY{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ CZ{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ DE{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ DJ{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ DK{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ DM{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ DO{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ DZ{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ EA{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ EC{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ EE{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ EG{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ EH{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ ER{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ ES{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ ET{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ FI{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ FJ{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ FM{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ FO{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ FR{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ GA{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ GB{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ GD{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ GE{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ GF{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ GG{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ GH{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ GI{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ GL{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ GM{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ GN{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ GP{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ GQ{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ GR{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ GT{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ GU{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ GW{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ GY{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ HK{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ HN{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ HR{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ HT{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ HU{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ IC{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ ID{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ IE{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ IL{
+ allowed{"H"}
+ preferred{"H"}
+ }
+ IM{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ IN{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ IQ{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ IR{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ IS{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ IT{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ JE{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ JM{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ JO{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ JP{
+ allowed{
+ "H",
+ "K",
+ "h",
+ }
+ preferred{"H"}
+ }
+ KE{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ KG{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ KH{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ KI{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ KM{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ KN{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ KP{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ KR{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ KW{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ KY{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ KZ{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ LA{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ LB{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ LC{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ LI{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ LK{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ LR{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ LS{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ LT{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ LU{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ LV{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ LY{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ MA{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ MC{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ MD{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ ME{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ MF{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ MG{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ MH{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ MK{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ ML{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ MM{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ MN{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ MO{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ MP{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ MQ{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ MR{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ MT{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ MU{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ MW{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ MX{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ MY{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ MZ{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ NA{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ NC{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ NE{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ NG{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ NI{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ NL{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ NO{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ NP{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ NZ{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ OM{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ PA{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ PE{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ PF{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ PG{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ PH{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ PK{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ PL{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ PR{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ PS{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ PT{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ PW{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ PY{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ QA{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ RE{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ RO{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ RS{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ RU{
+ allowed{"H"}
+ preferred{"H"}
+ }
+ RW{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ SA{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ SB{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ SC{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ SD{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ SE{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ SG{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ SI{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ SK{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ SL{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ SM{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ SN{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ SO{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ SR{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ SS{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ ST{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ SV{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ SX{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ SY{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ SZ{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ TC{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ TD{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ TG{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ TH{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ TJ{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ TL{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ TN{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ TO{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ TR{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ TT{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ TW{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ TZ{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ UA{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ UG{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ UM{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ US{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ UY{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ UZ{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ VC{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ VE{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ VG{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ VI{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ VN{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ VU{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ WS{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ XK{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ YE{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ YT{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"H"}
+ }
+ ZA{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ ZM{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ ZW{
+ allowed{
+ "H",
+ "h",
+ }
+ preferred{"h"}
+ }
+ }
weekData{
001:intvector{
2,
@@ -9095,6 +16376,14 @@
1,
86400000,
}
+ XK:intvector{
+ 2,
+ 1,
+ 7,
+ 0,
+ 1,
+ 86400000,
+ }
YE:intvector{
7,
1,
diff --git a/data/misc/timezoneTypes.txt b/data/misc/timezoneTypes.txt
index 7bc66e5..378eb75 100644
--- a/data/misc/timezoneTypes.txt
+++ b/data/misc/timezoneTypes.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/bcp47/timezone.xml
// *
@@ -387,6 +387,7 @@
"Asia:Karachi"{"pkkhi"}
"Asia:Kashgar"{"cnkhg"}
"Asia:Katmandu"{"npktm"}
+ "Asia:Khandyga"{"rukhndg"}
"Asia:Krasnoyarsk"{"rukra"}
"Asia:Kuala_Lumpur"{"mykul"}
"Asia:Kuching"{"mykch"}
@@ -422,6 +423,7 @@
"Asia:Tokyo"{"jptyo"}
"Asia:Ulaanbaatar"{"mnuln"}
"Asia:Urumqi"{"cnurc"}
+ "Asia:Ust-Nera"{"ruunera"}
"Asia:Vientiane"{"lavte"}
"Asia:Vladivostok"{"ruvvo"}
"Asia:Yakutsk"{"ruyks"}
@@ -486,6 +488,7 @@
"Europe:Brussels"{"bebru"}
"Europe:Bucharest"{"robuh"}
"Europe:Budapest"{"hubud"}
+ "Europe:Busingen"{"debsngn"}
"Europe:Chisinau"{"mdkiv"}
"Europe:Copenhagen"{"dkcph"}
"Europe:Dublin"{"iedub"}
diff --git a/data/misc/windowsZones.txt b/data/misc/windowsZones.txt
index 165c627..7396cf7 100644
--- a/data/misc/windowsZones.txt
+++ b/data/misc/windowsZones.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/windowsZones.xml
// *
@@ -202,7 +202,7 @@
}
"E. South America Standard Time"{
001{"America/Sao_Paulo"}
- BR{"America/Sao_Paulo"}
+ BR{"America/Sao_Paulo America/Araguaina"}
}
"Eastern Standard Time"{
001{"America/New_York"}
@@ -429,8 +429,8 @@
001{"America/Cayenne"}
AQ{"Antarctica/Rothera"}
BR{
- "America/Fortaleza America/Araguaina America/Belem America/Maceio Ame"
- "rica/Recife America/Santarem"
+ "America/Fortaleza America/Belem America/Maceio America/Recife Americ"
+ "a/Santarem"
}
FK{"Atlantic/Stanley"}
GF{"America/Cayenne"}
@@ -606,7 +606,7 @@
}
"Vladivostok Standard Time"{
001{"Asia/Vladivostok"}
- RU{"Asia/Vladivostok Asia/Sakhalin"}
+ RU{"Asia/Vladivostok Asia/Sakhalin Asia/Ust-Nera"}
}
"W. Australia Standard Time"{
001{"Australia/Perth"}
@@ -635,7 +635,7 @@
AD{"Europe/Andorra"}
AT{"Europe/Vienna"}
CH{"Europe/Zurich"}
- DE{"Europe/Berlin"}
+ DE{"Europe/Berlin Europe/Busingen"}
GI{"Europe/Gibraltar"}
IT{"Europe/Rome"}
LI{"Europe/Vaduz"}
@@ -672,7 +672,7 @@
}
"Yakutsk Standard Time"{
001{"Asia/Yakutsk"}
- RU{"Asia/Yakutsk"}
+ RU{"Asia/Yakutsk Asia/Khandyga"}
}
}
}
diff --git a/data/misc/zoneinfo64.txt b/data/misc/zoneinfo64.txt
index 7fa8915..6f43968 100644
--- a/data/misc/zoneinfo64.txt
+++ b/data/misc/zoneinfo64.txt
@@ -1,22 +1,22 @@
//---------------------------------------------------------
-// Copyright (C) 2003-2012, International Business Machines
+// Copyright (C) 2003-2013, International Business Machines
// Corporation and others. All Rights Reserved.
//---------------------------------------------------------
// Build tool: tz2icu
-// Build date: Tue Nov 13 21:39:53 2012
+// Build date: Tue Apr 23 15:26:39 2013
// Olson source: ftp://elsie.nci.nih.gov/pub/
-// Olson version: 2012j
-// ICU version: 51.0.1
+// Olson version: 2013c
+// ICU version: 51.1
//---------------------------------------------------------
// >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! <<
// >> !!! >>> DO NOT EDIT <<< !!! <<
//---------------------------------------------------------
zoneinfo64:table(nofallback) {
- TZVersion { "2012j" }
+ TZVersion { "2013c" }
Zones:array {
- /* ACT */ :int { 345 } //Z#0
- /* AET */ :int { 357 } //Z#1
+ /* ACT */ :int { 347 } //Z#0
+ /* AET */ :int { 359 } //Z#1
/* AGT */ :int { 64 } //Z#2
/* ART */ :int { 18 } //Z#3
/* AST */ :int { 60 } //Z#4
@@ -35,7 +35,7 @@
trans:intvector { -1062210920 }
typeOffsets:intvector { 9288, 0, 9320, 0, 10800, 0 }
typeMap:bin { "0102" }
- links:intvector { 7, 386 }
+ links:intvector { 7, 388 }
} //Z#7
/* Africa/Algiers */ :table {
transPre32:intvector { -1, 1808288224 }
@@ -88,19 +88,19 @@
typeMap:bin { "01" }
} //Z#17
/* Africa/Cairo */ :table {
- transPre32:intvector { -1, 2109558196 }
+ transPre32:intvector { -1, 2109558187 }
trans:intvector { -929844000, -923108400, -906170400, -892868400, -875844000, -857790000, -844308000, -825822000, -812685600, -794199600, -779853600, -762663600, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -71107200, -52707600, -39484800, -21171600, -7948800, 10364400, 23587200, 41900400, 55123200, 73522800, 86745600, 105058800, 118281600, 136594800, 149817600, 168130800, 181353600, 199753200, 212976000, 231289200, 244512000, 262825200, 276048000, 294361200, 307584000, 325983600, 339206400, 357519600, 370742400, 396399600, 402278400, 426812400, 433814400, 452214000, 465436800, 483750000, 496972800, 515286000, 528508800, 546822000, 560044800, 578444400, 591667200, 610412400, 623203200, 641516400, 654739200, 673052400, 686275200, 704674800, 717897600, 736210800, 749433600, 767746800, 780969600, 799020000, 812322000, 830469600, 843771600, 861919200, 875221200, 893368800, 906670800, 925423200, 938725200, 956872800, 970174800, 988322400, 1001624400, 1019772000, 1033074000, 1051221600, 1064523600, 1083276000, 1096578000, 1114725600, 1128027600, 1146175200, 1158872400, 1177624800, 1189112400, 1209074400, 1219957200, 1240524000, 1250802000, 1272578400, 1281474000, 1284069600, 1285880400 }
- typeOffsets:intvector { 7500, 0, 7200, 0, 7200, 3600 }
+ typeOffsets:intvector { 7509, 0, 7200, 0, 7200, 3600 }
typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
- links:intvector { 3, 18, 391 }
+ links:intvector { 3, 18, 393 }
} //Z#18
/* Africa/Casablanca */ :table {
- trans:intvector { -1773012580, -956361600, -950490000, -942019200, -761187600, -617241600, -605149200, -81432000, -71110800, 141264000, 147222000, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 448243200, 504918000, 1212278400, 1220223600, 1243814400, 1250809200, 1272758400, 1281222000, 1301788800, 1312066800, 1335664800, 1342749600, 1345428000, 1348970400 }
+ trans:intvector { -1773012580, -956361600, -950490000, -942019200, -761187600, -617241600, -605149200, -81432000, -71110800, 141264000, 147222000, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 448243200, 504918000, 1212278400, 1220223600, 1243814400, 1250809200, 1272758400, 1281222000, 1301788800, 1312066800, 1335664800, 1342749600, 1345428000, 1348970400, 1367114400, 1373335200, 1375927200, 1380420000, 1398564000, 1404007200, 1406599200, 1411869600, 1430013600, 1434592800, 1437184800, 1443319200, 1461463200, 1465264800, 1467856800, 1474768800, 1493517600, 1495850400, 1498442400, 1506218400, 1524967200, 1526436000, 1529028000, 1538272800, 1556416800, 1557108000, 1559700000, 1569722400, 1590285600, 1601172000, 1620871200, 1632621600, 1651543200, 1664071200, 1682820000, 1695520800 }
typeOffsets:intvector { -1820, 0, 0, 0, 0, 3600, 3600, 0 }
- typeMap:bin { "01020102010201020102010201020102010301020102010201020102010201" }
+ typeMap:bin { "01020102010201020102010201020102010301020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
finalRule { "Morocco" }
finalRaw:int { 0 }
- finalYear:int { 2013 }
+ finalYear:int { 2024 }
} //Z#19
/* Africa/Ceuta */ :table {
transPre32:intvector { -1, 2117515772 }
@@ -148,15 +148,15 @@
} //Z#27
/* Africa/Gaborone */ :table {
transPre32:intvector { -1, 1612673076 }
- trans:intvector { -829526400, -813805200 }
- typeOffsets:intvector { 6220, 0, 7200, 0, 7200, 3600 }
- typeMap:bin { "010201" }
+ trans:intvector { -2109288600, -829526400, -813805200 }
+ typeOffsets:intvector { 6220, 0, 5400, 0, 7200, 0, 7200, 3600 }
+ typeMap:bin { "01020302" }
} //Z#28
/* Africa/Harare */ :table {
trans:intvector { -2109290652 }
typeOffsets:intvector { 7452, 0, 7200, 0 }
typeMap:bin { "01" }
- links:intvector { 29, 368 }
+ links:intvector { 29, 370 }
} //Z#29
/* Africa/Johannesburg */ :table {
transPre32:intvector { -1, 1836794176 }
@@ -295,7 +295,7 @@
finalRule { "Libya" }
finalRaw:int { 3600 }
finalYear:int { 2014 }
- links:intvector { 56, 517 }
+ links:intvector { 56, 520 }
} //Z#56
/* Africa/Tunis */ :table {
transPre32:intvector { -1, 1497764852 }
@@ -320,7 +320,7 @@
finalRule { "US" }
finalRaw:int { -36000 }
finalYear:int { 2008 }
- links:intvector { 59, 80, 603 }
+ links:intvector { 59, 80, 606 }
} //Z#59
/* America/Anchorage */ :table {
transPre32:intvector { -1, 1069604872, -1, 2106016072 }
@@ -330,7 +330,7 @@
finalRule { "US" }
finalRaw:int { -32400 }
finalYear:int { 2008 }
- links:intvector { 4, 60, 602 }
+ links:intvector { 4, 60, 605 }
} //Z#60
/* America/Anguilla */ :table {
trans:intvector { -1825098464 }
@@ -434,12 +434,12 @@
typeMap:bin { "0102" }
} //Z#77
/* America/Asuncion */ :table {
- trans:intvector { -1206389360, 86760000, 134017200, 181368000, 194497200, 212990400, 226033200, 244526400, 257569200, 276062400, 291783600, 307598400, 323406000, 339220800, 354942000, 370756800, 386478000, 402292800, 418014000, 433828800, 449636400, 465451200, 481172400, 496987200, 512708400, 528523200, 544244400, 560059200, 575866800, 591681600, 607402800, 625032000, 638938800, 654753600, 670474800, 686721600, 699418800, 718257600, 733546800, 749448000, 762318000, 780984000, 793767600, 812520000, 825649200, 844574400, 856666800, 876024000, 888721200, 907473600, 920775600, 938923200, 952225200, 970372800, 983674800, 1002427200, 1018148400, 1030852800, 1049598000, 1062907200, 1081047600, 1097985600, 1110682800, 1129435200, 1142132400, 1160884800, 1173582000, 1192939200, 1205031600, 1224388800, 1236481200, 1255838400, 1270954800, 1286078400 }
+ trans:intvector { -1206389360, 86760000, 134017200, 181368000, 194497200, 212990400, 226033200, 244526400, 257569200, 276062400, 291783600, 307598400, 323406000, 339220800, 354942000, 370756800, 386478000, 402292800, 418014000, 433828800, 449636400, 465451200, 481172400, 496987200, 512708400, 528523200, 544244400, 560059200, 575866800, 591681600, 607402800, 625032000, 638938800, 654753600, 670474800, 686721600, 699418800, 718257600, 733546800, 749448000, 762318000, 780984000, 793767600, 812520000, 825649200, 844574400, 856666800, 876024000, 888721200, 907473600, 920775600, 938923200, 952225200, 970372800, 983674800, 1002427200, 1018148400, 1030852800, 1049598000, 1062907200, 1081047600, 1097985600, 1110682800, 1129435200, 1142132400, 1160884800, 1173582000, 1192939200, 1205031600, 1224388800, 1236481200, 1255838400, 1270954800, 1286078400, 1302404400, 1317528000, 1333854000, 1349582400, 1364094000, 1381032000 }
typeOffsets:intvector { -13840, 0, -14400, 0, -14400, 3600, -10800, 0 }
- typeMap:bin { "0103010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102" }
+ typeMap:bin { "0103010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102" }
finalRule { "Para" }
finalRaw:int { -14400 }
- finalYear:int { 2011 }
+ finalYear:int { 2014 }
} //Z#78
/* America/Atikokan */ :table {
transPre32:intvector { -1, 1928234084 }
@@ -463,8 +463,8 @@
finalYear:int { 2012 }
} //Z#82
/* America/Barbados */ :table {
- trans:intvector { -1199217692, 234943200, 244616400, 261554400, 276066000, 293004000, 307515600, 325058400, 338706000 }
- typeOffsets:intvector { -14308, 0, -14400, 0, -14400, 3600 }
+ trans:intvector { -1199217691, 234943200, 244616400, 261554400, 276066000, 293004000, 307515600, 325058400, 338706000 }
+ typeOffsets:intvector { -14309, 0, -14400, 0, -14400, 3600 }
typeMap:bin { "010201020102010201" }
} //Z#83
/* America/Belem */ :table {
@@ -489,8 +489,8 @@
typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201" }
} //Z#87
/* America/Bogota */ :table {
- trans:intvector { -1739041420, 704869200, 733896000 }
- typeOffsets:intvector { -17780, 0, -18000, 0, -18000, 3600 }
+ trans:intvector { -1739041424, 704869200, 733896000 }
+ typeOffsets:intvector { -17776, 0, -18000, 0, -18000, 3600 }
typeMap:bin { "010201" }
} //Z#88
/* America/Boise */ :table {
@@ -554,7 +554,7 @@
finalRule { "US" }
finalRaw:int { -21600 }
finalYear:int { 2008 }
- links:intvector { 98, 371, 605 }
+ links:intvector { 98, 373, 608 }
} //Z#98
/* America/Chihuahua */ :table {
trans:intvector { -1514739600, -1343066400, -1234807200, -1220292000, -1207159200, -1191344400, 828864000, 846399600, 860313600, 877849200, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600 }
@@ -567,8 +567,8 @@
/* America/Coral_Harbour */ :int { 79 } //Z#100
/* America/Cordoba */ :int { 67 } //Z#101
/* America/Costa_Rica */ :table {
- trans:intvector { -1545071020, 288770400, 297234000, 320220000, 328683600, 664264800, 678344400, 695714400, 700635600 }
- typeOffsets:intvector { -20180, 0, -21600, 0, -21600, 3600 }
+ trans:intvector { -1545071027, 288770400, 297234000, 320220000, 328683600, 664264800, 678344400, 695714400, 700635600 }
+ typeOffsets:intvector { -20173, 0, -21600, 0, -21600, 3600 }
typeMap:bin { "010201020102010201" }
} //Z#102
/* America/Creston */ :table {
@@ -587,8 +587,8 @@
finalYear:int { 2039 }
} //Z#104
/* America/Curacao */ :table {
- trans:intvector { -1826738656, -157750200 }
- typeOffsets:intvector { -16544, 0, -16200, 0, -14400, 0 }
+ trans:intvector { -1826738653, -157750200 }
+ typeOffsets:intvector { -16547, 0, -16200, 0, -14400, 0 }
typeMap:bin { "0102" }
links:intvector { 105, 147, 152 }
} //Z#105
@@ -620,7 +620,7 @@
finalRule { "US" }
finalRaw:int { -25200 }
finalYear:int { 2008 }
- links:intvector { 109, 202, 532, 611 }
+ links:intvector { 109, 202, 535, 614 }
} //Z#109
/* America/Detroit */ :table {
trans:intvector { -2051202469, -1724083200, -880218000, -765396000, -684349200, -671047200, -80499600, -68666400, 104914800, 120636000, 126687600, 152085600, 167814000, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954658800, 972799200, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000 }
@@ -629,7 +629,7 @@
finalRule { "US" }
finalRaw:int { -18000 }
finalYear:int { 2008 }
- links:intvector { 110, 610 }
+ links:intvector { 110, 613 }
} //Z#110
/* America/Dominica */ :table {
trans:intvector { -1846266804 }
@@ -643,7 +643,7 @@
finalRule { "Canada" }
finalRaw:int { -25200 }
finalYear:int { 2008 }
- links:intvector { 112, 378 }
+ links:intvector { 112, 380 }
} //Z#112
/* America/Eirunepe */ :table {
trans:intvector { -1767208832, -1206950400, -1191355200, -1175367600, -1159819200, -633812400, -622062000, -602276400, -591825600, -570740400, -560203200, -539118000, -531345600, -191358000, -184190400, -155156400, -150062400, -128890800, -121118400, -99946800, -89582400, -68410800, -57960000, 499755600, 511243200, 530600400, 540273600, 562136400, 571204800, 750834000, 761716800, 1214283600 }
@@ -730,7 +730,7 @@
finalRule { "Canada" }
finalRaw:int { -14400 }
finalYear:int { 2008 }
- links:intvector { 127, 374 }
+ links:intvector { 127, 376 }
} //Z#127
/* America/Havana */ :table {
transPre32:intvector { -1, 1770465464 }
@@ -740,7 +740,7 @@
finalRule { "Cuba" }
finalRaw:int { -18000 }
finalYear:int { 2014 }
- links:intvector { 128, 385 }
+ links:intvector { 128, 387 }
} //Z#128
/* America/Hermosillo */ :table {
trans:intvector { -1514739600, -1343066400, -1234807200, -1220292000, -1207159200, -1191344400, -873828000, -661539600, 28800, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400 }
@@ -755,7 +755,7 @@
finalRule { "US" }
finalRaw:int { -18000 }
finalYear:int { 2008 }
- links:intvector { 116, 130, 138, 497, 606 }
+ links:intvector { 116, 130, 138, 500, 609 }
} //Z#130
/* America/Indiana/Knox */ :table {
transPre32:intvector { -1, 1577320096 }
@@ -765,7 +765,7 @@
finalRule { "US" }
finalRaw:int { -21600 }
finalYear:int { 2008 }
- links:intvector { 131, 146, 609 }
+ links:intvector { 131, 146, 612 }
} //Z#131
/* America/Indiana/Marengo */ :table {
transPre32:intvector { -1, 1577320096 }
@@ -842,7 +842,7 @@
trans:intvector { -1827687168, 136364400, 152085600, 162370800, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600 }
typeOffsets:intvector { -18432, 0, -18000, 0, -18000, 3600 }
typeMap:bin { "010201020102010201020102010201020102010201" }
- links:intvector { 141, 514 }
+ links:intvector { 141, 517 }
} //Z#141
/* America/Jujuy */ :int { 68 } //Z#142
/* America/Juneau */ :table {
@@ -894,7 +894,7 @@
finalRule { "US" }
finalRaw:int { -28800 }
finalYear:int { 2008 }
- links:intvector { 150, 537, 612, 613 }
+ links:intvector { 150, 540, 615, 616 }
} //Z#150
/* America/Louisville */ :int { 144 } //Z#151
/* America/Lower_Princes */ :int { 105 } //Z#152
@@ -913,7 +913,7 @@
trans:intvector { -1767211196, -1206954000, -1191358800, -1175371200, -1159822800, -633816000, -622065600, -602280000, -591829200, -570744000, -560206800, -539121600, -531349200, -191361600, -184194000, -155160000, -150066000, -128894400, -121122000, -99950400, -89586000, -68414400, -57963600, 499752000, 511239600, 530596800, 540270000, 562132800, 571201200, 750830400, 761713200 }
typeOffsets:intvector { -14404, 0, -14400, 0, -14400, 3600 }
typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201" }
- links:intvector { 155, 367 }
+ links:intvector { 155, 369 }
} //Z#155
/* America/Marigot */ :int { 123 } //Z#156
/* America/Martinique */ :table {
@@ -936,7 +936,7 @@
finalRule { "Mexico" }
finalRaw:int { -25200 }
finalYear:int { 2003 }
- links:intvector { 159, 523 }
+ links:intvector { 159, 526 }
} //Z#159
/* America/Mendoza */ :int { 70 } //Z#160
/* America/Menominee */ :table {
@@ -969,7 +969,7 @@
finalRule { "Mexico" }
finalRaw:int { -21600 }
finalYear:int { 2003 }
- links:intvector { 164, 524 }
+ links:intvector { 164, 527 }
} //Z#164
/* America/Miquelon */ :table {
trans:intvector { -1850328920, 326001600, 544597200, 562132800, 576046800, 594187200, 607496400, 625636800, 638946000, 657086400, 671000400, 688536000, 702450000, 719985600, 733899600, 752040000, 765349200, 783489600, 796798800, 814939200, 828853200, 846388800, 860302800, 877838400, 891752400, 909288000, 923202000, 941342400, 954651600, 972792000, 986101200, 1004241600, 1018155600, 1035691200, 1049605200, 1067140800, 1081054800, 1099195200, 1112504400, 1130644800, 1143954000, 1162094400, 1173589200, 1194148800 }
@@ -1019,8 +1019,8 @@
typeMap:bin { "01" }
} //Z#170
/* America/Nassau */ :table {
- trans:intvector { -1825095036, -179341200, -163620000, -147891600, -131565600, -116442000, -100116000, -84387600, -68666400, -52938000, -37216800, -21488400, -5767200, 9961200, 25682400, 41410800, 57736800, 73465200, 89186400, 104914800, 120636000, 136364400, 152085600, 167814000, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954658800, 972799200, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000 }
- typeOffsets:intvector { -18564, 0, -18000, 0, -18000, 3600 }
+ trans:intvector { -1825095030, -179341200, -163620000, -147891600, -131565600, -116442000, -100116000, -84387600, -68666400, -52938000, -37216800, -21488400, -5767200, 9961200, 25682400, 41410800, 57736800, 73465200, 89186400, 104914800, 120636000, 136364400, 152085600, 167814000, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954658800, 972799200, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000 }
+ typeOffsets:intvector { -18570, 0, -18000, 0, -18000, 3600 }
typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
finalRule { "US" }
finalRaw:int { -18000 }
@@ -1034,7 +1034,7 @@
finalRule { "US" }
finalRaw:int { -18000 }
finalYear:int { 2008 }
- links:intvector { 172, 607 }
+ links:intvector { 172, 610 }
} //Z#172
/* America/Nipigon */ :table {
transPre32:intvector { -1, 1928233280 }
@@ -1058,7 +1058,7 @@
trans:intvector { -1767217820, -1206961200, -1191366000, -1175378400, -1159830000, -633823200, -622072800, -602287200, -591836400, -570751200, -560214000, -539128800, -531356400, -191368800, -184201200, -155167200, -150073200, -128901600, -121129200, -99957600, -89593200, -68421600, -57970800, 499744800, 511232400, 530589600, 540262800, 562125600, 571194000, 592970400, 602038800, 624420000, 634698000, 938916000, 951613200, 970970400, 971571600, 1003024800, 1013907600 }
typeOffsets:intvector { -7780, 0, -7200, 0, -7200, 3600 }
typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201" }
- links:intvector { 175, 365 }
+ links:intvector { 175, 367 }
} //Z#175
/* America/North_Dakota/Beulah */ :table {
transPre32:intvector { -1, 1577323696 }
@@ -1119,13 +1119,16 @@
trans:intvector { -1633273200, -1615132800, -1601823600, -1583683200, -880210800, -820519140, -812653140, -796845540, -84380400, -68659200 }
typeOffsets:intvector { -26898, 0, -25200, 0, -25200, 3600 }
typeMap:bin { "0102010201020102010201" }
- links:intvector { 183, 534, 604 }
+ links:intvector { 183, 537, 607 }
} //Z#183
/* America/Port-au-Prince */ :table {
transPre32:intvector { -1, 1770463056 }
trans:intvector { -1670483460, 421218000, 436334400, 452062800, 467784000, 483512400, 499233600, 514962000, 530683200, 546411600, 562132800, 576050400, 594194400, 607500000, 625644000, 638949600, 657093600, 671004000, 688543200, 702453600, 719992800, 733903200, 752047200, 765352800, 783496800, 796802400, 814946400, 828856800, 846396000, 860306400, 877845600, 1112504400, 1130644800, 1143954000, 1162094400, 1331449200, 1352008800 }
typeOffsets:intvector { -17360, 0, -18000, 0, -18000, 3600, -17340, 0 }
typeMap:bin { "0301020102010201020102010201020102010201020102010201020102010201020102010201" }
+ finalRule { "Haiti" }
+ finalRaw:int { -18000 }
+ finalYear:int { 2013 }
} //Z#184
/* America/Port_of_Spain */ :table {
trans:intvector { -1825098836 }
@@ -1143,7 +1146,7 @@
trans:intvector { -873057600, -765399600 }
typeOffsets:intvector { -15865, 0, -14400, 0, -14400, 3600 }
typeMap:bin { "010201" }
- links:intvector { 188, 536 }
+ links:intvector { 188, 539 }
} //Z#188
/* America/Rainy_River */ :table {
transPre32:intvector { -1, 1928234792 }
@@ -1171,7 +1174,7 @@
trans:intvector { -2030202084, -1632063600, -1615132800, -1251651600, -1238349600, -1220202000, -1206900000, -1188752400, -1175450400, -1156698000, -1144000800, -1125248400, -1111946400, -1032714000, -1016992800, -1001264400, -986148000, -969814800, -954093600, -937760400, -922039200, -906310800, -890589600, -880210800, -765388800, -748450800, -732729600, -715791600, -702489600, -684342000, -671040000, -652892400, -639590400, -620838000, -608140800, -589388400, -576086400, -557938800, -544636800, -526489200, -513187200, -495039600, -481737600, -463590000, -450288000, -431535600, -418233600, -400086000, -386784000, -337186800, -321465600, -305737200 }
typeOffsets:intvector { -25116, 0, -25200, 0, -25200, 3600, -21600, 0 }
typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020103" }
- links:intvector { 192, 376, 381 }
+ links:intvector { 192, 378, 383 }
} //Z#192
/* America/Resolute */ :table {
trans:intvector { -704937600, -147895200, -131565600, 325670400, 341391600, 357120000, 372841200, 388569600, 404895600, 420019200, 436345200, 452073600, 467794800, 483523200, 499244400, 514972800, 530694000, 544608000, 562143600, 576057600, 594198000, 607507200, 625647600, 638956800, 657097200, 671011200, 688546800, 702460800, 719996400, 733910400, 752050800, 765360000, 783500400, 796809600, 814950000, 828864000, 846399600, 860313600, 877849200, 891763200, 909298800, 923212800, 941353200, 954662400, 972802800, 986112000, 1004252400, 1018166400, 1035702000, 1049616000, 1067151600, 1081065600, 1099206000, 1112515200, 1130655600, 1143964800, 1162105200, 1173600000, 1194159600 }
@@ -1185,7 +1188,7 @@
trans:intvector { -1767209328, -1206950400, -1191355200, -1175367600, -1159819200, -633812400, -622062000, -602276400, -591825600, -570740400, -560203200, -539118000, -531345600, -191358000, -184190400, -155156400, -150062400, -128890800, -121118400, -99946800, -89582400, -68410800, -57960000, 499755600, 511243200, 530600400, 540273600, 562136400, 571204800, 1214283600 }
typeOffsets:intvector { -16272, 0, -18000, 0, -18000, 3600, -14400, 0 }
typeMap:bin { "010201020102010201020102010201020102010201020102010201020103" }
- links:intvector { 186, 194, 364 }
+ links:intvector { 186, 194, 366 }
} //Z#194
/* America/Rosario */ :int { 67 } //Z#195
/* America/Santa_Isabel */ :table {
@@ -1202,13 +1205,13 @@
typeMap:bin { "010201020102010201020102010201020102010201020102010201020103" }
} //Z#197
/* America/Santiago */ :table {
- trans:intvector { -1893439034, -1688410800, -1619983034, -1593806400, -1335986234, -1317585600, -1304362800, -1286049600, -1272826800, -1254513600, -1241290800, -1222977600, -1209754800, -1191355200, -1178132400, -870552000, -865278000, -736376400, -713646000, -36619200, -23922000, -3355200, 7527600, 24465600, 37767600, 55915200, 69217200, 87969600, 100666800, 118209600, 132116400, 150868800, 163566000, 182318400, 195620400, 213768000, 227070000, 245217600, 258519600, 277272000, 289969200, 308721600, 321418800, 340171200, 353473200, 371620800, 384922800, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 591768000, 605674800, 624427200, 637729200, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400, 1362884400, 1381636800 }
+ trans:intvector { -1893439034, -1688410800, -1619983034, -1593806400, -1335986234, -1317585600, -1304362800, -1286049600, -1272826800, -1254513600, -1241290800, -1222977600, -1209754800, -1191355200, -1178132400, -870552000, -865278000, -736376400, -713646000, -36619200, -23922000, -3355200, 7527600, 24465600, 37767600, 55915200, 69217200, 87969600, 100666800, 118209600, 132116400, 150868800, 163566000, 182318400, 195620400, 213768000, 227070000, 245217600, 258519600, 277272000, 289969200, 308721600, 321418800, 340171200, 353473200, 371620800, 384922800, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 591768000, 605674800, 624427200, 637729200, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400 }
typeOffsets:intvector { -16966, 0, -18000, 0, -18000, 3600, -14400, 0, -14400, 3600 }
- typeMap:bin { "0100030002010201020102010201020102010304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304" }
+ typeMap:bin { "010003000201020102010201020102010201030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304" }
finalRule { "Chile" }
finalRaw:int { -14400 }
- finalYear:int { 2014 }
- links:intvector { 198, 383 }
+ finalYear:int { 2013 }
+ links:intvector { 198, 385 }
} //Z#198
/* America/Santo_Domingo */ :table {
transPre32:intvector { -1, 1770462472 }
@@ -1224,7 +1227,7 @@
finalRule { "Brazil" }
finalRaw:int { -10800 }
finalYear:int { 2039 }
- links:intvector { 200, 362, 366 }
+ links:intvector { 200, 364, 368 }
} //Z#200
/* America/Scoresbysund */ :table {
trans:intvector { -1686090728, 323841600, 338961600, 354679200, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -1252,7 +1255,7 @@
finalRule { "Canada" }
finalRaw:int { -12600 }
finalYear:int { 2013 }
- links:intvector { 205, 370, 379 }
+ links:intvector { 205, 372, 381 }
} //Z#205
/* America/St_Kitts */ :table {
trans:intvector { -1825098548 }
@@ -1309,7 +1312,7 @@
finalRule { "US" }
finalRaw:int { -28800 }
finalYear:int { 2011 }
- links:intvector { 115, 214, 522 }
+ links:intvector { 115, 214, 525 }
} //Z#214
/* America/Toronto */ :table {
transPre32:intvector { -1, 1928231148 }
@@ -1319,7 +1322,7 @@
finalRule { "Canada" }
finalRaw:int { -18000 }
finalYear:int { 2008 }
- links:intvector { 215, 377 }
+ links:intvector { 215, 379 }
} //Z#215
/* America/Tortola */ :table {
trans:intvector { -1846266092 }
@@ -1334,7 +1337,7 @@
finalRule { "Canada" }
finalRaw:int { -28800 }
finalYear:int { 2008 }
- links:intvector { 217, 380 }
+ links:intvector { 217, 382 }
} //Z#217
/* America/Virgin */ :int { 208 } //Z#218
/* America/Whitehorse */ :table {
@@ -1345,7 +1348,7 @@
finalRule { "Canada" }
finalRaw:int { -28800 }
finalYear:int { 2008 }
- links:intvector { 219, 382 }
+ links:intvector { 219, 384 }
} //Z#219
/* America/Winnipeg */ :table {
transPre32:intvector { -1, 1692709012 }
@@ -1355,7 +1358,7 @@
finalRule { "Canada" }
finalRaw:int { -21600 }
finalYear:int { 2008 }
- links:intvector { 220, 375 }
+ links:intvector { 220, 377 }
} //Z#220
/* America/Yakutat */ :table {
transPre32:intvector { -1, 1069602431, -1, 2106013631 }
@@ -1390,9 +1393,10 @@
typeMap:bin { "010001" }
} //Z#225
/* Antarctica/Macquarie */ :table {
- trans:intvector { -1861920000, -1680508800, -1665392400, -883641600, -876128400, -860400000, -844678800, -828345600, -813229200, -71136000, -55411200, -37267200, -25776000, -5817600, 5673600, 25632000, 37728000, 57686400, 67968000, 89136000, 100022400, 120585600, 131472000, 152035200, 162921600, 183484800, 194976000, 215539200, 226425600, 246988800, 257875200, 278438400, 289324800, 309888000, 320774400, 341337600, 352224000, 372787200, 386092800, 404841600, 417542400, 436291200, 447177600, 467740800, 478627200, 499190400, 510076800, 530035200, 542736000, 562089600, 574790400, 594144000, 606240000, 625593600, 637689600, 657043200, 670348800, 686678400, 701798400, 718128000, 733248000, 749577600, 764697600, 781027200, 796147200, 812476800, 828201600, 844531200, 859651200, 875980800, 891100800, 907430400, 922550400, 938880000, 954000000, 967305600, 985449600, 1002384000, 1017504000, 1033833600, 1048953600, 1065283200, 1080403200, 1096732800, 1111852800, 1128182400, 1143907200, 1159632000, 1174752000, 1191686400, 1207411200, 1223136000, 1238860800, 1254585600, 1270310400 }
+ transPre32:intvector { -1, 2080708096 }
+ trans:intvector { -1680508800, -1665392400, -1601719200, -687052800, -71136000, -55411200, -37267200, -25776000, -5817600, 5673600, 25632000, 37728000, 57686400, 67968000, 89136000, 100022400, 120585600, 131472000, 152035200, 162921600, 183484800, 194976000, 215539200, 226425600, 246988800, 257875200, 278438400, 289324800, 309888000, 320774400, 341337600, 352224000, 372787200, 386092800, 404841600, 417542400, 436291200, 447177600, 467740800, 478627200, 499190400, 510076800, 530035200, 542736000, 562089600, 574790400, 594144000, 606240000, 625593600, 637689600, 657043200, 670348800, 686678400, 701798400, 718128000, 733248000, 749577600, 764697600, 781027200, 796147200, 812476800, 828201600, 844531200, 859651200, 875980800, 891100800, 907430400, 922550400, 938880000, 954000000, 967305600, 985449600, 1002384000, 1017504000, 1033833600, 1048953600, 1065283200, 1080403200, 1096732800, 1111852800, 1128182400, 1143907200, 1159632000, 1174752000, 1191686400, 1207411200, 1223136000, 1238860800, 1254585600, 1270310400 }
typeOffsets:intvector { 0, 0, 36000, 0, 36000, 3600, 39600, 0 }
- typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203" }
+ typeMap:bin { "01020100010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203" }
} //Z#226
/* Antarctica/Mawson */ :table {
trans:intvector { -501206400, 1255809600 }
@@ -1409,12 +1413,12 @@
links:intvector { 228, 231 }
} //Z#228
/* Antarctica/Palmer */ :table {
- trans:intvector { -157766400, -152658000, -132955200, -121122000, -101419200, -86821200, -71092800, -54766800, -39038400, -23317200, -7588800, 128142000, 136605600, 389070000, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 591768000, 605674800, 624427200, 637729200, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400, 1362884400, 1381636800 }
+ trans:intvector { -157766400, -152658000, -132955200, -121122000, -101419200, -86821200, -71092800, -54766800, -39038400, -23317200, -7588800, 128142000, 136605600, 389070000, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 591768000, 605674800, 624427200, 637729200, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400 }
typeOffsets:intvector { 0, 0, -14400, 0, -14400, 3600, -10800, 0, -10800, 3600 }
- typeMap:bin { "0201020102010201020103040301020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102" }
+ typeMap:bin { "020102010201020102010304030102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102" }
finalRule { "ChileAQ" }
finalRaw:int { -14400 }
- finalYear:int { 2014 }
+ finalYear:int { 2013 }
} //Z#229
/* Antarctica/Rothera */ :table {
trans:intvector { 218246400 }
@@ -1432,10 +1436,10 @@
typeOffsets:intvector { 0, 0, 21600, 0 }
typeMap:bin { "01" }
} //Z#233
- /* Arctic/Longyearbyen */ :int { 461 } //Z#234
+ /* Arctic/Longyearbyen */ :int { 464 } //Z#234
/* Asia/Aden */ :table {
- trans:intvector { -631162848 }
- typeOffsets:intvector { 10848, 0, 10800, 0 }
+ trans:intvector { -631162794 }
+ typeOffsets:intvector { 10794, 0, 10800, 0 }
typeMap:bin { "01" }
} //Z#235
/* Asia/Almaty */ :table {
@@ -1516,7 +1520,7 @@
typeOffsets:intvector { 27580, 0, 27000, 0, 28800, 0 }
typeMap:bin { "0102" }
} //Z#249
- /* Asia/Calcutta */ :int { 278 } //Z#250
+ /* Asia/Calcutta */ :int { 279 } //Z#250
/* Asia/Choibalsan */ :table {
trans:intvector { -2032933080, 252435600, 417974400, 433778400, 449593200, 465314400, 481042800, 496764000, 512492400, 528213600, 543942000, 559663200, 575391600, 591112800, 606841200, 622562400, 638290800, 654616800, 670345200, 686066400, 701794800, 717516000, 733244400, 748965600, 764694000, 780415200, 796143600, 811864800, 828198000, 843919200, 859647600, 875368800, 891097200, 906818400, 988390800, 1001692800, 1017421200, 1033142400, 1048870800, 1064592000, 1080320400, 1096041600, 1111770000, 1127491200, 1143219600, 1159545600, 1206889200 }
typeOffsets:intvector { 27480, 0, 25200, 0, 28800, 0, 32400, 0, 32400, 3600 }
@@ -1549,7 +1553,7 @@
trans:intvector { -891582800, -872058600, -862637400, -576138600, 1245430800, 1262278740 }
typeOffsets:intvector { 21700, 0, 19800, 0, 21200, 0, 21600, 0, 21600, 3600, 23400, 0 }
typeMap:bin { "02050105030403" }
- links:intvector { 255, 257, 363 }
+ links:intvector { 255, 257, 365 }
} //Z#257
/* Asia/Dili */ :table {
trans:intvector { -1830414140, -879152400, 199897200, 969120000 }
@@ -1568,9 +1572,12 @@
} //Z#260
/* Asia/Gaza */ :table {
transPre32:intvector { -1, 2109557424 }
- trans:intvector { -933645600, -857358000, -844300800, -825822000, -812685600, -794199600, -779853600, -762656400, -748310400, -731127600, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 482277600, 495579600, 516751200, 526424400, 545436000, 558478800, 576540000, 589237200, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1207000800, 1219957200, 1238104800, 1252018800, 1269640860, 1281474000, 1301738460, 1312146000, 1333058400, 1348178400 }
+ trans:intvector { -933645600, -857358000, -844300800, -825822000, -812685600, -794199600, -779853600, -762656400, -748310400, -731127600, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 482277600, 495579600, 516751200, 526424400, 545436000, 558478800, 576540000, 589237200, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1206655200, 1219957200, 1238104800, 1252015200, 1269640860, 1281474000, 1301608860, 1312146000, 1333058400, 1348178400 }
typeOffsets:intvector { 8272, 0, 7200, 0, 7200, 3600 }
typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
+ finalRule { "Palestine" }
+ finalRaw:int { 7200 }
+ finalYear:int { 2013 }
} //Z#261
/* Asia/Harbin */ :table {
trans:intvector { -1325492804, -1194078600, -946800000, -115894800, 325956600, 515520000, 527007600, 545155200, 558457200, 576604800, 589906800, 608659200, 621961200, 640108800, 653410800, 671558400, 684860400 }
@@ -1579,21 +1586,24 @@
} //Z#262
/* Asia/Hebron */ :table {
transPre32:intvector { -1, 2109557273 }
- trans:intvector { -933645600, -857358000, -844300800, -825822000, -812685600, -794199600, -779853600, -762656400, -748310400, -731127600, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 482277600, 495579600, 516751200, 526424400, 545436000, 558478800, 576540000, 589237200, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1207000800, 1220216400, 1238104800, 1252018800, 1269640860, 1281474000, 1301652060, 1312146000, 1314655200, 1317340800, 1333058400, 1348178400 }
+ trans:intvector { -933645600, -857358000, -844300800, -825822000, -812685600, -794199600, -779853600, -762656400, -748310400, -731127600, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 482277600, 495579600, 516751200, 526424400, 545436000, 558478800, 576540000, 589237200, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1206655200, 1220216400, 1238104800, 1252015200, 1269554400, 1281474000, 1301608860, 1312146000, 1314655200, 1317330000, 1333058400, 1348178400 }
typeOffsets:intvector { 8423, 0, 7200, 0, 7200, 3600 }
typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
+ finalRule { "Palestine" }
+ finalRaw:int { 7200 }
+ finalYear:int { 2013 }
} //Z#263
/* Asia/Ho_Chi_Minh */ :table {
trans:intvector { -2005974400, -1855983920, -1819954800, -1220428800 }
typeOffsets:intvector { 25600, 0, 25200, 0, 25580, 0, 28800, 0 }
typeMap:bin { "02010301" }
- links:intvector { 264, 304, 617 }
+ links:intvector { 264, 305, 620 }
} //Z#264
/* Asia/Hong_Kong */ :table {
- trans:intvector { -2056692996, -907389000, -891667800, -884246400, -766746000, -747981000, -728544600, -717049800, -694503000, -683785800, -668064600, -654755400, -636615000, -623305800, -605165400, -591856200, -573715800, -559801800, -542352600, -528352200, -510211800, -498112200, -478762200, -466662600, -446707800, -435213000, -415258200, -403158600, -383808600, -371709000, -352359000, -340259400, -320909400, -308809800, -288855000, -277360200, -257405400, -245910600, -225955800, -213856200, -194506200, -182406600, -163056600, -148537800, -132816600, -117088200, -101367000, -85638600, -69312600, -53584200, -37863000, -22134600, -6413400, 9315000, 25036200, 40764600, 56485800, 72214200, 88540200, 104268600, 119989800, 126041400, 151439400, 167167800, 182889000, 198617400, 214338600, 295385400, 309292200 }
- typeOffsets:intvector { 27396, 0, 28800, 0, 28800, 3600, 32400, 0 }
+ trans:intvector { -2056693002, -907389000, -891667800, -884246400, -766746000, -747981000, -728544600, -717049800, -694503000, -683785800, -668064600, -654755400, -636615000, -623305800, -605165400, -591856200, -573715800, -559801800, -542352600, -528352200, -510211800, -498112200, -478762200, -466662600, -446707800, -435213000, -415258200, -403158600, -383808600, -371709000, -352359000, -340259400, -320909400, -308809800, -288855000, -277360200, -257405400, -245910600, -225955800, -213856200, -194506200, -182406600, -163056600, -148537800, -132816600, -117088200, -101367000, -85638600, -69312600, -53584200, -37863000, -22134600, -6413400, 9315000, 25036200, 40764600, 56485800, 72214200, 88540200, 104268600, 119989800, 126041400, 151439400, 167167800, 182889000, 198617400, 214338600, 295385400, 309292200 }
+ typeOffsets:intvector { 27402, 0, 28800, 0, 28800, 3600, 32400, 0 }
typeMap:bin { "010201030102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
- links:intvector { 265, 496 }
+ links:intvector { 265, 499 }
} //Z#265
/* Asia/Hovd */ :table {
trans:intvector { -2032927596, 252439200, 417978000, 433785600, 449600400, 465321600, 481050000, 496771200, 512499600, 528220800, 543949200, 559670400, 575398800, 591120000, 606848400, 622569600, 638298000, 654624000, 670352400, 686073600, 701802000, 717523200, 733251600, 748972800, 764701200, 780422400, 796150800, 811872000, 828205200, 843926400, 859654800, 875376000, 891104400, 906825600, 988398000, 1001700000, 1017428400, 1033149600, 1048878000, 1064599200, 1080327600, 1096048800, 1111777200, 1127498400, 1143226800, 1159552800 }
@@ -1605,7 +1615,7 @@
typeOffsets:intvector { 25040, 0, 25200, 0, 25200, 3600, 28800, 0, 28800, 3600, 32400, 0 }
typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403040304030403040304030403040305" }
} //Z#267
- /* Asia/Istanbul */ :int { 446 } //Z#268
+ /* Asia/Istanbul */ :int { 449 } //Z#268
/* Asia/Jakarta */ :table {
trans:intvector { -1451719200, -1172906400, -876641400, -766054800, -683883000, -620812800, -189415800 }
typeOffsets:intvector { 25632, 0, 25200, 0, 26400, 0, 27000, 0, 28800, 0, 32400, 0 }
@@ -1624,7 +1634,7 @@
finalRule { "Zion" }
finalRaw:int { 7200 }
finalYear:int { 2029 }
- links:intvector { 271, 314, 512 }
+ links:intvector { 271, 315, 515 }
} //Z#271
/* Asia/Kabul */ :table {
transPre32:intvector { -1, 1770429088 }
@@ -1641,7 +1651,7 @@
trans:intvector { -1988166492, -862637400, -764145000, -576135000, 1018119660, 1033840860, 1212260400, 1225476000, 1239735600, 1257012000 }
typeOffsets:intvector { 16092, 0, 18000, 0, 18000, 3600, 19800, 0, 19800, 3600 }
typeMap:bin { "03040301020102010201" }
- links:intvector { 274, 533 }
+ links:intvector { 274, 536 }
} //Z#274
/* Asia/Kashgar */ :table {
trans:intvector { -1325480636, -946791000, 325969200, 515520000, 527007600, 545155200, 558457200, 576604800, 589906800, 608659200, 621961200, 640108800, 653410800, 671558400, 684860400 }
@@ -1655,63 +1665,68 @@
links:intvector { 276, 277 }
} //Z#276
/* Asia/Katmandu */ :int { 276 } //Z#277
+ /* Asia/Khandyga */ :table {
+ trans:intvector { -1579424533, -1247558400, 354898800, 370706400, 386434800, 402242400, 417970800, 433778400, 449593200, 465325200, 481050000, 496774800, 512499600, 528224400, 543949200, 559674000, 575398800, 591123600, 606848400, 622573200, 638298000, 654627600, 670352400, 686080800, 695757600, 701791200, 717512400, 733251600, 748976400, 764701200, 780426000, 796150800, 811875600, 828205200, 846349200, 859654800, 877798800, 891104400, 909248400, 922554000, 941302800, 954003600, 972752400, 985453200, 1004202000, 1017507600, 1035651600, 1048957200, 1067101200, 1072882800, 1080403200, 1099152000, 1111852800, 1130601600, 1143302400, 1162051200, 1174752000, 1193500800, 1206806400, 1224950400, 1238256000, 1256400000, 1269705600, 1288454400, 1301155200, 1315832400 }
+ typeOffsets:intvector { 32533, 0, 28800, 0, 28800, 3600, 32400, 0, 32400, 3600, 36000, 0, 36000, 3600, 39600, 0 }
+ typeMap:bin { "010304030403040304030403040304030403040304030201030403040304030403040304030403040304030403040304030506050605060506050605060506050705" }
+ } //Z#278
/* Asia/Kolkata */ :table {
transPre32:intvector { -1, 1454805288 }
trans:intvector { -891582800, -872058600, -862637400, -764145000 }
typeOffsets:intvector { 21208, 0, 19800, 0, 19800, 3600, 21200, 0, 23400, 0 }
typeMap:bin { "0304010201" }
- links:intvector { 250, 278, 498 }
- } //Z#278
+ links:intvector { 250, 279, 501 }
+ } //Z#279
/* Asia/Krasnoyarsk */ :table {
trans:intvector { -1577513480, -1247551200, 354906000, 370713600, 386442000, 402249600, 417978000, 433785600, 449600400, 465332400, 481057200, 496782000, 512506800, 528231600, 543956400, 559681200, 575406000, 591130800, 606855600, 622580400, 638305200, 654634800, 670359600, 686088000, 695764800, 701798400, 717519600, 733258800, 748983600, 764708400, 780433200, 796158000, 811882800, 828212400, 846356400, 859662000, 877806000, 891111600, 909255600, 922561200, 941310000, 954010800, 972759600, 985460400, 1004209200, 1017514800, 1035658800, 1048964400, 1067108400, 1080414000, 1099162800, 1111863600, 1130612400, 1143313200, 1162062000, 1174762800, 1193511600, 1206817200, 1224961200, 1238266800, 1256410800, 1269716400, 1288465200, 1301166000 }
typeOffsets:intvector { 22280, 0, 21600, 0, 21600, 3600, 25200, 0, 25200, 3600, 28800, 0 }
typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403040304030403040304030403040305" }
- } //Z#279
+ } //Z#280
/* Asia/Kuala_Lumpur */ :table {
transPre32:intvector { -1, 2117490090 }
trans:intvector { -2038200925, -1167634800, -1073028000, -894180000, -879665400, -767005200, 378664200 }
typeOffsets:intvector { 24406, 0, 24925, 0, 25200, 0, 25200, 1200, 26400, 0, 27000, 0, 28800, 0, 32400, 0 }
typeMap:bin { "0102030405070506" }
- } //Z#280
+ } //Z#281
/* Asia/Kuching */ :table {
trans:intvector { -1383463280, -1167636600, -1082448000, -1074586800, -1050825600, -1042964400, -1019289600, -1011428400, -987753600, -979892400, -956217600, -948356400, -924595200, -916734000, -893059200, -885198000, -879667200, -767005200 }
typeOffsets:intvector { 26480, 0, 27000, 0, 28800, 0, 28800, 1200, 32400, 0 }
typeMap:bin { "010203020302030203020302030203020402" }
- } //Z#281
+ } //Z#282
/* Asia/Kuwait */ :table {
trans:intvector { -631163516 }
typeOffsets:intvector { 11516, 0, 10800, 0 }
typeMap:bin { "01" }
- } //Z#282
- /* Asia/Macao */ :int { 284 } //Z#283
+ } //Z#283
+ /* Asia/Macao */ :int { 285 } //Z#284
/* Asia/Macau */ :table {
trans:intvector { -1830411260, -277360200, -257405400, -245910600, -225955800, -214473600, -194506200, -182406600, -163056600, -150969600, -131619600, -117088200, -101367000, -85638600, -69312600, -53584200, -37863000, -22134600, -6413400, 9315000, 25036200, 40764600, 56485800, 72201600, 87922800, 103651200, 119977200, 135705600, 151439400, 167167800, 182889000, 198617400, 214338600, 230067000, 245788200, 261504000, 277225200, 292953600, 309279600, 325008000, 340729200 }
typeOffsets:intvector { 27260, 0, 28800, 0, 28800, 3600 }
typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
- links:intvector { 283, 284 }
- } //Z#284
+ links:intvector { 284, 285 }
+ } //Z#285
/* Asia/Magadan */ :table {
trans:intvector { -1441188192, -1247565600, 354891600, 370699200, 386427600, 402235200, 417963600, 433771200, 449586000, 465318000, 481042800, 496767600, 512492400, 528217200, 543942000, 559666800, 575391600, 591116400, 606841200, 622566000, 638290800, 654620400, 670345200, 686073600, 695750400, 701784000, 717505200, 733244400, 748969200, 764694000, 780418800, 796143600, 811868400, 828198000, 846342000, 859647600, 877791600, 891097200, 909241200, 922546800, 941295600, 953996400, 972745200, 985446000, 1004194800, 1017500400, 1035644400, 1048950000, 1067094000, 1080399600, 1099148400, 1111849200, 1130598000, 1143298800, 1162047600, 1174748400, 1193497200, 1206802800, 1224946800, 1238252400, 1256396400, 1269702000, 1288450800, 1301151600 }
typeOffsets:intvector { 36192, 0, 36000, 0, 36000, 3600, 39600, 0, 39600, 3600, 43200, 0 }
typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403040304030403040304030403040305" }
- } //Z#285
+ } //Z#286
/* Asia/Makassar */ :table {
trans:intvector { -1172908656, -880272000, -766054800 }
typeOffsets:intvector { 28656, 0, 28800, 0, 32400, 0 }
typeMap:bin { "010201" }
- links:intvector { 286, 318 }
- } //Z#286
+ links:intvector { 287, 319 }
+ } //Z#287
/* Asia/Manila */ :table {
transPre32:intvector { -1, 350346256, -1, 2065645456 }
trans:intvector { -1046678400, -1038733200, -873273600, -794221200, -496224000, -489315600, 259344000, 275151600 }
typeOffsets:intvector { -57360, 0, 28800, 0, 28800, 3600, 29040, 0, 32400, 0 }
typeMap:bin { "03010201040102010201" }
- } //Z#287
- /* Asia/Muscat */ :table {
- trans:intvector { -1577937260 }
- typeOffsets:intvector { 14060, 0, 14400, 0 }
- typeMap:bin { "01" }
} //Z#288
+ /* Asia/Muscat */ :table {
+ trans:intvector { -1577937264 }
+ typeOffsets:intvector { 14064, 0, 14400, 0 }
+ typeMap:bin { "01" }
+ } //Z#289
/* Asia/Nicosia */ :table {
trans:intvector { -1518920008, 166572000, 182293200, 200959200, 213829200, 228866400, 243982800, 260316000, 276123600, 291765600, 307486800, 323820000, 338936400, 354664800, 370386000, 386114400, 401835600, 417564000, 433285200, 449013600, 465339600, 481068000, 496789200, 512517600, 528238800, 543967200, 559688400, 575416800, 591138000, 606866400, 622587600, 638316000, 654642000, 670370400, 686091600, 701820000, 717541200, 733269600, 748990800, 764719200, 780440400, 796168800, 811890000, 828223200, 843944400, 859672800, 875394000, 891122400, 909277200, 922582800, 941331600 }
typeOffsets:intvector { 8008, 0, 7200, 0, 7200, 3600 }
@@ -1719,190 +1734,194 @@
finalRule { "EUAsia" }
finalRaw:int { 7200 }
finalYear:int { 2000 }
- links:intvector { 289, 460 }
- } //Z#289
+ links:intvector { 290, 463 }
+ } //Z#290
/* Asia/Novokuznetsk */ :table {
trans:intvector { -1577512128, -1247551200, 354906000, 370713600, 386442000, 402249600, 417978000, 433785600, 449600400, 465332400, 481057200, 496782000, 512506800, 528231600, 543956400, 559681200, 575406000, 591130800, 606855600, 622580400, 638305200, 654634800, 670359600, 686088000, 695764800, 701798400, 717519600, 733258800, 748983600, 764708400, 780433200, 796158000, 811882800, 828212400, 846356400, 859662000, 877806000, 891111600, 909255600, 922561200, 941310000, 954010800, 972759600, 985460400, 1004209200, 1017514800, 1035658800, 1048964400, 1067108400, 1080414000, 1099162800, 1111863600, 1130612400, 1143313200, 1162062000, 1174762800, 1193511600, 1206817200, 1224961200, 1238266800, 1256410800, 1269716400, 1288468800, 1301169600 }
typeOffsets:intvector { 20928, 0, 21600, 0, 21600, 3600, 25200, 0, 25200, 3600 }
typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403040304030403040304030403020103" }
- } //Z#290
+ } //Z#291
/* Asia/Novosibirsk */ :table {
trans:intvector { -1579476700, -1247551200, 354906000, 370713600, 386442000, 402249600, 417978000, 433785600, 449600400, 465332400, 481057200, 496782000, 512506800, 528231600, 543956400, 559681200, 575406000, 591130800, 606855600, 622580400, 638305200, 654634800, 670359600, 686088000, 695764800, 701798400, 717519600, 733258800, 738086400, 748987200, 764712000, 780436800, 796161600, 811886400, 828216000, 846360000, 859665600, 877809600, 891115200, 909259200, 922564800, 941313600, 954014400, 972763200, 985464000, 1004212800, 1017518400, 1035662400, 1048968000, 1067112000, 1080417600, 1099166400, 1111867200, 1130616000, 1143316800, 1162065600, 1174766400, 1193515200, 1206820800, 1224964800, 1238270400, 1256414400, 1269720000, 1288468800, 1301169600 }
typeOffsets:intvector { 19900, 0, 21600, 0, 21600, 3600, 25200, 0, 25200, 3600 }
typeMap:bin { "0103040304030403040304030403040304030403040302010304030402010201020102010201020102010201020102010201020102010201020102010201020103" }
- } //Z#291
+ } //Z#292
/* Asia/Omsk */ :table {
trans:intvector { -1582088016, -1247547600, 354909600, 370717200, 386445600, 402253200, 417981600, 433789200, 449604000, 465336000, 481060800, 496785600, 512510400, 528235200, 543960000, 559684800, 575409600, 591134400, 606859200, 622584000, 638308800, 654638400, 670363200, 686091600, 695768400, 701802000, 717523200, 733262400, 748987200, 764712000, 780436800, 796161600, 811886400, 828216000, 846360000, 859665600, 877809600, 891115200, 909259200, 922564800, 941313600, 954014400, 972763200, 985464000, 1004212800, 1017518400, 1035662400, 1048968000, 1067112000, 1080417600, 1099166400, 1111867200, 1130616000, 1143316800, 1162065600, 1174766400, 1193515200, 1206820800, 1224964800, 1238270400, 1256414400, 1269720000, 1288468800, 1301169600 }
typeOffsets:intvector { 17616, 0, 18000, 0, 18000, 3600, 21600, 0, 21600, 3600, 25200, 0 }
typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403040304030403040304030403040305" }
- } //Z#292
+ } //Z#293
/* Asia/Oral */ :table {
trans:intvector { -1441164324, -1247544000, 354913200, 370720800, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622591200, 638316000, 654645600, 701809200, 717530400, 733269600, 748994400, 764719200, 780444000, 796168800, 811893600, 828223200, 846367200, 859672800, 877816800, 891122400, 909266400, 922572000, 941320800, 954021600, 972770400, 985471200, 1004220000, 1017525600, 1035669600, 1048975200, 1067119200, 1080424800, 1099173600, 1110830400 }
typeOffsets:intvector { 12324, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 }
typeMap:bin { "01030405040304030403040304030403040302010201020102010201020102010201020102010201020102010201020103" }
- } //Z#293
+ } //Z#294
/* Asia/Phnom_Penh */ :table {
trans:intvector { -2005973980, -1855983920, -1819954800, -1220428800 }
typeOffsets:intvector { 25180, 0, 25200, 0, 25580, 0, 28800, 0 }
typeMap:bin { "02010301" }
- } //Z#294
+ } //Z#295
/* Asia/Pontianak */ :table {
trans:intvector { -1172906240, -881220600, -766054800, -683883000, -620812800, -189415800, 567964800 }
typeOffsets:intvector { 26240, 0, 25200, 0, 27000, 0, 28800, 0, 32400, 0 }
typeMap:bin { "02040203020301" }
- } //Z#295
+ } //Z#296
/* Asia/Pyongyang */ :table {
transPre32:intvector { -1, 1770415516 }
trans:intvector { -2053931400, -1325494800, -1199262600, -498128400, -264931200 }
typeOffsets:intvector { 30180, 0, 28800, 0, 30600, 0, 32400, 0 }
typeMap:bin { "020302030103" }
- } //Z#296
+ } //Z#297
/* Asia/Qatar */ :table {
trans:intvector { -1577935568, 76190400 }
typeOffsets:intvector { 12368, 0, 10800, 0, 14400, 0 }
typeMap:bin { "0201" }
- } //Z#297
+ } //Z#298
/* Asia/Qyzylorda */ :table {
trans:intvector { -1441167712, -1247544000, 354913200, 370720800, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 695768400, 701802000, 717523200, 733262400, 748987200, 764712000, 780436800, 796161600, 811886400, 828216000, 846360000, 859665600, 877809600, 891115200, 909259200, 922564800, 941313600, 954014400, 972763200, 985464000, 1004212800, 1017518400, 1035662400, 1048968000, 1067112000, 1080417600, 1099166400 }
typeOffsets:intvector { 15712, 0, 14400, 0, 18000, 0, 18000, 3600, 21600, 0, 21600, 3600 }
typeMap:bin { "01020304030203020302030203020302030203020302040504050405040504050405040504050405040504050405040504" }
- } //Z#298
- /* Asia/Rangoon */ :table {
- transPre32:intvector { -1, 1454803416 }
- trans:intvector { -1577946276, -873268200, -778410000 }
- typeOffsets:intvector { 23080, 0, 23076, 0, 23400, 0, 32400, 0 }
- typeMap:bin { "01020302" }
} //Z#299
+ /* Asia/Rangoon */ :table {
+ trans:intvector { -1577946280, -873268200, -778410000 }
+ typeOffsets:intvector { 23080, 0, 23400, 0, 32400, 0 }
+ typeMap:bin { "010201" }
+ } //Z#300
/* Asia/Riyadh */ :table {
trans:intvector { -631163212 }
typeOffsets:intvector { 11212, 0, 10800, 0 }
typeMap:bin { "01" }
- } //Z#300
+ } //Z#301
/* Asia/Riyadh87 */ :table {
trans:intvector { 536489776, 536576206, 536662631, 536749061, 536835486, 536921916, 537008341, 537094766, 537181191, 537267616, 537354041, 537440466, 537526886, 537613311, 537699731, 537786151, 537872571, 537958991, 538045411, 538131831, 538218246, 538304666, 538391081, 538477496, 538563911, 538650326, 538736736, 538823151, 538909561, 538995971, 539082381, 539168791, 539255196, 539341606, 539428011, 539514416, 539600821, 539687226, 539860031, 540378426, 540551221, 540637616, 540724011, 540810406, 540896801, 540983191, 541069586, 541155976, 541242366, 541328756, 541415146, 541501536, 541587926, 541674316, 541760701, 541847091, 541933476, 542019861, 542106251, 542192636, 542279021, 542365406, 542451791, 542538171, 542624556, 542710941, 542797326, 542883706, 542970091, 543056471, 543142856, 543229236, 543315621, 543402001, 543488386, 543574766, 543661146, 543747531, 543833911, 543920291, 544006676, 544093056, 544179441, 544265821, 544352201, 544438586, 544524966, 544611351, 544697731, 544784116, 544870501, 544956881, 545043266, 545129651, 545216031, 545302416, 545388801, 545475186, 545561571, 545647961, 545734346, 545820731, 545907121, 545993506, 546079896, 546166281, 546252671, 546339061, 546425451, 546511841, 546598231, 546684621, 546771011, 546857406, 546943796, 547030191, 547116586, 547202981, 547289376, 547375771, 547462166, 547548561, 547721356, 548412561, 548585366, 548671771, 548758176, 548844581, 548930986, 549017391, 549103796, 549190206, 549276611, 549363021, 549449426, 549535836, 549622246, 549708656, 549795066, 549881476, 549967886, 550054296, 550140706, 550227121, 550313531, 550399946, 550486356, 550572766, 550659181, 550745591, 550832006, 550918421, 551004831, 551091246, 551177656, 551264071, 551350486, 551436896, 551523311, 551609721, 551696136, 551782546, 551868961, 551955371, 552041786, 552128196, 552214606, 552301021, 552387431, 552473841, 552560251, 552646661, 552733071, 552819481, 552905891, 552992296, 553078706, 553165116, 553251521, 553337926, 553424336, 553510741, 553597146, 553683551, 553856356, 553942761, 554201966, 554547561, 554806756, 554893151, 554979546, 555065941, 555152336, 555238731, 555325126, 555411516, 555497911, 555584301, 555670691, 555757081, 555843471, 555929861, 556016251, 556102641, 556189026, 556275416, 556361801, 556448186, 556534571, 556620956, 556707341, 556793726, 556880111, 556966496, 557052876, 557139261, 557225641, 557312026, 557398406, 557484786, 557571166, 557657551, 557743931, 557830311, 557916691, 558003071, 558089451, 558175826, 558262206, 558348586, 558434966, 558521346, 558607721, 558694101, 558780481, 558866861, 558953236, 559039616, 559125996, 559212371, 559298751, 559385131, 559471511, 559557891, 559644271, 559730646, 559817026, 559903406, 559989786, 560076166, 560162551, 560248931, 560335311, 560421691, 560508076, 560594456, 560680841, 560767221, 560853606, 560939991, 561026376, 561112761, 561199146, 561285531, 561371921, 561458306, 561544696, 561631081, 561717471, 561803861, 561890251, 561976641, 562063036, 562149426, 562235821, 562322211, 562408606, 562495001, 562667796, 562840591, 563186196, 563359001, 563445406, 563531811, 563618216, 563704621, 563791031, 563877436, 563963846, 564050256, 564136666, 564223081, 564309491, 564395906, 564482321, 564568736, 564655151, 564741566, 564827986, 564914406, 565000821, 565087241, 565173661, 565260086, 565346506, 565432926, 565519351, 565605776, 565692201, 565778626, 565865051, 565951476, 566037901, 566124326, 566210756, 566297181, 566383611, 566470041, 566556466, 566642896, 566729326, 566815756, 566902186, 566988616, 567075046, 567161476, 567247906, 567334336, 567420766, 567507196, 567593621, 567680051, 567766481, 567852911, 567939341, 567982541 }
typeOffsets:intvector { 11224, 0, 11224, -855, 11224, -850, 11224, -845, 11224, -840, 11224, -835, 11224, -830, 11224, -825, 11224, -820, 11224, -815, 11224, -810, 11224, -805, 11224, -800, 11224, -795, 11224, -790, 11224, -785, 11224, -780, 11224, -775, 11224, -770, 11224, -760, 11224, -750, 11224, -740, 11224, -735, 11224, -725, 11224, -720, 11224, -715, 11224, -705, 11224, -700, 11224, -690, 11224, -685, 11224, -675, 11224, -670, 11224, -660, 11224, -655, 11224, -645, 11224, -635, 11224, -630, 11224, -615, 11224, -595, 11224, -580, 11224, -575, 11224, -565, 11224, -555, 11224, -550, 11224, -535, 11224, -530, 11224, -515, 11224, -510, 11224, -495, 11224, -490, 11224, -480, 11224, -465, 11224, -460, 11224, -445, 11224, -440, 11224, -425, 11224, -415, 11224, -410, 11224, -390, 11224, -385, 11224, -380, 11224, -375, 11224, -370, 11224, -365, 11224, -360, 11224, -355, 11224, -350, 11224, -345, 11224, -340, 11224, -335, 11224, -330, 11224, -325, 11224, -320, 11224, -315, 11224, -310, 11224, -305, 11224, -300, 11224, -295, 11224, -285, 11224, -280, 11224, -275, 11224, -265, 11224, -255, 11224, -250, 11224, -245, 11224, -240, 11224, -230, 11224, -225, 11224, -220, 11224, -210, 11224, -200, 11224, -195, 11224, -190, 11224, -185, 11224, -180, 11224, -175, 11224, -170, 11224, -165, 11224, -160, 11224, -155, 11224, -150, 11224, -145, 11224, -140, 11224, -135, 11224, -125, 11224, -120, 11224, -110, 11224, -105, 11224, -100, 11224, -95, 11224, -90, 11224, -85, 11224, -80, 11224, -75, 11224, -70, 11224, -65, 11224, -55, 11224, -50, 11224, -45, 11224, -40, 11224, -30, 11224, -25, 11224, -20, 11224, -15, 11224, -10, 11224, -5, 11224, 5, 11224, 10, 11224, 15, 11224, 20, 11224, 25, 11224, 30, 11224, 40, 11224, 45, 11224, 55, 11224, 65, 11224, 70, 11224, 80, 11224, 85, 11224, 90, 11224, 95, 11224, 100, 11224, 105, 11224, 110, 11224, 115, 11224, 120, 11224, 125, 11224, 130, 11224, 135, 11224, 140, 11224, 145, 11224, 150, 11224, 155, 11224, 160, 11224, 165, 11224, 170, 11224, 180, 11224, 185, 11224, 190, 11224, 195, 11224, 200, 11224, 205, 11224, 210, 11224, 215, 11224, 220, 11224, 230, 11224, 250, 11224, 255, 11224, 275, 11224, 280, 11224, 295, 11224, 310, 11224, 315, 11224, 335, 11224, 340, 11224, 360, 11224, 365, 11224, 380, 11224, 395, 11224, 405, 11224, 420, 11224, 425, 11224, 445, 11224, 450, 11224, 465, 11224, 475, 11224, 485, 11224, 500, 11224, 505, 11224, 525, 11224, 530, 11224, 550, 11224, 570, 11224, 575, 11224, 590, 11224, 600, 11224, 610, 11224, 625, 11224, 645, 11224, 650, 11224, 665, 11224, 670, 11224, 685, 11224, 690, 11224, 700, 11224, 715, 11224, 720, 11224, 735, 11224, 755, 11224, 770, 11224, 785, 11224, 790, 11224, 800, 11224, 810, 11224, 815, 11224, 825, 11224, 830, 11224, 840, 11224, 845, 11224, 855, 11224, 870, 11224, 880, 11224, 885, 11224, 895, 11224, 905, 11224, 910, 11224, 915, 11224, 920, 11224, 925, 11224, 930, 11224, 935, 11224, 940, 11224, 945, 11224, 950, 11224, 955, 11224, 960, 11224, 965, 11224, 970, 11224, 975, 11224, 980, 11224, 985 }
typeMap:bin { "5a56524e4a443f3a383633312f2c2a28262523211f1c1a18161413110f0d0b0908060504030201020304050607090a0c0e101213141517191b1d1e202224252627292b2d2e3032343537393a3e4145494c4f515457595c5f6366686b6e717477797c7e8083858688898c8e90929496989a9b9c9d9e9fa0a1a2a3a4a3a2a1a09f9e9d9c9b9a98979593918f8d8b8988868583817f7d7b78767472706d6a69676562605d5b595856545251504e4d4b494846444342403f3e3d3c3b3a3b3c3d3e3f404142444547494b4d4e5051535557595b5e616467696c6f7375787c7f8285878a8e92979b9ea2a5a7a8aaacaeafb1b3b5b6b8babcbebfc0c2c4c5c6c8cacccecfd0d1d2d4d6d8dadbdcdddfe0e2e4e6e7e9eaecedeeeff0efeeedecebeae8e7e5e3e1dfdedcdbd9d7d5d3d1d0cfcdcbc9c7c5c3c1bfbdbbb9b7b4b2b0adaba9a6a49e99938d88847f7a76716b676100" }
- links:intvector { 301, 525 }
- } //Z#301
+ links:intvector { 302, 528 }
+ } //Z#302
/* Asia/Riyadh88 */ :table {
trans:intvector { 568025771, 568112196, 568198626, 568285056, 568371481, 568457906, 568544336, 568630761, 568717186, 568803611, 568890036, 568976461, 569062881, 569149306, 569235726, 569322146, 569408566, 569494986, 569581406, 569667826, 569754241, 569840661, 569927076, 570013491, 570099906, 570186321, 570272736, 570359146, 570445556, 570531966, 570618376, 570704786, 570791196, 570877601, 570964011, 571050416, 571136821, 571223226, 571396031, 571914426, 572087221, 572173616, 572260011, 572346406, 572432801, 572519196, 572605586, 572691976, 572778371, 572864761, 572951151, 573037541, 573123926, 573210316, 573296706, 573383091, 573469481, 573555866, 573642251, 573728636, 573815021, 573901406, 573987791, 574074176, 574160561, 574246946, 574333326, 574419711, 574506096, 574592476, 574678861, 574765241, 574851626, 574938006, 575024386, 575110771, 575197151, 575283536, 575369916, 575456296, 575542681, 575629061, 575715441, 575801826, 575888206, 575974591, 576060971, 576147356, 576233736, 576320121, 576406501, 576492886, 576579271, 576665651, 576752036, 576838421, 576924806, 577011191, 577097576, 577183961, 577270346, 577356736, 577443121, 577529511, 577615896, 577702286, 577788671, 577875061, 577961451, 578047841, 578134231, 578220626, 578307016, 578393406, 578479801, 578566191, 578652586, 578738981, 578825376, 578911771, 578998166, 579084561, 579257356, 579948561, 580121366, 580207771, 580294176, 580380581, 580466986, 580553391, 580639796, 580726201, 580812611, 580899016, 580985426, 581071836, 581158246, 581244651, 581331061, 581417471, 581503886, 581590296, 581676706, 581763116, 581849531, 581935941, 582022351, 582108766, 582195176, 582281591, 582368001, 582454416, 582540831, 582627241, 582713656, 582800066, 582886481, 582972896, 583059306, 583145721, 583232131, 583318546, 583404956, 583491371, 583577781, 583664196, 583750606, 583837016, 583923426, 584009841, 584096251, 584182661, 584269071, 584355481, 584441886, 584528296, 584614706, 584701111, 584787521, 584873926, 584960331, 585046736, 585133141, 585219546, 585305951, 585392356, 585478761, 585737966, 586169961, 586342756, 586429151, 586601946, 586688341, 586774731, 586861126, 586947521, 587033911, 587120301, 587206696, 587293086, 587379476, 587465866, 587552251, 587638641, 587725031, 587811416, 587897806, 587984191, 588070576, 588156961, 588243346, 588329731, 588416116, 588502496, 588588881, 588675266, 588761646, 588848026, 588934411, 589020791, 589107171, 589193551, 589279936, 589366316, 589452696, 589539076, 589625456, 589711831, 589798211, 589884591, 589970971, 590057351, 590143726, 590230106, 590316486, 590402866, 590489241, 590575621, 590662001, 590748381, 590834756, 590921136, 591007516, 591093896, 591180276, 591266651, 591353031, 591439411, 591525791, 591612171, 591698551, 591784936, 591871316, 591957696, 592044081, 592130461, 592216846, 592303226, 592389611, 592475996, 592562381, 592648766, 592735151, 592821536, 592907921, 592994311, 593080696, 593167086, 593253476, 593339861, 593426256, 593512646, 593599036, 593685426, 593771821, 593858216, 593944611, 594031006, 594117401, 594203796, 594376591, 594722196, 594895001, 595067806, 595154216, 595240621, 595327026, 595413436, 595499846, 595586256, 595672666, 595759076, 595845491, 595931901, 596018316, 596104731, 596191146, 596277566, 596363981, 596450401, 596536816, 596623236, 596709656, 596796081, 596882501, 596968921, 597055346, 597141771, 597228191, 597314616, 597401041, 597487471, 597573896, 597660321, 597746751, 597833176, 597919606, 598006031, 598092461, 598178891, 598265321, 598351751, 598438176, 598524606, 598611036, 598697466, 598783896, 598870326, 598956756, 599043186, 599129616, 599216046, 599302476, 599388906, 599475331, 599561761, 599604961 }
typeOffsets:intvector { 11224, 0, 11224, -855, 11224, -850, 11224, -845, 11224, -840, 11224, -835, 11224, -830, 11224, -825, 11224, -820, 11224, -810, 11224, -800, 11224, -795, 11224, -790, 11224, -785, 11224, -780, 11224, -775, 11224, -770, 11224, -765, 11224, -760, 11224, -750, 11224, -745, 11224, -740, 11224, -730, 11224, -715, 11224, -705, 11224, -700, 11224, -690, 11224, -685, 11224, -675, 11224, -665, 11224, -660, 11224, -650, 11224, -645, 11224, -630, 11224, -615, 11224, -610, 11224, -600, 11224, -590, 11224, -585, 11224, -570, 11224, -550, 11224, -535, 11224, -530, 11224, -520, 11224, -505, 11224, -500, 11224, -485, 11224, -465, 11224, -460, 11224, -450, 11224, -435, 11224, -430, 11224, -410, 11224, -395, 11224, -390, 11224, -385, 11224, -380, 11224, -375, 11224, -370, 11224, -365, 11224, -360, 11224, -355, 11224, -350, 11224, -345, 11224, -340, 11224, -335, 11224, -330, 11224, -325, 11224, -320, 11224, -310, 11224, -305, 11224, -300, 11224, -295, 11224, -290, 11224, -285, 11224, -280, 11224, -275, 11224, -265, 11224, -255, 11224, -250, 11224, -240, 11224, -230, 11224, -220, 11224, -215, 11224, -205, 11224, -200, 11224, -195, 11224, -185, 11224, -180, 11224, -170, 11224, -160, 11224, -155, 11224, -145, 11224, -140, 11224, -130, 11224, -125, 11224, -120, 11224, -110, 11224, -105, 11224, -100, 11224, -95, 11224, -90, 11224, -80, 11224, -75, 11224, -70, 11224, -65, 11224, -60, 11224, -55, 11224, -50, 11224, -45, 11224, -40, 11224, -35, 11224, -30, 11224, -25, 11224, -15, 11224, -10, 11224, 5, 11224, 10, 11224, 15, 11224, 20, 11224, 25, 11224, 30, 11224, 35, 11224, 40, 11224, 45, 11224, 50, 11224, 55, 11224, 60, 11224, 65, 11224, 70, 11224, 80, 11224, 90, 11224, 100, 11224, 105, 11224, 110, 11224, 115, 11224, 120, 11224, 125, 11224, 130, 11224, 135, 11224, 140, 11224, 145, 11224, 150, 11224, 160, 11224, 165, 11224, 170, 11224, 175, 11224, 180, 11224, 185, 11224, 190, 11224, 195, 11224, 200, 11224, 205, 11224, 210, 11224, 215, 11224, 220, 11224, 225, 11224, 250, 11224, 255, 11224, 270, 11224, 285, 11224, 290, 11224, 310, 11224, 315, 11224, 335, 11224, 345, 11224, 355, 11224, 370, 11224, 375, 11224, 395, 11224, 400, 11224, 420, 11224, 425, 11224, 440, 11224, 455, 11224, 460, 11224, 480, 11224, 500, 11224, 505, 11224, 525, 11224, 535, 11224, 545, 11224, 560, 11224, 565, 11224, 585, 11224, 605, 11224, 625, 11224, 630, 11224, 640, 11224, 655, 11224, 660, 11224, 675, 11224, 680, 11224, 695, 11224, 715, 11224, 720, 11224, 730, 11224, 740, 11224, 750, 11224, 760, 11224, 765, 11224, 775, 11224, 780, 11224, 795, 11224, 810, 11224, 825, 11224, 830, 11224, 840, 11224, 845, 11224, 855, 11224, 860, 11224, 865, 11224, 875, 11224, 880, 11224, 885, 11224, 890, 11224, 900, 11224, 910, 11224, 915, 11224, 920, 11224, 930, 11224, 940, 11224, 950, 11224, 955, 11224, 960, 11224, 965, 11224, 970, 11224, 975, 11224, 980, 11224, 985 }
typeMap:bin { "56524f4b46423c373432302e2c2a28272523211f1d1b1917161412100e0c0a090807050403020102030405060708090a0b0d0f1113151617181a1c1e20212224262728292b2d2e2f31333435393c4044464a4d4f515356585a5c5f6164676a6d70720076797b7e8082838587898b8d8e8f91929495969798999a9b9a9998979695949392908f8e8c8a8987858382817f7c7a78750072716e6b69666562605e5c5b595856545251504f4d4c4a4846454442413f3e3d3c3b3a393837363738393a3b3d3e3f4143444547494c4d4e5051535557595b5d606265686c6f7274787b7f8284888d9094989c9d9fa1a2a4a6a8a9abadafb0b1b3b5b7b8b9babcbec0c1c2c4c6c8cacbcccdcfd1d3d5d7d8dadbdcdddedfe0e1e2e3e4e5e4e3e2e0dfdedddcdbd9d8d6d4d2d0cecccbc9c7c5c3c1bfbdbbb9b8b6b4b2b0aeacaaa7a5a3a09e9c97918c86827d77736e68635e5b5700" }
- links:intvector { 302, 526 }
- } //Z#302
+ links:intvector { 303, 529 }
+ } //Z#303
/* Asia/Riyadh89 */ :table {
trans:intvector { 599648191, 599734621, 599821046, 599907476, 599993901, 600080326, 600166751, 600253181, 600339606, 600426031, 600512451, 600598876, 600685301, 600771721, 600858141, 600944561, 601030981, 601117401, 601203821, 601290241, 601376656, 601463071, 601549491, 601635906, 601722316, 601808731, 601895146, 601981556, 602067966, 602154376, 602240786, 602327196, 602413601, 602500011, 602586416, 602672821, 602759226, 602932031, 603104836, 603364031, 603536826, 603709621, 603796016, 603882411, 603968806, 604055196, 604141591, 604227981, 604314371, 604400761, 604487151, 604573541, 604659931, 604746321, 604832706, 604919096, 605005481, 605091871, 605178256, 605264641, 605351026, 605437411, 605523796, 605610181, 605696566, 605782946, 605869331, 605955716, 606042096, 606128481, 606214861, 606301246, 606387626, 606474011, 606560391, 606646771, 606733156, 606819536, 606905916, 606992301, 607078681, 607165066, 607251446, 607337826, 607424211, 607510591, 607596976, 607683356, 607769741, 607856121, 607942506, 608028886, 608115271, 608201656, 608288041, 608374426, 608460811, 608547196, 608633581, 608719966, 608806351, 608892736, 608979126, 609065511, 609151901, 609238286, 609324676, 609411066, 609497456, 609583846, 609670236, 609756626, 609843016, 609929411, 610015801, 610102196, 610188586, 610274981, 610361376, 610447771, 610534166, 610706961, 610879756, 611484561, 611657366, 611743771, 611916576, 612002981, 612089391, 612175796, 612262201, 612348611, 612435016, 612521426, 612607831, 612694241, 612780651, 612867061, 612953471, 613039881, 613126291, 613212701, 613299116, 613385526, 613471936, 613558351, 613644761, 613731176, 613817586, 613904001, 613990411, 614076826, 614163241, 614249651, 614336066, 614422476, 614508891, 614595306, 614681716, 614768131, 614854541, 614940956, 615027366, 615113781, 615200191, 615286601, 615373016, 615459426, 615545836, 615632246, 615718656, 615805066, 615891476, 615977886, 616064296, 616150701, 616237111, 616323516, 616409926, 616496331, 616582736, 616669141, 616755546, 616841951, 616928356, 617101161, 617273966, 617705961, 617878756, 618051551, 618137946, 618224341, 618310736, 618397126, 618483521, 618569911, 618656306, 618742696, 618829086, 618915476, 619001866, 619088256, 619174646, 619261031, 619347421, 619433806, 619520191, 619606581, 619692966, 619779351, 619865736, 619952116, 620038501, 620124886, 620211266, 620297651, 620384031, 620470416, 620556796, 620643176, 620729561, 620815941, 620902321, 620988701, 621075081, 621161461, 621247841, 621334216, 621420596, 621506976, 621593356, 621679736, 621766111, 621852491, 621938871, 622025251, 622111626, 622198006, 622284386, 622370766, 622457141, 622543521, 622629901, 622716281, 622802661, 622889041, 622975416, 623061796, 623148176, 623234561, 623320941, 623407321, 623493701, 623580086, 623666466, 623752846, 623839231, 623925616, 624011996, 624098381, 624184766, 624271151, 624357536, 624443926, 624530311, 624616696, 624703086, 624789476, 624875866, 624962256, 625048646, 625135036, 625221426, 625307821, 625394216, 625480606, 625567001, 625653396, 625826191, 626085386, 626171791, 626430996, 626517401, 626603806, 626690211, 626776616, 626863021, 626949431, 627035841, 627122251, 627208661, 627295071, 627381486, 627467896, 627554311, 627640726, 627727141, 627813561, 627899976, 627986396, 628072816, 628159231, 628245651, 628332076, 628418496, 628504916, 628591341, 628677766, 628764191, 628850611, 628937036, 629023466, 629109891, 629196316, 629282746, 629369171, 629455601, 629542026, 629628456, 629714886, 629801316, 629887741, 629974171, 630060601, 630147031, 630233461, 630319891, 630406321, 630492751, 630579181, 630665611, 630752041, 630838471, 630924896, 631011326, 631097756, 631140956 }
typeOffsets:intvector { 11224, 0, 11224, -860, 11224, -855, 11224, -850, 11224, -845, 11224, -840, 11224, -835, 11224, -830, 11224, -825, 11224, -820, 11224, -815, 11224, -810, 11224, -805, 11224, -800, 11224, -795, 11224, -790, 11224, -785, 11224, -780, 11224, -775, 11224, -770, 11224, -765, 11224, -755, 11224, -745, 11224, -740, 11224, -730, 11224, -720, 11224, -715, 11224, -705, 11224, -695, 11224, -680, 11224, -665, 11224, -650, 11224, -645, 11224, -635, 11224, -625, 11224, -620, 11224, -605, 11224, -590, 11224, -585, 11224, -570, 11224, -565, 11224, -555, 11224, -545, 11224, -540, 11224, -525, 11224, -520, 11224, -505, 11224, -500, 11224, -485, 11224, -475, 11224, -470, 11224, -455, 11224, -450, 11224, -435, 11224, -430, 11224, -415, 11224, -405, 11224, -395, 11224, -390, 11224, -385, 11224, -380, 11224, -375, 11224, -370, 11224, -365, 11224, -360, 11224, -355, 11224, -350, 11224, -345, 11224, -340, 11224, -335, 11224, -330, 11224, -325, 11224, -320, 11224, -310, 11224, -305, 11224, -300, 11224, -290, 11224, -280, 11224, -270, 11224, -260, 11224, -255, 11224, -250, 11224, -245, 11224, -240, 11224, -235, 11224, -230, 11224, -225, 11224, -215, 11224, -205, 11224, -200, 11224, -190, 11224, -180, 11224, -175, 11224, -165, 11224, -160, 11224, -155, 11224, -150, 11224, -145, 11224, -140, 11224, -130, 11224, -125, 11224, -120, 11224, -115, 11224, -110, 11224, -100, 11224, -95, 11224, -90, 11224, -80, 11224, -75, 11224, -65, 11224, -55, 11224, -50, 11224, -40, 11224, -35, 11224, -25, 11224, -20, 11224, -10, 11224, -5, 11224, 10, 11224, 15, 11224, 25, 11224, 35, 11224, 40, 11224, 50, 11224, 55, 11224, 60, 11224, 65, 11224, 75, 11224, 85, 11224, 90, 11224, 95, 11224, 100, 11224, 105, 11224, 110, 11224, 115, 11224, 120, 11224, 125, 11224, 130, 11224, 135, 11224, 140, 11224, 145, 11224, 150, 11224, 160, 11224, 165, 11224, 175, 11224, 180, 11224, 185, 11224, 190, 11224, 195, 11224, 200, 11224, 205, 11224, 210, 11224, 215, 11224, 220, 11224, 235, 11224, 240, 11224, 260, 11224, 265, 11224, 285, 11224, 290, 11224, 305, 11224, 320, 11224, 325, 11224, 350, 11224, 370, 11224, 375, 11224, 390, 11224, 405, 11224, 410, 11224, 430, 11224, 435, 11224, 455, 11224, 460, 11224, 475, 11224, 485, 11224, 495, 11224, 510, 11224, 515, 11224, 535, 11224, 540, 11224, 560, 11224, 565, 11224, 580, 11224, 585, 11224, 600, 11224, 610, 11224, 615, 11224, 635, 11224, 655, 11224, 660, 11224, 675, 11224, 680, 11224, 690, 11224, 700, 11224, 710, 11224, 725, 11224, 730, 11224, 745, 11224, 760, 11224, 780, 11224, 795, 11224, 800, 11224, 810, 11224, 815, 11224, 825, 11224, 835, 11224, 840, 11224, 850, 11224, 865, 11224, 880, 11224, 890, 11224, 900, 11224, 905, 11224, 910, 11224, 915, 11224, 920, 11224, 925, 11224, 930, 11224, 935, 11224, 940, 11224, 945, 11224, 950, 11224, 955, 11224, 960, 11224, 965, 11224, 970, 11224, 975, 11224, 980, 11224, 985, 11224, 990 }
typeMap:bin { "57524e4b47423d383633312f2c2a28262422201e1d1c1a18171513110f0d0b0908060504030201020304050607090a0c0e101214151618191b1c1d1e1f2123242527292b2d2e3032343537393c4044474a4c4e515457595b5d616367696b6d6f71737576787a7b7e7f81838587898b8d8e8f90919394959697989998979695949291908f8e8d8c8a88868482807f7d7b7a7877007472716f6d6c6a686663625f5d5b5a58575653514f4e4d4c4b49484745444241403f3e3d3c3b3a3b3c3d3e3f404243454648494b4c4d4e50525557585a5c5e6264676a6c6e70730077797c7f82868a8e9195999b9d9ea0a2a3a4a6a8aaabadafb1b2b4b6b8babbbcbec0c2c4c5c6c7c8cacccecfd0d1d2d3d5d7d9dbdddedfe1e2e3e4e5e4e3e2e1e0dfdedcdad8d6d4d2d1d0cfcdcbc9c7c6c5c3c1bfbdbbb9b7b5b3b0aeaca9a7a5a3a19f9c9a96908c86807c7875716d6965605b00" }
- links:intvector { 303, 527 }
- } //Z#303
- /* Asia/Saigon */ :int { 264 } //Z#304
+ links:intvector { 304, 530 }
+ } //Z#304
+ /* Asia/Saigon */ :int { 264 } //Z#305
/* Asia/Sakhalin */ :table {
trans:intvector { -2031039048, -768560400, 354891600, 370699200, 386427600, 402235200, 417963600, 433771200, 449586000, 465318000, 481042800, 496767600, 512492400, 528217200, 543942000, 559666800, 575391600, 591116400, 606841200, 622566000, 638290800, 654620400, 670345200, 686073600, 695750400, 701784000, 717505200, 733244400, 748969200, 764694000, 780418800, 796143600, 811868400, 828198000, 846342000, 859647600, 877795200, 891100800, 909244800, 922550400, 941299200, 954000000, 972748800, 985449600, 1004198400, 1017504000, 1035648000, 1048953600, 1067097600, 1080403200, 1099152000, 1111852800, 1130601600, 1143302400, 1162051200, 1174752000, 1193500800, 1206806400, 1224950400, 1238256000, 1256400000, 1269705600, 1288454400, 1301155200 }
typeOffsets:intvector { 34248, 0, 32400, 0, 36000, 0, 36000, 3600, 39600, 0, 39600, 3600 }
typeMap:bin { "01040504050405040504050405040504050405040504030204050405040504050405040302030203020302030203020302030203020302030203020302030204" }
- } //Z#305
+ } //Z#306
/* Asia/Samarkand */ :table {
trans:intvector { -1441168032, -1247544000, 354913200, 370720800, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 670366800, 686091600 }
typeOffsets:intvector { 16032, 0, 14400, 0, 18000, 0, 18000, 3600, 21600, 0 }
typeMap:bin { "010203040302030203020302030203020302030203020302" }
- } //Z#306
+ } //Z#307
/* Asia/Seoul */ :table {
transPre32:intvector { -1, 1770415224 }
trans:intvector { -2053931400, -1325494800, -1199262600, -498128400, -303984000, -293533200, -264931200, -39515400, 547570800, 560872800, 579020400, 592322400 }
typeOffsets:intvector { 30472, 0, 28800, 0, 28800, 3600, 30600, 0, 32400, 0, 32400, 3600 }
typeMap:bin { "03040304010201030405040504" }
- links:intvector { 307, 584 }
- } //Z#307
- /* Asia/Shanghai */ :table {
- trans:intvector { -1325491552, -933494400, -923130000, -908784000, -891594000, 515520000, 527007600, 545155200, 558457200, 576604800, 589906800, 608659200, 621961200, 640108800, 653410800, 671558400, 684860400 }
- typeOffsets:intvector { 29152, 0, 28800, 0, 28800, 3600 }
- typeMap:bin { "0102010201020102010201020102010201" }
- links:intvector { 308, 373, 535 }
+ links:intvector { 308, 587 }
} //Z#308
+ /* Asia/Shanghai */ :table {
+ trans:intvector { -1325491557, -933494400, -923130000, -908784000, -891594000, 515520000, 527007600, 545155200, 558457200, 576604800, 589906800, 608659200, 621961200, 640108800, 653410800, 671558400, 684860400 }
+ typeOffsets:intvector { 29157, 0, 28800, 0, 28800, 3600 }
+ typeMap:bin { "0102010201020102010201020102010201" }
+ links:intvector { 309, 375, 538 }
+ } //Z#309
/* Asia/Singapore */ :table {
trans:intvector { -2038200925, -1167634800, -1073028000, -894180000, -879665400, -767005200, 378664200 }
typeOffsets:intvector { 24925, 0, 25200, 0, 25200, 1200, 26400, 0, 27000, 0, 28800, 0, 32400, 0 }
typeMap:bin { "01020304060405" }
- links:intvector { 309, 586 }
- } //Z#309
+ links:intvector { 310, 589 }
+ } //Z#310
/* Asia/Taipei */ :table {
transPre32:intvector { -1, 1959718936 }
trans:intvector { -778579200, -765363600, -747043200, -733827600, -715507200, -702291600, -683884800, -670669200, -652348800, -639133200, -620812800, -607597200, -589276800, -576061200, -562924800, -541760400, -528710400, -510224400, -497174400, -478688400, -465638400, -449830800, -434016000, -418208400, -402480000, -386672400, -370944000, -355136400, -339408000, -323600400, -302515200, -291978000, -270979200, -260442000, 133977600, 149785200, 165513600, 181321200, 299520000, 307465200 }
typeOffsets:intvector { 29160, 0, 28800, 0, 28800, 3600 }
typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
- links:intvector { 310, 583 }
- } //Z#310
+ links:intvector { 311, 586 }
+ } //Z#311
/* Asia/Tashkent */ :table {
trans:intvector { -1441168632, -1247547600, 354909600, 370717200, 386445600, 402253200, 417981600, 433789200, 449604000, 465336000, 481060800, 496785600, 512510400, 528235200, 543960000, 559684800, 575409600, 591134400, 606859200, 622584000, 638308800, 654638400, 670363200, 686091600 }
typeOffsets:intvector { 16632, 0, 18000, 0, 18000, 3600, 21600, 0, 21600, 3600 }
typeMap:bin { "010304030403040304030403040304030403040304030201" }
- } //Z#311
+ } //Z#312
/* Asia/Tbilisi */ :table {
trans:intvector { -1441162756, -405140400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622591200, 638316000, 654645600, 670370400, 686098800, 701816400, 717537600, 733266000, 748987200, 764715600, 780436800, 796161600, 811882800, 828216000, 877806000, 891115200, 909255600, 922564800, 941310000, 954014400, 972759600, 985464000, 1004209200, 1017518400, 1035658800, 1048968000, 1067108400, 1080417600, 1088276400, 1099177200, 1111878000 }
typeOffsets:intvector { 10756, 0, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 }
typeMap:bin { "0103040304030403040304030403040304030403040302010201020102030403040304030403040304030403040304020103" }
- } //Z#312
+ } //Z#313
/* Asia/Tehran */ :table {
trans:intvector { -757394744, 247177800, 259272000, 277758000, 283982400, 290809800, 306531000, 322432200, 338499000, 673216200, 685481400, 701209800, 717103800, 732745800, 748639800, 764281800, 780175800, 795817800, 811711800, 827353800, 843247800, 858976200, 874870200, 890512200, 906406200, 922048200, 937942200, 953584200, 969478200, 985206600, 1001100600, 1016742600, 1032636600, 1048278600, 1064172600, 1079814600, 1095708600, 1111437000, 1127331000, 1206045000, 1221939000, 1237667400, 1253561400, 1269203400, 1285097400, 1300739400, 1316633400, 1332275400, 1348169400, 1363897800, 1379791800, 1395433800, 1411327800, 1426969800, 1442863800, 1458505800, 1474399800, 1490128200, 1506022200, 1521664200, 1537558200, 1553200200, 1569094200, 1584736200, 1600630200, 1616358600, 1632252600, 1647894600, 1663788600, 1679430600, 1695324600, 1710966600, 1726860600, 1742589000, 1758483000, 1774125000, 1790019000, 1805661000, 1821555000, 1837197000, 1853091000, 1868733000, 1884627000, 1900355400, 1916249400, 1931891400, 1947785400, 1963427400, 1979321400, 1994963400, 2010857400, 2026585800, 2042479800, 2058121800, 2074015800, 2089657800, 2105551800, 2121193800, 2137087800 }
typeOffsets:intvector { 12344, 0, 12600, 0, 12600, 3600, 14400, 0, 14400, 3600 }
typeMap:bin { "010304030102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
- links:intvector { 313, 511 }
- } //Z#313
- /* Asia/Tel_Aviv */ :int { 271 } //Z#314
- /* Asia/Thimbu */ :int { 316 } //Z#315
+ links:intvector { 314, 514 }
+ } //Z#314
+ /* Asia/Tel_Aviv */ :int { 271 } //Z#315
+ /* Asia/Thimbu */ :int { 317 } //Z#316
/* Asia/Thimphu */ :table {
trans:intvector { -706341516, 560025000 }
typeOffsets:intvector { 21516, 0, 19800, 0, 21600, 0 }
typeMap:bin { "0102" }
- links:intvector { 315, 316 }
- } //Z#316
+ links:intvector { 316, 317 }
+ } //Z#317
/* Asia/Tokyo */ :table {
transPre32:intvector { -1, 1707254896 }
trans:intvector { -683794800, -672393600, -654764400, -640944000, -620290800, -609494400, -588841200, -578044800 }
typeOffsets:intvector { 33539, 0, 32400, 0, 32400, 3600 }
typeMap:bin { "010201020102010201" }
- links:intvector { 317, 513, 515 }
- } //Z#317
- /* Asia/Ujung_Pandang */ :int { 286 } //Z#318
+ links:intvector { 318, 516, 518 }
+ } //Z#318
+ /* Asia/Ujung_Pandang */ :int { 287 } //Z#319
/* Asia/Ulaanbaatar */ :table {
trans:intvector { -2032931252, 252435600, 417974400, 433782000, 449596800, 465318000, 481046400, 496767600, 512496000, 528217200, 543945600, 559666800, 575395200, 591116400, 606844800, 622566000, 638294400, 654620400, 670348800, 686070000, 701798400, 717519600, 733248000, 748969200, 764697600, 780418800, 796147200, 811868400, 828201600, 843922800, 859651200, 875372400, 891100800, 906822000, 988394400, 1001696400, 1017424800, 1033146000, 1048874400, 1064595600, 1080324000, 1096045200, 1111773600, 1127494800, 1143223200, 1159549200 }
typeOffsets:intvector { 25652, 0, 25200, 0, 28800, 0, 28800, 3600 }
typeMap:bin { "01020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" }
- links:intvector { 319, 320 }
- } //Z#319
- /* Asia/Ulan_Bator */ :int { 319 } //Z#320
+ links:intvector { 320, 321 }
+ } //Z#320
+ /* Asia/Ulan_Bator */ :int { 320 } //Z#321
/* Asia/Urumqi */ :table {
trans:intvector { -1325483420, 325965600, 515520000, 527007600, 545155200, 558457200, 576604800, 589906800, 608659200, 621961200, 640108800, 653410800, 671558400, 684860400 }
typeOffsets:intvector { 21020, 0, 21600, 0, 28800, 0, 28800, 3600 }
typeMap:bin { "0102030203020302030203020302" }
- } //Z#321
+ } //Z#322
+ /* Asia/Ust-Nera */ :table {
+ trans:intvector { -1579426374, -1247558400, 354898800, 370699200, 386427600, 402235200, 417963600, 433771200, 449586000, 465318000, 481042800, 496767600, 512492400, 528217200, 543942000, 559666800, 575391600, 591116400, 606841200, 622566000, 638290800, 654620400, 670345200, 686073600, 695750400, 701784000, 717505200, 733244400, 748969200, 764694000, 780418800, 796143600, 811868400, 828198000, 846342000, 859647600, 877791600, 891097200, 909241200, 922546800, 941295600, 953996400, 972745200, 985446000, 1004194800, 1017500400, 1035644400, 1048950000, 1067094000, 1080399600, 1099148400, 1111849200, 1130598000, 1143298800, 1162047600, 1174748400, 1193497200, 1206802800, 1224946800, 1238252400, 1256396400, 1269702000, 1288450800, 1301151600, 1315828800 }
+ typeOffsets:intvector { 34374, 0, 28800, 0, 32400, 0, 36000, 0, 36000, 3600, 39600, 0, 39600, 3600, 43200, 0 }
+ typeMap:bin { "0102060506050605060506050605060506050605060504030506050605060506050605060506050605060506050605060506050605060506050605060506050705" }
+ } //Z#323
/* Asia/Vientiane */ :table {
trans:intvector { -2005973424, -1855983920, -1819954800, -1220428800 }
typeOffsets:intvector { 24624, 0, 25200, 0, 25580, 0, 28800, 0 }
typeMap:bin { "02010301" }
- } //Z#322
+ } //Z#324
/* Asia/Vladivostok */ :table {
trans:intvector { -1487321264, -1247562000, 354895200, 370702800, 386431200, 402238800, 417967200, 433774800, 449589600, 465321600, 481046400, 496771200, 512496000, 528220800, 543945600, 559670400, 575395200, 591120000, 606844800, 622569600, 638294400, 654624000, 670348800, 686077200, 695754000, 701787600, 717508800, 733248000, 748972800, 764697600, 780422400, 796147200, 811872000, 828201600, 846345600, 859651200, 877795200, 891100800, 909244800, 922550400, 941299200, 954000000, 972748800, 985449600, 1004198400, 1017504000, 1035648000, 1048953600, 1067097600, 1080403200, 1099152000, 1111852800, 1130601600, 1143302400, 1162051200, 1174752000, 1193500800, 1206806400, 1224950400, 1238256000, 1256400000, 1269705600, 1288454400, 1301155200 }
typeOffsets:intvector { 31664, 0, 32400, 0, 32400, 3600, 36000, 0, 36000, 3600, 39600, 0 }
typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403040304030403040304030403040305" }
- } //Z#323
+ } //Z#325
/* Asia/Yakutsk */ :table {
trans:intvector { -1579423120, -1247558400, 354898800, 370706400, 386434800, 402242400, 417970800, 433778400, 449593200, 465325200, 481050000, 496774800, 512499600, 528224400, 543949200, 559674000, 575398800, 591123600, 606848400, 622573200, 638298000, 654627600, 670352400, 686080800, 695757600, 701791200, 717512400, 733251600, 748976400, 764701200, 780426000, 796150800, 811875600, 828205200, 846349200, 859654800, 877798800, 891104400, 909248400, 922554000, 941302800, 954003600, 972752400, 985453200, 1004202000, 1017507600, 1035651600, 1048957200, 1067101200, 1080406800, 1099155600, 1111856400, 1130605200, 1143306000, 1162054800, 1174755600, 1193504400, 1206810000, 1224954000, 1238259600, 1256403600, 1269709200, 1288458000, 1301158800 }
typeOffsets:intvector { 31120, 0, 28800, 0, 28800, 3600, 32400, 0, 32400, 3600, 36000, 0 }
typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403040304030403040304030403040305" }
- } //Z#324
+ } //Z#326
/* Asia/Yekaterinburg */ :table {
trans:intvector { -1592611344, -1247544000, 354913200, 370720800, 386449200, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 670366800, 686095200, 695772000, 701805600, 717526800, 733266000, 748990800, 764715600, 780440400, 796165200, 811890000, 828219600, 846363600, 859669200, 877813200, 891118800, 909262800, 922568400, 941317200, 954018000, 972766800, 985467600, 1004216400, 1017522000, 1035666000, 1048971600, 1067115600, 1080421200, 1099170000, 1111870800, 1130619600, 1143320400, 1162069200, 1174770000, 1193518800, 1206824400, 1224968400, 1238274000, 1256418000, 1269723600, 1288472400, 1301173200 }
typeOffsets:intvector { 14544, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 }
typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403040304030403040304030403040305" }
- } //Z#325
+ } //Z#327
/* Asia/Yerevan */ :table {
trans:intvector { -1441162680, -405140400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622591200, 638316000, 654645600, 670370400, 686098800, 701812800, 717534000, 733273200, 748998000, 764722800, 780447600, 796172400, 811897200, 859672800, 877816800, 891122400, 909266400, 922572000, 941320800, 954021600, 972770400, 985471200, 1004220000, 1017525600, 1035669600, 1048975200, 1067119200, 1080424800, 1099173600, 1111874400, 1130623200, 1143324000, 1162072800, 1174773600, 1193522400, 1206828000, 1224972000, 1238277600, 1256421600, 1269727200, 1288476000, 1301176800, 1319925600 }
typeOffsets:intvector { 10680, 0, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 }
typeMap:bin { "0103040304030403040304030403040304030403040302010201020102010203040304030403040304030403040304030403040304030403040304030403" }
- links:intvector { 326, 528 }
- } //Z#326
+ links:intvector { 328, 531 }
+ } //Z#328
/* Atlantic/Azores */ :table {
transPre32:intvector { -1, 1581063056 }
trans:intvector { -1849557928, -1689548400, -1677794400, -1667430000, -1647730800, -1635807600, -1616194800, -1604358000, -1584658800, -1572735600, -1553036400, -1541199600, -1521500400, -1442444400, -1426806000, -1379286000, -1364770800, -1348441200, -1333321200, -1316386800, -1301266800, -1284332400, -1269817200, -1221433200, -1206918000, -1191193200, -1175468400, -1127689200, -1111964400, -1096844400, -1080514800, -1063580400, -1049065200, -1033340400, -1017615600, -1002495600, -986166000, -969231600, -950482800, -942015600, -922662000, -906937200, -891126000, -877302000, -873676800, -864000000, -857948400, -845852400, -842832000, -831340800, -825894000, -814402800, -810777600, -799891200, -794444400, -782953200, -779328000, -768441600, -762994800, -749084400, -733359600, -717624000, -701899200, -686174400, -670449600, -654724800, -639000000, -591825600, -575496000, -559771200, -544046400, -528321600, -512596800, -496872000, -481147200, -465422400, -449697600, -433972800, -417643200, -401918400, -386193600, -370468800, -354744000, -339019200, -323294400, -307569600, -291844800, -276120000, -260395200, -244670400, -228340800, -212616000, -196891200, -181166400, -165441600, -149716800, -133992000, -118267200, 228272400, 243997200, 260326800, 276051600, 291776400, 307504800, 323226000, 338954400, 354679200, 370404000, 386128800, 401853600, 417582000, 433303200, 449028000, 465357600, 481082400, 496807200, 512532000, 528256800, 543981600, 559706400, 575431200, 591156000, 606880800, 622605600, 638330400, 654660000, 670384800, 686109600, 701834400, 717559200, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -1911,15 +1930,15 @@
finalRule { "EU" }
finalRaw:int { -3600 }
finalYear:int { 1997 }
- } //Z#327
+ } //Z#329
/* Atlantic/Bermuda */ :table {
- trans:intvector { -1262281256, 136360800, 152082000, 167810400, 183531600, 199260000, 215586000, 230709600, 247035600, 262764000, 278485200, 294213600, 309934800, 325663200, 341384400, 357112800, 372834000, 388562400, 404888400, 420012000, 436338000, 452066400, 467787600, 483516000, 499237200, 514965600, 530686800, 544600800, 562136400, 576050400, 594190800, 607500000, 625640400, 638949600, 657090000, 671004000, 688539600, 702453600, 719989200, 733903200, 752043600, 765352800, 783493200, 796802400, 814942800, 828856800, 846392400, 860306400, 877842000, 891756000, 909291600, 923205600, 941346000, 954655200, 972795600, 986104800, 1004245200, 1018159200, 1035694800, 1049608800, 1067144400, 1081058400, 1099198800, 1112508000, 1130648400, 1143957600, 1162098000, 1173592800, 1194152400 }
- typeOffsets:intvector { -15544, 0, -14400, 0, -14400, 3600 }
+ trans:intvector { -1262281242, 136360800, 152082000, 167810400, 183531600, 199260000, 215586000, 230709600, 247035600, 262764000, 278485200, 294213600, 309934800, 325663200, 341384400, 357112800, 372834000, 388562400, 404888400, 420012000, 436338000, 452066400, 467787600, 483516000, 499237200, 514965600, 530686800, 544600800, 562136400, 576050400, 594190800, 607500000, 625640400, 638949600, 657090000, 671004000, 688539600, 702453600, 719989200, 733903200, 752043600, 765352800, 783493200, 796802400, 814942800, 828856800, 846392400, 860306400, 877842000, 891756000, 909291600, 923205600, 941346000, 954655200, 972795600, 986104800, 1004245200, 1018159200, 1035694800, 1049608800, 1067144400, 1081058400, 1099198800, 1112508000, 1130648400, 1143957600, 1162098000, 1173592800, 1194152400 }
+ typeOffsets:intvector { -15558, 0, -14400, 0, -14400, 3600 }
typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
finalRule { "US" }
finalRaw:int { -14400 }
finalYear:int { 2008 }
- } //Z#328
+ } //Z#330
/* Atlantic/Canary */ :table {
trans:intvector { -1509663504, -733874400, 323827200, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
typeOffsets:intvector { -3696, 0, -3600, 0, 0, 0, 0, 3600 }
@@ -1927,13 +1946,13 @@
finalRule { "EU" }
finalRaw:int { 0 }
finalYear:int { 1997 }
- } //Z#329
+ } //Z#331
/* Atlantic/Cape_Verde */ :table {
trans:intvector { -1988144756, -862610400, -764118000, 186120000 }
typeOffsets:intvector { -5644, 0, -7200, 0, -7200, 3600, -3600, 0 }
typeMap:bin { "01020103" }
- } //Z#330
- /* Atlantic/Faeroe */ :int { 332 } //Z#331
+ } //Z#332
+ /* Atlantic/Faeroe */ :int { 334 } //Z#333
/* Atlantic/Faroe */ :table {
trans:intvector { -1955748776, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
typeOffsets:intvector { -1624, 0, 0, 0, 0, 3600 }
@@ -1941,9 +1960,9 @@
finalRule { "EU" }
finalRaw:int { 0 }
finalYear:int { 1997 }
- links:intvector { 331, 332 }
- } //Z#332
- /* Atlantic/Jan_Mayen */ :int { 461 } //Z#333
+ links:intvector { 333, 334 }
+ } //Z#334
+ /* Atlantic/Jan_Mayen */ :int { 464 } //Z#335
/* Atlantic/Madeira */ :table {
trans:intvector { -1849560744, -1689552000, -1677798000, -1667433600, -1647734400, -1635811200, -1616198400, -1604361600, -1584662400, -1572739200, -1553040000, -1541203200, -1521504000, -1442448000, -1426809600, -1379289600, -1364774400, -1348444800, -1333324800, -1316390400, -1301270400, -1284336000, -1269820800, -1221436800, -1206921600, -1191196800, -1175472000, -1127692800, -1111968000, -1096848000, -1080518400, -1063584000, -1049068800, -1033344000, -1017619200, -1002499200, -986169600, -969235200, -950486400, -942019200, -922665600, -906940800, -891129600, -877305600, -873680400, -864003600, -857952000, -845856000, -842835600, -831344400, -825897600, -814406400, -810781200, -799894800, -794448000, -782956800, -779331600, -768445200, -762998400, -749088000, -733363200, -717627600, -701902800, -686178000, -670453200, -654728400, -639003600, -591829200, -575499600, -559774800, -544050000, -528325200, -512600400, -496875600, -481150800, -465426000, -449701200, -433976400, -417646800, -401922000, -386197200, -370472400, -354747600, -339022800, -323298000, -307573200, -291848400, -276123600, -260398800, -244674000, -228344400, -212619600, -196894800, -181170000, -165445200, -149720400, -133995600, -118270800, 228268800, 243993600, 260323200, 276048000, 291772800, 307501200, 323222400, 338950800, 354675600, 370400400, 386125200, 401850000, 417578400, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
typeOffsets:intvector { -4056, 0, -3600, 0, -3600, 3600, -3600, 7200, 0, 0, 0, 3600 }
@@ -1951,30 +1970,30 @@
finalRule { "EU" }
finalRaw:int { 0 }
finalYear:int { 1997 }
- } //Z#334
+ } //Z#336
/* Atlantic/Reykjavik */ :table {
transPre32:intvector { -1, 97919740 }
trans:intvector { -1956609132, -1668211200, -1647212400, -1636675200, -1613430000, -968025600, -949615200, -942008400, -920239200, -909957600, -888789600, -877903200, -857944800, -846453600, -826495200, -815004000, -795045600, -783554400, -762991200, -752104800, -731541600, -717631200, -700092000, -686181600, -668642400, -654732000, -636588000, -623282400, -605743200, -591832800, -573688800, -559778400, -542239200, -528328800, -510789600, -496879200, -479340000, -465429600, -447890400, -433980000, -415836000, -401925600, -384386400, -370476000, -352936800, -339026400, -321487200, -307576800, -290037600, -276127200, -258588000, -244677600, -226533600, -212623200, -195084000, -181173600, -163634400, -149724000, -132184800, -118274400, -100735200, -86824800, -68680800, -54770400 }
typeOffsets:intvector { -5244, 0, -5268, 0, -3600, 0, -3600, 3600, 0, 0 }
typeMap:bin { "0102030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030204" }
- links:intvector { 335, 499 }
- } //Z#335
+ links:intvector { 337, 502 }
+ } //Z#337
/* Atlantic/South_Georgia */ :table {
transPre32:intvector { -1, 1770454464 }
typeOffsets:intvector { -8768, 0, -7200, 0 }
typeMap:bin { "01" }
- } //Z#336
+ } //Z#338
/* Atlantic/St_Helena */ :table {
trans:intvector { -599614632 }
typeOffsets:intvector { -1368, 0, 0, 0 }
typeMap:bin { "01" }
- } //Z#337
+ } //Z#339
/* Atlantic/Stanley */ :table {
trans:intvector { -1824235716, -1018209600, -1003093200, -986760000, -971643600, -954705600, -939589200, -923256000, -908139600, -891806400, -876690000, -860356800, -852066000, 420609600, 433306800, 452052000, 464151600, 483501600, 495601200, 514350000, 527054400, 545799600, 558504000, 577249200, 589953600, 608698800, 621403200, 640753200, 652852800, 672202800, 684907200, 703652400, 716356800, 735102000, 747806400, 766551600, 779256000, 798001200, 810705600, 830055600, 842760000, 861505200, 874209600, 892954800, 905659200, 924404400, 937108800, 955854000, 968558400, 987310800, 999410400, 1019365200, 1030860000, 1050814800, 1062914400, 1082264400, 1094364000, 1113714000, 1125813600, 1145163600, 1157263200, 1176613200, 1188712800, 1208667600, 1220767200, 1240117200, 1252216800, 1271566800, 1283666400 }
typeOffsets:intvector { -13884, 0, -14400, 0, -14400, 3600, -10800, 0, -10800, 3600 }
typeMap:bin { "010201020102010201020102010304030403020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020103" }
- } //Z#338
- /* Australia/ACT */ :int { 357 } //Z#339
+ } //Z#340
+ /* Australia/ACT */ :int { 359 } //Z#341
/* Australia/Adelaide */ :table {
transPre32:intvector { -1, 1930857236, -1, 2064778096 }
trans:intvector { -1672565340, -1665390600, -883639800, -876126600, -860398200, -844677000, -828343800, -813227400, 57688200, 67969800, 89137800, 100024200, 120587400, 131473800, 152037000, 162923400, 183486600, 194977800, 215541000, 226427400, 246990600, 257877000, 278440200, 289326600, 309889800, 320776200, 341339400, 352225800, 372789000, 384280200, 404843400, 415729800, 436293000, 447179400, 467742600, 478629000, 499192200, 511288200, 530037000, 542737800, 562091400, 574792200, 594145800, 606241800, 625595400, 637691400, 657045000, 667931400, 688494600, 701195400, 719944200, 731435400, 751998600, 764094600, 783448200, 796149000, 814897800, 828203400, 846347400, 859653000, 877797000, 891102600, 909246600, 922552200, 941301000, 954001800, 972750600, 985451400, 1004200200, 1017505800, 1035649800, 1048955400, 1067099400, 1080405000, 1099153800, 1111854600, 1130603400, 1143909000, 1162053000, 1174753800, 1193502600, 1207413000, 1223137800 }
@@ -1983,15 +2002,15 @@
finalRule { "AS" }
finalRaw:int { 34200 }
finalYear:int { 2009 }
- links:intvector { 340, 356 }
- } //Z#340
+ links:intvector { 342, 358 }
+ } //Z#342
/* Australia/Brisbane */ :table {
transPre32:intvector { -1, 1928175368 }
trans:intvector { -1672567140, -1665392400, -883641600, -876128400, -860400000, -844678800, -828345600, -813229200, 57686400, 67968000, 625593600, 636480000, 657043200, 667929600, 688492800, 699379200 }
typeOffsets:intvector { 36728, 0, 36000, 0, 36000, 3600 }
typeMap:bin { "0102010201020102010201020102010201" }
- links:intvector { 341, 355 }
- } //Z#341
+ links:intvector { 343, 357 }
+ } //Z#343
/* Australia/Broken_Hill */ :table {
transPre32:intvector { -1, 1930856548, -1, 1980016096, -1, 2064778096 }
trans:intvector { -1672565340, -1665390600, -883639800, -876126600, -860398200, -844677000, -828343800, -813227400, 57688200, 67969800, 89137800, 100024200, 120587400, 131473800, 152037000, 162923400, 183486600, 194977800, 215541000, 226427400, 246990600, 257877000, 278440200, 289326600, 309889800, 320776200, 341339400, 352225800, 372789000, 386699400, 404843400, 415729800, 436293000, 447179400, 467742600, 478629000, 499192200, 511288200, 530037000, 542737800, 562091400, 574792200, 594145800, 606241800, 625595400, 636481800, 657045000, 667931400, 688494600, 699381000, 719944200, 731435400, 751998600, 762885000, 783448200, 794334600, 814897800, 828203400, 846347400, 859653000, 877797000, 891102600, 909246600, 922552200, 941301000, 954001800, 972750600, 985451400, 1004200200, 1017505800, 1035649800, 1048955400, 1067099400, 1080405000, 1099153800, 1111854600, 1130603400, 1143909000, 1162053000, 1174753800, 1193502600, 1207413000, 1223137800 }
@@ -2000,9 +2019,9 @@
finalRule { "AS" }
finalRaw:int { 34200 }
finalYear:int { 2009 }
- links:intvector { 342, 361 }
- } //Z#342
- /* Australia/Canberra */ :int { 357 } //Z#343
+ links:intvector { 344, 363 }
+ } //Z#344
+ /* Australia/Canberra */ :int { 359 } //Z#345
/* Australia/Currie */ :table {
transPre32:intvector { -1, 1949172768 }
trans:intvector { -1680508800, -1665392400, -883641600, -876128400, -860400000, -844678800, -828345600, -813229200, 57686400, 67968000, 89136000, 100022400, 120585600, 131472000, 152035200, 162921600, 183484800, 194976000, 215539200, 226425600, 246988800, 257875200, 278438400, 289324800, 309888000, 320774400, 341337600, 352224000, 372787200, 386092800, 404841600, 417542400, 436291200, 447177600, 467740800, 478627200, 499190400, 510076800, 530035200, 542736000, 562089600, 574790400, 594144000, 606240000, 625593600, 637689600, 657043200, 670348800, 686678400, 701798400, 718128000, 733248000, 749577600, 764697600, 781027200, 796147200, 812476800, 828201600, 844531200, 859651200, 875980800, 891100800, 907430400, 922550400, 938880000, 954000000, 967305600, 985449600, 1002384000, 1017504000, 1033833600, 1048953600, 1065283200, 1080403200, 1096732800, 1111852800, 1128182400, 1143907200, 1159632000, 1174752000, 1191686400, 1207411200, 1223136000 }
@@ -2011,20 +2030,20 @@
finalRule { "AT" }
finalRaw:int { 36000 }
finalYear:int { 2009 }
- } //Z#344
+ } //Z#346
/* Australia/Darwin */ :table {
transPre32:intvector { -1, 1930859096, -1, 2064778096 }
trans:intvector { -1672565340, -1665390600, -883639800, -876126600, -860398200, -844677000, -828343800, -813227400 }
typeOffsets:intvector { 31400, 0, 32400, 0, 34200, 0, 34200, 3600 }
typeMap:bin { "01020302030203020302" }
- links:intvector { 0, 345, 353 }
- } //Z#345
+ links:intvector { 0, 347, 355 }
+ } //Z#347
/* Australia/Eucla */ :table {
transPre32:intvector { -1, 1957038768 }
trans:intvector { -1672562640, -1665387900, -883637100, -876123900, -860395500, -844674300, 152039700, 162926100, 436295700, 447182100, 690311700, 699383700, 1165079700, 1174756500, 1193505300, 1206810900, 1224954900, 1238260500 }
typeOffsets:intvector { 30928, 0, 31500, 0, 31500, 3600 }
typeMap:bin { "01020102010201020102010201020102010201" }
- } //Z#346
+ } //Z#348
/* Australia/Hobart */ :table {
transPre32:intvector { -1, 1949171940 }
trans:intvector { -1680508800, -1665392400, -883641600, -876128400, -860400000, -844678800, -828345600, -813229200, -71136000, -55411200, -37267200, -25776000, -5817600, 5673600, 25632000, 37728000, 57686400, 67968000, 89136000, 100022400, 120585600, 131472000, 152035200, 162921600, 183484800, 194976000, 215539200, 226425600, 246988800, 257875200, 278438400, 289324800, 309888000, 320774400, 341337600, 352224000, 372787200, 386092800, 404841600, 417542400, 436291200, 447177600, 467740800, 478627200, 499190400, 510076800, 530035200, 542736000, 562089600, 574790400, 594144000, 606240000, 625593600, 637689600, 657043200, 670348800, 686678400, 701798400, 718128000, 733248000, 749577600, 764697600, 781027200, 796147200, 812476800, 828201600, 844531200, 859651200, 875980800, 891100800, 907430400, 922550400, 938880000, 954000000, 967305600, 985449600, 1002384000, 1017504000, 1033833600, 1048953600, 1065283200, 1080403200, 1096732800, 1111852800, 1128182400, 1143907200, 1159632000, 1174752000, 1191686400, 1207411200, 1223136000 }
@@ -2033,15 +2052,15 @@
finalRule { "AT" }
finalRaw:int { 36000 }
finalYear:int { 2009 }
- links:intvector { 347, 358 }
- } //Z#347
- /* Australia/LHI */ :int { 350 } //Z#348
+ links:intvector { 349, 360 }
+ } //Z#349
+ /* Australia/LHI */ :int { 352 } //Z#350
/* Australia/Lindeman */ :table {
transPre32:intvector { -1, 1928176340 }
trans:intvector { -1672567140, -1665392400, -883641600, -876128400, -860400000, -844678800, -828345600, -813229200, 57686400, 67968000, 625593600, 636480000, 657043200, 667929600, 688492800, 699379200, 719942400, 731433600, 751996800, 762883200 }
typeOffsets:intvector { 35756, 0, 36000, 0, 36000, 3600 }
typeMap:bin { "010201020102010201020102010201020102010201" }
- } //Z#349
+ } //Z#351
/* Australia/Lord_Howe */ :table {
transPre32:intvector { -1, 1930852316 }
trans:intvector { 352216800, 372785400, 384273000, 404839800, 415722600, 436289400, 447172200, 467739000, 478621800, 499188600, 511282800, 530033400, 542732400, 562087800, 574786800, 594142200, 606236400, 625591800, 636476400, 657041400, 667926000, 688491000, 699375600, 719940600, 731430000, 751995000, 762879600, 783444600, 794329200, 814894200, 828198000, 846343800, 859647600, 877793400, 891097200, 909243000, 922546800, 941297400, 953996400, 967303800, 985446000, 1004196600, 1017500400, 1035646200, 1048950000, 1067095800, 1080399600, 1099150200, 1111849200, 1130599800, 1143903600, 1162049400, 1174748400, 1193499000, 1207407600, 1223134200 }
@@ -2050,8 +2069,8 @@
finalRule { "LH" }
finalRaw:int { 37800 }
finalYear:int { 2009 }
- links:intvector { 348, 350 }
- } //Z#350
+ links:intvector { 350, 352 }
+ } //Z#352
/* Australia/Melbourne */ :table {
transPre32:intvector { -1, 1930855704 }
trans:intvector { -1672567140, -1665392400, -883641600, -876128400, -860400000, -844678800, -828345600, -813229200, 57686400, 67968000, 89136000, 100022400, 120585600, 131472000, 152035200, 162921600, 183484800, 194976000, 215539200, 226425600, 246988800, 257875200, 278438400, 289324800, 309888000, 320774400, 341337600, 352224000, 372787200, 384278400, 404841600, 415728000, 436291200, 447177600, 467740800, 478627200, 499190400, 511286400, 530035200, 542736000, 561484800, 574790400, 594144000, 606240000, 625593600, 637689600, 657043200, 667929600, 688492800, 699379200, 719942400, 731433600, 751996800, 762883200, 783446400, 796147200, 814896000, 828201600, 846345600, 859651200, 877795200, 891100800, 909244800, 922550400, 941299200, 954000000, 967305600, 985449600, 1004198400, 1017504000, 1035648000, 1048953600, 1067097600, 1080403200, 1099152000, 1111852800, 1130601600, 1143907200, 1162051200, 1174752000, 1193500800, 1207411200, 1223136000 }
@@ -2060,19 +2079,19 @@
finalRule { "AV" }
finalRaw:int { 36000 }
finalYear:int { 2009 }
- links:intvector { 351, 359 }
- } //Z#351
- /* Australia/NSW */ :int { 357 } //Z#352
- /* Australia/North */ :int { 345 } //Z#353
+ links:intvector { 353, 361 }
+ } //Z#353
+ /* Australia/NSW */ :int { 359 } //Z#354
+ /* Australia/North */ :int { 347 } //Z#355
/* Australia/Perth */ :table {
transPre32:intvector { -1, 1957041892 }
trans:intvector { -1672559940, -1665385200, -883634400, -876121200, -860392800, -844671600, 152042400, 162928800, 436298400, 447184800, 690314400, 699386400, 1165082400, 1174759200, 1193508000, 1206813600, 1224957600, 1238263200 }
typeOffsets:intvector { 27804, 0, 28800, 0, 28800, 3600 }
typeMap:bin { "01020102010201020102010201020102010201" }
- links:intvector { 354, 360 }
- } //Z#354
- /* Australia/Queensland */ :int { 341 } //Z#355
- /* Australia/South */ :int { 340 } //Z#356
+ links:intvector { 356, 362 }
+ } //Z#356
+ /* Australia/Queensland */ :int { 343 } //Z#357
+ /* Australia/South */ :int { 342 } //Z#358
/* Australia/Sydney */ :table {
transPre32:intvector { -1, 1930854204 }
trans:intvector { -1672567140, -1665392400, -883641600, -876128400, -860400000, -844678800, -828345600, -813229200, 57686400, 67968000, 89136000, 100022400, 120585600, 131472000, 152035200, 162921600, 183484800, 194976000, 215539200, 226425600, 246988800, 257875200, 278438400, 289324800, 309888000, 320774400, 341337600, 352224000, 372787200, 386697600, 404841600, 415728000, 436291200, 447177600, 467740800, 478627200, 499190400, 511286400, 530035200, 542736000, 562089600, 574790400, 594144000, 606240000, 625593600, 636480000, 657043200, 667929600, 688492800, 699379200, 719942400, 731433600, 751996800, 762883200, 783446400, 794332800, 814896000, 828201600, 846345600, 859651200, 877795200, 891100800, 909244800, 922550400, 941299200, 954000000, 967305600, 985449600, 1004198400, 1017504000, 1035648000, 1048953600, 1067097600, 1080403200, 1099152000, 1111852800, 1130601600, 1143907200, 1162051200, 1174752000, 1193500800, 1207411200, 1223136000 }
@@ -2081,19 +2100,19 @@
finalRule { "AN" }
finalRaw:int { 36000 }
finalYear:int { 2009 }
- links:intvector { 1, 339, 343, 352, 357 }
- } //Z#357
- /* Australia/Tasmania */ :int { 347 } //Z#358
- /* Australia/Victoria */ :int { 351 } //Z#359
- /* Australia/West */ :int { 354 } //Z#360
- /* Australia/Yancowinna */ :int { 342 } //Z#361
- /* BET */ :int { 200 } //Z#362
- /* BST */ :int { 257 } //Z#363
- /* Brazil/Acre */ :int { 194 } //Z#364
- /* Brazil/DeNoronha */ :int { 175 } //Z#365
- /* Brazil/East */ :int { 200 } //Z#366
- /* Brazil/West */ :int { 155 } //Z#367
- /* CAT */ :int { 29 } //Z#368
+ links:intvector { 1, 341, 345, 354, 359 }
+ } //Z#359
+ /* Australia/Tasmania */ :int { 349 } //Z#360
+ /* Australia/Victoria */ :int { 353 } //Z#361
+ /* Australia/West */ :int { 356 } //Z#362
+ /* Australia/Yancowinna */ :int { 344 } //Z#363
+ /* BET */ :int { 200 } //Z#364
+ /* BST */ :int { 257 } //Z#365
+ /* Brazil/Acre */ :int { 194 } //Z#366
+ /* Brazil/DeNoronha */ :int { 175 } //Z#367
+ /* Brazil/East */ :int { 200 } //Z#368
+ /* Brazil/West */ :int { 155 } //Z#369
+ /* CAT */ :int { 29 } //Z#370
/* CET */ :table {
trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -938905200, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -766623600, 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
typeOffsets:intvector { 3600, 0, 3600, 3600 }
@@ -2101,9 +2120,9 @@
finalRule { "C-Eur" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- } //Z#369
- /* CNT */ :int { 205 } //Z#370
- /* CST */ :int { 98 } //Z#371
+ } //Z#371
+ /* CNT */ :int { 205 } //Z#372
+ /* CST */ :int { 98 } //Z#373
/* CST6CDT */ :table {
trans:intvector { -1633276800, -1615136400, -1601827200, -1583686800, -880214400, -765392400, -84384000, -68662800, -52934400, -37213200, -21484800, -5763600, 9964800, 25686000, 41414400, 57740400, 73468800, 89190000, 104918400, 120639600, 126691200, 152089200, 162374400, 183538800, 199267200, 215593200, 230716800, 247042800, 262771200, 278492400, 294220800, 309942000, 325670400, 341391600, 357120000, 372841200, 388569600, 404895600, 420019200, 436345200, 452073600, 467794800, 483523200, 499244400, 514972800, 530694000, 544608000, 562143600, 576057600, 594198000, 607507200, 625647600, 638956800, 657097200, 671011200, 688546800, 702460800, 719996400, 733910400, 752050800, 765360000, 783500400, 796809600, 814950000, 828864000, 846399600, 860313600, 877849200, 891763200, 909298800, 923212800, 941353200, 954662400, 972802800, 986112000, 1004252400, 1018166400, 1035702000, 1049616000, 1067151600, 1081065600, 1099206000, 1112515200, 1130655600, 1143964800, 1162105200, 1173600000, 1194159600 }
typeOffsets:intvector { -21600, 0, -21600, 3600 }
@@ -2111,22 +2130,22 @@
finalRule { "US" }
finalRaw:int { -21600 }
finalYear:int { 2008 }
- } //Z#372
- /* CTT */ :int { 308 } //Z#373
- /* Canada/Atlantic */ :int { 127 } //Z#374
- /* Canada/Central */ :int { 220 } //Z#375
- /* Canada/East-Saskatchewan */ :int { 192 } //Z#376
- /* Canada/Eastern */ :int { 215 } //Z#377
- /* Canada/Mountain */ :int { 112 } //Z#378
- /* Canada/Newfoundland */ :int { 205 } //Z#379
- /* Canada/Pacific */ :int { 217 } //Z#380
- /* Canada/Saskatchewan */ :int { 192 } //Z#381
- /* Canada/Yukon */ :int { 219 } //Z#382
- /* Chile/Continental */ :int { 198 } //Z#383
- /* Chile/EasterIsland */ :int { 543 } //Z#384
- /* Cuba */ :int { 128 } //Z#385
- /* EAT */ :int { 7 } //Z#386
- /* ECT */ :int { 462 } //Z#387
+ } //Z#374
+ /* CTT */ :int { 309 } //Z#375
+ /* Canada/Atlantic */ :int { 127 } //Z#376
+ /* Canada/Central */ :int { 220 } //Z#377
+ /* Canada/East-Saskatchewan */ :int { 192 } //Z#378
+ /* Canada/Eastern */ :int { 215 } //Z#379
+ /* Canada/Mountain */ :int { 112 } //Z#380
+ /* Canada/Newfoundland */ :int { 205 } //Z#381
+ /* Canada/Pacific */ :int { 217 } //Z#382
+ /* Canada/Saskatchewan */ :int { 192 } //Z#383
+ /* Canada/Yukon */ :int { 219 } //Z#384
+ /* Chile/Continental */ :int { 198 } //Z#385
+ /* Chile/EasterIsland */ :int { 546 } //Z#386
+ /* Cuba */ :int { 128 } //Z#387
+ /* EAT */ :int { 7 } //Z#388
+ /* ECT */ :int { 465 } //Z#389
/* EET */ :table {
trans:intvector { 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
typeOffsets:intvector { 7200, 0, 7200, 3600 }
@@ -2134,10 +2153,10 @@
finalRule { "EU" }
finalRaw:int { 7200 }
finalYear:int { 1997 }
- } //Z#388
+ } //Z#390
/* EST */ :table {
typeOffsets:intvector { -18000, 0 }
- } //Z#389
+ } //Z#391
/* EST5EDT */ :table {
trans:intvector { -1633280400, -1615140000, -1601830800, -1583690400, -880218000, -765396000, -84387600, -68666400, -52938000, -37216800, -21488400, -5767200, 9961200, 25682400, 41410800, 57736800, 73465200, 89186400, 104914800, 120636000, 126687600, 152085600, 162370800, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954658800, 972799200, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000 }
typeOffsets:intvector { -18000, 0, -18000, 3600 }
@@ -2145,108 +2164,108 @@
finalRule { "US" }
finalRaw:int { -18000 }
finalYear:int { 2008 }
- } //Z#390
- /* Egypt */ :int { 18 } //Z#391
- /* Eire */ :int { 441 } //Z#392
+ } //Z#392
+ /* Egypt */ :int { 18 } //Z#393
+ /* Eire */ :int { 444 } //Z#394
/* Etc/GMT */ :table {
typeOffsets:intvector { 0, 0 }
- links:intvector { 393, 394, 407, 422, 423, 490, 491, 492, 493, 494 }
- } //Z#393
- /* Etc/GMT+0 */ :int { 393 } //Z#394
+ links:intvector { 395, 396, 409, 424, 425, 493, 494, 495, 496, 497 }
+ } //Z#395
+ /* Etc/GMT+0 */ :int { 395 } //Z#396
/* Etc/GMT+1 */ :table {
typeOffsets:intvector { -3600, 0 }
- } //Z#395
+ } //Z#397
/* Etc/GMT+10 */ :table {
typeOffsets:intvector { -36000, 0 }
- } //Z#396
+ } //Z#398
/* Etc/GMT+11 */ :table {
typeOffsets:intvector { -39600, 0 }
- } //Z#397
+ } //Z#399
/* Etc/GMT+12 */ :table {
typeOffsets:intvector { -43200, 0 }
- } //Z#398
+ } //Z#400
/* Etc/GMT+2 */ :table {
typeOffsets:intvector { -7200, 0 }
- } //Z#399
+ } //Z#401
/* Etc/GMT+3 */ :table {
typeOffsets:intvector { -10800, 0 }
- } //Z#400
+ } //Z#402
/* Etc/GMT+4 */ :table {
typeOffsets:intvector { -14400, 0 }
- } //Z#401
+ } //Z#403
/* Etc/GMT+5 */ :table {
typeOffsets:intvector { -18000, 0 }
- } //Z#402
+ } //Z#404
/* Etc/GMT+6 */ :table {
typeOffsets:intvector { -21600, 0 }
- } //Z#403
+ } //Z#405
/* Etc/GMT+7 */ :table {
typeOffsets:intvector { -25200, 0 }
- } //Z#404
+ } //Z#406
/* Etc/GMT+8 */ :table {
typeOffsets:intvector { -28800, 0 }
- } //Z#405
+ } //Z#407
/* Etc/GMT+9 */ :table {
typeOffsets:intvector { -32400, 0 }
- } //Z#406
- /* Etc/GMT-0 */ :int { 393 } //Z#407
+ } //Z#408
+ /* Etc/GMT-0 */ :int { 395 } //Z#409
/* Etc/GMT-1 */ :table {
typeOffsets:intvector { 3600, 0 }
- } //Z#408
+ } //Z#410
/* Etc/GMT-10 */ :table {
typeOffsets:intvector { 36000, 0 }
- } //Z#409
+ } //Z#411
/* Etc/GMT-11 */ :table {
typeOffsets:intvector { 39600, 0 }
- } //Z#410
+ } //Z#412
/* Etc/GMT-12 */ :table {
typeOffsets:intvector { 43200, 0 }
- } //Z#411
+ } //Z#413
/* Etc/GMT-13 */ :table {
typeOffsets:intvector { 46800, 0 }
- } //Z#412
+ } //Z#414
/* Etc/GMT-14 */ :table {
typeOffsets:intvector { 50400, 0 }
- } //Z#413
+ } //Z#415
/* Etc/GMT-2 */ :table {
typeOffsets:intvector { 7200, 0 }
- } //Z#414
+ } //Z#416
/* Etc/GMT-3 */ :table {
typeOffsets:intvector { 10800, 0 }
- } //Z#415
+ } //Z#417
/* Etc/GMT-4 */ :table {
typeOffsets:intvector { 14400, 0 }
- } //Z#416
+ } //Z#418
/* Etc/GMT-5 */ :table {
typeOffsets:intvector { 18000, 0 }
- } //Z#417
+ } //Z#419
/* Etc/GMT-6 */ :table {
typeOffsets:intvector { 21600, 0 }
- } //Z#418
+ } //Z#420
/* Etc/GMT-7 */ :table {
typeOffsets:intvector { 25200, 0 }
- } //Z#419
+ } //Z#421
/* Etc/GMT-8 */ :table {
typeOffsets:intvector { 28800, 0 }
- } //Z#420
+ } //Z#422
/* Etc/GMT-9 */ :table {
typeOffsets:intvector { 32400, 0 }
- } //Z#421
- /* Etc/GMT0 */ :int { 393 } //Z#422
- /* Etc/Greenwich */ :int { 393 } //Z#423
+ } //Z#423
+ /* Etc/GMT0 */ :int { 395 } //Z#424
+ /* Etc/Greenwich */ :int { 395 } //Z#425
/* Etc/UCT */ :table {
typeOffsets:intvector { 0, 0 }
- links:intvector { 424, 601 }
- } //Z#424
+ links:intvector { 426, 604 }
+ } //Z#426
/* Etc/UTC */ :table {
typeOffsets:intvector { 0, 0 }
- links:intvector { 425, 426, 428, 615, 616, 620 }
- } //Z#425
- /* Etc/Universal */ :int { 425 } //Z#426
+ links:intvector { 427, 428, 430, 618, 619, 623 }
+ } //Z#427
+ /* Etc/Universal */ :int { 427 } //Z#428
/* Etc/Unknown */ :table {
typeOffsets:intvector { 0, 0 }
- } //Z#427
- /* Etc/Zulu */ :int { 425 } //Z#428
+ } //Z#429
+ /* Etc/Zulu */ :int { 427 } //Z#430
/* Europe/Amsterdam */ :table {
trans:intvector { -1693700372, -1680484772, -1663453172, -1650147572, -1633213172, -1617488372, -1601158772, -1586038772, -1569709172, -1554589172, -1538259572, -1523139572, -1507501172, -1490566772, -1470176372, -1459117172, -1443997172, -1427667572, -1406672372, -1396217972, -1376950772, -1364768372, -1345414772, -1333318772, -1313792372, -1301264372, -1282256372, -1269814772, -1250720372, -1238365172, -1219184372, -1206915572, -1186957172, -1175465972, -1156025972, -1143411572, -1124489972, -1111961972, -1092953972, -1080512372, -1061331572, -1049062772, -1029190772, -1025745572, -1017613200, -998259600, -986163600, -966723600, -954109200, -935022000, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -766623600, 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
typeOffsets:intvector { 1172, 0, 1172, 3600, 1200, 0, 1200, 3600, 3600, 0, 3600, 3600 }
@@ -2254,7 +2273,7 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- } //Z#429
+ } //Z#431
/* Europe/Andorra */ :table {
transPre32:intvector { -1, 2117514132 }
trans:intvector { -733881600, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -2263,7 +2282,7 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- } //Z#430
+ } //Z#432
/* Europe/Athens */ :table {
trans:intvector { -1686101632, -1182996000, -1178161200, -906861600, -904878000, -857257200, -844477200, -828237600, -812422800, -552362400, -541652400, 166485600, 186184800, 198028800, 213753600, 228873600, 244080000, 260323200, 275446800, 291798000, 307407600, 323388000, 338936400, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
typeOffsets:intvector { 5692, 0, 3600, 0, 3600, 3600, 7200, 0, 7200, 3600 }
@@ -2271,8 +2290,8 @@
finalRule { "EU" }
finalRaw:int { 7200 }
finalYear:int { 1997 }
- } //Z#431
- /* Europe/Belfast */ :int { 452 } //Z#432
+ } //Z#433
+ /* Europe/Belfast */ :int { 455 } //Z#434
/* Europe/Belgrade */ :table {
transPre32:intvector { -1, 1581051976 }
trans:intvector { -905824800, -857257200, -844556400, -828226800, -812502000, -796777200, -777942000, -766623600, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -2281,8 +2300,8 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- links:intvector { 433, 451, 463, 469, 471, 484 }
- } //Z#433
+ links:intvector { 435, 454, 466, 472, 474, 487 }
+ } //Z#435
/* Europe/Berlin */ :table {
transPre32:intvector { -1, 1872912888 }
trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -938905200, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -776563200, -765936000, -761180400, -748479600, -733273200, -717631200, -714610800, -710380800, -701910000, -684975600, -670460400, -654130800, -639010800, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -2291,8 +2310,8 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- } //Z#434
- /* Europe/Bratislava */ :int { 464 } //Z#435
+ } //Z#436
+ /* Europe/Bratislava */ :int { 467 } //Z#437
/* Europe/Brussels */ :table {
transPre32:intvector { -1, 1844014246 }
trans:intvector { -1740355200, -1693702800, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -1613826000, -1604278800, -1585530000, -1574038800, -1552266000, -1539997200, -1520557200, -1507510800, -1490576400, -1473642000, -1459126800, -1444006800, -1427677200, -1411952400, -1396227600, -1379293200, -1364778000, -1348448400, -1333328400, -1316394000, -1301263200, -1284328800, -1269813600, -1253484000, -1238364000, -1221429600, -1206914400, -1191189600, -1175464800, -1160344800, -1143410400, -1127685600, -1111960800, -1096840800, -1080511200, -1063576800, -1049061600, -1033336800, -1017612000, -1002492000, -986162400, -969228000, -950479200, -942012000, -934668000, -857257200, -844556400, -828226800, -812502000, -798073200, -781052400, -766623600, -745455600, -733273200, 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -2301,7 +2320,7 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- } //Z#436
+ } //Z#438
/* Europe/Bucharest */ :table {
trans:intvector { -1213148664, -1187056800, -1175479200, -1159754400, -1144029600, -1127700000, -1111975200, -1096250400, -1080525600, -1064800800, -1049076000, -1033351200, -1017626400, -1001901600, -986176800, -970452000, -954727200, 296604000, 307486800, 323816400, 338940000, 354672000, 370396800, 386121600, 401846400, 417571200, 433296000, 449020800, 465350400, 481075200, 496800000, 512524800, 528249600, 543974400, 559699200, 575424000, 591148800, 606873600, 622598400, 638323200, 654652800, 670370400, 686095200, 701820000, 717544800, 733269600, 748994400, 764719200, 780440400, 796168800, 811890000, 828223200, 846363600, 859683600, 877827600 }
typeOffsets:intvector { 6264, 0, 7200, 0, 7200, 3600 }
@@ -2309,7 +2328,7 @@
finalRule { "EU" }
finalRaw:int { 7200 }
finalYear:int { 1998 }
- } //Z#437
+ } //Z#439
/* Europe/Budapest */ :table {
transPre32:intvector { -1, 1794028316 }
trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1633212000, -1617577200, -1600466400, -1587250800, -1569708000, -1554332400, -906937200, -857257200, -844556400, -828226800, -812502000, -796777200, -778471200, -762487200, -749689200, -733359600, -717634800, -701910000, -686185200, -670460400, -654130800, -639010800, -621990000, -605660400, -492656400, -481168800, -461120400, -449632800, -428547600, -418269600, -397094400, -386809200, 323827200, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -2318,7 +2337,8 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- } //Z#438
+ } //Z#440
+ /* Europe/Busingen */ :int { 489 } //Z#441
/* Europe/Chisinau */ :table {
transPre32:intvector { -1, 1454819576 }
trans:intvector { -1637114100, -1213148664, -1187056800, -1175479200, -1159754400, -1144029600, -1127700000, -1111975200, -1096250400, -1080525600, -1064800800, -1049076000, -1033351200, -1017626400, -1001901600, -986176800, -970452000, -954727200, -927165600, -898138800, -857257200, -844556400, -828226800, -812502000, -800157600, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 641941200, 670377600, 686102400, 701820000, 717541200, 733269600, 748990800, 764719200, 780440400, 796168800, 811890000, 828223200, 846363600, 859683600, 877827600 }
@@ -2327,8 +2347,8 @@
finalRule { "EU" }
finalRaw:int { 7200 }
finalYear:int { 1998 }
- links:intvector { 439, 476 }
- } //Z#439
+ links:intvector { 442, 479 }
+ } //Z#442
/* Europe/Copenhagen */ :table {
transPre32:intvector { -1, 1896673076 }
trans:intvector { -1692496800, -1680490800, -935110800, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -769388400, -747010800, -736383600, -715215600, -706748400, -683161200, -675298800, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -2337,7 +2357,7 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- } //Z#440
+ } //Z#443
/* Europe/Dublin */ :table {
transPre32:intvector { -1, 1473317596 }
trans:intvector { -1691962479, -1680471279, -1664143200, -1650146400, -1633903200, -1617487200, -1601848800, -1586037600, -1570399200, -1552168800, -1538344800, -1522533600, -1507500000, -1490565600, -1473631200, -1460930400, -1442786400, -1428876000, -1410732000, -1396216800, -1379282400, -1364767200, -1348437600, -1333317600, -1315778400, -1301263200, -1284328800, -1269813600, -1253484000, -1238364000, -1221429600, -1206914400, -1189980000, -1175464800, -1159135200, -1143410400, -1126476000, -1111960800, -1095631200, -1080511200, -1063576800, -1049061600, -1032127200, -1017612000, -1001282400, -986162400, -969228000, -950479200, -942012000, -733359600, -719445600, -699490800, -684972000, -668037600, -654732000, -636588000, -622072800, -605743200, -590623200, -574293600, -558568800, -542239200, -527119200, -512604000, -496274400, -481154400, -464220000, -449704800, -432165600, -417650400, -401320800, -386200800, -369266400, -354751200, -337816800, -323301600, -306972000, -291852000, -276732000, -257983200, -245282400, -226533600, -213228000, -195084000, -182383200, -163634400, -150933600, -132184800, -119484000, -100735200, -88034400, -68680800, -59004000, -37242000, 57722400, 69818400, 89172000, 101268000, 120621600, 132717600, 152071200, 164167200, 183520800, 196221600, 214970400, 227671200, 246420000, 259120800, 278474400, 290570400, 309924000, 322020000, 341373600, 354675600, 372819600, 386125200, 404269200, 417574800, 435718800, 449024400, 467773200, 481078800, 499222800, 512528400, 530672400, 543978000, 562122000, 575427600, 593571600, 606877200, 625626000, 638326800, 657075600, 670381200, 688525200, 701830800, 719974800, 733280400, 751424400, 764730000, 782874000, 796179600, 814323600, 828234000, 846378000 }
@@ -2346,8 +2366,8 @@
finalRule { "EU" }
finalRaw:int { 0 }
finalYear:int { 1997 }
- links:intvector { 392, 441 }
- } //Z#441
+ links:intvector { 394, 444 }
+ } //Z#444
/* Europe/Gibraltar */ :table {
transPre32:intvector { -1, 1473317380 }
trans:intvector { -1691964000, -1680472800, -1664143200, -1650146400, -1633903200, -1617487200, -1601848800, -1586037600, -1570399200, -1552168800, -1538344800, -1522533600, -1507500000, -1490565600, -1473631200, -1460930400, -1442786400, -1428876000, -1410732000, -1396216800, -1379282400, -1364767200, -1348437600, -1333317600, -1315778400, -1301263200, -1284328800, -1269813600, -1253484000, -1238364000, -1221429600, -1206914400, -1189980000, -1175464800, -1159135200, -1143410400, -1126476000, -1111960800, -1095631200, -1080511200, -1063576800, -1049061600, -1032127200, -1017612000, -1001282400, -986162400, -969228000, -950479200, -942012000, -904518000, -896050800, -875487600, -864601200, -844038000, -832546800, -812588400, -798073200, -781052400, -772066800, -764805600, -748476000, -733356000, -719445600, -717030000, -706748400, -699487200, -687996000, -668037600, -654732000, -636588000, -622072800, -605743200, -590623200, -574293600, -558568800, -542239200, -527119200, -512604000, -496274400, -481154400, -464220000, -449704800, -432165600, -417650400, -401320800, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -2356,8 +2376,8 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- } //Z#442
- /* Europe/Guernsey */ :int { 452 } //Z#443
+ } //Z#445
+ /* Europe/Guernsey */ :int { 455 } //Z#446
/* Europe/Helsinki */ :table {
trans:intvector { -1535938792, -875671200, -859863600, 354672000, 370396800, 386121600, 401846400, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
typeOffsets:intvector { 5992, 0, 7200, 0, 7200, 3600 }
@@ -2365,9 +2385,9 @@
finalRule { "EU" }
finalRaw:int { 7200 }
finalYear:int { 1997 }
- links:intvector { 444, 456 }
- } //Z#444
- /* Europe/Isle_of_Man */ :int { 452 } //Z#445
+ links:intvector { 447, 459 }
+ } //Z#447
+ /* Europe/Isle_of_Man */ :int { 455 } //Z#448
/* Europe/Istanbul */ :table {
transPre32:intvector { -1, 1454819544 }
trans:intvector { -1869875816, -1693706400, -1680490800, -1570413600, -1552186800, -1538359200, -1522551600, -1507514400, -1490583600, -1440208800, -1428030000, -1409709600, -1396494000, -931140000, -922762800, -917834400, -892436400, -875844000, -857358000, -781063200, -764737200, -744343200, -733806000, -716436000, -701924400, -684986400, -670474800, -654141600, -639025200, -621828000, -606970800, -590032800, -575434800, -235620000, -228279600, -177732000, -165726000, 10533600, 23835600, 41983200, 55285200, 74037600, 87339600, 107910000, 121219200, 133920000, 152676000, 165362400, 183502800, 202428000, 215557200, 228866400, 245797200, 260316000, 277246800, 308779200, 323827200, 340228800, 354672000, 371678400, 386121600, 403128000, 428446800, 433886400, 482792400, 496702800, 512524800, 528249600, 543974400, 559699200, 575424000, 591148800, 606873600, 622598400, 638323200, 654652800, 670374000, 686098800, 701823600, 717548400, 733273200, 748998000, 764722800, 780447600, 796172400, 811897200, 828226800, 846370800, 859676400, 877820400, 891126000, 909270000, 922575600, 941324400, 954025200, 972774000, 985474800, 1004223600, 1017529200, 1035673200, 1048978800, 1067122800, 1080428400, 1099177200, 1111878000, 1130626800, 1143327600, 1162076400, 1174784400, 1193533200, 1206838800, 1224982800, 1238288400, 1256432400, 1269738000, 1288486800, 1301274000, 1319936400, 1332637200, 1351386000 }
@@ -2376,15 +2396,15 @@
finalRule { "EU" }
finalRaw:int { 7200 }
finalYear:int { 2013 }
- links:intvector { 268, 446, 600 }
- } //Z#446
- /* Europe/Jersey */ :int { 452 } //Z#447
+ links:intvector { 268, 449, 603 }
+ } //Z#449
+ /* Europe/Jersey */ :int { 455 } //Z#450
/* Europe/Kaliningrad */ :table {
transPre32:intvector { -1, 1872911176 }
trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -938905200, -857257200, -844556400, -828226800, -812502000, -796777200, -788922000, -778730400, -762663600, -757389600, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 638319600, 654649200, 670374000, 686102400, 701816400, 717537600, 733276800, 749001600, 764726400, 780451200, 796176000, 811900800, 828230400, 846374400, 859680000, 877824000, 891129600, 909273600, 922579200, 941328000, 954028800, 972777600, 985478400, 1004227200, 1017532800, 1035676800, 1048982400, 1067126400, 1080432000, 1099180800, 1111881600, 1130630400, 1143331200, 1162080000, 1174780800, 1193529600, 1206835200, 1224979200, 1238284800, 1256428800, 1269734400, 1288483200, 1301184000 }
typeOffsets:intvector { 4920, 0, 3600, 0, 3600, 3600, 7200, 0, 7200, 3600, 10800, 0, 10800, 3600 }
typeMap:bin { "010201020102010201020102010304030506050605060506050605060506050605060506050403040304030403040304030403040304030403040304030403040304030403040304030403040305" }
- } //Z#448
+ } //Z#451
/* Europe/Kiev */ :table {
trans:intvector { -1441159324, -1247536800, -892522800, -857257200, -844556400, -828226800, -825382800, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 646786800, 701820000, 717541200, 733269600, 748990800, 764719200, 780440400, 796179600, 811904400, 828234000, 846378000 }
typeOffsets:intvector { 7324, 0, 3600, 0, 3600, 3600, 7200, 0, 7200, 3600, 10800, 0, 10800, 3600 }
@@ -2392,7 +2412,7 @@
finalRule { "EU" }
finalRaw:int { 7200 }
finalYear:int { 1997 }
- } //Z#449
+ } //Z#452
/* Europe/Lisbon */ :table {
trans:intvector { -1830381808, -1689555600, -1677801600, -1667437200, -1647738000, -1635814800, -1616202000, -1604365200, -1584666000, -1572742800, -1553043600, -1541206800, -1521507600, -1442451600, -1426813200, -1379293200, -1364778000, -1348448400, -1333328400, -1316394000, -1301274000, -1284339600, -1269824400, -1221440400, -1206925200, -1191200400, -1175475600, -1127696400, -1111971600, -1096851600, -1080522000, -1063587600, -1049072400, -1033347600, -1017622800, -1002502800, -986173200, -969238800, -950490000, -942022800, -922669200, -906944400, -891133200, -877309200, -873684000, -864007200, -857955600, -845859600, -842839200, -831348000, -825901200, -814410000, -810784800, -799898400, -794451600, -782960400, -779335200, -768448800, -763002000, -749091600, -733366800, -717631200, -701906400, -686181600, -670456800, -654732000, -639007200, -591832800, -575503200, -559778400, -544053600, -528328800, -512604000, -496879200, -481154400, -465429600, -449704800, -433980000, -417650400, -401925600, -386200800, -370476000, -354751200, -339026400, -323301600, -307576800, -291852000, -276127200, -260402400, -244677600, -228348000, -212623200, -196898400, -181173600, -165448800, -149724000, -133999200, -118274400, 212544000, 228268800, 243993600, 260323200, 276048000, 291772800, 307501200, 323222400, 338950800, 354675600, 370400400, 386125200, 401850000, 417578400, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
typeOffsets:intvector { -2192, 0, 0, 0, 0, 3600, 0, 7200, 3600, 0, 3600, 3600 }
@@ -2400,9 +2420,9 @@
finalRule { "EU" }
finalRaw:int { 0 }
finalYear:int { 1997 }
- links:intvector { 450, 582 }
- } //Z#450
- /* Europe/Ljubljana */ :int { 433 } //Z#451
+ links:intvector { 453, 585 }
+ } //Z#453
+ /* Europe/Ljubljana */ :int { 435 } //Z#454
/* Europe/London */ :table {
transPre32:intvector { -1, 442304971 }
trans:intvector { -1691964000, -1680472800, -1664143200, -1650146400, -1633903200, -1617487200, -1601848800, -1586037600, -1570399200, -1552168800, -1538344800, -1522533600, -1507500000, -1490565600, -1473631200, -1460930400, -1442786400, -1428876000, -1410732000, -1396216800, -1379282400, -1364767200, -1348437600, -1333317600, -1315778400, -1301263200, -1284328800, -1269813600, -1253484000, -1238364000, -1221429600, -1206914400, -1189980000, -1175464800, -1159135200, -1143410400, -1126476000, -1111960800, -1095631200, -1080511200, -1063576800, -1049061600, -1032127200, -1017612000, -1001282400, -986162400, -969228000, -950479200, -942012000, -904518000, -896050800, -875487600, -864601200, -844038000, -832546800, -812588400, -798073200, -781052400, -772066800, -764805600, -748476000, -733356000, -719445600, -717030000, -706748400, -699487200, -687996000, -668037600, -654732000, -636588000, -622072800, -605743200, -590623200, -574293600, -558568800, -542239200, -527119200, -512604000, -496274400, -481154400, -464220000, -449704800, -432165600, -417650400, -401320800, -386200800, -369266400, -354751200, -337816800, -323301600, -306972000, -291852000, -276732000, -257983200, -245282400, -226533600, -213228000, -195084000, -182383200, -163634400, -150933600, -132184800, -119484000, -100735200, -88034400, -68680800, -59004000, -37242000, 57722400, 69818400, 89172000, 101268000, 120621600, 132717600, 152071200, 164167200, 183520800, 196221600, 214970400, 227671200, 246420000, 259120800, 278474400, 290570400, 309924000, 322020000, 341373600, 354675600, 372819600, 386125200, 404269200, 417574800, 435718800, 449024400, 467773200, 481078800, 499222800, 512528400, 530672400, 543978000, 562122000, 575427600, 593571600, 606877200, 625626000, 638326800, 657075600, 670381200, 688525200, 701830800, 719974800, 733280400, 751424400, 764730000, 782874000, 796179600, 814323600, 828234000, 846378000 }
@@ -2411,8 +2431,8 @@
finalRule { "EU" }
finalRaw:int { 0 }
finalYear:int { 1997 }
- links:intvector { 432, 443, 445, 447, 452, 488, 489 }
- } //Z#452
+ links:intvector { 434, 446, 448, 450, 455, 491, 492 }
+ } //Z#455
/* Europe/Luxembourg */ :table {
trans:intvector { -2069713476, -1692496800, -1680483600, -1662343200, -1650157200, -1632006000, -1618700400, -1612659600, -1604278800, -1585519200, -1574038800, -1552258800, -1539997200, -1520550000, -1507510800, -1490572800, -1473642000, -1459119600, -1444006800, -1427673600, -1411866000, -1396224000, -1379293200, -1364774400, -1348448400, -1333324800, -1316394000, -1301270400, -1284339600, -1269813600, -1253484000, -1238364000, -1221429600, -1206914400, -1191189600, -1175464800, -1160344800, -1143410400, -1127685600, -1111960800, -1096840800, -1080511200, -1063576800, -1049061600, -1033336800, -1017612000, -1002492000, -986162400, -969228000, -950479200, -942012000, -935186400, -857257200, -844556400, -828226800, -812502000, -797986800, -781052400, -766623600, -745455600, -733273200, 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
typeOffsets:intvector { 1476, 0, 0, 0, 0, 3600, 3600, 0, 3600, 3600 }
@@ -2420,7 +2440,7 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- } //Z#453
+ } //Z#456
/* Europe/Madrid */ :table {
transPre32:intvector { -1, 2117515380 }
trans:intvector { -1661734800, -1648429200, -1631926800, -1616893200, -1601254800, -1585357200, -1442451600, -1427677200, -1379293200, -1364778000, -1348448400, -1333328400, -1316394000, -1301274000, -1284339600, -1269824400, -1029114000, -1017622800, -1002848400, -986173200, -969238800, -954118800, -940208400, -873079200, -862538400, -842839200, -828237600, -811389600, -796010400, -779940000, -765421200, -748490400, -733888800, -652327200, -639190800, 135122400, 150246000, 167176800, 181695600, 196812000, 212540400, 228866400, 243990000, 260402400, 276044400, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -2429,7 +2449,7 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- } //Z#454
+ } //Z#457
/* Europe/Malta */ :table {
transPre32:intvector { -1, 1891488612 }
trans:intvector { -1690851600, -1680483600, -1664758800, -1649034000, -1635123600, -1616979600, -1604278800, -1585530000, -1571014800, -1555290000, -932432400, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -766717200, -750898800, -733359600, -719456400, -701917200, -689209200, -670460400, -114051600, -103168800, -81997200, -71719200, -50547600, -40269600, -18493200, -8215200, 12956400, 23234400, 43801200, 54687600, 75855600, 86738400, 102380400, 118105200, 135730800, 148518000, 167187600, 180489600, 198637200, 211939200, 230086800, 243388800, 261536400, 274838400, 292986000, 306288000, 323312400, 338342400, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -2438,14 +2458,14 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- } //Z#455
- /* Europe/Mariehamn */ :int { 444 } //Z#456
+ } //Z#458
+ /* Europe/Mariehamn */ :int { 447 } //Z#459
/* Europe/Minsk */ :table {
transPre32:intvector { -1, 1454819880 }
trans:intvector { -1441158600, -1247536800, -899780400, -857257200, -844556400, -828226800, -812502000, -804650400, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 670374000, 686102400, 701820000, 717544800, 733276800, 749001600, 764726400, 780451200, 796176000, 811900800, 828230400, 846374400, 859680000, 877824000, 891129600, 909273600, 922579200, 941328000, 954028800, 972777600, 985478400, 1004227200, 1017532800, 1035676800, 1048982400, 1067126400, 1080432000, 1099180800, 1111881600, 1130630400, 1143331200, 1162080000, 1174780800, 1193529600, 1206835200, 1224979200, 1238284800, 1256428800, 1269734400, 1288483200, 1301184000 }
typeOffsets:intvector { 6616, 0, 3600, 0, 3600, 3600, 6600, 0, 7200, 0, 7200, 3600, 10800, 0, 10800, 3600 }
typeMap:bin { "0304060201020102060706070607060706070607060706070607060504050405040504050405040504050405040504050405040504050405040504050405040504050406" }
- } //Z#457
+ } //Z#460
/* Europe/Monaco */ :table {
transPre32:intvector { -1, 1808287124 }
trans:intvector { -1855958961, -1689814800, -1680397200, -1665363600, -1648342800, -1635123600, -1616893200, -1604278800, -1585443600, -1574038800, -1552266000, -1539997200, -1520557200, -1507510800, -1490576400, -1470618000, -1459126800, -1444006800, -1427677200, -1411952400, -1396227600, -1379293200, -1364778000, -1348448400, -1333328400, -1316394000, -1301274000, -1284339600, -1269824400, -1253494800, -1238374800, -1221440400, -1206925200, -1191200400, -1175475600, -1160355600, -1143421200, -1127696400, -1111971600, -1096851600, -1080522000, -1063587600, -1049072400, -1033347600, -1017622800, -1002502800, -986173200, -969238800, -950490000, -942012000, -904438800, -891136800, -877827600, -857257200, -844556400, -828226800, -812502000, -796266000, -781052400, -766623600, 196819200, 212540400, 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -2454,15 +2474,15 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- } //Z#458
+ } //Z#461
/* Europe/Moscow */ :table {
transPre32:intvector { -1, 1454817476 }
trans:intvector { -1688265000, -1656819048, -1641353448, -1627965048, -1618716648, -1596429048, -1593829848, -1589860800, -1542427200, -1539493200, -1525323600, -1522728000, -1491188400, -1247536800, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 638319600, 654649200, 670374000, 686102400, 695779200, 701812800, 717534000, 733273200, 748998000, 764722800, 780447600, 796172400, 811897200, 828226800, 846370800, 859676400, 877820400, 891126000, 909270000, 922575600, 941324400, 954025200, 972774000, 985474800, 1004223600, 1017529200, 1035673200, 1048978800, 1067122800, 1080428400, 1099177200, 1111878000, 1130626800, 1143327600, 1162076400, 1174777200, 1193526000, 1206831600, 1224975600, 1238281200, 1256425200, 1269730800, 1288479600, 1301180400 }
typeOffsets:intvector { 9020, 0, 7200, 0, 7200, 3600, 9000, 0, 9048, 0, 9048, 3600, 9048, 7200, 10800, 0, 10800, 3600, 10800, 7200, 14400, 0 }
typeMap:bin { "030405040605060807080908070107080708070807080708070807080708070807080702010708070807080708070807080708070807080708070807080708070807080708070807080708070a" }
- links:intvector { 459, 618 }
- } //Z#459
- /* Europe/Nicosia */ :int { 289 } //Z#460
+ links:intvector { 462, 621 }
+ } //Z#462
+ /* Europe/Nicosia */ :int { 290 } //Z#463
/* Europe/Oslo */ :table {
transPre32:intvector { -1, 1928209516 }
trans:intvector { -1691884800, -1680573600, -927511200, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -765327600, -340844400, -324514800, -308790000, -293065200, -277340400, -261615600, -245890800, -230166000, -214441200, -198716400, -182991600, -166662000, -147913200, -135212400, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -2471,8 +2491,8 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- links:intvector { 234, 333, 461 }
- } //Z#461
+ links:intvector { 234, 335, 464 }
+ } //Z#464
/* Europe/Paris */ :table {
trans:intvector { -1855958901, -1689814800, -1680397200, -1665363600, -1648342800, -1635123600, -1616893200, -1604278800, -1585443600, -1574038800, -1552266000, -1539997200, -1520557200, -1507510800, -1490576400, -1470618000, -1459126800, -1444006800, -1427677200, -1411952400, -1396227600, -1379293200, -1364778000, -1348448400, -1333328400, -1316394000, -1301274000, -1284339600, -1269824400, -1253494800, -1238374800, -1221440400, -1206925200, -1191200400, -1175475600, -1160355600, -1143421200, -1127696400, -1111971600, -1096851600, -1080522000, -1063587600, -1049072400, -1033347600, -1017622800, -1002502800, -986173200, -969238800, -950490000, -942012000, -932436000, -857257200, -844556400, -828226800, -812502000, -800071200, -796266000, -781052400, -766623600, 196819200, 212540400, 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
typeOffsets:intvector { 561, 0, 0, 0, 0, 3600, 0, 7200, 3600, 0, 3600, 3600 }
@@ -2480,9 +2500,9 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- links:intvector { 387, 462 }
- } //Z#462
- /* Europe/Podgorica */ :int { 433 } //Z#463
+ links:intvector { 389, 465 }
+ } //Z#465
+ /* Europe/Podgorica */ :int { 435 } //Z#466
/* Europe/Prague */ :table {
transPre32:intvector { -1, 1825565432 }
trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -938905200, -857257200, -844556400, -828226800, -812502000, -798073200, -780534000, -761180400, -746578800, -733359600, -716425200, -701910000, -684975600, -670460400, -654217200, -639010800, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -2491,8 +2511,8 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- links:intvector { 435, 464 }
- } //Z#464
+ links:intvector { 437, 467 }
+ } //Z#467
/* Europe/Riga */ :table {
trans:intvector { -1632008184, -1618702584, -1601681784, -1597275384, -1377308184, -928029600, -899521200, -857257200, -844556400, -828226800, -812502000, -796777200, -795834000, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622598400, 638323200, 654652800, 670377600, 686102400, 701827200, 717552000, 733276800, 749001600, 764726400, 780451200, 796176000, 811900800, 828230400, 843955200, 859683600, 877827600, 891133200, 909277200, 922582800, 941331600, 985482000, 1004230800 }
typeOffsets:intvector { 5784, 0, 3600, 0, 3600, 3600, 5784, 3600, 7200, 0, 7200, 3600, 10800, 0, 10800, 3600 }
@@ -2500,7 +2520,7 @@
finalRule { "EU" }
finalRaw:int { 7200 }
finalYear:int { 2002 }
- } //Z#465
+ } //Z#468
/* Europe/Rome */ :table {
transPre32:intvector { -1, 1891402700 }
trans:intvector { -1690851600, -1680483600, -1664758800, -1649034000, -1635123600, -1616979600, -1604278800, -1585530000, -1571014800, -1555290000, -932432400, -857257200, -844556400, -828226800, -812502000, -798080400, -781052400, -766717200, -750898800, -733359600, -719456400, -701917200, -689209200, -670460400, -114051600, -103168800, -81997200, -71719200, -50547600, -40269600, -18493200, -8215200, 12956400, 23234400, 43801200, 54687600, 75855600, 86738400, 107910000, 118188000, 138754800, 149637600, 170809200, 181090800, 202258800, 212540400, 233103600, 243990000, 265158000, 276044400, 296607600, 307494000, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -2509,15 +2529,15 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- links:intvector { 466, 468, 479 }
- } //Z#466
+ links:intvector { 469, 471, 482 }
+ } //Z#469
/* Europe/Samara */ :table {
trans:intvector { -1593825636, -1247540400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622594800, 638319600, 654649200, 670374000, 686102400, 687916800, 701809200, 717530400, 733269600, 748994400, 764719200, 780444000, 796168800, 811893600, 828223200, 846367200, 859672800, 877816800, 891122400, 909266400, 922572000, 941320800, 954021600, 972770400, 985471200, 1004220000, 1017525600, 1035669600, 1048975200, 1067119200, 1080424800, 1099173600, 1111874400, 1130623200, 1143324000, 1162072800, 1174773600, 1193522400, 1206828000, 1224972000, 1238277600, 1256421600, 1269727200, 1288479600, 1301180400 }
typeOffsets:intvector { 12036, 0, 7200, 3600, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 }
typeMap:bin { "02040504050405040504050405040504050403020302010204050405040504050405040504050405040504050405040504050405040504050405040504030204" }
- } //Z#467
- /* Europe/San_Marino */ :int { 466 } //Z#468
- /* Europe/Sarajevo */ :int { 433 } //Z#469
+ } //Z#470
+ /* Europe/San_Marino */ :int { 469 } //Z#471
+ /* Europe/Sarajevo */ :int { 435 } //Z#472
/* Europe/Simferopol */ :table {
transPre32:intvector { -1, 1454818312 }
trans:intvector { -1441160160, -1247536800, -888894000, -857257200, -844556400, -828226800, -812502000, -811648800, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 646786800, 701820000, 717541200, 733269600, 748990800, 764719200, 767739600, 780436800, 796165200, 811886400, 828219600, 846374400, 859683600, 877827600 }
@@ -2526,8 +2546,8 @@
finalRule { "EU" }
finalRaw:int { 7200 }
finalYear:int { 1998 }
- } //Z#470
- /* Europe/Skopje */ :int { 433 } //Z#471
+ } //Z#473
+ /* Europe/Skopje */ :int { 435 } //Z#474
/* Europe/Sofia */ :table {
transPre32:intvector { -1, 1454820900, -1, 1925440280 }
trans:intvector { -857257200, -844556400, -828226800, -812502000, -796777200, -781048800, 291762000, 307576800, 323816400, 339026400, 355266000, 370393200, 386715600, 401846400, 417571200, 433296000, 449020800, 465350400, 481075200, 496800000, 512524800, 528249600, 543974400, 559699200, 575424000, 591148800, 606873600, 622598400, 638323200, 654652800, 670370400, 686091600, 701820000, 717541200, 733269600, 748990800, 764719200, 780440400, 796168800, 811890000, 828223200, 846363600, 859683600, 877827600 }
@@ -2536,7 +2556,7 @@
finalRule { "EU" }
finalRaw:int { 7200 }
finalYear:int { 1998 }
- } //Z#472
+ } //Z#475
/* Europe/Stockholm */ :table {
transPre32:intvector { -1, 1423286164, -1, 2085974882 }
trans:intvector { -1692496800, -1680483600, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -2545,7 +2565,7 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- } //Z#473
+ } //Z#476
/* Europe/Tallinn */ :table {
trans:intvector { -1638322740, -1632006000, -1618700400, -1593824400, -1535938740, -927943200, -892954800, -857257200, -844556400, -828226800, -812502000, -797652000, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622598400, 638323200, 654652800, 670377600, 686102400, 701827200, 717552000, 733276800, 749001600, 764726400, 780451200, 796176000, 811900800, 828230400, 846374400, 859680000, 877824000, 891129600, 909277200, 922582800, 941331600, 1017536400, 1035680400 }
typeOffsets:intvector { 5940, 0, 3600, 0, 3600, 3600, 7200, 0, 7200, 3600, 10800, 0, 10800, 3600 }
@@ -2553,7 +2573,7 @@
finalRule { "EU" }
finalRaw:int { 7200 }
finalYear:int { 2003 }
- } //Z#474
+ } //Z#477
/* Europe/Tirane */ :table {
trans:intvector { -1767230360, -932346000, -857257200, -844556400, -843519600, 136854000, 149896800, 168130800, 181432800, 199839600, 213141600, 231894000, 244591200, 263257200, 276040800, 294706800, 307490400, 326156400, 339458400, 357087600, 370389600, 389142000, 402444000, 419468400, 433807200, 449622000, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
typeOffsets:intvector { 4760, 0, 3600, 0, 3600, 3600 }
@@ -2561,8 +2581,8 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- } //Z#475
- /* Europe/Tiraspol */ :int { 439 } //Z#476
+ } //Z#478
+ /* Europe/Tiraspol */ :int { 442 } //Z#479
/* Europe/Uzhgorod */ :table {
transPre32:intvector { -1, 1794027544 }
trans:intvector { -938905200, -857257200, -844556400, -828226800, -812502000, -794714400, -773456400, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 646786800, 670384800, 701820000, 717541200, 733269600, 748990800, 764719200, 780440400, 796179600, 811904400, 828234000, 846378000 }
@@ -2571,7 +2591,7 @@
finalRule { "EU" }
finalRaw:int { 7200 }
finalYear:int { 1997 }
- } //Z#477
+ } //Z#480
/* Europe/Vaduz */ :table {
transPre32:intvector { -1, 1909720212 }
trans:intvector { 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -2580,17 +2600,17 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- } //Z#478
- /* Europe/Vatican */ :int { 466 } //Z#479
+ } //Z#481
+ /* Europe/Vatican */ :int { 469 } //Z#482
/* Europe/Vienna */ :table {
- transPre32:intvector { -1, 1872912176 }
+ transPre32:intvector { -1, 1872912175 }
trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -1569711600, -1555801200, -938905200, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -780188400, -748479600, -733359600, -717634800, -701910000, -684975600, -670460400, 323823600, 338940000, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
- typeOffsets:intvector { 3920, 0, 3600, 0, 3600, 3600 }
+ typeOffsets:intvector { 3921, 0, 3600, 0, 3600, 3600 }
typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- } //Z#480
+ } //Z#483
/* Europe/Vilnius */ :table {
transPre32:intvector { -1, 1454820420 }
trans:intvector { -1672536240, -1585100136, -1561251600, -1553565600, -928198800, -900126000, -857257200, -844556400, -828226800, -812502000, -802144800, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 638319600, 654649200, 670374000, 686102400, 701827200, 717552000, 733276800, 749001600, 764726400, 780451200, 796176000, 811900800, 828230400, 846374400, 859680000, 877824000, 891133200, 909277200, 922582800, 941331600, 1048986000, 1067130000 }
@@ -2599,12 +2619,12 @@
finalRule { "EU" }
finalRaw:int { 7200 }
finalYear:int { 2004 }
- } //Z#481
+ } //Z#484
/* Europe/Volgograd */ :table {
trans:intvector { -1577761060, -1247540400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622594800, 638319600, 654649200, 670374000, 701820000, 717534000, 733273200, 748998000, 764722800, 780447600, 796172400, 811897200, 828226800, 846370800, 859676400, 877820400, 891126000, 909270000, 922575600, 941324400, 954025200, 972774000, 985474800, 1004223600, 1017529200, 1035673200, 1048978800, 1067122800, 1080428400, 1099177200, 1111878000, 1130626800, 1143327600, 1162076400, 1174777200, 1193526000, 1206831600, 1224975600, 1238281200, 1256425200, 1269730800, 1288479600, 1301180400 }
typeOffsets:intvector { 10660, 0, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 }
typeMap:bin { "0103040304030403040304030403040304030201020103020102010201020102010201020102010201020102010201020102010201020102010201020103" }
- } //Z#482
+ } //Z#485
/* Europe/Warsaw */ :table {
trans:intvector { -1717032240, -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -1600473600, -1587168000, -1501725600, -931734000, -857257200, -844556400, -828226800, -812502000, -796608000, -778726800, -762660000, -748486800, -733273200, -715215600, -701910000, -684975600, -670460400, -654130800, -639010800, -397094400, -386812800, -371088000, -355363200, -334195200, -323308800, -307584000, -291859200, -271296000, -260409600, -239846400, -228960000, -208396800, -197510400, -176342400, -166060800, 228873600, 243993600, 260323200, 276048000, 291772800, 307497600, 323827200, 338947200, 354672000, 370396800, 386121600, 401846400, 417571200, 433296000, 449020800, 465350400, 481075200, 496800000, 512524800, 528249600, 543974400, 559699200, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
typeOffsets:intvector { 5040, 0, 3600, 0, 3600, 3600, 7200, 0, 7200, 3600 }
@@ -2612,9 +2632,9 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- links:intvector { 483, 581 }
- } //Z#483
- /* Europe/Zagreb */ :int { 433 } //Z#484
+ links:intvector { 486, 584 }
+ } //Z#486
+ /* Europe/Zagreb */ :int { 435 } //Z#487
/* Europe/Zaporozhye */ :table {
transPre32:intvector { -1, 1454818056 }
trans:intvector { -1441160400, -1247536800, -894769200, -857257200, -844556400, -828226800, -826419600, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 638319600, 654649200, 670374000, 686091600, 701820000, 717541200, 733269600, 748990800, 764719200, 780440400, 796179600, 811904400, 828234000, 846378000 }
@@ -2623,7 +2643,7 @@
finalRule { "EU" }
finalRaw:int { 7200 }
finalYear:int { 1997 }
- } //Z#485
+ } //Z#488
/* Europe/Zurich */ :table {
transPre32:intvector { -1, 467013248, -1, 1909720712 }
trans:intvector { -904435200, -891129600, -872985600, -859680000, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -2632,86 +2652,87 @@
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- } //Z#486
+ links:intvector { 441, 489 }
+ } //Z#489
/* Factory */ :table {
typeOffsets:intvector { 0, 0 }
- } //Z#487
- /* GB */ :int { 452 } //Z#488
- /* GB-Eire */ :int { 452 } //Z#489
- /* GMT */ :int { 393 } //Z#490
- /* GMT+0 */ :int { 393 } //Z#491
- /* GMT-0 */ :int { 393 } //Z#492
- /* GMT0 */ :int { 393 } //Z#493
- /* Greenwich */ :int { 393 } //Z#494
+ } //Z#490
+ /* GB */ :int { 455 } //Z#491
+ /* GB-Eire */ :int { 455 } //Z#492
+ /* GMT */ :int { 395 } //Z#493
+ /* GMT+0 */ :int { 395 } //Z#494
+ /* GMT-0 */ :int { 395 } //Z#495
+ /* GMT0 */ :int { 395 } //Z#496
+ /* Greenwich */ :int { 395 } //Z#497
/* HST */ :table {
typeOffsets:intvector { -36000, 0 }
- } //Z#495
- /* Hongkong */ :int { 265 } //Z#496
- /* IET */ :int { 130 } //Z#497
- /* IST */ :int { 278 } //Z#498
- /* Iceland */ :int { 335 } //Z#499
+ } //Z#498
+ /* Hongkong */ :int { 265 } //Z#499
+ /* IET */ :int { 130 } //Z#500
+ /* IST */ :int { 279 } //Z#501
+ /* Iceland */ :int { 337 } //Z#502
/* Indian/Antananarivo */ :table {
trans:intvector { -1846293004, -499924800, -492062400 }
typeOffsets:intvector { 11404, 0, 10800, 0, 10800, 3600 }
typeMap:bin { "010201" }
- } //Z#500
+ } //Z#503
/* Indian/Chagos */ :table {
trans:intvector { -1988167780, 820436400 }
typeOffsets:intvector { 17380, 0, 18000, 0, 21600, 0 }
typeMap:bin { "0102" }
- } //Z#501
+ } //Z#504
/* Indian/Christmas */ :table {
transPre32:intvector { -1, 1930865124 }
typeOffsets:intvector { 25372, 0, 25200, 0 }
typeMap:bin { "01" }
- } //Z#502
+ } //Z#505
/* Indian/Cocos */ :table {
transPre32:intvector { -1, 2085955236 }
typeOffsets:intvector { 23260, 0, 23400, 0 }
typeMap:bin { "01" }
- } //Z#503
+ } //Z#506
/* Indian/Comoro */ :table {
trans:intvector { -1846291984 }
typeOffsets:intvector { 10384, 0, 10800, 0 }
typeMap:bin { "01" }
- } //Z#504
+ } //Z#507
/* Indian/Kerguelen */ :table {
trans:intvector { -631152000 }
typeOffsets:intvector { 0, 0, 18000, 0 }
typeMap:bin { "01" }
- } //Z#505
+ } //Z#508
/* Indian/Mahe */ :table {
trans:intvector { -2006653308 }
typeOffsets:intvector { 13308, 0, 14400, 0 }
typeMap:bin { "01" }
- } //Z#506
+ } //Z#509
/* Indian/Maldives */ :table {
trans:intvector { -315636840 }
typeOffsets:intvector { 17640, 0, 18000, 0 }
typeMap:bin { "01" }
- } //Z#507
+ } //Z#510
/* Indian/Mauritius */ :table {
trans:intvector { -1988164200, 403041600, 417034800, 1224972000, 1238274000 }
typeOffsets:intvector { 13800, 0, 14400, 0, 14400, 3600 }
typeMap:bin { "0102010201" }
- } //Z#508
+ } //Z#511
/* Indian/Mayotte */ :table {
trans:intvector { -1846292456 }
typeOffsets:intvector { 10856, 0, 10800, 0 }
typeMap:bin { "01" }
- } //Z#509
+ } //Z#512
/* Indian/Reunion */ :table {
trans:intvector { -1848886912 }
typeOffsets:intvector { 13312, 0, 14400, 0 }
typeMap:bin { "01" }
- } //Z#510
- /* Iran */ :int { 313 } //Z#511
- /* Israel */ :int { 271 } //Z#512
- /* JST */ :int { 317 } //Z#513
- /* Jamaica */ :int { 141 } //Z#514
- /* Japan */ :int { 317 } //Z#515
- /* Kwajalein */ :int { 557 } //Z#516
- /* Libya */ :int { 56 } //Z#517
+ } //Z#513
+ /* Iran */ :int { 314 } //Z#514
+ /* Israel */ :int { 271 } //Z#515
+ /* JST */ :int { 318 } //Z#516
+ /* Jamaica */ :int { 141 } //Z#517
+ /* Japan */ :int { 318 } //Z#518
+ /* Kwajalein */ :int { 560 } //Z#519
+ /* Libya */ :int { 56 } //Z#520
/* MET */ :table {
trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -938905200, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -766623600, 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
typeOffsets:intvector { 3600, 0, 3600, 3600 }
@@ -2719,11 +2740,11 @@
finalRule { "C-Eur" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
- } //Z#518
- /* MIT */ :int { 539 } //Z#519
+ } //Z#521
+ /* MIT */ :int { 542 } //Z#522
/* MST */ :table {
typeOffsets:intvector { -25200, 0 }
- } //Z#520
+ } //Z#523
/* MST7MDT */ :table {
trans:intvector { -1633273200, -1615132800, -1601823600, -1583683200, -880210800, -765388800, -84380400, -68659200, -52930800, -37209600, -21481200, -5760000, 9968400, 25689600, 41418000, 57744000, 73472400, 89193600, 104922000, 120643200, 126694800, 152092800, 162378000, 183542400, 199270800, 215596800, 230720400, 247046400, 262774800, 278496000, 294224400, 309945600, 325674000, 341395200, 357123600, 372844800, 388573200, 404899200, 420022800, 436348800, 452077200, 467798400, 483526800, 499248000, 514976400, 530697600, 544611600, 562147200, 576061200, 594201600, 607510800, 625651200, 638960400, 657100800, 671014800, 688550400, 702464400, 720000000, 733914000, 752054400, 765363600, 783504000, 796813200, 814953600, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 986115600, 1004256000, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1173603600, 1194163200 }
typeOffsets:intvector { -25200, 0, -25200, 3600 }
@@ -2731,23 +2752,23 @@
finalRule { "US" }
finalRaw:int { -25200 }
finalYear:int { 2008 }
- } //Z#521
- /* Mexico/BajaNorte */ :int { 214 } //Z#522
- /* Mexico/BajaSur */ :int { 159 } //Z#523
- /* Mexico/General */ :int { 164 } //Z#524
- /* Mideast/Riyadh87 */ :int { 301 } //Z#525
- /* Mideast/Riyadh88 */ :int { 302 } //Z#526
- /* Mideast/Riyadh89 */ :int { 303 } //Z#527
- /* NET */ :int { 326 } //Z#528
- /* NST */ :int { 540 } //Z#529
- /* NZ */ :int { 540 } //Z#530
- /* NZ-CHAT */ :int { 541 } //Z#531
- /* Navajo */ :int { 109 } //Z#532
- /* PLT */ :int { 274 } //Z#533
- /* PNT */ :int { 183 } //Z#534
- /* PRC */ :int { 308 } //Z#535
- /* PRT */ :int { 188 } //Z#536
- /* PST */ :int { 150 } //Z#537
+ } //Z#524
+ /* Mexico/BajaNorte */ :int { 214 } //Z#525
+ /* Mexico/BajaSur */ :int { 159 } //Z#526
+ /* Mexico/General */ :int { 164 } //Z#527
+ /* Mideast/Riyadh87 */ :int { 302 } //Z#528
+ /* Mideast/Riyadh88 */ :int { 303 } //Z#529
+ /* Mideast/Riyadh89 */ :int { 304 } //Z#530
+ /* NET */ :int { 328 } //Z#531
+ /* NST */ :int { 543 } //Z#532
+ /* NZ */ :int { 543 } //Z#533
+ /* NZ-CHAT */ :int { 544 } //Z#534
+ /* Navajo */ :int { 109 } //Z#535
+ /* PLT */ :int { 274 } //Z#536
+ /* PNT */ :int { 183 } //Z#537
+ /* PRC */ :int { 309 } //Z#538
+ /* PRT */ :int { 188 } //Z#539
+ /* PST */ :int { 150 } //Z#540
/* PST8PDT */ :table {
trans:intvector { -1633269600, -1615129200, -1601820000, -1583679600, -880207200, -765385200, -84376800, -68655600, -52927200, -37206000, -21477600, -5756400, 9972000, 25693200, 41421600, 57747600, 73476000, 89197200, 104925600, 120646800, 126698400, 152096400, 162381600, 183546000, 199274400, 215600400, 230724000, 247050000, 262778400, 278499600, 294228000, 309949200, 325677600, 341398800, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400, 452080800, 467802000, 483530400, 499251600, 514980000, 530701200, 544615200, 562150800, 576064800, 594205200, 607514400, 625654800, 638964000, 657104400, 671018400, 688554000, 702468000, 720003600, 733917600, 752058000, 765367200, 783507600, 796816800, 814957200, 828871200, 846406800, 860320800, 877856400, 891770400, 909306000, 923220000, 941360400, 954669600, 972810000, 986119200, 1004259600, 1018173600, 1035709200, 1049623200, 1067158800, 1081072800, 1099213200, 1112522400, 1130662800, 1143972000, 1162112400, 1173607200, 1194166800 }
typeOffsets:intvector { -28800, 0, -28800, 3600 }
@@ -2755,7 +2776,7 @@
finalRule { "US" }
finalRaw:int { -28800 }
finalYear:int { 2008 }
- } //Z#538
+ } //Z#541
/* Pacific/Apia */ :table {
transPre32:intvector { -1, 1439229312 }
trans:intvector { -1861878784, -631110600, 1285498800, 1301752800, 1316872800, 1325239200, 1333202400, 1348927200 }
@@ -2764,8 +2785,8 @@
finalRule { "WS" }
finalRaw:int { 46800 }
finalYear:int { 2013 }
- links:intvector { 519, 539 }
- } //Z#539
+ links:intvector { 522, 542 }
+ } //Z#542
/* Pacific/Auckland */ :table {
transPre32:intvector { -1, 1102531752 }
trans:intvector { -1330335000, -1320057000, -1300699800, -1287396000, -1269250200, -1255946400, -1237800600, -1224496800, -1206351000, -1192442400, -1174901400, -1160992800, -1143451800, -1125914400, -1112607000, -1094464800, -1081157400, -1063015200, -1049707800, -1031565600, -1018258200, -1000116000, -986808600, -968061600, -955359000, -936612000, -923304600, -757425600, 152632800, 162309600, 183477600, 194968800, 215532000, 226418400, 246981600, 257868000, 278431200, 289317600, 309880800, 320767200, 341330400, 352216800, 372780000, 384271200, 404834400, 415720800, 436284000, 447170400, 467733600, 478620000, 499183200, 510069600, 530632800, 541519200, 562082400, 573573600, 594136800, 605023200, 623772000, 637682400, 655221600, 669132000, 686671200, 700581600, 718120800, 732636000, 749570400, 764085600, 781020000, 795535200, 812469600, 826984800, 844524000, 858434400, 875973600, 889884000, 907423200, 921938400, 938872800, 953388000, 970322400, 984837600, 1002376800, 1016287200, 1033826400, 1047736800, 1065276000, 1079791200, 1096725600, 1111240800, 1128175200, 1142690400, 1159624800, 1174140000, 1191074400, 1207404000, 1222524000 }
@@ -2774,8 +2795,8 @@
finalRule { "NZ" }
finalRaw:int { 43200 }
finalYear:int { 2009 }
- links:intvector { 529, 530, 540 }
- } //Z#540
+ links:intvector { 532, 533, 543 }
+ } //Z#543
/* Pacific/Chatham */ :table {
trans:intvector { -410271228, 152632800, 162309600, 183477600, 194968800, 215532000, 226418400, 246981600, 257868000, 278431200, 289317600, 309880800, 320767200, 341330400, 352216800, 372780000, 384271200, 404834400, 415720800, 436284000, 447170400, 467733600, 478620000, 499183200, 510069600, 530632800, 541519200, 562082400, 573573600, 594136800, 605023200, 623772000, 637682400, 655221600, 669132000, 686671200, 700581600, 718120800, 732636000, 749570400, 764085600, 781020000, 795535200, 812469600, 826984800, 844524000, 858434400, 875973600, 889884000, 907423200, 921938400, 938872800, 953388000, 970322400, 984837600, 1002376800, 1016287200, 1033826400, 1047736800, 1065276000, 1079791200, 1096725600, 1111240800, 1128175200, 1142690400, 1159624800, 1174140000, 1191074400, 1207404000, 1222524000 }
typeOffsets:intvector { 44028, 0, 45900, 0, 45900, 3600 }
@@ -2783,223 +2804,223 @@
finalRule { "Chatham" }
finalRaw:int { 45900 }
finalYear:int { 2009 }
- links:intvector { 531, 541 }
- } //Z#541
+ links:intvector { 534, 544 }
+ } //Z#544
/* Pacific/Chuuk */ :table {
transPre32:intvector { -1, 2117478068 }
typeOffsets:intvector { 36428, 0, 36000, 0 }
typeMap:bin { "01" }
- links:intvector { 542, 577, 580 }
- } //Z#542
+ links:intvector { 545, 580, 583 }
+ } //Z#545
/* Pacific/Easter */ :table {
transPre32:intvector { -1, 1770471960 }
- trans:intvector { -1178124152, -870552000, -865278000, -736376400, -36619200, -23922000, -3355200, 7527600, 24465600, 37767600, 55915200, 69217200, 87969600, 100666800, 118209600, 132116400, 150868800, 163566000, 182318400, 195620400, 213768000, 227070000, 245217600, 258519600, 277272000, 289969200, 308721600, 321418800, 340171200, 353473200, 371620800, 384922800, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 591768000, 605674800, 624427200, 637729200, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400, 1362884400, 1381636800 }
+ trans:intvector { -1178124152, -870552000, -865278000, -736376400, -36619200, -23922000, -3355200, 7527600, 24465600, 37767600, 55915200, 69217200, 87969600, 100666800, 118209600, 132116400, 150868800, 163566000, 182318400, 195620400, 213768000, 227070000, 245217600, 258519600, 277272000, 289969200, 308721600, 321418800, 340171200, 353473200, 371620800, 384922800, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 591768000, 605674800, 624427200, 637729200, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400 }
typeOffsets:intvector { -26264, 0, -26248, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600 }
- typeMap:bin { "010302030203020302030203020302030203020302030203020302030203020304050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405" }
+ typeMap:bin { "01030203020302030203020302030203020302030203020302030203020302030405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405" }
finalRule { "Chile" }
finalRaw:int { -21600 }
- finalYear:int { 2014 }
- links:intvector { 384, 543 }
- } //Z#543
+ finalYear:int { 2013 }
+ links:intvector { 386, 546 }
+ } //Z#546
/* Pacific/Efate */ :table {
trans:intvector { -1829387596, 433256400, 448977600, 467298000, 480427200, 496760400, 511876800, 528210000, 543931200, 559659600, 575380800, 591109200, 606830400, 622558800, 638280000, 654008400, 669729600, 686062800, 696340800, 719931600, 727790400 }
typeOffsets:intvector { 40396, 0, 39600, 0, 39600, 3600 }
typeMap:bin { "010201020102010201020102010201020102010201" }
- } //Z#544
+ } //Z#547
/* Pacific/Enderbury */ :table {
transPre32:intvector { -1, 2117555556 }
trans:intvector { 307627200, 788958000 }
typeOffsets:intvector { -41060, 0, -43200, 0, -39600, 0, 46800, 0 }
typeMap:bin { "010203" }
- } //Z#545
+ } //Z#548
/* Pacific/Fakaofo */ :table {
transPre32:intvector { -1, 2117555592 }
trans:intvector { 1325242800 }
typeOffsets:intvector { -41096, 0, -39600, 0, 46800, 0 }
typeMap:bin { "0102" }
- } //Z#546
+ } //Z#549
/* Pacific/Fiji */ :table {
- trans:intvector { -1709985220, 909842400, 920124000, 941896800, 951573600, 1259416800, 1269698400, 1287842400, 1299333600, 1319292000, 1327154400, 1350741600 }
- typeOffsets:intvector { 42820, 0, 43200, 0, 43200, 3600 }
+ trans:intvector { -1709985344, 909842400, 920124000, 941896800, 951573600, 1259416800, 1269698400, 1287842400, 1299333600, 1319292000, 1327154400, 1350741600 }
+ typeOffsets:intvector { 42944, 0, 43200, 0, 43200, 3600 }
typeMap:bin { "010201020102010201020102" }
finalRule { "Fiji" }
finalRaw:int { 43200 }
finalYear:int { 2013 }
- } //Z#547
+ } //Z#550
/* Pacific/Funafuti */ :table {
transPre32:intvector { -1, 2117471484 }
typeOffsets:intvector { 43012, 0, 43200, 0 }
typeMap:bin { "01" }
- } //Z#548
+ } //Z#551
/* Pacific/Galapagos */ :table {
trans:intvector { -1230746496, 504939600 }
typeOffsets:intvector { -21504, 0, -21600, 0, -18000, 0 }
typeMap:bin { "0201" }
- } //Z#549
+ } //Z#552
/* Pacific/Gambier */ :table {
trans:intvector { -1806678012 }
typeOffsets:intvector { -32388, 0, -32400, 0 }
typeMap:bin { "01" }
- } //Z#550
+ } //Z#553
/* Pacific/Guadalcanal */ :table {
trans:intvector { -1806748788 }
typeOffsets:intvector { 38388, 0, 39600, 0 }
typeMap:bin { "01" }
- links:intvector { 551, 585 }
- } //Z#551
+ links:intvector { 554, 588 }
+ } //Z#554
/* Pacific/Guam */ :table {
transPre32:intvector { -1, 350340556, -1, 2117479756 }
typeOffsets:intvector { -51660, 0, 34740, 0, 36000, 0 }
typeMap:bin { "0102" }
- } //Z#552
+ } //Z#555
/* Pacific/Honolulu */ :table {
transPre32:intvector { -1, 1960865982 }
trans:intvector { -1157283000, -1155436200, -880198200, -765376200, -712150200 }
typeOffsets:intvector { -37886, 0, -37800, 0, -37800, 3600, -36000, 0 }
typeMap:bin { "010201020103" }
- links:intvector { 553, 608 }
- } //Z#553
+ links:intvector { 556, 611 }
+ } //Z#556
/* Pacific/Johnston */ :table {
typeOffsets:intvector { -36000, 0 }
- } //Z#554
+ } //Z#557
/* Pacific/Kiritimati */ :table {
transPre32:intvector { -1, 2117552256 }
trans:intvector { 307622400, 788954400 }
typeOffsets:intvector { -37760, 0, -38400, 0, -36000, 0, 50400, 0 }
typeMap:bin { "010203" }
- } //Z#555
+ } //Z#558
/* Pacific/Kosrae */ :table {
transPre32:intvector { -1, 2117475380 }
trans:intvector { -7988400, 915105600 }
typeOffsets:intvector { 39116, 0, 39600, 0, 43200, 0 }
typeMap:bin { "010201" }
- } //Z#556
+ } //Z#559
/* Pacific/Kwajalein */ :table {
transPre32:intvector { -1, 2117474336 }
trans:intvector { -7988400, 745848000 }
typeOffsets:intvector { 40160, 0, -43200, 0, 39600, 0, 43200, 0 }
typeMap:bin { "020103" }
- links:intvector { 516, 557 }
- } //Z#557
+ links:intvector { 519, 560 }
+ } //Z#560
/* Pacific/Majuro */ :table {
transPre32:intvector { -1, 2117473408 }
trans:intvector { -7988400 }
typeOffsets:intvector { 41088, 0, 39600, 0, 43200, 0 }
typeMap:bin { "0102" }
- } //Z#558
+ } //Z#561
/* Pacific/Marquesas */ :table {
trans:intvector { -1806676920 }
typeOffsets:intvector { -33480, 0, -34200, 0 }
typeMap:bin { "01" }
- } //Z#559
+ } //Z#562
/* Pacific/Midway */ :table {
transPre32:intvector { -1, 2117557064 }
trans:intvector { -428504400, -420645600 }
typeOffsets:intvector { -42568, 0, -39600, 0, -39600, 3600 }
typeMap:bin { "010201" }
- } //Z#560
+ } //Z#563
/* Pacific/Nauru */ :table {
trans:intvector { -1545131260, -877347000, -800960400, 294323400 }
typeOffsets:intvector { 40060, 0, 32400, 0, 41400, 0, 43200, 0 }
typeMap:bin { "02010203" }
- } //Z#561
+ } //Z#564
/* Pacific/Niue */ :table {
transPre32:intvector { -1, 2117555276 }
trans:intvector { -599575200, 276089400 }
typeOffsets:intvector { -40780, 0, -41400, 0, -40800, 0, -39600, 0 }
typeMap:bin { "020103" }
- } //Z#562
+ } //Z#565
/* Pacific/Norfolk */ :table {
transPre32:intvector { -1, 2117474184 }
trans:intvector { -599656320 }
typeOffsets:intvector { 40312, 0, 40320, 0, 41400, 0 }
typeMap:bin { "0102" }
- } //Z#563
+ } //Z#566
/* Pacific/Noumea */ :table {
trans:intvector { -1829387148, 250002000, 257342400, 281451600, 288878400, 849366000, 857228400 }
typeOffsets:intvector { 39948, 0, 39600, 0, 39600, 3600 }
typeMap:bin { "01020102010201" }
- } //Z#564
+ } //Z#567
/* Pacific/Pago_Pago */ :table {
transPre32:intvector { -1, 1439229064 }
trans:intvector { -1861879032, -631110600 }
typeOffsets:intvector { 45432, 0, -41400, 0, -40968, 0, -39600, 0 }
typeMap:bin { "020103" }
- links:intvector { 565, 573, 614 }
- } //Z#565
+ links:intvector { 568, 576, 617 }
+ } //Z#568
/* Pacific/Palau */ :table {
transPre32:intvector { -1, 2117482220 }
typeOffsets:intvector { 32276, 0, 32400, 0 }
typeMap:bin { "01" }
- } //Z#566
+ } //Z#569
/* Pacific/Pitcairn */ :table {
transPre32:intvector { -1, 2117545716 }
trans:intvector { 893665800 }
typeOffsets:intvector { -31220, 0, -30600, 0, -28800, 0 }
typeMap:bin { "0102" }
- } //Z#567
+ } //Z#570
/* Pacific/Pohnpei */ :table {
transPre32:intvector { -1, 2117476524 }
typeOffsets:intvector { 37972, 0, 39600, 0 }
typeMap:bin { "01" }
- links:intvector { 568, 569 }
- } //Z#568
- /* Pacific/Ponape */ :int { 568 } //Z#569
+ links:intvector { 571, 572 }
+ } //Z#571
+ /* Pacific/Ponape */ :int { 571 } //Z#572
/* Pacific/Port_Moresby */ :table {
transPre32:intvector { -1, 1454791176, -1, 1928176784 }
typeOffsets:intvector { 35320, 0, 35312, 0, 36000, 0 }
typeMap:bin { "0102" }
- } //Z#570
+ } //Z#573
/* Pacific/Rarotonga */ :table {
transPre32:intvector { -1, 2117552840 }
trans:intvector { 279714600, 289387800, 309952800, 320837400, 341402400, 352287000, 372852000, 384341400, 404906400, 415791000, 436356000, 447240600, 467805600, 478690200, 499255200, 510139800, 530704800, 541589400, 562154400, 573643800, 594208800, 605093400, 625658400, 636543000, 657108000, 667992600 }
typeOffsets:intvector { -38344, 0, -37800, 0, -36000, 0, -36000, 1800 }
typeMap:bin { "010302030203020302030203020302030203020302030203020302" }
- } //Z#571
+ } //Z#574
/* Pacific/Saipan */ :table {
transPre32:intvector { -1, 350340316, -1, 2117479516 }
trans:intvector { -7981200 }
typeOffsets:intvector { -51420, 0, 32400, 0, 34980, 0, 36000, 0 }
typeMap:bin { "020103" }
- } //Z#572
- /* Pacific/Samoa */ :int { 565 } //Z#573
+ } //Z#575
+ /* Pacific/Samoa */ :int { 568 } //Z#576
/* Pacific/Tahiti */ :table {
trans:intvector { -1806674504 }
typeOffsets:intvector { -35896, 0, -36000, 0 }
typeMap:bin { "01" }
- } //Z#574
+ } //Z#577
/* Pacific/Tarawa */ :table {
transPre32:intvector { -1, 2117472972 }
typeOffsets:intvector { 41524, 0, 43200, 0 }
typeMap:bin { "01" }
- } //Z#575
+ } //Z#578
/* Pacific/Tongatapu */ :table {
transPre32:intvector { -1, 2117470136 }
trans:intvector { -915193200, 939214800, 953384400, 973342800, 980596800, 1004792400, 1012046400 }
typeOffsets:intvector { 44360, 0, 44400, 0, 46800, 0, 46800, 3600 }
typeMap:bin { "0102030203020302" }
- } //Z#576
- /* Pacific/Truk */ :int { 542 } //Z#577
+ } //Z#579
+ /* Pacific/Truk */ :int { 545 } //Z#580
/* Pacific/Wake */ :table {
transPre32:intvector { -1, 2117474508 }
typeOffsets:intvector { 39988, 0, 43200, 0 }
typeMap:bin { "01" }
- } //Z#578
+ } //Z#581
/* Pacific/Wallis */ :table {
transPre32:intvector { -1, 2117470376 }
typeOffsets:intvector { 44120, 0, 43200, 0 }
typeMap:bin { "01" }
- } //Z#579
- /* Pacific/Yap */ :int { 542 } //Z#580
- /* Poland */ :int { 483 } //Z#581
- /* Portugal */ :int { 450 } //Z#582
- /* ROC */ :int { 310 } //Z#583
- /* ROK */ :int { 307 } //Z#584
- /* SST */ :int { 551 } //Z#585
- /* Singapore */ :int { 309 } //Z#586
+ } //Z#582
+ /* Pacific/Yap */ :int { 545 } //Z#583
+ /* Poland */ :int { 486 } //Z#584
+ /* Portugal */ :int { 453 } //Z#585
+ /* ROC */ :int { 311 } //Z#586
+ /* ROK */ :int { 308 } //Z#587
+ /* SST */ :int { 554 } //Z#588
+ /* Singapore */ :int { 310 } //Z#589
/* SystemV/AST4 */ :table {
typeOffsets:intvector { -14400, 0 }
- } //Z#587
+ } //Z#590
/* SystemV/AST4ADT */ :table {
transPre32:intvector { -1, 2096195296, -1, 2111916496, -1, 2127644896, -1, 2143366096 }
trans:intvector { -2135872800, -2120151600, -2104423200, -2088702000, -2072973600, -2056647600, -2040919200, -2025198000, -2009469600, -1993748400, -1978020000, -1962298800, -1946570400, -1930849200, -1915120800, -1898794800, -1883671200, -1867345200, -1851616800, -1835895600, -1820167200, -1804446000, -1788717600, -1772996400, -1757268000, -1741546800, -1725818400, -1709492400, -1693764000, -1678042800, -1662314400, -1646593200, -1630864800, -1615143600, -1599415200, -1583694000, -1567965600, -1551639600, -1536516000, -1520190000, -1504461600, -1488740400, -1473012000, -1457290800, -1441562400, -1425841200, -1410112800, -1394391600, -1378663200, -1362337200, -1347213600, -1330887600, -1315159200, -1299438000, -1283709600, -1267988400, -1252260000, -1236538800, -1220810400, -1205089200, -1189360800, -1173034800, -1157306400, -1141585200, -1125856800, -1110135600, -1094407200, -1078686000, -1062957600, -1047236400, -1031508000, -1015182000, -1000058400, -983732400, -968004000, -952282800, -936554400, -920833200, -905104800, -889383600, -873655200, -857934000, -842205600, -825879600, -810151200, -794430000, -778701600, -762980400, -747252000, -731530800, -715802400, -700081200, -684352800, -668026800, -652903200, -636577200, -620848800, -605127600, -589399200, -573678000, -557949600, -542228400, -526500000, -510778800, -495050400, -478724400, -463600800, -447274800, -431546400, -415825200, -400096800, -384375600, -368647200, -352926000, -337197600, -321476400, -305748000, -289422000, -273693600, -257972400, -242244000, -226522800, -210794400, -195073200, -179344800, -163623600, -147895200, -131569200, -116445600, -100119600, -84391200, -68670000, -52941600, -37220400, -21492000, -5770800, 9957600, 25678800, 41407200, 57733200, 73461600, 89182800, 104911200, 120632400, 126684000, 154501200, 162367200, 183531600, 199260000, 215586000 }
@@ -3008,10 +3029,10 @@
finalRule { "SystemV" }
finalRaw:int { -14400 }
finalYear:int { 1977 }
- } //Z#588
+ } //Z#591
/* SystemV/CST6 */ :table {
typeOffsets:intvector { -21600, 0 }
- } //Z#589
+ } //Z#592
/* SystemV/CST6CDT */ :table {
transPre32:intvector { -1, 2096202496, -1, 2111923696, -1, 2127652096, -1, 2143373296 }
trans:intvector { -2135865600, -2120144400, -2104416000, -2088694800, -2072966400, -2056640400, -2040912000, -2025190800, -2009462400, -1993741200, -1978012800, -1962291600, -1946563200, -1930842000, -1915113600, -1898787600, -1883664000, -1867338000, -1851609600, -1835888400, -1820160000, -1804438800, -1788710400, -1772989200, -1757260800, -1741539600, -1725811200, -1709485200, -1693756800, -1678035600, -1662307200, -1646586000, -1630857600, -1615136400, -1599408000, -1583686800, -1567958400, -1551632400, -1536508800, -1520182800, -1504454400, -1488733200, -1473004800, -1457283600, -1441555200, -1425834000, -1410105600, -1394384400, -1378656000, -1362330000, -1347206400, -1330880400, -1315152000, -1299430800, -1283702400, -1267981200, -1252252800, -1236531600, -1220803200, -1205082000, -1189353600, -1173027600, -1157299200, -1141578000, -1125849600, -1110128400, -1094400000, -1078678800, -1062950400, -1047229200, -1031500800, -1015174800, -1000051200, -983725200, -967996800, -952275600, -936547200, -920826000, -905097600, -889376400, -873648000, -857926800, -842198400, -825872400, -810144000, -794422800, -778694400, -762973200, -747244800, -731523600, -715795200, -700074000, -684345600, -668019600, -652896000, -636570000, -620841600, -605120400, -589392000, -573670800, -557942400, -542221200, -526492800, -510771600, -495043200, -478717200, -463593600, -447267600, -431539200, -415818000, -400089600, -384368400, -368640000, -352918800, -337190400, -321469200, -305740800, -289414800, -273686400, -257965200, -242236800, -226515600, -210787200, -195066000, -179337600, -163616400, -147888000, -131562000, -116438400, -100112400, -84384000, -68662800, -52934400, -37213200, -21484800, -5763600, 9964800, 25686000, 41414400, 57740400, 73468800, 89190000, 104918400, 120639600, 126691200, 154508400, 162374400, 183538800, 199267200, 215593200 }
@@ -3020,10 +3041,10 @@
finalRule { "SystemV" }
finalRaw:int { -21600 }
finalYear:int { 1977 }
- } //Z#590
+ } //Z#593
/* SystemV/EST5 */ :table {
typeOffsets:intvector { -18000, 0 }
- } //Z#591
+ } //Z#594
/* SystemV/EST5EDT */ :table {
transPre32:intvector { -1, 2096198896, -1, 2111920096, -1, 2127648496, -1, 2143369696 }
trans:intvector { -2135869200, -2120148000, -2104419600, -2088698400, -2072970000, -2056644000, -2040915600, -2025194400, -2009466000, -1993744800, -1978016400, -1962295200, -1946566800, -1930845600, -1915117200, -1898791200, -1883667600, -1867341600, -1851613200, -1835892000, -1820163600, -1804442400, -1788714000, -1772992800, -1757264400, -1741543200, -1725814800, -1709488800, -1693760400, -1678039200, -1662310800, -1646589600, -1630861200, -1615140000, -1599411600, -1583690400, -1567962000, -1551636000, -1536512400, -1520186400, -1504458000, -1488736800, -1473008400, -1457287200, -1441558800, -1425837600, -1410109200, -1394388000, -1378659600, -1362333600, -1347210000, -1330884000, -1315155600, -1299434400, -1283706000, -1267984800, -1252256400, -1236535200, -1220806800, -1205085600, -1189357200, -1173031200, -1157302800, -1141581600, -1125853200, -1110132000, -1094403600, -1078682400, -1062954000, -1047232800, -1031504400, -1015178400, -1000054800, -983728800, -968000400, -952279200, -936550800, -920829600, -905101200, -889380000, -873651600, -857930400, -842202000, -825876000, -810147600, -794426400, -778698000, -762976800, -747248400, -731527200, -715798800, -700077600, -684349200, -668023200, -652899600, -636573600, -620845200, -605124000, -589395600, -573674400, -557946000, -542224800, -526496400, -510775200, -495046800, -478720800, -463597200, -447271200, -431542800, -415821600, -400093200, -384372000, -368643600, -352922400, -337194000, -321472800, -305744400, -289418400, -273690000, -257968800, -242240400, -226519200, -210790800, -195069600, -179341200, -163620000, -147891600, -131565600, -116442000, -100116000, -84387600, -68666400, -52938000, -37216800, -21488400, -5767200, 9961200, 25682400, 41410800, 57736800, 73465200, 89186400, 104914800, 120636000, 126687600, 154504800, 162370800, 183535200, 199263600, 215589600 }
@@ -3032,13 +3053,13 @@
finalRule { "SystemV" }
finalRaw:int { -18000 }
finalYear:int { 1977 }
- } //Z#592
+ } //Z#595
/* SystemV/HST10 */ :table {
typeOffsets:intvector { -36000, 0 }
- } //Z#593
+ } //Z#596
/* SystemV/MST7 */ :table {
typeOffsets:intvector { -25200, 0 }
- } //Z#594
+ } //Z#597
/* SystemV/MST7MDT */ :table {
transPre32:intvector { -1, 2096206096, -1, 2111927296, -1, 2127655696, -1, 2143376896 }
trans:intvector { -2135862000, -2120140800, -2104412400, -2088691200, -2072962800, -2056636800, -2040908400, -2025187200, -2009458800, -1993737600, -1978009200, -1962288000, -1946559600, -1930838400, -1915110000, -1898784000, -1883660400, -1867334400, -1851606000, -1835884800, -1820156400, -1804435200, -1788706800, -1772985600, -1757257200, -1741536000, -1725807600, -1709481600, -1693753200, -1678032000, -1662303600, -1646582400, -1630854000, -1615132800, -1599404400, -1583683200, -1567954800, -1551628800, -1536505200, -1520179200, -1504450800, -1488729600, -1473001200, -1457280000, -1441551600, -1425830400, -1410102000, -1394380800, -1378652400, -1362326400, -1347202800, -1330876800, -1315148400, -1299427200, -1283698800, -1267977600, -1252249200, -1236528000, -1220799600, -1205078400, -1189350000, -1173024000, -1157295600, -1141574400, -1125846000, -1110124800, -1094396400, -1078675200, -1062946800, -1047225600, -1031497200, -1015171200, -1000047600, -983721600, -967993200, -952272000, -936543600, -920822400, -905094000, -889372800, -873644400, -857923200, -842194800, -825868800, -810140400, -794419200, -778690800, -762969600, -747241200, -731520000, -715791600, -700070400, -684342000, -668016000, -652892400, -636566400, -620838000, -605116800, -589388400, -573667200, -557938800, -542217600, -526489200, -510768000, -495039600, -478713600, -463590000, -447264000, -431535600, -415814400, -400086000, -384364800, -368636400, -352915200, -337186800, -321465600, -305737200, -289411200, -273682800, -257961600, -242233200, -226512000, -210783600, -195062400, -179334000, -163612800, -147884400, -131558400, -116434800, -100108800, -84380400, -68659200, -52930800, -37209600, -21481200, -5760000, 9968400, 25689600, 41418000, 57744000, 73472400, 89193600, 104922000, 120643200, 126694800, 154512000, 162378000, 183542400, 199270800, 215596800 }
@@ -3047,10 +3068,10 @@
finalRule { "SystemV" }
finalRaw:int { -25200 }
finalYear:int { 1977 }
- } //Z#595
+ } //Z#598
/* SystemV/PST8 */ :table {
typeOffsets:intvector { -28800, 0 }
- } //Z#596
+ } //Z#599
/* SystemV/PST8PDT */ :table {
transPre32:intvector { -1, 2096209696, -1, 2111930896, -1, 2127659296, -1, 2143380496 }
trans:intvector { -2135858400, -2120137200, -2104408800, -2088687600, -2072959200, -2056633200, -2040904800, -2025183600, -2009455200, -1993734000, -1978005600, -1962284400, -1946556000, -1930834800, -1915106400, -1898780400, -1883656800, -1867330800, -1851602400, -1835881200, -1820152800, -1804431600, -1788703200, -1772982000, -1757253600, -1741532400, -1725804000, -1709478000, -1693749600, -1678028400, -1662300000, -1646578800, -1630850400, -1615129200, -1599400800, -1583679600, -1567951200, -1551625200, -1536501600, -1520175600, -1504447200, -1488726000, -1472997600, -1457276400, -1441548000, -1425826800, -1410098400, -1394377200, -1378648800, -1362322800, -1347199200, -1330873200, -1315144800, -1299423600, -1283695200, -1267974000, -1252245600, -1236524400, -1220796000, -1205074800, -1189346400, -1173020400, -1157292000, -1141570800, -1125842400, -1110121200, -1094392800, -1078671600, -1062943200, -1047222000, -1031493600, -1015167600, -1000044000, -983718000, -967989600, -952268400, -936540000, -920818800, -905090400, -889369200, -873640800, -857919600, -842191200, -825865200, -810136800, -794415600, -778687200, -762966000, -747237600, -731516400, -715788000, -700066800, -684338400, -668012400, -652888800, -636562800, -620834400, -605113200, -589384800, -573663600, -557935200, -542214000, -526485600, -510764400, -495036000, -478710000, -463586400, -447260400, -431532000, -415810800, -400082400, -384361200, -368632800, -352911600, -337183200, -321462000, -305733600, -289407600, -273679200, -257958000, -242229600, -226508400, -210780000, -195058800, -179330400, -163609200, -147880800, -131554800, -116431200, -100105200, -84376800, -68655600, -52927200, -37206000, -21477600, -5756400, 9972000, 25693200, 41421600, 57747600, 73476000, 89197200, 104925600, 120646800, 126698400, 154515600, 162381600, 183546000, 199274400, 215600400 }
@@ -3059,10 +3080,10 @@
finalRule { "SystemV" }
finalRaw:int { -28800 }
finalYear:int { 1977 }
- } //Z#597
+ } //Z#600
/* SystemV/YST9 */ :table {
typeOffsets:intvector { -32400, 0 }
- } //Z#598
+ } //Z#601
/* SystemV/YST9YDT */ :table {
transPre32:intvector { -1, 2096213296, -1, 2111934496, -1, 2127662896, -1, 2143384096 }
trans:intvector { -2135854800, -2120133600, -2104405200, -2088684000, -2072955600, -2056629600, -2040901200, -2025180000, -2009451600, -1993730400, -1978002000, -1962280800, -1946552400, -1930831200, -1915102800, -1898776800, -1883653200, -1867327200, -1851598800, -1835877600, -1820149200, -1804428000, -1788699600, -1772978400, -1757250000, -1741528800, -1725800400, -1709474400, -1693746000, -1678024800, -1662296400, -1646575200, -1630846800, -1615125600, -1599397200, -1583676000, -1567947600, -1551621600, -1536498000, -1520172000, -1504443600, -1488722400, -1472994000, -1457272800, -1441544400, -1425823200, -1410094800, -1394373600, -1378645200, -1362319200, -1347195600, -1330869600, -1315141200, -1299420000, -1283691600, -1267970400, -1252242000, -1236520800, -1220792400, -1205071200, -1189342800, -1173016800, -1157288400, -1141567200, -1125838800, -1110117600, -1094389200, -1078668000, -1062939600, -1047218400, -1031490000, -1015164000, -1000040400, -983714400, -967986000, -952264800, -936536400, -920815200, -905086800, -889365600, -873637200, -857916000, -842187600, -825861600, -810133200, -794412000, -778683600, -762962400, -747234000, -731512800, -715784400, -700063200, -684334800, -668008800, -652885200, -636559200, -620830800, -605109600, -589381200, -573660000, -557931600, -542210400, -526482000, -510760800, -495032400, -478706400, -463582800, -447256800, -431528400, -415807200, -400078800, -384357600, -368629200, -352908000, -337179600, -321458400, -305730000, -289404000, -273675600, -257954400, -242226000, -226504800, -210776400, -195055200, -179326800, -163605600, -147877200, -131551200, -116427600, -100101600, -84373200, -68652000, -52923600, -37202400, -21474000, -5752800, 9975600, 25696800, 41425200, 57751200, 73479600, 89200800, 104929200, 120650400, 126702000, 154519200, 162385200, 183549600, 199278000, 215604000 }
@@ -3071,26 +3092,26 @@
finalRule { "SystemV" }
finalRaw:int { -32400 }
finalYear:int { 1977 }
- } //Z#599
- /* Turkey */ :int { 446 } //Z#600
- /* UCT */ :int { 424 } //Z#601
- /* US/Alaska */ :int { 60 } //Z#602
- /* US/Aleutian */ :int { 59 } //Z#603
- /* US/Arizona */ :int { 183 } //Z#604
- /* US/Central */ :int { 98 } //Z#605
- /* US/East-Indiana */ :int { 130 } //Z#606
- /* US/Eastern */ :int { 172 } //Z#607
- /* US/Hawaii */ :int { 553 } //Z#608
- /* US/Indiana-Starke */ :int { 131 } //Z#609
- /* US/Michigan */ :int { 110 } //Z#610
- /* US/Mountain */ :int { 109 } //Z#611
- /* US/Pacific */ :int { 150 } //Z#612
- /* US/Pacific-New */ :int { 150 } //Z#613
- /* US/Samoa */ :int { 565 } //Z#614
- /* UTC */ :int { 425 } //Z#615
- /* Universal */ :int { 425 } //Z#616
- /* VST */ :int { 264 } //Z#617
- /* W-SU */ :int { 459 } //Z#618
+ } //Z#602
+ /* Turkey */ :int { 449 } //Z#603
+ /* UCT */ :int { 426 } //Z#604
+ /* US/Alaska */ :int { 60 } //Z#605
+ /* US/Aleutian */ :int { 59 } //Z#606
+ /* US/Arizona */ :int { 183 } //Z#607
+ /* US/Central */ :int { 98 } //Z#608
+ /* US/East-Indiana */ :int { 130 } //Z#609
+ /* US/Eastern */ :int { 172 } //Z#610
+ /* US/Hawaii */ :int { 556 } //Z#611
+ /* US/Indiana-Starke */ :int { 131 } //Z#612
+ /* US/Michigan */ :int { 110 } //Z#613
+ /* US/Mountain */ :int { 109 } //Z#614
+ /* US/Pacific */ :int { 150 } //Z#615
+ /* US/Pacific-New */ :int { 150 } //Z#616
+ /* US/Samoa */ :int { 568 } //Z#617
+ /* UTC */ :int { 427 } //Z#618
+ /* Universal */ :int { 427 } //Z#619
+ /* VST */ :int { 264 } //Z#620
+ /* W-SU */ :int { 462 } //Z#621
/* WET */ :table {
trans:intvector { 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
typeOffsets:intvector { 0, 0, 0, 3600 }
@@ -3098,8 +3119,8 @@
finalRule { "EU" }
finalRaw:int { 0 }
finalYear:int { 1997 }
- } //Z#619
- /* Zulu */ :int { 425 } //Z#620
+ } //Z#622
+ /* Zulu */ :int { 427 } //Z#623
}
Names {
"ACT","AET","AGT","ART","AST","Africa/Abidjan","Africa/Accra" // 6
@@ -3192,96 +3213,98 @@
,"Asia/Ho_Chi_Minh","Asia/Hong_Kong","Asia/Hovd","Asia/Irkutsk" // 267
,"Asia/Istanbul","Asia/Jakarta","Asia/Jayapura","Asia/Jerusalem" // 271
,"Asia/Kabul","Asia/Kamchatka","Asia/Karachi","Asia/Kashgar" // 275
- ,"Asia/Kathmandu","Asia/Katmandu","Asia/Kolkata","Asia/Krasnoyarsk" // 279
- ,"Asia/Kuala_Lumpur","Asia/Kuching","Asia/Kuwait","Asia/Macao" // 283
- ,"Asia/Macau","Asia/Magadan","Asia/Makassar","Asia/Manila" // 287
- ,"Asia/Muscat","Asia/Nicosia","Asia/Novokuznetsk","Asia/Novosibirsk" // 291
- ,"Asia/Omsk","Asia/Oral","Asia/Phnom_Penh","Asia/Pontianak" // 295
- ,"Asia/Pyongyang","Asia/Qatar","Asia/Qyzylorda","Asia/Rangoon" // 299
- ,"Asia/Riyadh","Asia/Riyadh87","Asia/Riyadh88","Asia/Riyadh89" // 303
- ,"Asia/Saigon","Asia/Sakhalin","Asia/Samarkand","Asia/Seoul" // 307
- ,"Asia/Shanghai","Asia/Singapore","Asia/Taipei","Asia/Tashkent" // 311
- ,"Asia/Tbilisi","Asia/Tehran","Asia/Tel_Aviv","Asia/Thimbu" // 315
- ,"Asia/Thimphu","Asia/Tokyo","Asia/Ujung_Pandang","Asia/Ulaanbaatar" // 319
- ,"Asia/Ulan_Bator","Asia/Urumqi","Asia/Vientiane","Asia/Vladivostok" // 323
- ,"Asia/Yakutsk","Asia/Yekaterinburg","Asia/Yerevan" // 326
- ,"Atlantic/Azores","Atlantic/Bermuda","Atlantic/Canary" // 329
- ,"Atlantic/Cape_Verde","Atlantic/Faeroe","Atlantic/Faroe" // 332
- ,"Atlantic/Jan_Mayen","Atlantic/Madeira","Atlantic/Reykjavik" // 335
- ,"Atlantic/South_Georgia","Atlantic/St_Helena","Atlantic/Stanley" // 338
- ,"Australia/ACT","Australia/Adelaide","Australia/Brisbane" // 341
- ,"Australia/Broken_Hill","Australia/Canberra","Australia/Currie" // 344
- ,"Australia/Darwin","Australia/Eucla","Australia/Hobart" // 347
- ,"Australia/LHI","Australia/Lindeman","Australia/Lord_Howe" // 350
- ,"Australia/Melbourne","Australia/NSW","Australia/North" // 353
- ,"Australia/Perth","Australia/Queensland","Australia/South" // 356
- ,"Australia/Sydney","Australia/Tasmania","Australia/Victoria" // 359
- ,"Australia/West","Australia/Yancowinna","BET","BST" // 363
- ,"Brazil/Acre","Brazil/DeNoronha","Brazil/East","Brazil/West" // 367
- ,"CAT","CET","CNT","CST","CST6CDT","CTT","Canada/Atlantic" // 374
- ,"Canada/Central","Canada/East-Saskatchewan","Canada/Eastern" // 377
- ,"Canada/Mountain","Canada/Newfoundland","Canada/Pacific" // 380
- ,"Canada/Saskatchewan","Canada/Yukon","Chile/Continental" // 383
- ,"Chile/EasterIsland","Cuba","EAT","ECT","EET","EST" // 389
- ,"EST5EDT","Egypt","Eire","Etc/GMT","Etc/GMT+0","Etc/GMT+1" // 395
- ,"Etc/GMT+10","Etc/GMT+11","Etc/GMT+12","Etc/GMT+2" // 399
- ,"Etc/GMT+3","Etc/GMT+4","Etc/GMT+5","Etc/GMT+6","Etc/GMT+7" // 404
- ,"Etc/GMT+8","Etc/GMT+9","Etc/GMT-0","Etc/GMT-1","Etc/GMT-10" // 409
- ,"Etc/GMT-11","Etc/GMT-12","Etc/GMT-13","Etc/GMT-14" // 413
- ,"Etc/GMT-2","Etc/GMT-3","Etc/GMT-4","Etc/GMT-5","Etc/GMT-6" // 418
- ,"Etc/GMT-7","Etc/GMT-8","Etc/GMT-9","Etc/GMT0","Etc/Greenwich" // 423
- ,"Etc/UCT","Etc/UTC","Etc/Universal","Etc/Unknown" // 427
- ,"Etc/Zulu","Europe/Amsterdam","Europe/Andorra","Europe/Athens" // 431
- ,"Europe/Belfast","Europe/Belgrade","Europe/Berlin" // 434
- ,"Europe/Bratislava","Europe/Brussels","Europe/Bucharest" // 437
- ,"Europe/Budapest","Europe/Chisinau","Europe/Copenhagen" // 440
- ,"Europe/Dublin","Europe/Gibraltar","Europe/Guernsey" // 443
- ,"Europe/Helsinki","Europe/Isle_of_Man","Europe/Istanbul" // 446
- ,"Europe/Jersey","Europe/Kaliningrad","Europe/Kiev" // 449
- ,"Europe/Lisbon","Europe/Ljubljana","Europe/London" // 452
- ,"Europe/Luxembourg","Europe/Madrid","Europe/Malta" // 455
- ,"Europe/Mariehamn","Europe/Minsk","Europe/Monaco" // 458
- ,"Europe/Moscow","Europe/Nicosia","Europe/Oslo","Europe/Paris" // 462
- ,"Europe/Podgorica","Europe/Prague","Europe/Riga","Europe/Rome" // 466
- ,"Europe/Samara","Europe/San_Marino","Europe/Sarajevo" // 469
- ,"Europe/Simferopol","Europe/Skopje","Europe/Sofia" // 472
- ,"Europe/Stockholm","Europe/Tallinn","Europe/Tirane" // 475
- ,"Europe/Tiraspol","Europe/Uzhgorod","Europe/Vaduz" // 478
- ,"Europe/Vatican","Europe/Vienna","Europe/Vilnius" // 481
- ,"Europe/Volgograd","Europe/Warsaw","Europe/Zagreb" // 484
- ,"Europe/Zaporozhye","Europe/Zurich","Factory","GB" // 488
- ,"GB-Eire","GMT","GMT+0","GMT-0","GMT0","Greenwich" // 494
- ,"HST","Hongkong","IET","IST","Iceland","Indian/Antananarivo" // 500
- ,"Indian/Chagos","Indian/Christmas","Indian/Cocos" // 503
- ,"Indian/Comoro","Indian/Kerguelen","Indian/Mahe","Indian/Maldives" // 507
- ,"Indian/Mauritius","Indian/Mayotte","Indian/Reunion" // 510
- ,"Iran","Israel","JST","Jamaica","Japan","Kwajalein" // 516
- ,"Libya","MET","MIT","MST","MST7MDT","Mexico/BajaNorte" // 522
- ,"Mexico/BajaSur","Mexico/General","Mideast/Riyadh87" // 525
- ,"Mideast/Riyadh88","Mideast/Riyadh89","NET","NST" // 529
- ,"NZ","NZ-CHAT","Navajo","PLT","PNT","PRC","PRT","PST" // 537
- ,"PST8PDT","Pacific/Apia","Pacific/Auckland","Pacific/Chatham" // 541
- ,"Pacific/Chuuk","Pacific/Easter","Pacific/Efate","Pacific/Enderbury" // 545
- ,"Pacific/Fakaofo","Pacific/Fiji","Pacific/Funafuti" // 548
- ,"Pacific/Galapagos","Pacific/Gambier","Pacific/Guadalcanal" // 551
- ,"Pacific/Guam","Pacific/Honolulu","Pacific/Johnston" // 554
- ,"Pacific/Kiritimati","Pacific/Kosrae","Pacific/Kwajalein" // 557
- ,"Pacific/Majuro","Pacific/Marquesas","Pacific/Midway" // 560
- ,"Pacific/Nauru","Pacific/Niue","Pacific/Norfolk","Pacific/Noumea" // 564
- ,"Pacific/Pago_Pago","Pacific/Palau","Pacific/Pitcairn" // 567
- ,"Pacific/Pohnpei","Pacific/Ponape","Pacific/Port_Moresby" // 570
- ,"Pacific/Rarotonga","Pacific/Saipan","Pacific/Samoa" // 573
- ,"Pacific/Tahiti","Pacific/Tarawa","Pacific/Tongatapu" // 576
- ,"Pacific/Truk","Pacific/Wake","Pacific/Wallis","Pacific/Yap" // 580
- ,"Poland","Portugal","ROC","ROK","SST","Singapore" // 586
- ,"SystemV/AST4","SystemV/AST4ADT","SystemV/CST6","SystemV/CST6CDT" // 590
- ,"SystemV/EST5","SystemV/EST5EDT","SystemV/HST10","SystemV/MST7" // 594
- ,"SystemV/MST7MDT","SystemV/PST8","SystemV/PST8PDT" // 597
- ,"SystemV/YST9","SystemV/YST9YDT","Turkey","UCT","US/Alaska" // 602
- ,"US/Aleutian","US/Arizona","US/Central","US/East-Indiana" // 606
- ,"US/Eastern","US/Hawaii","US/Indiana-Starke","US/Michigan" // 610
- ,"US/Mountain","US/Pacific","US/Pacific-New","US/Samoa" // 614
- ,"UTC","Universal","VST","W-SU","WET","Zulu" // 620
+ ,"Asia/Kathmandu","Asia/Katmandu","Asia/Khandyga","Asia/Kolkata" // 279
+ ,"Asia/Krasnoyarsk","Asia/Kuala_Lumpur","Asia/Kuching" // 282
+ ,"Asia/Kuwait","Asia/Macao","Asia/Macau","Asia/Magadan" // 286
+ ,"Asia/Makassar","Asia/Manila","Asia/Muscat","Asia/Nicosia" // 290
+ ,"Asia/Novokuznetsk","Asia/Novosibirsk","Asia/Omsk" // 293
+ ,"Asia/Oral","Asia/Phnom_Penh","Asia/Pontianak","Asia/Pyongyang" // 297
+ ,"Asia/Qatar","Asia/Qyzylorda","Asia/Rangoon","Asia/Riyadh" // 301
+ ,"Asia/Riyadh87","Asia/Riyadh88","Asia/Riyadh89","Asia/Saigon" // 305
+ ,"Asia/Sakhalin","Asia/Samarkand","Asia/Seoul","Asia/Shanghai" // 309
+ ,"Asia/Singapore","Asia/Taipei","Asia/Tashkent","Asia/Tbilisi" // 313
+ ,"Asia/Tehran","Asia/Tel_Aviv","Asia/Thimbu","Asia/Thimphu" // 317
+ ,"Asia/Tokyo","Asia/Ujung_Pandang","Asia/Ulaanbaatar" // 320
+ ,"Asia/Ulan_Bator","Asia/Urumqi","Asia/Ust-Nera","Asia/Vientiane" // 324
+ ,"Asia/Vladivostok","Asia/Yakutsk","Asia/Yekaterinburg" // 327
+ ,"Asia/Yerevan","Atlantic/Azores","Atlantic/Bermuda" // 330
+ ,"Atlantic/Canary","Atlantic/Cape_Verde","Atlantic/Faeroe" // 333
+ ,"Atlantic/Faroe","Atlantic/Jan_Mayen","Atlantic/Madeira" // 336
+ ,"Atlantic/Reykjavik","Atlantic/South_Georgia","Atlantic/St_Helena" // 339
+ ,"Atlantic/Stanley","Australia/ACT","Australia/Adelaide" // 342
+ ,"Australia/Brisbane","Australia/Broken_Hill","Australia/Canberra" // 345
+ ,"Australia/Currie","Australia/Darwin","Australia/Eucla" // 348
+ ,"Australia/Hobart","Australia/LHI","Australia/Lindeman" // 351
+ ,"Australia/Lord_Howe","Australia/Melbourne","Australia/NSW" // 354
+ ,"Australia/North","Australia/Perth","Australia/Queensland" // 357
+ ,"Australia/South","Australia/Sydney","Australia/Tasmania" // 360
+ ,"Australia/Victoria","Australia/West","Australia/Yancowinna" // 363
+ ,"BET","BST","Brazil/Acre","Brazil/DeNoronha","Brazil/East" // 368
+ ,"Brazil/West","CAT","CET","CNT","CST","CST6CDT","CTT" // 375
+ ,"Canada/Atlantic","Canada/Central","Canada/East-Saskatchewan" // 378
+ ,"Canada/Eastern","Canada/Mountain","Canada/Newfoundland" // 381
+ ,"Canada/Pacific","Canada/Saskatchewan","Canada/Yukon" // 384
+ ,"Chile/Continental","Chile/EasterIsland","Cuba","EAT" // 388
+ ,"ECT","EET","EST","EST5EDT","Egypt","Eire","Etc/GMT" // 395
+ ,"Etc/GMT+0","Etc/GMT+1","Etc/GMT+10","Etc/GMT+11" // 399
+ ,"Etc/GMT+12","Etc/GMT+2","Etc/GMT+3","Etc/GMT+4","Etc/GMT+5" // 404
+ ,"Etc/GMT+6","Etc/GMT+7","Etc/GMT+8","Etc/GMT+9","Etc/GMT-0" // 409
+ ,"Etc/GMT-1","Etc/GMT-10","Etc/GMT-11","Etc/GMT-12" // 413
+ ,"Etc/GMT-13","Etc/GMT-14","Etc/GMT-2","Etc/GMT-3" // 417
+ ,"Etc/GMT-4","Etc/GMT-5","Etc/GMT-6","Etc/GMT-7","Etc/GMT-8" // 422
+ ,"Etc/GMT-9","Etc/GMT0","Etc/Greenwich","Etc/UCT","Etc/UTC" // 427
+ ,"Etc/Universal","Etc/Unknown","Etc/Zulu","Europe/Amsterdam" // 431
+ ,"Europe/Andorra","Europe/Athens","Europe/Belfast" // 434
+ ,"Europe/Belgrade","Europe/Berlin","Europe/Bratislava" // 437
+ ,"Europe/Brussels","Europe/Bucharest","Europe/Budapest" // 440
+ ,"Europe/Busingen","Europe/Chisinau","Europe/Copenhagen" // 443
+ ,"Europe/Dublin","Europe/Gibraltar","Europe/Guernsey" // 446
+ ,"Europe/Helsinki","Europe/Isle_of_Man","Europe/Istanbul" // 449
+ ,"Europe/Jersey","Europe/Kaliningrad","Europe/Kiev" // 452
+ ,"Europe/Lisbon","Europe/Ljubljana","Europe/London" // 455
+ ,"Europe/Luxembourg","Europe/Madrid","Europe/Malta" // 458
+ ,"Europe/Mariehamn","Europe/Minsk","Europe/Monaco" // 461
+ ,"Europe/Moscow","Europe/Nicosia","Europe/Oslo","Europe/Paris" // 465
+ ,"Europe/Podgorica","Europe/Prague","Europe/Riga","Europe/Rome" // 469
+ ,"Europe/Samara","Europe/San_Marino","Europe/Sarajevo" // 472
+ ,"Europe/Simferopol","Europe/Skopje","Europe/Sofia" // 475
+ ,"Europe/Stockholm","Europe/Tallinn","Europe/Tirane" // 478
+ ,"Europe/Tiraspol","Europe/Uzhgorod","Europe/Vaduz" // 481
+ ,"Europe/Vatican","Europe/Vienna","Europe/Vilnius" // 484
+ ,"Europe/Volgograd","Europe/Warsaw","Europe/Zagreb" // 487
+ ,"Europe/Zaporozhye","Europe/Zurich","Factory","GB" // 491
+ ,"GB-Eire","GMT","GMT+0","GMT-0","GMT0","Greenwich" // 497
+ ,"HST","Hongkong","IET","IST","Iceland","Indian/Antananarivo" // 503
+ ,"Indian/Chagos","Indian/Christmas","Indian/Cocos" // 506
+ ,"Indian/Comoro","Indian/Kerguelen","Indian/Mahe","Indian/Maldives" // 510
+ ,"Indian/Mauritius","Indian/Mayotte","Indian/Reunion" // 513
+ ,"Iran","Israel","JST","Jamaica","Japan","Kwajalein" // 519
+ ,"Libya","MET","MIT","MST","MST7MDT","Mexico/BajaNorte" // 525
+ ,"Mexico/BajaSur","Mexico/General","Mideast/Riyadh87" // 528
+ ,"Mideast/Riyadh88","Mideast/Riyadh89","NET","NST" // 532
+ ,"NZ","NZ-CHAT","Navajo","PLT","PNT","PRC","PRT","PST" // 540
+ ,"PST8PDT","Pacific/Apia","Pacific/Auckland","Pacific/Chatham" // 544
+ ,"Pacific/Chuuk","Pacific/Easter","Pacific/Efate","Pacific/Enderbury" // 548
+ ,"Pacific/Fakaofo","Pacific/Fiji","Pacific/Funafuti" // 551
+ ,"Pacific/Galapagos","Pacific/Gambier","Pacific/Guadalcanal" // 554
+ ,"Pacific/Guam","Pacific/Honolulu","Pacific/Johnston" // 557
+ ,"Pacific/Kiritimati","Pacific/Kosrae","Pacific/Kwajalein" // 560
+ ,"Pacific/Majuro","Pacific/Marquesas","Pacific/Midway" // 563
+ ,"Pacific/Nauru","Pacific/Niue","Pacific/Norfolk","Pacific/Noumea" // 567
+ ,"Pacific/Pago_Pago","Pacific/Palau","Pacific/Pitcairn" // 570
+ ,"Pacific/Pohnpei","Pacific/Ponape","Pacific/Port_Moresby" // 573
+ ,"Pacific/Rarotonga","Pacific/Saipan","Pacific/Samoa" // 576
+ ,"Pacific/Tahiti","Pacific/Tarawa","Pacific/Tongatapu" // 579
+ ,"Pacific/Truk","Pacific/Wake","Pacific/Wallis","Pacific/Yap" // 583
+ ,"Poland","Portugal","ROC","ROK","SST","Singapore" // 589
+ ,"SystemV/AST4","SystemV/AST4ADT","SystemV/CST6","SystemV/CST6CDT" // 593
+ ,"SystemV/EST5","SystemV/EST5EDT","SystemV/HST10","SystemV/MST7" // 597
+ ,"SystemV/MST7MDT","SystemV/PST8","SystemV/PST8PDT" // 600
+ ,"SystemV/YST9","SystemV/YST9YDT","Turkey","UCT","US/Alaska" // 605
+ ,"US/Aleutian","US/Arizona","US/Central","US/East-Indiana" // 609
+ ,"US/Eastern","US/Hawaii","US/Indiana-Starke","US/Michigan" // 613
+ ,"US/Mountain","US/Pacific","US/Pacific-New","US/Samoa" // 617
+ ,"UTC","Universal","VST","W-SU","WET","Zulu" // 623
}
Rules {
AN:intvector {
@@ -3312,10 +3335,10 @@
8, -30, -1, 9900, 1, 3, 1, -1, 9900, 1, 3600
} //_#8
Chile:intvector {
- 9, 9, -1, 14400, 2, 2, 9, -1, 10800, 2, 3600
+ 8, 2, -1, 14400, 2, 3, 23, -1, 10800, 2, 3600
} //_#9
ChileAQ:intvector {
- 9, 9, -1, 14400, 2, 2, 9, -1, 10800, 2, 3600
+ 8, 2, -1, 14400, 2, 3, 23, -1, 10800, 2, 3600
} //_#10
Cuba:intvector {
2, 8, -1, 0, 1, 10, 1, -1, 0, 1, 3600
@@ -3329,60 +3352,66 @@
Fiji:intvector {
9, 18, -1, 7200, 0, 0, 18, -1, 10800, 0, 3600
} //_#14
+ Haiti:intvector {
+ 2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
+ } //_#15
Jordan:intvector {
2, -31, -5, 86400, 0, 9, -31, -6, 0, 1, 3600
- } //_#15
+ } //_#16
LH:intvector {
9, 1, -1, 7200, 0, 3, 1, -1, 7200, 0, 1800
- } //_#16
+ } //_#17
Lebanon:intvector {
2, -31, -1, 0, 0, 9, -31, -1, 0, 0, 3600
- } //_#17
+ } //_#18
Libya:intvector {
2, -31, -6, 3600, 0, 9, -31, -6, 7200, 0, 3600
- } //_#18
+ } //_#19
Mexico:intvector {
3, 1, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600
- } //_#19
+ } //_#20
Morocco:intvector {
3, -30, -1, 7200, 0, 8, -30, -1, 10800, 0, 3600
- } //_#20
+ } //_#21
NZ:intvector {
8, -30, -1, 7200, 1, 3, 1, -1, 7200, 1, 3600
- } //_#21
+ } //_#22
NZAQ:intvector {
8, -30, -1, 7200, 1, 3, 1, -1, 7200, 1, 3600
- } //_#22
+ } //_#23
Namibia:intvector {
8, 1, -1, 7200, 0, 3, 1, -1, 7200, 0, 3600
- } //_#23
- Para:intvector {
- 9, 1, -1, 0, 0, 3, 8, -1, 0, 0, 3600
} //_#24
+ Palestine:intvector {
+ 2, -31, -5, 86400, 0, 8, 21, -6, 3600, 0, 3600
+ } //_#25
+ Para:intvector {
+ 9, 1, -1, 0, 0, 2, 22, -1, 0, 0, 3600
+ } //_#26
Syria:intvector {
2, -31, -6, 0, 0, 9, -31, -6, 0, 0, 3600
- } //_#25
+ } //_#27
SystemV:intvector {
3, -30, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600
- } //_#26
+ } //_#28
TC:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
- } //_#27
+ } //_#29
Thule:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
- } //_#28
+ } //_#30
US:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
- } //_#29
+ } //_#31
Uruguay:intvector {
9, 1, -1, 7200, 0, 2, 8, -1, 7200, 0, 3600
- } //_#30
+ } //_#32
WS:intvector {
8, -30, -1, 10800, 0, 3, 1, -1, 14400, 0, 3600
- } //_#31
+ } //_#33
Zion:intvector {
2, 23, -6, 7200, 0, 9, 2, -1, 7200, 0, 3600
- } //_#32
+ } //_#34
}
Regions:array {
"AU", //Z#0 ACT
@@ -3611,7 +3640,7 @@
"AQ", //Z#223 Antarctica/Casey
"AQ", //Z#224 Antarctica/Davis
"AQ", //Z#225 Antarctica/DumontDUrville
- "AQ", //Z#226 Antarctica/Macquarie
+ "AU", //Z#226 Antarctica/Macquarie
"AQ", //Z#227 Antarctica/Mawson
"AQ", //Z#228 Antarctica/McMurdo
"AQ", //Z#229 Antarctica/Palmer
@@ -3663,348 +3692,351 @@
"CN", //Z#275 Asia/Kashgar
"NP", //Z#276 Asia/Kathmandu
"NP", //Z#277 Asia/Katmandu
- "IN", //Z#278 Asia/Kolkata
- "RU", //Z#279 Asia/Krasnoyarsk
- "MY", //Z#280 Asia/Kuala_Lumpur
- "MY", //Z#281 Asia/Kuching
- "KW", //Z#282 Asia/Kuwait
- "MO", //Z#283 Asia/Macao
- "MO", //Z#284 Asia/Macau
- "RU", //Z#285 Asia/Magadan
- "ID", //Z#286 Asia/Makassar
- "PH", //Z#287 Asia/Manila
- "OM", //Z#288 Asia/Muscat
- "CY", //Z#289 Asia/Nicosia
- "RU", //Z#290 Asia/Novokuznetsk
- "RU", //Z#291 Asia/Novosibirsk
- "RU", //Z#292 Asia/Omsk
- "KZ", //Z#293 Asia/Oral
- "KH", //Z#294 Asia/Phnom_Penh
- "ID", //Z#295 Asia/Pontianak
- "KP", //Z#296 Asia/Pyongyang
- "QA", //Z#297 Asia/Qatar
- "KZ", //Z#298 Asia/Qyzylorda
- "MM", //Z#299 Asia/Rangoon
- "SA", //Z#300 Asia/Riyadh
- "001",//Z#301 Asia/Riyadh87
- "001",//Z#302 Asia/Riyadh88
- "001",//Z#303 Asia/Riyadh89
- "VN", //Z#304 Asia/Saigon
- "RU", //Z#305 Asia/Sakhalin
- "UZ", //Z#306 Asia/Samarkand
- "KR", //Z#307 Asia/Seoul
- "CN", //Z#308 Asia/Shanghai
- "SG", //Z#309 Asia/Singapore
- "TW", //Z#310 Asia/Taipei
- "UZ", //Z#311 Asia/Tashkent
- "GE", //Z#312 Asia/Tbilisi
- "IR", //Z#313 Asia/Tehran
- "IL", //Z#314 Asia/Tel_Aviv
- "BT", //Z#315 Asia/Thimbu
- "BT", //Z#316 Asia/Thimphu
- "JP", //Z#317 Asia/Tokyo
- "ID", //Z#318 Asia/Ujung_Pandang
- "MN", //Z#319 Asia/Ulaanbaatar
- "MN", //Z#320 Asia/Ulan_Bator
- "CN", //Z#321 Asia/Urumqi
- "LA", //Z#322 Asia/Vientiane
- "RU", //Z#323 Asia/Vladivostok
- "RU", //Z#324 Asia/Yakutsk
- "RU", //Z#325 Asia/Yekaterinburg
- "AM", //Z#326 Asia/Yerevan
- "PT", //Z#327 Atlantic/Azores
- "BM", //Z#328 Atlantic/Bermuda
- "ES", //Z#329 Atlantic/Canary
- "CV", //Z#330 Atlantic/Cape_Verde
- "FO", //Z#331 Atlantic/Faeroe
- "FO", //Z#332 Atlantic/Faroe
- "NO", //Z#333 Atlantic/Jan_Mayen
- "PT", //Z#334 Atlantic/Madeira
- "IS", //Z#335 Atlantic/Reykjavik
- "GS", //Z#336 Atlantic/South_Georgia
- "SH", //Z#337 Atlantic/St_Helena
- "FK", //Z#338 Atlantic/Stanley
- "AU", //Z#339 Australia/ACT
- "AU", //Z#340 Australia/Adelaide
- "AU", //Z#341 Australia/Brisbane
- "AU", //Z#342 Australia/Broken_Hill
- "AU", //Z#343 Australia/Canberra
- "AU", //Z#344 Australia/Currie
- "AU", //Z#345 Australia/Darwin
- "AU", //Z#346 Australia/Eucla
- "AU", //Z#347 Australia/Hobart
- "AU", //Z#348 Australia/LHI
- "AU", //Z#349 Australia/Lindeman
- "AU", //Z#350 Australia/Lord_Howe
- "AU", //Z#351 Australia/Melbourne
- "AU", //Z#352 Australia/NSW
- "AU", //Z#353 Australia/North
- "AU", //Z#354 Australia/Perth
- "AU", //Z#355 Australia/Queensland
- "AU", //Z#356 Australia/South
- "AU", //Z#357 Australia/Sydney
- "AU", //Z#358 Australia/Tasmania
- "AU", //Z#359 Australia/Victoria
- "AU", //Z#360 Australia/West
- "AU", //Z#361 Australia/Yancowinna
- "BR", //Z#362 BET
- "BD", //Z#363 BST
- "BR", //Z#364 Brazil/Acre
- "BR", //Z#365 Brazil/DeNoronha
- "BR", //Z#366 Brazil/East
- "BR", //Z#367 Brazil/West
- "ZW", //Z#368 CAT
- "001",//Z#369 CET
- "CA", //Z#370 CNT
- "US", //Z#371 CST
- "001",//Z#372 CST6CDT
- "CN", //Z#373 CTT
- "CA", //Z#374 Canada/Atlantic
- "CA", //Z#375 Canada/Central
- "CA", //Z#376 Canada/East-Saskatchewan
- "CA", //Z#377 Canada/Eastern
- "CA", //Z#378 Canada/Mountain
- "CA", //Z#379 Canada/Newfoundland
- "CA", //Z#380 Canada/Pacific
- "CA", //Z#381 Canada/Saskatchewan
- "CA", //Z#382 Canada/Yukon
- "CL", //Z#383 Chile/Continental
- "CL", //Z#384 Chile/EasterIsland
- "CU", //Z#385 Cuba
- "ET", //Z#386 EAT
- "FR", //Z#387 ECT
- "001",//Z#388 EET
- "001",//Z#389 EST
- "001",//Z#390 EST5EDT
- "EG", //Z#391 Egypt
- "IE", //Z#392 Eire
- "001",//Z#393 Etc/GMT
- "001",//Z#394 Etc/GMT+0
- "001",//Z#395 Etc/GMT+1
- "001",//Z#396 Etc/GMT+10
- "001",//Z#397 Etc/GMT+11
- "001",//Z#398 Etc/GMT+12
- "001",//Z#399 Etc/GMT+2
- "001",//Z#400 Etc/GMT+3
- "001",//Z#401 Etc/GMT+4
- "001",//Z#402 Etc/GMT+5
- "001",//Z#403 Etc/GMT+6
- "001",//Z#404 Etc/GMT+7
- "001",//Z#405 Etc/GMT+8
- "001",//Z#406 Etc/GMT+9
- "001",//Z#407 Etc/GMT-0
- "001",//Z#408 Etc/GMT-1
- "001",//Z#409 Etc/GMT-10
- "001",//Z#410 Etc/GMT-11
- "001",//Z#411 Etc/GMT-12
- "001",//Z#412 Etc/GMT-13
- "001",//Z#413 Etc/GMT-14
- "001",//Z#414 Etc/GMT-2
- "001",//Z#415 Etc/GMT-3
- "001",//Z#416 Etc/GMT-4
- "001",//Z#417 Etc/GMT-5
- "001",//Z#418 Etc/GMT-6
- "001",//Z#419 Etc/GMT-7
- "001",//Z#420 Etc/GMT-8
- "001",//Z#421 Etc/GMT-9
- "001",//Z#422 Etc/GMT0
- "001",//Z#423 Etc/Greenwich
- "001",//Z#424 Etc/UCT
- "001",//Z#425 Etc/UTC
- "001",//Z#426 Etc/Universal
- "001",//Z#427 Etc/Unknown
- "001",//Z#428 Etc/Zulu
- "NL", //Z#429 Europe/Amsterdam
- "AD", //Z#430 Europe/Andorra
- "GR", //Z#431 Europe/Athens
- "GB", //Z#432 Europe/Belfast
- "RS", //Z#433 Europe/Belgrade
- "DE", //Z#434 Europe/Berlin
- "SK", //Z#435 Europe/Bratislava
- "BE", //Z#436 Europe/Brussels
- "RO", //Z#437 Europe/Bucharest
- "HU", //Z#438 Europe/Budapest
- "MD", //Z#439 Europe/Chisinau
- "DK", //Z#440 Europe/Copenhagen
- "IE", //Z#441 Europe/Dublin
- "GI", //Z#442 Europe/Gibraltar
- "GG", //Z#443 Europe/Guernsey
- "FI", //Z#444 Europe/Helsinki
- "IM", //Z#445 Europe/Isle_of_Man
- "TR", //Z#446 Europe/Istanbul
- "JE", //Z#447 Europe/Jersey
- "RU", //Z#448 Europe/Kaliningrad
- "UA", //Z#449 Europe/Kiev
- "PT", //Z#450 Europe/Lisbon
- "SI", //Z#451 Europe/Ljubljana
- "GB", //Z#452 Europe/London
- "LU", //Z#453 Europe/Luxembourg
- "ES", //Z#454 Europe/Madrid
- "MT", //Z#455 Europe/Malta
- "AX", //Z#456 Europe/Mariehamn
- "BY", //Z#457 Europe/Minsk
- "MC", //Z#458 Europe/Monaco
- "RU", //Z#459 Europe/Moscow
- "CY", //Z#460 Europe/Nicosia
- "NO", //Z#461 Europe/Oslo
- "FR", //Z#462 Europe/Paris
- "ME", //Z#463 Europe/Podgorica
- "CZ", //Z#464 Europe/Prague
- "LV", //Z#465 Europe/Riga
- "IT", //Z#466 Europe/Rome
- "RU", //Z#467 Europe/Samara
- "SM", //Z#468 Europe/San_Marino
- "BA", //Z#469 Europe/Sarajevo
- "UA", //Z#470 Europe/Simferopol
- "MK", //Z#471 Europe/Skopje
- "BG", //Z#472 Europe/Sofia
- "SE", //Z#473 Europe/Stockholm
- "EE", //Z#474 Europe/Tallinn
- "AL", //Z#475 Europe/Tirane
- "MD", //Z#476 Europe/Tiraspol
- "UA", //Z#477 Europe/Uzhgorod
- "LI", //Z#478 Europe/Vaduz
- "VA", //Z#479 Europe/Vatican
- "AT", //Z#480 Europe/Vienna
- "LT", //Z#481 Europe/Vilnius
- "RU", //Z#482 Europe/Volgograd
- "PL", //Z#483 Europe/Warsaw
- "HR", //Z#484 Europe/Zagreb
- "UA", //Z#485 Europe/Zaporozhye
- "CH", //Z#486 Europe/Zurich
- "001",//Z#487 Factory
- "GB", //Z#488 GB
- "GB", //Z#489 GB-Eire
- "001",//Z#490 GMT
- "001",//Z#491 GMT+0
- "001",//Z#492 GMT-0
- "001",//Z#493 GMT0
- "001",//Z#494 Greenwich
- "001",//Z#495 HST
- "HK", //Z#496 Hongkong
- "US", //Z#497 IET
- "IN", //Z#498 IST
- "IS", //Z#499 Iceland
- "MG", //Z#500 Indian/Antananarivo
- "IO", //Z#501 Indian/Chagos
- "CX", //Z#502 Indian/Christmas
- "CC", //Z#503 Indian/Cocos
- "KM", //Z#504 Indian/Comoro
- "TF", //Z#505 Indian/Kerguelen
- "SC", //Z#506 Indian/Mahe
- "MV", //Z#507 Indian/Maldives
- "MU", //Z#508 Indian/Mauritius
- "YT", //Z#509 Indian/Mayotte
- "RE", //Z#510 Indian/Reunion
- "IR", //Z#511 Iran
- "IL", //Z#512 Israel
- "JP", //Z#513 JST
- "JM", //Z#514 Jamaica
- "JP", //Z#515 Japan
- "MH", //Z#516 Kwajalein
- "LY", //Z#517 Libya
- "001",//Z#518 MET
- "WS", //Z#519 MIT
- "001",//Z#520 MST
- "001",//Z#521 MST7MDT
- "MX", //Z#522 Mexico/BajaNorte
- "MX", //Z#523 Mexico/BajaSur
- "MX", //Z#524 Mexico/General
- "001",//Z#525 Mideast/Riyadh87
- "001",//Z#526 Mideast/Riyadh88
- "001",//Z#527 Mideast/Riyadh89
- "AM", //Z#528 NET
- "NZ", //Z#529 NST
- "NZ", //Z#530 NZ
- "NZ", //Z#531 NZ-CHAT
- "US", //Z#532 Navajo
- "PK", //Z#533 PLT
- "US", //Z#534 PNT
- "CN", //Z#535 PRC
- "PR", //Z#536 PRT
- "US", //Z#537 PST
- "001",//Z#538 PST8PDT
- "WS", //Z#539 Pacific/Apia
- "NZ", //Z#540 Pacific/Auckland
- "NZ", //Z#541 Pacific/Chatham
- "FM", //Z#542 Pacific/Chuuk
- "CL", //Z#543 Pacific/Easter
- "VU", //Z#544 Pacific/Efate
- "KI", //Z#545 Pacific/Enderbury
- "TK", //Z#546 Pacific/Fakaofo
- "FJ", //Z#547 Pacific/Fiji
- "TV", //Z#548 Pacific/Funafuti
- "EC", //Z#549 Pacific/Galapagos
- "PF", //Z#550 Pacific/Gambier
- "SB", //Z#551 Pacific/Guadalcanal
- "GU", //Z#552 Pacific/Guam
- "US", //Z#553 Pacific/Honolulu
- "UM", //Z#554 Pacific/Johnston
- "KI", //Z#555 Pacific/Kiritimati
- "FM", //Z#556 Pacific/Kosrae
- "MH", //Z#557 Pacific/Kwajalein
- "MH", //Z#558 Pacific/Majuro
- "PF", //Z#559 Pacific/Marquesas
- "UM", //Z#560 Pacific/Midway
- "NR", //Z#561 Pacific/Nauru
- "NU", //Z#562 Pacific/Niue
- "NF", //Z#563 Pacific/Norfolk
- "NC", //Z#564 Pacific/Noumea
- "AS", //Z#565 Pacific/Pago_Pago
- "PW", //Z#566 Pacific/Palau
- "PN", //Z#567 Pacific/Pitcairn
- "FM", //Z#568 Pacific/Pohnpei
- "FM", //Z#569 Pacific/Ponape
- "PG", //Z#570 Pacific/Port_Moresby
- "CK", //Z#571 Pacific/Rarotonga
- "MP", //Z#572 Pacific/Saipan
- "AS", //Z#573 Pacific/Samoa
- "PF", //Z#574 Pacific/Tahiti
- "KI", //Z#575 Pacific/Tarawa
- "TO", //Z#576 Pacific/Tongatapu
- "FM", //Z#577 Pacific/Truk
- "UM", //Z#578 Pacific/Wake
- "WF", //Z#579 Pacific/Wallis
- "FM", //Z#580 Pacific/Yap
- "PL", //Z#581 Poland
- "PT", //Z#582 Portugal
- "TW", //Z#583 ROC
- "KR", //Z#584 ROK
- "SB", //Z#585 SST
- "SG", //Z#586 Singapore
- "001",//Z#587 SystemV/AST4
- "001",//Z#588 SystemV/AST4ADT
- "001",//Z#589 SystemV/CST6
- "001",//Z#590 SystemV/CST6CDT
- "001",//Z#591 SystemV/EST5
- "001",//Z#592 SystemV/EST5EDT
- "001",//Z#593 SystemV/HST10
- "001",//Z#594 SystemV/MST7
- "001",//Z#595 SystemV/MST7MDT
- "001",//Z#596 SystemV/PST8
- "001",//Z#597 SystemV/PST8PDT
- "001",//Z#598 SystemV/YST9
- "001",//Z#599 SystemV/YST9YDT
- "TR", //Z#600 Turkey
- "001",//Z#601 UCT
- "US", //Z#602 US/Alaska
- "US", //Z#603 US/Aleutian
- "US", //Z#604 US/Arizona
- "US", //Z#605 US/Central
- "US", //Z#606 US/East-Indiana
- "US", //Z#607 US/Eastern
- "US", //Z#608 US/Hawaii
- "US", //Z#609 US/Indiana-Starke
- "US", //Z#610 US/Michigan
- "US", //Z#611 US/Mountain
- "US", //Z#612 US/Pacific
- "US", //Z#613 US/Pacific-New
- "AS", //Z#614 US/Samoa
- "001",//Z#615 UTC
- "001",//Z#616 Universal
- "VN", //Z#617 VST
- "RU", //Z#618 W-SU
- "001",//Z#619 WET
- "001",//Z#620 Zulu
+ "RU", //Z#278 Asia/Khandyga
+ "IN", //Z#279 Asia/Kolkata
+ "RU", //Z#280 Asia/Krasnoyarsk
+ "MY", //Z#281 Asia/Kuala_Lumpur
+ "MY", //Z#282 Asia/Kuching
+ "KW", //Z#283 Asia/Kuwait
+ "MO", //Z#284 Asia/Macao
+ "MO", //Z#285 Asia/Macau
+ "RU", //Z#286 Asia/Magadan
+ "ID", //Z#287 Asia/Makassar
+ "PH", //Z#288 Asia/Manila
+ "OM", //Z#289 Asia/Muscat
+ "CY", //Z#290 Asia/Nicosia
+ "RU", //Z#291 Asia/Novokuznetsk
+ "RU", //Z#292 Asia/Novosibirsk
+ "RU", //Z#293 Asia/Omsk
+ "KZ", //Z#294 Asia/Oral
+ "KH", //Z#295 Asia/Phnom_Penh
+ "ID", //Z#296 Asia/Pontianak
+ "KP", //Z#297 Asia/Pyongyang
+ "QA", //Z#298 Asia/Qatar
+ "KZ", //Z#299 Asia/Qyzylorda
+ "MM", //Z#300 Asia/Rangoon
+ "SA", //Z#301 Asia/Riyadh
+ "001",//Z#302 Asia/Riyadh87
+ "001",//Z#303 Asia/Riyadh88
+ "001",//Z#304 Asia/Riyadh89
+ "VN", //Z#305 Asia/Saigon
+ "RU", //Z#306 Asia/Sakhalin
+ "UZ", //Z#307 Asia/Samarkand
+ "KR", //Z#308 Asia/Seoul
+ "CN", //Z#309 Asia/Shanghai
+ "SG", //Z#310 Asia/Singapore
+ "TW", //Z#311 Asia/Taipei
+ "UZ", //Z#312 Asia/Tashkent
+ "GE", //Z#313 Asia/Tbilisi
+ "IR", //Z#314 Asia/Tehran
+ "IL", //Z#315 Asia/Tel_Aviv
+ "BT", //Z#316 Asia/Thimbu
+ "BT", //Z#317 Asia/Thimphu
+ "JP", //Z#318 Asia/Tokyo
+ "ID", //Z#319 Asia/Ujung_Pandang
+ "MN", //Z#320 Asia/Ulaanbaatar
+ "MN", //Z#321 Asia/Ulan_Bator
+ "CN", //Z#322 Asia/Urumqi
+ "RU", //Z#323 Asia/Ust-Nera
+ "LA", //Z#324 Asia/Vientiane
+ "RU", //Z#325 Asia/Vladivostok
+ "RU", //Z#326 Asia/Yakutsk
+ "RU", //Z#327 Asia/Yekaterinburg
+ "AM", //Z#328 Asia/Yerevan
+ "PT", //Z#329 Atlantic/Azores
+ "BM", //Z#330 Atlantic/Bermuda
+ "ES", //Z#331 Atlantic/Canary
+ "CV", //Z#332 Atlantic/Cape_Verde
+ "FO", //Z#333 Atlantic/Faeroe
+ "FO", //Z#334 Atlantic/Faroe
+ "NO", //Z#335 Atlantic/Jan_Mayen
+ "PT", //Z#336 Atlantic/Madeira
+ "IS", //Z#337 Atlantic/Reykjavik
+ "GS", //Z#338 Atlantic/South_Georgia
+ "SH", //Z#339 Atlantic/St_Helena
+ "FK", //Z#340 Atlantic/Stanley
+ "AU", //Z#341 Australia/ACT
+ "AU", //Z#342 Australia/Adelaide
+ "AU", //Z#343 Australia/Brisbane
+ "AU", //Z#344 Australia/Broken_Hill
+ "AU", //Z#345 Australia/Canberra
+ "AU", //Z#346 Australia/Currie
+ "AU", //Z#347 Australia/Darwin
+ "AU", //Z#348 Australia/Eucla
+ "AU", //Z#349 Australia/Hobart
+ "AU", //Z#350 Australia/LHI
+ "AU", //Z#351 Australia/Lindeman
+ "AU", //Z#352 Australia/Lord_Howe
+ "AU", //Z#353 Australia/Melbourne
+ "AU", //Z#354 Australia/NSW
+ "AU", //Z#355 Australia/North
+ "AU", //Z#356 Australia/Perth
+ "AU", //Z#357 Australia/Queensland
+ "AU", //Z#358 Australia/South
+ "AU", //Z#359 Australia/Sydney
+ "AU", //Z#360 Australia/Tasmania
+ "AU", //Z#361 Australia/Victoria
+ "AU", //Z#362 Australia/West
+ "AU", //Z#363 Australia/Yancowinna
+ "BR", //Z#364 BET
+ "BD", //Z#365 BST
+ "BR", //Z#366 Brazil/Acre
+ "BR", //Z#367 Brazil/DeNoronha
+ "BR", //Z#368 Brazil/East
+ "BR", //Z#369 Brazil/West
+ "ZW", //Z#370 CAT
+ "001",//Z#371 CET
+ "CA", //Z#372 CNT
+ "US", //Z#373 CST
+ "001",//Z#374 CST6CDT
+ "CN", //Z#375 CTT
+ "CA", //Z#376 Canada/Atlantic
+ "CA", //Z#377 Canada/Central
+ "CA", //Z#378 Canada/East-Saskatchewan
+ "CA", //Z#379 Canada/Eastern
+ "CA", //Z#380 Canada/Mountain
+ "CA", //Z#381 Canada/Newfoundland
+ "CA", //Z#382 Canada/Pacific
+ "CA", //Z#383 Canada/Saskatchewan
+ "CA", //Z#384 Canada/Yukon
+ "CL", //Z#385 Chile/Continental
+ "CL", //Z#386 Chile/EasterIsland
+ "CU", //Z#387 Cuba
+ "ET", //Z#388 EAT
+ "FR", //Z#389 ECT
+ "001",//Z#390 EET
+ "001",//Z#391 EST
+ "001",//Z#392 EST5EDT
+ "EG", //Z#393 Egypt
+ "IE", //Z#394 Eire
+ "001",//Z#395 Etc/GMT
+ "001",//Z#396 Etc/GMT+0
+ "001",//Z#397 Etc/GMT+1
+ "001",//Z#398 Etc/GMT+10
+ "001",//Z#399 Etc/GMT+11
+ "001",//Z#400 Etc/GMT+12
+ "001",//Z#401 Etc/GMT+2
+ "001",//Z#402 Etc/GMT+3
+ "001",//Z#403 Etc/GMT+4
+ "001",//Z#404 Etc/GMT+5
+ "001",//Z#405 Etc/GMT+6
+ "001",//Z#406 Etc/GMT+7
+ "001",//Z#407 Etc/GMT+8
+ "001",//Z#408 Etc/GMT+9
+ "001",//Z#409 Etc/GMT-0
+ "001",//Z#410 Etc/GMT-1
+ "001",//Z#411 Etc/GMT-10
+ "001",//Z#412 Etc/GMT-11
+ "001",//Z#413 Etc/GMT-12
+ "001",//Z#414 Etc/GMT-13
+ "001",//Z#415 Etc/GMT-14
+ "001",//Z#416 Etc/GMT-2
+ "001",//Z#417 Etc/GMT-3
+ "001",//Z#418 Etc/GMT-4
+ "001",//Z#419 Etc/GMT-5
+ "001",//Z#420 Etc/GMT-6
+ "001",//Z#421 Etc/GMT-7
+ "001",//Z#422 Etc/GMT-8
+ "001",//Z#423 Etc/GMT-9
+ "001",//Z#424 Etc/GMT0
+ "001",//Z#425 Etc/Greenwich
+ "001",//Z#426 Etc/UCT
+ "001",//Z#427 Etc/UTC
+ "001",//Z#428 Etc/Universal
+ "001",//Z#429 Etc/Unknown
+ "001",//Z#430 Etc/Zulu
+ "NL", //Z#431 Europe/Amsterdam
+ "AD", //Z#432 Europe/Andorra
+ "GR", //Z#433 Europe/Athens
+ "GB", //Z#434 Europe/Belfast
+ "RS", //Z#435 Europe/Belgrade
+ "DE", //Z#436 Europe/Berlin
+ "SK", //Z#437 Europe/Bratislava
+ "BE", //Z#438 Europe/Brussels
+ "RO", //Z#439 Europe/Bucharest
+ "HU", //Z#440 Europe/Budapest
+ "DE", //Z#441 Europe/Busingen
+ "MD", //Z#442 Europe/Chisinau
+ "DK", //Z#443 Europe/Copenhagen
+ "IE", //Z#444 Europe/Dublin
+ "GI", //Z#445 Europe/Gibraltar
+ "GG", //Z#446 Europe/Guernsey
+ "FI", //Z#447 Europe/Helsinki
+ "IM", //Z#448 Europe/Isle_of_Man
+ "TR", //Z#449 Europe/Istanbul
+ "JE", //Z#450 Europe/Jersey
+ "RU", //Z#451 Europe/Kaliningrad
+ "UA", //Z#452 Europe/Kiev
+ "PT", //Z#453 Europe/Lisbon
+ "SI", //Z#454 Europe/Ljubljana
+ "GB", //Z#455 Europe/London
+ "LU", //Z#456 Europe/Luxembourg
+ "ES", //Z#457 Europe/Madrid
+ "MT", //Z#458 Europe/Malta
+ "AX", //Z#459 Europe/Mariehamn
+ "BY", //Z#460 Europe/Minsk
+ "MC", //Z#461 Europe/Monaco
+ "RU", //Z#462 Europe/Moscow
+ "CY", //Z#463 Europe/Nicosia
+ "NO", //Z#464 Europe/Oslo
+ "FR", //Z#465 Europe/Paris
+ "ME", //Z#466 Europe/Podgorica
+ "CZ", //Z#467 Europe/Prague
+ "LV", //Z#468 Europe/Riga
+ "IT", //Z#469 Europe/Rome
+ "RU", //Z#470 Europe/Samara
+ "SM", //Z#471 Europe/San_Marino
+ "BA", //Z#472 Europe/Sarajevo
+ "UA", //Z#473 Europe/Simferopol
+ "MK", //Z#474 Europe/Skopje
+ "BG", //Z#475 Europe/Sofia
+ "SE", //Z#476 Europe/Stockholm
+ "EE", //Z#477 Europe/Tallinn
+ "AL", //Z#478 Europe/Tirane
+ "MD", //Z#479 Europe/Tiraspol
+ "UA", //Z#480 Europe/Uzhgorod
+ "LI", //Z#481 Europe/Vaduz
+ "VA", //Z#482 Europe/Vatican
+ "AT", //Z#483 Europe/Vienna
+ "LT", //Z#484 Europe/Vilnius
+ "RU", //Z#485 Europe/Volgograd
+ "PL", //Z#486 Europe/Warsaw
+ "HR", //Z#487 Europe/Zagreb
+ "UA", //Z#488 Europe/Zaporozhye
+ "CH", //Z#489 Europe/Zurich
+ "001",//Z#490 Factory
+ "GB", //Z#491 GB
+ "GB", //Z#492 GB-Eire
+ "001",//Z#493 GMT
+ "001",//Z#494 GMT+0
+ "001",//Z#495 GMT-0
+ "001",//Z#496 GMT0
+ "001",//Z#497 Greenwich
+ "001",//Z#498 HST
+ "HK", //Z#499 Hongkong
+ "US", //Z#500 IET
+ "IN", //Z#501 IST
+ "IS", //Z#502 Iceland
+ "MG", //Z#503 Indian/Antananarivo
+ "IO", //Z#504 Indian/Chagos
+ "CX", //Z#505 Indian/Christmas
+ "CC", //Z#506 Indian/Cocos
+ "KM", //Z#507 Indian/Comoro
+ "TF", //Z#508 Indian/Kerguelen
+ "SC", //Z#509 Indian/Mahe
+ "MV", //Z#510 Indian/Maldives
+ "MU", //Z#511 Indian/Mauritius
+ "YT", //Z#512 Indian/Mayotte
+ "RE", //Z#513 Indian/Reunion
+ "IR", //Z#514 Iran
+ "IL", //Z#515 Israel
+ "JP", //Z#516 JST
+ "JM", //Z#517 Jamaica
+ "JP", //Z#518 Japan
+ "MH", //Z#519 Kwajalein
+ "LY", //Z#520 Libya
+ "001",//Z#521 MET
+ "WS", //Z#522 MIT
+ "001",//Z#523 MST
+ "001",//Z#524 MST7MDT
+ "MX", //Z#525 Mexico/BajaNorte
+ "MX", //Z#526 Mexico/BajaSur
+ "MX", //Z#527 Mexico/General
+ "001",//Z#528 Mideast/Riyadh87
+ "001",//Z#529 Mideast/Riyadh88
+ "001",//Z#530 Mideast/Riyadh89
+ "AM", //Z#531 NET
+ "NZ", //Z#532 NST
+ "NZ", //Z#533 NZ
+ "NZ", //Z#534 NZ-CHAT
+ "US", //Z#535 Navajo
+ "PK", //Z#536 PLT
+ "US", //Z#537 PNT
+ "CN", //Z#538 PRC
+ "PR", //Z#539 PRT
+ "US", //Z#540 PST
+ "001",//Z#541 PST8PDT
+ "WS", //Z#542 Pacific/Apia
+ "NZ", //Z#543 Pacific/Auckland
+ "NZ", //Z#544 Pacific/Chatham
+ "FM", //Z#545 Pacific/Chuuk
+ "CL", //Z#546 Pacific/Easter
+ "VU", //Z#547 Pacific/Efate
+ "KI", //Z#548 Pacific/Enderbury
+ "TK", //Z#549 Pacific/Fakaofo
+ "FJ", //Z#550 Pacific/Fiji
+ "TV", //Z#551 Pacific/Funafuti
+ "EC", //Z#552 Pacific/Galapagos
+ "PF", //Z#553 Pacific/Gambier
+ "SB", //Z#554 Pacific/Guadalcanal
+ "GU", //Z#555 Pacific/Guam
+ "US", //Z#556 Pacific/Honolulu
+ "UM", //Z#557 Pacific/Johnston
+ "KI", //Z#558 Pacific/Kiritimati
+ "FM", //Z#559 Pacific/Kosrae
+ "MH", //Z#560 Pacific/Kwajalein
+ "MH", //Z#561 Pacific/Majuro
+ "PF", //Z#562 Pacific/Marquesas
+ "UM", //Z#563 Pacific/Midway
+ "NR", //Z#564 Pacific/Nauru
+ "NU", //Z#565 Pacific/Niue
+ "NF", //Z#566 Pacific/Norfolk
+ "NC", //Z#567 Pacific/Noumea
+ "AS", //Z#568 Pacific/Pago_Pago
+ "PW", //Z#569 Pacific/Palau
+ "PN", //Z#570 Pacific/Pitcairn
+ "FM", //Z#571 Pacific/Pohnpei
+ "FM", //Z#572 Pacific/Ponape
+ "PG", //Z#573 Pacific/Port_Moresby
+ "CK", //Z#574 Pacific/Rarotonga
+ "MP", //Z#575 Pacific/Saipan
+ "AS", //Z#576 Pacific/Samoa
+ "PF", //Z#577 Pacific/Tahiti
+ "KI", //Z#578 Pacific/Tarawa
+ "TO", //Z#579 Pacific/Tongatapu
+ "FM", //Z#580 Pacific/Truk
+ "UM", //Z#581 Pacific/Wake
+ "WF", //Z#582 Pacific/Wallis
+ "FM", //Z#583 Pacific/Yap
+ "PL", //Z#584 Poland
+ "PT", //Z#585 Portugal
+ "TW", //Z#586 ROC
+ "KR", //Z#587 ROK
+ "SB", //Z#588 SST
+ "SG", //Z#589 Singapore
+ "001",//Z#590 SystemV/AST4
+ "001",//Z#591 SystemV/AST4ADT
+ "001",//Z#592 SystemV/CST6
+ "001",//Z#593 SystemV/CST6CDT
+ "001",//Z#594 SystemV/EST5
+ "001",//Z#595 SystemV/EST5EDT
+ "001",//Z#596 SystemV/HST10
+ "001",//Z#597 SystemV/MST7
+ "001",//Z#598 SystemV/MST7MDT
+ "001",//Z#599 SystemV/PST8
+ "001",//Z#600 SystemV/PST8PDT
+ "001",//Z#601 SystemV/YST9
+ "001",//Z#602 SystemV/YST9YDT
+ "TR", //Z#603 Turkey
+ "001",//Z#604 UCT
+ "US", //Z#605 US/Alaska
+ "US", //Z#606 US/Aleutian
+ "US", //Z#607 US/Arizona
+ "US", //Z#608 US/Central
+ "US", //Z#609 US/East-Indiana
+ "US", //Z#610 US/Eastern
+ "US", //Z#611 US/Hawaii
+ "US", //Z#612 US/Indiana-Starke
+ "US", //Z#613 US/Michigan
+ "US", //Z#614 US/Mountain
+ "US", //Z#615 US/Pacific
+ "US", //Z#616 US/Pacific-New
+ "AS", //Z#617 US/Samoa
+ "001",//Z#618 UTC
+ "001",//Z#619 Universal
+ "VN", //Z#620 VST
+ "RU", //Z#621 W-SU
+ "001",//Z#622 WET
+ "001",//Z#623 Zulu
}
}
diff --git a/data/rbnf/af.txt b/data/rbnf/af.txt
index 0b7b323..34ebd60 100644
--- a/data/rbnf/af.txt
+++ b/data/rbnf/af.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/af.xml
@@ -98,5 +98,5 @@
"1000000000000000000: =#,##0=.;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/am.txt b/data/rbnf/am.txt
index d4b3fab..36d7dbb 100644
--- a/data/rbnf/am.txt
+++ b/data/rbnf/am.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/am.xml
@@ -64,5 +64,5 @@
"0: =%spellout-numbering=\u129B;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/ar.txt b/data/rbnf/ar.txt
index f4ed575..1439867 100644
--- a/data/rbnf/ar.txt
+++ b/data/rbnf/ar.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/ar.xml
@@ -184,5 +184,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.76.67"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/az.txt b/data/rbnf/az.txt
index 26eeff5..176bb20 100644
--- a/data/rbnf/az.txt
+++ b/data/rbnf/az.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/az.xml
@@ -99,5 +99,5 @@
"1000000000000000000: =#,##0='inci;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/be.txt b/data/rbnf/be.txt
index b31dfb1..ea39405 100644
--- a/data/rbnf/be.txt
+++ b/data/rbnf/be.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/be.xml
@@ -433,5 +433,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.77.49"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/bg.txt b/data/rbnf/bg.txt
index d206214..73cf51b 100644
--- a/data/rbnf/bg.txt
+++ b/data/rbnf/bg.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/bg.xml
@@ -103,5 +103,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/bs.txt b/data/rbnf/bs.txt
index 76ccf08..c833081 100644
--- a/data/rbnf/bs.txt
+++ b/data/rbnf/bs.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/bs.xml
@@ -125,5 +125,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/ca.txt b/data/rbnf/ca.txt
index dcc1525..2be78a1 100644
--- a/data/rbnf/ca.txt
+++ b/data/rbnf/ca.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/ca.xml
@@ -264,5 +264,5 @@
"1000000000000000000: =#,##0=ena;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/cs.txt b/data/rbnf/cs.txt
index 8dbafb5..8f22c3d 100644
--- a/data/rbnf/cs.txt
+++ b/data/rbnf/cs.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/cs.xml
@@ -134,5 +134,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/cy.txt b/data/rbnf/cy.txt
index 32c969e..85b67a5 100644
--- a/data/rbnf/cy.txt
+++ b/data/rbnf/cy.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/cy.xml
@@ -113,5 +113,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/da.txt b/data/rbnf/da.txt
index 5d1b6fd..4e55ed7 100644
--- a/data/rbnf/da.txt
+++ b/data/rbnf/da.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/da.xml
@@ -78,5 +78,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/de.txt b/data/rbnf/de.txt
index 415a2d1..deddc97 100644
--- a/data/rbnf/de.txt
+++ b/data/rbnf/de.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/de.xml
@@ -128,5 +128,5 @@
"1000000000000000000: =#,##0=.;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/ee.txt b/data/rbnf/ee.txt
index 91f747d..3e33574 100755
--- a/data/rbnf/ee.txt
+++ b/data/rbnf/ee.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/ee.xml
@@ -14,15 +14,14 @@
OrdinalRules{
"%digits-ordinal:",
"-x: \u2212>>;",
- "x.x: =#,##0.0=lia;",
- "0: =#,##0=lia;",
- "1: =#,##0=t\u0254;",
- "2: =#,##0=lia;",
+ "0: =#,##0= lia;",
+ "1: =#,##0= t\u0254;",
+ "2: =#,##0= lia;",
}
SpelloutRules{
"%spellout-numbering-year:",
"x.x: =#,###0.#=;",
- "0: =%spellout-numbering=;",
+ "0: \u0192e =%spellout-numbering=;",
"%spellout-numbering:",
"0: =%spellout-cardinal=;",
"%%after-hundreds:",
@@ -46,19 +45,20 @@
"0: ' kple =%spellout-cardinal=;",
"100: ' =%spellout-cardinal=;",
"%%after-hundred-thousands:",
- "0: ' gb\u0254viedzesi kple =%spellout-cardinal=;",
+ "0: ' kpakple =%spellout-cardinal=;",
"100: ' =%spellout-cardinal=;",
"%%after-millions:",
- "0: ' t\u0254viedzesi kple =%spellout-cardinal=;",
+ "0: ' kpakple =%spellout-cardinal=;",
"1000: ' kple =%spellout-cardinal=;",
"100000: ' =%spellout-cardinal=;",
"%%after-billions:",
- "0: ' t\u0254viedzesi kple =%spellout-cardinal=;",
+ "0: ' kpakple =%spellout-cardinal=;",
"1000: ' kple =%spellout-cardinal=;",
+ "100000000: ' kple =%spellout-cardinal=;",
"100000000000: ' =%spellout-cardinal=;",
"%%spellout-base:",
"0: \u0256ekeo;",
- "1: \u0256ek\u03B5;",
+ "1: \u0256ek\u025B;",
"2: eve;",
"3: et\u0254\u0303;",
"4: ene;",
@@ -74,22 +74,21 @@
"1000: akpe <%spellout-cardinal<[>%%after-thousands>];",
"100000/1000: akpe <%spellout-cardinal<[>%%after-hundred-thousands>];",
"1000000: mili\u0254n <%spellout-cardinal<[>%%after-millions>];",
+ "1000000000: mili\u0254n akpe <%spellout-cardinal<[>%%after-millions>];",
"1000000000000: bili\u0254n <%spellout-cardinal<[>%%after-billions>];",
"1000000000000000000: =#,##0=;",
"%spellout-cardinal:",
"-x: >> xle\u0303yimegbee;",
- "x.x: << t\u0254t\u0254dzesi >>;",
+ "x.x: << ewoliawo \u0192e >>;",
"0: \u0256ekeo;",
"1: \u0256eka;",
"2: =%%spellout-base=;",
"%spellout-ordinal:",
"-x: >> xle\u0303yimegbee;",
- "x.x: =#,##0.0=lia;",
"0: \u0256ekeolia;",
"1: gb\u00E3t\u0254;",
"2: =%spellout-cardinal=lia;",
- "1000000000000000000: =#,##0=lia;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/el.txt b/data/rbnf/el.txt
index 4fc3c6e..82e9637 100644
--- a/data/rbnf/el.txt
+++ b/data/rbnf/el.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/el.xml
@@ -303,5 +303,5 @@
"1000000000000000000: =#,##0=.;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/en.txt b/data/rbnf/en.txt
index b406a23..4a864a6 100644
--- a/data/rbnf/en.txt
+++ b/data/rbnf/en.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/en.xml
@@ -211,5 +211,5 @@
"1000000000000000000: =#,##0=.;",
}
}
- Version{"2.0.76.41"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/eo.txt b/data/rbnf/eo.txt
index 8cc8237..d21fd54 100644
--- a/data/rbnf/eo.txt
+++ b/data/rbnf/eo.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/eo.xml
@@ -49,5 +49,5 @@
"0: =%spellout-cardinal=a;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es.txt b/data/rbnf/es.txt
index 513f318..6e62795 100644
--- a/data/rbnf/es.txt
+++ b/data/rbnf/es.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es.xml
@@ -316,5 +316,5 @@
"1000000000000000000: =#,##0=\u00AA;",
}
}
- Version{"2.0.74.2"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_419.txt b/data/rbnf/es_419.txt
index d039308..42e05fe 100755
--- a/data/rbnf/es_419.txt
+++ b/data/rbnf/es_419.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_419.xml
@@ -410,5 +410,5 @@
"1000000000000000000: =#,##0=\u00AA;",
}
}
- Version{"2.0.74.2"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_AR.txt b/data/rbnf/es_AR.txt
index 4aab309..9d24d3f 100755
--- a/data/rbnf/es_AR.txt
+++ b/data/rbnf/es_AR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_AR.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_AR{
%%Parent{"es_419"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_BO.txt b/data/rbnf/es_BO.txt
index a8915a0..642c0bd 100755
--- a/data/rbnf/es_BO.txt
+++ b/data/rbnf/es_BO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_BO.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_BO{
%%Parent{"es_419"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_CL.txt b/data/rbnf/es_CL.txt
index c230161..cd24c0d 100755
--- a/data/rbnf/es_CL.txt
+++ b/data/rbnf/es_CL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_CL.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_CL{
%%Parent{"es_419"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_CO.txt b/data/rbnf/es_CO.txt
index 8a87bf0..304c0fc 100755
--- a/data/rbnf/es_CO.txt
+++ b/data/rbnf/es_CO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_CO.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_CO{
%%Parent{"es_419"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_CR.txt b/data/rbnf/es_CR.txt
index 66146ec..fc611ec 100755
--- a/data/rbnf/es_CR.txt
+++ b/data/rbnf/es_CR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_CR.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_CR{
%%Parent{"es_419"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_CU.txt b/data/rbnf/es_CU.txt
index 7322056..6be0377 100755
--- a/data/rbnf/es_CU.txt
+++ b/data/rbnf/es_CU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_CU.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_CU{
%%Parent{"es_419"}
- Version{"2.0.76.12"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_DO.txt b/data/rbnf/es_DO.txt
index 1f551e3..6df751a 100755
--- a/data/rbnf/es_DO.txt
+++ b/data/rbnf/es_DO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_DO.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_DO{
%%Parent{"es_419"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_EC.txt b/data/rbnf/es_EC.txt
index 9b9053d..4e7ff64 100755
--- a/data/rbnf/es_EC.txt
+++ b/data/rbnf/es_EC.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_EC.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_EC{
%%Parent{"es_419"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_GT.txt b/data/rbnf/es_GT.txt
index 7d25a17..53fcde1 100755
--- a/data/rbnf/es_GT.txt
+++ b/data/rbnf/es_GT.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_GT.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_GT{
%%Parent{"es_419"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_HN.txt b/data/rbnf/es_HN.txt
index f701cf0..8b9ae0c 100755
--- a/data/rbnf/es_HN.txt
+++ b/data/rbnf/es_HN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_HN.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_HN{
%%Parent{"es_419"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_MX.txt b/data/rbnf/es_MX.txt
index cc621d2..f94f902 100755
--- a/data/rbnf/es_MX.txt
+++ b/data/rbnf/es_MX.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_MX.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_MX{
%%Parent{"es_419"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_NI.txt b/data/rbnf/es_NI.txt
index 7eb44b9..b1b16cc 100755
--- a/data/rbnf/es_NI.txt
+++ b/data/rbnf/es_NI.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_NI.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_NI{
%%Parent{"es_419"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_PA.txt b/data/rbnf/es_PA.txt
index e5e6fa1..7f64850 100755
--- a/data/rbnf/es_PA.txt
+++ b/data/rbnf/es_PA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_PA.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_PA{
%%Parent{"es_419"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_PE.txt b/data/rbnf/es_PE.txt
index 5b36095..5a65b3f 100755
--- a/data/rbnf/es_PE.txt
+++ b/data/rbnf/es_PE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_PE.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_PE{
%%Parent{"es_419"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_PR.txt b/data/rbnf/es_PR.txt
index fdfd7a9..c725269 100755
--- a/data/rbnf/es_PR.txt
+++ b/data/rbnf/es_PR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_PR.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_PR{
%%Parent{"es_419"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_PY.txt b/data/rbnf/es_PY.txt
index 7a02674..d884f37 100755
--- a/data/rbnf/es_PY.txt
+++ b/data/rbnf/es_PY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_PY.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_PY{
%%Parent{"es_419"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_SV.txt b/data/rbnf/es_SV.txt
index b68afec..6beebec 100755
--- a/data/rbnf/es_SV.txt
+++ b/data/rbnf/es_SV.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_SV.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_SV{
%%Parent{"es_419"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_US.txt b/data/rbnf/es_US.txt
index 15cfb3e..43e92eb 100755
--- a/data/rbnf/es_US.txt
+++ b/data/rbnf/es_US.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_US.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_US{
%%Parent{"es_419"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_UY.txt b/data/rbnf/es_UY.txt
index 087d8c7..e970b5b 100755
--- a/data/rbnf/es_UY.txt
+++ b/data/rbnf/es_UY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_UY.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_UY{
%%Parent{"es_419"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/es_VE.txt b/data/rbnf/es_VE.txt
index 524316a..8a37dc4 100755
--- a/data/rbnf/es_VE.txt
+++ b/data/rbnf/es_VE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/es_VE.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
es_VE{
%%Parent{"es_419"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/et.txt b/data/rbnf/et.txt
index b5fe528..687d28b 100644
--- a/data/rbnf/et.txt
+++ b/data/rbnf/et.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/et.xml
@@ -49,5 +49,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/fa.txt b/data/rbnf/fa.txt
index 2348186..66d423d 100644
--- a/data/rbnf/fa.txt
+++ b/data/rbnf/fa.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/fa.xml
@@ -64,5 +64,5 @@
"1000000000000000: =#,##0=;",
}
}
- Version{"2.0.75.1"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/fa_AF.txt b/data/rbnf/fa_AF.txt
index dbd2b08..ab2b6cc 100644
--- a/data/rbnf/fa_AF.txt
+++ b/data/rbnf/fa_AF.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/fa_AF.xml
@@ -60,5 +60,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/fi.txt b/data/rbnf/fi.txt
index 95efb91..562c222 100644
--- a/data/rbnf/fi.txt
+++ b/data/rbnf/fi.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/fi.xml
@@ -16,8 +16,6 @@
"-x: miinus >>;",
"x.x: =#,###0.#=;",
"0: =%spellout-numbering=;",
- "1100/100: <<\u00ADsataa[\u00AD>>];",
- "10000: =%spellout-numbering=;",
"%spellout-numbering:",
"0: =%spellout-cardinal=;",
"%spellout-cardinal:",
@@ -36,20 +34,18 @@
"10: kymmenen;",
"11: >>toista;",
"20: <<kymment\u00E4[\u00AD>>];",
- "100: <<sata[\u00AD>>];",
- "200: <<sataa[\u00AD>>];",
- "1000: <<\u00ADtuhat[ >>];",
- "2000: <<\u00ADtuhatta[ >>];",
+ "100: sata[\u00AD>>];",
+ "200: <<\u00ADsataa[\u00AD>>];",
+ "1000: tuhat[\u00AD>>];",
+ "2000: <<\u00ADtuhatta[\u00AD>>];",
"1000000: << miljoona[ >>];",
- "2000000: << miljoonan[ >>];",
+ "2000000: << miljoonaa[ >>];",
"1000000000: << miljardi[ >>];",
- "2000000000: << miljardin[ >>];",
+ "2000000000: << miljardia[ >>];",
"1000000000000: << biljoona[ >>];",
- "2000000000000: << biljoonan[ >>];",
- "1000000000000000: << biljardi[ >>];",
- "2000000000000000: << biljardin[ >>];",
+ "2000000000000: << biljoonaa[ >>];",
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/fil.txt b/data/rbnf/fil.txt
index 1d9f0e2..59e2b1f 100755
--- a/data/rbnf/fil.txt
+++ b/data/rbnf/fil.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/fil.xml
@@ -65,5 +65,5 @@
"0: ika =%spellout-cardinal=;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/fo.txt b/data/rbnf/fo.txt
index 2da0af9..eef996c 100644
--- a/data/rbnf/fo.txt
+++ b/data/rbnf/fo.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/fo.xml
@@ -122,5 +122,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/fr.txt b/data/rbnf/fr.txt
index f163e02..90c91c6 100644
--- a/data/rbnf/fr.txt
+++ b/data/rbnf/fr.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/fr.xml
@@ -194,5 +194,5 @@
"2: =%%spellout-ordinal=;",
}
}
- Version{"2.0.77.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/fr_BE.txt b/data/rbnf/fr_BE.txt
index 6cfee8b..dd623d7 100644
--- a/data/rbnf/fr_BE.txt
+++ b/data/rbnf/fr_BE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/fr_BE.xml
@@ -201,5 +201,5 @@
"2: =%%spellout-ordinal=;",
}
}
- Version{"2.0.77.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/fr_CH.txt b/data/rbnf/fr_CH.txt
index 166336b..60aeaa1 100644
--- a/data/rbnf/fr_CH.txt
+++ b/data/rbnf/fr_CH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/fr_CH.xml
@@ -202,5 +202,5 @@
"2: =%%spellout-ordinal=;",
}
}
- Version{"2.0.77.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/ga.txt b/data/rbnf/ga.txt
index 6793d80..8585434 100644
--- a/data/rbnf/ga.txt
+++ b/data/rbnf/ga.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/ga.xml
@@ -64,7 +64,7 @@
"%%2d-year:",
"0: agus =%spellout-numbering=;",
"10: =%%spellout-numbering-no-a=;",
- "%spellout-numbering-year@noparse:",
+ "%spellout-numbering-year:",
"-x: m\u00EDneas >>;",
"x.x: =#,##0.#=;",
"0: =%spellout-numbering=;",
@@ -82,11 +82,11 @@
"8: ocht;",
"9: naoi;",
"10: deich;",
- "11: >>=%%spellout-cardinal-postfixpart=;",
- "12: >>=%%spellout-cardinal-postfixparth=;",
- "13: >>=%%spellout-cardinal-postfixpart=;",
+ "11: >> d\u00E9ag;",
+ "12: >> dh\u00E9ag;",
+ "13: >> d\u00E9ag;",
"20: =%spellout-numbering=;",
- "%spellout-numbering@noparse:",
+ "%spellout-numbering:",
"-x: m\u00EDneas >>;",
"x.x: << pointe >>;",
"0: a n\u00E1id;",
@@ -100,9 +100,9 @@
"8: a hocht;",
"9: a naoi;",
"10: a deich;",
- "11: >>=%%spellout-cardinal-postfixpart=;",
- "12: >>=%%spellout-cardinal-postfixparth=;",
- "13: >>=%%spellout-cardinal-postfixpart=;",
+ "11: >> d\u00E9ag;",
+ "12: >> dh\u00E9ag;",
+ "13: >> d\u00E9ag;",
"20: fiche[ >>];",
"30: tr\u00EDocha[ >>];",
"40: daichead[ >>];",
@@ -119,18 +119,19 @@
"1000000000000000: <%%quadrillions<[, >%spellout-numbering>];",
"1000000000000000000: =#,##0=;",
"%%is-number:",
- "0: =%%is= =%spellout-numbering=;",
+ "0: ' is =%spellout-numbering=;",
+ "1: ' =%spellout-numbering=;",
"%%is-numberp:",
- "0: =%%is= =%%numberp=;",
+ "0: ' is =%%numberp=;",
+ "1: ' =%%numberp=;",
"%%numberp:",
"0: =%%spellout-cardinal-prefixpart=;",
- "12: d\u00F3=%%spellout-cardinal-postfixparth=;",
- "13: =%%spellout-cardinal-prefixpart==%%spellout-cardinal-postfixpart=;",
- "%spellout-cardinal@noparse:",
+ "12: d\u00F3 dh\u00E9ag;",
+ "13: =%%spellout-cardinal-prefixpart= d\u00E9ag;",
+ "20: =%%spellout-cardinal-prefixpart=;",
+ "%spellout-cardinal:",
"0: =%spellout-numbering=;",
"%%spellout-cardinal-prefixpart:",
- "-x: m\u00EDneas >>;",
- "x.x: <%%numberp< pointe >>;",
"0: n\u00E1id;",
"1: aon;",
"2: dh\u00E1;",
@@ -158,42 +159,28 @@
"1000000000000: <%%trillions<[, >%%numberp>];",
"1000000000000000: <%%quadrillions<[, >%%numberp>];",
"1000000000000000000: =#,##0=;",
- "%%spellout-cardinal-postfixpart:",
- "-x: >>;",
- "x.x: ;",
- "0: ;",
- "1: ' amh\u00E1in;",
- "2: ;",
- "11: ' d\u00E9ag;",
- "20: ;",
- "%%spellout-cardinal-postfixparth:",
- "-x: >>;",
- "x.x: ;",
- "0: ;",
- "1: ' amh\u00E1in;",
- "2: ;",
- "11: ' dh\u00E9ag;",
- "20: ;",
"%%is:",
"0: ' is;",
"1: ;",
"10: >>;",
"%%hundreds:",
"1: c\u00E9ad;",
- "2: =%%spellout-cardinal-prefixpart= =%%hundredp=;",
- "%%hundredp:",
- "2: =%%hundred==%%spellout-cardinal-postfixpart=;",
- "%%hundred:",
- "0: gc\u00E9ad;",
- "1: ch\u00E9ad;",
- "7: gc\u00E9ad;",
- "11: >>;",
+ "2: dh\u00E1 ch\u00E9ad;",
+ "3: tr\u00ED ch\u00E9ad;",
+ "4: ceithre ch\u00E9ad;",
+ "5: c\u00FAig ch\u00E9ad;",
+ "6: s\u00E9 ch\u00E9ad;",
+ "7: seacht gc\u00E9ad;",
+ "8: ocht gc\u00E9ad;",
+ "9: naoi gc\u00E9ad;",
"%%thousands:",
"1: m\u00EDle;",
"2: =%%spellout-cardinal-prefixpart= =%%thousandp=;",
"100: <%%hundreds<>%%is-thousands>;",
"%%thousandp:",
- "2: =%%thousand==%%spellout-cardinal-postfixparth=;",
+ "2: =%%thousand=;",
+ "11: =%%thousand= dh\u00E9ag;",
+ "20: =%%thousand=;",
"%%thousand:",
"0: m\u00EDle;",
"1: mh\u00EDle;",
@@ -209,7 +196,9 @@
"2: =%%spellout-cardinal-prefixpart= =%%millionsp=;",
"100: <%%hundreds<>%%is-millions>;",
"%%millionsp:",
- "2: =%%million==%%spellout-cardinal-postfixpart=;",
+ "2: =%%million=;",
+ "11: =%%million= d\u00E9ag;",
+ "20: =%%million=;",
"%%million:",
"0: milli\u00FAn;",
"1: mhilli\u00FAn;",
@@ -222,7 +211,9 @@
"20: =%%is= =%%millions=;",
"%%billions:",
"1: billi\u00FAn;",
- "2: =%%spellout-cardinal-prefixpart= billi\u00FAn=%%spellout-cardinal-postfixpart=;",
+ "2: =%%spellout-cardinal-prefixpart= billi\u00FAn;",
+ "11: =%%spellout-cardinal-prefixpart= billi\u00FAn d\u00E9ag;",
+ "20: =%%spellout-cardinal-prefixpart= billi\u00FAn;",
"100: <%%hundreds<>%%is-billions>;",
"%%is-billions:",
"0: ' billi\u00FAn;",
@@ -234,7 +225,9 @@
"2: =%%spellout-cardinal-prefixpart= =%%trillionsp=;",
"100: <%%hundreds<>%%is-trillions>;",
"%%trillionsp:",
- "2: =%%trillion==%%spellout-cardinal-postfixpart=;",
+ "2: =%%trillion=;",
+ "11: =%%trillion= d\u00E9ag;",
+ "20: =%%trillion=;",
"%%trillion:",
"0: dtrilli\u00FAn;",
"1: thrilli\u00FAn;",
@@ -247,7 +240,9 @@
"20: =%%is= =%%trillions=;",
"%%quadrillions:",
"1: quadrilli\u00FAn;",
- "2: =%%spellout-cardinal-prefixpart= quadrilli\u00FAn=%%spellout-cardinal-postfixpart=;",
+ "2: =%%spellout-cardinal-prefixpart= quadrilli\u00FAn;",
+ "11: =%%spellout-cardinal-prefixpart= quadrilli\u00FAn d\u00E9ag;",
+ "20: =%%spellout-cardinal-prefixpart= quadrilli\u00FAn;",
"100: <%%hundreds<>%%is-quadrillions>;",
"%%is-quadrillions:",
"0: ' quadrilli\u00FAn;",
@@ -256,5 +251,5 @@
"20: =%%is= =%%quadrillions=;",
}
}
- Version{"2.0.76.47"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/he.txt b/data/rbnf/he.txt
index f6cac00..f38017d 100644
--- a/data/rbnf/he.txt
+++ b/data/rbnf/he.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/he.xml
@@ -60,17 +60,6 @@
"2000000000000000: \u05E9\u05E0\u05D9 \u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >%%and-feminine>];",
"3000000000000000: <%%spellout-numbering-m< \u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >%%and-feminine>];",
"1000000000000000000: =#,##0=;",
- "%spellout-cardinal-feminine-prefixpart@noparse:",
- "-x: \u05DE\u05D9\u05E0\u05D5\u05E1 >%spellout-cardinal-feminine>;",
- "0: =%spellout-cardinal-feminine= ;",
- "1: ;",
- "2: \u05E9\u05EA\u05D9;",
- "3: =%spellout-cardinal-feminine= ;",
- "%spellout-cardinal-feminine-postfixpart@noparse:",
- "-x: ;",
- "0: ;",
- "1: =%spellout-cardinal-feminine=;",
- "2: ;",
"%spellout-cardinal-feminine:",
"-x: \u05DE\u05D9\u05E0\u05D5\u05E1 >>;",
"x.x: <%spellout-numbering< \u05E0\u05E7\u05D5\u05D3\u05D4 >> ;",
@@ -211,17 +200,6 @@
"2000000000000000: \u05E9\u05E0\u05D9 \u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >%%and-masculine>];",
"3000000000000000: <%%spellout-numbering-m< \u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >%%and-masculine>];",
"1000000000000000000: =#,##0=;",
- "%spellout-cardinal-masculine-prefixpart@noparse:",
- "-x: \u05DE\u05D9\u05E0\u05D5\u05E1 >%spellout-cardinal-masculine>;",
- "0: =%spellout-cardinal-masculine= ;",
- "1: ;",
- "2: \u05E9\u05E0\u05D9;",
- "3: =%spellout-cardinal-masculine= ;",
- "%spellout-cardinal-masculine-postfixpart@noparse:",
- "-x: ;",
- "0: ;",
- "1: =%spellout-cardinal-masculine=;",
- "2: ;",
"%spellout-cardinal-masculine:",
"-x: \u05DE\u05D9\u05E0\u05D5\u05E1 >>;",
"x.x: <%%spellout-numbering-m< \u05E0\u05E7\u05D5\u05D3\u05D4 >> ;",
@@ -373,5 +351,5 @@
"11: =%spellout-numbering=;",
}
}
- Version{"2.0.73.65"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/hi.txt b/data/rbnf/hi.txt
index 9ae9ed6..3b5df9f 100644
--- a/data/rbnf/hi.txt
+++ b/data/rbnf/hi.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/hi.xml
@@ -156,5 +156,5 @@
"7: =%spellout-cardinal=\u0935\u0940;",
}
}
- Version{"2.0.77.84"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/hr.txt b/data/rbnf/hr.txt
index af8918c..dd4aff5 100644
--- a/data/rbnf/hr.txt
+++ b/data/rbnf/hr.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/hr.xml
@@ -31,12 +31,12 @@
"8: osam;",
"9: devet;",
"10: deset;",
- "11: jedenaest;",
+ "11: jedanaest;",
"12: dvanaest;",
"13: trinaest;",
"14: \u010Detrnaest;",
"15: petnaest;",
- "16: \u0161estnaest;",
+ "16: \u0161esnaest;",
"17: sedamnaest;",
"18: osamnaest;",
"19: devetnaest;",
@@ -51,9 +51,9 @@
"100: sto[ >>];",
"200: dvjesto[ >>];",
"300: tristo[ >>];",
- "400: \u010Detristo[ >>];",
+ "400: \u010Detiristo[ >>];",
"500: petsto[ >>];",
- "600: \u0161esto[ >>];",
+ "600: \u0161eststo[ >>];",
"700: sedamsto[ >>];",
"800: osamsto[ >>];",
"900: devetsto[ >>];",
@@ -91,9 +91,9 @@
"100: sto[ >>];",
"200: dvjesto[ >>];",
"300: tristo[ >>];",
- "400: \u010Detristo[ >>];",
+ "400: \u010Detiristo[ >>];",
"500: petsto[ >>];",
- "600: \u0161esto[ >>];",
+ "600: \u0161eststo[ >>];",
"700: sedamsto[ >>];",
"800: osamsto[ >>];",
"900: devetsto[ >>];",
@@ -131,9 +131,9 @@
"100: sto[ >>];",
"200: dvjesto[ >>];",
"300: tristo[ >>];",
- "400: \u010Detristo[ >>];",
+ "400: \u010Detiristo[ >>];",
"500: petsto[ >>];",
- "600: \u0161esto[ >>];",
+ "600: \u0161eststo[ >>];",
"700: sedamsto[ >>];",
"800: osamsto[ >>];",
"900: devetsto[ >>];",
@@ -211,5 +211,5 @@
"0: =%%spellout-ordinal-base=a;",
}
}
- Version{"2.0.77.82"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/hu.txt b/data/rbnf/hu.txt
index f368e97..4740c90 100644
--- a/data/rbnf/hu.txt
+++ b/data/rbnf/hu.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/hu.xml
@@ -53,5 +53,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/hy.txt b/data/rbnf/hy.txt
index d541797..0ff8842 100644
--- a/data/rbnf/hy.txt
+++ b/data/rbnf/hy.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/hy.xml
@@ -48,5 +48,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/id.txt b/data/rbnf/id.txt
index 7ce079b..4cb5015 100644
--- a/data/rbnf/id.txt
+++ b/data/rbnf/id.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/id.xml
@@ -53,5 +53,5 @@
"0: ke=%spellout-cardinal=;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/is.txt b/data/rbnf/is.txt
index 892144f..f8d4d51 100644
--- a/data/rbnf/is.txt
+++ b/data/rbnf/is.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/is.xml
@@ -122,5 +122,5 @@
"1000000000000000000: =#,##0.#=;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/it.txt b/data/rbnf/it.txt
index 6d0434c..77cc939 100644
--- a/data/rbnf/it.txt
+++ b/data/rbnf/it.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/it.xml
@@ -401,5 +401,5 @@
"10: o\u00AD=%spellout-ordinal-feminine=;",
}
}
- Version{"2.0.74.12"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/ja.txt b/data/rbnf/ja.txt
index cc44a31..f92bbdd 100644
--- a/data/rbnf/ja.txt
+++ b/data/rbnf/ja.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/ja.xml
@@ -20,6 +20,15 @@
"%spellout-numbering-year:",
"x.x: =#,###0.#=;",
"0: =%spellout-numbering=;",
+ "1: \u5143;",
+ "2: =%spellout-numbering=;",
+ "1000: =%%spellout-numbering-year-digits=;",
+ "10000: =%spellout-numbering=;",
+ "%%spellout-numbering-year-digits:",
+ "0: =%spellout-numbering=;",
+ "10: <<>>>;",
+ "100: <<>>>;",
+ "1000: <<>>>;",
"%spellout-numbering:",
"0: =%spellout-cardinal=;",
"%spellout-cardinal-financial:",
@@ -73,5 +82,5 @@
"0: \u7B2C=%spellout-numbering=;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/ka.txt b/data/rbnf/ka.txt
index 6b25d03..6e52669 100644
--- a/data/rbnf/ka.txt
+++ b/data/rbnf/ka.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/ka.xml
@@ -72,5 +72,5 @@
"1: ' =%spellout-cardinal=;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/kl.txt b/data/rbnf/kl.txt
index bedd03a..97164da 100644
--- a/data/rbnf/kl.txt
+++ b/data/rbnf/kl.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/kl.xml
@@ -79,5 +79,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/km.txt b/data/rbnf/km.txt
index 877c99d..6d85725 100755
--- a/data/rbnf/km.txt
+++ b/data/rbnf/km.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/km.xml
@@ -20,7 +20,7 @@
"0: =%spellout-numbering=;",
"%spellout-numbering:",
"-x: \u178A\u1780\u200B>>;",
- "x.x: <<\u200B\u1785\u17BB\u1785\u200B>%%spellout-fraction>;",
+ "x.x: <<\u200B\u1785\u17BB\u1785\u200B>>>;",
"0: \u179F\u17BC\u1793\u17D2\u1799;",
"1: \u1798\u17BD\u1799;",
"2: \u1796\u17B8\u179A;",
@@ -47,25 +47,11 @@
"1000000: <<\u200B\u179B\u17B6\u1793[\u200B>>];",
"10000000000: <<\u200B\u1796\u17B6\u1793\u17CB\u200B\u1780\u17C4\u178A\u17B7[\u200B>>];",
"1000000000000: =#,##0=;",
- "%%spellout-fraction:",
- "10: <%%spellout-fraction-digits<<;",
- "100: <%%spellout-fraction-digits<<;",
- "1000: <%%spellout-fraction-digits<<;",
- "10000: <%%spellout-fraction-digits<<;",
- "100000: <%%spellout-fraction-digits<<;",
- "1000000: <%%spellout-fraction-digits<<;",
- "10000000: <%%spellout-fraction-digits<<;",
- "100000000: <%%spellout-fraction-digits<<;",
- "1000000000: <%%spellout-fraction-digits<<;",
- "10000000000: <0<;",
- "%%spellout-fraction-digits:",
- "0: =%spellout-numbering=;",
- "10: <<\u200B>>;",
"%spellout-cardinal:",
"0: =%spellout-numbering=;",
"%spellout-ordinal:",
"0: \u1791\u17B8=%spellout-cardinal=;",
}
}
- Version{"2.0.74.11"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/ko.txt b/data/rbnf/ko.txt
index 8aab56e..470d917 100644
--- a/data/rbnf/ko.txt
+++ b/data/rbnf/ko.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/ko.xml
@@ -16,13 +16,13 @@
"x.x: =#,###0.#=;",
"0: =%spellout-numbering=;",
"%spellout-numbering:",
- "0.x: =%spellout-cardinal-sinokorean=;",
- "x.x: <<\uC810 >%%spellout-fraction>;",
+ "0.x: <%spellout-cardinal-sinokorean<\uC810>>>;",
+ "x.x: <<\uC810>>>;",
"0: \uACF5;",
"1: =%spellout-cardinal-sinokorean=;",
"%spellout-cardinal-sinokorean:",
"-x: \uB9C8\uC774\uB108\uC2A4 >>;",
- "x.x: <<\uC810 >%%spellout-fraction>;",
+ "x.x: <<\uC810>>>;",
"0: \uC601;",
"1: \uC77C;",
"2: \uC774;",
@@ -47,7 +47,7 @@
"1000000000000000000: =#,###0=;",
"%spellout-cardinal-native-attributive:",
"-x: \uB9C8\uC774\uB108\uC2A4 >>;",
- "x.x: <<\uC810 >%%spellout-fraction>;",
+ "x.x: =%spellout-cardinal-sinokorean=;",
"0: \uC601;",
"1: \uD55C;",
"2: \uB450;",
@@ -80,7 +80,7 @@
"1000000000000000000: =#,###0=;",
"%spellout-cardinal-native:",
"-x: \uB9C8\uC774\uB108\uC2A4 >>;",
- "x.x: <<\uC810 >%%spellout-fraction>;",
+ "x.x: =%spellout-cardinal-sinokorean=;",
"0: \uC601;",
"1: \uD558\uB098;",
"2: \uB458;",
@@ -103,7 +103,7 @@
"100: =%spellout-cardinal-sinokorean=;",
"%spellout-cardinal-financial:",
"-x: \uB9C8\uC774\uB108\uC2A4 >>;",
- "x.x: <<\uC810 >%%spellout-fraction>;",
+ "x.x: =%spellout-cardinal-sinokorean=;",
"0: \uC601;",
"1: \uC77C;",
"2: \uC774;",
@@ -248,30 +248,7 @@
"0: =%%spellout-ordinal-native-smaller=;",
"2: \uB458;",
"3: =%%spellout-ordinal-native-smaller=;",
- "%%spellout-fraction:",
- "10: <%%spellout-fraction-digits<<;",
- "100: <%%spellout-fraction-digits<<;",
- "1000: <%%spellout-fraction-digits<<;",
- "10000: <%%spellout-fraction-digits<<;",
- "100000: <%%spellout-fraction-digits<<;",
- "1000000: <%%spellout-fraction-digits<<;",
- "10000000: <%%spellout-fraction-digits<<;",
- "100000000: <%%spellout-fraction-digits<<;",
- "1000000000: <%%spellout-fraction-digits<<;",
- "10000000000: <0<;",
- "%%spellout-fraction-digits:",
- "0: \uC601;",
- "1: \uC77C;",
- "2: \uC774;",
- "3: \uC0BC;",
- "4: \uC0AC;",
- "5: \uC624;",
- "6: \uC721;",
- "7: \uCE60;",
- "8: \uD314;",
- "9: \uAD6C;",
- "10: <<>>;",
}
}
- Version{"2.0.76.31"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/lo.txt b/data/rbnf/lo.txt
index 14425b9..a890dbf 100755
--- a/data/rbnf/lo.txt
+++ b/data/rbnf/lo.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/lo.xml
@@ -52,5 +52,5 @@
"0: \u0E17\u0E35\u0E48\u200B=%spellout-cardinal=;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/lt.txt b/data/rbnf/lt.txt
index 150fbc8..73640f4 100644
--- a/data/rbnf/lt.txt
+++ b/data/rbnf/lt.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/lt.xml
@@ -115,5 +115,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/lv.txt b/data/rbnf/lv.txt
index 7b42ccf..7c3b961 100644
--- a/data/rbnf/lv.txt
+++ b/data/rbnf/lv.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/lv.xml
@@ -90,5 +90,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/mk.txt b/data/rbnf/mk.txt
index 0bcfb3d..3bf18fc 100644
--- a/data/rbnf/mk.txt
+++ b/data/rbnf/mk.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/mk.xml
@@ -103,5 +103,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/ms.txt b/data/rbnf/ms.txt
index 10f9367..44d80b9 100644
--- a/data/rbnf/ms.txt
+++ b/data/rbnf/ms.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/ms.xml
@@ -56,5 +56,5 @@
"2: ke=%spellout-cardinal=;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/mt.txt b/data/rbnf/mt.txt
index 00f5f8f..0fb774c 100644
--- a/data/rbnf/mt.txt
+++ b/data/rbnf/mt.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/mt.xml
@@ -75,23 +75,23 @@
"90: [>> u ]disg\u0127in;",
"100: mija[ u >>];",
"200: mitejn[ u >>];",
- "300: <%%spellout-cardinal-masculine< mija[ u >>];",
+ "300: <%spellout-cardinal-masculine< mija[ u >>];",
"1000: elf[>%%and-typeB-masculine>];",
"2000: elfejn[>%%and-typeB-masculine>];",
"3000: <%%thousands< elef[>%%and-typeB-masculine>];",
- "11000/1000: <%%spellout-cardinal-masculine< elf[>%%and-typeB-masculine>];",
+ "11000/1000: <%spellout-cardinal-masculine< elf[>%%and-typeB-masculine>];",
"1000000: miljun[>%%and-typeB-masculine>];",
- "2000000: <%%spellout-cardinal-masculine< miljuni[>%%and-typeB-masculine>];",
- "11000000/1,000: <%%spellout-cardinal-masculine< miljun[>%%and-typeB-masculine>];",
+ "2000000: <%spellout-cardinal-masculine< miljuni[>%%and-typeB-masculine>];",
+ "11000000/1,000: <%spellout-cardinal-masculine< miljun[>%%and-typeB-masculine>];",
"1000000000: biljun[>%%and-typeB-masculine>];",
- "2000000000: <%%spellout-cardinal-masculine< biljuni[>%%and-typeB-masculine>];",
- "11000000000/1,000: <%%spellout-cardinal-masculine< biljun[>%%and-typeB-masculine>];",
+ "2000000000: <%spellout-cardinal-masculine< biljuni[>%%and-typeB-masculine>];",
+ "11000000000/1,000: <%spellout-cardinal-masculine< biljun[>%%and-typeB-masculine>];",
"1000000000000: triljun[>%%and-typeB-masculine>];",
- "2000000000000: <%%spellout-cardinal-masculine< triljuni[>%%and-typeB-masculine>];",
- "11000000000000/1,000: <%%spellout-cardinal-masculine< triljun[>%%and-typeB-masculine>];",
+ "2000000000000: <%spellout-cardinal-masculine< triljuni[>%%and-typeB-masculine>];",
+ "11000000000000/1,000: <%spellout-cardinal-masculine< triljun[>%%and-typeB-masculine>];",
"1000000000000000: kvadriljun[>%%and-typeB-masculine>];",
- "2000000000000000: <%%spellout-cardinal-masculine< kvadriljuni[>%%and-typeB-masculine>];",
- "11000000000000000/1,000: <%%spellout-cardinal-masculine< kvadriljun[>%%and-typeB-masculine>];",
+ "2000000000000000: <%spellout-cardinal-masculine< kvadriljuni[>%%and-typeB-masculine>];",
+ "11000000000000000/1,000: <%spellout-cardinal-masculine< kvadriljun[>%%and-typeB-masculine>];",
"1000000000000000000: =#,##0=;",
"%%and-typeB-masculine:",
"0: ;",
@@ -129,98 +129,32 @@
"90: [>> u ]disg\u0127in;",
"100: mija[ u >>];",
"200: mitejn[ u >>];",
- "300: <%%spellout-cardinal-masculine< mija[ u >>];",
+ "300: <%spellout-cardinal-masculine< mija[ u >>];",
"1000: elf[>%%and-typeB-feminine>];",
"2000: elfejn[>%%and-typeB-feminine>];",
"3000: <%%thousands< elef[>%%and-typeB-feminine>];",
- "11000/1000: <%%spellout-cardinal-masculine< elf[>%%and-typeB-feminine>];",
+ "11000/1000: <%spellout-cardinal-masculine< elf[>%%and-typeB-feminine>];",
"1000000: miljun[>%%and-typeB-feminine>];",
- "2000000: <%%spellout-cardinal-masculine< miljuni[>%%and-typeB-feminine>];",
- "11000000/1,000: <%%spellout-cardinal-masculine< miljun[>%%and-typeB-feminine>];",
+ "2000000: <%spellout-cardinal-masculine< miljuni[>%%and-typeB-feminine>];",
+ "11000000/1,000: <%spellout-cardinal-masculine< miljun[>%%and-typeB-feminine>];",
"1000000000: biljun[>%%and-typeB-feminine>];",
- "2000000000: <%%spellout-cardinal-masculine< biljuni[>%%and-typeB-feminine>];",
- "11000000000/1,000: <%%spellout-cardinal-masculine< biljun[>%%and-typeB-feminine>];",
+ "2000000000: <%spellout-cardinal-masculine< biljuni[>%%and-typeB-feminine>];",
+ "11000000000/1,000: <%spellout-cardinal-masculine< biljun[>%%and-typeB-feminine>];",
"1000000000000: triljun[>%%and-typeB-feminine>];",
- "2000000000000: <%%spellout-cardinal-masculine< triljuni[>%%and-typeB-feminine>];",
- "11000000000000/1,000: <%%spellout-cardinal-masculine< triljun[>%%and-typeB-feminine>];",
+ "2000000000000: <%spellout-cardinal-masculine< triljuni[>%%and-typeB-feminine>];",
+ "11000000000000/1,000: <%spellout-cardinal-masculine< triljun[>%%and-typeB-feminine>];",
"1000000000000000: kvadriljun[>%%and-typeB-feminine>];",
- "2000000000000000: <%%spellout-cardinal-masculine< kvadriljuni[>%%and-typeB-feminine>];",
- "11000000000000000/1,000: <%%spellout-cardinal-masculine< kvadriljun[>%%and-typeB-feminine>];",
+ "2000000000000000: <%spellout-cardinal-masculine< kvadriljuni[>%%and-typeB-feminine>];",
+ "11000000000000000/1,000: <%spellout-cardinal-masculine< kvadriljun[>%%and-typeB-feminine>];",
"1000000000000000000: =#,##0=;",
"%%and-typeB-feminine:",
"0: ;",
"1: ' u =%%spellout-cardinal-typeB-feminine=;",
- "%%spellout-cardinal-masculine:",
- "0: \u017Cero;",
- "1: wie\u0127ed;",
- "2: \u017Cew\u0121;",
- "3: tliet;",
- "4: erba\u02BC;",
- "5: \u0127ames;",
- "6: sitt;",
- "7: seba\u02BC;",
- "8: tmien;",
- "9: disa\u02BC;",
- "10: g\u0127axar;",
- "11: \u0127dax-il;",
- "12: tnax-il;",
- "13: tlettax-il;",
- "14: erbatax-il;",
- "15: \u0127mistax-il;",
- "16: sittax-il;",
- "17: sbatax-il;",
- "18: tmintax-il;",
- "19: dsatax-il;",
- "20: [>%%spellout-cardinal-masculine> u ]g\u0127oxrin;",
- "30: [>%%spellout-cardinal-masculine> u ]tletin;",
- "40: [>%%spellout-cardinal-masculine> u ]erbg\u0127in;",
- "50: [>%%spellout-cardinal-masculine> u ]\u0127amsin;",
- "60: [>%%spellout-cardinal-masculine> u ]sittin;",
- "70: [>%%spellout-cardinal-masculine> u ]sebg\u0127in;",
- "80: [>%%spellout-cardinal-masculine> u ]tmenin;",
- "90: [>%%spellout-cardinal-masculine> u ]disg\u0127in;",
- "100: mitt;",
- "101: mija u >%%spellout-cardinal-masculine>;",
- "200: mitejn[ u >%%spellout-cardinal-masculine>];",
- "300: <%%spellout-cardinal-masculine< mija[>%%and-typeA-masculine>];",
- "1000: elf[>%%and-typeA-masculine>];",
- "2000: elfejn[>%%and-typeA-masculine>];",
- "3000: <%%thousands< elef[>%%and-typeA-masculine>];",
- "11000/1000: <%%spellout-cardinal-masculine< elf[>%%and-typeA-masculine>];",
- "1000000: miljun[>%%and-typeA-masculine>];",
- "2000000: <%%spellout-cardinal-masculine< miljuni[>%%and-typeA-masculine>];",
- "11000000/1,000: <%%spellout-cardinal-masculine< miljun[>%%and-typeA-masculine>];",
- "1000000000: biljun[>%%and-typeA-masculine>];",
- "2000000000: <%%spellout-cardinal-masculine< biljuni[>%%and-typeA-masculine>];",
- "11000000000/1,000: <%%spellout-cardinal-masculine< biljun[>%%and-typeA-masculine>];",
- "1000000000000: triljun[>%%and-typeA-masculine>];",
- "2000000000000: <%%spellout-cardinal-masculine< triljuni[>%%and-typeA-masculine>];",
- "11000000000000/1,000: <%%spellout-cardinal-masculine< triljun[>%%and-typeA-masculine>];",
- "1000000000000000: kvadriljun[>%%and-typeA-masculine>];",
- "2000000000000000: <%%spellout-cardinal-masculine< kvadriljuni[>%%and-typeA-masculine>];",
- "11000000000000000/1,000: <%%spellout-cardinal-masculine< kvadriljun[>%%and-typeA-masculine>];",
- "1000000000000000000: =#,##0=;",
- "%spellout-cardinal-masculine-prefixpart@noparse:",
+ "%spellout-cardinal-masculine:",
"-x: minus >>;",
- "x.x: <%%spellout-cardinal-masculine< punt >%%zz-fraction-masculine> ;",
- "0: \u017Cero ;",
- "1: ;",
- "2: =%%spellout-cardinal-masculine-prefx= ;",
- "%%lenient-parse:",
- "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
- "%spellout-cardinal-masculine-postfixpart@noparse:",
- "-x: >>;",
- "x.x: ;",
- "0: ;",
- "1: ' =%%spellout-cardinal-masculine-postfx=;",
- "2: ;",
- "%%spellout-cardinal-masculine-postfx:",
- "0: ;",
- "1: wie\u0127ed;",
- "2: ;",
- "%%spellout-cardinal-masculine-prefx:",
+ "x.x: << punt >>;",
"0: \u017Cero;",
- "1: ;",
+ "1: wie\u0127ed;",
"2: \u017Cew\u0121;",
"3: tliet;",
"4: erba\u02BC;",
@@ -239,107 +173,45 @@
"17: sbatax-il;",
"18: tmintax-il;",
"19: dsatax-il;",
- "20: [>%%spellout-cardinal-masculine> u ]g\u0127oxrin;",
- "30: [>%%spellout-cardinal-masculine> u ]tletin;",
- "40: [>%%spellout-cardinal-masculine> u ]erbg\u0127in;",
- "50: [>%%spellout-cardinal-masculine> u ]\u0127amsin;",
- "60: [>%%spellout-cardinal-masculine> u ]sittin;",
- "70: [>%%spellout-cardinal-masculine> u ]sebg\u0127in;",
- "80: [>%%spellout-cardinal-masculine> u ]tmenin;",
- "90: [>%%spellout-cardinal-masculine> u ]disg\u0127in;",
+ "20: [>%spellout-cardinal-masculine> u ]g\u0127oxrin;",
+ "30: [>%spellout-cardinal-masculine> u ]tletin;",
+ "40: [>%spellout-cardinal-masculine> u ]erbg\u0127in;",
+ "50: [>%spellout-cardinal-masculine> u ]\u0127amsin;",
+ "60: [>%spellout-cardinal-masculine> u ]sittin;",
+ "70: [>%spellout-cardinal-masculine> u ]sebg\u0127in;",
+ "80: [>%spellout-cardinal-masculine> u ]tmenin;",
+ "90: [>%spellout-cardinal-masculine> u ]disg\u0127in;",
"100: mitt;",
- "101: mija u >%%spellout-cardinal-masculine>;",
- "200: mitejn[ u >%%spellout-cardinal-masculine>];",
- "300: <%%spellout-cardinal-masculine< mija[>%%and-typeA-masculine>];",
+ "101: mija u >%spellout-cardinal-masculine>;",
+ "200: mitejn[ u >%spellout-cardinal-masculine>];",
+ "300: <%spellout-cardinal-masculine< mija[>%%and-typeA-masculine>];",
"1000: elf[>%%and-typeA-masculine>];",
"2000: elfejn[>%%and-typeA-masculine>];",
"3000: <%%thousands< elef[>%%and-typeA-masculine>];",
- "11000/1000: <%%spellout-cardinal-masculine< elf[>%%and-typeA-masculine>];",
+ "11000/1000: <%spellout-cardinal-masculine< elf[>%%and-typeA-masculine>];",
"1000000: miljun[>%%and-typeA-masculine>];",
- "2000000: <%%spellout-cardinal-masculine< miljuni[>%%and-typeA-masculine>];",
- "11000000/1,000: <%%spellout-cardinal-masculine< miljun[>%%and-typeA-masculine>];",
+ "2000000: <%spellout-cardinal-masculine< miljuni[>%%and-typeA-masculine>];",
+ "11000000/1,000: <%spellout-cardinal-masculine< miljun[>%%and-typeA-masculine>];",
"1000000000: biljun[>%%and-typeA-masculine>];",
- "2000000000: <%%spellout-cardinal-masculine< biljuni[>%%and-typeA-masculine>];",
- "11000000000/1,000: <%%spellout-cardinal-masculine< biljun[>%%and-typeA-masculine>];",
+ "2000000000: <%spellout-cardinal-masculine< biljuni[>%%and-typeA-masculine>];",
+ "11000000000/1,000: <%spellout-cardinal-masculine< biljun[>%%and-typeA-masculine>];",
"1000000000000: triljun[>%%and-typeA-masculine>];",
- "2000000000000: <%%spellout-cardinal-masculine< triljuni[>%%and-typeA-masculine>];",
- "11000000000000/1,000: <%%spellout-cardinal-masculine< triljun[>%%and-typeA-masculine>];",
+ "2000000000000: <%spellout-cardinal-masculine< triljuni[>%%and-typeA-masculine>];",
+ "11000000000000/1,000: <%spellout-cardinal-masculine< triljun[>%%and-typeA-masculine>];",
"1000000000000000: kvadriljun[>%%and-typeA-masculine>];",
- "2000000000000000: <%%spellout-cardinal-masculine< kvadriljuni[>%%and-typeA-masculine>];",
- "11000000000000000/1,000: <%%spellout-cardinal-masculine< kvadriljun[>%%and-typeA-masculine>];",
+ "2000000000000000: <%spellout-cardinal-masculine< kvadriljuni[>%%and-typeA-masculine>];",
+ "11000000000000000/1,000: <%spellout-cardinal-masculine< kvadriljun[>%%and-typeA-masculine>];",
"1000000000000000000: =#,##0=;",
"%%and-typeA-masculine:",
"0: ;",
- "1: ' u =%%spellout-cardinal-masculine=;",
- "%%spellout-cardinal-feminine:",
- "0: \u017Cero;",
- "1: wa\u0127da;",
- "2: \u017Cew\u0121;",
- "3: tliet;",
- "4: erba\u02BC;",
- "5: \u0127ames;",
- "6: sitt;",
- "7: seba\u02BC;",
- "8: tmien;",
- "9: disa\u02BC;",
- "10: g\u0127axar;",
- "11: \u0127dax-il;",
- "12: tnax-il;",
- "13: tlettax-il;",
- "14: erbatax-il;",
- "15: \u0127mistax-il;",
- "16: sittax-il;",
- "17: sbatax-il;",
- "18: tmintax-il;",
- "19: dsatax-il;",
- "20: [>%%spellout-cardinal-feminine> u ]g\u0127oxrin;",
- "30: [>%%spellout-cardinal-feminine> u ]tletin;",
- "40: [>%%spellout-cardinal-feminine> u ]erbg\u0127in;",
- "50: [>%%spellout-cardinal-feminine> u ]\u0127amsin;",
- "60: [>%%spellout-cardinal-feminine> u ]sittin;",
- "70: [>%%spellout-cardinal-feminine> u ]sebg\u0127in;",
- "80: [>%%spellout-cardinal-feminine> u ]tmenin;",
- "90: [>%%spellout-cardinal-feminine> u ]disg\u0127in;",
- "100: mitt;",
- "101: mija u >%%spellout-cardinal-feminine>;",
- "200: mitejn[ u >%%spellout-cardinal-feminine>];",
- "300: <%%spellout-cardinal-masculine< mija[>%%and-typeA-feminine>];",
- "1000: elf[>%%and-typeA-feminine>];",
- "2000: elfejn[>%%and-typeA-feminine>];",
- "3000: <%%thousands< elef[>%%and-typeA-feminine>];",
- "11000/1000: <%%spellout-cardinal-masculine< elf[>%%and-typeA-feminine>];",
- "1000000: miljun[>%%and-typeA-feminine>];",
- "2000000: <%%spellout-cardinal-masculine< miljuni[>%%and-typeA-feminine>];",
- "11000000/1,000: <%%spellout-cardinal-masculine< miljun[>%%and-typeA-feminine>];",
- "1000000000: biljun[>%%and-typeA-feminine>];",
- "2000000000: <%%spellout-cardinal-masculine< biljuni[>%%and-typeA-feminine>];",
- "11000000000/1,000: <%%spellout-cardinal-masculine< biljun[>%%and-typeA-feminine>];",
- "1000000000000: triljun[>%%and-typeA-feminine>];",
- "2000000000000: <%%spellout-cardinal-masculine< triljuni[>%%and-typeA-feminine>];",
- "11000000000000/1,000: <%%spellout-cardinal-masculine< triljun[>%%and-typeA-feminine>];",
- "1000000000000000: kvadriljun[>%%and-typeA-feminine>];",
- "2000000000000000: <%%spellout-cardinal-masculine< kvadriljuni[>%%and-typeA-feminine>];",
- "11000000000000000/1,000: <%%spellout-cardinal-masculine< kvadriljun[>%%and-typeA-feminine>];",
- "1000000000000000000: =#,##0=;",
- "%spellout-cardinal-feminine-prefixpart@noparse:",
+ "1: ' u =%spellout-cardinal-masculine=;",
+ "%%lenient-parse:",
+ "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
+ "%spellout-cardinal-feminine:",
"-x: minus >>;",
- "x.x: <%%spellout-cardinal-feminine< punt >%%zz-fraction-feminine> ;",
- "0: \u017Cero ;",
- "1: ;",
- "2: =%%spellout-cardinal-feminine-prefx= ;",
- "%spellout-cardinal-feminine-postfixpart@noparse:",
- "-x: >>;",
- "x.x: ;",
- "0: ;",
- "1: ' =%%spellout-cardinal-feminine-postfx=;",
- "2: ;",
- "%%spellout-cardinal-feminine-postfx:",
- "0: ;",
- "1: wa\u0127da;",
- "2: ;",
- "%%spellout-cardinal-feminine-prefx:",
+ "x.x: << punt >>;",
"0: \u017Cero;",
- "1: ;",
+ "1: wa\u0127da;",
"2: \u017Cew\u0121;",
"3: tliet;",
"4: erba\u02BC;",
@@ -358,38 +230,38 @@
"17: sbatax-il;",
"18: tmintax-il;",
"19: dsatax-il;",
- "20: [>%%spellout-cardinal-feminine> u ]g\u0127oxrin;",
- "30: [>%%spellout-cardinal-feminine> u ]tletin;",
- "40: [>%%spellout-cardinal-feminine> u ]erbg\u0127in;",
- "50: [>%%spellout-cardinal-feminine> u ]\u0127amsin;",
- "60: [>%%spellout-cardinal-feminine> u ]sittin;",
- "70: [>%%spellout-cardinal-feminine> u ]sebg\u0127in;",
- "80: [>%%spellout-cardinal-feminine> u ]tmenin;",
- "90: [>%%spellout-cardinal-feminine> u ]disg\u0127in;",
+ "20: [>%spellout-cardinal-feminine> u ]g\u0127oxrin;",
+ "30: [>%spellout-cardinal-feminine> u ]tletin;",
+ "40: [>%spellout-cardinal-feminine> u ]erbg\u0127in;",
+ "50: [>%spellout-cardinal-feminine> u ]\u0127amsin;",
+ "60: [>%spellout-cardinal-feminine> u ]sittin;",
+ "70: [>%spellout-cardinal-feminine> u ]sebg\u0127in;",
+ "80: [>%spellout-cardinal-feminine> u ]tmenin;",
+ "90: [>%spellout-cardinal-feminine> u ]disg\u0127in;",
"100: mitt;",
- "101: mija u >%%spellout-cardinal-feminine>;",
- "200: mitejn[ u >%%spellout-cardinal-feminine>];",
- "300: <%%spellout-cardinal-masculine< mija[>%%and-typeA-feminine>];",
+ "101: mija u >%spellout-cardinal-feminine>;",
+ "200: mitejn[ u >%spellout-cardinal-feminine>];",
+ "300: <%spellout-cardinal-masculine< mija[>%%and-typeA-feminine>];",
"1000: elf[>%%and-typeA-feminine>];",
"2000: elfejn[>%%and-typeA-feminine>];",
"3000: <%%thousands< elef[>%%and-typeA-feminine>];",
- "11000/1000: <%%spellout-cardinal-masculine< elf[>%%and-typeA-feminine>];",
+ "11000/1000: <%spellout-cardinal-masculine< elf[>%%and-typeA-feminine>];",
"1000000: miljun[>%%and-typeA-feminine>];",
- "2000000: <%%spellout-cardinal-masculine< miljuni[>%%and-typeA-feminine>];",
- "11000000/1,000: <%%spellout-cardinal-masculine< miljun[>%%and-typeA-feminine>];",
+ "2000000: <%spellout-cardinal-masculine< miljuni[>%%and-typeA-feminine>];",
+ "11000000/1,000: <%spellout-cardinal-masculine< miljun[>%%and-typeA-feminine>];",
"1000000000: biljun[>%%and-typeA-feminine>];",
- "2000000000: <%%spellout-cardinal-masculine< biljuni[>%%and-typeA-feminine>];",
- "11000000000/1,000: <%%spellout-cardinal-masculine< biljun[>%%and-typeA-feminine>];",
+ "2000000000: <%spellout-cardinal-masculine< biljuni[>%%and-typeA-feminine>];",
+ "11000000000/1,000: <%spellout-cardinal-masculine< biljun[>%%and-typeA-feminine>];",
"1000000000000: triljun[>%%and-typeA-feminine>];",
- "2000000000000: <%%spellout-cardinal-masculine< triljuni[>%%and-typeA-feminine>];",
- "11000000000000/1,000: <%%spellout-cardinal-masculine< triljun[>%%and-typeA-feminine>];",
+ "2000000000000: <%spellout-cardinal-masculine< triljuni[>%%and-typeA-feminine>];",
+ "11000000000000/1,000: <%spellout-cardinal-masculine< triljun[>%%and-typeA-feminine>];",
"1000000000000000: kvadriljun[>%%and-typeA-feminine>];",
- "2000000000000000: <%%spellout-cardinal-masculine< kvadriljuni[>%%and-typeA-feminine>];",
- "11000000000000000/1,000: <%%spellout-cardinal-masculine< kvadriljun[>%%and-typeA-feminine>];",
+ "2000000000000000: <%spellout-cardinal-masculine< kvadriljuni[>%%and-typeA-feminine>];",
+ "11000000000000000/1,000: <%spellout-cardinal-masculine< kvadriljun[>%%and-typeA-feminine>];",
"1000000000000000000: =#,##0=;",
"%%and-typeA-feminine:",
"0: ;",
- "1: ' u =%%spellout-cardinal-feminine=;",
+ "1: ' u =%spellout-cardinal-feminine=;",
"%%thousands:",
"0: ERROR-=0=;",
"3: tlitt;",
@@ -400,30 +272,7 @@
"8: tmint;",
"9: disat;",
"10: g\u0127axart;",
- "11: ERROR-=0=;",
- "%%zz-fraction-feminine:",
- "10: <%%spellout-cardinal-feminine<<;",
- "100: <%%spellout-cardinal-feminine<<;",
- "1000: <%%spellout-cardinal-feminine<<;",
- "10000: <%%spellout-cardinal-feminine<<;",
- "100000: <%%spellout-cardinal-feminine<<;",
- "1000000: <%%spellout-cardinal-feminine<<;",
- "10000000: <%%spellout-cardinal-feminine<<;",
- "100000000: <%%spellout-cardinal-feminine<<;",
- "1000000000: <%%spellout-cardinal-feminine<<;",
- "10000000000: <#,##0<<;",
- "%%zz-fraction-masculine:",
- "10: <%%spellout-cardinal-masculine<<;",
- "100: <%%spellout-cardinal-masculine<<;",
- "1000: <%%spellout-cardinal-masculine<<;",
- "10000: <%%spellout-cardinal-masculine<<;",
- "100000: <%%spellout-cardinal-masculine<<;",
- "1000000: <%%spellout-cardinal-masculine<<;",
- "10000000: <%%spellout-cardinal-masculine<<;",
- "100000000: <%%spellout-cardinal-masculine<<;",
- "1000000000: <%%spellout-cardinal-masculine<<;",
- "10000000000: <#,##0<<;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/nb.txt b/data/rbnf/nb.txt
index b6f74e1..9932870 100644
--- a/data/rbnf/nb.txt
+++ b/data/rbnf/nb.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/nb.xml
@@ -77,5 +77,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/nl.txt b/data/rbnf/nl.txt
index cf611ac..59358db 100644
--- a/data/rbnf/nl.txt
+++ b/data/rbnf/nl.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/nl.xml
@@ -115,5 +115,5 @@
"1000000000000000000: =#,##0=.;",
}
}
- Version{"2.0.74.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/nn.txt b/data/rbnf/nn.txt
index 84b290a..acba8ee 100644
--- a/data/rbnf/nn.txt
+++ b/data/rbnf/nn.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/nn.xml
@@ -76,5 +76,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/pl.txt b/data/rbnf/pl.txt
index 1665896..ce34922 100644
--- a/data/rbnf/pl.txt
+++ b/data/rbnf/pl.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/pl.xml
@@ -19,7 +19,7 @@
"0: =%spellout-cardinal-masculine=;",
"%spellout-cardinal-masculine:",
"-x: minus >>;",
- "x.x: << przecinek >%%spellout-fraction>;",
+ "x.x: << przecinek >>;",
"0: zero;",
"1: jeden;",
"2: dwa;",
@@ -132,29 +132,20 @@
"5000000000000000: <%spellout-cardinal-masculine< biliard\u00F3w[ >>];",
"1000000000000000000: =#,##0=;",
"%%spellout-fraction:",
- "10: <%%spellout-fraction-digits<;",
- "100: <%%spellout-fraction-digits<;",
- "1000: <%%spellout-fraction-digits<;",
- "10000: <%%spellout-fraction-digits<;",
- "100000: <%%spellout-fraction-digits<;",
- "1000000: <%%spellout-fraction-digits<;",
- "10000000: <%%spellout-fraction-digits<;",
- "100000000: <%%spellout-fraction-digits<;",
- "1000000000: <%%spellout-fraction-digits<;",
+ "10: <%%spellout-fraction-digits<<;",
+ "100: <%%spellout-fraction-digits<<;",
+ "1000: <%%spellout-fraction-digits<<;",
+ "10000: <%%spellout-fraction-digits<<;",
+ "100000: <%%spellout-fraction-digits<<;",
+ "1000000: <%%spellout-fraction-digits<<;",
+ "10000000: <%%spellout-fraction-digits<<;",
+ "100000000: <%%spellout-fraction-digits<<;",
+ "1000000000: <%%spellout-fraction-digits<<;",
"10000000000: <0<;",
"%%spellout-fraction-digits:",
- "0: zero;",
- "1: jeden;",
- "2: dwa;",
- "3: trzy;",
- "4: cztery;",
- "5: pi\u0119\u0107;",
- "6: sze\u015B\u0107;",
- "7: siedem;",
- "8: osiem;",
- "9: dziewi\u0119\u0107;",
+ "0: =%spellout-cardinal-masculine=;",
"10: << >>;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/pt.txt b/data/rbnf/pt.txt
index 6b7d6a4..61edaf6 100644
--- a/data/rbnf/pt.txt
+++ b/data/rbnf/pt.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/pt.xml
@@ -207,5 +207,5 @@
"1000000000000000000: =#,##0=\u00AA;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/pt_AO.txt b/data/rbnf/pt_AO.txt
index a43d330..56b4428 100755
--- a/data/rbnf/pt_AO.txt
+++ b/data/rbnf/pt_AO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/pt_AO.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
pt_AO{
%%Parent{"pt_PT"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/pt_GW.txt b/data/rbnf/pt_GW.txt
index db60f0d..56e64e7 100755
--- a/data/rbnf/pt_GW.txt
+++ b/data/rbnf/pt_GW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/pt_GW.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
pt_GW{
%%Parent{"pt_PT"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/pt_MO.txt b/data/rbnf/pt_MO.txt
index e752caa..21e73fb 100755
--- a/data/rbnf/pt_MO.txt
+++ b/data/rbnf/pt_MO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/pt_MO.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
pt_MO{
%%Parent{"pt_PT"}
- Version{"2.0.76.12"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/pt_MZ.txt b/data/rbnf/pt_MZ.txt
index aea9a88..18acefa 100755
--- a/data/rbnf/pt_MZ.txt
+++ b/data/rbnf/pt_MZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/pt_MZ.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
pt_MZ{
%%Parent{"pt_PT"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/pt_PT.txt b/data/rbnf/pt_PT.txt
index 18263f9..8e4ec08 100644
--- a/data/rbnf/pt_PT.txt
+++ b/data/rbnf/pt_PT.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/pt_PT.xml
@@ -207,5 +207,5 @@
"1000000000000000000: =#,##0=\u00AA;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/pt_ST.txt b/data/rbnf/pt_ST.txt
index cb57743..de2b579 100755
--- a/data/rbnf/pt_ST.txt
+++ b/data/rbnf/pt_ST.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/pt_ST.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
pt_ST{
%%Parent{"pt_PT"}
- Version{"2.0.58.58"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/pt_TL.txt b/data/rbnf/pt_TL.txt
index 2de7fd0..c703e63 100755
--- a/data/rbnf/pt_TL.txt
+++ b/data/rbnf/pt_TL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/pt_TL.xml
@@ -8,5 +8,5 @@
// ***************************************************************************
pt_TL{
%%Parent{"pt_PT"}
- Version{"2.0.76.12"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/rbnffiles.mk b/data/rbnf/rbnffiles.mk
index 154ab0f..bb05082 100644
--- a/data/rbnf/rbnffiles.mk
+++ b/data/rbnf/rbnffiles.mk
@@ -1,6 +1,6 @@
-# * Copyright (C) 1998-2012, International Business Machines
+# * Copyright (C) 1998-2013, International Business Machines
# * Corporation and others. All Rights Reserved.
-RBNF_CLDR_VERSION = 22.1.1
+RBNF_CLDR_VERSION = 23
# A list of txt's to build
# Note:
#
diff --git a/data/rbnf/ro.txt b/data/rbnf/ro.txt
index e179b33..953ba1d 100644
--- a/data/rbnf/ro.txt
+++ b/data/rbnf/ro.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/ro.xml
@@ -96,5 +96,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/root.txt b/data/rbnf/root.txt
index ed10a1f..454f2ff 100644
--- a/data/rbnf/root.txt
+++ b/data/rbnf/root.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/root.xml
@@ -16,47 +16,6 @@
"0: =#,##0=;",
}
NumberingSystemRules{
- "%armenian-upper:",
- "-x: \u2212>>;",
- "x.x: =#,##0.00=;",
- "0: 0;",
- "1: \u0531;",
- "2: \u0532;",
- "3: \u0533;",
- "4: \u0534;",
- "5: \u0535;",
- "6: \u0536;",
- "7: \u0537;",
- "8: \u0538;",
- "9: \u0539;",
- "10: \u053A[>>];",
- "20: \u053B[>>];",
- "30: \u053C[>>];",
- "40: \u053D[>>];",
- "50: \u053E[>>];",
- "60: \u053F[>>];",
- "70: \u0540[>>];",
- "80: \u0541[>>];",
- "90: \u0542[>>];",
- "100: \u0543[>>];",
- "200: \u0544[>>];",
- "300: \u0545[>>];",
- "400: \u0546[>>];",
- "500: \u0547[>>];",
- "600: \u0548[>>];",
- "700: \u0549[>>];",
- "800: \u054A[>>];",
- "900: \u054B[>>];",
- "1000: \u054C[>>];",
- "2000: \u054D[>>];",
- "3000: \u054E[>>];",
- "4000: \u054F[>>];",
- "5000: \u0550[>>];",
- "6000: \u0551[>>];",
- "7000: \u0552[>>];",
- "8000: \u0553[>>];",
- "9000: \u0554[>>];",
- "10000: =#,##0=;",
"%armenian-lower:",
"-x: \u2212>>;",
"x.x: =#,##0.00=;",
@@ -98,9 +57,50 @@
"8000: \u0583[>>];",
"9000: \u0584[>>];",
"10000: =#,##0=;",
- "%ethiopic:",
+ "%armenian-upper:",
"-x: \u2212>>;",
"x.x: =#,##0.00=;",
+ "0: 0;",
+ "1: \u0531;",
+ "2: \u0532;",
+ "3: \u0533;",
+ "4: \u0534;",
+ "5: \u0535;",
+ "6: \u0536;",
+ "7: \u0537;",
+ "8: \u0538;",
+ "9: \u0539;",
+ "10: \u053A[>>];",
+ "20: \u053B[>>];",
+ "30: \u053C[>>];",
+ "40: \u053D[>>];",
+ "50: \u053E[>>];",
+ "60: \u053F[>>];",
+ "70: \u0540[>>];",
+ "80: \u0541[>>];",
+ "90: \u0542[>>];",
+ "100: \u0543[>>];",
+ "200: \u0544[>>];",
+ "300: \u0545[>>];",
+ "400: \u0546[>>];",
+ "500: \u0547[>>];",
+ "600: \u0548[>>];",
+ "700: \u0549[>>];",
+ "800: \u054A[>>];",
+ "900: \u054B[>>];",
+ "1000: \u054C[>>];",
+ "2000: \u054D[>>];",
+ "3000: \u054E[>>];",
+ "4000: \u054F[>>];",
+ "5000: \u0550[>>];",
+ "6000: \u0551[>>];",
+ "7000: \u0552[>>];",
+ "8000: \u0553[>>];",
+ "9000: \u0554[>>];",
+ "10000: =#,##0=;",
+ "%ethiopic:",
+ "-x: \u2212>>;",
+ "x.x: <<\u1361>>>;",
"0: \u1263\u12F6;",
"1: \u1369;",
"2: \u136A;",
@@ -120,24 +120,17 @@
"70: \u1378[>>];",
"80: \u1379[>>];",
"90: \u137A[>>];",
- "100/100: \u137B[>>];",
- "200/100: <<\u137B[>>];",
- "10000/10000: <<\u137C>%%ethiopic2>;",
- "1000000/1000000: \u137B>%%ethiopic3>;",
- "2000000/1000000: <<\u137B>%%ethiopic3>;",
- "100000000/100000000: <<\u137C>%%ethiopic4>;",
- "10000000000: =#,##0=;",
- "%%ethiopic2:",
- "0: \u137B;\u137B=%ethiopic=;",
- "100/100: <%ethiopic<\u137B[>%ethiopic>];",
- "%%ethiopic3:",
- "0: \u137C\u137B;\u137C\u137B=%ethiopic=;",
- "100/100: \u137C<%ethiopic<\u137B[>%ethiopic>];",
- "10000/10000: =%ethiopic=;",
- "%%ethiopic4:",
- "0: \u137B=%%ethiopic3=;",
- "10000/10000: \u137B<%ethiopic<\u137B[>%ethiopic>];",
- "1000000/1000000: =%ethiopic=;",
+ "100: \u137B[>>];",
+ "200: <<\u137B[>>];",
+ "10000: \u137C[>>];",
+ "20000: <<\u137C[>>];",
+ "100000000: \u137C\u137C[>>];",
+ "200000000: <<\u137C\u137C[>>];",
+ "1000000000000: \u137C\u137C\u137C[>>];",
+ "2000000000000: <<\u137C\u137C\u137C[>>];",
+ "10000000000000000: \u137C\u137C\u137C\u137C[>>];",
+ "20000000000000000: <<\u137C\u137C\u137C\u137C[>>];",
+ "1000000000000000000: =#,###0=;",
"%georgian:",
"-x: \u2212>>;",
"x.x: =#,##0.00=;",
@@ -245,9 +238,9 @@
"-x: \u2212>>;",
"x.x: =#,##0.00=;",
"0: 00;",
- "1: =%%GREEK-NUMERAL-MAJUSCULES=\u00B4;",
+ "1: =%%greek-numeral-majuscules=\u00B4;",
"1000000: =#,##0=;",
- "%%GREEK-NUMERAL-MAJUSCULES:",
+ "%%greek-numeral-majuscules:",
"1: \u0391;",
"2: \u0392;",
"3: \u0393;",
@@ -316,53 +309,53 @@
"8: \u05D7\u05F3;",
"9: \u05D8\u05F3;",
"10: \u05D9\u05F3;",
- "11: \u05D9[>%%hebrew_final>];",
+ "11: \u05D9[>%%hebrew-final>];",
"15: \u05D8\u05F4\u05D5;",
"16: \u05D8\u05F4\u05D6;",
- "17: \u05D9[>%%hebrew_final>];",
+ "17: \u05D9[>%%hebrew-final>];",
"20: \u05DB\u05F3;",
- "21: \u05DB[>%%hebrew_final>];",
+ "21: \u05DB[>%%hebrew-final>];",
"30: \u05DC\u05F3;",
- "31: \u05DC[>%%hebrew_final>];",
+ "31: \u05DC[>%%hebrew-final>];",
"40: \u05DE\u05F3;",
- "41: \u05DE[>%%hebrew_final>];",
+ "41: \u05DE[>%%hebrew-final>];",
"50: \u05E0\u05F3;",
- "51: \u05E0[>%%hebrew_final>];",
+ "51: \u05E0[>%%hebrew-final>];",
"60: \u05E1\u05F3;",
- "61: \u05E1[>%%hebrew_final>];",
+ "61: \u05E1[>%%hebrew-final>];",
"70: \u05E2\u05F3;",
- "71: \u05E2[>%%hebrew_final>];",
+ "71: \u05E2[>%%hebrew-final>];",
"80: \u05E4\u05F3;",
- "81: \u05E4[>%%hebrew_final>];",
+ "81: \u05E4[>%%hebrew-final>];",
"90: \u05E6\u05F3;",
- "91: \u05E6[>%%hebrew_final>];",
+ "91: \u05E6[>%%hebrew-final>];",
"100: \u05E7\u05F3;",
- "101: \u05E7[>%%hebrew_final>];",
+ "101: \u05E7[>%%hebrew-final>];",
"200: \u05E8\u05F3;",
- "201: \u05E8[>%%hebrew_final>];",
+ "201: \u05E8[>%%hebrew-final>];",
"300: \u05E9\u05F3;",
- "301: \u05E9[>%%hebrew_final>];",
+ "301: \u05E9[>%%hebrew-final>];",
"400: \u05EA\u05F3;",
- "401: \u05EA[>%%hebrew_final>];",
+ "401: \u05EA[>%%hebrew-final>];",
"500: \u05EA\u05F4\u05E7;",
- "501: \u05EA\u05E7[>%%hebrew_final>];",
+ "501: \u05EA\u05E7[>%%hebrew-final>];",
"600: \u05EA\u05F4\u05E8;",
- "601: \u05EA\u05E8[>%%hebrew_final>];",
+ "601: \u05EA\u05E8[>%%hebrew-final>];",
"700: \u05EA\u05F4\u05E9;",
- "701: \u05EA\u05E9[>%%hebrew_final>];",
+ "701: \u05EA\u05E9[>%%hebrew-final>];",
"800: \u05EA\u05F4\u05EA;",
- "801: \u05EA\u05EA[>%%hebrew_final>];",
+ "801: \u05EA\u05EA[>%%hebrew-final>];",
"900: \u05EA\u05EA\u05F4\u05E7;",
- "901: \u05EA\u05EA\u05E7[>%%hebrew_final>];",
+ "901: \u05EA\u05EA\u05E7[>%%hebrew-final>];",
"1000: \u05D0\u05DC\u05E3;",
- "1001: <%%hebrew_thousands<[>>];",
+ "1001: <%%hebrew-thousands<[>>];",
"2000: \u05D0\u05DC\u05E4\u05D9\u05D9\u05DD;",
- "2001: <%%hebrew_thousands<[>>];",
+ "2001: <%%hebrew-thousands<[>>];",
"3000: << \u05D0\u05DC\u05E4\u05D9\u05DD;",
- "3001: <%%hebrew_thousands<[>>];",
+ "3001: <%%hebrew-thousands<[>>];",
"1000000: \u05D0\u05DC\u05E3 \u05D0\u05DC\u05E4\u05D9\u05DD;",
"1000001: =#,##0=;",
- "%%hebrew_final:",
+ "%%hebrew-final:",
"0: \u05D0\u05E4\u05E1;",
"1: \u05F4\u05D0;",
"2: \u05F4\u05D1;",
@@ -374,27 +367,27 @@
"8: \u05F4\u05D7;",
"9: \u05F4\u05D8;",
"10: \u05F4\u05D9;",
- "11: \u05D9\u05F4[>%%hebrew_digit>];",
+ "11: \u05D9\u05F4[>%%hebrew-digit>];",
"15: \u05D8\u05F4\u05D5;",
"16: \u05D8\u05F4\u05D6;",
- "17: \u05D9\u05F4[>%%hebrew_digit>];",
+ "17: \u05D9\u05F4[>%%hebrew-digit>];",
"20: \u05F4\u05DB;",
- "21: \u05DB\u05F4[>%%hebrew_digit>];",
+ "21: \u05DB\u05F4[>%%hebrew-digit>];",
"30: \u05F4\u05DC;",
- "31: \u05DC\u05F4[>%%hebrew_digit>];",
+ "31: \u05DC\u05F4[>%%hebrew-digit>];",
"40: \u05F4\u05DE;",
- "41: \u05DE\u05F4[>%%hebrew_digit>];",
+ "41: \u05DE\u05F4[>%%hebrew-digit>];",
"50: \u05F4\u05E0;",
- "51: \u05E0\u05F4[>%%hebrew_digit>];",
+ "51: \u05E0\u05F4[>%%hebrew-digit>];",
"60: \u05F4\u05E1;",
- "61: \u05E1\u05F4[>%%hebrew_digit>];",
+ "61: \u05E1\u05F4[>%%hebrew-digit>];",
"70: \u05F4\u05E2;",
- "71: \u05E2\u05F4[>%%hebrew_digit>];",
+ "71: \u05E2\u05F4[>%%hebrew-digit>];",
"80: \u05F4\u05E4;",
- "81: \u05E4\u05F4[>%%hebrew_digit>];",
+ "81: \u05E4\u05F4[>%%hebrew-digit>];",
"90: \u05F4\u05E6;",
- "91: \u05E6\u05F4[>%%hebrew_digit>];",
- "%%hebrew_digit:",
+ "91: \u05E6\u05F4[>%%hebrew-digit>];",
+ "%%hebrew-digit:",
"0: \u05D0\u05E4\u05E1;",
"1: \u05D0;",
"2: \u05D1;",
@@ -405,21 +398,14 @@
"7: \u05D6;",
"8: \u05D7;",
"9: \u05D8;",
- "%%hebrew_thousands:",
+ "%%hebrew-thousands:",
"0: =%hebrew=;",
- "10: =%hebrew=;=%hebrew=\u05F3;",
- "20: =%hebrew=;=%hebrew=\u05F3;",
- "30: =%hebrew=;=%hebrew=\u05F3;",
- "40: =%hebrew=;=%hebrew=\u05F3;",
- "50: =%hebrew=;=%hebrew=\u05F3;",
- "60: =%hebrew=;=%hebrew=\u05F3;",
- "70: =%hebrew=;=%hebrew=\u05F3;",
- "80: =%hebrew=;=%hebrew=\u05F3;",
- "90: =%hebrew=;=%hebrew=\u05F3;",
- "100: =%hebrew=;=%hebrew=\u05F3;",
- "200: =%hebrew=;=%hebrew=\u05F3;",
- "300: =%hebrew=;=%hebrew=\u05F3;",
- "400: =%hebrew=;=%hebrew=\u05F3;",
+ "10: =%hebrew=[\u05F3];",
+ "100: =%hebrew=[\u05F3];",
+ "200: =%hebrew=[\u05F3];",
+ "300: =%hebrew=[\u05F3];",
+ "400: =%hebrew=;",
+ "401: =%hebrew=\u05F3;",
"%roman-lower:",
"-x: \u2212>>;",
"x.x: =#,##0.00=;",
@@ -528,9 +514,9 @@
"200: <<\u0BF1[>>];",
"1000: \u0BF2[>>];",
"2000: <<\u0BF2[>>];",
- "1000000/100000: <<\u0BF1\u0BF2[>%%tamil_thousands>];",
+ "1000000/100000: <<\u0BF1\u0BF2[>%%tamil-thousands>];",
"100000000: =#,##,##0=;",
- "%%tamil_thousands:",
+ "%%tamil-thousands:",
"0: =%tamil=;",
"1000: <<\u0BF2[>>];",
}
@@ -554,5 +540,5 @@
"0: =#,##0.#=.;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/ru.txt b/data/rbnf/ru.txt
index 0f9da50..f51cbdf 100644
--- a/data/rbnf/ru.txt
+++ b/data/rbnf/ru.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/ru.xml
@@ -142,5 +142,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/sk.txt b/data/rbnf/sk.txt
index 2e1cbcb..9b1a1f5 100644
--- a/data/rbnf/sk.txt
+++ b/data/rbnf/sk.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/sk.xml
@@ -113,5 +113,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/sl.txt b/data/rbnf/sl.txt
index 30402b7..7807d02 100644
--- a/data/rbnf/sl.txt
+++ b/data/rbnf/sl.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/sl.xml
@@ -137,5 +137,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/sq.txt b/data/rbnf/sq.txt
index 937f58d..c0d9a07 100644
--- a/data/rbnf/sq.txt
+++ b/data/rbnf/sq.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/sq.xml
@@ -72,5 +72,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/sr.txt b/data/rbnf/sr.txt
index 99e9724..63698c4 100644
--- a/data/rbnf/sr.txt
+++ b/data/rbnf/sr.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/sr.xml
@@ -156,5 +156,5 @@
"400: <%spellout-cardinal-feminine<\u0441\u0442\u043E>%%ordti>;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/sr_Latn.txt b/data/rbnf/sr_Latn.txt
index 8713cdd..345ee54 100644
--- a/data/rbnf/sr_Latn.txt
+++ b/data/rbnf/sr_Latn.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/sr_Latn.xml
@@ -156,5 +156,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/sv.txt b/data/rbnf/sv.txt
index 74ffd08..21879e4 100644
--- a/data/rbnf/sv.txt
+++ b/data/rbnf/sv.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/sv.xml
@@ -239,5 +239,5 @@
"0: =%spellout-ordinal-neuter=;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/ta.txt b/data/rbnf/ta.txt
index e370477..a39a8c0 100644
--- a/data/rbnf/ta.txt
+++ b/data/rbnf/ta.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/ta.xml
@@ -93,5 +93,5 @@
"21: =#,##,##0=\u0BBE\u0BB5\u0BA4\u0BC1;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/th.txt b/data/rbnf/th.txt
index e9f755f..8b6edaf 100644
--- a/data/rbnf/th.txt
+++ b/data/rbnf/th.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/th.xml
@@ -52,5 +52,5 @@
"0: \u0E17\u0E35\u0E48\u200B=%spellout-cardinal=;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/tr.txt b/data/rbnf/tr.txt
index 3853c53..f624b41 100644
--- a/data/rbnf/tr.txt
+++ b/data/rbnf/tr.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/tr.xml
@@ -103,5 +103,5 @@
"1000000000000000000: =#,##0='inci;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/uk.txt b/data/rbnf/uk.txt
index ab71f3c..06e435e 100644
--- a/data/rbnf/uk.txt
+++ b/data/rbnf/uk.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/uk.xml
@@ -157,5 +157,5 @@
"1000000000000000000: =#,##0=;",
}
}
- Version{"2.0.77.34"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/vi.txt b/data/rbnf/vi.txt
index bf8900e..ae1dd59 100644
--- a/data/rbnf/vi.txt
+++ b/data/rbnf/vi.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/vi.xml
@@ -66,5 +66,5 @@
"5: th\u1EE9 =%spellout-cardinal=;",
}
}
- Version{"2.0.73.63"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/zh.txt b/data/rbnf/zh.txt
index bada730..43197a3 100644
--- a/data/rbnf/zh.txt
+++ b/data/rbnf/zh.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/zh.xml
@@ -95,7 +95,7 @@
"20: <<\u62FE[>>];",
"100: <<\u4F70[>%%financialnumber2>];",
"1000: <<\u4EDF[>%%financialnumber3>];",
- "10000: <<\u842C[>%%financialnumber4>];",
+ "10000: <<\u4E07[>%%financialnumber4>];",
"100000000: <<\u4EBF[>%%financialnumber5>];",
"1000000000000: <<\u5146[>%%financialnumber8>];",
"10000000000000000: <<\u4EAC[>%%financialnumber13>];",
@@ -131,7 +131,7 @@
"1000000000000: =%spellout-cardinal-financial=;",
"%spellout-cardinal:",
"-x: \u8D1F>>;",
- "x.x: <<\u70B9>%%spellout-fraction>;",
+ "x.x: <<\u70B9>>>;",
"0: \u96F6;",
"1: \u4E00;",
"2: \u4E8C;",
@@ -181,7 +181,7 @@
"1000000000000: =%spellout-cardinal=;",
"%spellout-cardinal-alternate2:",
"-x: \u8D1F>>;",
- "x.x: <<\u70B9>%%spellout-fraction>;",
+ "x.x: =%spellout-cardinal=;",
"0: \u96F6;",
"1: \u4E00;",
"2: \u4E24;",
@@ -229,24 +229,10 @@
"10: \u96F6\u4E00=%spellout-cardinal-alternate2=;",
"20: \u96F6=%spellout-cardinal-alternate2=;",
"1000000000000: =%spellout-cardinal-alternate2=;",
- "%%spellout-fraction:",
- "10: <%%spellout-fraction-digits<;",
- "100: <%%spellout-fraction-digits<;",
- "1000: <%%spellout-fraction-digits<;",
- "10000: <%%spellout-fraction-digits<;",
- "100000: <%%spellout-fraction-digits<;",
- "1000000: <%%spellout-fraction-digits<;",
- "10000000: <%%spellout-fraction-digits<;",
- "100000000: <%%spellout-fraction-digits<;",
- "1000000000: <%%spellout-fraction-digits<;",
- "10000000000: <0<;",
- "%%spellout-fraction-digits:",
- "0: =%spellout-numbering=;",
- "10: <<>>;",
"%spellout-ordinal:",
"x.x: =#,###0.#=;",
"0: \u7B2C=%spellout-numbering=;",
}
}
- Version{"2.0.76.62"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/zh_Hant.txt b/data/rbnf/zh_Hant.txt
index 0cc7b2b..311d021 100644
--- a/data/rbnf/zh_Hant.txt
+++ b/data/rbnf/zh_Hant.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/zh_Hant.xml
@@ -120,7 +120,7 @@
"1000000000000: =%spellout-cardinal-financial=;",
"%spellout-cardinal:",
"-x: \u8CA0>>;",
- "x.x: <<\u9EDE>%%spellout-fraction>;",
+ "x.x: <<\u9EDE>>>;",
"0: \u96F6;",
"1: \u4E00;",
"2: \u4E8C;",
@@ -170,7 +170,7 @@
"1000000000000: =%spellout-cardinal=;",
"%spellout-cardinal-alternate2:",
"-x: \u8CA0>>;",
- "x.x: <<\u9EDE>%%spellout-fraction>;",
+ "x.x: =%spellout-cardinal=;",
"0: \u96F6;",
"1: \u4E00;",
"2: \u5169;",
@@ -218,24 +218,10 @@
"10: \u96F6\u4E00=%spellout-cardinal-alternate2=;",
"20: \u96F6=%spellout-cardinal-alternate2=;",
"1000000000000: =%spellout-cardinal-alternate2=;",
- "%%spellout-fraction:",
- "10: <%%spellout-fraction-digits<;",
- "100: <%%spellout-fraction-digits<;",
- "1000: <%%spellout-fraction-digits<;",
- "10000: <%%spellout-fraction-digits<;",
- "100000: <%%spellout-fraction-digits<;",
- "1000000: <%%spellout-fraction-digits<;",
- "10000000: <%%spellout-fraction-digits<;",
- "100000000: <%%spellout-fraction-digits<;",
- "1000000000: <%%spellout-fraction-digits<;",
- "10000000000: <0<;",
- "%%spellout-fraction-digits:",
- "0: =%spellout-numbering=;",
- "10: <<>>;",
"%spellout-ordinal:",
"x.x: =#,###0.#=;",
"0: \u7B2C=%spellout-numbering=;",
}
}
- Version{"2.0.76.62"}
+ Version{"2.0.82.42"}
}
diff --git a/data/rbnf/zh_Hant_HK.txt b/data/rbnf/zh_Hant_HK.txt
index e275ef1..2f53724 100755
--- a/data/rbnf/zh_Hant_HK.txt
+++ b/data/rbnf/zh_Hant_HK.txt
@@ -1,12 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/rbnf/zh_Hant_HK.xml
// *
// ***************************************************************************
zh_Hant_HK{
+ %%Parent{"zh_Hant"}
RBNFRules{
SpelloutRules{
"%spellout-numbering-year:",
@@ -123,7 +124,7 @@
"1000000000000: =%spellout-cardinal-financial=;",
"%spellout-cardinal:",
"-x: \u8CA0>>;",
- "x.x: <<\u9EDE>%%spellout-fraction>;",
+ "x.x: <<\u9EDE>>>;",
"0: \u96F6;",
"1: \u4E00;",
"2: \u4E8C;",
@@ -146,7 +147,7 @@
"1000000000000000000: =#,###0=;",
"%spellout-cardinal-alternate2:",
"-x: \u8CA0>>;",
- "x.x: <<\u9EDE>%%spellout-fraction>;",
+ "x.x: =%spellout-cardinal=;",
"0: \u96F6;",
"1: \u4E00;",
"2: \u5169;",
@@ -170,24 +171,10 @@
"%%cardinal-twenties:",
"1: ;",
"2: \u4E8C;",
- "%%spellout-fraction:",
- "10: <%%spellout-fraction-digits<;",
- "100: <%%spellout-fraction-digits<;",
- "1000: <%%spellout-fraction-digits<;",
- "10000: <%%spellout-fraction-digits<;",
- "100000: <%%spellout-fraction-digits<;",
- "1000000: <%%spellout-fraction-digits<;",
- "10000000: <%%spellout-fraction-digits<;",
- "100000000: <%%spellout-fraction-digits<;",
- "1000000000: <%%spellout-fraction-digits<;",
- "10000000000: <0<;",
- "%%spellout-fraction-digits:",
- "0: =%spellout-numbering=;",
- "10: <<>>;",
"%spellout-ordinal:",
"x.x: =#,###0.#=;",
"0: \u7B2C=%spellout-numbering=;",
}
}
- Version{"2.0.52.30"}
+ Version{"2.0.82.68"}
}
diff --git a/data/region/af.txt b/data/region/af.txt
index d70e7e9..ccd5e32 100644
--- a/data/region/af.txt
+++ b/data/region/af.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis en Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Jemen"}
YT{"Mayotte"}
ZA{"Suid-Afrika"}
@@ -301,5 +302,5 @@
ZW{"Zimbabwe"}
ZZ{"Onbekend gebied"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/agq.txt b/data/region/agq.txt
index 22e463a..323d285 100755
--- a/data/region/agq.txt
+++ b/data/region/agq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/agq.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambìa"}
ZW{"Zìmbagbɛ̀"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ak.txt b/data/region/ak.txt
index 8a9f2be..cee4967 100755
--- a/data/region/ak.txt
+++ b/data/region/ak.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ak.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambia"}
ZW{"Zembabwe"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/am.txt b/data/region/am.txt
index 5d92e54..b5bf31f 100644
--- a/data/region/am.txt
+++ b/data/region/am.txt
@@ -294,6 +294,7 @@
VU{"ቫኑአቱ"}
WF{"ዋሊስ እና ፉቱና ደሴቶች"}
WS{"ሳሞአ"}
+ XK{"ኮሶቮ"}
YE{"የመን"}
YT{"ሜይኦቴ"}
ZA{"ደቡብ አፍሪካ"}
@@ -301,5 +302,5 @@
ZW{"ዚምቧቤ"}
ZZ{"ያልታወቀ ክልል"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.52"}
}
diff --git a/data/region/ar.txt b/data/region/ar.txt
index 9e37456..da4e372 100644
--- a/data/region/ar.txt
+++ b/data/region/ar.txt
@@ -294,6 +294,7 @@
VU{"فانواتو"}
WF{"جزر والس وفوتونا"}
WS{"ساموا"}
+ XK{"كوسوفو"}
YE{"اليمن"}
YT{"مايوت"}
ZA{"جنوب أفريقيا"}
@@ -301,5 +302,5 @@
ZW{"زيمبابوي"}
ZZ{"منطقة غير معروفة"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/as.txt b/data/region/as.txt
index 7fceac3..7069c4b 100644
--- a/data/region/as.txt
+++ b/data/region/as.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/as.xml
// *
@@ -29,5 +29,5 @@
US{"যুক্তৰাষ্ট্ৰ"}
ZZ{"অজ্ঞাত বা অবৈধ অঞ্চল"}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/asa.txt b/data/region/asa.txt
index 5de0ba6..e31b4ae 100755
--- a/data/region/asa.txt
+++ b/data/region/asa.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/asa.xml
// *
@@ -235,5 +235,5 @@
ZM{"Dhambia"}
ZW{"Dhimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/az.txt b/data/region/az.txt
index 94137a8..3a31afd 100644
--- a/data/region/az.txt
+++ b/data/region/az.txt
@@ -289,5 +289,5 @@
ZW{"Zimbabve"}
ZZ{"bilinmir"}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/az_AZ.txt b/data/region/az_AZ.txt
index 881b97c..f76eaaa 100644
--- a/data/region/az_AZ.txt
+++ b/data/region/az_AZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/az_Cyrl.txt b/data/region/az_Cyrl.txt
index 9862a64..65901d3 100644
--- a/data/region/az_Cyrl.txt
+++ b/data/region/az_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/az_Cyrl.xml
// *
@@ -22,5 +22,5 @@
RU{"Русија"}
US{"Америка Бирләшмиш Штатлары"}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/az_Latn.txt b/data/region/az_Latn.txt
index 72a33fc..fb302c0 100644
--- a/data/region/az_Latn.txt
+++ b/data/region/az_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/az_Latn.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/az_Latn.xml
*/
az_Latn{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/az_Latn_AZ.txt b/data/region/az_Latn_AZ.txt
index 45b7660..f907674 100644
--- a/data/region/az_Latn_AZ.txt
+++ b/data/region/az_Latn_AZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/bas.txt b/data/region/bas.txt
index ea14fa9..9db6c52 100755
--- a/data/region/bas.txt
+++ b/data/region/bas.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bas.xml
// *
@@ -234,5 +234,5 @@
ZM{"Zàmbià"}
ZW{"Zìmbàbwê"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/be.txt b/data/region/be.txt
index b9bdd75..d6cfbb6 100644
--- a/data/region/be.txt
+++ b/data/region/be.txt
@@ -274,5 +274,5 @@
ZW{"Зімбабвэ"}
ZZ{"Невядомы рэгіён"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.49"}
}
diff --git a/data/region/bem.txt b/data/region/bem.txt
index d6ceb6b..de60044 100755
--- a/data/region/bem.txt
+++ b/data/region/bem.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bem.xml
// *
@@ -13,5 +13,5 @@
Countries{
ZM{"Zambia"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/bez.txt b/data/region/bez.txt
index 61de266..be85e11 100755
--- a/data/region/bez.txt
+++ b/data/region/bez.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bez.xml
// *
@@ -237,5 +237,5 @@
ZM{"Huzambia"}
ZW{"Huzimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/bg.txt b/data/region/bg.txt
index 42e1ec0..4dc7056 100644
--- a/data/region/bg.txt
+++ b/data/region/bg.txt
@@ -301,5 +301,5 @@
ZW{"Зимбабве"}
ZZ{"Непозната или несъществуваща област"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/bm.txt b/data/region/bm.txt
index d5e4c36..179d1fc 100755
--- a/data/region/bm.txt
+++ b/data/region/bm.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bm.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zanbi"}
ZW{"Zimbabuwe"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/bn.txt b/data/region/bn.txt
index 876d881..4bbc479 100644
--- a/data/region/bn.txt
+++ b/data/region/bn.txt
@@ -294,6 +294,7 @@
VU{"ভানুয়াটু"}
WF{"ওয়ালিস ও ফুটুনা"}
WS{"সামোয়া"}
+ XK{"কসোভো"}
YE{"ইমেন"}
YT{"মায়োত্তে"}
ZA{"দক্ষিণ আফ্রিকা"}
@@ -301,5 +302,5 @@
ZW{"জিম্বাবুয়ে"}
ZZ{"অজানা অথবা ভুল স্থান"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.47"}
}
diff --git a/data/region/bn_IN.txt b/data/region/bn_IN.txt
index 420866c..ad37a09 100755
--- a/data/region/bn_IN.txt
+++ b/data/region/bn_IN.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bn_IN.xml
// *
@@ -10,5 +10,5 @@
Countries{
CH{"সুইজর্লণ্ড"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/bo.txt b/data/region/bo.txt
index fe741a6..5dfa73a 100644
--- a/data/region/bo.txt
+++ b/data/region/bo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bo.xml
// *
@@ -23,5 +23,5 @@
US{"ཨ་མེ་རི་ཀ་"}
ZZ{"མིའི་ཤེས་རྟོགས་མ་བྱུང་བའི་ཁོར་ཡུག"}
}
- Version{"2.0.74.85"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/bo_IN.txt b/data/region/bo_IN.txt
index e197960..91e799b 100755
--- a/data/region/bo_IN.txt
+++ b/data/region/bo_IN.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bo_IN.xml
// *
@@ -10,5 +10,5 @@
Countries{
009{"ཨོཤི་ཡཱན་ན།"}
}
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/br.txt b/data/region/br.txt
index 2be55fd..42f886b 100755
--- a/data/region/br.txt
+++ b/data/region/br.txt
@@ -301,5 +301,5 @@
ZW{"Zimbabwe"}
ZZ{"Rannved dianav"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.57"}
}
diff --git a/data/region/brx.txt b/data/region/brx.txt
index 80f9474..f3558e3 100755
--- a/data/region/brx.txt
+++ b/data/region/brx.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/brx.xml
// *
@@ -291,5 +291,5 @@
ZW{"ज़ीम्बाब्वे"}
ZZ{"अज्ञात या अवैध प्रदेश"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/bs.txt b/data/region/bs.txt
index 931e204..e40618c 100644
--- a/data/region/bs.txt
+++ b/data/region/bs.txt
@@ -291,5 +291,5 @@
ZW{"Zimbabve"}
ZZ{"Nepoznata ili nevažeća oblast"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/bs_BA.txt b/data/region/bs_BA.txt
index 3fb951c..a5158e5 100755
--- a/data/region/bs_BA.txt
+++ b/data/region/bs_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/bs_Cyrl.txt b/data/region/bs_Cyrl.txt
index 7fca0a8..408772a 100755
--- a/data/region/bs_Cyrl.txt
+++ b/data/region/bs_Cyrl.txt
@@ -297,5 +297,5 @@
ZW{"Зимбабве"}
ZZ{"Непозната или неважећа област"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.47"}
}
diff --git a/data/region/bs_Latn.txt b/data/region/bs_Latn.txt
index 3ea3b65..940f036 100755
--- a/data/region/bs_Latn.txt
+++ b/data/region/bs_Latn.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bs_Latn.xml
// *
// ***************************************************************************
bs_Latn{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/bs_Latn_BA.txt b/data/region/bs_Latn_BA.txt
index 3906520..f6c37c6 100755
--- a/data/region/bs_Latn_BA.txt
+++ b/data/region/bs_Latn_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/ca.txt b/data/region/ca.txt
index 86c4440..83e046c 100644
--- a/data/region/ca.txt
+++ b/data/region/ca.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis i Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Iemen"}
YT{"Mayotte"}
ZA{"República de Sud-àfrica"}
@@ -301,5 +302,5 @@
ZW{"Zimbabwe"}
ZZ{"Regió desconeguda"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.57"}
}
diff --git a/data/region/cgg.txt b/data/region/cgg.txt
index f5cbd23..9a26839 100755
--- a/data/region/cgg.txt
+++ b/data/region/cgg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/cgg.xml
// *
@@ -235,5 +235,5 @@
ZM{"Zambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/chr.txt b/data/region/chr.txt
index bc08916..417b1fa 100755
--- a/data/region/chr.txt
+++ b/data/region/chr.txt
@@ -213,5 +213,5 @@
US{"ᎠᎹᏰᏟ"}
ZZ{"ᏄᏬᎵᏍᏛᎾ ᎤᏔᏂᏗᎦᏙᎯ"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/cs.txt b/data/region/cs.txt
index e9f4122..37a54a1 100644
--- a/data/region/cs.txt
+++ b/data/region/cs.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis a Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Jemen"}
YT{"Mayotte"}
ZA{"Jihoafrická republika"}
@@ -301,5 +302,5 @@
ZW{"Zimbabwe"}
ZZ{"Neznámá oblast"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/cy.txt b/data/region/cy.txt
index 0e16a30..57a73a8 100644
--- a/data/region/cy.txt
+++ b/data/region/cy.txt
@@ -293,6 +293,7 @@
VU{"Vanuatu"}
WF{"Wallis a Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Yemen"}
YT{"Mayotte"}
ZA{"De Affrica"}
@@ -300,5 +301,5 @@
ZW{"Zimbabwe"}
ZZ{"Rhanbarth Anhysbys"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.51"}
}
diff --git a/data/region/da.txt b/data/region/da.txt
index fe3aed3..6719243 100644
--- a/data/region/da.txt
+++ b/data/region/da.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis og Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Yemen"}
YT{"Mayotte"}
ZA{"Sydafrika"}
@@ -301,5 +302,5 @@
ZW{"Zimbabwe"}
ZZ{"Ukendt område"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/dav.txt b/data/region/dav.txt
index 9f16213..bdccd28 100755
--- a/data/region/dav.txt
+++ b/data/region/dav.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dav.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/de.txt b/data/region/de.txt
index 3f3b34d..acaaf9d 100644
--- a/data/region/de.txt
+++ b/data/region/de.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis und Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Jemen"}
YT{"Mayotte"}
ZA{"Südafrika"}
@@ -301,5 +302,5 @@
ZW{"Simbabwe"}
ZZ{"Unbekannte Region"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/de_CH.txt b/data/region/de_CH.txt
index b0e9d7d..0e7ef45 100644
--- a/data/region/de_CH.txt
+++ b/data/region/de_CH.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/de_CH.xml
// *
@@ -22,5 +22,5 @@
ST{"Sao Tomé und Principe"}
ZW{"Zimbabwe"}
}
- Version{"2.0.65.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/dje.txt b/data/region/dje.txt
index bb3d52f..a62d498 100755
--- a/data/region/dje.txt
+++ b/data/region/dje.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dje.xml
// *
@@ -236,5 +236,5 @@
ZM{"Zambi"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/dua.txt b/data/region/dua.txt
index 0dd4989..d85a4a3 100755
--- a/data/region/dua.txt
+++ b/data/region/dua.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dua.xml
// *
@@ -13,5 +13,5 @@
Countries{
CM{"Cameroun"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/dyo.txt b/data/region/dyo.txt
index ccc83f1..6f85e80 100755
--- a/data/region/dyo.txt
+++ b/data/region/dyo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dyo.xml
// *
@@ -120,5 +120,5 @@
TG{"Togo"}
TH{"Tailand"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/dz.txt b/data/region/dz.txt
index de2d565..c605864 100755
--- a/data/region/dz.txt
+++ b/data/region/dz.txt
@@ -300,5 +300,5 @@
ZW{"ཛིམ་བྷབ་ཝེ"}
ZZ{"ངོ་མ་ཤེས་པའི་ལུང་ཕྱོགས"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ebu.txt b/data/region/ebu.txt
index 5406489..0d202c1 100755
--- a/data/region/ebu.txt
+++ b/data/region/ebu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ebu.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ee.txt b/data/region/ee.txt
index 881e813..f58d711 100755
--- a/data/region/ee.txt
+++ b/data/region/ee.txt
@@ -296,5 +296,5 @@
ZW{"Zimbabwe nutome"}
ZZ{"nutome manya"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
}
diff --git a/data/region/el.txt b/data/region/el.txt
index b8218c6..fc62bae 100644
--- a/data/region/el.txt
+++ b/data/region/el.txt
@@ -294,6 +294,7 @@
VU{"Βανουάτου"}
WF{"Ουόλις και Φουτούνα"}
WS{"Σαμόα"}
+ XK{"Κόσοβο"}
YE{"Υεμένη"}
YT{"Μαγιότ"}
ZA{"Νότια Αφρική"}
@@ -301,5 +302,5 @@
ZW{"Ζιμπάμπουε"}
ZZ{"Άγνωστη περιοχή"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/en.txt b/data/region/en.txt
index c50e4d9..fef376b 100644
--- a/data/region/en.txt
+++ b/data/region/en.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis and Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Yemen"}
YT{"Mayotte"}
ZA{"South Africa"}
@@ -301,5 +302,5 @@
ZW{"Zimbabwe"}
ZZ{"Unknown Region"}
}
- Version{"2.0.78.36"}
+ Version{"2.0.82.76"}
}
diff --git a/data/region/en_GB.txt b/data/region/en_GB.txt
index cb6c932..877c859 100755
--- a/data/region/en_GB.txt
+++ b/data/region/en_GB.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GB.xml
// *
@@ -10,5 +10,5 @@
Countries{
UM{"U.S. Minor Outlying Islands"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/en_NH.txt b/data/region/en_NH.txt
index 92d7383..0b45233 100755
--- a/data/region/en_NH.txt
+++ b/data/region/en_NH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/en_RH.txt b/data/region/en_RH.txt
index 928f668..bc71849 100644
--- a/data/region/en_RH.txt
+++ b/data/region/en_RH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/en_VU.txt b/data/region/en_VU.txt
index a5076d7..2e3e092 100755
--- a/data/region/en_VU.txt
+++ b/data/region/en_VU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/en_ZW.txt b/data/region/en_ZW.txt
index 6d0f9be..88c4471 100644
--- a/data/region/en_ZW.txt
+++ b/data/region/en_ZW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/eo.txt b/data/region/eo.txt
index 37ca6af..b00e90c 100644
--- a/data/region/eo.txt
+++ b/data/region/eo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/eo.xml
// *
@@ -236,5 +236,5 @@
ZM{"Zambio"}
ZW{"Zimbabvo"}
}
- Version{"2.0.74.74"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/es.txt b/data/region/es.txt
index ce359ab..cf24c37 100644
--- a/data/region/es.txt
+++ b/data/region/es.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis y Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Yemen"}
YT{"Mayotte"}
ZA{"Sudáfrica"}
@@ -301,5 +302,5 @@
ZW{"Zimbabue"}
ZZ{"Región desconocida"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.47"}
}
diff --git a/data/region/es_CL.txt b/data/region/es_CL.txt
index dc2e36a..61e859a 100644
--- a/data/region/es_CL.txt
+++ b/data/region/es_CL.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_CL.xml
// *
@@ -11,5 +11,5 @@
005{"Sudamérica"}
EH{"Sahara Occidental"}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/et.txt b/data/region/et.txt
index f7267b8..51b6ee0 100644
--- a/data/region/et.txt
+++ b/data/region/et.txt
@@ -300,5 +300,5 @@
ZM{"Sambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.47"}
}
diff --git a/data/region/eu.txt b/data/region/eu.txt
index 20f487d..13f5969 100644
--- a/data/region/eu.txt
+++ b/data/region/eu.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis eta Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Yemen"}
YT{"Mayotte"}
ZA{"Hegoafrika"}
@@ -301,5 +302,5 @@
ZW{"Zimbabwe"}
ZZ{"Eskualde ezezaguna"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ewo.txt b/data/region/ewo.txt
index 99974f8..6f36bde 100755
--- a/data/region/ewo.txt
+++ b/data/region/ewo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ewo.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambí"}
ZW{"Zimbabwé"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/fa.txt b/data/region/fa.txt
index c1b5368..dac186b 100644
--- a/data/region/fa.txt
+++ b/data/region/fa.txt
@@ -294,6 +294,7 @@
VU{"وانواتو"}
WF{"والیس و فیوتونا"}
WS{"ساموا"}
+ XK{"کوزووو"}
YE{"یمن"}
YT{"مایوت"}
ZA{"افریقای جنوبی"}
@@ -301,5 +302,5 @@
ZW{"زیمبابوه"}
ZZ{"ناحیهٔ نامشخص"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/fa_AF.txt b/data/region/fa_AF.txt
index 2f569cf..3c664b3 100644
--- a/data/region/fa_AF.txt
+++ b/data/region/fa_AF.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fa_AF.xml
// *
@@ -102,5 +102,5 @@
WS{"ساموآ"}
ZW{"زیمبابوی"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ff.txt b/data/region/ff.txt
index 7e362ab..0948a7a 100755
--- a/data/region/ff.txt
+++ b/data/region/ff.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ff.xml
// *
@@ -237,5 +237,5 @@
ZM{"Sammbi"}
ZW{"Simbaabuwe"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/fi.txt b/data/region/fi.txt
index 7dd939a..803cacc 100644
--- a/data/region/fi.txt
+++ b/data/region/fi.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis ja Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Jemen"}
YT{"Mayotte"}
ZA{"Etelä-Afrikka"}
@@ -301,5 +302,5 @@
ZW{"Zimbabwe"}
ZZ{"tuntematon alue"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
}
diff --git a/data/region/fil.txt b/data/region/fil.txt
index 9f89985..dc0d991 100755
--- a/data/region/fil.txt
+++ b/data/region/fil.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis and the Futuna Islands"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Yemen"}
YT{"Mayotte"}
ZA{"South Africa"}
@@ -301,5 +302,5 @@
ZW{"Zimbabwe"}
ZZ{"Hindi kilala o Hindi wastong Rehiyon"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/fil_PH.txt b/data/region/fil_PH.txt
index 42baeba..3a691b4 100755
--- a/data/region/fil_PH.txt
+++ b/data/region/fil_PH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/fo.txt b/data/region/fo.txt
index 10391e2..6ea6458 100644
--- a/data/region/fo.txt
+++ b/data/region/fo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fo.xml
// *
@@ -136,5 +136,5 @@
ZM{"Sambia"}
ZW{"Simbabvi"}
}
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/fr.txt b/data/region/fr.txt
index 0b9a047..7630fc9 100644
--- a/data/region/fr.txt
+++ b/data/region/fr.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis-et-Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Yémen"}
YT{"Mayotte"}
ZA{"Afrique du Sud"}
@@ -301,5 +302,5 @@
ZW{"Zimbabwe"}
ZZ{"région indéterminée"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
}
diff --git a/data/region/fr_CA.txt b/data/region/fr_CA.txt
index 1e566e9..ad79096 100755
--- a/data/region/fr_CA.txt
+++ b/data/region/fr_CA.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_CA.xml
// *
@@ -11,6 +11,7 @@
AC{"Île de l'Ascension"}
GS{"Géorgie du Sud et les îles Sandwich du Sud"}
ST{"Sao Tomé-et-Principe"}
+ XK{"Kosovo"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ga.txt b/data/region/ga.txt
index 0eaa24c..b3608ed 100644
--- a/data/region/ga.txt
+++ b/data/region/ga.txt
@@ -273,5 +273,5 @@
ZW{"An tSiombáib"}
ZZ{"Réigiún Anaithnid nó Neamhbhailí"}
}
- Version{"2.0.77.27"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/gl.txt b/data/region/gl.txt
index 53e62f7..6693699 100644
--- a/data/region/gl.txt
+++ b/data/region/gl.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis e Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Iemen"}
YT{"Mayotte"}
ZA{"Sudáfrica"}
@@ -301,5 +302,5 @@
ZW{"Cimbabue"}
ZZ{"Rexión descoñecida"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/gsw.txt b/data/region/gsw.txt
index a244374..8aeffc8 100644
--- a/data/region/gsw.txt
+++ b/data/region/gsw.txt
@@ -291,5 +291,5 @@
ZW{"Simbabwe"}
ZZ{"Unbekannti oder ungültigi Regioon"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/gu.txt b/data/region/gu.txt
index 7c8e408..741be1f 100644
--- a/data/region/gu.txt
+++ b/data/region/gu.txt
@@ -294,6 +294,7 @@
VU{"વાનુઆતુ"}
WF{"વૉલિસ એંડ ફ્યુચુના આઇલેન્ડ્સ"}
WS{"સમોઆ"}
+ XK{"કોસોવો"}
YE{"યેમેન"}
YT{"મેયોટ"}
ZA{"દક્ષિણ આફ્રિકા"}
@@ -301,5 +302,5 @@
ZW{"ઝિમ્બાબ્વે"}
ZZ{"અજ્ઞાત અથવા અમાન્ય પ્રદેશ"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
}
diff --git a/data/region/guz.txt b/data/region/guz.txt
index 46cd5c5..d081008 100755
--- a/data/region/guz.txt
+++ b/data/region/guz.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/guz.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/gv.txt b/data/region/gv.txt
index c7934cd..acc016d 100644
--- a/data/region/gv.txt
+++ b/data/region/gv.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gv.xml
// *
@@ -13,5 +13,5 @@
Countries{
GB{"Rywvaneth Unys"}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ha.txt b/data/region/ha.txt
index f9de666..9151456 100644
--- a/data/region/ha.txt
+++ b/data/region/ha.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ha.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambiya"}
ZW{"Zimbabuwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ha_GH.txt b/data/region/ha_GH.txt
index a414604..5a59b2e 100644
--- a/data/region/ha_GH.txt
+++ b/data/region/ha_GH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/ha_Latn.txt b/data/region/ha_Latn.txt
index 649d47f..bdcc668 100644
--- a/data/region/ha_Latn.txt
+++ b/data/region/ha_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ha_Latn.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/ha_Latn.xml
*/
ha_Latn{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ha_Latn_GH.txt b/data/region/ha_Latn_GH.txt
index 4a7717b..c10a415 100644
--- a/data/region/ha_Latn_GH.txt
+++ b/data/region/ha_Latn_GH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/ha_Latn_NE.txt b/data/region/ha_Latn_NE.txt
index b383c7c..e80f6f7 100644
--- a/data/region/ha_Latn_NE.txt
+++ b/data/region/ha_Latn_NE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/ha_Latn_NG.txt b/data/region/ha_Latn_NG.txt
index 1b09876..bb60f3c 100644
--- a/data/region/ha_Latn_NG.txt
+++ b/data/region/ha_Latn_NG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/ha_NE.txt b/data/region/ha_NE.txt
index 5c06d78..f28adee 100644
--- a/data/region/ha_NE.txt
+++ b/data/region/ha_NE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/ha_NG.txt b/data/region/ha_NG.txt
index 66e2170..1a5e209 100644
--- a/data/region/ha_NG.txt
+++ b/data/region/ha_NG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/haw.txt b/data/region/haw.txt
index d0adc1d..f947887 100644
--- a/data/region/haw.txt
+++ b/data/region/haw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/haw.xml
// *
@@ -32,5 +32,5 @@
RU{"Lūkia"}
US{"ʻAmelika Hui Pū ʻIa"}
}
- Version{"2.0.74.85"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/he.txt b/data/region/he.txt
index 4dfc190..6cb52b3 100644
--- a/data/region/he.txt
+++ b/data/region/he.txt
@@ -294,6 +294,7 @@
VU{"ונואטו"}
WF{"איי ווליס ופוטונה"}
WS{"סמואה"}
+ XK{"קוסובו"}
YE{"תימן"}
YT{"מאיוט"}
ZA{"דרום אפריקה"}
@@ -301,5 +302,5 @@
ZW{"זימבאבווה"}
ZZ{"אזור לא ידוע"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.47"}
}
diff --git a/data/region/he_IL.txt b/data/region/he_IL.txt
index 9925868..2324002 100644
--- a/data/region/he_IL.txt
+++ b/data/region/he_IL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/hi.txt b/data/region/hi.txt
index 6da6fca..becea07 100644
--- a/data/region/hi.txt
+++ b/data/region/hi.txt
@@ -294,6 +294,7 @@
VU{"वानुअतु"}
WF{"वालिस और फ़्यूचूना"}
WS{"समोआ"}
+ XK{"कोसोवो"}
YE{"यमन"}
YT{"मैयट"}
ZA{"दक्षिण अफ़्रीका"}
@@ -301,5 +302,5 @@
ZW{"ज़िम्बाब्वे"}
ZZ{"अज्ञात क्षेत्र"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/hr.txt b/data/region/hr.txt
index cd60d80..1e47b68 100644
--- a/data/region/hr.txt
+++ b/data/region/hr.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis i Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Jemen"}
YT{"Majote"}
ZA{"Južnoafrička Republika"}
@@ -301,5 +302,5 @@
ZW{"Zimbabve"}
ZZ{"nepoznato područje"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/hu.txt b/data/region/hu.txt
index 4f8f3b4..f5dcd19 100644
--- a/data/region/hu.txt
+++ b/data/region/hu.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis- és Futuna-szigetek"}
WS{"Szamoa"}
+ XK{"Koszovó"}
YE{"Jemen"}
YT{"Mayotte"}
ZA{"Dél-afrikai Köztársaság"}
@@ -301,5 +302,5 @@
ZW{"Zimbabwe"}
ZZ{"Ismeretlen vagy érvénytelen körzet"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.47"}
}
diff --git a/data/region/hy.txt b/data/region/hy.txt
index 4ef1fed..2e10a00 100644
--- a/data/region/hy.txt
+++ b/data/region/hy.txt
@@ -293,6 +293,7 @@
VU{"Վանուատու"}
WF{"Ուոլիս և Ֆուտունա"}
WS{"Սամոա"}
+ XK{"Կոսովո"}
YE{"Եմեն"}
YT{"Մայոտ"}
ZA{"Հարավաֆրիկյան Հանրապետություն"}
@@ -300,5 +301,5 @@
ZW{"Զիմբաբվե"}
ZZ{"Անհայտ տարածաշրջան"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.51"}
}
diff --git a/data/region/id.txt b/data/region/id.txt
index 07c95f0..449b1f1 100644
--- a/data/region/id.txt
+++ b/data/region/id.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Kepulauan Wallis dan Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Yaman"}
YT{"Mayotte"}
ZA{"Afrika Selatan"}
@@ -301,5 +302,5 @@
ZW{"Zimbabwe"}
ZZ{"Wilayah Tidak Dikenal"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
}
diff --git a/data/region/id_ID.txt b/data/region/id_ID.txt
index 6593209..85fc819 100644
--- a/data/region/id_ID.txt
+++ b/data/region/id_ID.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/ig.txt b/data/region/ig.txt
index bf37b70..4b38f78 100755
--- a/data/region/ig.txt
+++ b/data/region/ig.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ig.xml
// *
@@ -20,5 +20,5 @@
MV{"Maldivesa"}
NG{"Nigeria"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ii.txt b/data/region/ii.txt
index ff77321..5eca8a9 100644
--- a/data/region/ii.txt
+++ b/data/region/ii.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ii.xml
// *
@@ -23,5 +23,5 @@
US{"ꂰꇩ"}
ZZ{"ꃅꄷꅉꀋꐚꌠ"}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/in.txt b/data/region/in.txt
index cb3e2e0..2a3360a 100644
--- a/data/region/in.txt
+++ b/data/region/in.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/in_ID.txt b/data/region/in_ID.txt
index d22885f..bc2b4af 100644
--- a/data/region/in_ID.txt
+++ b/data/region/in_ID.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/is.txt b/data/region/is.txt
index 6770920..77fd05b 100644
--- a/data/region/is.txt
+++ b/data/region/is.txt
@@ -294,6 +294,7 @@
VU{"Vanúatú"}
WF{"Wallis- og Fútúnaeyjar"}
WS{"Samóa"}
+ XK{"Kósóvó"}
YE{"Jemen"}
YT{"Mayotte"}
ZA{"Suður-Afríka"}
@@ -301,5 +302,5 @@
ZW{"Simbabve"}
ZZ{"Óþekkt svæði"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/it.txt b/data/region/it.txt
index 76d0ec2..cf9878d 100644
--- a/data/region/it.txt
+++ b/data/region/it.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis e Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Yemen"}
YT{"Mayotte"}
ZA{"Sudafrica"}
@@ -301,5 +302,5 @@
ZW{"Zimbabwe"}
ZZ{"Regione non valida o sconosciuta"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/iw.txt b/data/region/iw.txt
index c10c184..8352a34 100644
--- a/data/region/iw.txt
+++ b/data/region/iw.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/iw_IL.txt b/data/region/iw_IL.txt
index 6963f2d..5a4954b 100644
--- a/data/region/iw_IL.txt
+++ b/data/region/iw_IL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/ja.txt b/data/region/ja.txt
index 38106e9..8302230 100644
--- a/data/region/ja.txt
+++ b/data/region/ja.txt
@@ -294,6 +294,7 @@
VU{"バヌアツ"}
WF{"ウォリス・フツナ"}
WS{"サモア"}
+ XK{"コソボ"}
YE{"イエメン"}
YT{"マヨット島"}
ZA{"南アフリカ"}
@@ -301,5 +302,5 @@
ZW{"ジンバブエ"}
ZZ{"不明な地域"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
}
diff --git a/data/region/ja_JP.txt b/data/region/ja_JP.txt
index c049867..c0ce246 100644
--- a/data/region/ja_JP.txt
+++ b/data/region/ja_JP.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/ja_JP_TRADITIONAL.txt b/data/region/ja_JP_TRADITIONAL.txt
index ca942f1..e95c34a 100644
--- a/data/region/ja_JP_TRADITIONAL.txt
+++ b/data/region/ja_JP_TRADITIONAL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/jgo.txt b/data/region/jgo.txt
index f80e40f..5ed6efb 100755
--- a/data/region/jgo.txt
+++ b/data/region/jgo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/jgo.xml
// *
@@ -94,5 +94,5 @@
ZW{"Zimbɑ́mbwɛ"}
ZZ{"ŋgɔŋ yi pɛ́ ká kɛ́ jʉɔ"}
}
- Version{"2.0.77.53"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/jmc.txt b/data/region/jmc.txt
index 6de1630..6338a35 100755
--- a/data/region/jmc.txt
+++ b/data/region/jmc.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/jmc.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ka.txt b/data/region/ka.txt
index b08456e..25e3f33 100644
--- a/data/region/ka.txt
+++ b/data/region/ka.txt
@@ -294,6 +294,7 @@
VU{"ვანუატუ"}
WF{"უოლისი და ფუტუნა"}
WS{"სამოა"}
+ XK{"კოსოვო"}
YE{"იემენი"}
YT{"მაიოტა"}
ZA{"სამხრეთ აფრიკა"}
@@ -301,5 +302,5 @@
ZW{"ზიმბაბვე"}
ZZ{"უცნობი რეგიონი"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.61"}
}
diff --git a/data/region/kab.txt b/data/region/kab.txt
index a263b5c..4e61b77 100755
--- a/data/region/kab.txt
+++ b/data/region/kab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kab.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambya"}
ZW{"Zimbabwi"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/kam.txt b/data/region/kam.txt
index ccb8163..3c4b88e 100755
--- a/data/region/kam.txt
+++ b/data/region/kam.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kam.xml
// *
@@ -237,5 +237,5 @@
ZM{"Nzambia"}
ZW{"Nzimbambwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/kde.txt b/data/region/kde.txt
index 417b6fb..dfa42de 100755
--- a/data/region/kde.txt
+++ b/data/region/kde.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kde.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/kea.txt b/data/region/kea.txt
index b2fd4d9..b7f0018 100755
--- a/data/region/kea.txt
+++ b/data/region/kea.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kea.xml
// *
@@ -141,7 +141,7 @@
GU{"Guam"}
GW{"Gine-Bisau"}
GY{"Giana"}
- HK{"Rejiãu Administrativu Special di Ong Kong"}
+ HK{"Ong Kong"}
HM{"Ilha Heard i Ilhas McDonald"}
HN{"Onduras"}
HR{"Kroasia"}
@@ -195,7 +195,7 @@
ML{"Mali"}
MM{"Mianmar"}
MN{"Mongolia"}
- MO{"Rejiãu Administrativu Special di Makau"}
+ MO{"Makau"}
MP{"Ilhas Marianas di Norti"}
MQ{"Martinika"}
MR{"Mauritania"}
@@ -301,5 +301,5 @@
ZW{"Zimbabui"}
ZZ{"Rejiãu Diskonxedu"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/khq.txt b/data/region/khq.txt
index ed5f3b0..892e470 100755
--- a/data/region/khq.txt
+++ b/data/region/khq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/khq.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambi"}
ZW{"Zimbabwe"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ki.txt b/data/region/ki.txt
index 9c15325..052326b 100755
--- a/data/region/ki.txt
+++ b/data/region/ki.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ki.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/kk.txt b/data/region/kk.txt
index c75e615..6e168bd 100644
--- a/data/region/kk.txt
+++ b/data/region/kk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kk.xml
// *
@@ -93,5 +93,5 @@
ZA{"Оңтүстік Африка республикасы"}
ZZ{"Белгісіз аймақ"}
}
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/kk_Cyrl.txt b/data/region/kk_Cyrl.txt
index 6e5a261..a368107 100644
--- a/data/region/kk_Cyrl.txt
+++ b/data/region/kk_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kk_Cyrl.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/kk_Cyrl.xml
*/
kk_Cyrl{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/kk_Cyrl_KZ.txt b/data/region/kk_Cyrl_KZ.txt
index ec163a4..6917b0e 100644
--- a/data/region/kk_Cyrl_KZ.txt
+++ b/data/region/kk_Cyrl_KZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/kk_KZ.txt b/data/region/kk_KZ.txt
index 6702eea..f94bda6 100644
--- a/data/region/kk_KZ.txt
+++ b/data/region/kk_KZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/kl.txt b/data/region/kl.txt
index 0e5a60d..deb1e24 100644
--- a/data/region/kl.txt
+++ b/data/region/kl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kl.xml
// *
@@ -13,5 +13,5 @@
Countries{
GL{"Kalaallit Nunaat"}
}
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/kln.txt b/data/region/kln.txt
index 22a5e70..f6680eb 100755
--- a/data/region/kln.txt
+++ b/data/region/kln.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kln.xml
// *
@@ -237,5 +237,5 @@
ZM{"Emetab Zambia"}
ZW{"Emetab Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/km.txt b/data/region/km.txt
index 555bb6d..04b4398 100644
--- a/data/region/km.txt
+++ b/data/region/km.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/km.xml
// *
@@ -293,6 +293,7 @@
VU{"វ៉ាន់ណៅទូ"}
WF{"វ៉ាលីស និងហ្វូទូណា"}
WS{"សាមូអា"}
+ XK{"កូសូវ៉ូ"}
YE{"យេមែន"}
YT{"ម៉ាយុត"}
ZA{"អាព្រិកភាគខាងត្បូង"}
@@ -300,5 +301,5 @@
ZW{"ហ្ស៊ីមបាបវ៉េ"}
ZZ{"មិនស្គាល់តំបន់"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/kn.txt b/data/region/kn.txt
index 27cb730..c05a775 100644
--- a/data/region/kn.txt
+++ b/data/region/kn.txt
@@ -294,6 +294,7 @@
VU{"ವನೌಟು"}
WF{"ವಾಲಿಸ್ ಮತ್ತು ಫುಟುನಾ"}
WS{"ಸಮೋವಾ"}
+ XK{"ಕೊಸೊವೊ"}
YE{"ಯೆಮನ್"}
YT{"ಮಯೊಟ್ಟೆ"}
ZA{"ದಕ್ಷಿಣ ಆಫ್ರಿಕಾ"}
@@ -301,5 +302,5 @@
ZW{"ಜಿಂಬಾಬ್ವೆ"}
ZZ{"ಅಪರಿಚಿತ ಅಥವಾ ಅಮಾನ್ಯ ಪ್ರದೇಶ"}
}
- Version{"2.0.78.40"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ko.txt b/data/region/ko.txt
index 06e75fb..952eda0 100644
--- a/data/region/ko.txt
+++ b/data/region/ko.txt
@@ -294,6 +294,7 @@
VU{"바누아투"}
WF{"왈리스-푸투나 제도"}
WS{"사모아"}
+ XK{"코소보"}
YE{"예멘"}
YT{"마요티"}
ZA{"남아프리카"}
@@ -301,5 +302,5 @@
ZW{"짐바브웨"}
ZZ{"알수없거나 유효하지 않은 지역"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
}
diff --git a/data/region/kok.txt b/data/region/kok.txt
index a0b90fd..48015b9 100644
--- a/data/region/kok.txt
+++ b/data/region/kok.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kok.xml
// *
@@ -13,5 +13,5 @@
Countries{
IN{"भारत"}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ks.txt b/data/region/ks.txt
index 2a8fb12..16fef04 100755
--- a/data/region/ks.txt
+++ b/data/region/ks.txt
@@ -288,5 +288,5 @@
ZW{"زِمبابے"}
ZZ{"نامعلوٗم تہٕ نالَگہار عَلاقہٕ"}
}
- Version{"2.0.78.55"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ks_Arab.txt b/data/region/ks_Arab.txt
index cbef02c..903481b 100755
--- a/data/region/ks_Arab.txt
+++ b/data/region/ks_Arab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ks_Arab.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/ks_Arab.xml
*/
ks_Arab{
- Version{"2.0.75.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ks_Arab_IN.txt b/data/region/ks_Arab_IN.txt
index 47b5e54..9eac4af 100755
--- a/data/region/ks_Arab_IN.txt
+++ b/data/region/ks_Arab_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/ks_IN.txt b/data/region/ks_IN.txt
index 558e1ea..fa6550f 100755
--- a/data/region/ks_IN.txt
+++ b/data/region/ks_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/ksb.txt b/data/region/ksb.txt
index 1c6ab2f..2c57a81 100755
--- a/data/region/ksb.txt
+++ b/data/region/ksb.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ksb.xml
// *
@@ -236,5 +236,5 @@
ZM{"Zambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ksf.txt b/data/region/ksf.txt
index 28606fe..0499a3a 100755
--- a/data/region/ksf.txt
+++ b/data/region/ksf.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ksf.xml
// *
@@ -237,5 +237,5 @@
ZM{"zambí"}
ZW{"zimbabwɛ́"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/kw.txt b/data/region/kw.txt
index 5be8d3a..3d868b2 100644
--- a/data/region/kw.txt
+++ b/data/region/kw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kw.xml
// *
@@ -13,5 +13,5 @@
Countries{
GB{"Rywvaneth Unys"}
}
- Version{"2.0.74.74"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/lag.txt b/data/region/lag.txt
index e67f2cf..002b5ba 100755
--- a/data/region/lag.txt
+++ b/data/region/lag.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lag.xml
// *
@@ -237,5 +237,5 @@
ZM{"Sámbia"}
ZW{"Simbáabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/lg.txt b/data/region/lg.txt
index dfb6ca6..e9eda7a 100755
--- a/data/region/lg.txt
+++ b/data/region/lg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lg.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambya"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ln.txt b/data/region/ln.txt
index a123ff7..60d0255 100755
--- a/data/region/ln.txt
+++ b/data/region/ln.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ln.xml
// *
@@ -236,5 +236,5 @@
ZM{"Zambi"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/lo.txt b/data/region/lo.txt
index fd99b9a..5f17a98 100755
--- a/data/region/lo.txt
+++ b/data/region/lo.txt
@@ -283,6 +283,7 @@
VU{"ວານົວຕູ"}
WF{"ວາລິສແລະຟຸຕູນາ"}
WS{"ຊາມົວ"}
+ XK{"ໂຄໂຊໂວ"}
YE{"ເຢເມນ"}
YT{"ມາຢອດ"}
ZA{"ອາຟະລິກາໃຕ້"}
@@ -290,5 +291,5 @@
ZW{"ຊິມບັບເວ"}
ZZ{"ຂົງເຂດທີ່ບໍ່ຮູ້ຈັກ"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
}
diff --git a/data/region/lt.txt b/data/region/lt.txt
index 7b44038..250b00e 100644
--- a/data/region/lt.txt
+++ b/data/region/lt.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallisas ir Futuna"}
WS{"Samoa"}
+ XK{"Kosovas"}
YE{"Jemenas"}
YT{"Majotas"}
ZA{"Pietų Afrika"}
@@ -301,5 +302,5 @@
ZW{"Zimbabvė"}
ZZ{"nežinoma sritis"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.57"}
}
diff --git a/data/region/lu.txt b/data/region/lu.txt
index 7a3ad76..e15c0ec 100755
--- a/data/region/lu.txt
+++ b/data/region/lu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lu.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambi"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/luo.txt b/data/region/luo.txt
index c40992e..32f528c 100755
--- a/data/region/luo.txt
+++ b/data/region/luo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/luo.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/luy.txt b/data/region/luy.txt
index 330955b..63d640b 100755
--- a/data/region/luy.txt
+++ b/data/region/luy.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/luy.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/lv.txt b/data/region/lv.txt
index 97d4b89..cecdd1e 100644
--- a/data/region/lv.txt
+++ b/data/region/lv.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Volisa un Futuna"}
WS{"Samoa"}
+ XK{"Kosova"}
YE{"Jemena"}
YT{"Majota"}
ZA{"Dienvidāfrikas Republika"}
@@ -301,5 +302,5 @@
ZW{"Zimbabve"}
ZZ{"nezināms reģions"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/mas.txt b/data/region/mas.txt
index d62ffc9..31a248a 100755
--- a/data/region/mas.txt
+++ b/data/region/mas.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mas.xml
// *
@@ -237,5 +237,5 @@
ZM{"Sambia"}
ZW{"Simbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/mer.txt b/data/region/mer.txt
index 30c8447..7c49fb6 100755
--- a/data/region/mer.txt
+++ b/data/region/mer.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mer.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/mfe.txt b/data/region/mfe.txt
index dad5f59..e9b2354 100755
--- a/data/region/mfe.txt
+++ b/data/region/mfe.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mfe.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambi"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/mg.txt b/data/region/mg.txt
index f08ab66..beb305a 100755
--- a/data/region/mg.txt
+++ b/data/region/mg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mg.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambia"}
ZW{"Zimbaboe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/mgh.txt b/data/region/mgh.txt
index 01d7e35..7cbc865 100755
--- a/data/region/mgh.txt
+++ b/data/region/mgh.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mgh.xml
// *
@@ -149,5 +149,5 @@
ZM{"Uzambia"}
ZW{"Uzimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/mgo.txt b/data/region/mgo.txt
index dc53ccc..1b70ae2 100755
--- a/data/region/mgo.txt
+++ b/data/region/mgo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mgo.xml
// *
@@ -14,5 +14,5 @@
CM{"Kamalun"}
ZZ{"aba aben tisɔ̀"}
}
- Version{"2.0.77.53"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/mk.txt b/data/region/mk.txt
index 176cdff..3319425 100644
--- a/data/region/mk.txt
+++ b/data/region/mk.txt
@@ -301,5 +301,5 @@
ZW{"Зимбабве"}
ZZ{"Непознат регион"}
}
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ml.txt b/data/region/ml.txt
index dce0c2b..8fd0211 100644
--- a/data/region/ml.txt
+++ b/data/region/ml.txt
@@ -294,6 +294,7 @@
VU{"വന്വാത്തു"}
WF{"വാലിസ് ആൻഡ് ഫ്യുചൂന"}
WS{"സാമോവ"}
+ XK{"കൊസോവൊ"}
YE{"യമൻ"}
YT{"മയോട്ട്"}
ZA{"ദക്ഷിണാഫ്രിക്ക"}
@@ -301,5 +302,5 @@
ZW{"സിംബാബ്വേ"}
ZZ{"അറിയപ്പെടാത്തതോ നിലവിലില്ലാത്തതോ ആയ പ്രദേശം"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/mn.txt b/data/region/mn.txt
new file mode 100755
index 0000000..fa3a822
--- /dev/null
+++ b/data/region/mn.txt
@@ -0,0 +1,305 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/mn.xml
+// *
+// ***************************************************************************
+/**
+ * ICU <specials> source: <path>/xml/main/mn.xml
+ */
+mn{
+ Countries{
+ 001{"Дэлхий"}
+ 002{"Африк"}
+ 003{"Хойд Америк"}
+ 005{"Өмнөд Америк"}
+ 009{"Номхон далайн орнууд"}
+ 011{"Баруун Африк"}
+ 013{"Төв Америк"}
+ 014{"Зүүн Африк"}
+ 015{"Хойд Африк"}
+ 017{"Төв Африк"}
+ 018{"Өмнөд Африк"}
+ 019{"Америк"}
+ 021{"Хойд Америк тив"}
+ 029{"Карибын"}
+ 030{"Зүүн Ази"}
+ 034{"Өмнөд Ази"}
+ 035{"Зүүн Өмнөд Ази"}
+ 039{"Өмнөд Европ"}
+ 053{"Австралиази"}
+ 054{"Меланези"}
+ 057{"Микронезийн бүс"}
+ 061{"Полинез"}
+ 142{"Ази"}
+ 143{"Төв Ази"}
+ 145{"Баруун Ази"}
+ 150{"Европ"}
+ 151{"Зүүн Европ"}
+ 154{"Хойд Европ"}
+ 155{"Баруун Европ"}
+ 419{"Латин Америк"}
+ AC{"Аскенсион Арал"}
+ AD{"Андорра"}
+ AE{"Арабын Нэгдсэн Эмират"}
+ AF{"Афганистан"}
+ AG{"Антигуа ба Барбуда"}
+ AI{"Ангила"}
+ AL{"Албани"}
+ AM{"Армен"}
+ AO{"Ангол"}
+ AQ{"Антарктик"}
+ AR{"Аргентин"}
+ AS{"Америкийн Самоа"}
+ AT{"Австри"}
+ AU{"Австрали"}
+ AW{"Аруба"}
+ AX{"Аландын Арлууд"}
+ AZ{"Азербайжан"}
+ BA{"Босни Херцеговин"}
+ BB{"Барбадос"}
+ BD{"Бангладеш"}
+ BE{"Белги"}
+ BF{"Буркина фасо"}
+ BG{"Болгар"}
+ BH{"Бахрейн"}
+ BI{"Бурунди"}
+ BJ{"Бенин"}
+ BL{"Сент Бартельми"}
+ BM{"Бермуд"}
+ BN{"Бруней"}
+ BO{"Боливи"}
+ BQ{"Карибын Нидерланд"}
+ BR{"Бразил"}
+ BS{"Багам"}
+ BT{"Бутан"}
+ BV{"Буветын Арлууд"}
+ BW{"Ботсвана"}
+ BY{"Беларус"}
+ BZ{"Белиз"}
+ CA{"Канад"}
+ CC{"Кокос [Кийлинг] Арлууд"}
+ CD{"Конго-Киншаса"}
+ CF{"Төв Африкийн Бүгд Найрамдах Улс"}
+ CG{"Конго Браззавиль"}
+ CH{"Швейцари"}
+ CI{"Кот д'Ивуар"}
+ CK{"Күүкийн Арлууд"}
+ CL{"Чили"}
+ CM{"Камерун"}
+ CN{"Хятад"}
+ CO{"Колумб"}
+ CP{"Клиппертон Арал"}
+ CR{"Коста Рика"}
+ CU{"Куба"}
+ CV{"Капе Верде"}
+ CW{"Куракао"}
+ CX{"Зул Сарын Арал"}
+ CY{"Кипр"}
+ CZ{"Бүгд Найрамдах Чех Улс"}
+ DE{"Герман"}
+ DG{"Диего Гарсиа"}
+ DJ{"Джибути"}
+ DK{"Дани"}
+ DM{"Доминик"}
+ DO{"Бүгд Найрамдах Доминикан"}
+ DZ{"Алжир"}
+ EA{"Сеута ба Мелилья"}
+ EC{"Эквадор"}
+ EE{"Эстон"}
+ EG{"Египет"}
+ EH{"Баруун Сахар"}
+ ER{"Эритри"}
+ ES{"Испани"}
+ ET{"Этиоп"}
+ EU{"Европын Холбоо"}
+ FI{"Финланд"}
+ FJ{"Фижи"}
+ FK{"Фолькландын Арлууд"}
+ FM{"Микронези"}
+ FO{"Фароэ Арлууд"}
+ FR{"Франц"}
+ GA{"Габон"}
+ GB{"Их Британи"}
+ GD{"Гренада"}
+ GE{"Гүрж"}
+ GF{"Францын Гайана"}
+ GG{"Гернси"}
+ GH{"Гана"}
+ GI{"Гибралтар"}
+ GL{"Гренланд"}
+ GM{"Гамби"}
+ GN{"Гвиней"}
+ GP{"Гваделуп"}
+ GQ{"Экваторын Гвиней"}
+ GR{"Грек"}
+ GS{"Өмнөд Жоржиа ба Өмнөд Сэндвичийн Арлууд"}
+ GT{"Гватемал"}
+ GU{"Гуам"}
+ GW{"Гвиней-Бисау"}
+ GY{"Гайана"}
+ HK{"Хонг Конг"}
+ HM{"Хэрд Арал ба Макдоналд Арлууд"}
+ HN{"Гондурас"}
+ HR{"Хорват"}
+ HT{"Гаити"}
+ HU{"Унгар"}
+ IC{"Канарын арлууд"}
+ ID{"Индонези"}
+ IE{"Ирланд"}
+ IL{"Израиль"}
+ IM{"Мэн Арал"}
+ IN{"Энэтхэг"}
+ IO{"Британийн харьяа Энэтхэгийн далай дахь нутаг дэвсгэрүүд"}
+ IQ{"Ирак"}
+ IR{"Иран"}
+ IS{"Исланд"}
+ IT{"Итали"}
+ JE{"Жерси"}
+ JM{"Ямайк"}
+ JO{"Йордан"}
+ JP{"Япон"}
+ KE{"Кени"}
+ KG{"Кыргызстан"}
+ KH{"Камбож"}
+ KI{"Кирибати"}
+ KM{"Коморос"}
+ KN{"Сент-Киттс ба Невис"}
+ KP{"Хойд Солонгос"}
+ KR{"Өмнөд Солонгос"}
+ KW{"Кувейт"}
+ KY{"Кайманы Арлууд"}
+ KZ{"Казахстан"}
+ LA{"Лаос"}
+ LB{"Ливан"}
+ LC{"Сент Люсиа"}
+ LI{"Лихтенштейн"}
+ LK{"Шри Ланка"}
+ LR{"Либери"}
+ LS{"Лесото"}
+ LT{"Литва"}
+ LU{"Люксембург"}
+ LV{"Латви"}
+ LY{"Ливи"}
+ MA{"Марокко"}
+ MC{"Монако"}
+ MD{"Молдав"}
+ ME{"Монтенегро"}
+ MF{"Сент-Мартин"}
+ MG{"Мадагаскар"}
+ MH{"Маршаллын Арлууд"}
+ MK{"Македон"}
+ ML{"Мали"}
+ MM{"Мьянмар [Бурма]"}
+ MN{"Монгол"}
+ MO{"Макао"}
+ MP{"Хойд Марианы Арлууд"}
+ MQ{"Мартиник"}
+ MR{"Мавритани"}
+ MS{"Монтсеррат"}
+ MT{"Мальта"}
+ MU{"Мавритус"}
+ MV{"Мальдив"}
+ MW{"Малави"}
+ MX{"Мексик"}
+ MY{"Малайз"}
+ MZ{"Мозамбик"}
+ NA{"Намиби"}
+ NC{"Шинэ Каледони"}
+ NE{"Нигер"}
+ NF{"Норфолк Арлууд"}
+ NG{"Нигери"}
+ NI{"Никарагуа"}
+ NL{"Голланд"}
+ NO{"Норвеги"}
+ NP{"Балба"}
+ NR{"Науру"}
+ NU{"Ниуэ"}
+ NZ{"Шинэ Зеланд"}
+ OM{"Оман"}
+ PA{"Панам"}
+ PE{"Перу"}
+ PF{"Францын Полинез"}
+ PG{"Папуа Шинэ Гвиней"}
+ PH{"Филиппин"}
+ PK{"Пакистан"}
+ PL{"Польш"}
+ PM{"Сэнт Пьер ба Микелон"}
+ PN{"Питкэрн Арлууд"}
+ PR{"Пуэрто Рико"}
+ PS{"Палестин"}
+ PT{"Португал"}
+ PW{"Палау"}
+ PY{"Парагвай"}
+ QA{"Катар"}
+ QO{"Номхон далайг тойрсон улс орнууд"}
+ RE{"Реюньон"}
+ RO{"Румын"}
+ RS{"Серби"}
+ RU{"Орос"}
+ RW{"Руанда"}
+ SA{"Саудын Араб"}
+ SB{"Соломоны Арлууд"}
+ SC{"Сейшел"}
+ SD{"Судан"}
+ SE{"Швед"}
+ SG{"Сингапур"}
+ SH{"Сент Хелена"}
+ SI{"Словени"}
+ SJ{"Свалбард ба Ян Майен"}
+ SK{"Словак"}
+ SL{"Сьерра-Леоне"}
+ SM{"Сан-Марино"}
+ SN{"Сенегал"}
+ SO{"Сомали"}
+ SR{"Суринам"}
+ SS{"Өмнөд Судан"}
+ ST{"Сан-Томе ба Принсипи"}
+ SV{"Эль Сальвадор"}
+ SX{"Синт Мартен"}
+ SY{"Сири"}
+ SZ{"Свазиланд"}
+ TA{"Тристан да Кунья"}
+ TC{"Турк ба Кайкосын Арлууд"}
+ TD{"Чад"}
+ TF{"Францын өмнөд газар нутаг"}
+ TG{"Того"}
+ TH{"Тайланд"}
+ TJ{"Тажикистан"}
+ TK{"Токелау"}
+ TL{"Тимор-Лесте"}
+ TM{"Туркменистан"}
+ TN{"Тунис"}
+ TO{"Тонга"}
+ TR{"Турк"}
+ TT{"Тринидад ба Тобаго"}
+ TV{"Тувалу"}
+ TW{"Тайван"}
+ TZ{"Танзани"}
+ UA{"Украйн"}
+ UG{"Уганда"}
+ UM{"АНУ-ын тойрсон арлууд"}
+ US{"Америкийн Нэгдсэн Улс"}
+ UY{"Уругвай"}
+ UZ{"Узбекистан"}
+ VA{"Ватикан хот улс"}
+ VC{"Сэнт Винсэнт ба Гренадин"}
+ VE{"Венесуэл"}
+ VG{"Британийн Виржиний Арлууд"}
+ VI{"АНУ-ын Виржиний Арлууд"}
+ VN{"Вьетнам"}
+ VU{"Вануату"}
+ WF{"Уоллис ба Футуна"}
+ WS{"Самоа"}
+ XK{"Косово"}
+ YE{"Йемен"}
+ YT{"Майотте"}
+ ZA{"Өмнөд Африк тив"}
+ ZM{"Замби"}
+ ZW{"Зимбабве"}
+ ZZ{"Тодорхойгүй"}
+ }
+ Version{"2.0.82.51"}
+}
diff --git a/data/region/mn_Cyrl.txt b/data/region/mn_Cyrl.txt
new file mode 100755
index 0000000..55d4dd3
--- /dev/null
+++ b/data/region/mn_Cyrl.txt
@@ -0,0 +1,14 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/mn_Cyrl.xml
+// *
+// ***************************************************************************
+/**
+ * ICU <specials> source: <path>/xml/main/mn_Cyrl.xml
+ */
+mn_Cyrl{
+ Version{"2.0.82.45"}
+}
diff --git a/data/region/shi_Latn_MA.txt b/data/region/mn_Cyrl_MN.txt
similarity index 86%
rename from data/region/shi_Latn_MA.txt
rename to data/region/mn_Cyrl_MN.txt
index cd7fd64..5d61306 100755
--- a/data/region/shi_Latn_MA.txt
+++ b/data/region/mn_Cyrl_MN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* generated alias target
*/
-shi_Latn_MA{
+mn_Cyrl_MN{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/coll/hi__DIRECT.txt b/data/region/mn_MN.txt
old mode 100644
new mode 100755
similarity index 73%
copy from data/coll/hi__DIRECT.txt
copy to data/region/mn_MN.txt
index fd5973f..cf689b7
--- a/data/coll/hi__DIRECT.txt
+++ b/data/region/mn_MN.txt
@@ -1,13 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
-hi__DIRECT{
- collations{
- default{"direct"}
- }
+mn_MN{
+ "%%ALIAS"{"mn_Cyrl_MN"}
}
diff --git a/data/region/mo.txt b/data/region/mo.txt
index ef3bdd7..55f72d2 100755
--- a/data/region/mo.txt
+++ b/data/region/mo.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/mr.txt b/data/region/mr.txt
index 890df8c..db199d9 100644
--- a/data/region/mr.txt
+++ b/data/region/mr.txt
@@ -294,6 +294,7 @@
VU{"वानौटु"}
WF{"वालिस आणि फ्यूचूना"}
WS{"सामोआ"}
+ XK{"कोसोव्हो"}
YE{"येमेन"}
YT{"मायोट्टे"}
ZA{"दक्षिण अफ्रिका"}
@@ -301,5 +302,5 @@
ZW{"झिम्बाब्वे"}
ZZ{"अज्ञात वा अवैध प्रदेश"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ms.txt b/data/region/ms.txt
index fcac266..e5bfd6d 100644
--- a/data/region/ms.txt
+++ b/data/region/ms.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis and Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Yaman"}
YT{"Mayotte"}
ZA{"Afrika Selatan"}
@@ -301,5 +302,5 @@
ZW{"Zimbabwe"}
ZZ{"Wilayah Tidak Diketahui"}
}
- Version{"2.0.78.20"}
+ Version{"2.0.82.45"}
}
diff --git a/data/coll/hi__DIRECT.txt b/data/region/ms_BN.txt
similarity index 73%
copy from data/coll/hi__DIRECT.txt
copy to data/region/ms_BN.txt
index fd5973f..3f5c08a 100644
--- a/data/coll/hi__DIRECT.txt
+++ b/data/region/ms_BN.txt
@@ -1,13 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
-hi__DIRECT{
- collations{
- default{"direct"}
- }
+ms_BN{
+ "%%ALIAS"{"ms_Latn_BN"}
}
diff --git a/data/region/ms_Latn.txt b/data/region/ms_Latn.txt
new file mode 100644
index 0000000..62fa3e2
--- /dev/null
+++ b/data/region/ms_Latn.txt
@@ -0,0 +1,14 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/ms_Latn.xml
+// *
+// ***************************************************************************
+/**
+ * ICU <specials> source: <path>/xml/main/ms_Latn.xml
+ */
+ms_Latn{
+ Version{"2.0.82.68"}
+}
diff --git a/data/region/shi_Latn_MA.txt b/data/region/ms_Latn_BN.txt
old mode 100755
new mode 100644
similarity index 86%
copy from data/region/shi_Latn_MA.txt
copy to data/region/ms_Latn_BN.txt
index cd7fd64..a54fd72
--- a/data/region/shi_Latn_MA.txt
+++ b/data/region/ms_Latn_BN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* generated alias target
*/
-shi_Latn_MA{
+ms_Latn_BN{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/region/shi_Latn_MA.txt b/data/region/ms_Latn_MY.txt
old mode 100755
new mode 100644
similarity index 86%
copy from data/region/shi_Latn_MA.txt
copy to data/region/ms_Latn_MY.txt
index cd7fd64..dc26b90
--- a/data/region/shi_Latn_MA.txt
+++ b/data/region/ms_Latn_MY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* generated alias target
*/
-shi_Latn_MA{
+ms_Latn_MY{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/region/shi_Latn_MA.txt b/data/region/ms_Latn_SG.txt
old mode 100755
new mode 100644
similarity index 86%
copy from data/region/shi_Latn_MA.txt
copy to data/region/ms_Latn_SG.txt
index cd7fd64..c65bf0a
--- a/data/region/shi_Latn_MA.txt
+++ b/data/region/ms_Latn_SG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* generated alias target
*/
-shi_Latn_MA{
+ms_Latn_SG{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/coll/hi__DIRECT.txt b/data/region/ms_MY.txt
similarity index 73%
copy from data/coll/hi__DIRECT.txt
copy to data/region/ms_MY.txt
index fd5973f..c926ea92 100644
--- a/data/coll/hi__DIRECT.txt
+++ b/data/region/ms_MY.txt
@@ -1,13 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
-hi__DIRECT{
- collations{
- default{"direct"}
- }
+ms_MY{
+ "%%ALIAS"{"ms_Latn_MY"}
}
diff --git a/data/coll/hi__DIRECT.txt b/data/region/ms_SG.txt
similarity index 73%
copy from data/coll/hi__DIRECT.txt
copy to data/region/ms_SG.txt
index fd5973f..841c737 100644
--- a/data/coll/hi__DIRECT.txt
+++ b/data/region/ms_SG.txt
@@ -1,13 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
-hi__DIRECT{
- collations{
- default{"direct"}
- }
+ms_SG{
+ "%%ALIAS"{"ms_Latn_SG"}
}
diff --git a/data/region/mt.txt b/data/region/mt.txt
index 67a7ef3..519ab2e 100644
--- a/data/region/mt.txt
+++ b/data/region/mt.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mt.xml
// *
@@ -282,5 +282,5 @@
ZW{"Żimbabwe"}
ZZ{"Reġjun Mhux Magħruf jew Mhux Validu"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/mua.txt b/data/region/mua.txt
index 5c6a9bd..3fc6b8a 100755
--- a/data/region/mua.txt
+++ b/data/region/mua.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mua.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambiya"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/my.txt b/data/region/my.txt
index 582ce1d..347cfc9 100644
--- a/data/region/my.txt
+++ b/data/region/my.txt
@@ -219,5 +219,5 @@
ZW{"ဇင်ဘာဘွေ"}
ZZ{"မသိ သို့မဟုတ် မရှိ သော နေရာ"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/naq.txt b/data/region/naq.txt
index 258b815..25729e1 100755
--- a/data/region/naq.txt
+++ b/data/region/naq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/naq.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambiab"}
ZW{"Zimbabweb"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/nb.txt b/data/region/nb.txt
index 8973cab..25d6b43 100644
--- a/data/region/nb.txt
+++ b/data/region/nb.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis og Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Jemen"}
YT{"Mayotte"}
ZA{"Sør-Afrika"}
@@ -301,5 +302,5 @@
ZW{"Zimbabwe"}
ZZ{"ukjent område"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
}
diff --git a/data/region/nb_NO.txt b/data/region/nb_NO.txt
index a1437d3..db840a9 100644
--- a/data/region/nb_NO.txt
+++ b/data/region/nb_NO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/nd.txt b/data/region/nd.txt
index ef78c2e..6b57a9b 100755
--- a/data/region/nd.txt
+++ b/data/region/nd.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nd.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambiya"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ne.txt b/data/region/ne.txt
index 86c295d..31b50fb 100644
--- a/data/region/ne.txt
+++ b/data/region/ne.txt
@@ -294,6 +294,7 @@
VU{"भानुआतु"}
WF{"वालिस र फुटुना"}
WS{"सामोआ"}
+ XK{"कोसोवो"}
YE{"येमेन"}
YT{"मायोट्ट"}
ZA{"दक्षिण अफ्रिका"}
@@ -301,5 +302,5 @@
ZW{"जिम्बाबे"}
ZZ{"अपरिचित क्षेत्र"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/nl.txt b/data/region/nl.txt
index d961ea7..b4c671a 100644
--- a/data/region/nl.txt
+++ b/data/region/nl.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis en Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Jemen"}
YT{"Mayotte"}
ZA{"Zuid-Afrika"}
@@ -301,5 +302,5 @@
ZW{"Zimbabwe"}
ZZ{"Onbekend gebied"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/nl_BE.txt b/data/region/nl_BE.txt
index 35d0e59..0b20fa6 100644
--- a/data/region/nl_BE.txt
+++ b/data/region/nl_BE.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nl_BE.xml
// *
@@ -10,5 +10,5 @@
Countries{
IM{"Het Eiland Man"}
}
- Version{"2.0.77.28"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/nmg.txt b/data/region/nmg.txt
index 4bb1dd4..9a9d815 100755
--- a/data/region/nmg.txt
+++ b/data/region/nmg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nmg.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambia"}
ZW{"Zimbabwǝ"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/nn.txt b/data/region/nn.txt
index 33067b3..7aeb23e 100644
--- a/data/region/nn.txt
+++ b/data/region/nn.txt
@@ -297,5 +297,5 @@
ZW{"Zimbabwe"}
ZZ{"ukjent område"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
}
diff --git a/data/region/nn_NO.txt b/data/region/nn_NO.txt
index e8050a8..e297007 100644
--- a/data/region/nn_NO.txt
+++ b/data/region/nn_NO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/no.txt b/data/region/no.txt
index 49a17b2..6dc26b5 100644
--- a/data/region/no.txt
+++ b/data/region/no.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/no_NO.txt b/data/region/no_NO.txt
index 4b958f6..408deef 100644
--- a/data/region/no_NO.txt
+++ b/data/region/no_NO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/no_NO_NY.txt b/data/region/no_NO_NY.txt
index 61d8107..38940c7c 100644
--- a/data/region/no_NO_NY.txt
+++ b/data/region/no_NO_NY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/nus.txt b/data/region/nus.txt
index 94f9eb1..ffc5bb4 100755
--- a/data/region/nus.txt
+++ b/data/region/nus.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nus.xml
// *
@@ -63,5 +63,5 @@
TD{"Ca̱d"}
VG{"Burutic dhuɔ̱ɔ̱l be̱rgin"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/nyn.txt b/data/region/nyn.txt
index fcb1761..07fe48b 100755
--- a/data/region/nyn.txt
+++ b/data/region/nyn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nyn.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/om.txt b/data/region/om.txt
index e3ee15c..4c2c2d8 100644
--- a/data/region/om.txt
+++ b/data/region/om.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/om.xml
// *
@@ -24,5 +24,5 @@
RU{"Russia"}
US{"United States"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/or.txt b/data/region/or.txt
index 24caeeb..379762b 100644
--- a/data/region/or.txt
+++ b/data/region/or.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/or.xml
// *
@@ -291,5 +291,5 @@
ZW{"ଜିମ୍ବାୱେ"}
ZZ{"ଅଜଣା କିମ୍ବା ଅବୈଧ ପ୍ରଦେଶ"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/pa.txt b/data/region/pa.txt
index 1d778d5..3664c8d 100644
--- a/data/region/pa.txt
+++ b/data/region/pa.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pa.xml
// *
@@ -13,5 +13,5 @@
Countries{
IN{"ਭਾਰਤ"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/pa_Arab.txt b/data/region/pa_Arab.txt
index dab4835..bd92457 100644
--- a/data/region/pa_Arab.txt
+++ b/data/region/pa_Arab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pa_Arab.xml
// *
@@ -13,5 +13,5 @@
Countries{
PK{"پکستان"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/pa_Arab_PK.txt b/data/region/pa_Arab_PK.txt
index a535601..d07b5c6 100644
--- a/data/region/pa_Arab_PK.txt
+++ b/data/region/pa_Arab_PK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/pa_Guru.txt b/data/region/pa_Guru.txt
index e2feb97..0562443 100644
--- a/data/region/pa_Guru.txt
+++ b/data/region/pa_Guru.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pa_Guru.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/pa_Guru.xml
*/
pa_Guru{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/pa_Guru_IN.txt b/data/region/pa_Guru_IN.txt
index 69fdff4..7f5e984 100644
--- a/data/region/pa_Guru_IN.txt
+++ b/data/region/pa_Guru_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/pa_IN.txt b/data/region/pa_IN.txt
index f8f230a..8a52933 100644
--- a/data/region/pa_IN.txt
+++ b/data/region/pa_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/pa_PK.txt b/data/region/pa_PK.txt
index 22fb56e..8478504 100644
--- a/data/region/pa_PK.txt
+++ b/data/region/pa_PK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/pl.txt b/data/region/pl.txt
index 3277b95..ac66560 100644
--- a/data/region/pl.txt
+++ b/data/region/pl.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis i Futuna"}
WS{"Samoa"}
+ XK{"Kosowo"}
YE{"Jemen"}
YT{"Majotta"}
ZA{"Republika Południowej Afryki"}
@@ -301,5 +302,5 @@
ZW{"Zimbabwe"}
ZZ{"Nieznany region"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/pool.res b/data/region/pool.res
index e7797a0..bf2ce0f 100644
--- a/data/region/pool.res
+++ b/data/region/pool.res
Binary files differ
diff --git a/data/region/ps.txt b/data/region/ps.txt
index 734a9ce..9e3a1c0 100644
--- a/data/region/ps.txt
+++ b/data/region/ps.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ps.xml
// *
@@ -75,5 +75,5 @@
UY{"یوروګوای"}
YE{"یمن"}
}
- Version{"2.0.75.94"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/pt.txt b/data/region/pt.txt
index 153cf35..310568f 100644
--- a/data/region/pt.txt
+++ b/data/region/pt.txt
@@ -292,6 +292,7 @@
VU{"Vanuatu"}
WF{"Wallis e Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Iêmen"}
YT{"Mayotte"}
ZA{"África do Sul"}
@@ -299,5 +300,5 @@
ZW{"Zimbábue"}
ZZ{"Região desconhecida"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
}
diff --git a/data/region/pt_PT.txt b/data/region/pt_PT.txt
index b7a36ff..cb1e5a4 100644
--- a/data/region/pt_PT.txt
+++ b/data/region/pt_PT.txt
@@ -69,5 +69,5 @@
ZW{"Zimbabué"}
ZZ{"Região desconhecida ou inválida"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.51"}
}
diff --git a/data/region/resfiles.mk b/data/region/resfiles.mk
index 84f45f8..3056041 100644
--- a/data/region/resfiles.mk
+++ b/data/region/resfiles.mk
@@ -1,6 +1,6 @@
-# * Copyright (C) 1998-2012, International Business Machines
+# * Copyright (C) 1998-2013, International Business Machines
# * Corporation and others. All Rights Reserved.
-REGION_CLDR_VERSION = 22.1.1
+REGION_CLDR_VERSION = 23
# A list of txt's to build
# Note:
#
@@ -31,17 +31,19 @@
ha_GH.txt ha_Latn_GH.txt ha_Latn_NE.txt ha_Latn_NG.txt ha_NE.txt\
ha_NG.txt he_IL.txt id_ID.txt in.txt in_ID.txt\
iw.txt iw_IL.txt ja_JP.txt ja_JP_TRADITIONAL.txt kk_Cyrl_KZ.txt\
- kk_KZ.txt ks_Arab_IN.txt ks_IN.txt mo.txt nb_NO.txt\
- nn_NO.txt no.txt no_NO.txt no_NO_NY.txt pa_Arab_PK.txt\
- pa_Guru_IN.txt pa_IN.txt pa_PK.txt ro_MD.txt sh.txt\
- sh_BA.txt sh_CS.txt sh_YU.txt shi_Latn_MA.txt shi_MA.txt\
- sr_BA.txt sr_CS.txt sr_Cyrl_BA.txt sr_Cyrl_CS.txt sr_Cyrl_RS.txt\
- sr_Cyrl_YU.txt sr_Latn_BA.txt sr_Latn_CS.txt sr_Latn_ME.txt sr_Latn_RS.txt\
- sr_Latn_YU.txt sr_ME.txt sr_RS.txt sr_YU.txt th_TH.txt\
- th_TH_TRADITIONAL.txt tl.txt tl_PH.txt tzm_Latn_MA.txt tzm_MA.txt\
- uz_AF.txt uz_Arab_AF.txt uz_Cyrl_UZ.txt uz_UZ.txt vai_LR.txt\
- vai_Vaii_LR.txt zh_CN.txt zh_HK.txt zh_Hans_CN.txt zh_Hant_MO.txt\
- zh_Hant_TW.txt zh_MO.txt zh_SG.txt zh_TW.txt
+ kk_KZ.txt ks_Arab_IN.txt ks_IN.txt mn_Cyrl_MN.txt mn_MN.txt\
+ mo.txt ms_BN.txt ms_Latn_BN.txt ms_Latn_MY.txt ms_Latn_SG.txt\
+ ms_MY.txt ms_SG.txt nb_NO.txt nn_NO.txt no.txt\
+ no_NO.txt no_NO_NY.txt pa_Arab_PK.txt pa_Guru_IN.txt pa_IN.txt\
+ pa_PK.txt ro_MD.txt sh.txt sh_BA.txt sh_CS.txt\
+ sh_YU.txt shi_MA.txt shi_Tfng_MA.txt sr_BA.txt sr_CS.txt\
+ sr_Cyrl_BA.txt sr_Cyrl_CS.txt sr_Cyrl_RS.txt sr_Cyrl_YU.txt sr_Latn_BA.txt\
+ sr_Latn_CS.txt sr_Latn_ME.txt sr_Latn_RS.txt sr_Latn_YU.txt sr_ME.txt\
+ sr_RS.txt sr_YU.txt th_TH.txt th_TH_TRADITIONAL.txt tl.txt\
+ tl_PH.txt tzm_Latn_MA.txt tzm_MA.txt uz_AF.txt uz_Arab_AF.txt\
+ uz_Cyrl_UZ.txt uz_UZ.txt vai_LR.txt vai_Vaii_LR.txt zh_CN.txt\
+ zh_HK.txt zh_Hans_CN.txt zh_Hant_MO.txt zh_Hant_TW.txt zh_MO.txt\
+ zh_SG.txt zh_TW.txt
# All aliases (to not be included under 'installed'), but not including root.
@@ -72,22 +74,22 @@
lag.txt lg.txt ln.txt lo.txt lt.txt\
lu.txt luo.txt luy.txt lv.txt mas.txt\
mer.txt mfe.txt mg.txt mgh.txt mgo.txt\
- mk.txt ml.txt mr.txt ms.txt mt.txt\
- mua.txt my.txt naq.txt nb.txt nd.txt\
- ne.txt nl.txt nl_BE.txt nmg.txt nn.txt\
- nus.txt nyn.txt om.txt or.txt pa.txt\
- pa_Arab.txt pa_Guru.txt pl.txt ps.txt pt.txt\
- pt_PT.txt rm.txt rn.txt ro.txt rof.txt\
- ru.txt rw.txt rwk.txt saq.txt sbp.txt\
- seh.txt ses.txt sg.txt shi.txt shi_Latn.txt\
- shi_Tfng.txt si.txt sk.txt sl.txt sn.txt\
- so.txt sq.txt sr.txt sr_Cyrl.txt sr_Latn.txt\
- sv.txt sv_FI.txt sw.txt swc.txt ta.txt\
- te.txt teo.txt th.txt ti.txt to.txt\
- tr.txt twq.txt tzm.txt tzm_Latn.txt uk.txt\
- ur.txt uz.txt uz_Arab.txt uz_Cyrl.txt uz_Latn.txt\
- vai.txt vai_Latn.txt vai_Vaii.txt vi.txt vun.txt\
- xog.txt yav.txt yo.txt zh.txt zh_Hans.txt\
- zh_Hans_HK.txt zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt zh_Hant_HK.txt\
- zu.txt
+ mk.txt ml.txt mn.txt mn_Cyrl.txt mr.txt\
+ ms.txt ms_Latn.txt mt.txt mua.txt my.txt\
+ naq.txt nb.txt nd.txt ne.txt nl.txt\
+ nl_BE.txt nmg.txt nn.txt nus.txt nyn.txt\
+ om.txt or.txt pa.txt pa_Arab.txt pa_Guru.txt\
+ pl.txt ps.txt pt.txt pt_PT.txt rm.txt\
+ rn.txt ro.txt rof.txt ru.txt rw.txt\
+ rwk.txt saq.txt sbp.txt seh.txt ses.txt\
+ sg.txt shi.txt shi_Latn.txt shi_Tfng.txt si.txt\
+ sk.txt sl.txt sn.txt so.txt sq.txt\
+ sr.txt sr_Cyrl.txt sr_Latn.txt sv.txt sv_FI.txt\
+ sw.txt swc.txt ta.txt te.txt teo.txt\
+ th.txt ti.txt to.txt tr.txt twq.txt\
+ tzm.txt tzm_Latn.txt uk.txt ur.txt uz.txt\
+ uz_Arab.txt uz_Cyrl.txt uz_Latn.txt vai.txt vai_Latn.txt\
+ vai_Vaii.txt vi.txt vun.txt xog.txt yav.txt\
+ yo.txt zh.txt zh_Hans.txt zh_Hans_HK.txt zh_Hans_MO.txt\
+ zh_Hans_SG.txt zh_Hant.txt zh_Hant_HK.txt zu.txt
diff --git a/data/region/rm.txt b/data/region/rm.txt
index 74f1c7e..11cd955 100755
--- a/data/region/rm.txt
+++ b/data/region/rm.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rm.xml
// *
@@ -290,5 +290,5 @@
ZW{"Simbabwe"}
ZZ{"Regiun betg encouschenta u nunvalaivla"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/rn.txt b/data/region/rn.txt
index 7e30a72..aadd98d 100755
--- a/data/region/rn.txt
+++ b/data/region/rn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rn.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambiya"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ro.txt b/data/region/ro.txt
index 8fb28ac..1940456 100644
--- a/data/region/ro.txt
+++ b/data/region/ro.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis și Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Yemen"}
YT{"Mayotte"}
ZA{"Africa de Sud"}
@@ -301,5 +302,5 @@
ZW{"Zimbabwe"}
ZZ{"Regiune necunoscută"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ro_MD.txt b/data/region/ro_MD.txt
index eed93a7..cb90da0 100755
--- a/data/region/ro_MD.txt
+++ b/data/region/ro_MD.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/rof.txt b/data/region/rof.txt
index 6f9c7fb..4a3af8e 100755
--- a/data/region/rof.txt
+++ b/data/region/rof.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rof.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/root.txt b/data/region/root.txt
index f54d5c7..c42c358 100644
--- a/data/region/root.txt
+++ b/data/region/root.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/root.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/root.xml
*/
root{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ru.txt b/data/region/ru.txt
index 36738db..b08f683 100644
--- a/data/region/ru.txt
+++ b/data/region/ru.txt
@@ -301,5 +301,5 @@
ZW{"Зимбабве"}
ZZ{"Неизвестный регион"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/rw.txt b/data/region/rw.txt
index c5df2f5..c9ceb5a 100755
--- a/data/region/rw.txt
+++ b/data/region/rw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rw.xml
// *
@@ -14,5 +14,5 @@
RW{"Rwanda"}
TO{"Igitonga"}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/rwk.txt b/data/region/rwk.txt
index 09a7a51..0862905 100755
--- a/data/region/rwk.txt
+++ b/data/region/rwk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rwk.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/saq.txt b/data/region/saq.txt
index 81ab9af..fb6c14c 100755
--- a/data/region/saq.txt
+++ b/data/region/saq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/saq.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/sbp.txt b/data/region/sbp.txt
index fb763ef..953be35 100755
--- a/data/region/sbp.txt
+++ b/data/region/sbp.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sbp.xml
// *
@@ -237,5 +237,5 @@
ZM{"Sambiya"}
ZW{"Simbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/seh.txt b/data/region/seh.txt
index d5698b9..5be6ea6 100755
--- a/data/region/seh.txt
+++ b/data/region/seh.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/seh.xml
// *
@@ -236,5 +236,5 @@
ZM{"Zâmbia"}
ZW{"Zimbábue"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ses.txt b/data/region/ses.txt
index c2f45ed..968a1ef 100755
--- a/data/region/ses.txt
+++ b/data/region/ses.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ses.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambi"}
ZW{"Zimbabwe"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/sg.txt b/data/region/sg.txt
index 3e69421..063c5fc 100755
--- a/data/region/sg.txt
+++ b/data/region/sg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sg.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambïi"}
ZW{"Zimbäbwe"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/sh.txt b/data/region/sh.txt
index 3f0a236..1433f43 100644
--- a/data/region/sh.txt
+++ b/data/region/sh.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/sh_BA.txt b/data/region/sh_BA.txt
index af5634f..82a1a16 100644
--- a/data/region/sh_BA.txt
+++ b/data/region/sh_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/sh_CS.txt b/data/region/sh_CS.txt
index 2adfb4a..8967fc8 100644
--- a/data/region/sh_CS.txt
+++ b/data/region/sh_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/sh_YU.txt b/data/region/sh_YU.txt
index 516cdf3..85f7ad6 100644
--- a/data/region/sh_YU.txt
+++ b/data/region/sh_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/shi.txt b/data/region/shi.txt
index 1fc265b..dfce03a 100755
--- a/data/region/shi.txt
+++ b/data/region/shi.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/shi.xml
// *
@@ -237,5 +237,5 @@
ZM{"ⵣⴰⵎⴱⵢⴰ"}
ZW{"ⵣⵉⵎⴱⴰⴱⵡⵉ"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/shi_Latn.txt b/data/region/shi_Latn.txt
index 76fdfdf..dba3eb0 100755
--- a/data/region/shi_Latn.txt
+++ b/data/region/shi_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/shi_Latn.xml
// *
@@ -237,5 +237,5 @@
ZM{"zambya"}
ZW{"zimbabwi"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/shi_MA.txt b/data/region/shi_MA.txt
index 91d13a9..084cfbe 100755
--- a/data/region/shi_MA.txt
+++ b/data/region/shi_MA.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
shi_MA{
- "%%ALIAS"{"shi_Latn_MA"}
+ "%%ALIAS"{"shi_Tfng_MA"}
}
diff --git a/data/region/shi_Tfng.txt b/data/region/shi_Tfng.txt
index 12bcee9..49f4299 100755
--- a/data/region/shi_Tfng.txt
+++ b/data/region/shi_Tfng.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/shi_Tfng.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/shi_Tfng.xml
*/
shi_Tfng{
- Version{"2.0.75.56"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/shi_Latn_MA.txt b/data/region/shi_Tfng_MA.txt
similarity index 86%
copy from data/region/shi_Latn_MA.txt
copy to data/region/shi_Tfng_MA.txt
index cd7fd64..0573400 100755
--- a/data/region/shi_Latn_MA.txt
+++ b/data/region/shi_Tfng_MA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* generated alias target
*/
-shi_Latn_MA{
+shi_Tfng_MA{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/region/si.txt b/data/region/si.txt
index 0f964c8..ad178e4 100644
--- a/data/region/si.txt
+++ b/data/region/si.txt
@@ -294,6 +294,7 @@
VU{"වනුවාටු"}
WF{"වැලිස් සහ ෆුටුනා"}
WS{"සැමෝවා"}
+ XK{"කොසෝවෝ"}
YE{"යේමනය"}
YT{"මයෝටි"}
ZA{"දකුණු අප්රිකාව"}
@@ -301,5 +302,5 @@
ZW{"සිම්බාබ්වේ"}
ZZ{"හඳුනා නොගත් කළාපය"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/sk.txt b/data/region/sk.txt
index de801e1..2b46060 100644
--- a/data/region/sk.txt
+++ b/data/region/sk.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis a Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Jemen"}
YT{"Mayotte"}
ZA{"Južná Afrika"}
@@ -301,5 +302,5 @@
ZW{"Zimbabwe"}
ZZ{"Neznámy región"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/sl.txt b/data/region/sl.txt
index a880943..375c5ce 100644
--- a/data/region/sl.txt
+++ b/data/region/sl.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis in Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Jemen"}
YT{"Mayotte"}
ZA{"Južnoafriška republika"}
@@ -301,5 +302,5 @@
ZW{"Zimbabve"}
ZZ{"Neznano ali neveljavno območje"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/sn.txt b/data/region/sn.txt
index 5acb32b..fd450cd 100755
--- a/data/region/sn.txt
+++ b/data/region/sn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sn.xml
// *
@@ -236,5 +236,5 @@
ZM{"Zambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/so.txt b/data/region/so.txt
index e156cc5..a2c1cbc 100644
--- a/data/region/so.txt
+++ b/data/region/so.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/so.xml
// *
@@ -238,5 +238,5 @@
ZW{"Simbaabwe"}
ZZ{"Far aan la aqoon amase aan saxnayn"}
}
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/sq.txt b/data/region/sq.txt
index 230f5fa..cc2b0e5 100644
--- a/data/region/sq.txt
+++ b/data/region/sq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sq.xml
// *
@@ -162,11 +162,12 @@
VA{"Vatikan"}
VC{"Saint Vincent e Grenadinet"}
VE{"Venezuelë"}
+ XK{"Kosovë"}
YE{"Jemen"}
ZA{"Afrika e Jugut"}
ZM{"Zambi"}
ZW{"Zimbabve"}
ZZ{"Rajon i panjohur"}
}
- Version{"2.0.77.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/sr.txt b/data/region/sr.txt
index 6502eb7..83a3ed0 100644
--- a/data/region/sr.txt
+++ b/data/region/sr.txt
@@ -294,6 +294,7 @@
VU{"Вануату"}
WF{"Валис и Футуна Острва"}
WS{"Самоа"}
+ XK{"Косово"}
YE{"Јемен"}
YT{"Мајоте"}
ZA{"Јужноафричка Република"}
@@ -301,5 +302,5 @@
ZW{"Зимбабве"}
ZZ{"Непозната или неважећа област"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.47"}
}
diff --git a/data/region/sr_BA.txt b/data/region/sr_BA.txt
index bad5005..9754916 100644
--- a/data/region/sr_BA.txt
+++ b/data/region/sr_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/sr_CS.txt b/data/region/sr_CS.txt
index b6ee46c..23bc131 100644
--- a/data/region/sr_CS.txt
+++ b/data/region/sr_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/sr_Cyrl.txt b/data/region/sr_Cyrl.txt
index 426675a..4d109a8 100644
--- a/data/region/sr_Cyrl.txt
+++ b/data/region/sr_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr_Cyrl.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/sr_Cyrl.xml
*/
sr_Cyrl{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/sr_Cyrl_BA.txt b/data/region/sr_Cyrl_BA.txt
index 6db5bfa..34df035 100644
--- a/data/region/sr_Cyrl_BA.txt
+++ b/data/region/sr_Cyrl_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/sr_Cyrl_CS.txt b/data/region/sr_Cyrl_CS.txt
index 99b0d57..54c3633 100644
--- a/data/region/sr_Cyrl_CS.txt
+++ b/data/region/sr_Cyrl_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/sr_Cyrl_RS.txt b/data/region/sr_Cyrl_RS.txt
index 5475cea..dfb1855 100644
--- a/data/region/sr_Cyrl_RS.txt
+++ b/data/region/sr_Cyrl_RS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/sr_Cyrl_YU.txt b/data/region/sr_Cyrl_YU.txt
index 088b496..608f5f9 100644
--- a/data/region/sr_Cyrl_YU.txt
+++ b/data/region/sr_Cyrl_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/sr_Latn.txt b/data/region/sr_Latn.txt
index ceb4c2a..e9e0885 100644
--- a/data/region/sr_Latn.txt
+++ b/data/region/sr_Latn.txt
@@ -301,5 +301,5 @@
ZW{"Zimbabve"}
ZZ{"Nepoznata ili nevažeća oblast"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.51"}
}
diff --git a/data/region/sr_Latn_BA.txt b/data/region/sr_Latn_BA.txt
index cb015a6..1a5f126 100644
--- a/data/region/sr_Latn_BA.txt
+++ b/data/region/sr_Latn_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/sr_Latn_CS.txt b/data/region/sr_Latn_CS.txt
index f80a8a8..9df1eb2 100644
--- a/data/region/sr_Latn_CS.txt
+++ b/data/region/sr_Latn_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/sr_Latn_ME.txt b/data/region/sr_Latn_ME.txt
index fefdf54..700e1cb 100755
--- a/data/region/sr_Latn_ME.txt
+++ b/data/region/sr_Latn_ME.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/sr_Latn_RS.txt b/data/region/sr_Latn_RS.txt
index 418f50c..4e4b742 100644
--- a/data/region/sr_Latn_RS.txt
+++ b/data/region/sr_Latn_RS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/sr_Latn_YU.txt b/data/region/sr_Latn_YU.txt
index 56911ca..9451580 100644
--- a/data/region/sr_Latn_YU.txt
+++ b/data/region/sr_Latn_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/sr_ME.txt b/data/region/sr_ME.txt
index 76ef7f7..8535ec0 100644
--- a/data/region/sr_ME.txt
+++ b/data/region/sr_ME.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/sr_RS.txt b/data/region/sr_RS.txt
index d9c7dc2..2fba029 100644
--- a/data/region/sr_RS.txt
+++ b/data/region/sr_RS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/sr_YU.txt b/data/region/sr_YU.txt
index 9bb7c27..e3b8f74 100644
--- a/data/region/sr_YU.txt
+++ b/data/region/sr_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/sv.txt b/data/region/sv.txt
index 47cd30e..4e8ebb4 100644
--- a/data/region/sv.txt
+++ b/data/region/sv.txt
@@ -293,6 +293,7 @@
VU{"Vanuatu"}
WF{"Wallis- och Futunaöarna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Jemen"}
YT{"Mayotte"}
ZA{"Sydafrika"}
@@ -300,5 +301,5 @@
ZW{"Zimbabwe"}
ZZ{"okänd region"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
}
diff --git a/data/region/sv_FI.txt b/data/region/sv_FI.txt
index 63aaee2..1ec894e 100755
--- a/data/region/sv_FI.txt
+++ b/data/region/sv_FI.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sv_FI.xml
// *
@@ -12,5 +12,5 @@
MF{"S:t Martin (franska delen)"}
SD{"Nordsudan"}
}
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/sw.txt b/data/region/sw.txt
index 0bc8960..5713035 100644
--- a/data/region/sw.txt
+++ b/data/region/sw.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Walis na Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Yemeni"}
YT{"Mayotte"}
ZA{"Afrika Kusini"}
@@ -301,5 +302,5 @@
ZW{"Zimbabwe"}
ZZ{"Eneo lisilojulikana"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/swc.txt b/data/region/swc.txt
index 9315c25..4b0cbd7 100755
--- a/data/region/swc.txt
+++ b/data/region/swc.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/swc.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ta.txt b/data/region/ta.txt
index 6b84c56..581eac7 100644
--- a/data/region/ta.txt
+++ b/data/region/ta.txt
@@ -294,6 +294,7 @@
VU{"வனுவாட்டு"}
WF{"வாலிஸ் மற்றும் ஃபுடுனா தீவுகள்"}
WS{"சமோவா"}
+ XK{"கொசோவோ"}
YE{"ஏமன்"}
YT{"மயோத்"}
ZA{"தென் ஆப்பிரிக்கா"}
@@ -301,5 +302,5 @@
ZW{"ஜிம்பாப்வே"}
ZZ{"அறியப்படாத பிரதேசம்"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/te.txt b/data/region/te.txt
index 812b155..7501253 100644
--- a/data/region/te.txt
+++ b/data/region/te.txt
@@ -294,6 +294,7 @@
VU{"వనౌటు"}
WF{"వాలిస్ మరియు ఫ్యుత్యునా"}
WS{"సమోవా"}
+ XK{"కొసోవో"}
YE{"యెమెన్"}
YT{"మాయొట్టి"}
ZA{"దక్షిణ ఆఫ్రికా రాజ్యం"}
@@ -301,5 +302,5 @@
ZW{"జింబాబ్వే"}
ZZ{"తెలియని లేదా చెల్లని ప్రాంతం"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/teo.txt b/data/region/teo.txt
index 3798329..58901d8 100755
--- a/data/region/teo.txt
+++ b/data/region/teo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/teo.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/th.txt b/data/region/th.txt
index 71165e2..0db1a10 100644
--- a/data/region/th.txt
+++ b/data/region/th.txt
@@ -294,6 +294,7 @@
VU{"วานูอาตู"}
WF{"วาลลิสและฟุตูนา"}
WS{"ซามัว"}
+ XK{"โคโซโว"}
YE{"เยเมน"}
YT{"มายอต"}
ZA{"แอฟริกาใต้"}
@@ -301,5 +302,5 @@
ZW{"ซิมบับเว"}
ZZ{"ไม่ทราบภูมิภาค"}
}
- Version{"2.0.79.79"}
+ Version{"2.0.82.57"}
}
diff --git a/data/region/th_TH.txt b/data/region/th_TH.txt
index 94c4a72..9820811 100644
--- a/data/region/th_TH.txt
+++ b/data/region/th_TH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/th_TH_TRADITIONAL.txt b/data/region/th_TH_TRADITIONAL.txt
index 9a5620e..37548cf 100644
--- a/data/region/th_TH_TRADITIONAL.txt
+++ b/data/region/th_TH_TRADITIONAL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/ti.txt b/data/region/ti.txt
index 96bdbbc..2e8f8c2 100644
--- a/data/region/ti.txt
+++ b/data/region/ti.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ti.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/ti.xml
*/
ti{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/tl.txt b/data/region/tl.txt
index 2a55f9a..85b090c 100755
--- a/data/region/tl.txt
+++ b/data/region/tl.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/tl_PH.txt b/data/region/tl_PH.txt
index 52f1969..c788c54 100755
--- a/data/region/tl_PH.txt
+++ b/data/region/tl_PH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/to.txt b/data/region/to.txt
index 68b14f4..f235c32 100755
--- a/data/region/to.txt
+++ b/data/region/to.txt
@@ -297,5 +297,5 @@
ZW{"Simipapuei"}
ZZ{"Potu fonua taʻeʻiloa pe hala"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
}
diff --git a/data/region/tr.txt b/data/region/tr.txt
index 8d55a0a..46146d1 100644
--- a/data/region/tr.txt
+++ b/data/region/tr.txt
@@ -294,6 +294,7 @@
VU{"Vanuatu"}
WF{"Wallis ve Futuna Adaları"}
WS{"Samoa"}
+ XK{"Kosova"}
YE{"Yemen"}
YT{"Mayotte"}
ZA{"Güney Afrika"}
@@ -301,5 +302,5 @@
ZW{"Zimbabve"}
ZZ{"Bilinmeyen Bölge"}
}
- Version{"2.0.79.79"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/twq.txt b/data/region/twq.txt
index c972d92..4d7400d 100755
--- a/data/region/twq.txt
+++ b/data/region/twq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/twq.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambi"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/tzm.txt b/data/region/tzm.txt
index 91795d1..0d51fbf 100755
--- a/data/region/tzm.txt
+++ b/data/region/tzm.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/tzm.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambya"}
ZW{"Zimbabwi"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/tzm_Latn.txt b/data/region/tzm_Latn.txt
index 0bbb4b4..72fe963 100755
--- a/data/region/tzm_Latn.txt
+++ b/data/region/tzm_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/tzm_Latn.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/tzm_Latn.xml
*/
tzm_Latn{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/tzm_Latn_MA.txt b/data/region/tzm_Latn_MA.txt
index 271f885..6465f27 100755
--- a/data/region/tzm_Latn_MA.txt
+++ b/data/region/tzm_Latn_MA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/tzm_MA.txt b/data/region/tzm_MA.txt
index ebd194c..ee6f521 100755
--- a/data/region/tzm_MA.txt
+++ b/data/region/tzm_MA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/uk.txt b/data/region/uk.txt
index fc45216..683b27a 100644
--- a/data/region/uk.txt
+++ b/data/region/uk.txt
@@ -293,6 +293,7 @@
VU{"Вануату"}
WF{"Уолліс і Футуна"}
WS{"Самоа"}
+ XK{"Косово"}
YE{"Ємен"}
YT{"Майот"}
ZA{"ПАР"}
@@ -300,5 +301,5 @@
ZW{"Зімбабве"}
ZZ{"Невідомий регіон"}
}
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/ur.txt b/data/region/ur.txt
index 9868326..1e70eac 100644
--- a/data/region/ur.txt
+++ b/data/region/ur.txt
@@ -294,6 +294,7 @@
VU{"وینوآٹو"}
WF{"ویلیز اور فیوٹیونا"}
WS{"ساموآ"}
+ XK{"کوسووو"}
YE{"یمن"}
YT{"مایوٹ"}
ZA{"جنوبی افریقہ"}
@@ -301,5 +302,5 @@
ZW{"زمبابوے"}
ZZ{"نامعلوم علاقہ"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/uz.txt b/data/region/uz.txt
index 27a500d..f855ee3 100644
--- a/data/region/uz.txt
+++ b/data/region/uz.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz.xml
// *
@@ -13,5 +13,5 @@
Countries{
UZ{"Ўзбекистон"}
}
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/uz_AF.txt b/data/region/uz_AF.txt
index 0010d89..5996fc9 100644
--- a/data/region/uz_AF.txt
+++ b/data/region/uz_AF.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/uz_Arab.txt b/data/region/uz_Arab.txt
index 1641268..c4c2673 100644
--- a/data/region/uz_Arab.txt
+++ b/data/region/uz_Arab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz_Arab.xml
// *
@@ -13,5 +13,5 @@
Countries{
AF{"افغانستان"}
}
- Version{"2.0.76.36"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/uz_Arab_AF.txt b/data/region/uz_Arab_AF.txt
index 972b280..9e5d31f 100644
--- a/data/region/uz_Arab_AF.txt
+++ b/data/region/uz_Arab_AF.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/uz_Cyrl.txt b/data/region/uz_Cyrl.txt
index 4f1cc29..9f16779 100644
--- a/data/region/uz_Cyrl.txt
+++ b/data/region/uz_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz_Cyrl.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/uz_Cyrl.xml
*/
uz_Cyrl{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/uz_Cyrl_UZ.txt b/data/region/uz_Cyrl_UZ.txt
index 0776fef..97d565c 100644
--- a/data/region/uz_Cyrl_UZ.txt
+++ b/data/region/uz_Cyrl_UZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/uz_Latn.txt b/data/region/uz_Latn.txt
index bf30017..5cd039b 100644
--- a/data/region/uz_Latn.txt
+++ b/data/region/uz_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz_Latn.xml
// *
@@ -24,5 +24,5 @@
US{"Qoʻshma Shtatlar"}
UZ{"Oʻzbekiston"}
}
- Version{"2.0.74.98"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/uz_UZ.txt b/data/region/uz_UZ.txt
index a419389..35e0a7f 100644
--- a/data/region/uz_UZ.txt
+++ b/data/region/uz_UZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/vai.txt b/data/region/vai.txt
index 3befc83..20b2f66 100755
--- a/data/region/vai.txt
+++ b/data/region/vai.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vai.xml
// *
@@ -236,5 +236,5 @@
ZM{"ꕤꔭꕩ"}
ZW{"ꔽꕓꖜꔃ"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/vai_LR.txt b/data/region/vai_LR.txt
index 9d1560d..403f4c0 100755
--- a/data/region/vai_LR.txt
+++ b/data/region/vai_LR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/vai_Latn.txt b/data/region/vai_Latn.txt
index e949b45..2458cca 100755
--- a/data/region/vai_Latn.txt
+++ b/data/region/vai_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vai_Latn.xml
// *
@@ -236,5 +236,5 @@
ZM{"Zambiya"}
ZW{"Zimbabhuwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/vai_Vaii.txt b/data/region/vai_Vaii.txt
index a7f9e21..42c6a51 100755
--- a/data/region/vai_Vaii.txt
+++ b/data/region/vai_Vaii.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vai_Vaii.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/vai_Vaii.xml
*/
vai_Vaii{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/vai_Vaii_LR.txt b/data/region/vai_Vaii_LR.txt
index edccde9..dd7fb4c 100755
--- a/data/region/vai_Vaii_LR.txt
+++ b/data/region/vai_Vaii_LR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/vi.txt b/data/region/vi.txt
index d05e7a2..b23b6a0 100644
--- a/data/region/vi.txt
+++ b/data/region/vi.txt
@@ -293,6 +293,7 @@
VU{"Vanuatu"}
WF{"Wallis và Futuna"}
WS{"Samoa"}
+ XK{"Kosovo"}
YE{"Yemen"}
YT{"Mayotte"}
ZA{"Nam Phi"}
@@ -300,5 +301,5 @@
ZW{"Zimbabwe"}
ZZ{"Vùng Chưa biết hoặc không Hợp lệ"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
}
diff --git a/data/region/vun.txt b/data/region/vun.txt
index 66be265..533d8ce 100755
--- a/data/region/vun.txt
+++ b/data/region/vun.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vun.xml
// *
@@ -237,5 +237,5 @@
ZM{"Zambia"}
ZW{"Zimbabwe"}
}
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/xog.txt b/data/region/xog.txt
index b5b37ab..aa14eb8 100755
--- a/data/region/xog.txt
+++ b/data/region/xog.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/xog.xml
// *
@@ -236,5 +236,5 @@
ZM{"Zambya"}
ZW{"Zimbabwe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/yav.txt b/data/region/yav.txt
index c9d7723..12c120e 100755
--- a/data/region/yav.txt
+++ b/data/region/yav.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/yav.xml
// *
@@ -236,5 +236,5 @@
ZM{"saambíi"}
ZW{"simbapuwé"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/yo.txt b/data/region/yo.txt
index 71f1ba7..0731e17 100755
--- a/data/region/yo.txt
+++ b/data/region/yo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/yo.xml
// *
@@ -237,5 +237,5 @@
ZM{"Orílẹ́ède ṣamibia"}
ZW{"Orílẹ́ède ṣimibabe"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/zh.txt b/data/region/zh.txt
index d66faa1..0027ad4 100644
--- a/data/region/zh.txt
+++ b/data/region/zh.txt
@@ -294,6 +294,7 @@
VU{"瓦努阿图"}
WF{"瓦利斯和富图纳"}
WS{"萨摩亚"}
+ XK{"科索沃"}
YE{"也门"}
YT{"马约特"}
ZA{"南非"}
@@ -301,5 +302,5 @@
ZW{"津巴布韦"}
ZZ{"未知地区"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.60"}
}
diff --git a/data/region/zh_CN.txt b/data/region/zh_CN.txt
index 348f06e..28103b9 100644
--- a/data/region/zh_CN.txt
+++ b/data/region/zh_CN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/zh_HK.txt b/data/region/zh_HK.txt
index 8e03c71..67efd92 100644
--- a/data/region/zh_HK.txt
+++ b/data/region/zh_HK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/zh_Hans.txt b/data/region/zh_Hans.txt
index e8cbcd7..1542b90 100644
--- a/data/region/zh_Hans.txt
+++ b/data/region/zh_Hans.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/zh_Hans.xml
*/
zh_Hans{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/zh_Hans_CN.txt b/data/region/zh_Hans_CN.txt
index c4f5185..6e6723b 100644
--- a/data/region/zh_Hans_CN.txt
+++ b/data/region/zh_Hans_CN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/zh_Hans_HK.txt b/data/region/zh_Hans_HK.txt
index c993eef..e324dde 100755
--- a/data/region/zh_Hans_HK.txt
+++ b/data/region/zh_Hans_HK.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans_HK.xml
// *
@@ -13,5 +13,5 @@
ME{"黑山"}
PM{"圣皮埃尔和密克隆"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/zh_Hans_MO.txt b/data/region/zh_Hans_MO.txt
index 558f6a7..efe9748 100755
--- a/data/region/zh_Hans_MO.txt
+++ b/data/region/zh_Hans_MO.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans_MO.xml
// *
@@ -15,5 +15,5 @@
ME{"黑山"}
PM{"圣皮埃尔和密克隆"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/zh_Hans_SG.txt b/data/region/zh_Hans_SG.txt
index 900a830..c0b94a2 100644
--- a/data/region/zh_Hans_SG.txt
+++ b/data/region/zh_Hans_SG.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans_SG.xml
// *
@@ -14,5 +14,5 @@
ME{"黑山"}
PM{"圣皮埃尔和密克隆"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
}
diff --git a/data/region/zh_Hant.txt b/data/region/zh_Hant.txt
index d6c753e..88daa2e 100644
--- a/data/region/zh_Hant.txt
+++ b/data/region/zh_Hant.txt
@@ -293,6 +293,7 @@
VU{"萬那杜"}
WF{"瓦利斯和福杜納群島"}
WS{"薩摩亞群島"}
+ XK{"科索夫"}
YE{"也門"}
YT{"馬約特"}
ZA{"南非"}
@@ -300,5 +301,5 @@
ZW{"津巴布韋"}
ZZ{"未確定的區域"}
}
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
}
diff --git a/data/region/zh_Hant_HK.txt b/data/region/zh_Hant_HK.txt
index 51eb68f..8646594 100644
--- a/data/region/zh_Hant_HK.txt
+++ b/data/region/zh_Hant_HK.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hant_HK.xml
// *
@@ -12,6 +12,7 @@
019{"美洲地區"}
029{"加勒比"}
EA{"瑟塔與梅利拉"}
+ XK{"科索沃"}
}
- Version{"2.0.78.47"}
+ Version{"2.0.82.47"}
}
diff --git a/data/region/zh_Hant_MO.txt b/data/region/zh_Hant_MO.txt
index 686610b..08cadc7 100644
--- a/data/region/zh_Hant_MO.txt
+++ b/data/region/zh_Hant_MO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/zh_Hant_TW.txt b/data/region/zh_Hant_TW.txt
index 659b708..99d5a6f 100644
--- a/data/region/zh_Hant_TW.txt
+++ b/data/region/zh_Hant_TW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/zh_MO.txt b/data/region/zh_MO.txt
index 7a340a7..0492740 100644
--- a/data/region/zh_MO.txt
+++ b/data/region/zh_MO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/zh_SG.txt b/data/region/zh_SG.txt
index e5b7c41..4ebb462 100644
--- a/data/region/zh_SG.txt
+++ b/data/region/zh_SG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/zh_TW.txt b/data/region/zh_TW.txt
index 5957fe3..dc597d3 100644
--- a/data/region/zh_TW.txt
+++ b/data/region/zh_TW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/region/zu.txt b/data/region/zu.txt
index e9bd949..9e3a7d2 100644
--- a/data/region/zu.txt
+++ b/data/region/zu.txt
@@ -294,6 +294,7 @@
VU{"i-Vanuatu"}
WF{"i-Wallis ne-Futuna"}
WS{"i-Samoa"}
+ XK{"I-Kosovo"}
YE{"i-Yemen"}
YT{"i-Mayotte"}
ZA{"iNingizimu Afrika"}
@@ -301,5 +302,5 @@
ZW{"i-Zimbabwe"}
ZZ{"Isifunda esingaziwa"}
}
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/translit/Amharic_Latin_BGN.txt b/data/translit/Amharic_Latin_BGN.txt
index a019bed..6de93c0 100644
--- a/data/translit/Amharic_Latin_BGN.txt
+++ b/data/translit/Amharic_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Any_Accents.txt b/data/translit/Any_Accents.txt
index 99bdd40..4b8f2e1 100644
--- a/data/translit/Any_Accents.txt
+++ b/data/translit/Any_Accents.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Any_Publishing.txt b/data/translit/Any_Publishing.txt
index b5788f6..4f0bc37 100644
--- a/data/translit/Any_Publishing.txt
+++ b/data/translit/Any_Publishing.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Arabic_Latin.txt b/data/translit/Arabic_Latin.txt
index a68c34e..1cf6204 100644
--- a/data/translit/Arabic_Latin.txt
+++ b/data/translit/Arabic_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Arabic_Latin_BGN.txt b/data/translit/Arabic_Latin_BGN.txt
index dbf330c..7fae6a2 100644
--- a/data/translit/Arabic_Latin_BGN.txt
+++ b/data/translit/Arabic_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Armenian_Latin_BGN.txt b/data/translit/Armenian_Latin_BGN.txt
index 2acc4be..dacb36b 100644
--- a/data/translit/Armenian_Latin_BGN.txt
+++ b/data/translit/Armenian_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Azerbaijani_Latin_BGN.txt b/data/translit/Azerbaijani_Latin_BGN.txt
index c91fc32..cf20e23 100644
--- a/data/translit/Azerbaijani_Latin_BGN.txt
+++ b/data/translit/Azerbaijani_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Belarusian_Latin_BGN.txt b/data/translit/Belarusian_Latin_BGN.txt
index 6692c20..b46e59c 100644
--- a/data/translit/Belarusian_Latin_BGN.txt
+++ b/data/translit/Belarusian_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Bengali_Devanagari.txt b/data/translit/Bengali_Devanagari.txt
index 11fb71b..db7162b 100644
--- a/data/translit/Bengali_Devanagari.txt
+++ b/data/translit/Bengali_Devanagari.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Bengali_Gujarati.txt b/data/translit/Bengali_Gujarati.txt
index 39836f6..13a76f8 100644
--- a/data/translit/Bengali_Gujarati.txt
+++ b/data/translit/Bengali_Gujarati.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Bengali_Gurmukhi.txt b/data/translit/Bengali_Gurmukhi.txt
index 86a2ff0..b87f667 100644
--- a/data/translit/Bengali_Gurmukhi.txt
+++ b/data/translit/Bengali_Gurmukhi.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Bengali_InterIndic.txt b/data/translit/Bengali_InterIndic.txt
index 2bd7a80..fdfeaed 100644
--- a/data/translit/Bengali_InterIndic.txt
+++ b/data/translit/Bengali_InterIndic.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Bengali_Kannada.txt b/data/translit/Bengali_Kannada.txt
index 6a6a3e2..437280c 100644
--- a/data/translit/Bengali_Kannada.txt
+++ b/data/translit/Bengali_Kannada.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Bengali_Latin.txt b/data/translit/Bengali_Latin.txt
index 42d844e..3db68e3 100644
--- a/data/translit/Bengali_Latin.txt
+++ b/data/translit/Bengali_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Bengali_Malayalam.txt b/data/translit/Bengali_Malayalam.txt
index d9e9f05..1b0ef58 100644
--- a/data/translit/Bengali_Malayalam.txt
+++ b/data/translit/Bengali_Malayalam.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Bengali_Oriya.txt b/data/translit/Bengali_Oriya.txt
index bb36677..dcd9bb7 100644
--- a/data/translit/Bengali_Oriya.txt
+++ b/data/translit/Bengali_Oriya.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Bengali_Tamil.txt b/data/translit/Bengali_Tamil.txt
index 326dc99..34b6f8d 100644
--- a/data/translit/Bengali_Tamil.txt
+++ b/data/translit/Bengali_Tamil.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Bengali_Telugu.txt b/data/translit/Bengali_Telugu.txt
index 6f6c699..bea8ca2 100644
--- a/data/translit/Bengali_Telugu.txt
+++ b/data/translit/Bengali_Telugu.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Bulgarian_Latin_BGN.txt b/data/translit/Bulgarian_Latin_BGN.txt
index bcfe5b8..ae9baec 100644
--- a/data/translit/Bulgarian_Latin_BGN.txt
+++ b/data/translit/Bulgarian_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Cyrillic_Latin.txt b/data/translit/Cyrillic_Latin.txt
index 05eef02..7428453 100644
--- a/data/translit/Cyrillic_Latin.txt
+++ b/data/translit/Cyrillic_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Devanagari_Bengali.txt b/data/translit/Devanagari_Bengali.txt
index aba6e2c..b9c7d10 100644
--- a/data/translit/Devanagari_Bengali.txt
+++ b/data/translit/Devanagari_Bengali.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Devanagari_Gujarati.txt b/data/translit/Devanagari_Gujarati.txt
index 4642129..1aa9100 100644
--- a/data/translit/Devanagari_Gujarati.txt
+++ b/data/translit/Devanagari_Gujarati.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Devanagari_Gurmukhi.txt b/data/translit/Devanagari_Gurmukhi.txt
index 09d6548..a96d07f 100644
--- a/data/translit/Devanagari_Gurmukhi.txt
+++ b/data/translit/Devanagari_Gurmukhi.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Devanagari_InterIndic.txt b/data/translit/Devanagari_InterIndic.txt
index 0e38385..844ab6e 100644
--- a/data/translit/Devanagari_InterIndic.txt
+++ b/data/translit/Devanagari_InterIndic.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Devanagari_Kannada.txt b/data/translit/Devanagari_Kannada.txt
index e9b6d4d..194eb9b 100644
--- a/data/translit/Devanagari_Kannada.txt
+++ b/data/translit/Devanagari_Kannada.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Devanagari_Latin.txt b/data/translit/Devanagari_Latin.txt
index ca09233..01540a5 100644
--- a/data/translit/Devanagari_Latin.txt
+++ b/data/translit/Devanagari_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Devanagari_Malayalam.txt b/data/translit/Devanagari_Malayalam.txt
index 54cf5a2..57b4fa3 100644
--- a/data/translit/Devanagari_Malayalam.txt
+++ b/data/translit/Devanagari_Malayalam.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Devanagari_Oriya.txt b/data/translit/Devanagari_Oriya.txt
index 51ee158..598457e 100644
--- a/data/translit/Devanagari_Oriya.txt
+++ b/data/translit/Devanagari_Oriya.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Devanagari_Tamil.txt b/data/translit/Devanagari_Tamil.txt
index d3cf852..e995e3b 100644
--- a/data/translit/Devanagari_Tamil.txt
+++ b/data/translit/Devanagari_Tamil.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Devanagari_Telugu.txt b/data/translit/Devanagari_Telugu.txt
index 098db6c..a700239 100644
--- a/data/translit/Devanagari_Telugu.txt
+++ b/data/translit/Devanagari_Telugu.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Fullwidth_Halfwidth.txt b/data/translit/Fullwidth_Halfwidth.txt
index 09b4448..2a6ac33 100644
--- a/data/translit/Fullwidth_Halfwidth.txt
+++ b/data/translit/Fullwidth_Halfwidth.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Georgian_Latin.txt b/data/translit/Georgian_Latin.txt
index 2250dbd..0214b64 100644
--- a/data/translit/Georgian_Latin.txt
+++ b/data/translit/Georgian_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Georgian_Latin_BGN.txt b/data/translit/Georgian_Latin_BGN.txt
index 6e4c6e9..0939825 100644
--- a/data/translit/Georgian_Latin_BGN.txt
+++ b/data/translit/Georgian_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Greek_Latin.txt b/data/translit/Greek_Latin.txt
index 454d6ae..9f626ce 100644
--- a/data/translit/Greek_Latin.txt
+++ b/data/translit/Greek_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Greek_Latin_BGN.txt b/data/translit/Greek_Latin_BGN.txt
index 440aa35..6286590 100644
--- a/data/translit/Greek_Latin_BGN.txt
+++ b/data/translit/Greek_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Greek_Latin_UNGEGN.txt b/data/translit/Greek_Latin_UNGEGN.txt
index 17d3dd3..069861a 100644
--- a/data/translit/Greek_Latin_UNGEGN.txt
+++ b/data/translit/Greek_Latin_UNGEGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gujarati_Bengali.txt b/data/translit/Gujarati_Bengali.txt
index ad48b95..e9c35f6 100644
--- a/data/translit/Gujarati_Bengali.txt
+++ b/data/translit/Gujarati_Bengali.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gujarati_Devanagari.txt b/data/translit/Gujarati_Devanagari.txt
index 0e1658b..33b32e4 100644
--- a/data/translit/Gujarati_Devanagari.txt
+++ b/data/translit/Gujarati_Devanagari.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gujarati_Gurmukhi.txt b/data/translit/Gujarati_Gurmukhi.txt
index b174dca..662d49a 100644
--- a/data/translit/Gujarati_Gurmukhi.txt
+++ b/data/translit/Gujarati_Gurmukhi.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gujarati_InterIndic.txt b/data/translit/Gujarati_InterIndic.txt
index 2345d0a..029cd22 100644
--- a/data/translit/Gujarati_InterIndic.txt
+++ b/data/translit/Gujarati_InterIndic.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gujarati_Kannada.txt b/data/translit/Gujarati_Kannada.txt
index e78e84b..0bfb84b 100644
--- a/data/translit/Gujarati_Kannada.txt
+++ b/data/translit/Gujarati_Kannada.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gujarati_Latin.txt b/data/translit/Gujarati_Latin.txt
index b59a4bb..5e54b6a 100644
--- a/data/translit/Gujarati_Latin.txt
+++ b/data/translit/Gujarati_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gujarati_Malayalam.txt b/data/translit/Gujarati_Malayalam.txt
index 66c98cf..77b6720 100644
--- a/data/translit/Gujarati_Malayalam.txt
+++ b/data/translit/Gujarati_Malayalam.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gujarati_Oriya.txt b/data/translit/Gujarati_Oriya.txt
index a091af6..d0bb2c3 100644
--- a/data/translit/Gujarati_Oriya.txt
+++ b/data/translit/Gujarati_Oriya.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gujarati_Tamil.txt b/data/translit/Gujarati_Tamil.txt
index 5ea9f53..eb7e5e4 100644
--- a/data/translit/Gujarati_Tamil.txt
+++ b/data/translit/Gujarati_Tamil.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gujarati_Telugu.txt b/data/translit/Gujarati_Telugu.txt
index fb117b3..7537a3c 100644
--- a/data/translit/Gujarati_Telugu.txt
+++ b/data/translit/Gujarati_Telugu.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gurmukhi_Bengali.txt b/data/translit/Gurmukhi_Bengali.txt
index 0aa2ce7..0bd646d 100644
--- a/data/translit/Gurmukhi_Bengali.txt
+++ b/data/translit/Gurmukhi_Bengali.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gurmukhi_Devanagari.txt b/data/translit/Gurmukhi_Devanagari.txt
index fb97fef..6361f8c 100644
--- a/data/translit/Gurmukhi_Devanagari.txt
+++ b/data/translit/Gurmukhi_Devanagari.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gurmukhi_Gujarati.txt b/data/translit/Gurmukhi_Gujarati.txt
index 5c0d225..9367ea8 100644
--- a/data/translit/Gurmukhi_Gujarati.txt
+++ b/data/translit/Gurmukhi_Gujarati.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gurmukhi_InterIndic.txt b/data/translit/Gurmukhi_InterIndic.txt
index 0123632..f44d2eb 100644
--- a/data/translit/Gurmukhi_InterIndic.txt
+++ b/data/translit/Gurmukhi_InterIndic.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gurmukhi_Kannada.txt b/data/translit/Gurmukhi_Kannada.txt
index b63cfad..b5ba896 100644
--- a/data/translit/Gurmukhi_Kannada.txt
+++ b/data/translit/Gurmukhi_Kannada.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gurmukhi_Latin.txt b/data/translit/Gurmukhi_Latin.txt
index 253d910..7883a4e 100644
--- a/data/translit/Gurmukhi_Latin.txt
+++ b/data/translit/Gurmukhi_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gurmukhi_Malayalam.txt b/data/translit/Gurmukhi_Malayalam.txt
index 08152b4..862c46e 100644
--- a/data/translit/Gurmukhi_Malayalam.txt
+++ b/data/translit/Gurmukhi_Malayalam.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gurmukhi_Oriya.txt b/data/translit/Gurmukhi_Oriya.txt
index 15f1cea..4b007a3 100644
--- a/data/translit/Gurmukhi_Oriya.txt
+++ b/data/translit/Gurmukhi_Oriya.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gurmukhi_Tamil.txt b/data/translit/Gurmukhi_Tamil.txt
index 4c7d16f..6b12528 100644
--- a/data/translit/Gurmukhi_Tamil.txt
+++ b/data/translit/Gurmukhi_Tamil.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Gurmukhi_Telugu.txt b/data/translit/Gurmukhi_Telugu.txt
index aacd8b8..b91384f 100644
--- a/data/translit/Gurmukhi_Telugu.txt
+++ b/data/translit/Gurmukhi_Telugu.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Han_Latin.txt b/data/translit/Han_Latin.txt
index 7af707a..9eccd6b 100644
--- a/data/translit/Han_Latin.txt
+++ b/data/translit/Han_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
@@ -8,6 +8,7 @@
# Generated from CLDR
#
::Han-Spacedhan();
+藏文→zàngwén;
[呵锕阿𠼞𥥩𨉚]→ā;
[嗄]→á;
[啊]→a;
diff --git a/data/translit/Han_Latin_Names.txt b/data/translit/Han_Latin_Names.txt
index d591206..25f8e80 100755
--- a/data/translit/Han_Latin_Names.txt
+++ b/data/translit/Han_Latin_Names.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
@@ -8,13 +8,33 @@
# Generated from CLDR
#
::Han-Spacedhan();
+万俟→mòqí;
+长孙→zhǎngsūn;
+秘→bì;
+卜→bǔ;
长→cháng;
+重→chóng;
+干→gān;
葛→gě;
-贾→jǐa;
-賈→jǐa;
+盖→gě;
+华→huà;
+贾→jiǎ;
+賈→jiǎ;
筠→jūn;
+区→ōu;
+繁→pó;
+仇→qiú;
+任→rén;
+单→shàn;
+折→shé;
沈→shěn;
峙→shì;
+隗→wěi;
+解→xiè;
莘→xīn;
+尉→yù;
+乐→yuè;
+查→zhā;
+翟→zhái;
曾→zēng;
::Han-Latin();
diff --git a/data/translit/Han_Spacedhan.txt b/data/translit/Han_Spacedhan.txt
index d6f0da5..65c1718 100644
--- a/data/translit/Han_Spacedhan.txt
+++ b/data/translit/Han_Spacedhan.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Hangul_Latin.txt b/data/translit/Hangul_Latin.txt
index a075b48..b9bbcb2 100644
--- a/data/translit/Hangul_Latin.txt
+++ b/data/translit/Hangul_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Hebrew_Latin.txt b/data/translit/Hebrew_Latin.txt
index 9badff2..6b64287 100644
--- a/data/translit/Hebrew_Latin.txt
+++ b/data/translit/Hebrew_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Hebrew_Latin_BGN.txt b/data/translit/Hebrew_Latin_BGN.txt
index fa9baa3..463d0eb 100644
--- a/data/translit/Hebrew_Latin_BGN.txt
+++ b/data/translit/Hebrew_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Hiragana_Katakana.txt b/data/translit/Hiragana_Katakana.txt
index 9879114..c9dbc0a 100644
--- a/data/translit/Hiragana_Katakana.txt
+++ b/data/translit/Hiragana_Katakana.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Hiragana_Latin.txt b/data/translit/Hiragana_Latin.txt
index 3625d83..ff7f34e 100644
--- a/data/translit/Hiragana_Latin.txt
+++ b/data/translit/Hiragana_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/IPA_XSampa.txt b/data/translit/IPA_XSampa.txt
index 3e81e2c..b536a06 100644
--- a/data/translit/IPA_XSampa.txt
+++ b/data/translit/IPA_XSampa.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/InterIndic_Bengali.txt b/data/translit/InterIndic_Bengali.txt
index c90fa41..103d8d4 100644
--- a/data/translit/InterIndic_Bengali.txt
+++ b/data/translit/InterIndic_Bengali.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/InterIndic_Devanagari.txt b/data/translit/InterIndic_Devanagari.txt
index 80dbe20..f25b6e5 100644
--- a/data/translit/InterIndic_Devanagari.txt
+++ b/data/translit/InterIndic_Devanagari.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/InterIndic_Gujarati.txt b/data/translit/InterIndic_Gujarati.txt
index 4fa0f6d..a627f66 100644
--- a/data/translit/InterIndic_Gujarati.txt
+++ b/data/translit/InterIndic_Gujarati.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/InterIndic_Gurmukhi.txt b/data/translit/InterIndic_Gurmukhi.txt
index 1dc6cf9..706719d 100644
--- a/data/translit/InterIndic_Gurmukhi.txt
+++ b/data/translit/InterIndic_Gurmukhi.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/InterIndic_Kannada.txt b/data/translit/InterIndic_Kannada.txt
index 2f4b954..e4bb646 100644
--- a/data/translit/InterIndic_Kannada.txt
+++ b/data/translit/InterIndic_Kannada.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/InterIndic_Latin.txt b/data/translit/InterIndic_Latin.txt
index 941240a..fa3734a 100644
--- a/data/translit/InterIndic_Latin.txt
+++ b/data/translit/InterIndic_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/InterIndic_Malayalam.txt b/data/translit/InterIndic_Malayalam.txt
index fb4db6a..2ce90ac 100644
--- a/data/translit/InterIndic_Malayalam.txt
+++ b/data/translit/InterIndic_Malayalam.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/InterIndic_Oriya.txt b/data/translit/InterIndic_Oriya.txt
index 8738339..bb94b18 100644
--- a/data/translit/InterIndic_Oriya.txt
+++ b/data/translit/InterIndic_Oriya.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/InterIndic_Tamil.txt b/data/translit/InterIndic_Tamil.txt
index 94beda2..80328e7 100644
--- a/data/translit/InterIndic_Tamil.txt
+++ b/data/translit/InterIndic_Tamil.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/InterIndic_Telugu.txt b/data/translit/InterIndic_Telugu.txt
index 710fea6..23e2128 100644
--- a/data/translit/InterIndic_Telugu.txt
+++ b/data/translit/InterIndic_Telugu.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Jamo_Latin.txt b/data/translit/Jamo_Latin.txt
index 73943b4..e31b66c 100644
--- a/data/translit/Jamo_Latin.txt
+++ b/data/translit/Jamo_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/JapaneseKana_Latin_BGN.txt b/data/translit/JapaneseKana_Latin_BGN.txt
index e86cfdc..0da0e0c 100644
--- a/data/translit/JapaneseKana_Latin_BGN.txt
+++ b/data/translit/JapaneseKana_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Kannada_Bengali.txt b/data/translit/Kannada_Bengali.txt
index 02d5fd6..51a8f26 100644
--- a/data/translit/Kannada_Bengali.txt
+++ b/data/translit/Kannada_Bengali.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Kannada_Devanagari.txt b/data/translit/Kannada_Devanagari.txt
index 7379a97..204a948 100644
--- a/data/translit/Kannada_Devanagari.txt
+++ b/data/translit/Kannada_Devanagari.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Kannada_Gujarati.txt b/data/translit/Kannada_Gujarati.txt
index d9588d2..92e834a 100644
--- a/data/translit/Kannada_Gujarati.txt
+++ b/data/translit/Kannada_Gujarati.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Kannada_Gurmukhi.txt b/data/translit/Kannada_Gurmukhi.txt
index 0348e46..fbe34df 100644
--- a/data/translit/Kannada_Gurmukhi.txt
+++ b/data/translit/Kannada_Gurmukhi.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Kannada_InterIndic.txt b/data/translit/Kannada_InterIndic.txt
index ab2c7ec..942db08 100644
--- a/data/translit/Kannada_InterIndic.txt
+++ b/data/translit/Kannada_InterIndic.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Kannada_Latin.txt b/data/translit/Kannada_Latin.txt
index 6d4b13a..419780c 100644
--- a/data/translit/Kannada_Latin.txt
+++ b/data/translit/Kannada_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Kannada_Malayalam.txt b/data/translit/Kannada_Malayalam.txt
index a8e462a..ebf42d7 100644
--- a/data/translit/Kannada_Malayalam.txt
+++ b/data/translit/Kannada_Malayalam.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Kannada_Oriya.txt b/data/translit/Kannada_Oriya.txt
index 1698477..e31940c 100644
--- a/data/translit/Kannada_Oriya.txt
+++ b/data/translit/Kannada_Oriya.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Kannada_Tamil.txt b/data/translit/Kannada_Tamil.txt
index bca8c32..be2f96b 100644
--- a/data/translit/Kannada_Tamil.txt
+++ b/data/translit/Kannada_Tamil.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Kannada_Telugu.txt b/data/translit/Kannada_Telugu.txt
index b76f30a..b0e6535 100644
--- a/data/translit/Kannada_Telugu.txt
+++ b/data/translit/Kannada_Telugu.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Kazakh_Latin_BGN.txt b/data/translit/Kazakh_Latin_BGN.txt
index 2aef02e..6abc40c 100644
--- a/data/translit/Kazakh_Latin_BGN.txt
+++ b/data/translit/Kazakh_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Kirghiz_Latin_BGN.txt b/data/translit/Kirghiz_Latin_BGN.txt
index d723618..8bc96c8 100644
--- a/data/translit/Kirghiz_Latin_BGN.txt
+++ b/data/translit/Kirghiz_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Korean_Latin_BGN.txt b/data/translit/Korean_Latin_BGN.txt
index 1a8a69e..82c3198 100644
--- a/data/translit/Korean_Latin_BGN.txt
+++ b/data/translit/Korean_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_ASCII.txt b/data/translit/Latin_ASCII.txt
index a1e0490..5965034 100644
--- a/data/translit/Latin_ASCII.txt
+++ b/data/translit/Latin_ASCII.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_Armenian.txt b/data/translit/Latin_Armenian.txt
index efc872e..c826c60 100644
--- a/data/translit/Latin_Armenian.txt
+++ b/data/translit/Latin_Armenian.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_Bengali.txt b/data/translit/Latin_Bengali.txt
index a4fbf42..9a6f61f 100644
--- a/data/translit/Latin_Bengali.txt
+++ b/data/translit/Latin_Bengali.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_Bopomofo.txt b/data/translit/Latin_Bopomofo.txt
index 0c1dc5d..15c5386 100755
--- a/data/translit/Latin_Bopomofo.txt
+++ b/data/translit/Latin_Bopomofo.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_ConjoiningJamo.txt b/data/translit/Latin_ConjoiningJamo.txt
index 8c3b47b..9ae4614 100644
--- a/data/translit/Latin_ConjoiningJamo.txt
+++ b/data/translit/Latin_ConjoiningJamo.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_Devanagari.txt b/data/translit/Latin_Devanagari.txt
index 6629ae0..8e263f3 100644
--- a/data/translit/Latin_Devanagari.txt
+++ b/data/translit/Latin_Devanagari.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_Gujarati.txt b/data/translit/Latin_Gujarati.txt
index 949ca4a..3fad148 100644
--- a/data/translit/Latin_Gujarati.txt
+++ b/data/translit/Latin_Gujarati.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_Gurmukhi.txt b/data/translit/Latin_Gurmukhi.txt
index fde211b..a790597 100644
--- a/data/translit/Latin_Gurmukhi.txt
+++ b/data/translit/Latin_Gurmukhi.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_Hangul.txt b/data/translit/Latin_Hangul.txt
index 96d344d..110d562 100644
--- a/data/translit/Latin_Hangul.txt
+++ b/data/translit/Latin_Hangul.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_InterIndic.txt b/data/translit/Latin_InterIndic.txt
index c7fdf28..ee0fa3a 100644
--- a/data/translit/Latin_InterIndic.txt
+++ b/data/translit/Latin_InterIndic.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_Jamo.txt b/data/translit/Latin_Jamo.txt
index 9d79c0e..5c5624a 100644
--- a/data/translit/Latin_Jamo.txt
+++ b/data/translit/Latin_Jamo.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_Kannada.txt b/data/translit/Latin_Kannada.txt
index be1c716..410716e 100644
--- a/data/translit/Latin_Kannada.txt
+++ b/data/translit/Latin_Kannada.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_Katakana.txt b/data/translit/Latin_Katakana.txt
index bca89c4..691dc06 100644
--- a/data/translit/Latin_Katakana.txt
+++ b/data/translit/Latin_Katakana.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_Malayalam.txt b/data/translit/Latin_Malayalam.txt
index 94dfab5..5074bf6 100644
--- a/data/translit/Latin_Malayalam.txt
+++ b/data/translit/Latin_Malayalam.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_NumericPinyin.txt b/data/translit/Latin_NumericPinyin.txt
index bb0f4dc..381e5aa 100644
--- a/data/translit/Latin_NumericPinyin.txt
+++ b/data/translit/Latin_NumericPinyin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_Oriya.txt b/data/translit/Latin_Oriya.txt
index e6fd215..ce7fd5c 100644
--- a/data/translit/Latin_Oriya.txt
+++ b/data/translit/Latin_Oriya.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_Tamil.txt b/data/translit/Latin_Tamil.txt
index e724c6a..af65d81 100644
--- a/data/translit/Latin_Tamil.txt
+++ b/data/translit/Latin_Tamil.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_Telugu.txt b/data/translit/Latin_Telugu.txt
index d5ef715..9cb7fe5 100644
--- a/data/translit/Latin_Telugu.txt
+++ b/data/translit/Latin_Telugu.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_Thaana.txt b/data/translit/Latin_Thaana.txt
index f58e992..5c3816f 100644
--- a/data/translit/Latin_Thaana.txt
+++ b/data/translit/Latin_Thaana.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Latin_Thai.txt b/data/translit/Latin_Thai.txt
index 4c4c7f7..53a69fe 100644
--- a/data/translit/Latin_Thai.txt
+++ b/data/translit/Latin_Thai.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Macedonian_Latin_BGN.txt b/data/translit/Macedonian_Latin_BGN.txt
index d01cfe4..ddbce63 100644
--- a/data/translit/Macedonian_Latin_BGN.txt
+++ b/data/translit/Macedonian_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Malayalam_Bengali.txt b/data/translit/Malayalam_Bengali.txt
index 414f8af..2f7ca6b 100644
--- a/data/translit/Malayalam_Bengali.txt
+++ b/data/translit/Malayalam_Bengali.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Malayalam_Devanagari.txt b/data/translit/Malayalam_Devanagari.txt
index 385a499..f7107d8 100644
--- a/data/translit/Malayalam_Devanagari.txt
+++ b/data/translit/Malayalam_Devanagari.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Malayalam_Gujarati.txt b/data/translit/Malayalam_Gujarati.txt
index d983f76..40f4c3d 100644
--- a/data/translit/Malayalam_Gujarati.txt
+++ b/data/translit/Malayalam_Gujarati.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Malayalam_Gurmukhi.txt b/data/translit/Malayalam_Gurmukhi.txt
index 421cf10..46d324a 100644
--- a/data/translit/Malayalam_Gurmukhi.txt
+++ b/data/translit/Malayalam_Gurmukhi.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Malayalam_InterIndic.txt b/data/translit/Malayalam_InterIndic.txt
index 19eaa5d..24d2adb 100644
--- a/data/translit/Malayalam_InterIndic.txt
+++ b/data/translit/Malayalam_InterIndic.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Malayalam_Kannada.txt b/data/translit/Malayalam_Kannada.txt
index 77bca1e..e394a27 100644
--- a/data/translit/Malayalam_Kannada.txt
+++ b/data/translit/Malayalam_Kannada.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Malayalam_Latin.txt b/data/translit/Malayalam_Latin.txt
index 968cc77..8b6dc56 100644
--- a/data/translit/Malayalam_Latin.txt
+++ b/data/translit/Malayalam_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Malayalam_Oriya.txt b/data/translit/Malayalam_Oriya.txt
index bc1e47b..a02762d 100644
--- a/data/translit/Malayalam_Oriya.txt
+++ b/data/translit/Malayalam_Oriya.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Malayalam_Tamil.txt b/data/translit/Malayalam_Tamil.txt
index a2f9992..8a57ddc 100644
--- a/data/translit/Malayalam_Tamil.txt
+++ b/data/translit/Malayalam_Tamil.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Malayalam_Telugu.txt b/data/translit/Malayalam_Telugu.txt
index b80bf53..db5206c 100644
--- a/data/translit/Malayalam_Telugu.txt
+++ b/data/translit/Malayalam_Telugu.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Maldivian_Latin_BGN.txt b/data/translit/Maldivian_Latin_BGN.txt
index ad43d2f..79c40b1 100644
--- a/data/translit/Maldivian_Latin_BGN.txt
+++ b/data/translit/Maldivian_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Mongolian_Latin_BGN.txt b/data/translit/Mongolian_Latin_BGN.txt
index f142150..f3a6ae0 100644
--- a/data/translit/Mongolian_Latin_BGN.txt
+++ b/data/translit/Mongolian_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Oriya_Bengali.txt b/data/translit/Oriya_Bengali.txt
index b805519..1308527 100644
--- a/data/translit/Oriya_Bengali.txt
+++ b/data/translit/Oriya_Bengali.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Oriya_Devanagari.txt b/data/translit/Oriya_Devanagari.txt
index 27dd02e..8e5cb5a 100644
--- a/data/translit/Oriya_Devanagari.txt
+++ b/data/translit/Oriya_Devanagari.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Oriya_Gujarati.txt b/data/translit/Oriya_Gujarati.txt
index 14d0c3c..d7e9479 100644
--- a/data/translit/Oriya_Gujarati.txt
+++ b/data/translit/Oriya_Gujarati.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Oriya_Gurmukhi.txt b/data/translit/Oriya_Gurmukhi.txt
index 65e453e..5220641 100644
--- a/data/translit/Oriya_Gurmukhi.txt
+++ b/data/translit/Oriya_Gurmukhi.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Oriya_InterIndic.txt b/data/translit/Oriya_InterIndic.txt
index 6db1c94..1604591 100644
--- a/data/translit/Oriya_InterIndic.txt
+++ b/data/translit/Oriya_InterIndic.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Oriya_Kannada.txt b/data/translit/Oriya_Kannada.txt
index 7d3cff8..650358a 100644
--- a/data/translit/Oriya_Kannada.txt
+++ b/data/translit/Oriya_Kannada.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Oriya_Latin.txt b/data/translit/Oriya_Latin.txt
index 52a510d..f1a2324 100644
--- a/data/translit/Oriya_Latin.txt
+++ b/data/translit/Oriya_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Oriya_Malayalam.txt b/data/translit/Oriya_Malayalam.txt
index 4147ebc..04aa3ed 100644
--- a/data/translit/Oriya_Malayalam.txt
+++ b/data/translit/Oriya_Malayalam.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Oriya_Tamil.txt b/data/translit/Oriya_Tamil.txt
index 6c942d4..0b2b382 100644
--- a/data/translit/Oriya_Tamil.txt
+++ b/data/translit/Oriya_Tamil.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Oriya_Telugu.txt b/data/translit/Oriya_Telugu.txt
index e9799ba..0e7a0ba 100644
--- a/data/translit/Oriya_Telugu.txt
+++ b/data/translit/Oriya_Telugu.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Pashto_Latin_BGN.txt b/data/translit/Pashto_Latin_BGN.txt
index 6bc602c..e86344d 100644
--- a/data/translit/Pashto_Latin_BGN.txt
+++ b/data/translit/Pashto_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Persian_Latin_BGN.txt b/data/translit/Persian_Latin_BGN.txt
index 74df996..872ee17 100644
--- a/data/translit/Persian_Latin_BGN.txt
+++ b/data/translit/Persian_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Pinyin_NumericPinyin.txt b/data/translit/Pinyin_NumericPinyin.txt
index ab0d361..510c472 100644
--- a/data/translit/Pinyin_NumericPinyin.txt
+++ b/data/translit/Pinyin_NumericPinyin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Russian_Latin_BGN.txt b/data/translit/Russian_Latin_BGN.txt
index 7c82176..9fcc8a6 100644
--- a/data/translit/Russian_Latin_BGN.txt
+++ b/data/translit/Russian_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Serbian_Latin_BGN.txt b/data/translit/Serbian_Latin_BGN.txt
index 056d8eb..e871a27 100644
--- a/data/translit/Serbian_Latin_BGN.txt
+++ b/data/translit/Serbian_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Simplified_Traditional.txt b/data/translit/Simplified_Traditional.txt
index 2568ea2..e2211ed 100644
--- a/data/translit/Simplified_Traditional.txt
+++ b/data/translit/Simplified_Traditional.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Syriac_Latin.txt b/data/translit/Syriac_Latin.txt
index 3a5b568..c39e8a3 100644
--- a/data/translit/Syriac_Latin.txt
+++ b/data/translit/Syriac_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Tamil_Bengali.txt b/data/translit/Tamil_Bengali.txt
index 78275d9..adfbfd8 100644
--- a/data/translit/Tamil_Bengali.txt
+++ b/data/translit/Tamil_Bengali.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Tamil_Devanagari.txt b/data/translit/Tamil_Devanagari.txt
index 9891ae9..f2f34ae 100644
--- a/data/translit/Tamil_Devanagari.txt
+++ b/data/translit/Tamil_Devanagari.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Tamil_Gujarati.txt b/data/translit/Tamil_Gujarati.txt
index 09d18e4..ef669fb 100644
--- a/data/translit/Tamil_Gujarati.txt
+++ b/data/translit/Tamil_Gujarati.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Tamil_Gurmukhi.txt b/data/translit/Tamil_Gurmukhi.txt
index 8c90bd5..0186ddf 100644
--- a/data/translit/Tamil_Gurmukhi.txt
+++ b/data/translit/Tamil_Gurmukhi.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Tamil_InterIndic.txt b/data/translit/Tamil_InterIndic.txt
index 8acf8f5..fb6b1bd 100644
--- a/data/translit/Tamil_InterIndic.txt
+++ b/data/translit/Tamil_InterIndic.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Tamil_Kannada.txt b/data/translit/Tamil_Kannada.txt
index 6f497dc..6598945 100644
--- a/data/translit/Tamil_Kannada.txt
+++ b/data/translit/Tamil_Kannada.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Tamil_Latin.txt b/data/translit/Tamil_Latin.txt
index 16a7590..92182d4 100644
--- a/data/translit/Tamil_Latin.txt
+++ b/data/translit/Tamil_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Tamil_Malayalam.txt b/data/translit/Tamil_Malayalam.txt
index 7b81695..7a43dfb 100644
--- a/data/translit/Tamil_Malayalam.txt
+++ b/data/translit/Tamil_Malayalam.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Tamil_Oriya.txt b/data/translit/Tamil_Oriya.txt
index cdf96f3..2e15c32 100644
--- a/data/translit/Tamil_Oriya.txt
+++ b/data/translit/Tamil_Oriya.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Tamil_Telugu.txt b/data/translit/Tamil_Telugu.txt
index 28b1b98..2884675 100644
--- a/data/translit/Tamil_Telugu.txt
+++ b/data/translit/Tamil_Telugu.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Telugu_Bengali.txt b/data/translit/Telugu_Bengali.txt
index b4f590e..85ff57c 100644
--- a/data/translit/Telugu_Bengali.txt
+++ b/data/translit/Telugu_Bengali.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Telugu_Devanagari.txt b/data/translit/Telugu_Devanagari.txt
index ca6780d..3859c40 100644
--- a/data/translit/Telugu_Devanagari.txt
+++ b/data/translit/Telugu_Devanagari.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Telugu_Gujarati.txt b/data/translit/Telugu_Gujarati.txt
index 6bcc114..4f8340f 100644
--- a/data/translit/Telugu_Gujarati.txt
+++ b/data/translit/Telugu_Gujarati.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Telugu_Gurmukhi.txt b/data/translit/Telugu_Gurmukhi.txt
index 7824060..f730ab2 100644
--- a/data/translit/Telugu_Gurmukhi.txt
+++ b/data/translit/Telugu_Gurmukhi.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Telugu_InterIndic.txt b/data/translit/Telugu_InterIndic.txt
index 5755fa8..e6f8fcb 100644
--- a/data/translit/Telugu_InterIndic.txt
+++ b/data/translit/Telugu_InterIndic.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Telugu_Kannada.txt b/data/translit/Telugu_Kannada.txt
index 3843df6..4c380f5 100644
--- a/data/translit/Telugu_Kannada.txt
+++ b/data/translit/Telugu_Kannada.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Telugu_Latin.txt b/data/translit/Telugu_Latin.txt
index 932f04e..056ac6e 100644
--- a/data/translit/Telugu_Latin.txt
+++ b/data/translit/Telugu_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Telugu_Malayalam.txt b/data/translit/Telugu_Malayalam.txt
index 46ad004..8774aaa 100644
--- a/data/translit/Telugu_Malayalam.txt
+++ b/data/translit/Telugu_Malayalam.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Telugu_Oriya.txt b/data/translit/Telugu_Oriya.txt
index 9d8f07a..73833f2 100644
--- a/data/translit/Telugu_Oriya.txt
+++ b/data/translit/Telugu_Oriya.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Telugu_Tamil.txt b/data/translit/Telugu_Tamil.txt
index 0f10eab..9a82c09 100644
--- a/data/translit/Telugu_Tamil.txt
+++ b/data/translit/Telugu_Tamil.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/ThaiLogical_Latin.txt b/data/translit/ThaiLogical_Latin.txt
index 50abd24..f52e169 100644
--- a/data/translit/ThaiLogical_Latin.txt
+++ b/data/translit/ThaiLogical_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Thai_Latin.txt b/data/translit/Thai_Latin.txt
index 784c821..aa3a245 100644
--- a/data/translit/Thai_Latin.txt
+++ b/data/translit/Thai_Latin.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Thai_ThaiLogical.txt b/data/translit/Thai_ThaiLogical.txt
index 8a43a69..9b228a3 100644
--- a/data/translit/Thai_ThaiLogical.txt
+++ b/data/translit/Thai_ThaiLogical.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Thai_ThaiSemi.txt b/data/translit/Thai_ThaiSemi.txt
index 45a62a3..dadd901 100644
--- a/data/translit/Thai_ThaiSemi.txt
+++ b/data/translit/Thai_ThaiSemi.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Turkmen_Latin_BGN.txt b/data/translit/Turkmen_Latin_BGN.txt
index 1d79648..36a9ac2 100644
--- a/data/translit/Turkmen_Latin_BGN.txt
+++ b/data/translit/Turkmen_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Ukrainian_Latin_BGN.txt b/data/translit/Ukrainian_Latin_BGN.txt
index e57652e..c67c09c 100644
--- a/data/translit/Ukrainian_Latin_BGN.txt
+++ b/data/translit/Ukrainian_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/Uzbek_Latin_BGN.txt b/data/translit/Uzbek_Latin_BGN.txt
index 7f2dc6e..a4ce1b8 100644
--- a/data/translit/Uzbek_Latin_BGN.txt
+++ b/data/translit/Uzbek_Latin_BGN.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/az_Lower.txt b/data/translit/az_Lower.txt
new file mode 100755
index 0000000..9ad1b1a
--- /dev/null
+++ b/data/translit/az_Lower.txt
@@ -0,0 +1,13 @@
+# ***************************************************************************
+# *
+# * Copyright (C) 2004-2013, International Business Machines
+# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
+# *
+# ***************************************************************************
+# File: az_Lower.txt
+# Generated from CLDR
+#
+İ→i;
+I([^[:ccc=Not_Reordered:][:ccc=Above:]]*)\u0307 → i$1 ;
+I→ı ;
+::Any-Lower();
diff --git a/data/translit/az_Title.txt b/data/translit/az_Title.txt
new file mode 100755
index 0000000..426c88d
--- /dev/null
+++ b/data/translit/az_Title.txt
@@ -0,0 +1,14 @@
+# ***************************************************************************
+# *
+# * Copyright (C) 2004-2013, International Business Machines
+# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
+# *
+# ***************************************************************************
+# File: az_Title.txt
+# Generated from CLDR
+#
+[:cased:] [:case-ignorable:]* { İ → i;
+[:cased:] [:case-ignorable:]* { I → ı;
+[:cased:] [:case-ignorable:]* { (.) → &Any-Lower($1) ;
+i→İ ;
+([:Lowercase:]) → &Any-Upper($1) ;
diff --git a/data/translit/az_Upper.txt b/data/translit/az_Upper.txt
new file mode 100644
index 0000000..04274fb
--- /dev/null
+++ b/data/translit/az_Upper.txt
@@ -0,0 +1,11 @@
+# ***************************************************************************
+# *
+# * Copyright (C) 2004-2013, International Business Machines
+# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
+# *
+# ***************************************************************************
+# File: az_Upper.txt
+# Generated from CLDR
+#
+i→İ;
+::Any-Upper();
diff --git a/data/translit/cs_FONIPA_ja.txt b/data/translit/cs_FONIPA_ja.txt
index acd2dec..66b4bfa 100644
--- a/data/translit/cs_FONIPA_ja.txt
+++ b/data/translit/cs_FONIPA_ja.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/cs_FONIPA_ko.txt b/data/translit/cs_FONIPA_ko.txt
index 7931cc7..ed0d450 100644
--- a/data/translit/cs_FONIPA_ko.txt
+++ b/data/translit/cs_FONIPA_ko.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/cs_cs_FONIPA.txt b/data/translit/cs_cs_FONIPA.txt
index 731ac25..c48345e 100644
--- a/data/translit/cs_cs_FONIPA.txt
+++ b/data/translit/cs_cs_FONIPA.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/cs_ja.txt b/data/translit/cs_ja.txt
index b2dd864..17313e6 100644
--- a/data/translit/cs_ja.txt
+++ b/data/translit/cs_ja.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/cs_ko.txt b/data/translit/cs_ko.txt
index 07d8dc2..4debbce 100644
--- a/data/translit/cs_ko.txt
+++ b/data/translit/cs_ko.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/el_Lower.txt b/data/translit/el_Lower.txt
new file mode 100644
index 0000000..38ec704
--- /dev/null
+++ b/data/translit/el_Lower.txt
@@ -0,0 +1,14 @@
+# ***************************************************************************
+# *
+# * Copyright (C) 2004-2013, International Business Machines
+# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
+# *
+# ***************************************************************************
+# File: el_Lower.txt
+# Generated from CLDR
+#
+::NFD();
+Σ } [:case-ignorable:]* [:cased:] → σ;
+[:cased:] [:case-ignorable:]* { Σ → ς;
+::Any-Lower;
+::NFC();
diff --git a/data/translit/el_Title.txt b/data/translit/el_Title.txt
new file mode 100644
index 0000000..62c0d04
--- /dev/null
+++ b/data/translit/el_Title.txt
@@ -0,0 +1,15 @@
+# ***************************************************************************
+# *
+# * Copyright (C) 2004-2013, International Business Machines
+# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
+# *
+# ***************************************************************************
+# File: el_Title.txt
+# Generated from CLDR
+#
+::NFD();
+[:cased:] [:case-ignorable:]* { Σ } [:case-ignorable:]* [:cased:] → σ;
+[:cased:] [:case-ignorable:]* { Σ → ς;
+[:cased:] [:case-ignorable:]* { (.) → &Any-Lower($1) ;
+([:Lowercase:]) → &Any-Title($1) ;
+::NFC();
diff --git a/data/translit/el_Upper.txt b/data/translit/el_Upper.txt
new file mode 100644
index 0000000..5e70c6b
--- /dev/null
+++ b/data/translit/el_Upper.txt
@@ -0,0 +1,14 @@
+# ***************************************************************************
+# *
+# * Copyright (C) 2004-2013, International Business Machines
+# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
+# *
+# ***************************************************************************
+# File: el_Upper.txt
+# Generated from CLDR
+#
+::NFD();
+[:Greek:] [^[:ccc=Not_Reordered:][:ccc=Above:]]*? { [\u0313\u0314\u0301\u0300\u0306\u0342\u0308\u0304] → ;
+[:Greek:] [^[:ccc=Not_Reordered:][:ccc=Iota_Subscript:]]*? { \u0345 → ;
+::NFC();
+::Any-Upper();
diff --git a/data/translit/es_419_ja.txt b/data/translit/es_419_ja.txt
index b7d56ba..e276e44 100644
--- a/data/translit/es_419_ja.txt
+++ b/data/translit/es_419_ja.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/es_419_zh.txt b/data/translit/es_419_zh.txt
index 78848cf..8b700d9 100644
--- a/data/translit/es_419_zh.txt
+++ b/data/translit/es_419_zh.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/es_FONIPA_am.txt b/data/translit/es_FONIPA_am.txt
index a83bbac..9e00ee1 100644
--- a/data/translit/es_FONIPA_am.txt
+++ b/data/translit/es_FONIPA_am.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/es_FONIPA_es_419_FONIPA.txt b/data/translit/es_FONIPA_es_419_FONIPA.txt
index 4c66394..8e60e1e 100644
--- a/data/translit/es_FONIPA_es_419_FONIPA.txt
+++ b/data/translit/es_FONIPA_es_419_FONIPA.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/es_FONIPA_ja.txt b/data/translit/es_FONIPA_ja.txt
index 5eb13eb..1b9e541 100644
--- a/data/translit/es_FONIPA_ja.txt
+++ b/data/translit/es_FONIPA_ja.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/es_FONIPA_zh.txt b/data/translit/es_FONIPA_zh.txt
index 64b3917..67dc66d 100644
--- a/data/translit/es_FONIPA_zh.txt
+++ b/data/translit/es_FONIPA_zh.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/es_am.txt b/data/translit/es_am.txt
index 44dcc2e..2ce44ca 100644
--- a/data/translit/es_am.txt
+++ b/data/translit/es_am.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/es_es_FONIPA.txt b/data/translit/es_es_FONIPA.txt
index a018f1d..691ec0b 100644
--- a/data/translit/es_es_FONIPA.txt
+++ b/data/translit/es_es_FONIPA.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/es_ja.txt b/data/translit/es_ja.txt
index c67d24c..d4d1d34 100644
--- a/data/translit/es_ja.txt
+++ b/data/translit/es_ja.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/es_zh.txt b/data/translit/es_zh.txt
index fbd419a..e5018df 100644
--- a/data/translit/es_zh.txt
+++ b/data/translit/es_zh.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/it_am.txt b/data/translit/it_am.txt
index a0fc3ea..2408ae5 100644
--- a/data/translit/it_am.txt
+++ b/data/translit/it_am.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/it_ja.txt b/data/translit/it_ja.txt
index 12ec3b2..572356e 100644
--- a/data/translit/it_ja.txt
+++ b/data/translit/it_ja.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/ja_Latn_ko.txt b/data/translit/ja_Latn_ko.txt
index 29ecd34..b27ddd4 100644
--- a/data/translit/ja_Latn_ko.txt
+++ b/data/translit/ja_Latn_ko.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/ja_Latn_ru.txt b/data/translit/ja_Latn_ru.txt
index 6e5a9cd..84f1391 100644
--- a/data/translit/ja_Latn_ru.txt
+++ b/data/translit/ja_Latn_ru.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/lt_Lower.txt b/data/translit/lt_Lower.txt
new file mode 100755
index 0000000..59e3460
--- /dev/null
+++ b/data/translit/lt_Lower.txt
@@ -0,0 +1,18 @@
+# ***************************************************************************
+# *
+# * Copyright (C) 2004-2013, International Business Machines
+# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
+# *
+# ***************************************************************************
+# File: lt_Lower.txt
+# Generated from CLDR
+#
+::NFD();
+I } [^[:ccc=Not_Reordered:][:ccc=Above:]]* [:ccc=Above:] → i \u0307;
+J } [^[:ccc=Not_Reordered:][:ccc=Above:]]* [:ccc=Above:] → j \u0307;
+Į } [^[:ccc=Not_Reordered:][:ccc=Above:]]* [:ccc=Above:] → į \u0307;
+Ì → i \u0307 \u0300;
+Í → i \u0307 \u0301;
+Ĩ → i \u0307 \u0303;
+::Any-Lower();
+::NFC();
diff --git a/data/translit/lt_Title.txt b/data/translit/lt_Title.txt
new file mode 100755
index 0000000..4fbcdef
--- /dev/null
+++ b/data/translit/lt_Title.txt
@@ -0,0 +1,20 @@
+# ***************************************************************************
+# *
+# * Copyright (C) 2004-2013, International Business Machines
+# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
+# *
+# ***************************************************************************
+# File: lt_Title.txt
+# Generated from CLDR
+#
+::NFD();
+[:cased:] [:case-ignorable:]* {I } [^[:ccc=Not_Reordered:][:ccc=Above:]]* [:ccc=Above:] → i \u0307;
+[:cased:] [:case-ignorable:]* {J } [^[:ccc=Not_Reordered:][:ccc=Above:]]* [:ccc=Above:] → j \u0307;
+[:cased:] [:case-ignorable:]* {Į } [^[:ccc=Not_Reordered:][:ccc=Above:]]* [:ccc=Above:] → į \u0307;
+[:cased:] [:case-ignorable:]* {Ì → i \u0307 \u0300;
+[:cased:] [:case-ignorable:]* {Í → i \u0307 \u0301;
+[:cased:] [:case-ignorable:]* {Ĩ → i \u0307 \u0303;
+[:cased:] [:case-ignorable:]* { (.) → &Any-Lower($1) ;
+[:Soft_Dotted:] [^[:ccc=Not_Reordered:][:ccc=Above:]]* { \u0307 → ;
+([:Lowercase:]) → &Any-Upper($1) ;
+::NFC();
diff --git a/data/translit/lt_Upper.txt b/data/translit/lt_Upper.txt
new file mode 100644
index 0000000..c6cc643
--- /dev/null
+++ b/data/translit/lt_Upper.txt
@@ -0,0 +1,13 @@
+# ***************************************************************************
+# *
+# * Copyright (C) 2004-2013, International Business Machines
+# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
+# *
+# ***************************************************************************
+# File: lt_Upper.txt
+# Generated from CLDR
+#
+::NFD();
+[:Soft_Dotted:] [^[:ccc=Not_Reordered:][:ccc=Above:]]* { \u0307 → ;
+::Any-Upper();
+::NFC();
diff --git a/data/translit/nl_Title.txt b/data/translit/nl_Title.txt
new file mode 100644
index 0000000..d12e572
--- /dev/null
+++ b/data/translit/nl_Title.txt
@@ -0,0 +1,11 @@
+# ***************************************************************************
+# *
+# * Copyright (C) 2004-2013, International Business Machines
+# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
+# *
+# ***************************************************************************
+# File: nl_Title.txt
+# Generated from CLDR
+#
+::Any-Title();
+[:^WB=ALetter:] [:WB=Extend:]* [[:WB=MidLetter:][:WB=MidNumLet:]]? { Ij } → IJ ;
diff --git a/data/translit/pl_FONIPA_ja.txt b/data/translit/pl_FONIPA_ja.txt
index 60038ea..0805a2c 100644
--- a/data/translit/pl_FONIPA_ja.txt
+++ b/data/translit/pl_FONIPA_ja.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/pl_ja.txt b/data/translit/pl_ja.txt
index 607680e..afa6b3b 100644
--- a/data/translit/pl_ja.txt
+++ b/data/translit/pl_ja.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/pl_pl_FONIPA.txt b/data/translit/pl_pl_FONIPA.txt
index e3b0669..00cbad2 100644
--- a/data/translit/pl_pl_FONIPA.txt
+++ b/data/translit/pl_pl_FONIPA.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/ro_FONIPA_ja.txt b/data/translit/ro_FONIPA_ja.txt
index 8c870d9..18d4768 100644
--- a/data/translit/ro_FONIPA_ja.txt
+++ b/data/translit/ro_FONIPA_ja.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/ro_ja.txt b/data/translit/ro_ja.txt
index a0b1adb..5ac0d74 100644
--- a/data/translit/ro_ja.txt
+++ b/data/translit/ro_ja.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/ro_ro_FONIPA.txt b/data/translit/ro_ro_FONIPA.txt
index aa08de5..2e1d1fd 100644
--- a/data/translit/ro_ro_FONIPA.txt
+++ b/data/translit/ro_ro_FONIPA.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/root.txt b/data/translit/root.txt
index 1377ea5..1eed53c 100644
--- a/data/translit/root.txt
+++ b/data/translit/root.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2004-2012, International Business Machines
+// * Copyright (C) 2004-2013, International Business Machines
// * Corporation; Unicode, Inc.; and others. All Rights Reserved.
// *
// ***************************************************************************
@@ -467,12 +467,6 @@
direction {"FORWARD"}
}
}
- Latin-Han {
- file {
- resource:process(transliterator) {"Han_Latin.txt"}
- direction {"REVERSE"}
- }
- }
Han-Latin/Names {
file {
@@ -1352,6 +1346,27 @@
}
}
+ az-Lower {
+ file {
+ resource:process(transliterator) {"az_Lower.txt"}
+ direction {"FORWARD"}
+ }
+ }
+
+ az-Title {
+ file {
+ resource:process(transliterator) {"az_Title.txt"}
+ direction {"FORWARD"}
+ }
+ }
+
+ az-Upper {
+ file {
+ resource:process(transliterator) {"az_Upper.txt"}
+ direction {"FORWARD"}
+ }
+ }
+
cs-cs_FONIPA {
file {
resource:process(transliterator) {"cs_cs_FONIPA.txt"}
@@ -1387,6 +1402,27 @@
}
}
+ el-Lower {
+ file {
+ resource:process(transliterator) {"el_Lower.txt"}
+ direction {"FORWARD"}
+ }
+ }
+
+ el-Title {
+ file {
+ resource:process(transliterator) {"el_Title.txt"}
+ direction {"FORWARD"}
+ }
+ }
+
+ el-Upper {
+ file {
+ resource:process(transliterator) {"el_Upper.txt"}
+ direction {"FORWARD"}
+ }
+ }
+
es-am {
file {
resource:process(transliterator) {"es_am.txt"}
@@ -1485,6 +1521,34 @@
}
}
+ lt-Lower {
+ file {
+ resource:process(transliterator) {"lt_Lower.txt"}
+ direction {"FORWARD"}
+ }
+ }
+
+ lt-Title {
+ file {
+ resource:process(transliterator) {"lt_Title.txt"}
+ direction {"FORWARD"}
+ }
+ }
+
+ lt-Upper {
+ file {
+ resource:process(transliterator) {"lt_Upper.txt"}
+ direction {"FORWARD"}
+ }
+ }
+
+ nl-Title {
+ file {
+ resource:process(transliterator) {"nl_Title.txt"}
+ direction {"FORWARD"}
+ }
+ }
+
pl-ja {
file {
resource:process(transliterator) {"pl_ja.txt"}
@@ -1562,6 +1626,27 @@
}
}
+ tr-Lower {
+ file {
+ resource:process(transliterator) {"tr_Lower.txt"}
+ direction {"FORWARD"}
+ }
+ }
+
+ tr-Title {
+ file {
+ resource:process(transliterator) {"tr_Title.txt"}
+ direction {"FORWARD"}
+ }
+ }
+
+ tr-Upper {
+ file {
+ resource:process(transliterator) {"tr_Upper.txt"}
+ direction {"FORWARD"}
+ }
+ }
+
zh_Latn_PINYIN-ru {
file {
resource:process(transliterator) {"zh_Latn_PINYIN_ru.txt"}
diff --git a/data/translit/ru_ja.txt b/data/translit/ru_ja.txt
index b95be0e..8ecd273 100644
--- a/data/translit/ru_ja.txt
+++ b/data/translit/ru_ja.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/ru_zh.txt b/data/translit/ru_zh.txt
index 9a5ccc4..d5a123a 100644
--- a/data/translit/ru_zh.txt
+++ b/data/translit/ru_zh.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/sk_FONIPA_ja.txt b/data/translit/sk_FONIPA_ja.txt
index 8294fa8..3b878c9 100644
--- a/data/translit/sk_FONIPA_ja.txt
+++ b/data/translit/sk_FONIPA_ja.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/sk_ja.txt b/data/translit/sk_ja.txt
index db8fa24..a8bd070 100644
--- a/data/translit/sk_ja.txt
+++ b/data/translit/sk_ja.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/sk_sk_FONIPA.txt b/data/translit/sk_sk_FONIPA.txt
index a7c200b..aa6a33d 100644
--- a/data/translit/sk_sk_FONIPA.txt
+++ b/data/translit/sk_sk_FONIPA.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/translit/tr_Lower.txt b/data/translit/tr_Lower.txt
new file mode 100644
index 0000000..2ccc6b1
--- /dev/null
+++ b/data/translit/tr_Lower.txt
@@ -0,0 +1,13 @@
+# ***************************************************************************
+# *
+# * Copyright (C) 2004-2013, International Business Machines
+# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
+# *
+# ***************************************************************************
+# File: tr_Lower.txt
+# Generated from CLDR
+#
+İ→i;
+I([^[:ccc=Not_Reordered:][:ccc=Above:]]*)\u0307 → i$1 ;
+I→ı ;
+::Any-Lower();
diff --git a/data/translit/tr_Title.txt b/data/translit/tr_Title.txt
new file mode 100644
index 0000000..76d12a3
--- /dev/null
+++ b/data/translit/tr_Title.txt
@@ -0,0 +1,14 @@
+# ***************************************************************************
+# *
+# * Copyright (C) 2004-2013, International Business Machines
+# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
+# *
+# ***************************************************************************
+# File: tr_Title.txt
+# Generated from CLDR
+#
+[:cased:] [:case-ignorable:]* { İ → i;
+[:cased:] [:case-ignorable:]* { I → ı;
+[:cased:] [:case-ignorable:]* { (.) → &Any-Lower($1) ;
+i→İ ;
+([:Lowercase:]) → &Any-Upper($1) ;
diff --git a/data/translit/tr_Upper.txt b/data/translit/tr_Upper.txt
new file mode 100644
index 0000000..66728d9
--- /dev/null
+++ b/data/translit/tr_Upper.txt
@@ -0,0 +1,11 @@
+# ***************************************************************************
+# *
+# * Copyright (C) 2004-2013, International Business Machines
+# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
+# *
+# ***************************************************************************
+# File: tr_Upper.txt
+# Generated from CLDR
+#
+i→İ;
+::Any-Upper();
diff --git a/data/translit/zh_Latn_PINYIN_ru.txt b/data/translit/zh_Latn_PINYIN_ru.txt
index ff8a263..37f8006 100644
--- a/data/translit/zh_Latn_PINYIN_ru.txt
+++ b/data/translit/zh_Latn_PINYIN_ru.txt
@@ -1,6 +1,6 @@
# ***************************************************************************
# *
-# * Copyright (C) 2004-2012, International Business Machines
+# * Copyright (C) 2004-2013, International Business Machines
# * Corporation; Unicode, Inc.; and others. All Rights Reserved.
# *
# ***************************************************************************
diff --git a/data/xml/main/mn.xml b/data/xml/main/mn.xml
new file mode 100644
index 0000000..72927d7
--- /dev/null
+++ b/data/xml/main/mn.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright (c) 2013 International Business Machines Corporation and others. All rights reserved.
+-->
+<!DOCTYPE ldml SYSTEM "http://www.unicode.org/repos/cldr/trunk/common/dtd/ldml.dtd"
+[
+ <!ENTITY % icu SYSTEM "http://www.unicode.org/repos/cldr/trunk/common/dtd/ldmlICU.dtd">
+ %icu;
+]
+>
+<ldml>
+ <identity>
+ <version number="$Revision: 33355 $"/>
+ <generation date="$Date: 2013-03-03 13:34:51 -0800 (Sun, 03 Mar 2013) $"/>
+ <language type="mn"/>
+ </identity>
+ <characters>
+ <special xmlns:icu="http://www.icu-project.org/">
+ <icu:scripts>
+ <icu:script type="1">Cyrl</icu:script>
+ </icu:scripts>
+ </special>
+ </characters>
+</ldml>
+
diff --git a/data/xml/main/mn_Cyrl.xml b/data/xml/main/mn_Cyrl.xml
new file mode 100644
index 0000000..59c95e6
--- /dev/null
+++ b/data/xml/main/mn_Cyrl.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright (c) 2013 International Business Machines Corporation and others. All rights reserved.
+-->
+<!DOCTYPE ldml SYSTEM "http://www.unicode.org/repos/cldr/trunk/common/dtd/ldml.dtd"
+[
+ <!ENTITY % icu SYSTEM "http://www.unicode.org/repos/cldr/trunk/common/dtd/ldmlICU.dtd">
+ %icu;
+]
+>
+<ldml>
+ <identity>
+ <version number="$Revision: 33355 $"/>
+ <generation date="$Date: 2013-03-03 13:34:51 -0800 (Sun, 03 Mar 2013) $"/>
+ <language type="mn"/>
+ <script type="Cyrl"/>
+ </identity>
+ <characters>
+ <special xmlns:icu="http://www.icu-project.org/">
+ <icu:scripts>
+ <icu:script type="1">Cyrl</icu:script>
+ </icu:scripts>
+ </special>
+ </characters>
+</ldml>
+
diff --git a/data/xml/main/ms_Latn.xml b/data/xml/main/ms_Latn.xml
new file mode 100644
index 0000000..38568b6
--- /dev/null
+++ b/data/xml/main/ms_Latn.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright (c) 2013 International Business Machines Corporation and others. All rights reserved.
+-->
+<!DOCTYPE ldml SYSTEM "http://www.unicode.org/repos/cldr/trunk/common/dtd/ldml.dtd"
+[
+ <!ENTITY % icu SYSTEM "http://www.unicode.org/repos/cldr/trunk/common/dtd/ldmlICU.dtd">
+ %icu;
+]
+>
+<ldml>
+ <identity>
+ <version number="$Revision: 33080 $"/>
+ <generation date="$Date: 2013-01-25 23:30:00 -0800 (Fri, 25 Jan 2013) $"/>
+ <language type="ms"/>
+ <script type="Latn"/>
+ </identity>
+ <characters>
+ <special xmlns:icu="http://www.icu-project.org/">
+ <icu:scripts>
+ <icu:script type="1">Latn</icu:script>
+ </icu:scripts>
+ </special>
+ </characters>
+</ldml>
diff --git a/data/zone/af.txt b/data/zone/af.txt
index 7235528..863a4fc 100644
--- a/data/zone/af.txt
+++ b/data/zone/af.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/af.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/af.xml
*/
af{
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Sao_Tome"{
ec{"São Tomé"}
@@ -530,11 +530,13 @@
ls{"Sakhalin-standaardtyd"}
}
"meta:Samara"{
- ld{"Samara-somertyd"}
+ ld{"Samara-dagligtyd"}
lg{"Samara-tyd"}
ls{"Samara-standaardtyd"}
}
"meta:Samoa"{
+ ld{"Samoa-dagligtyd"}
+ lg{"Samoa-tyd"}
ls{"Samoa-standaardtyd"}
}
"meta:Seychelles"{
diff --git a/data/zone/agq.txt b/data/zone/agq.txt
index 2597c15..4c267f3 100755
--- a/data/zone/agq.txt
+++ b/data/zone/agq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/agq.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/agq.xml
*/
agq{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/ak.txt b/data/zone/ak.txt
index 8ef0683..da0a9b8 100755
--- a/data/zone/ak.txt
+++ b/data/zone/ak.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ak.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/ak.xml
*/
ak{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/am.txt b/data/zone/am.txt
index 6c92a00..29c9a8d 100644
--- a/data/zone/am.txt
+++ b/data/zone/am.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/am.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/am.xml
*/
am{
- Version{"2.0.78.39"}
+ Version{"2.0.82.52"}
zoneStrings{
"Africa:Abidjan"{
ec{"አቢጃን"}
@@ -909,51 +909,6 @@
"Australia:Sydney"{
ec{"ሲድኒ"}
}
- "Etc:GMT"{
- ec{"ጂ ኤም ቲ"}
- }
- "Etc:GMT-1"{
- ec{"ጂ ኤም ቲ-1"}
- }
- "Etc:GMT-10"{
- ec{"ጂ ኤም ቲ-10"}
- }
- "Etc:GMT-11"{
- ec{"ጂ ኤም ቲ-11"}
- }
- "Etc:GMT-12"{
- ec{"ጂ ኤም ቲ-12"}
- }
- "Etc:GMT-13"{
- ec{"ጂ ኤም ቲ-13"}
- }
- "Etc:GMT-14"{
- ec{"ጂ ኤም ቲ-14"}
- }
- "Etc:GMT-2"{
- ec{"ጂ ኤም ቲ-2"}
- }
- "Etc:GMT-3"{
- ec{"ጂ ኤም ቲ-3"}
- }
- "Etc:GMT-4"{
- ec{"ጂ ኤም ቲ-4"}
- }
- "Etc:GMT-5"{
- ec{"ጂ ኤም ቲ-5"}
- }
- "Etc:GMT-6"{
- ec{"ጂ ኤም ቲ-6"}
- }
- "Etc:GMT-7"{
- ec{"ጂ ኤም ቲ-7"}
- }
- "Etc:GMT-8"{
- ec{"ጂ ኤም ቲ-8"}
- }
- "Etc:GMT-9"{
- ec{"ጂ ኤም ቲ-9"}
- }
"Etc:Unknown"{
ec{"ያልታወቀ ከተማ"}
}
@@ -1753,6 +1708,8 @@
ls{"የሳማራ መደበኛ ሰዓት አቆጣጠር"}
}
"meta:Samoa"{
+ ld{"የሳሞዋ የበጋ ሰዓት"}
+ lg{"የሳሞዋ ሰዓት"}
ls{"የሳሞዋ መደበኛ ሰዓት"}
}
"meta:Seychelles"{
diff --git a/data/zone/ar.txt b/data/zone/ar.txt
index afdac08..a041f8c 100644
--- a/data/zone/ar.txt
+++ b/data/zone/ar.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ar.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/ar.xml
*/
ar{
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"أبيدجان"}
@@ -909,51 +909,6 @@
"Australia:Sydney"{
ec{"سيدني"}
}
- "Etc:GMT"{
- ec{"توقيت جرينتش"}
- }
- "Etc:GMT-1"{
- ec{"توقيت جرينتش-1"}
- }
- "Etc:GMT-10"{
- ec{"توقيت جرينتش-10"}
- }
- "Etc:GMT-11"{
- ec{"توقيت جرينتش-11"}
- }
- "Etc:GMT-12"{
- ec{"توقيت جرينتش-12"}
- }
- "Etc:GMT-13"{
- ec{"توقيت جرينتش-13"}
- }
- "Etc:GMT-14"{
- ec{"توقيت جرينتش-14"}
- }
- "Etc:GMT-2"{
- ec{"توقيت جرينتش-2"}
- }
- "Etc:GMT-3"{
- ec{"توقيت جرينتش-3"}
- }
- "Etc:GMT-4"{
- ec{"توقيت جرينتش-4"}
- }
- "Etc:GMT-5"{
- ec{"توقيت جرينتش-5"}
- }
- "Etc:GMT-6"{
- ec{"توقيت جرينتش-6"}
- }
- "Etc:GMT-7"{
- ec{"توقيت جرينتش-7"}
- }
- "Etc:GMT-8"{
- ec{"توقيت جرينتش-8"}
- }
- "Etc:GMT-9"{
- ec{"توقيت جرينتش-9"}
- }
"Etc:Unknown"{
ec{"مدينة غير معروفة"}
}
@@ -1293,11 +1248,6 @@
lg{"توقيت ألاسكا"}
ls{"التوقيت الرسمي لألاسكا"}
}
- "meta:Alaska_Hawaii"{
- ld{"توقيت ألاسكا-هاواي الصيفي"}
- lg{"توقيت ألاسكا-هاواي"}
- ls{"التوقيت الرسمي لألاسكا-هاواي"}
- }
"meta:Amazon"{
ld{"توقيت الأمازون الصيفي"}
lg{"توقيت الأمازون"}
@@ -1389,11 +1339,6 @@
"meta:Bolivia"{
ls{"توقيت بوليفيا"}
}
- "meta:Borneo"{
- ld{"توقيت بورنيو الصيفي"}
- lg{"توقيت بورنيو"}
- ls{"توقيت بورنيو الرسمي"}
- }
"meta:Brasilia"{
ld{"توقيت برازيليا الصيفي"}
lg{"توقيت برازيليا"}
@@ -1577,9 +1522,6 @@
lg{"توقيت كراسنويارسك"}
ls{"توقيت كراسنويارسك الرسمي"}
}
- "meta:Kwajalein"{
- ls{"توقيت كواجالين"}
- }
"meta:Lord_Howe"{
ld{"التوقيت الصيفي للورد هاو"}
lg{"توقيت لورد هاو"}
@@ -1593,9 +1535,6 @@
lg{"توقيت ماغادان"}
ls{"توقيت ماغادان الرسمي"}
}
- "meta:Malaya"{
- ls{"توقيت مالايا"}
- }
"meta:Malaysia"{
ls{"توقيت ماليزيا"}
}
diff --git a/data/zone/as.txt b/data/zone/as.txt
index 2cb4a35..e5f4fa5 100644
--- a/data/zone/as.txt
+++ b/data/zone/as.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/as.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/as.xml
*/
as{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
zoneStrings{
"Asia:Calcutta"{
ec{"এলাহাৱাদ"}
diff --git a/data/zone/asa.txt b/data/zone/asa.txt
index f80b52c..5cecea5 100755
--- a/data/zone/asa.txt
+++ b/data/zone/asa.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/asa.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/asa.xml
*/
asa{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/az.txt b/data/zone/az.txt
index 6b3a443..dc6a395 100644
--- a/data/zone/az.txt
+++ b/data/zone/az.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/az.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/az.xml
*/
az{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Ceuta"{
ec{"Seuta"}
@@ -484,11 +484,6 @@
lg{"Şərq Avropa vaxtı"}
ls{"Şərq Avropa standart vaxtı"}
}
- "meta:Kuybyshev"{
- ld{"Kuybuşev yay vaxtı"}
- lg{"Kuybuşev vaxtı"}
- ls{"Kuybuşev standart vaxtı"}
- }
"meta:Moscow"{
ld{"Moskva yay vaxtı"}
lg{"Moskva vaxtı"}
@@ -499,11 +494,6 @@
lg{"Samara vaxtı"}
ls{"Samara standart vaxtı"}
}
- "meta:Turkey"{
- ld{"Türkiya yay vaxtı"}
- lg{"Türkiya vaxtı"}
- ls{"Türkiya standart vaxtı"}
- }
"meta:Volgograd"{
ld{"Volqoqrad yay vaxtı"}
lg{"Volqoqrad vaxtı"}
diff --git a/data/zone/az_AZ.txt b/data/zone/az_AZ.txt
index 881b97c..f76eaaa 100644
--- a/data/zone/az_AZ.txt
+++ b/data/zone/az_AZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/az_Cyrl.txt b/data/zone/az_Cyrl.txt
index ec9e4d5..3153c3a 100644
--- a/data/zone/az_Cyrl.txt
+++ b/data/zone/az_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/az_Cyrl.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/az_Cyrl.xml
*/
az_Cyrl{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/az_Latn.txt b/data/zone/az_Latn.txt
index 72a33fc..fb302c0 100644
--- a/data/zone/az_Latn.txt
+++ b/data/zone/az_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/az_Latn.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/az_Latn.xml
*/
az_Latn{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/az_Latn_AZ.txt b/data/zone/az_Latn_AZ.txt
index 45b7660..f907674 100644
--- a/data/zone/az_Latn_AZ.txt
+++ b/data/zone/az_Latn_AZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/bas.txt b/data/zone/bas.txt
index d55f6d9..ab27e6c 100755
--- a/data/zone/bas.txt
+++ b/data/zone/bas.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bas.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/bas.xml
*/
bas{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/be.txt b/data/zone/be.txt
index ebef021..fd60a00 100644
--- a/data/zone/be.txt
+++ b/data/zone/be.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/be.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/be.xml
*/
be{
- Version{"2.0.78.38"}
+ Version{"2.0.82.49"}
zoneStrings{
"America:Anchorage"{
ec{"Анкорыдж"}
diff --git a/data/zone/bem.txt b/data/zone/bem.txt
index 5b3814b..c81532f 100755
--- a/data/zone/bem.txt
+++ b/data/zone/bem.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bem.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/bem.xml
*/
bem{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/bez.txt b/data/zone/bez.txt
index 5113501..ed682c0 100755
--- a/data/zone/bez.txt
+++ b/data/zone/bez.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bez.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/bez.xml
*/
bez{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/bg.txt b/data/zone/bg.txt
index 55223a9..444eb4a 100644
--- a/data/zone/bg.txt
+++ b/data/zone/bg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bg.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/bg.xml
*/
bg{
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"Абиджан"}
@@ -1708,6 +1708,8 @@
ls{"Самара – стандартно време"}
}
"meta:Samoa"{
+ ld{"Самоа – лятно часово време"}
+ lg{"Самоа време"}
ls{"Самоа – стандартно време"}
}
"meta:Seychelles"{
diff --git a/data/zone/bm.txt b/data/zone/bm.txt
index f1c0632..484859d 100755
--- a/data/zone/bm.txt
+++ b/data/zone/bm.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bm.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/bm.xml
*/
bm{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/bn.txt b/data/zone/bn.txt
index 0b72f06..d9b62a3 100644
--- a/data/zone/bn.txt
+++ b/data/zone/bn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bn.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/bn.xml
*/
bn{
- Version{"2.0.78.39"}
+ Version{"2.0.82.47"}
zoneStrings{
"Africa:Abidjan"{
ec{"আবিদজান"}
@@ -1709,6 +1709,8 @@
ls{"সামারা মান সময়"}
}
"meta:Samoa"{
+ ld{"সামোয়া গৃষ্মকালীন সময়"}
+ lg{"সামোয়া সময়"}
ls{"সামোয়া মানক সময়"}
}
"meta:Seychelles"{
diff --git a/data/zone/bn_IN.txt b/data/zone/bn_IN.txt
index 225d0cb..edd243b 100755
--- a/data/zone/bn_IN.txt
+++ b/data/zone/bn_IN.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bn_IN.xml
// *
// ***************************************************************************
bn_IN{
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
zoneStrings{
"meta:Alaska"{
ld{"আলাসকা দিবালোক সময়"}
diff --git a/data/zone/bo.txt b/data/zone/bo.txt
index e3849e9..672a495 100644
--- a/data/zone/bo.txt
+++ b/data/zone/bo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bo.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/bo.xml
*/
bo{
- Version{"2.0.74.85"}
+ Version{"2.0.82.45"}
zoneStrings{
"Etc:Unknown"{
ec{"མ་རྟོགས་པ"}
diff --git a/data/zone/br.txt b/data/zone/br.txt
index c9005ca..70986ee 100755
--- a/data/zone/br.txt
+++ b/data/zone/br.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/br.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/br.xml
*/
br{
- Version{"2.0.78.38"}
+ Version{"2.0.82.57"}
zoneStrings{
"Africa:Addis_Ababa"{
ec{"Adis Abeba"}
diff --git a/data/zone/brx.txt b/data/zone/brx.txt
index 63818fd..0e8a62b 100755
--- a/data/zone/brx.txt
+++ b/data/zone/brx.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/brx.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/brx.xml
*/
brx{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"अबिद्जान"}
@@ -1176,21 +1176,11 @@
lg{"पश्चीम अफ्रीका टाईम"}
ls{"पश्चीम अफ्रीका स्टैंडर्ड टाईम"}
}
- "meta:Aktyubinsk"{
- ld{"आक्त्युबीनस्क समर टाईम"}
- lg{"आक्त्युबीनस्क टाईम"}
- ls{"आक्त्युबीनस्क स्टैंडर्ड टाईम"}
- }
"meta:Alaska"{
ld{"अलास्का डेलाईट टाईम"}
lg{"अलास्का टाईम"}
ls{"अलास्का स्टैंडर्ड टाईम"}
}
- "meta:Alaska_Hawaii"{
- ld{"अलास्का हवाई डेलाईट टाईम"}
- lg{"अलास्का हवाई टाईम"}
- ls{"अलास्का हवाई स्टैंडर्ड टाईम"}
- }
"meta:Almaty"{
ld{"अलमाटी समर टाईम"}
lg{"अलमाटी टाईम"}
@@ -1256,11 +1246,6 @@
lg{"आरमीनी टाईम"}
ls{"आरमीनी स्टैंडर्ड टाईम"}
}
- "meta:Ashkhabad"{
- ld{"अश्काबाद समर टाईम"}
- lg{"अश्काबाद टाईम"}
- ls{"अश्काबाद स्टैंडर्ड टाईम"}
- }
"meta:Atlantic"{
ld{"अटलांटीक डेलाईट टाईम"}
lg{"अटलांटीक टाईम"}
@@ -1296,32 +1281,17 @@
lg{"आज़ोर टाईम"}
ls{"आज़ोर स्टैंडर्ड टाईम"}
}
- "meta:Baku"{
- ld{"बाकु समर टाईम"}
- lg{"बाकु टाईम"}
- ls{"बाकु स्टैंडर्ड टाईम"}
- }
"meta:Bangladesh"{
ld{"बांगलादेश समर टाईम"}
lg{"बांगलादेश टाईम"}
ls{"बांगलादेश स्टैंडर्ड टाईम"}
}
- "meta:Bering"{
- ld{"बेरींग डेलाईट टाईम"}
- lg{"बेरींग टाईम"}
- ls{"बेरींग स्टैंडर्ड टाईम"}
- }
"meta:Bhutan"{
ls{"भुटान स्टैंडर्ड टाईम"}
}
"meta:Bolivia"{
ls{"बोलिविया स्टैंडर्ड टाईम"}
}
- "meta:Borneo"{
- ld{"बोर्नीओ समर टाईम"}
- lg{"बोर्नीओ टाईम"}
- ls{"बोर्नीओ स्टैंडर्ड टाईम"}
- }
"meta:Brasilia"{
ld{"ब्राज़ीलिया समर टाईम"}
lg{"ब्राज़ीलिया टाईम"}
@@ -1338,9 +1308,6 @@
"meta:Chamorro"{
ls{"चामरो स्टैंडर्ड टाईम"}
}
- "meta:Changbai"{
- ls{"चांगबाई स्टैंडर्ड टाईम"}
- }
"meta:Chatham"{
ld{"चैथम डेलाईट टाईम"}
lg{"चैथम टाईम"}
@@ -1382,23 +1349,12 @@
lg{"क्युबा टाईम"}
ls{"क्युबा स्टैंडर्ड टाईम"}
}
- "meta:Dacca"{
- ls{"ढ़ाका स्टैंडर्ड टाईम"}
- }
"meta:Davis"{
ls{"डेवीस स्टैंडर्ड टाईम"}
}
"meta:DumontDUrville"{
ls{"ड्युमों ड्युरवील स्टैंडर्ड टाईम"}
}
- "meta:Dushanbe"{
- ld{"दुशांबे समर टाईम"}
- lg{"दुशांबे टाईम"}
- ls{"दुशांबे स्टैंडर्ड टाईम"}
- }
- "meta:Dutch_Guiana"{
- ls{"डच गियना स्टैंडर्ड टाईम"}
- }
"meta:East_Timor"{
ls{"ईस्ट टीमोर स्टैंडर्ड टाईम"}
}
@@ -1441,11 +1397,6 @@
"meta:French_Southern"{
ls{"दक्षिण फ्रान्सीसी स्टैंडर्ड टाईम"}
}
- "meta:Frunze"{
- ld{"फ़्रुन्ज़े समर टाईम"}
- lg{"फ़्रुन्ज़े टाईम"}
- ls{"फ़्रुन्ज़े स्टैंडर्ड टाईम"}
- }
"meta:GMT"{
ls{"ग्रीनीच स्टैंडर्ड टाईम"}
}
@@ -1463,11 +1414,6 @@
"meta:Gilbert_Islands"{
ls{"गीलबर्ट द्वीप स्टैंडर्ड टाईम"}
}
- "meta:Greenland_Central"{
- ld{"ग्रीनलैण्ड सैन्ट्रल समर टाईम"}
- lg{"ग्रीनलैण्ड सैन्ट्रल टाईम"}
- ls{"ग्रीनलैण्ड सैन्ट्रल स्टैंडर्ड टाईम"}
- }
"meta:Greenland_Eastern"{
ld{"ग्रीनलैण्ड ईस्टर्न समर टाईम"}
lg{"ग्रीनलैण्ड ईस्टर्न टाईम"}
@@ -1546,23 +1492,12 @@
lg{"पेत्रोपावलोस्क कामचटका टाईम"}
ls{"पेत्रोपावलोस्क कामचटका स्टैंडर्ड टाईम"}
}
- "meta:Karachi"{
- ls{"कराची स्टैंडर्ड टाईम"}
- }
- "meta:Kashgar"{
- ls{"कशगार स्टैंडर्ड टाईम"}
- }
"meta:Kazakhstan_Eastern"{
ls{"क़ज़ाख़स्तान टाईम"}
}
"meta:Kazakhstan_Western"{
ls{"वेस्टर्न क़ज़ाख़स्तान टाईम"}
}
- "meta:Kizilorda"{
- ld{"कीज़ीलोर्डा डेलाईट टाईम"}
- lg{"कीज़ीलोर्डा टाईम"}
- ls{"कीज़ीलोर्डा स्टैंडर्ड टाईम"}
- }
"meta:Korea"{
ld{"कोरिया डेलाईट टाईम"}
lg{"कोरिया टाईम"}
@@ -1576,14 +1511,6 @@
lg{"क्रासनोयार्स्क टाईम"}
ls{"क्रासनोयार्स्क स्टैंडर्ड टाईम"}
}
- "meta:Kuybyshev"{
- ld{"कुयबिशेव समर टाईम"}
- lg{"कुयबिशेव टाईम"}
- ls{"कुयबिशेव स्टैंडर्ड टाईम"}
- }
- "meta:Kwajalein"{
- ls{"क्वाजलेइन स्टैंडर्ड टाईम"}
- }
"meta:Kyrgystan"{
ls{"क़ीर्ग़स्तान स्टैंडर्ड टाईम"}
}
@@ -1593,9 +1520,6 @@
"meta:Line_Islands"{
ls{"लाईन द्वीप स्टैंडर्ड टाईम"}
}
- "meta:Long_Shu"{
- ls{"लॉंग शु स्टैंडर्ड टाईम"}
- }
"meta:Lord_Howe"{
ld{"लार्ड़ होव डेलाईट टाईम"}
lg{"लार्ड़ होव टाईम"}
@@ -1611,9 +1535,6 @@
lg{"मगदन टाईम"}
ls{"मगदन स्टैंडर्ड टाईम"}
}
- "meta:Malaya"{
- ls{"मलाय स्टैंडर्ड टाईम"}
- }
"meta:Malaysia"{
ls{"मलेशिया स्टैंडर्ड टाईम"}
}
@@ -1753,22 +1674,14 @@
lg{"समारा टाईम"}
ls{"समारा स्टैंडर्ड टाईम"}
}
- "meta:Samarkand"{
- ld{"समरकंद समर टाईम"}
- lg{"समरकंद टाईम"}
- ls{"समरकंद स्टैंडर्ड टाईम"}
- }
"meta:Samoa"{
+ ld{"समोआ समर टाईम"}
+ lg{"समोआ टाईम"}
ls{"समोआ स्टैंडर्ड टाईम"}
}
"meta:Seychelles"{
ls{"सेशेल्स स्टैंडर्ड टाईम"}
}
- "meta:Shevchenko"{
- ld{"शेवचेनको समर टाईम"}
- lg{"शेवचेनको टाईम"}
- ls{"शेवचेनको स्टैंडर्ड टाईम"}
- }
"meta:Singapore"{
ls{"सींगापुर स्टैंडर्ड टाईम"}
}
@@ -1781,11 +1694,6 @@
"meta:Suriname"{
ls{"सुरीनाम स्टैंडर्ड टाईम"}
}
- "meta:Sverdlovsk"{
- ld{"स्वेर्दलोव्स्क समर टाईम"}
- lg{"स्वेर्दलोव्स्क टाईम"}
- ls{"स्वेर्दलोव्स्क स्टैंडर्ड टाईम"}
- }
"meta:Syowa"{
ls{"सीओवा स्टैंडर्ड टाईम"}
}
@@ -1795,16 +1703,6 @@
"meta:Tajikistan"{
ls{"ताजीक़ीस्तान स्टैंडर्ड टाईम"}
}
- "meta:Tashkent"{
- ld{"ताशकंद समर टाईम"}
- lg{"ताशकंद टाईम"}
- ls{"ताशकंद स्टैंडर्ड टाईम"}
- }
- "meta:Tbilisi"{
- ld{"तीबीलीसी समर टाईम"}
- lg{"तीबीलीसी टाईम"}
- ls{"तीबीलीसी स्टैंडर्ड टाईम"}
- }
"meta:Tokelau"{
ls{"टोकेलौ स्टैंडर्ड टाईम"}
}
@@ -1816,11 +1714,6 @@
"meta:Truk"{
ls{"ट्रुक स्टैंडर्ड टाईम"}
}
- "meta:Turkey"{
- ld{"तुर्की समर टाईम"}
- lg{"तुर्की टाईम"}
- ls{"तुर्की स्टैंडर्ड टाईम"}
- }
"meta:Turkmenistan"{
ld{"तुर्कमेनीस्तान समर टाईम"}
lg{"तुर्कमेनीस्तान टाईम"}
@@ -1829,19 +1722,11 @@
"meta:Tuvalu"{
ls{"तुवालु स्टैंडर्ड टाईम"}
}
- "meta:Uralsk"{
- ld{"ऊरालस्क समर टाईम"}
- lg{"ऊरालस्क टाईम"}
- ls{"ऊरालस्क स्टैंडर्ड टाईम"}
- }
"meta:Uruguay"{
ld{"ऊरुगुए समर टाईम"}
lg{"ऊरुगुए टाईम"}
ls{"ऊरुगुए स्टैंडर्ड टाईम"}
}
- "meta:Urumqi"{
- ls{"ऊरुमकी स्टैंडर्ड टाईम"}
- }
"meta:Uzbekistan"{
ld{"ऊज़्बेकिस्तान समर टाईम"}
lg{"ऊज़्बेकिस्तान टाईम"}
@@ -1884,15 +1769,5 @@
lg{"येकातेरीनाबुर्ग टाईम"}
ls{"येकातेरीनाबुर्ग स्टैंडर्ड टाईम"}
}
- "meta:Yerevan"{
- ld{"येरेवान समर टाईम"}
- lg{"येरेवान टाईम"}
- ls{"येरेवान स्टैंडर्ड टाईम"}
- }
- "meta:Yukon"{
- ld{"युकॉन डेलाईट टाईम"}
- lg{"युकॉन टाईम"}
- ls{"युकॉन स्टैंडर्ड टाईम"}
- }
}
}
diff --git a/data/zone/bs.txt b/data/zone/bs.txt
index d3ca170..99e2a91 100644
--- a/data/zone/bs.txt
+++ b/data/zone/bs.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bs.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/bs.xml
*/
bs{
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidžan"}
@@ -745,21 +745,11 @@
lg{"Zapadna Afrika vreme"}
ls{"Zapadna Afrika standardno vreme"}
}
- "meta:Aktyubinsk"{
- ld{"Aktjubinsk letnje računanje vremena"}
- lg{"Aktjubinsk vreme"}
- ls{"Aktjubinsk standardno vreme"}
- }
"meta:Alaska"{
ld{"Aljaska letnje računanje vremena"}
lg{"Aljaska vreme"}
ls{"Aljaska standardno vreme"}
}
- "meta:Alaska_Hawaii"{
- ld{"Aljaska-Havaji letnje računanje vremena"}
- lg{"Aljaska-Havaji vreme"}
- ls{"Aljaska-Havaji standardno vreme"}
- }
"meta:Almaty"{
ld{"Almatu letnje računanje vremena"}
lg{"Almatu vreme"}
@@ -825,11 +815,6 @@
lg{"Armenija vreme"}
ls{"Armenija standardno vreme"}
}
- "meta:Ashkhabad"{
- ld{"Aškabad letnje računanje vremena"}
- lg{"Aškabad vreme"}
- ls{"Aškabad standardno vreme"}
- }
"meta:Atlantic"{
ld{"Atlantsko letnje računanje vremena"}
lg{"Atlantsko vreme"}
@@ -865,32 +850,17 @@
lg{"Azori vreme"}
ls{"Azori standardno vreme"}
}
- "meta:Baku"{
- ld{"Baku letnje računanje vremena"}
- lg{"Baku vreme"}
- ls{"Baku standardno vreme"}
- }
"meta:Bangladesh"{
ld{"Bangladeš letnje računanje vremena"}
lg{"Bangladeš vreme"}
ls{"Bangladeš standardno vreme"}
}
- "meta:Bering"{
- ld{"Bering letnje računanje vremena"}
- lg{"Bering vreme"}
- ls{"Bering standardno vreme"}
- }
"meta:Bhutan"{
ls{"Butan vreme"}
}
"meta:Bolivia"{
ls{"Bolivija vreme"}
}
- "meta:Borneo"{
- ld{"Borneo letnje računanje vremena"}
- lg{"Borneo vreme"}
- ls{"Borneo standardno vreme"}
- }
"meta:Brasilia"{
ld{"Brazilija letnje računanje vremena"}
lg{"Brazilija vreme"}
@@ -907,9 +877,6 @@
"meta:Chamorro"{
ls{"Čamoro standardno vreme"}
}
- "meta:Changbai"{
- ls{"Čangbai vreme"}
- }
"meta:Chatham"{
ld{"Čatam letnje računanje vremena"}
lg{"Čatam vreme"}
@@ -951,23 +918,12 @@
lg{"Kuba vreme"}
ls{"Kuba standardno vreme"}
}
- "meta:Dacca"{
- ls{"Dača vreme"}
- }
"meta:Davis"{
ls{"Dejvis vreme"}
}
"meta:DumontDUrville"{
ls{"Dimon d’Urvil vreme"}
}
- "meta:Dushanbe"{
- ld{"Dušanbe letnje računanje vremena"}
- lg{"Dušanbe vreme"}
- ls{"Dušanbe standardno vreme"}
- }
- "meta:Dutch_Guiana"{
- ls{"Holandska Gvijana vreme"}
- }
"meta:East_Timor"{
ls{"Istočni Timor vreme"}
}
@@ -1010,11 +966,6 @@
"meta:French_Southern"{
ls{"Francuske Južne Teritorije vreme"}
}
- "meta:Frunze"{
- ld{"Frunze letnje računanje vremena"}
- lg{"Frunze vreme"}
- ls{"Frunze standardno vreme"}
- }
"meta:GMT"{
ls{"Grinvič vreme"}
}
@@ -1029,11 +980,6 @@
lg{"Gruzija vreme"}
ls{"Gruzija standardno vreme"}
}
- "meta:Greenland_Central"{
- ld{"Centralni Grenland letnje računanje vremena"}
- lg{"Centralni Grenland vreme"}
- ls{"Centralni Grenland standardno vreme"}
- }
"meta:Greenland_Eastern"{
ld{"Istočni Grenland letnje računanje vremena"}
lg{"Istočni Grenland vreme"}
@@ -1111,12 +1057,6 @@
lg{"Petropavlovsk-Kamčatski vreme"}
ls{"Petropavlovsk-Kamčatski standardno vreme"}
}
- "meta:Karachi"{
- ls{"Karači vreme"}
- }
- "meta:Kashgar"{
- ls{"Kašgar vreme"}
- }
"meta:Kazakhstan_Eastern"{
ls{"Istočni Kazahstan vreme"}
}
@@ -1136,14 +1076,6 @@
lg{"Krasnojarsk vreme"}
ls{"Krasnojarsk standardno vreme"}
}
- "meta:Kuybyshev"{
- ld{"Kujbišev letnje računanje vemena"}
- lg{"Kujbišev vreme"}
- ls{"Kujbišev standardno vreme"}
- }
- "meta:Kwajalein"{
- ls{"Kvajalejnsko vreme"}
- }
"meta:Kyrgystan"{
ls{"Kirgizstan vreme"}
}
@@ -1153,9 +1085,6 @@
"meta:Line_Islands"{
ls{"Lajn ostrva vreme"}
}
- "meta:Long_Shu"{
- ls{"Long Šu vreme"}
- }
"meta:Lord_Howe"{
ld{"Lord Hov letnje računanje vremena"}
lg{"Lord Hov vreme"}
@@ -1171,9 +1100,6 @@
lg{"Magadan vreme"}
ls{"Magadan standardno vreme"}
}
- "meta:Malaya"{
- ls{"Malaja vreme"}
- }
"meta:Malaysia"{
ls{"Malezija vreme"}
}
@@ -1313,22 +1239,14 @@
lg{"Samara vreme"}
ls{"Samara standardno vreme"}
}
- "meta:Samarkand"{
- ld{"Samarkand letnje računanje vremena"}
- lg{"Samarkand vreme"}
- ls{"Samarkand standardno vreme"}
- }
"meta:Samoa"{
+ ld{"Samoa letnje računanje vremena"}
+ lg{"Samoa vreme"}
ls{"Samoa standardno vreme"}
}
"meta:Seychelles"{
ls{"Sejšeli vreme"}
}
- "meta:Shevchenko"{
- ld{"Ševčenko letnje računanje vremena"}
- lg{"Ševčenko vreme"}
- ls{"Ševčenko standardno vreme"}
- }
"meta:Singapore"{
ls{"Singapur standardno vreme"}
}
@@ -1341,11 +1259,6 @@
"meta:Suriname"{
ls{"Surinam vreme"}
}
- "meta:Sverdlovsk"{
- ld{"Sverdlovsk letnje računanje vremena"}
- lg{"Sverdlovsk vreme"}
- ls{"Sverdlovsk standardno vreme"}
- }
"meta:Syowa"{
ls{"Šova vreme"}
}
@@ -1355,16 +1268,6 @@
"meta:Tajikistan"{
ls{"Tadžikistan vreme"}
}
- "meta:Tashkent"{
- ld{"Taškent letnje računanje vremena"}
- lg{"Taškent vreme"}
- ls{"Taškent standardno vreme"}
- }
- "meta:Tbilisi"{
- ld{"Tbilisi letnje računanje vremena"}
- lg{"Tbilisi vreme"}
- ls{"Tbilisi standardno vreme"}
- }
"meta:Tokelau"{
ls{"Tokelo vreme"}
}
@@ -1376,11 +1279,6 @@
"meta:Truk"{
ls{"Truk vreme"}
}
- "meta:Turkey"{
- ld{"Turska letnje računanje vremena"}
- lg{"Turska vreme"}
- ls{"Turska standardno vreme"}
- }
"meta:Turkmenistan"{
ld{"Turkmenistan letnje računanje vremena"}
lg{"Turkmenistan vreme"}
@@ -1389,19 +1287,11 @@
"meta:Tuvalu"{
ls{"Tuvalu vreme"}
}
- "meta:Uralsk"{
- ld{"Ural'sk letnje računanje vremena"}
- lg{"Ural'sk vreme"}
- ls{"Ural'sk standardno vreme"}
- }
"meta:Uruguay"{
ld{"Urugvaj letnje računanje vremena"}
lg{"Urugvaj vreme"}
ls{"Urugvaj standardno vreme"}
}
- "meta:Urumqi"{
- ls{"Urumki vreme"}
- }
"meta:Uzbekistan"{
ld{"Uzbekistan letnje računanje vremena"}
lg{"Uzbekistan vreme"}
@@ -1444,15 +1334,5 @@
lg{"Jekaterinburg vreme"}
ls{"Jekaterinburg standardno vreme"}
}
- "meta:Yerevan"{
- ld{"Jerevan letnje računanje vremena"}
- lg{"Jerevan vreme"}
- ls{"Jerevan standardno vreme"}
- }
- "meta:Yukon"{
- ld{"Jukon letnje računanje vremena"}
- lg{"Jukon vreme"}
- ls{"Jukon standardno vreme"}
- }
}
}
diff --git a/data/zone/bs_BA.txt b/data/zone/bs_BA.txt
index 3fb951c..a5158e5 100755
--- a/data/zone/bs_BA.txt
+++ b/data/zone/bs_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/bs_Cyrl.txt b/data/zone/bs_Cyrl.txt
index 9f01205..5f86951 100755
--- a/data/zone/bs_Cyrl.txt
+++ b/data/zone/bs_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bs_Cyrl.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/bs_Cyrl.xml
*/
bs_Cyrl{
- Version{"2.0.78.38"}
+ Version{"2.0.82.47"}
zoneStrings{
"Africa:Abidjan"{
ec{"Абиџан"}
@@ -1240,11 +1240,6 @@
lg{"Западно-афричко време"}
ls{"Западно-афричко стандардно време"}
}
- "meta:Aktyubinsk"{
- ld{"Актјубинск летње рачунање времена"}
- lg{"Актјубинск време"}
- ls{"Актјубинск стандардно време"}
- }
"meta:Alaska"{
ld{"Аљашко летње време"}
lg{"Аљашко време"}
@@ -1315,11 +1310,6 @@
lg{"Арменија време"}
ls{"Арменија стандардно време"}
}
- "meta:Ashkhabad"{
- ld{"Ашкабад летње рачунање времена"}
- lg{"Ашкабад време"}
- ls{"Ашкабад стандардно време"}
- }
"meta:Atlantic"{
ld{"Атланско лтње рачунање времена"}
lg{"Атланско време"}
@@ -1355,32 +1345,17 @@
lg{"Азори време"}
ls{"Азори стандардно време"}
}
- "meta:Baku"{
- ld{"Баку летње рачунање времена"}
- lg{"Баку време"}
- ls{"Баку стандардно време"}
- }
"meta:Bangladesh"{
ld{"Бангладеш летње рачунање времена"}
lg{"Бангладеш време"}
ls{"Бангладеш стандардно време"}
}
- "meta:Bering"{
- ld{"Беринг летње рачунање времена"}
- lg{"Беринг време"}
- ls{"Беринг стандардно време"}
- }
"meta:Bhutan"{
ls{"Бутан време"}
}
"meta:Bolivia"{
ls{"Боливија време"}
}
- "meta:Borneo"{
- ld{"Борнео летње рачунање времена"}
- lg{"Борнео време"}
- ls{"Борнео стандардно време"}
- }
"meta:Brasilia"{
ld{"Бразилија летње рачунање времена"}
lg{"Бразилија време"}
@@ -1397,9 +1372,6 @@
"meta:Chamorro"{
ls{"Чаморо време"}
}
- "meta:Changbai"{
- ls{"Чангбаи време"}
- }
"meta:Chatham"{
ld{"Чатам летње рачунање времена"}
lg{"Чатам време"}
@@ -1441,23 +1413,12 @@
lg{"Куба време"}
ls{"Куба стандардно време"}
}
- "meta:Dacca"{
- ls{"Дача време"}
- }
"meta:Davis"{
ls{"Дејвис време"}
}
"meta:DumontDUrville"{
ls{"Димон д’Урвил време"}
}
- "meta:Dushanbe"{
- ld{"Душанбе летње рачунање времена"}
- lg{"Душанбе време"}
- ls{"Душанбе стандардно време"}
- }
- "meta:Dutch_Guiana"{
- ls{"Холандска Гвајана време"}
- }
"meta:East_Timor"{
ls{"Источни тимор време"}
}
@@ -1500,11 +1461,6 @@
"meta:French_Southern"{
ls{"Француско јужно и антарктичко време"}
}
- "meta:Frunze"{
- ld{"Фрунзе летње рачунање времена"}
- lg{"Фрунзе време"}
- ls{"Фрунзе стандардно време"}
- }
"meta:GMT"{
ls{"Гринвич средње време"}
}
@@ -1522,11 +1478,6 @@
"meta:Gilbert_Islands"{
ls{"Гилберт острва време"}
}
- "meta:Greenland_Central"{
- ld{"Централни Гренланд летње рачунање времена"}
- lg{"Централни Гренланд време"}
- ls{"Централни Гренланд стандардно време"}
- }
"meta:Greenland_Eastern"{
ld{"Источни Гренланд летње рачунање времена"}
lg{"Источни Гренланд време"}
@@ -1604,12 +1555,6 @@
lg{"Петропавловско-камчатско време"}
ls{"Петропавловско-камчатско стандардно време"}
}
- "meta:Karachi"{
- ls{"Карачи време"}
- }
- "meta:Kashgar"{
- ls{"Кашгар време"}
- }
"meta:Kazakhstan_Eastern"{
ls{"Источно-казахстанско време"}
}
@@ -1629,14 +1574,6 @@
lg{"Краснојарск време"}
ls{"Краснојарск стандардно време"}
}
- "meta:Kuybyshev"{
- ld{"Кујбишев летње рачунање времена"}
- lg{"Кујбишев време"}
- ls{"Кујбишев стандардно време"}
- }
- "meta:Kwajalein"{
- ls{"Кваџалејин време"}
- }
"meta:Kyrgystan"{
ls{"Киргизстан време"}
}
@@ -1646,9 +1583,6 @@
"meta:Line_Islands"{
ls{"Лине Острва време"}
}
- "meta:Long_Shu"{
- ls{"Лонг Шу време"}
- }
"meta:Lord_Howe"{
ld{"Лорд Хов летње рачунање времена"}
lg{"Лорд Хов време"}
@@ -1667,9 +1601,6 @@
lg{"Магадан време"}
ls{"Магадан стандардно време"}
}
- "meta:Malaya"{
- ls{"Малаја време"}
- }
"meta:Malaysia"{
ls{"Малезија време"}
}
@@ -1806,22 +1737,14 @@
lg{"Самара време"}
ls{"Самара стандардно време"}
}
- "meta:Samarkand"{
- ld{"Самарканд летње рачунање времена"}
- lg{"Самарканд време"}
- ls{"Самарканд стандардно време"}
- }
"meta:Samoa"{
+ ld{"Самоа летње рачунање времена"}
+ lg{"Самоа време"}
ls{"Самоа стандардно време"}
}
"meta:Seychelles"{
ls{"Сејшели време"}
}
- "meta:Shevchenko"{
- ld{"Шевченко летње рачунање времена"}
- lg{"Шевченко време"}
- ls{"Шевченко стандардно време"}
- }
"meta:Singapore"{
ls{"Сингапур стандардно време"}
}
@@ -1834,11 +1757,6 @@
"meta:Suriname"{
ls{"Суринам време"}
}
- "meta:Sverdlovsk"{
- ld{"Свердловск летње рачунање времена"}
- lg{"Свердловск време"}
- ls{"Свердловск стандардно време"}
- }
"meta:Syowa"{
ls{"Шова време"}
}
@@ -1853,16 +1771,6 @@
"meta:Tajikistan"{
ls{"Таџикистан време"}
}
- "meta:Tashkent"{
- ld{"Ташкент летње рачунање времена"}
- lg{"Ташкент време"}
- ls{"Ташкент стандардно време"}
- }
- "meta:Tbilisi"{
- ld{"Тбилиси летње рачунање времена"}
- lg{"Тбилиси време"}
- ls{"Тбилиси стандардно време"}
- }
"meta:Tokelau"{
ls{"Токелау време"}
}
@@ -1874,11 +1782,6 @@
"meta:Truk"{
ls{"Трук време"}
}
- "meta:Turkey"{
- ld{"Турска летње рачунање времена"}
- lg{"Турска време"}
- ls{"Турска стандардно време"}
- }
"meta:Turkmenistan"{
ld{"Туркменистан летње рачунање времена"}
lg{"Туркменистан време"}
@@ -1887,19 +1790,11 @@
"meta:Tuvalu"{
ls{"Тувалу време"}
}
- "meta:Uralsk"{
- ld{"Уралск летње рачунање времена"}
- lg{"Уралск време"}
- ls{"Уралск стандардно време"}
- }
"meta:Uruguay"{
ld{"Уругвај летње рачунање времена"}
lg{"Уругвај време"}
ls{"Уругвај стандардно време"}
}
- "meta:Urumqi"{
- ls{"Урумки време"}
- }
"meta:Uzbekistan"{
ld{"Узбекистан летње рачунање времена"}
lg{"Узбекистан време"}
@@ -1942,16 +1837,6 @@
lg{"Јекатеринбург време"}
ls{"Јекатеринбург стандардно време"}
}
- "meta:Yerevan"{
- ld{"Јереван летње рачунање времена"}
- lg{"Јереван време"}
- ls{"Јереван стандардно време"}
- }
- "meta:Yukon"{
- ld{"Јукон летње рачунање времена"}
- lg{"Јукон време"}
- ls{"Јукон стандардно време"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"Време у земљи: {1} ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/bs_Latn.txt b/data/zone/bs_Latn.txt
index 3ea3b65..940f036 100755
--- a/data/zone/bs_Latn.txt
+++ b/data/zone/bs_Latn.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/bs_Latn.xml
// *
// ***************************************************************************
bs_Latn{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/bs_Latn_BA.txt b/data/zone/bs_Latn_BA.txt
index 3906520..f6c37c6 100755
--- a/data/zone/bs_Latn_BA.txt
+++ b/data/zone/bs_Latn_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/ca.txt b/data/zone/ca.txt
index fa1e208..02a2b49 100644
--- a/data/zone/ca.txt
+++ b/data/zone/ca.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ca.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/ca.xml
*/
ca{
- Version{"2.0.78.32"}
+ Version{"2.0.82.57"}
zoneStrings{
"Africa:Addis_Ababa"{
ec{"Addis Abeba"}
@@ -432,11 +432,6 @@
lg{"Hora d'Alaska"}
ls{"Horari estàndard d'Alaska"}
}
- "meta:Alaska_Hawaii"{
- ld{"Horari d'estiu d'Alaska-Hawaii"}
- lg{"Hora d'Alaska-Hawaii"}
- ls{"Hora estàndard d'Alaska-Hawaii"}
- }
"meta:Amazon"{
ld{"Hora d'estiu de l'Amazones"}
lg{"Hora de l'Amazones"}
@@ -522,11 +517,6 @@
lg{"Hora de Bangla Desh"}
ls{"Hora estàndard de Bangla Desh"}
}
- "meta:Bering"{
- ld{"Hora d'estiu de Bering"}
- lg{"Hora de Bering"}
- ls{"Hora estàndard de Bering"}
- }
"meta:Bhutan"{
ls{"Hora de Bhutan"}
}
@@ -623,11 +613,6 @@
lg{"Hora de Geòrgia"}
ls{"Hora estàndard de Geòrgia"}
}
- "meta:Greenland_Central"{
- ld{"Horari d'estiu de Grenlàndia Central"}
- lg{"Hora de Grenlàndia Central"}
- ls{"Hora estàndard de Grenlàndia Central"}
- }
"meta:Greenland_Eastern"{
ld{"Hora d'estiu de l'Est de Grenlàndia"}
lg{"Hora de l'Est de Grenlàndia"}
@@ -710,11 +695,6 @@
lg{"Hora de Krasnoiarsk"}
ls{"Hora estàndard de Krasnoiarsk"}
}
- "meta:Kuybyshev"{
- ld{"Hora d'estiu de Kujbysev"}
- lg{"Hora de Kujbysev"}
- ls{"Hora estàndard de Kujbysev"}
- }
"meta:Kyrgystan"{
ls{"Hora del Kirguizistan"}
}
@@ -849,6 +829,11 @@
lg{"Hora de Samara"}
ls{"Hora estàndard de Samara"}
}
+ "meta:Samoa"{
+ ld{"Hora d'estiu de Samoa"}
+ lg{"Hora de Samoa"}
+ ls{"Hora estàndard de Samoa"}
+ }
"meta:Seychelles"{
ls{"Hora de les Seychelles"}
}
@@ -886,11 +871,6 @@
"meta:Truk"{
ls{"Hora de Chuuk"}
}
- "meta:Turkey"{
- ld{"Hora d'estiu de Turquia"}
- lg{"Hora de Turquia"}
- ls{"Hora estàndard de Turquia"}
- }
"meta:Turkmenistan"{
ld{"Hora d'estiu del Turkmenistan"}
lg{"Hora del Turkmenistan"}
@@ -941,11 +921,6 @@
lg{"Hora d'Ekaterinburg"}
ls{"Hora estàndard d'Ekaterinburg"}
}
- "meta:Yukon"{
- ld{"Hora d'estiu de Yuokon"}
- lg{"Hora de Yukon"}
- ls{"Hora estàndard de Yukon"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"Hora de: {1} ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/cgg.txt b/data/zone/cgg.txt
index 6f70031..3790444 100755
--- a/data/zone/cgg.txt
+++ b/data/zone/cgg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/cgg.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/cgg.xml
*/
cgg{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/chr.txt b/data/zone/chr.txt
index 24a9163..ccf7978 100755
--- a/data/zone/chr.txt
+++ b/data/zone/chr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/chr.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/chr.xml
*/
chr{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
zoneStrings{
"meta:America_Central"{
ld{"ᎠᏰᎵ ᎢᎦ ᎢᏳᏩᎪᏗ"}
diff --git a/data/zone/cs.txt b/data/zone/cs.txt
index b4f0b88..d4fce91 100644
--- a/data/zone/cs.txt
+++ b/data/zone/cs.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/cs.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/cs.xml
*/
cs{
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidžan"}
@@ -506,21 +506,11 @@
lg{"Západoafrický čas"}
ls{"Západoafrický standardní čas"}
}
- "meta:Aktyubinsk"{
- ld{"Akťubinský letní čas"}
- lg{"Akťubinský čas"}
- ls{"Akťubinský standardní čas"}
- }
"meta:Alaska"{
ld{"Aljašský letní čas"}
lg{"Aljašský čas"}
ls{"Aljašský standardní čas"}
}
- "meta:Alaska_Hawaii"{
- ld{"Aljašsko-havajský letní čas"}
- lg{"Aljašsko-havajský čas"}
- ls{"Aljašsko-havajský standardní čas"}
- }
"meta:Almaty"{
ld{"Almatský letní čas"}
lg{"Almatský čas"}
@@ -586,11 +576,6 @@
lg{"Arménský čas"}
ls{"Arménský standardní čas"}
}
- "meta:Ashkhabad"{
- ld{"Ašchabadský letní čas"}
- lg{"Ašchabadský čas"}
- ls{"Ašchabadský standardní čas"}
- }
"meta:Atlantic"{
ld{"Atlantický letní čas"}
lg{"Atlantický čas"}
@@ -626,32 +611,17 @@
lg{"Azorský čas"}
ls{"Azorský standardní čas"}
}
- "meta:Baku"{
- ld{"Bakuský letní čas"}
- lg{"Bakuský čas"}
- ls{"Bakuský standardní čas"}
- }
"meta:Bangladesh"{
ld{"Bangladéšský letní čas"}
lg{"Bangladéšský čas"}
ls{"Bangladéšský standardní čas"}
}
- "meta:Bering"{
- ld{"Beringský letní čas"}
- lg{"Beringský čas"}
- ls{"Beringský standardní čas"}
- }
"meta:Bhutan"{
ls{"Bhútánský čas"}
}
"meta:Bolivia"{
ls{"Bolivijský čas"}
}
- "meta:Borneo"{
- ld{"Bornejský letní čas"}
- lg{"Bornejský čas"}
- ls{"Bornejský standardní čas"}
- }
"meta:Brasilia"{
ld{"Brasilijský letní čas"}
lg{"Brasilijský čas"}
@@ -671,9 +641,6 @@
"meta:Chamorro"{
ls{"Chamorrský čas"}
}
- "meta:Changbai"{
- ls{"Čchangpejský čas"}
- }
"meta:Chatham"{
ld{"Chathamský letní čas"}
lg{"Chathamský čas"}
@@ -715,23 +682,12 @@
lg{"Kubánský čas"}
ls{"Kubánský standardní čas"}
}
- "meta:Dacca"{
- ls{"Dhácký čas"}
- }
"meta:Davis"{
ls{"Čas Davisovy stanice"}
}
"meta:DumontDUrville"{
ls{"Čas stanice Dumonta d’Urvilla"}
}
- "meta:Dushanbe"{
- ld{"Dušanbský letní čas"}
- lg{"Dušanbský čas"}
- ls{"Dušanbský standardní čas"}
- }
- "meta:Dutch_Guiana"{
- ls{"Nizozemskoguyanský čas"}
- }
"meta:East_Timor"{
ls{"Východotimorský čas"}
}
@@ -774,11 +730,6 @@
"meta:French_Southern"{
ls{"Čas Francouzských jižních a antarktických území"}
}
- "meta:Frunze"{
- ld{"Frunzský letní čas"}
- lg{"Frunzský čas"}
- ls{"Frunzský standardní čas"}
- }
"meta:GMT"{
ls{"Greenwichský střední čas"}
}
@@ -796,11 +747,6 @@
"meta:Gilbert_Islands"{
ls{"Čas Gilbertových ostrovů"}
}
- "meta:Greenland_Central"{
- ld{"Středogrónský letní čas"}
- lg{"Středogrónský čas"}
- ls{"Středogrónský standardní čas"}
- }
"meta:Greenland_Eastern"{
ld{"Východogrónský letní čas"}
lg{"Východogrónský čas"}
@@ -878,12 +824,6 @@
lg{"Petropavlovsko-kamčatský čas"}
ls{"Petropavlovsko-kamčatský standardní čas"}
}
- "meta:Karachi"{
- ls{"Karáčský čas"}
- }
- "meta:Kashgar"{
- ls{"Kašgarský čas"}
- }
"meta:Kazakhstan_Eastern"{
ls{"Východokazachstánský čas"}
}
@@ -903,14 +843,6 @@
lg{"Krasnojarský čas"}
ls{"Krasnojarský standardní čas"}
}
- "meta:Kuybyshev"{
- ld{"Kujbyševský letní čas"}
- lg{"Kujbyševský čas"}
- ls{"Kujbyševský standardní čas"}
- }
- "meta:Kwajalein"{
- ls{"Kwajaleinský čas"}
- }
"meta:Kyrgystan"{
ls{"Kyrgyzský čas"}
}
@@ -935,9 +867,6 @@
lg{"Magadanský čas"}
ls{"Magadanský standardní čas"}
}
- "meta:Malaya"{
- ls{"Malajský čas"}
- }
"meta:Malaysia"{
ls{"Malajsijský čas"}
}
@@ -1077,13 +1006,10 @@
lg{"Samarský čas"}
ls{"Samarský standardní čas"}
}
- "meta:Samarkand"{
- ld{"Samarkandský letní čas"}
- lg{"Samarkandský čas"}
- ls{"Samarkandský standardní čas"}
- }
"meta:Samoa"{
- ls{"Samojský čas"}
+ ld{"Samojský letní čas"}
+ lg{"Samojský čas"}
+ ls{"Samojský standardní čas"}
}
"meta:Seychelles"{
ls{"Seychelský čas"}
@@ -1100,11 +1026,6 @@
"meta:Suriname"{
ls{"Surinamský čas"}
}
- "meta:Sverdlovsk"{
- ld{"Sverdlovský letní čas"}
- lg{"Sverdlovský čas"}
- ls{"Sverdlovský standardní čas"}
- }
"meta:Syowa"{
ls{"Čas stanice Šówa"}
}
@@ -1119,16 +1040,6 @@
"meta:Tajikistan"{
ls{"Tádžický čas"}
}
- "meta:Tashkent"{
- ld{"Taškentský letní čas"}
- lg{"Taškentský čas"}
- ls{"Taškentský standardní čas"}
- }
- "meta:Tbilisi"{
- ld{"Tbiliský letní čas"}
- lg{"Tbiliský čas"}
- ls{"Tbiliský standardní čas"}
- }
"meta:Tokelau"{
ls{"Tokelauský čas"}
}
@@ -1140,11 +1051,6 @@
"meta:Truk"{
ls{"Chuukský čas"}
}
- "meta:Turkey"{
- ld{"Turecký letní čas"}
- lg{"Turecký čas"}
- ls{"Turecký standardní čas"}
- }
"meta:Turkmenistan"{
ld{"Turkmenský letní čas"}
lg{"Turkmenský čas"}
@@ -1153,19 +1059,11 @@
"meta:Tuvalu"{
ls{"Tuvalský čas"}
}
- "meta:Uralsk"{
- ld{"Uralský letní čas"}
- lg{"Uralský čas"}
- ls{"Uralský standardní čas"}
- }
"meta:Uruguay"{
ld{"Uruguayský letní čas"}
lg{"Uruguayský čas"}
ls{"Uruguayský standardní čas"}
}
- "meta:Urumqi"{
- ls{"Urumčijský čas"}
- }
"meta:Uzbekistan"{
ld{"Uzbecký letní čas"}
lg{"Uzbecký čas"}
@@ -1208,16 +1106,6 @@
lg{"Jekatěrinburský čas"}
ls{"Jekatěrinburský standardní čas"}
}
- "meta:Yerevan"{
- ld{"Jerevanský letní čas"}
- lg{"Jerevanský čas"}
- ls{"Jerevanský standardní čas"}
- }
- "meta:Yukon"{
- ld{"Yukonský letní čas"}
- lg{"Yukonský čas"}
- ls{"Yukonský standardní čas"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"Časové pásmo {1} ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/cy.txt b/data/zone/cy.txt
index 70bb1e0..ca32a80 100644
--- a/data/zone/cy.txt
+++ b/data/zone/cy.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/cy.xml
// *
@@ -10,8 +10,796 @@
* ICU <specials> source: <path>/xml/main/cy.xml
*/
cy{
- Version{"2.0.78.38"}
+ Version{"2.0.82.51"}
zoneStrings{
- hourFormat{"+HHmm;-HHmm"}
+ "Africa:Asmera"{
+ ec{"Asmara"}
+ }
+ "Africa:Ndjamena"{
+ ec{"N'Djamena"}
+ }
+ "Africa:Sao_Tome"{
+ ec{"São Tomé"}
+ }
+ "America:Coral_Harbour"{
+ ec{"Atikokan"}
+ }
+ "America:Curacao"{
+ ec{"Curaçao"}
+ }
+ "America:Godthab"{
+ ec{"Godthab"}
+ }
+ "America:Havana"{
+ ec{"Habana"}
+ }
+ "America:Indiana:Knox"{
+ ec{"Knox, Indiana"}
+ }
+ "America:Indiana:Marengo"{
+ ec{"Marengo, Indiana"}
+ }
+ "America:Indiana:Petersburg"{
+ ec{"Petersburg, Indiana"}
+ }
+ "America:Indiana:Tell_City"{
+ ec{"Dinas Tell, Indiana"}
+ }
+ "America:Indiana:Vevay"{
+ ec{"Vevay, Indiana"}
+ }
+ "America:Indiana:Vincennes"{
+ ec{"Vincennes, Indiana"}
+ }
+ "America:Indiana:Winamac"{
+ ec{"Winamac, Indiana"}
+ }
+ "America:Kentucky:Monticello"{
+ ec{"Monticello, Kentucky"}
+ }
+ "America:Lower_Princes"{
+ ec{"Lower Prince's Quarter"}
+ }
+ "America:Mexico_City"{
+ ec{"Dinas Mecsico"}
+ }
+ "America:New_York"{
+ ec{"Efrog Newydd"}
+ }
+ "America:North_Dakota:Beulah"{
+ ec{"Beulah, Gogledd Dakota"}
+ }
+ "America:North_Dakota:Center"{
+ ec{"Center, Gogledd Dakota"}
+ }
+ "America:North_Dakota:New_Salem"{
+ ec{"New Salem, Gogledd Dakota"}
+ }
+ "America:Scoresbysund"{
+ ec{"Scoresbysund"}
+ }
+ "America:St_Barthelemy"{
+ ec{"St. Barthelemy"}
+ }
+ "America:St_Johns"{
+ ec{"St. John’s"}
+ }
+ "America:St_Kitts"{
+ ec{"Saint Kitts"}
+ }
+ "America:St_Lucia"{
+ ec{"Saint Lucia"}
+ }
+ "America:St_Thomas"{
+ ec{"Saint Thomas"}
+ }
+ "America:St_Vincent"{
+ ec{"Saint Vincent"}
+ }
+ "Antarctica:DumontDUrville"{
+ ec{"Dumont d’Urville"}
+ }
+ "Antarctica:South_Pole"{
+ ec{"Pegwn y De"}
+ }
+ "Asia:Aqtau"{
+ ec{"Aktau"}
+ }
+ "Asia:Aqtobe"{
+ ec{"Aqtöbe"}
+ }
+ "Asia:Calcutta"{
+ ec{"Kolkata"}
+ }
+ "Asia:Hovd"{
+ ec{"Khovd"}
+ }
+ "Asia:Jerusalem"{
+ ec{"Jeriwsalem"}
+ }
+ "Asia:Katmandu"{
+ ec{"Kathmandu"}
+ }
+ "Asia:Pyongyang"{
+ ec{"P'yŏngyang"}
+ }
+ "Asia:Rangoon"{
+ ec{"Yangon"}
+ }
+ "Asia:Saigon"{
+ ec{"Dinas Ho Chi Minh"}
+ }
+ "Asia:Sakhalin"{
+ ec{"Sachalin"}
+ }
+ "Asia:Samarkand"{
+ ec{"Samarcand"}
+ }
+ "Asia:Ulaanbaatar"{
+ ec{"Ulan Bator"}
+ }
+ "Asia:Urumqi"{
+ ec{"Ürümqi"}
+ }
+ "Asia:Yekaterinburg"{
+ ec{"Ekaterinburg"}
+ }
+ "Atlantic:Cape_Verde"{
+ ec{"Cabo Verde"}
+ }
+ "Atlantic:Faeroe"{
+ ec{"Føroyar"}
+ }
+ "Atlantic:Reykjavik"{
+ ec{"Reykjavík"}
+ }
+ "Atlantic:South_Georgia"{
+ ec{"De Georgia"}
+ }
+ "Atlantic:St_Helena"{
+ ec{"Saint Helena"}
+ }
+ "Etc:Unknown"{
+ ec{"Dinas Anhysbys"}
+ }
+ "Europe:Athens"{
+ ec{"Athen"}
+ }
+ "Europe:Belgrade"{
+ ec{"Beograd"}
+ }
+ "Europe:Brussels"{
+ ec{"Brwsel"}
+ }
+ "Europe:Bucharest"{
+ ec{"Bucureşti"}
+ }
+ "Europe:Chisinau"{
+ ec{"Chişinău"}
+ }
+ "Europe:Dublin"{
+ ec{"Dulyn"}
+ ld{"Amser Haf Iwerddon"}
+ }
+ "Europe:Isle_of_Man"{
+ ec{"Ynys Manaw"}
+ }
+ "Europe:London"{
+ ec{"Llundain"}
+ ld{"Amser Haf Prydain"}
+ }
+ "Europe:Luxembourg"{
+ ec{"Lwcsembwrg"}
+ }
+ "Europe:Moscow"{
+ ec{"Moscfa"}
+ }
+ "Europe:Prague"{
+ ec{"Prag"}
+ }
+ "Europe:Rome"{
+ ec{"Rhufain"}
+ }
+ "Europe:Tirane"{
+ ec{"Tirana"}
+ }
+ "Europe:Uzhgorod"{
+ ec{"Uzhhorod"}
+ }
+ "Europe:Vatican"{
+ ec{"y Fatican"}
+ }
+ "Europe:Vienna"{
+ ec{"Fienna"}
+ }
+ "Europe:Zurich"{
+ ec{"Zürich"}
+ }
+ "Indian:Christmas"{
+ ec{"Ynys y Nadolig"}
+ }
+ "Indian:Mahe"{
+ ec{"Mahé"}
+ }
+ "Pacific:Noumea"{
+ ec{"Nouméa"}
+ }
+ "Pacific:Ponape"{
+ ec{"Pohnpei"}
+ }
+ "Pacific:Truk"{
+ ec{"Chuuk"}
+ }
+ "meta:Afghanistan"{
+ ls{"Amser Afghanistan"}
+ }
+ "meta:Africa_Central"{
+ ls{"Amser Canolbarth Affrica"}
+ }
+ "meta:Africa_Eastern"{
+ ls{"Amser Dwyrain Affrica"}
+ }
+ "meta:Africa_Southern"{
+ ls{"Amser De Affrica"}
+ }
+ "meta:Africa_Western"{
+ ld{"Amser Haf Gorllewin Affrica"}
+ lg{"Amser Gorllewin Affrica"}
+ ls{"Amser Safonol Gorllewin Affrica"}
+ }
+ "meta:Alaska"{
+ ld{"Amser Haf Alaska"}
+ lg{"Amser Alaska"}
+ ls{"Amser Safonol Alaska"}
+ }
+ "meta:Amazon"{
+ ld{"Amser Haf Amazon"}
+ lg{"Amser Amazon"}
+ ls{"Amser Safonol Amazon"}
+ }
+ "meta:America_Central"{
+ ld{"Amser Haf Canolbarth Gogledd America"}
+ lg{"Amser Canolbarth Gogledd America"}
+ ls{"Amser Safonol Canolbarth Gogledd America"}
+ }
+ "meta:America_Eastern"{
+ ld{"Amser Haf Dwyrain Gogledd America"}
+ lg{"Amser Dwyrain Gogledd America"}
+ ls{"Amser Safonol Dwyrain Gogledd America"}
+ }
+ "meta:America_Mountain"{
+ ld{"Amser Haf Mynyddoedd Gogledd America"}
+ lg{"Amser Mynyddoedd Gogledd America"}
+ ls{"Amser Safonol Mynyddoedd Gogledd America"}
+ }
+ "meta:America_Pacific"{
+ ld{"Amser Haf Cefnfor Tawel Gogledd America"}
+ lg{"Amser Cefnfor Tawel Gogledd America"}
+ ls{"Amser Safonol Cefnfor Tawel Gogledd America"}
+ }
+ "meta:Arabian"{
+ ld{"Amser Haf Arabaidd"}
+ lg{"Amser Arabaidd"}
+ ls{"Amser Safonol Arabaidd"}
+ }
+ "meta:Argentina"{
+ ld{"Amser Haf yr Ariannin"}
+ lg{"Amser yr Ariannin"}
+ ls{"Amser Safonol yr Ariannin"}
+ }
+ "meta:Argentina_Western"{
+ ld{"Amser Haf Gorllewin yr Ariannin"}
+ lg{"Amser Gorllewin yr Ariannin"}
+ ls{"Amser Safonol Gorllewin yr Ariannin"}
+ }
+ "meta:Armenia"{
+ ld{"Amser Haf Armenia"}
+ lg{"Amser Armenia"}
+ ls{"Amser Safonol Armenia"}
+ }
+ "meta:Atlantic"{
+ ld{"Amser Haf Cefnfor yr Iwerydd"}
+ lg{"Amser Cefnfor yr Iwerydd"}
+ ls{"Amser Safonol Cefnfor yr Iwerydd"}
+ }
+ "meta:Australia_Central"{
+ ld{"Amser Haf Canolbarth Awstralia"}
+ lg{"Amser Canolbarth Awstralia"}
+ ls{"Amser Safonol Canolbarth Awstralia"}
+ }
+ "meta:Australia_CentralWestern"{
+ ld{"Amser Haf Canolbarth Gorllewin Awstralia"}
+ lg{"Amser Canolbarth Gorllewin Awstralia"}
+ ls{"Amser Safonol Canolbarth Gorllewin Awstralia"}
+ }
+ "meta:Australia_Eastern"{
+ ld{"Amser Haf Dwyrain Awstralia"}
+ lg{"Amser Dwyrain Awstralia"}
+ ls{"Amser Safonol Dwyrain Awstralia"}
+ }
+ "meta:Australia_Western"{
+ ld{"Amser Haf Gorllewin Awstralia"}
+ lg{"Amser Gorllewin Awstralia"}
+ ls{"Amser Safonol Gorllewin Awstralia"}
+ }
+ "meta:Azerbaijan"{
+ ld{"Amser Haf Azerbaijan"}
+ lg{"Amser Azerbaijan"}
+ ls{"Amser Safonol Azerbaijan"}
+ }
+ "meta:Azores"{
+ ld{"Amser Haf Azores"}
+ lg{"Amser Azores"}
+ ls{"Amser Safonol Azores"}
+ }
+ "meta:Bangladesh"{
+ ld{"Amser Haf Bangladesh"}
+ lg{"Amser Bangladesh"}
+ ls{"Amser Safonol Bangladesh"}
+ }
+ "meta:Bhutan"{
+ ls{"Amser Bhutan"}
+ }
+ "meta:Bolivia"{
+ ls{"Amser Bolifia"}
+ }
+ "meta:Brasilia"{
+ ld{"Amser Haf Brasília"}
+ lg{"Amser Brasília"}
+ ls{"Amser Safonol Brasília"}
+ }
+ "meta:Brunei"{
+ ls{"Amser Brunei Darussalam"}
+ }
+ "meta:Cape_Verde"{
+ ld{"Amser Haf Cabo Verde"}
+ lg{"Amser Cabo Verde"}
+ ls{"Amser Safonol Cabo Verde"}
+ }
+ "meta:Chamorro"{
+ ls{"Amser Chamorro"}
+ }
+ "meta:Chatham"{
+ ld{"Amser Haf Chatham"}
+ lg{"Amser Chatham"}
+ ls{"Amser Safonol Chatham"}
+ }
+ "meta:Chile"{
+ ld{"Amser Haf Chile"}
+ lg{"Amser Chile"}
+ ls{"Amser Safonol Chile"}
+ }
+ "meta:China"{
+ ld{"Amser Haf Tsieina"}
+ lg{"Amser Tsieina"}
+ ls{"Amser Safonol Tsieina"}
+ }
+ "meta:Choibalsan"{
+ ld{"Amser Haf Choibalsan"}
+ lg{"Amser Choibalsan"}
+ ls{"Amser Safonol Choibalsan"}
+ }
+ "meta:Christmas"{
+ ls{"Amser Ynys y Nadolig"}
+ }
+ "meta:Cocos"{
+ ls{"Amser Ynysoedd Cocos"}
+ }
+ "meta:Colombia"{
+ ld{"Amser Haf Colombia"}
+ lg{"Amser Colombia"}
+ ls{"Amser Safonol Colombia"}
+ }
+ "meta:Cook"{
+ ld{"Amser Hanner Haf Ynysoedd Cook"}
+ lg{"Amser Ynysoedd Cook"}
+ ls{"Amser Safonol Ynysoedd Cook"}
+ }
+ "meta:Cuba"{
+ ld{"Amser Haf Cuba"}
+ lg{"Amser Cuba"}
+ ls{"Amser Safonol Cuba"}
+ }
+ "meta:Davis"{
+ ls{"Amser Davis"}
+ }
+ "meta:DumontDUrville"{
+ ls{"Amser Dumont-d’Urville"}
+ }
+ "meta:East_Timor"{
+ ls{"Amser Dwyrain Timor"}
+ }
+ "meta:Easter"{
+ ld{"Amser Haf Ynys y Pasg"}
+ lg{"Amser Ynys y Pasg"}
+ ls{"Amser Safonol Ynys y Pasg"}
+ }
+ "meta:Ecuador"{
+ ls{"Amser Ecuador"}
+ }
+ "meta:Europe_Central"{
+ ld{"Amser Haf Canolbarth Ewrop"}
+ lg{"Amser Canolbarth Ewrop"}
+ ls{"Amser Safonol Canolbarth Ewrop"}
+ }
+ "meta:Europe_Eastern"{
+ ld{"Amser Haf Dwyrain Ewrop"}
+ lg{"Amser Dwyrain Ewrop"}
+ ls{"Amser Safonol Dwyrain Ewrop"}
+ }
+ "meta:Europe_Western"{
+ ld{"Amser Haf Gorllewin Ewrop"}
+ lg{"Amser Gorllewin Ewrop"}
+ ls{"Amser Safonol Gorllewin Ewrop"}
+ }
+ "meta:Falkland"{
+ ld{"Amser Haf Ynysoedd Falklands/Malvinas"}
+ lg{"Amser Ynysoedd Falklands/Malvinas"}
+ ls{"Amser Safonol Ynysoedd Falklands/Malvinas"}
+ }
+ "meta:Fiji"{
+ ld{"Amser Haf Ffiji"}
+ lg{"Amser Ffiji"}
+ ls{"Amser Safonol Ffiji"}
+ }
+ "meta:French_Guiana"{
+ ls{"Amser Guyane Ffrengig"}
+ }
+ "meta:French_Southern"{
+ ls{"Amser Deheuol ac Antarctig Frengig"}
+ }
+ "meta:GMT"{
+ ls{"Greenwich Mean Time"}
+ }
+ "meta:Galapagos"{
+ ls{"Amser Galapagos"}
+ }
+ "meta:Gambier"{
+ ls{"Amser Gambier"}
+ }
+ "meta:Georgia"{
+ ld{"Amser Haf Georgia"}
+ lg{"Amser Georgia"}
+ ls{"Amser Safonol Georgia"}
+ }
+ "meta:Gilbert_Islands"{
+ ls{"Amser Ynysoedd Gilbert"}
+ }
+ "meta:Greenland_Eastern"{
+ ld{"Amser Haf Dwyrain yr Ynys Las"}
+ lg{"Amser Dwyrain yr Ynys Las"}
+ ls{"Amser Safonol Dwyrain yr Ynys Las"}
+ }
+ "meta:Greenland_Western"{
+ ld{"Amser Haf Gorllewin yr Ynys Las"}
+ lg{"Amser Gorllewin yr Ynys Las"}
+ ls{"Amser Safonol Gorllewin yr Ynys Las"}
+ }
+ "meta:Gulf"{
+ ls{"Amser y Gwlff"}
+ }
+ "meta:Guyana"{
+ ls{"Amser Guyana"}
+ }
+ "meta:Hawaii_Aleutian"{
+ ld{"Amser Haf Hawaii-Aleutian"}
+ lg{"Amser Hawaii-Aleutian"}
+ ls{"Amser Safonol Hawaii-Aleutian"}
+ }
+ "meta:Hong_Kong"{
+ ld{"Amser Haf Hong Kong"}
+ lg{"Amser Hong Kong"}
+ ls{"Amser Safonol Hong Kong"}
+ }
+ "meta:Hovd"{
+ ld{"Amser Haf Hovd"}
+ lg{"Amser Hovd"}
+ ls{"Amser Safonol Hovd"}
+ }
+ "meta:India"{
+ ls{"Amser India"}
+ }
+ "meta:Indian_Ocean"{
+ ls{"Amser Cefnfor India"}
+ }
+ "meta:Indochina"{
+ ls{"Amser Indo-Tsieina"}
+ }
+ "meta:Indonesia_Central"{
+ ls{"Amser Canolbarth Indonesia"}
+ }
+ "meta:Indonesia_Eastern"{
+ ls{"Amser Dwyrain Indonesia"}
+ }
+ "meta:Indonesia_Western"{
+ ls{"Amser Gorllewin Indonesia"}
+ }
+ "meta:Iran"{
+ ld{"Amser Haf Iran"}
+ lg{"Amser Iran"}
+ ls{"Amser Safonol Iran"}
+ }
+ "meta:Irkutsk"{
+ ld{"Amser Haf Irkutsk"}
+ lg{"Amser Irkutsk"}
+ ls{"Amser Safonol Irkutsk"}
+ }
+ "meta:Israel"{
+ ld{"Amser Haf Israel"}
+ lg{"Amser Israel"}
+ ls{"Amser Safonol Israel"}
+ }
+ "meta:Japan"{
+ ld{"Amser Haf Japan"}
+ lg{"Amser Japan"}
+ ls{"Amser Safonol Japan"}
+ }
+ "meta:Kazakhstan_Eastern"{
+ ls{"Amser Dwyrain Kazakstan"}
+ }
+ "meta:Kazakhstan_Western"{
+ ls{"Amser Gorllewin Kazakstan"}
+ }
+ "meta:Korea"{
+ ld{"Amser Haf Corea"}
+ lg{"Amser Corea"}
+ ls{"Amser Safonol Corea"}
+ }
+ "meta:Kosrae"{
+ ls{"Amser Kosrae"}
+ }
+ "meta:Krasnoyarsk"{
+ ld{"Amser Haf Krasnoyarsk"}
+ lg{"Amser Krasnoyarsk"}
+ ls{"Amser Safonol Krasnoyarsk"}
+ }
+ "meta:Kyrgystan"{
+ ls{"Amser Kyrgyzstan"}
+ }
+ "meta:Line_Islands"{
+ ls{"Amser Ynysoedd Line"}
+ }
+ "meta:Lord_Howe"{
+ ld{"Amser Haf yr Arglwydd Howe"}
+ lg{"Amser yr Arglwydd Howe"}
+ ls{"Amser Safonol yr Arglwydd Howe"}
+ }
+ "meta:Macquarie"{
+ ls{"Amser Ynys Macquarie"}
+ }
+ "meta:Magadan"{
+ ld{"Amser Haf Magadan"}
+ lg{"Amser Magadan"}
+ ls{"Amser Safonol Magadan"}
+ }
+ "meta:Malaysia"{
+ ls{"Amser Malaysia"}
+ }
+ "meta:Maldives"{
+ ls{"Amser Y Maldives"}
+ }
+ "meta:Marquesas"{
+ ls{"Amser Marquesas"}
+ }
+ "meta:Marshall_Islands"{
+ ls{"Amser Ynysoedd Marshall"}
+ }
+ "meta:Mauritius"{
+ ld{"Amser Haf Mauritius"}
+ lg{"Amser Mauritius"}
+ ls{"Amser Safonol Mauritius"}
+ }
+ "meta:Mawson"{
+ ls{"Amser Mawson"}
+ }
+ "meta:Mongolia"{
+ ld{"Amser Haf Ulan Bator"}
+ lg{"Amser Ulan Bator"}
+ ls{"Amser Safonol Ulan Bator"}
+ }
+ "meta:Moscow"{
+ ld{"Amser Haf Moscfa"}
+ lg{"Amser Moscfa"}
+ ls{"Amser Safonol Moscfa"}
+ }
+ "meta:Myanmar"{
+ ls{"Amser Myanmar"}
+ }
+ "meta:Nauru"{
+ ls{"Amser Nauru"}
+ }
+ "meta:Nepal"{
+ ls{"Amser Nepal"}
+ }
+ "meta:New_Caledonia"{
+ ld{"Amser Haf Caledonia Newydd"}
+ lg{"Amser Caledonia Newydd"}
+ ls{"Amser Safonol Caledonia Newydd"}
+ }
+ "meta:New_Zealand"{
+ ld{"Amser Haf Seland Newydd"}
+ lg{"Amser Seland Newydd"}
+ ls{"Amser Safonol Seland Newydd"}
+ }
+ "meta:Newfoundland"{
+ ld{"Amser Haf Newfoundland"}
+ lg{"Amser Newfoundland"}
+ ls{"Amser Safonol Newfoundland"}
+ }
+ "meta:Niue"{
+ ls{"Amser Niue"}
+ }
+ "meta:Norfolk"{
+ ls{"Amser Ynys Norfolk"}
+ }
+ "meta:Noronha"{
+ ld{"Amser Haf Fernando de Noronha"}
+ lg{"Amser Fernando de Noronha"}
+ ls{"Amser Safonol Fernando de Noronha"}
+ }
+ "meta:Novosibirsk"{
+ ld{"Amser Haf Novosibirsk"}
+ lg{"Amser Novosibirsk"}
+ ls{"Amser Safonol Novosibirsk"}
+ }
+ "meta:Omsk"{
+ ld{"Amser Haf Omsk"}
+ lg{"Amser Omsk"}
+ ls{"Amser Safonol Omsk"}
+ }
+ "meta:Pakistan"{
+ ld{"Amser Haf Pacistan"}
+ lg{"Amser Pacistan"}
+ ls{"Amser Safonol Pacistan"}
+ }
+ "meta:Palau"{
+ ls{"Amser Palau"}
+ }
+ "meta:Papua_New_Guinea"{
+ ls{"Amser Papua Guinea Newydd"}
+ }
+ "meta:Paraguay"{
+ ld{"Amser Haf Paraguay"}
+ lg{"Amser Paraguay"}
+ ls{"Amser Safonol Paraguay"}
+ }
+ "meta:Peru"{
+ ld{"Amser Haf Periw"}
+ lg{"Amser Periw"}
+ ls{"Amser Safonol Periw"}
+ }
+ "meta:Philippines"{
+ ld{"Amser Haf Pilipinas"}
+ lg{"Amser Pilipinas"}
+ ls{"Amser Safonol Pilipinas"}
+ }
+ "meta:Phoenix_Islands"{
+ ls{"Amser Ynysoedd Phoenix"}
+ }
+ "meta:Pierre_Miquelon"{
+ ld{"Amser Haf Saint-Pierre-et-Miquelon"}
+ lg{"Amser Saint-Pierre-et-Miquelon"}
+ ls{"Amser Safonol Saint-Pierre-et-Miquelon"}
+ }
+ "meta:Pitcairn"{
+ ls{"Amser Pitcairn"}
+ }
+ "meta:Ponape"{
+ ls{"Amser Pohnpei"}
+ }
+ "meta:Reunion"{
+ ls{"Amser Réunion"}
+ }
+ "meta:Rothera"{
+ ls{"Amser Rothera"}
+ }
+ "meta:Sakhalin"{
+ ld{"Amser Haf Sakhalin"}
+ lg{"Amser Sakhalin"}
+ ls{"Amser Safonol Sakhalin"}
+ }
+ "meta:Samoa"{
+ ld{"Amser Haf Samoa"}
+ lg{"Amser Samoa"}
+ ls{"Amser Safonol Samoa"}
+ }
+ "meta:Seychelles"{
+ ls{"Amser Seychelles"}
+ }
+ "meta:Singapore"{
+ ls{"Amser Singapore"}
+ }
+ "meta:Solomon"{
+ ls{"Amser Ynysoedd Solomon"}
+ }
+ "meta:South_Georgia"{
+ ls{"Amser De Georgia"}
+ }
+ "meta:Syowa"{
+ ls{"Amser Syowa"}
+ }
+ "meta:Tahiti"{
+ ls{"Amser Tahiti"}
+ }
+ "meta:Taipei"{
+ ld{"Amser Haf Taipei"}
+ lg{"Amser Taipei"}
+ ls{"Amser Safonol Taipei"}
+ }
+ "meta:Tajikistan"{
+ ls{"Amser Tajikistan"}
+ }
+ "meta:Tokelau"{
+ ls{"Amser Tokelau"}
+ }
+ "meta:Tonga"{
+ ld{"Amser Haf Tonga"}
+ lg{"Amser Tonga"}
+ ls{"Amser Safonol Tonga"}
+ }
+ "meta:Truk"{
+ ls{"Amser Chuuk"}
+ }
+ "meta:Turkmenistan"{
+ ld{"Amser Haf Turkmenistan"}
+ lg{"Amser Turkmenistan"}
+ ls{"Amser Safonol Turkmenistan"}
+ }
+ "meta:Tuvalu"{
+ ls{"Amser Twfalw"}
+ }
+ "meta:Uruguay"{
+ ld{"Amser Haf Uruguay"}
+ lg{"Amser Uruguay"}
+ ls{"Amser Safonol Uruguay"}
+ }
+ "meta:Uzbekistan"{
+ ld{"Amser Haf Uzbekistan"}
+ lg{"Amser Uzbekistan"}
+ ls{"Amser Safonol Uzbekistan"}
+ }
+ "meta:Vanuatu"{
+ ld{"Amser Haf Vanuatu"}
+ lg{"Amser Vanuatu"}
+ ls{"Amser Safonol Vanuatu"}
+ }
+ "meta:Venezuela"{
+ ls{"Amser Venezuela"}
+ }
+ "meta:Vladivostok"{
+ ld{"Amser Haf Vladivostok"}
+ lg{"Amser Vladivostok"}
+ ls{"Amser Safonol Vladivostok"}
+ }
+ "meta:Volgograd"{
+ ld{"Amser Haf Volgograd"}
+ lg{"Amser Volgograd"}
+ ls{"Amser Safonol Volgograd"}
+ }
+ "meta:Vostok"{
+ ls{"Amser Vostok"}
+ }
+ "meta:Wake"{
+ ls{"Amser Ynys Wake"}
+ }
+ "meta:Wallis"{
+ ls{"Amser Wallis a Futuna"}
+ }
+ "meta:Yakutsk"{
+ ld{"Amser Haf Yakutsk"}
+ lg{"Amser Yakutsk"}
+ ls{"Amser Safonol Yakutsk"}
+ }
+ "meta:Yekaterinburg"{
+ ld{"Amser Haf Ekaterinburg"}
+ lg{"Amser Ekaterinburg"}
+ ls{"Amser Safonol Ekaterinburg"}
+ }
+ fallbackFormat{"{1} ({0})"}
+ fallbackRegionFormat{"Amser {1} ({0})"}
+ gmtFormat{"GMT{0}"}
+ gmtZeroFormat{"GMT"}
+ hourFormat{"+HH:mm;-HH:mm"}
+ regionFormat{"Amser {0}"}
}
}
diff --git a/data/zone/da.txt b/data/zone/da.txt
index 0b8df40..9256957 100644
--- a/data/zone/da.txt
+++ b/data/zone/da.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/da.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/da.xml
*/
da{
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Addis_Ababa"{
ec{"Addis Abeba"}
@@ -211,21 +211,11 @@
lg{"Vestafrikansk tid"}
ls{"Vestafrikansk normaltid"}
}
- "meta:Aktyubinsk"{
- ld{"Aktyubinsk-sommertid"}
- lg{"Aktyubinsk-tid"}
- ls{"Aktyubinsk-normaltid"}
- }
"meta:Alaska"{
ld{"Alaska-sommertid"}
lg{"Alaska-tid"}
ls{"Alaska-normaltid"}
}
- "meta:Alaska_Hawaii"{
- ld{"Alaska-Hawaii-sommertid"}
- lg{"Alaska-Hawaii-tid"}
- ls{"Alaska-Hawaii-normaltid"}
- }
"meta:Almaty"{
ld{"Almaty-sommertid"}
lg{"Almaty-tid"}
@@ -291,11 +281,6 @@
lg{"Armensk tid"}
ls{"Armensk normaltid"}
}
- "meta:Ashkhabad"{
- ld{"Ashkhabad-sommertid"}
- lg{"Ashkhabad-tid"}
- ls{"Ashkhabad-normaltid"}
- }
"meta:Atlantic"{
ld{"Atlantic-sommertid"}
lg{"Atlantic-tid"}
@@ -331,32 +316,17 @@
lg{"Azorerne-tid"}
ls{"Azorerne-normaltid"}
}
- "meta:Baku"{
- ld{"Baku-sommertid"}
- lg{"Baku-tid"}
- ls{"Baku-normaltid"}
- }
"meta:Bangladesh"{
ld{"Bangladeshisk sommertid"}
lg{"Bangladeshisk tid"}
ls{"Bangladeshisk normaltid"}
}
- "meta:Bering"{
- ld{"Bering-sommertid"}
- lg{"Bering-tid"}
- ls{"Bering-normaltid"}
- }
"meta:Bhutan"{
ls{"Bhutanesisk tid"}
}
"meta:Bolivia"{
ls{"Boliviansk tid"}
}
- "meta:Borneo"{
- ld{"Borneo-sommertid"}
- lg{"Borneo-tid"}
- ls{"Borneo-normaltid"}
- }
"meta:Brasilia"{
ld{"Brasiliansk sommertid"}
lg{"Brasiliansk tid"}
@@ -373,9 +343,6 @@
"meta:Chamorro"{
ls{"Chamorro-tid"}
}
- "meta:Changbai"{
- ls{"Changbai-tid"}
- }
"meta:Chatham"{
ld{"Chatham-sommertid"}
lg{"Chatham-tid"}
@@ -417,23 +384,12 @@
lg{"Cubansk tid"}
ls{"Cubansk normaltid"}
}
- "meta:Dacca"{
- ls{"Dacca-tid"}
- }
"meta:Davis"{
ls{"Davis-tid"}
}
"meta:DumontDUrville"{
ls{"Dumont-d'Urville-tid"}
}
- "meta:Dushanbe"{
- ld{"Dushanbe-sommertid"}
- lg{"Dushanbe-tid"}
- ls{"Dushanbe-normaltid"}
- }
- "meta:Dutch_Guiana"{
- ls{"Hollandsk Guiana-tid"}
- }
"meta:East_Timor"{
ls{"Østtimor-tid"}
}
@@ -485,11 +441,6 @@
"meta:French_Southern"{
ls{"Franske Sydlige og Antarktiske Territorier-tid"}
}
- "meta:Frunze"{
- ld{"Frunze-sommertid"}
- lg{"Frunze-tid"}
- ls{"Frunze-normaltid"}
- }
"meta:GMT"{
ls{"GMT"}
}
@@ -507,11 +458,6 @@
"meta:Gilbert_Islands"{
ls{"Gilbertøerne-tid"}
}
- "meta:Greenland_Central"{
- ld{"Centralgrønlandsk sommertid"}
- lg{"Centralgrønlandsk tid"}
- ls{"Centralgrønlandsk normaltid"}
- }
"meta:Greenland_Eastern"{
ld{"Østgrønlandsk sommertid"}
lg{"Østgrønlandsk tid"}
@@ -589,23 +535,12 @@
lg{"Petropavlovsk-Kamchatski tid"}
ls{"Petropavlovsk-Kamchatski normaltid"}
}
- "meta:Karachi"{
- ls{"Karachi-tid"}
- }
- "meta:Kashgar"{
- ls{"Kashgar-tid"}
- }
"meta:Kazakhstan_Eastern"{
ls{"Østkasakhstansk tid"}
}
"meta:Kazakhstan_Western"{
ls{"Vestkasakhstansk tid"}
}
- "meta:Kizilorda"{
- ld{"Kizilorda-sommertid"}
- lg{"Kizilorda-tid"}
- ls{"Kizilorda-normaltid"}
- }
"meta:Korea"{
ld{"Koreansk sommertid"}
lg{"Koreansk tid"}
@@ -619,14 +554,6 @@
lg{"Krasnoyarsk-tid"}
ls{"Krasnoyarsk-normaltid"}
}
- "meta:Kuybyshev"{
- ld{"Kuybyshev-sommertid"}
- lg{"Kuybyshev-tid"}
- ls{"Kuybyshev-normaltid"}
- }
- "meta:Kwajalein"{
- ls{"Kwajalein-tid"}
- }
"meta:Kyrgystan"{
ls{"Kirgisisk tid"}
}
@@ -636,9 +563,6 @@
"meta:Line_Islands"{
ls{"Linjeøerne-tid"}
}
- "meta:Long_Shu"{
- ls{"Long-Shu-tid"}
- }
"meta:Lord_Howe"{
ld{"Lord Howe-sommertid"}
lg{"Lord Howe-tid"}
@@ -657,9 +581,6 @@
lg{"Magadan-tid"}
ls{"Magadan-normaltid"}
}
- "meta:Malaya"{
- ls{"Malaja-tid"}
- }
"meta:Malaysia"{
ls{"Malaysisk tid"}
}
@@ -799,22 +720,14 @@
lg{"Samara-tid"}
ls{"Samara-normaltid"}
}
- "meta:Samarkand"{
- ld{"Samarkand-sommertid"}
- lg{"Samarkand-tid"}
- ls{"Samarkand-normaltid"}
- }
"meta:Samoa"{
+ ld{"Samoa-sommertid"}
+ lg{"Samoa-tid"}
ls{"Samoa-normaltid"}
}
"meta:Seychelles"{
ls{"Seychellisk tid"}
}
- "meta:Shevchenko"{
- ld{"Shevchenko-sommertid"}
- lg{"Shevchenko-tid"}
- ls{"Shevchenko-normaltid"}
- }
"meta:Singapore"{
ls{"Singaporeansk normaltid"}
}
@@ -827,11 +740,6 @@
"meta:Suriname"{
ls{"Surinam-tid"}
}
- "meta:Sverdlovsk"{
- ld{"Sverdlovsk-sommertid"}
- lg{"Sverdlovsk-tid"}
- ls{"Sverdlovsk-normaltid"}
- }
"meta:Syowa"{
ls{"Syowa-tid"}
}
@@ -846,16 +754,6 @@
"meta:Tajikistan"{
ls{"Tadsjikisk tid"}
}
- "meta:Tashkent"{
- ld{"Tashkent-sommertid"}
- lg{"Tashkent-tid"}
- ls{"Tashkent-normaltid"}
- }
- "meta:Tbilisi"{
- ld{"Tbilisi-sommertid"}
- lg{"Tbilisi-tid"}
- ls{"Tbilisi-normaltid"}
- }
"meta:Tokelau"{
ls{"Tokelau-tid"}
}
@@ -867,11 +765,6 @@
"meta:Truk"{
ls{"Truk-tid"}
}
- "meta:Turkey"{
- ld{"Tyrkisk sommertid"}
- lg{"Tyrkisk tid"}
- ls{"Tyrkisk normaltid"}
- }
"meta:Turkmenistan"{
ld{"Turkmensk sommertid"}
lg{"Turkmensk tid"}
@@ -880,19 +773,11 @@
"meta:Tuvalu"{
ls{"Tuvalu-tid"}
}
- "meta:Uralsk"{
- ld{"Ural'sk-sommertid"}
- lg{"Ural'sk-tid"}
- ls{"Ural'sk-normaltid"}
- }
"meta:Uruguay"{
ld{"Uruguayansk sommertid"}
lg{"Uruguayansk tid"}
ls{"Uruguayansk normaltid"}
}
- "meta:Urumqi"{
- ls{"Urumqi-tid"}
- }
"meta:Uzbekistan"{
ld{"Usbekisk sommertid"}
lg{"Usbekisk tid"}
@@ -935,16 +820,6 @@
lg{"Yekaterinburgsk tid"}
ls{"Yekaterinburgsk normaltid"}
}
- "meta:Yerevan"{
- ld{"Yerevan-sommertid"}
- lg{"Yerevan-tid"}
- ls{"Yerevan-normaltid"}
- }
- "meta:Yukon"{
- ld{"Yukon-sommertid"}
- lg{"Yukon-tid"}
- ls{"Yukon-normaltid"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"Tidszone for {1} ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/dav.txt b/data/zone/dav.txt
index 7efa383..6ada411 100755
--- a/data/zone/dav.txt
+++ b/data/zone/dav.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dav.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/dav.xml
*/
dav{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/de.txt b/data/zone/de.txt
index 9b2081e..85f399b 100644
--- a/data/zone/de.txt
+++ b/data/zone/de.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/de.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/de.xml
*/
de{
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Accra"{
ec{"Akkra"}
@@ -373,21 +373,11 @@
lg{"Westafrikanische Zeit"}
ls{"Westafrikanische Normalzeit"}
}
- "meta:Aktyubinsk"{
- ld{"Aktyubinsk-Sommerzeit"}
- lg{"Aktyubinsk-Zeit"}
- ls{"Aktyubinsk-Normalzeit"}
- }
"meta:Alaska"{
ld{"Alaska Sommerzeit"}
lg{"Alaska Zeit"}
ls{"Alaska-Normalzeit"}
}
- "meta:Alaska_Hawaii"{
- ld{"Alaska-Hawaii-Sommerzeit"}
- lg{"Alaska-Hawaii-Zeit"}
- ls{"Alaska-Hawaii-Normalzeit"}
- }
"meta:Almaty"{
ld{"Almaty-Sommerzeit"}
lg{"Almaty-Zeit"}
@@ -716,11 +706,6 @@
lg{"Krasnoyarsk-Zeit"}
ls{"Krasnoyarsk-Normalzeit"}
}
- "meta:Kuybyshev"{
- ld{"Kuibyschew-Sommerzeit"}
- lg{"Kuibyschew-Zeit"}
- ls{"Kuibyschew-Normalzeit"}
- }
"meta:Kyrgystan"{
ls{"Kirgisistan-Zeit"}
}
@@ -872,7 +857,9 @@
ls{"Samara-Normalzeit"}
}
"meta:Samoa"{
- ls{"Samoa-Zeit"}
+ ld{"Samoa-Sommerzeit"}
+ lg{"Samoa-Zeit"}
+ ls{"Samoa-Normalzeit"}
}
"meta:Seychelles"{
ls{"Seychellen-Zeit"}
@@ -911,11 +898,6 @@
"meta:Truk"{
ls{"Chuuk-Zeit"}
}
- "meta:Turkey"{
- ld{"Türkische Sommerzeit"}
- lg{"Türkische Zeit"}
- ls{"Türkische Normalzeit"}
- }
"meta:Turkmenistan"{
ld{"Turkmenistan-Sommerzeit"}
lg{"Turkmenistan-Zeit"}
diff --git a/data/zone/dje.txt b/data/zone/dje.txt
index aa95360..5cac21d 100755
--- a/data/zone/dje.txt
+++ b/data/zone/dje.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dje.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/dje.xml
*/
dje{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/dua.txt b/data/zone/dua.txt
index e3d8ebe..a78dea0 100755
--- a/data/zone/dua.txt
+++ b/data/zone/dua.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dua.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/dua.xml
*/
dua{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/dyo.txt b/data/zone/dyo.txt
index 515aba6..6162ac3 100755
--- a/data/zone/dyo.txt
+++ b/data/zone/dyo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dyo.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/dyo.xml
*/
dyo{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/dz.txt b/data/zone/dz.txt
index 51d30b5..595aab2 100755
--- a/data/zone/dz.txt
+++ b/data/zone/dz.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/dz.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/dz.xml
*/
dz{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Cairo"{
ec{"ཀཱའི་རོ"}
@@ -159,51 +159,6 @@
"Atlantic:Faeroe"{
ec{"ཕཱའེ་རོ་"}
}
- "Etc:GMT"{
- ec{"ཇི་ཨེམ་ཊི"}
- }
- "Etc:GMT-1"{
- ec{"ཇི་ཨེམ་ཊི-༡"}
- }
- "Etc:GMT-10"{
- ec{"ཇི་ཨེམ་ཊི-༡༠"}
- }
- "Etc:GMT-11"{
- ec{"ཇི་ཨེམ་ཊི-༡༡"}
- }
- "Etc:GMT-12"{
- ec{"ཇི་ཨེམ་ཊི-༡༢"}
- }
- "Etc:GMT-13"{
- ec{"ཇི་ཨེམ་ཊི-༡༣"}
- }
- "Etc:GMT-14"{
- ec{"ཇི་ཨེམ་ཊི-༡༤"}
- }
- "Etc:GMT-2"{
- ec{"ཇི་ཨེམ་ཊི-༢"}
- }
- "Etc:GMT-3"{
- ec{"ཇི་ཨེམ་ཊི-༣"}
- }
- "Etc:GMT-4"{
- ec{"ཇི་ཨེམ་ཊི-༤"}
- }
- "Etc:GMT-5"{
- ec{"ཇི་ཨེམ་ཊི-༥"}
- }
- "Etc:GMT-6"{
- ec{"ཇི་ཨེམ་ཊི-༦"}
- }
- "Etc:GMT-7"{
- ec{"ཇི་ཨེམ་ཊི-༧"}
- }
- "Etc:GMT-8"{
- ec{"ཇི་ཨེམ་ཊི-༨"}
- }
- "Etc:GMT-9"{
- ec{"ཇི་ཨེམ་ཊི-༩"}
- }
"Etc:Unknown"{
ec{"མ་ཤེས་པའི་ཁྲོམ་སྡེ"}
}
diff --git a/data/zone/ebu.txt b/data/zone/ebu.txt
index 02e4f70..3b92f34 100755
--- a/data/zone/ebu.txt
+++ b/data/zone/ebu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ebu.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/ebu.xml
*/
ebu{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/ee.txt b/data/zone/ee.txt
index 9185461..ff69542 100755
--- a/data/zone/ee.txt
+++ b/data/zone/ee.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ee.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/ee.xml
*/
ee{
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidzan nutomegaƒoƒome"}
@@ -1224,6 +1224,9 @@
lg{"Atlantic gaƒoƒome"}
ls{"Atlantic gaƒoƒoɖoanyime"}
}
+ "meta:Suriname"{
+ ls{"Suriname gaƒoƒome"}
+ }
fallbackRegionFormat{"{1} gaƒoƒo ({0})"}
regionFormat{"{0} gaƒoƒo"}
}
diff --git a/data/zone/el.txt b/data/zone/el.txt
index ccf7f9d..6304abe 100644
--- a/data/zone/el.txt
+++ b/data/zone/el.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/el.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/el.xml
*/
el{
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"Αμπιτζάν"}
@@ -909,51 +909,6 @@
"Australia:Sydney"{
ec{"Σίδνεϊ"}
}
- "Etc:GMT"{
- ec{"[GMT]"}
- }
- "Etc:GMT-1"{
- ec{"[GMT-1]"}
- }
- "Etc:GMT-10"{
- ec{"[GMT-10]"}
- }
- "Etc:GMT-11"{
- ec{"[GMT-11]"}
- }
- "Etc:GMT-12"{
- ec{"[GMT-12]"}
- }
- "Etc:GMT-13"{
- ec{"[GMT-13]"}
- }
- "Etc:GMT-14"{
- ec{"[GMT-14]"}
- }
- "Etc:GMT-2"{
- ec{"[GMT-2]"}
- }
- "Etc:GMT-3"{
- ec{"[GMT-3]"}
- }
- "Etc:GMT-4"{
- ec{"[GMT-4]"}
- }
- "Etc:GMT-5"{
- ec{"[GMT-5]"}
- }
- "Etc:GMT-6"{
- ec{"[GMT-6]"}
- }
- "Etc:GMT-7"{
- ec{"[GMT-7]"}
- }
- "Etc:GMT-8"{
- ec{"[GMT-8]"}
- }
- "Etc:GMT-9"{
- ec{"[GMT-9]"}
- }
"Etc:Unknown"{
ec{"Άγνωστη πόλη"}
}
@@ -1288,11 +1243,6 @@
lg{"Ώρα Δυτικής Αφρικής"}
ls{"Χειμερινή ώρα Δυτικής Αφρικής"}
}
- "meta:Aktyubinsk"{
- ld{"Θερινή ώρα Ακτιουμπίνσκ"}
- lg{"Ώρα Ακτιουμπίνσκ"}
- ls{"Χειμερινή ώρα Ακτιουμπίνσκ"}
- }
"meta:Alaska"{
ld{"Θερινή ώρα Αλάσκας"}
lg{"Ώρα Αλάσκας"}
@@ -1383,11 +1333,6 @@
lg{"Ώρα Αζορών"}
ls{"Χειμερινή ώρα Αζορών"}
}
- "meta:Baku"{
- ld{"Θερινή ώρα Μπακού"}
- lg{"Ώρα Μπακού"}
- ls{"Χειμερινή ώρα Μπακού"}
- }
"meta:Bangladesh"{
ld{"Θερινή ώρα Μπανγκλαντές"}
lg{"Ώρα Μπανγκλαντές"}
@@ -1626,9 +1571,6 @@
lg{"Ώρα Κρασνόγιαρσκ"}
ls{"Χειμερινή ώρα Κρασνόγιαρσκ"}
}
- "meta:Kwajalein"{
- ls{"Ώρα Κουαχαλέιν"}
- }
"meta:Kyrgystan"{
ls{"Ώρα Κιργιστάν"}
}
@@ -1788,7 +1730,9 @@
ls{"Χειμερινή ώρα Σάμαρας"}
}
"meta:Samoa"{
- ls{"Ώρα Σαμόα"}
+ ld{"Θερινή ώρα Σαμόα"}
+ lg{"Ώρα Σαμόα"}
+ ls{"Χειμερινή ώρα Σαμόα"}
}
"meta:Seychelles"{
ls{"Ώρα Σεϋχελλών"}
@@ -1819,11 +1763,6 @@
"meta:Tajikistan"{
ls{"Ώρα Τατζικιστάν"}
}
- "meta:Tbilisi"{
- ld{"Θερινή ώρα Τυφλίδας"}
- lg{"Ώρα Τυφλίδας"}
- ls{"Χειμερινή ώρα Τυφλίδας"}
- }
"meta:Tokelau"{
ls{"Ώρα Τοκελάου"}
}
@@ -1835,11 +1774,6 @@
"meta:Truk"{
ls{"Ώρα Τσουκ"}
}
- "meta:Turkey"{
- ld{"Θερινή ώρα Τουρκίας"}
- lg{"Ώρα Τουρκίας"}
- ls{"Χειμερινή ώρα Τουρκίας"}
- }
"meta:Turkmenistan"{
ld{"Θερινή ώρα Τουρκμενιστάν"}
lg{"Ώρα Τουρκμενιστάν"}
@@ -1895,11 +1829,6 @@
lg{"Ώρα Γεκατερίνμπουργκ"}
ls{"Χειμερινή ώρα Γεκατερίνμπουργκ"}
}
- "meta:Yerevan"{
- ld{"Θερινή ώρα Ερεβάν"}
- lg{"Ώρα Ερεβάν"}
- ls{"Χειμερινή ώρα Ερεβάν"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"Ώρα {1} ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/en.txt b/data/zone/en.txt
index e53d068..6e4bf0c 100644
--- a/data/zone/en.txt
+++ b/data/zone/en.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/en.xml
*/
en{
- Version{"2.0.78.36"}
+ Version{"2.0.82.76"}
zoneStrings{
"Africa:Sao_Tome"{
ec{"São Tomé"}
@@ -69,11 +69,6 @@
lg{"West Africa Time"}
ls{"West Africa Standard Time"}
}
- "meta:Aktyubinsk"{
- ld{"Aktyubinsk Summer Time"}
- lg{"Aktyubinsk Time"}
- ls{"Aktyubinsk Standard Time"}
- }
"meta:Alaska"{
ld{"Alaska Daylight Time"}
lg{"Alaska Time"}
@@ -82,11 +77,6 @@
sg{"AKT"}
ss{"AKST"}
}
- "meta:Alaska_Hawaii"{
- ld{"Alaska-Hawaii Daylight Time"}
- lg{"Alaska-Hawaii Time"}
- ls{"Alaska-Hawaii Standard Time"}
- }
"meta:Almaty"{
ld{"Almaty Summer Time"}
lg{"Almaty Time"}
@@ -164,11 +154,6 @@
lg{"Armenia Time"}
ls{"Armenia Standard Time"}
}
- "meta:Ashkhabad"{
- ld{"Ashkhabad Summer Time"}
- lg{"Ashkhabad Time"}
- ls{"Ashkhabad Standard Time"}
- }
"meta:Atlantic"{
ld{"Atlantic Daylight Time"}
lg{"Atlantic Time"}
@@ -207,32 +192,17 @@
lg{"Azores Time"}
ls{"Azores Standard Time"}
}
- "meta:Baku"{
- ld{"Baku Summer Time"}
- lg{"Baku Time"}
- ls{"Baku Standard Time"}
- }
"meta:Bangladesh"{
ld{"Bangladesh Summer Time"}
lg{"Bangladesh Time"}
ls{"Bangladesh Standard Time"}
}
- "meta:Bering"{
- ld{"Bering Daylight Time"}
- lg{"Bering Time"}
- ls{"Bering Standard Time"}
- }
"meta:Bhutan"{
ls{"Bhutan Time"}
}
"meta:Bolivia"{
ls{"Bolivia Time"}
}
- "meta:Borneo"{
- ld{"Borneo Summer Time"}
- lg{"Borneo Time"}
- ls{"Borneo Standard Time"}
- }
"meta:Brasilia"{
ld{"Brasilia Summer Time"}
lg{"Brasilia Time"}
@@ -252,9 +222,6 @@
"meta:Chamorro"{
ls{"Chamorro Standard Time"}
}
- "meta:Changbai"{
- ls{"Changbai Time"}
- }
"meta:Chatham"{
ld{"Chatham Daylight Time"}
lg{"Chatham Time"}
@@ -296,23 +263,12 @@
lg{"Cuba Time"}
ls{"Cuba Standard Time"}
}
- "meta:Dacca"{
- ls{"Dacca Time"}
- }
"meta:Davis"{
ls{"Davis Time"}
}
"meta:DumontDUrville"{
ls{"Dumont-d’Urville Time"}
}
- "meta:Dushanbe"{
- ld{"Dushanbe Summer Time"}
- lg{"Dushanbe Time"}
- ls{"Dushanbe Standard Time"}
- }
- "meta:Dutch_Guiana"{
- ls{"Dutch Guiana Time"}
- }
"meta:East_Timor"{
ls{"East Timor Time"}
}
@@ -355,11 +311,6 @@
"meta:French_Southern"{
ls{"French Southern and Antarctic Time"}
}
- "meta:Frunze"{
- ld{"Frunze Summer Time"}
- lg{"Frunze Time"}
- ls{"Frunze Standard Time"}
- }
"meta:GMT"{
ls{"Greenwich Mean Time"}
ss{"GMT"}
@@ -378,11 +329,6 @@
"meta:Gilbert_Islands"{
ls{"Gilbert Islands Time"}
}
- "meta:Greenland_Central"{
- ld{"Central Greenland Summer Time"}
- lg{"Central Greenland Time"}
- ls{"Central Greenland Standard Time"}
- }
"meta:Greenland_Eastern"{
ld{"East Greenland Summer Time"}
lg{"East Greenland Time"}
@@ -463,23 +409,12 @@
lg{"Petropavlovsk-Kamchatski Time"}
ls{"Petropavlovsk-Kamchatski Standard Time"}
}
- "meta:Karachi"{
- ls{"Karachi Time"}
- }
- "meta:Kashgar"{
- ls{"Kashgar Time"}
- }
"meta:Kazakhstan_Eastern"{
ls{"East Kazakhstan Time"}
}
"meta:Kazakhstan_Western"{
ls{"West Kazakhstan Time"}
}
- "meta:Kizilorda"{
- ld{"Kizilorda Summer Time"}
- lg{"Kizilorda Time"}
- ls{"Kizilorda Standard Time"}
- }
"meta:Korea"{
ld{"Korean Daylight Time"}
lg{"Korean Time"}
@@ -493,14 +428,6 @@
lg{"Krasnoyarsk Time"}
ls{"Krasnoyarsk Standard Time"}
}
- "meta:Kuybyshev"{
- ld{"Kuybyshev Summer Time"}
- lg{"Kuybyshev Time"}
- ls{"Kuybyshev Standard Time"}
- }
- "meta:Kwajalein"{
- ls{"Kwajalein Time"}
- }
"meta:Kyrgystan"{
ls{"Kyrgystan Time"}
}
@@ -510,9 +437,6 @@
"meta:Line_Islands"{
ls{"Line Islands Time"}
}
- "meta:Long_Shu"{
- ls{"Long-Shu Time"}
- }
"meta:Lord_Howe"{
ld{"Lord Howe Daylight Time"}
lg{"Lord Howe Time"}
@@ -531,9 +455,6 @@
lg{"Magadan Time"}
ls{"Magadan Standard Time"}
}
- "meta:Malaya"{
- ls{"Malaya Time"}
- }
"meta:Malaysia"{
ls{"Malaysia Time"}
}
@@ -673,22 +594,14 @@
lg{"Samara Time"}
ls{"Samara Standard Time"}
}
- "meta:Samarkand"{
- ld{"Samarkand Summer Time"}
- lg{"Samarkand Time"}
- ls{"Samarkand Standard Time"}
- }
"meta:Samoa"{
+ ld{"Samoa Daylight Time"}
+ lg{"Samoa Time"}
ls{"Samoa Standard Time"}
}
"meta:Seychelles"{
ls{"Seychelles Time"}
}
- "meta:Shevchenko"{
- ld{"Shevchenko Summer Time"}
- lg{"Shevchenko Time"}
- ls{"Shevchenko Standard Time"}
- }
"meta:Singapore"{
ls{"Singapore Standard Time"}
}
@@ -701,11 +614,6 @@
"meta:Suriname"{
ls{"Suriname Time"}
}
- "meta:Sverdlovsk"{
- ld{"Sverdlovsk Summer Time"}
- lg{"Sverdlovsk Time"}
- ls{"Sverdlovsk Standard Time"}
- }
"meta:Syowa"{
ls{"Syowa Time"}
}
@@ -720,16 +628,6 @@
"meta:Tajikistan"{
ls{"Tajikistan Time"}
}
- "meta:Tashkent"{
- ld{"Tashkent Summer Time"}
- lg{"Tashkent Time"}
- ls{"Tashkent Standard Time"}
- }
- "meta:Tbilisi"{
- ld{"Tbilisi Summer Time"}
- lg{"Tbilisi Time"}
- ls{"Tbilisi Standard Time"}
- }
"meta:Tokelau"{
ls{"Tokelau Time"}
}
@@ -741,11 +639,6 @@
"meta:Truk"{
ls{"Chuuk Time"}
}
- "meta:Turkey"{
- ld{"Turkey Summer Time"}
- lg{"Turkey Time"}
- ls{"Turkey Standard Time"}
- }
"meta:Turkmenistan"{
ld{"Turkmenistan Summer Time"}
lg{"Turkmenistan Time"}
@@ -754,19 +647,11 @@
"meta:Tuvalu"{
ls{"Tuvalu Time"}
}
- "meta:Uralsk"{
- ld{"Uralʹsk Summer Time"}
- lg{"Uralʹsk Time"}
- ls{"Uralʹsk Standard Time"}
- }
"meta:Uruguay"{
ld{"Uruguay Summer Time"}
lg{"Uruguay Time"}
ls{"Uruguay Standard Time"}
}
- "meta:Urumqi"{
- ls{"Urumqi Time"}
- }
"meta:Uzbekistan"{
ld{"Uzbekistan Summer Time"}
lg{"Uzbekistan Time"}
@@ -809,16 +694,6 @@
lg{"Yekaterinburg Time"}
ls{"Yekaterinburg Standard Time"}
}
- "meta:Yerevan"{
- ld{"Yerevan Summer Time"}
- lg{"Yerevan Time"}
- ls{"Yerevan Standard Time"}
- }
- "meta:Yukon"{
- ld{"Yukon Daylight Time"}
- lg{"Yukon Time"}
- ls{"Yukon Standard Time"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"{1} Time ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/en_AG.txt b/data/zone/en_AG.txt
index 54a3507..a02dcb6 100755
--- a/data/zone/en_AG.txt
+++ b/data/zone/en_AG.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_AG.xml
// *
// ***************************************************************************
en_AG{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_AU.txt b/data/zone/en_AU.txt
index 27cf128..f4d7361 100644
--- a/data/zone/en_AU.txt
+++ b/data/zone/en_AU.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_AU.xml
// *
// ***************************************************************************
en_AU{
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
zoneStrings{
"Europe:London"{
sd{"∅∅∅"}
diff --git a/data/zone/en_BB.txt b/data/zone/en_BB.txt
index 4bcbff5..61a22ec 100755
--- a/data/zone/en_BB.txt
+++ b/data/zone/en_BB.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_BB.xml
// *
// ***************************************************************************
en_BB{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_BZ.txt b/data/zone/en_BZ.txt
index 797d25d..63d636d 100755
--- a/data/zone/en_BZ.txt
+++ b/data/zone/en_BZ.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_BZ.xml
// *
// ***************************************************************************
en_BZ{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_CA.txt b/data/zone/en_CA.txt
index c263ef1..746ba7b 100644
--- a/data/zone/en_CA.txt
+++ b/data/zone/en_CA.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_CA.xml
// *
// ***************************************************************************
en_CA{
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
zoneStrings{
"meta:Newfoundland"{
sd{"NDT"}
diff --git a/data/zone/en_CM.txt b/data/zone/en_CM.txt
index bdfae79..5004818 100755
--- a/data/zone/en_CM.txt
+++ b/data/zone/en_CM.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_CM.xml
// *
// ***************************************************************************
en_CM{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_DM.txt b/data/zone/en_DM.txt
index 81c8849..8bdd35b 100755
--- a/data/zone/en_DM.txt
+++ b/data/zone/en_DM.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_DM.xml
// *
// ***************************************************************************
en_DM{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_FJ.txt b/data/zone/en_FJ.txt
index 5e1f96e..e38d9b1 100755
--- a/data/zone/en_FJ.txt
+++ b/data/zone/en_FJ.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_FJ.xml
// *
// ***************************************************************************
en_FJ{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_FM.txt b/data/zone/en_FM.txt
index b770e5c..2628b8a 100755
--- a/data/zone/en_FM.txt
+++ b/data/zone/en_FM.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_FM.xml
// *
// ***************************************************************************
en_FM{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_GB.txt b/data/zone/en_GB.txt
index c6e9d57..c60343e 100644
--- a/data/zone/en_GB.txt
+++ b/data/zone/en_GB.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GB.xml
// *
// ***************************************************************************
en_GB{
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Asmera"{
ec{"Asmara"}
diff --git a/data/zone/en_GD.txt b/data/zone/en_GD.txt
index 273e495..b7b45ba 100755
--- a/data/zone/en_GD.txt
+++ b/data/zone/en_GD.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GD.xml
// *
// ***************************************************************************
en_GD{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_GH.txt b/data/zone/en_GH.txt
index ba16214..893116a 100755
--- a/data/zone/en_GH.txt
+++ b/data/zone/en_GH.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GH.xml
// *
// ***************************************************************************
en_GH{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_GM.txt b/data/zone/en_GM.txt
index bdfbabf..5ee440e 100755
--- a/data/zone/en_GM.txt
+++ b/data/zone/en_GM.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GM.xml
// *
// ***************************************************************************
en_GM{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_GU.txt b/data/zone/en_GU.txt
index a3b15f3..c7b5eef 100755
--- a/data/zone/en_GU.txt
+++ b/data/zone/en_GU.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GU.xml
// *
// ***************************************************************************
en_GU{
- Version{"2.0.61.44"}
+ Version{"2.0.82.45"}
zoneStrings{
"meta:Chamorro"{
ss{"ChST"}
diff --git a/data/zone/en_GY.txt b/data/zone/en_GY.txt
index eb8110a..4a4ddef 100755
--- a/data/zone/en_GY.txt
+++ b/data/zone/en_GY.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_GY.xml
// *
// ***************************************************************************
en_GY{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_HK.txt b/data/zone/en_HK.txt
index 27dd083..7667971 100755
--- a/data/zone/en_HK.txt
+++ b/data/zone/en_HK.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_HK.xml
// *
// ***************************************************************************
en_HK{
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
zoneStrings{
"Europe:London"{
sd{"∅∅∅"}
diff --git a/data/zone/en_IE.txt b/data/zone/en_IE.txt
index 6760cf2..e19f142 100755
--- a/data/zone/en_IE.txt
+++ b/data/zone/en_IE.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_IE.xml
// *
// ***************************************************************************
en_IE{
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
zoneStrings{
"Europe:Dublin"{
sd{"IST"}
diff --git a/data/zone/en_IN.txt b/data/zone/en_IN.txt
index 60d9608..19a8c5e 100755
--- a/data/zone/en_IN.txt
+++ b/data/zone/en_IN.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_IN.xml
// *
// ***************************************************************************
en_IN{
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
zoneStrings{
"Europe:London"{
sd{"∅∅∅"}
diff --git a/data/zone/en_JM.txt b/data/zone/en_JM.txt
index 7587727..b4cb8f6 100755
--- a/data/zone/en_JM.txt
+++ b/data/zone/en_JM.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_JM.xml
// *
// ***************************************************************************
en_JM{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_KE.txt b/data/zone/en_KE.txt
index 2d9b60e..d7b7c10 100755
--- a/data/zone/en_KE.txt
+++ b/data/zone/en_KE.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_KE.xml
// *
// ***************************************************************************
en_KE{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_KI.txt b/data/zone/en_KI.txt
index 784c0b0..85acf99 100755
--- a/data/zone/en_KI.txt
+++ b/data/zone/en_KI.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_KI.xml
// *
// ***************************************************************************
en_KI{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_KN.txt b/data/zone/en_KN.txt
index fb09888..fd81253 100755
--- a/data/zone/en_KN.txt
+++ b/data/zone/en_KN.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_KN.xml
// *
// ***************************************************************************
en_KN{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_KY.txt b/data/zone/en_KY.txt
index c7ce1bd..47e6680 100755
--- a/data/zone/en_KY.txt
+++ b/data/zone/en_KY.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_KY.xml
// *
// ***************************************************************************
en_KY{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_LC.txt b/data/zone/en_LC.txt
index db0848e..39526c4 100755
--- a/data/zone/en_LC.txt
+++ b/data/zone/en_LC.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_LC.xml
// *
// ***************************************************************************
en_LC{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_LR.txt b/data/zone/en_LR.txt
index 1c12846..20c0e21 100755
--- a/data/zone/en_LR.txt
+++ b/data/zone/en_LR.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_LR.xml
// *
// ***************************************************************************
en_LR{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_LS.txt b/data/zone/en_LS.txt
index 4e7ff31..de78543 100755
--- a/data/zone/en_LS.txt
+++ b/data/zone/en_LS.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_LS.xml
// *
// ***************************************************************************
en_LS{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_MG.txt b/data/zone/en_MG.txt
index 49dd4f3..b8b67a2 100755
--- a/data/zone/en_MG.txt
+++ b/data/zone/en_MG.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_MG.xml
// *
// ***************************************************************************
en_MG{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_MH.txt b/data/zone/en_MH.txt
index 362fc5f..a3d3ef2 100755
--- a/data/zone/en_MH.txt
+++ b/data/zone/en_MH.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_MH.xml
// *
// ***************************************************************************
en_MH{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_MP.txt b/data/zone/en_MP.txt
index 39d6df0..33e1ad5 100755
--- a/data/zone/en_MP.txt
+++ b/data/zone/en_MP.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_MP.xml
// *
// ***************************************************************************
en_MP{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_MU.txt b/data/zone/en_MU.txt
index 13fe107..cbcb612 100755
--- a/data/zone/en_MU.txt
+++ b/data/zone/en_MU.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_MU.xml
// *
// ***************************************************************************
en_MU{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_MW.txt b/data/zone/en_MW.txt
index 462c7e2..cb55dd0 100755
--- a/data/zone/en_MW.txt
+++ b/data/zone/en_MW.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_MW.xml
// *
// ***************************************************************************
en_MW{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_NA.txt b/data/zone/en_NA.txt
index 7543d89..e1ff361 100755
--- a/data/zone/en_NA.txt
+++ b/data/zone/en_NA.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_NA.xml
// *
// ***************************************************************************
en_NA{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_NG.txt b/data/zone/en_NG.txt
index 549920d..98a40b8 100755
--- a/data/zone/en_NG.txt
+++ b/data/zone/en_NG.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_NG.xml
// *
// ***************************************************************************
en_NG{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_NH.txt b/data/zone/en_NH.txt
index 92d7383..0b45233 100755
--- a/data/zone/en_NH.txt
+++ b/data/zone/en_NH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/en_NZ.txt b/data/zone/en_NZ.txt
index b336c25..22afdb3 100644
--- a/data/zone/en_NZ.txt
+++ b/data/zone/en_NZ.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_NZ.xml
// *
// ***************************************************************************
en_NZ{
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
zoneStrings{
"Europe:London"{
sd{"∅∅∅"}
diff --git a/data/zone/en_PG.txt b/data/zone/en_PG.txt
index 0b637d8..0dbbb7c 100755
--- a/data/zone/en_PG.txt
+++ b/data/zone/en_PG.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_PG.xml
// *
// ***************************************************************************
en_PG{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_PH.txt b/data/zone/en_PH.txt
index 9247238..c3576bb 100755
--- a/data/zone/en_PH.txt
+++ b/data/zone/en_PH.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_PH.xml
// *
// ***************************************************************************
en_PH{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_PK.txt b/data/zone/en_PK.txt
index 1ced1fe..f2f4792 100755
--- a/data/zone/en_PK.txt
+++ b/data/zone/en_PK.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_PK.xml
// *
// ***************************************************************************
en_PK{
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
zoneStrings{
"Europe:London"{
sd{"∅∅∅"}
diff --git a/data/zone/en_PW.txt b/data/zone/en_PW.txt
index b21d8ad..99e90cc 100755
--- a/data/zone/en_PW.txt
+++ b/data/zone/en_PW.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_PW.xml
// *
// ***************************************************************************
en_PW{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_RH.txt b/data/zone/en_RH.txt
index 928f668..bc71849 100644
--- a/data/zone/en_RH.txt
+++ b/data/zone/en_RH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/en_SB.txt b/data/zone/en_SB.txt
index 342e41e..450090c 100755
--- a/data/zone/en_SB.txt
+++ b/data/zone/en_SB.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_SB.xml
// *
// ***************************************************************************
en_SB{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_SC.txt b/data/zone/en_SC.txt
index 76a4779..874d65c 100755
--- a/data/zone/en_SC.txt
+++ b/data/zone/en_SC.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_SC.xml
// *
// ***************************************************************************
en_SC{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_SG.txt b/data/zone/en_SG.txt
index b8837a8..301ef78 100755
--- a/data/zone/en_SG.txt
+++ b/data/zone/en_SG.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_SG.xml
// *
// ***************************************************************************
en_SG{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
zoneStrings{
"Europe:London"{
sd{"∅∅∅"}
diff --git a/data/zone/en_SL.txt b/data/zone/en_SL.txt
index 66e9f4b..ba7fe0f 100755
--- a/data/zone/en_SL.txt
+++ b/data/zone/en_SL.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_SL.xml
// *
// ***************************************************************************
en_SL{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_SS.txt b/data/zone/en_SS.txt
index f91bf5f..7a49fae 100755
--- a/data/zone/en_SS.txt
+++ b/data/zone/en_SS.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_SS.xml
// *
// ***************************************************************************
en_SS{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_SZ.txt b/data/zone/en_SZ.txt
index e57b672..04692e5 100755
--- a/data/zone/en_SZ.txt
+++ b/data/zone/en_SZ.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_SZ.xml
// *
// ***************************************************************************
en_SZ{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_TC.txt b/data/zone/en_TC.txt
index 750064d..a3290ee 100755
--- a/data/zone/en_TC.txt
+++ b/data/zone/en_TC.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_TC.xml
// *
// ***************************************************************************
en_TC{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_TO.txt b/data/zone/en_TO.txt
index 5ed62fa..4faf4a1 100755
--- a/data/zone/en_TO.txt
+++ b/data/zone/en_TO.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_TO.xml
// *
// ***************************************************************************
en_TO{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_TT.txt b/data/zone/en_TT.txt
index 7e06f7b..af84537 100755
--- a/data/zone/en_TT.txt
+++ b/data/zone/en_TT.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_TT.xml
// *
// ***************************************************************************
en_TT{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_TZ.txt b/data/zone/en_TZ.txt
index 93c4212..7996b44 100755
--- a/data/zone/en_TZ.txt
+++ b/data/zone/en_TZ.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_TZ.xml
// *
// ***************************************************************************
en_TZ{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_UG.txt b/data/zone/en_UG.txt
index 2e19bc2..d3e93c9 100755
--- a/data/zone/en_UG.txt
+++ b/data/zone/en_UG.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_UG.xml
// *
// ***************************************************************************
en_UG{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_VC.txt b/data/zone/en_VC.txt
index 8779dd4..ca33c56 100755
--- a/data/zone/en_VC.txt
+++ b/data/zone/en_VC.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_VC.xml
// *
// ***************************************************************************
en_VC{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_VG.txt b/data/zone/en_VG.txt
index 4cb4067..5927db7 100755
--- a/data/zone/en_VG.txt
+++ b/data/zone/en_VG.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_VG.xml
// *
// ***************************************************************************
en_VG{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_VU.txt b/data/zone/en_VU.txt
index 3b069dd..a15de4c 100755
--- a/data/zone/en_VU.txt
+++ b/data/zone/en_VU.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_VU.xml
// *
// ***************************************************************************
en_VU{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_WS.txt b/data/zone/en_WS.txt
index 480caa4..b644242 100755
--- a/data/zone/en_WS.txt
+++ b/data/zone/en_WS.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_WS.xml
// *
// ***************************************************************************
en_WS{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_ZA.txt b/data/zone/en_ZA.txt
index 9e73d9a..cf6a9e9 100644
--- a/data/zone/en_ZA.txt
+++ b/data/zone/en_ZA.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_ZA.xml
// *
// ***************************************************************************
en_ZA{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_ZM.txt b/data/zone/en_ZM.txt
index 8ed850c..e06a0c3 100755
--- a/data/zone/en_ZM.txt
+++ b/data/zone/en_ZM.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_ZM.xml
// *
// ***************************************************************************
en_ZM{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/en_ZW.txt b/data/zone/en_ZW.txt
index f9b39c3..553e26d 100644
--- a/data/zone/en_ZW.txt
+++ b/data/zone/en_ZW.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/en_ZW.xml
// *
// ***************************************************************************
en_ZW{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"Pacific:Honolulu"{
sd{"∅∅∅"}
diff --git a/data/zone/eo.txt b/data/zone/eo.txt
index eb4358b..66a8192 100644
--- a/data/zone/eo.txt
+++ b/data/zone/eo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/eo.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/eo.xml
*/
eo{
- Version{"2.0.74.74"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/es.txt b/data/zone/es.txt
index 319fcb4..2fbaf87 100644
--- a/data/zone/es.txt
+++ b/data/zone/es.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/es.xml
*/
es{
- Version{"2.0.78.32"}
+ Version{"2.0.82.47"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abiyán"}
@@ -531,21 +531,11 @@
lg{"Hora de África occidental"}
ls{"Hora estándar de África occidental"}
}
- "meta:Aktyubinsk"{
- ld{"Hora de verano de Aktyubinsk"}
- lg{"Hora de Aktyubinsk"}
- ls{"Hora estándar de Aktyubinsk"}
- }
"meta:Alaska"{
ld{"Hora de verano de Alaska"}
lg{"Hora de Alaska"}
ls{"Hora estándar de Alaska"}
}
- "meta:Alaska_Hawaii"{
- ld{"Hora de verano de Alaska-Hawái"}
- lg{"Hora de Alaska-Hawái"}
- ls{"Hora estándar de Alaska-Hawái"}
- }
"meta:Amazon"{
ld{"Hora de verano del Amazonas"}
lg{"Hora del Amazonas"}
@@ -606,11 +596,6 @@
lg{"Hora de Armenia"}
ls{"Hora estándar de Armenia"}
}
- "meta:Ashkhabad"{
- ld{"Hora de verano de Asjabad"}
- lg{"Hora de Asjabad"}
- ls{"Hora estándar de Asjabad"}
- }
"meta:Atlantic"{
ld{"Hora de verano del Atlántico"}
lg{"Hora del Atlántico"}
@@ -646,32 +631,17 @@
lg{"Hora de las Azores"}
ls{"Hora estándar de las Azores"}
}
- "meta:Baku"{
- ld{"Hora de verano de Bakú"}
- lg{"Hora de Bakú"}
- ls{"Hora estándar de Bakú"}
- }
"meta:Bangladesh"{
ld{"Hora de verano de Bangladés"}
lg{"Hora de Bangladés"}
ls{"Hora estándar de Bangladés"}
}
- "meta:Bering"{
- ld{"Hora de verano de Bering"}
- lg{"Hora de Bering"}
- ls{"Hora estándar de Bering"}
- }
"meta:Bhutan"{
ls{"Hora de Bután"}
}
"meta:Bolivia"{
ls{"Hora de Bolivia"}
}
- "meta:Borneo"{
- ld{"Hora de verano de Borneo"}
- lg{"Hora de Borneo"}
- ls{"Hora estándar de Borneo"}
- }
"meta:Brasilia"{
ld{"Hora de verano de Brasilia"}
lg{"Hora de Brasilia"}
@@ -688,9 +658,6 @@
"meta:Chamorro"{
ls{"Hora estándar de Chamorro"}
}
- "meta:Changbai"{
- ls{"Hora de Changbai"}
- }
"meta:Chatham"{
ld{"Hora de verano de Chatham"}
lg{"Hora de Chatham"}
@@ -732,23 +699,12 @@
lg{"Hora de Cuba"}
ls{"Hora estándar de Cuba"}
}
- "meta:Dacca"{
- ls{"Hora de Dacca"}
- }
"meta:Davis"{
ls{"Hora de Davis"}
}
"meta:DumontDUrville"{
ls{"Hora de Dumont-d’Urville"}
}
- "meta:Dushanbe"{
- ld{"Hora de verano de Dusambé"}
- lg{"Hora de Dusambé"}
- ls{"Hora estándar de Dusambé"}
- }
- "meta:Dutch_Guiana"{
- ls{"Hora de la Guayana Holandesa"}
- }
"meta:East_Timor"{
ls{"Hora de Timor Oriental"}
}
@@ -791,11 +747,6 @@
"meta:French_Southern"{
ls{"Hora de las Tierras Australes y Antárticas Francesas"}
}
- "meta:Frunze"{
- ld{"Hora de verano de Frunze"}
- lg{"Hora de Frunze"}
- ls{"Hora estándar de Frunze"}
- }
"meta:GMT"{
ls{"Hora del meridiano de Greenwich"}
}
@@ -813,11 +764,6 @@
"meta:Gilbert_Islands"{
ls{"Hora de las islas Gilbert"}
}
- "meta:Greenland_Central"{
- ld{"Hora de verano de Groenlandia central"}
- lg{"Hora de Groenlandia central"}
- ls{"Hora estándar de Groenlandia central"}
- }
"meta:Greenland_Eastern"{
ld{"Hora de verano de Groenlandia oriental"}
lg{"Hora de Groenlandia oriental"}
@@ -895,23 +841,12 @@
lg{"Hora de Kamchatka"}
ls{"Hora de estándar de Kamchatka"}
}
- "meta:Karachi"{
- ls{"Hora de Karachi"}
- }
- "meta:Kashgar"{
- ls{"Hora de Kashgar"}
- }
"meta:Kazakhstan_Eastern"{
ls{"Hora de Kazajistán oriental"}
}
"meta:Kazakhstan_Western"{
ls{"Hora de Kazajistán occidental"}
}
- "meta:Kizilorda"{
- ld{"Hora de verano de Kizil Orda"}
- lg{"Hora de Kizil Orda"}
- ls{"Hora estándar de Kizil Orda"}
- }
"meta:Korea"{
ld{"Hora de verano de Corea"}
lg{"Hora de Corea"}
@@ -925,14 +860,6 @@
lg{"Hora de Krasnoyarsk"}
ls{"Hora estándar de Krasnoyarsk"}
}
- "meta:Kuybyshev"{
- ld{"Hora de verano de Kuíbyshev"}
- lg{"Hora de Kuíbyshev"}
- ls{"Hora estándar de Kuíbyshev"}
- }
- "meta:Kwajalein"{
- ls{"Hora de Kwajalein"}
- }
"meta:Kyrgystan"{
ls{"Hora de Kirguistán"}
}
@@ -942,9 +869,6 @@
"meta:Line_Islands"{
ls{"Hora de las Espóradas Ecuatoriales"}
}
- "meta:Long_Shu"{
- ls{"Hora de Long-Shu"}
- }
"meta:Lord_Howe"{
ld{"Hora de verano de Lord Howe"}
lg{"Hora de Lord Howe"}
@@ -963,9 +887,6 @@
lg{"Hora de Magadán"}
ls{"Hora estándar de Magadán"}
}
- "meta:Malaya"{
- ls{"Hora de Malaya"}
- }
"meta:Malaysia"{
ls{"Hora de Malasia"}
}
@@ -1099,19 +1020,11 @@
lg{"Hora de Samara"}
ls{"Hora estándar de Samara"}
}
- "meta:Samarkand"{
- ld{"Hora de verano de Samarcanda"}
- lg{"Hora de Samarcanda"}
- ls{"Hora estándar de Samarcanda"}
- }
"meta:Samoa"{
+ ld{"Hora de verano de Samoa"}
+ lg{"Hora de Samoa"}
ls{"Hora estándar de Samoa"}
}
- "meta:Shevchenko"{
- ld{"Hora de verano de Shevchenko"}
- lg{"Hora de Shevchenko"}
- ls{"Hora estándar de Shevchenko"}
- }
"meta:Solomon"{
ls{"Hora de las islas Salomón"}
}
@@ -1121,11 +1034,6 @@
"meta:Suriname"{
ls{"Hora de Surinam"}
}
- "meta:Sverdlovsk"{
- ld{"Hora de verano de Sverdlovsk"}
- lg{"Hora de Sverdlovsk"}
- ls{"Hora estándar de Sverdlovsk"}
- }
"meta:Syowa"{
ls{"Hora de Syowa"}
}
@@ -1140,16 +1048,6 @@
"meta:Tajikistan"{
ls{"Hora de Tayikistán"}
}
- "meta:Tashkent"{
- ld{"Hora de verano de Tashkent"}
- lg{"Hora de Tashkent"}
- ls{"Hora estándar de Tashkent"}
- }
- "meta:Tbilisi"{
- ld{"Hora de verano de Tbilisi"}
- lg{"Hora de Tbilisi"}
- ls{"Hora estándar de Tbilisi"}
- }
"meta:Tokelau"{
ls{"Hora de Tokelau"}
}
@@ -1161,11 +1059,6 @@
"meta:Truk"{
ls{"Hora de Chuuk"}
}
- "meta:Turkey"{
- ld{"Hora de verano de Turquía"}
- lg{"Hora de Turquía"}
- ls{"Hora estándar de Turquía"}
- }
"meta:Turkmenistan"{
ld{"Hora de verano de Turkmenistán"}
lg{"Hora de Turkmenistán"}
@@ -1174,19 +1067,11 @@
"meta:Tuvalu"{
ls{"Hora de Tuvalu"}
}
- "meta:Uralsk"{
- ld{"Hora de verano de Oral"}
- lg{"Hora de Oral"}
- ls{"Hora estándar de Oral"}
- }
"meta:Uruguay"{
ld{"Hora de verano de Uruguay"}
lg{"Hora de Uruguay"}
ls{"Hora estándar de Uruguay"}
}
- "meta:Urumqi"{
- ls{"Hora de Ürümqi"}
- }
"meta:Uzbekistan"{
ld{"Hora de verano de Uzbekistán"}
lg{"Hora de Uzbekistán"}
@@ -1229,16 +1114,6 @@
lg{"Hora de Ekaterimburgo"}
ls{"Hora estándar de Ekaterimburgo"}
}
- "meta:Yerevan"{
- ld{"Hora de verano de Ereván"}
- lg{"Hora de Ereván"}
- ls{"Hora estándar de Ereván"}
- }
- "meta:Yukon"{
- ld{"Hora de verano del Yukón"}
- lg{"Hora del Yukón"}
- ls{"Hora estándar del Yukón"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"Hora de {1} ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/es_419.txt b/data/zone/es_419.txt
index 1f03e04..b41a1eb 100755
--- a/data/zone/es_419.txt
+++ b/data/zone/es_419.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_419.xml
// *
// ***************************************************************************
es_419{
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
zoneStrings{
"America:Coral_Harbour"{
ec{"Atikokan"}
diff --git a/data/zone/es_AR.txt b/data/zone/es_AR.txt
index b676f64..797b014 100755
--- a/data/zone/es_AR.txt
+++ b/data/zone/es_AR.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/es_AR.xml
// *
// ***************************************************************************
es_AR{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
zoneStrings{
"meta:Argentina"{
sd{"ARST"}
diff --git a/data/zone/et.txt b/data/zone/et.txt
index d6da82b..439c212 100644
--- a/data/zone/et.txt
+++ b/data/zone/et.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/et.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/et.xml
*/
et{
- Version{"2.0.78.32"}
+ Version{"2.0.82.47"}
zoneStrings{
"Africa:Algiers"{
ec{"Alžiir"}
@@ -614,14 +614,6 @@
lg{"Krasnojarski aeg"}
ls{"Krasnojarski standardaeg"}
}
- "meta:Kuybyshev"{
- ld{"Kuibõševi suveaeg"}
- lg{"Kuibõševi aeg"}
- ls{"Kuibõševi standardaeg"}
- }
- "meta:Kwajalein"{
- ls{"Kwajalein'i aeg"}
- }
"meta:Kyrgystan"{
ls{"Kõrgõzstani aeg"}
}
@@ -768,11 +760,13 @@
ls{"Sahhalini standardaeg"}
}
"meta:Samara"{
- ld{"Samara suveag"}
+ ld{"Samara suveaeg"}
lg{"Samara aeg"}
ls{"Samara standardaeg"}
}
"meta:Samoa"{
+ ld{"Samoa suveaeg"}
+ lg{"Samoa aeg"}
ls{"Samoa standardaeg"}
}
"meta:Seychelles"{
@@ -787,7 +781,7 @@
"meta:South_Georgia"{
ls{"Lõuna-Georgia aeg"}
}
- "meta:Suriname"{
+s "meta:Suriname"{
ls{"Suriname aeg"}
}
"meta:Syowa"{
@@ -815,11 +809,6 @@
"meta:Truk"{
ls{"Chuuki aeg"}
}
- "meta:Turkey"{
- ld{"Türgi suveaeg"}
- lg{"Türgi aeg"}
- ls{"Türgi standardaeg"}
- }
"meta:Turkmenistan"{
ld{"Türkmenistani suveaeg"}
lg{"Türkmenistani aeg"}
diff --git a/data/zone/eu.txt b/data/zone/eu.txt
index b8c50bc..8c6c8c8 100644
--- a/data/zone/eu.txt
+++ b/data/zone/eu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/eu.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/eu.xml
*/
eu{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Djibouti"{
ec{"Djibuti"}
@@ -569,6 +569,8 @@
ls{"Samarako ordu estandarra"}
}
"meta:Samoa"{
+ ld{"Samoako udako ordua"}
+ lg{"Samoako ordua"}
ls{"Samoako ordu estandarra"}
}
"meta:Seychelles"{
diff --git a/data/zone/ewo.txt b/data/zone/ewo.txt
index cdd8ae0..01ffca1 100755
--- a/data/zone/ewo.txt
+++ b/data/zone/ewo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ewo.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/ewo.xml
*/
ewo{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/fa.txt b/data/zone/fa.txt
index 2da2c85..8e5f917 100644
--- a/data/zone/fa.txt
+++ b/data/zone/fa.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fa.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/fa.xml
*/
fa{
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"آبیجان"}
@@ -1248,11 +1248,6 @@
lg{"وقت آلاسکا"}
ls{"وقت عادی آلاسکا"}
}
- "meta:Alaska_Hawaii"{
- ld{"وقت تابستانی آلاسکا‐هاوائی"}
- lg{"وقت آلاسکا‐هاوائی"}
- ls{"وقت عادی آلاسکا‐هاوائی"}
- }
"meta:Almaty"{
ld{"وقت تابستانی آلماآتا"}
lg{"وقت آلماآتا"}
@@ -1308,11 +1303,6 @@
lg{"وقت ارمنستان"}
ls{"وقت عادی ارمنستان"}
}
- "meta:Ashkhabad"{
- ld{"وقت تابستانی عشقآباد"}
- lg{"وقت عشقآباد"}
- ls{"وقت عادی عشقآباد"}
- }
"meta:Atlantic"{
ld{"وقت تابستانی آتلانتیک"}
lg{"وقت آتلانتیک"}
@@ -1348,21 +1338,11 @@
lg{"وقت آزور"}
ls{"وقت عادی آزور"}
}
- "meta:Baku"{
- ld{"وقت تابستانی باکو"}
- lg{"وقت باکو"}
- ls{"وقت عادی باکو"}
- }
"meta:Bangladesh"{
ld{"وقت تابستانی بنگلادش"}
lg{"وقت بنگلادش"}
ls{"وقت عادی بنگلادش"}
}
- "meta:Bering"{
- ld{"وقت تابستانی برینگ"}
- lg{"وقت برینگ"}
- ls{"وقت عادی برینگ"}
- }
"meta:Bhutan"{
ls{"وقت بوتان"}
}
@@ -1432,14 +1412,6 @@
"meta:DumontDUrville"{
ls{"وقت دومون دورویل"}
}
- "meta:Dushanbe"{
- ld{"وقت تابستانی دوشنبه"}
- lg{"وقت دوشنبه"}
- ls{"وقت عادی دوشنبه"}
- }
- "meta:Dutch_Guiana"{
- ls{"وقت گویان هلند"}
- }
"meta:East_Timor"{
ls{"وقت تیمور شرقی"}
}
@@ -1499,11 +1471,6 @@
"meta:Gilbert_Islands"{
ls{"وقت جزایر گیلبرت"}
}
- "meta:Greenland_Central"{
- ld{"وقت تابستانی مرکز گروئنلند"}
- lg{"وقت مرکز گروئنلند"}
- ls{"وقت عادی مرکز گروئنلند"}
- }
"meta:Greenland_Eastern"{
ld{"وقت تابستانی شرق گرینلند"}
lg{"وقت شرق گرینلند"}
@@ -1581,12 +1548,6 @@
lg{"وقت پتروپاولوسک‐کامچاتسکی"}
ls{"وقت عادی پتروپاولوسک‐کامچاتسکی"}
}
- "meta:Karachi"{
- ls{"وقت کراچی"}
- }
- "meta:Kashgar"{
- ls{"وقت کاشغر"}
- }
"meta:Kazakhstan_Eastern"{
ls{"وقت شرق قزاقستان"}
}
@@ -1772,13 +1733,10 @@
lg{"وقت سامارا"}
ls{"وقت عادی سامارا"}
}
- "meta:Samarkand"{
- ld{"وقت تابستانی سمرقند"}
- lg{"وقت سمرقند"}
- ls{"وقت عادی سمرقند"}
- }
"meta:Samoa"{
- ls{"وقت ساموا"}
+ ld{"وقت تابستانی ساموا"}
+ lg{"وقت ساموا"}
+ ls{"وقت عادی ساموا"}
}
"meta:Seychelles"{
ls{"وقت سیشل"}
@@ -1809,16 +1767,6 @@
"meta:Tajikistan"{
ls{"وقت تاجیکستان"}
}
- "meta:Tashkent"{
- ld{"وقت تابستانی تاشکند"}
- lg{"وقت تاشکند"}
- ls{"وقت عادی تاشکند"}
- }
- "meta:Tbilisi"{
- ld{"وقت تابستانی تفلیس"}
- lg{"وقت تفلیس"}
- ls{"وقت عادی تفلیس"}
- }
"meta:Tokelau"{
ls{"وقت توکلائو"}
}
@@ -1830,11 +1778,6 @@
"meta:Truk"{
ls{"وقت چوئوک"}
}
- "meta:Turkey"{
- ld{"وقت تابستانی ترکیه"}
- lg{"وقت ترکیه"}
- ls{"وقت عادی ترکیه"}
- }
"meta:Turkmenistan"{
ld{"وقت تابستانی ترکمنستان"}
lg{"وقت ترکمنستان"}
@@ -1848,9 +1791,6 @@
lg{"وقت اروگوئه"}
ls{"وقت عادی اروگوئه"}
}
- "meta:Urumqi"{
- ls{"وقت ارومچی"}
- }
"meta:Uzbekistan"{
ld{"وقت تابستانی ازبکستان"}
lg{"وقت ازبکستان"}
@@ -1893,16 +1833,6 @@
lg{"وقت یکاترینبورگ"}
ls{"وقت عادی یکاترینبورگ"}
}
- "meta:Yerevan"{
- ld{"وقت تابستانی ایروان"}
- lg{"وقت ایروان"}
- ls{"وقت عادی ایروان"}
- }
- "meta:Yukon"{
- ld{"وقت تابستانی یوکان"}
- lg{"وقت یوکان"}
- ls{"وقت عادی یوکان"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"وقت {1} ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/ff.txt b/data/zone/ff.txt
index b90a5bb..68cfdd4 100755
--- a/data/zone/ff.txt
+++ b/data/zone/ff.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ff.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/ff.xml
*/
ff{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/fi.txt b/data/zone/fi.txt
index 71b4577..b722d8c 100644
--- a/data/zone/fi.txt
+++ b/data/zone/fi.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fi.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/fi.xml
*/
fi{
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
zoneStrings{
"Africa:Addis_Ababa"{
ec{"Addis Abeba"}
@@ -279,51 +279,6 @@
"Atlantic:St_Helena"{
ec{"Saint Helena"}
}
- "Etc:GMT"{
- ec{"UTC"}
- }
- "Etc:GMT-1"{
- ec{"UTC-1"}
- }
- "Etc:GMT-10"{
- ec{"UTC-10"}
- }
- "Etc:GMT-11"{
- ec{"UTC-11"}
- }
- "Etc:GMT-12"{
- ec{"UTC-12"}
- }
- "Etc:GMT-13"{
- ec{"UTC-13"}
- }
- "Etc:GMT-14"{
- ec{"UTC-14"}
- }
- "Etc:GMT-2"{
- ec{"UTC-2"}
- }
- "Etc:GMT-3"{
- ec{"UTC-3"}
- }
- "Etc:GMT-4"{
- ec{"UTC-4"}
- }
- "Etc:GMT-5"{
- ec{"UTC-5"}
- }
- "Etc:GMT-6"{
- ec{"UTC-6"}
- }
- "Etc:GMT-7"{
- ec{"UTC-7"}
- }
- "Etc:GMT-8"{
- ec{"UTC-8"}
- }
- "Etc:GMT-9"{
- ec{"UTC-9"}
- }
"Etc:Unknown"{
ec{"tuntematon"}
}
@@ -473,21 +428,11 @@
lg{"Länsi-Afrikan aika"}
ls{"Länsi-Afrikan normaaliaika"}
}
- "meta:Aktyubinsk"{
- ld{"Aktjubinskin kesäaika"}
- lg{"Aktjubinskin aika"}
- ls{"Aktjubinskin normaaliaika"}
- }
"meta:Alaska"{
ld{"Alaskan kesäaika"}
lg{"Alaskan aika"}
ls{"Alaskan normaaliaika"}
}
- "meta:Alaska_Hawaii"{
- ld{"Alaskan ja Havaijin kesäaika"}
- lg{"Alaskan ja Havaijin aika"}
- ls{"Alaskan ja Havaijin normaaliaika"}
- }
"meta:Almaty"{
ld{"Almatyn kesäaika"}
lg{"Almatyn aika"}
@@ -553,11 +498,6 @@
lg{"Armenian aika"}
ls{"Armenian normaaliaika"}
}
- "meta:Ashkhabad"{
- ld{"Ašgabatin kesäaika"}
- lg{"Ašgabatin aika"}
- ls{"Ašgabatin normaaliaika"}
- }
"meta:Atlantic"{
ld{"Kanadan Atlantin kesäaika"}
lg{"Kanadan Atlantin aika"}
@@ -593,32 +533,17 @@
lg{"Azorien aika"}
ls{"Azorien normaaliaika"}
}
- "meta:Baku"{
- ld{"Bakun kesäaika"}
- lg{"Bakun aika"}
- ls{"Bakun normaaliaika"}
- }
"meta:Bangladesh"{
ld{"Bangladeshin kesäaika"}
lg{"Bangladeshin aika"}
ls{"Bangladeshin normaaliaika"}
}
- "meta:Bering"{
- ld{"Beringin kesäaika"}
- lg{"Beringin aika"}
- ls{"Beringin normaaliaika"}
- }
"meta:Bhutan"{
ls{"Bhutanin aika"}
}
"meta:Bolivia"{
ls{"Bolivian aika"}
}
- "meta:Borneo"{
- ld{"Borneon kesäaika"}
- lg{"Borneon aika"}
- ls{"Borneon normaaliaika"}
- }
"meta:Brasilia"{
ld{"Brasilian kesäaika"}
lg{"Brasilian aika"}
@@ -638,9 +563,6 @@
"meta:Chamorro"{
ls{"Tšamorron aika"}
}
- "meta:Changbai"{
- ls{"Changbain aika"}
- }
"meta:Chatham"{
ld{"Chathamin kesäaika"}
lg{"Chathamin aika"}
@@ -682,23 +604,12 @@
lg{"Kuuban aika"}
ls{"Kuuban normaaliaika"}
}
- "meta:Dacca"{
- ls{"Daccan aika"}
- }
"meta:Davis"{
ls{"Davisin aika"}
}
"meta:DumontDUrville"{
ls{"Dumont-d'Urvillen aika"}
}
- "meta:Dushanbe"{
- ld{"Dušanben kesäaika"}
- lg{"Dušanben aika"}
- ls{"Dušanben normaaliaika"}
- }
- "meta:Dutch_Guiana"{
- ls{"Hollannin Guianan aika"}
- }
"meta:East_Timor"{
ls{"Itä-Timorin aika"}
}
@@ -741,11 +652,6 @@
"meta:French_Southern"{
ls{"Ranskan eteläisten ja antarktisten alueiden aika"}
}
- "meta:Frunze"{
- ld{"Biškekin kesäaika"}
- lg{"Biškekin aika"}
- ls{"Biškekin normaaliaika"}
- }
"meta:GMT"{
ls{"Greenwichin normaaliaika"}
}
@@ -763,11 +669,6 @@
"meta:Gilbert_Islands"{
ls{"Gilbertsaarten aika"}
}
- "meta:Greenland_Central"{
- ld{"Keski-Grönlannin kesäaika"}
- lg{"Keski-Grönlannin aika"}
- ls{"Keski-Grönlannin normaaliaika"}
- }
"meta:Greenland_Eastern"{
ld{"Itä-Grönlannin kesäaika"}
lg{"Itä-Grönlannin aika"}
@@ -845,23 +746,12 @@
lg{"Kamtšatkan aika"}
ls{"Kamtšatkan normaaliaika"}
}
- "meta:Karachi"{
- ls{"Karachin aika"}
- }
- "meta:Kashgar"{
- ls{"Kašgarin aika"}
- }
"meta:Kazakhstan_Eastern"{
ls{"Itä-Kazakstanin aika"}
}
"meta:Kazakhstan_Western"{
ls{"Länsi-Kazakstanin aika"}
}
- "meta:Kizilorda"{
- ld{"Kyzyl-Ordan kesäaika"}
- lg{"Kyzyl-Ordan aika"}
- ls{"Kyzyl-Ordan normaaliaika"}
- }
"meta:Korea"{
ld{"Korean kesäaika"}
lg{"Korean aika"}
@@ -875,14 +765,6 @@
lg{"Krasnojarskin aika"}
ls{"Krasnojarskin normaaliaika"}
}
- "meta:Kuybyshev"{
- ld{"Kuibyševin kesäaika"}
- lg{"Kuibyševin aika"}
- ls{"Kuibyševin normaaliaika"}
- }
- "meta:Kwajalein"{
- ls{"Kwajaleinin aika"}
- }
"meta:Kyrgystan"{
ls{"Kirgisian aika"}
}
@@ -892,9 +774,6 @@
"meta:Line_Islands"{
ls{"Linesaarten aika"}
}
- "meta:Long_Shu"{
- ls{"Long-Shun aika"}
- }
"meta:Lord_Howe"{
ld{"Lord Howen kesäaika"}
lg{"Lord Howen aika"}
@@ -913,9 +792,6 @@
lg{"Magadanin aika"}
ls{"Magadanin normaaliaika"}
}
- "meta:Malaya"{
- ls{"Malaijan aika"}
- }
"meta:Malaysia"{
ls{"Malesian aika"}
}
@@ -1055,22 +931,14 @@
lg{"Samaran aika"}
ls{"Samaran normaaliaika"}
}
- "meta:Samarkand"{
- ld{"Samarkandin kesäaika"}
- lg{"Samarkandin aika"}
- ls{"Samarkandin normaaliaika"}
- }
"meta:Samoa"{
- ls{"Samoan aika"}
+ ld{"Samoan kesäaika"}
+ lg{"Samoan aika"}
+ ls{"Samoan normaaliaika"}
}
"meta:Seychelles"{
ls{"Seychellien aika"}
}
- "meta:Shevchenko"{
- ld{"Ševtšenkon kesäaika"}
- lg{"Ševtšenkon aika"}
- ls{"Ševtšenkon normaaliaika"}
- }
"meta:Singapore"{
ls{"Singaporen aika"}
}
@@ -1083,11 +951,6 @@
"meta:Suriname"{
ls{"Surinamin aika"}
}
- "meta:Sverdlovsk"{
- ld{"Sverdlovskin kesäaika"}
- lg{"Sverdlovskin aika"}
- ls{"Sverdlovskin normaaliaika"}
- }
"meta:Syowa"{
ls{"Syowan aika"}
}
@@ -1102,16 +965,6 @@
"meta:Tajikistan"{
ls{"Tadžikistanin aika"}
}
- "meta:Tashkent"{
- ld{"Taškentin kesäaika"}
- lg{"Taškentin aika"}
- ls{"Taškentin normaaliaika"}
- }
- "meta:Tbilisi"{
- ld{"Tbilisin kesäaika"}
- lg{"Tbilisin aika"}
- ls{"Tbilisin normaaliaika"}
- }
"meta:Tokelau"{
ls{"Tokelaun aika"}
}
@@ -1123,11 +976,6 @@
"meta:Truk"{
ls{"Chuukin aika"}
}
- "meta:Turkey"{
- ld{"Turkin kesäaika"}
- lg{"Turkin aika"}
- ls{"Turkin normaaliaika"}
- }
"meta:Turkmenistan"{
ld{"Turkmenistanin kesäaika"}
lg{"Turkmenistanin aika"}
@@ -1136,19 +984,11 @@
"meta:Tuvalu"{
ls{"Tuvalun aika"}
}
- "meta:Uralsk"{
- ld{"Uralskin kesäaika"}
- lg{"Uralskin aika"}
- ls{"Uralskin normaaliaika"}
- }
"meta:Uruguay"{
ld{"Uruguayn kesäaika"}
lg{"Uruguayn aika"}
ls{"Uruguayn normaaliaika"}
}
- "meta:Urumqi"{
- ls{"Ürümqin aika"}
- }
"meta:Uzbekistan"{
ld{"Uzbekistanin kesäaika"}
lg{"Uzbekistanin aika"}
@@ -1191,16 +1031,6 @@
lg{"Jekaterinburgin aika"}
ls{"Jekaterinburgin normaaliaika"}
}
- "meta:Yerevan"{
- ld{"Jerevanin kesäaika"}
- lg{"Jerevanin aika"}
- ls{"Jerevanin normaaliaika"}
- }
- "meta:Yukon"{
- ld{"Yukonin kesäaika"}
- lg{"Yukonin aika"}
- ls{"Yukonin normaaliaika"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"{1} ({0})"}
gmtFormat{"UTC{0}"}
diff --git a/data/zone/fil.txt b/data/zone/fil.txt
index b2fa8e8..0831bf6 100755
--- a/data/zone/fil.txt
+++ b/data/zone/fil.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fil.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/fil.xml
*/
fil{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
zoneStrings{
"America:Asuncion"{
ec{"Asunción"}
@@ -43,196 +43,196 @@
ec{"Réunion"}
}
"meta:Afghanistan"{
- ls{"Afghanistan Time"}
+ ls{"Oras sa Afghanistan"}
}
"meta:Africa_Central"{
- ls{"Central Africa Time"}
+ ls{"Oras sa Central Africa"}
}
"meta:Africa_Eastern"{
- ls{"East Africa Time"}
+ ls{"Oras sa East Africa"}
}
"meta:Africa_Southern"{
- ls{"South Africa Standard Time"}
+ ls{"Oras sa South Africa"}
}
"meta:Africa_Western"{
- ld{"West Africa Summer Time"}
- lg{"West Africa Time"}
- ls{"West Africa Standard Time"}
+ ld{"Summer Time sa West Africa"}
+ lg{"Oras sa West Africa"}
+ ls{"Standard Time sa West Africa"}
}
"meta:Alaska"{
- ld{"Oras na Alaska Daylight"}
+ ld{"Daylight Time sa Alaska"}
lg{"Oras sa Alaska"}
- ls{"Standard na Oras sa Alaska"}
+ ls{"Standard Time sa Alaska"}
}
"meta:Amazon"{
- ld{"Amazon Summer Time"}
+ ld{"Summer Time sa Amazon"}
lg{"Oras sa Amazon"}
- ls{"Amazon Standard Time"}
+ ls{"Standard Time sa Amazon"}
}
"meta:America_Central"{
- ld{"Oras na Central Daylight"}
- lg{"Oras sa Central"}
- ls{"Standard na Oras sa Central"}
+ ld{"Central Daylight Time sa North America"}
+ lg{"Central Time sa North America"}
+ ls{"Central Standard Time sa North America"}
}
"meta:America_Eastern"{
- ld{"Oras na Eastern Daylight"}
- lg{"Oras sa Silangan"}
- ls{"Standard na Oras sa Silangan"}
+ ld{"Eastern Daylight Time sa North America"}
+ lg{"Eastern Time sa North America"}
+ ls{"Eastern Standard Time sa North America"}
}
"meta:America_Mountain"{
- ld{"Oras na Mountain Daylight"}
- lg{"Oras sa Mountain"}
- ls{"Standard na Oras sa Mountain"}
+ ld{"Mountain Daylight Time sa North America"}
+ lg{"Mountain Time sa North America"}
+ ls{"Mountain Standard Time sa North America"}
}
"meta:America_Pacific"{
- ld{"Oras sa Pacific Daylight"}
- lg{"Oras sa Pacific"}
- ls{"Standard na Oras sa Pacific"}
+ ld{"Pacific Daylight Time sa North America"}
+ lg{"Pacific Time sa North America"}
+ ls{"Pacific Standard Time sa North America"}
}
"meta:Anadyr"{
- ld{"Panahon ng Tag-init sa Anadyr"}
+ ld{"Summer Time sa Anadyr"}
lg{"Oras sa Anadyr"}
- ls{"Standard na Oras sa Anadyr"}
+ ls{"Standard Time sa Anadyr"}
}
"meta:Arabian"{
- ld{"Arabian Daylight Time"}
- lg{"Arabian Time"}
- ls{"Arabian Standard Time"}
+ ld{"Daylight Time sa Arabia"}
+ lg{"Oras sa Arabia"}
+ ls{"Standard Time sa Arabia"}
}
"meta:Argentina"{
- ld{"Panahon ng Tag-init sa Argentina"}
+ ld{"Summer Time sa Argentina"}
lg{"Oras sa Argentina"}
- ls{"Standard na Oras sa Argentina"}
+ ls{"Standard Time sa Argentina"}
}
"meta:Argentina_Western"{
- ld{"Western Argentina Summer Time"}
- lg{"Western Argentina Time"}
- ls{"Western Argentina Standard Time"}
+ ld{"Summer Time sa Western Argentina"}
+ lg{"Oras sa Western Argentina"}
+ ls{"Standard Time sa Western Argentina"}
}
"meta:Armenia"{
- ld{"Armenia Summer Time"}
- lg{"Armenia Time"}
- ls{"Armenia Standard Time"}
+ ld{"Summer Time sa Armenia"}
+ lg{"Oras sa Armenia"}
+ ls{"Standard Time sa Armenia"}
}
"meta:Atlantic"{
- ld{"Oras na Atlantic Daylight"}
+ ld{"Daylight Time sa Atlantic"}
lg{"Oras sa Atlantic"}
- ls{"Standard na Oras sa Atlantic"}
+ ls{"Standard Time sa Atlantic"}
}
"meta:Australia_Central"{
- ld{"Panahon ng Tag-init sa Central ng Australia"}
- lg{"Oras sa Central ng Australia"}
- ls{"Standard na Oras sa Central ng Australia"}
+ ld{"Central Summer Time sa Australia"}
+ lg{"Oras sa Central Australia"}
+ ls{"Central Standard Time sa Australia"}
}
"meta:Australia_CentralWestern"{
- ld{"Oras sa Central sa Kanluran ng Australia Daylight"}
- lg{"Oras sa Central sa Kanluran ng Australia"}
- ls{"Standard na Oras sa Central na Kanluran ng Australia"}
+ ld{"Central Western Daylight Time sa Australia"}
+ lg{"Central Western Time sa Australia"}
+ ls{"Central Western Standard Time sa Australia"}
}
"meta:Australia_Eastern"{
- ld{"Oras sa Silangang Australia Daylight"}
- lg{"Oras sa Silangang Australia"}
- ls{"Standard na Oras sa Silangan ng Australia"}
+ ld{"Eastern Daylight Time sa Australia"}
+ lg{"Oras sa Eastern Australia"}
+ ls{"Eastern Standard Time sa Australia"}
}
"meta:Australia_Western"{
- ld{"Oras sa Kanlurang Australia Daylight"}
- lg{"Oras sa Kanlurang Australia"}
- ls{"Standard na Oras sa Kanluran ng Australia"}
+ ld{"Western Daylight Time sa Australia"}
+ lg{"Oras sa Western Australia"}
+ ls{"Western Standard Time sa Australia"}
}
"meta:Azerbaijan"{
- ld{"Azerbaijan Summer Time"}
- lg{"Azerbaijan Time"}
- ls{"Azerbaijan Standard Time"}
+ ld{"Azerbaijan Summer"}
+ lg{"Oras sa Azerbaijan"}
+ ls{"Standard Time sa Azerbaijan"}
}
"meta:Azores"{
- ld{"Azores Summer Time"}
- lg{"Azores Time"}
- ls{"Azores Standard Time"}
+ ld{"Summer Time sa Azores"}
+ lg{"Oras sa Azores"}
+ ls{"Standard Time sa Azores"}
}
"meta:Bangladesh"{
- ld{"Bangladesh Summer Time"}
- lg{"Bangladesh Time"}
- ls{"Bangladesh Standard Time"}
+ ld{"Summer Time sa Bangladesh"}
+ lg{"Oras sa Bangladesh"}
+ ls{"Standard Time sa Bangladesh"}
}
"meta:Bhutan"{
- ls{"Bhutan Time"}
+ ls{"Oras sa Bhutan"}
}
"meta:Bolivia"{
- ls{"Bolivia Time"}
+ ls{"Oras sa Bolivia"}
}
"meta:Brasilia"{
- ld{"Panahon ng Tag-init sa Brasilia"}
+ ld{"Summer Time sa Brasilia"}
lg{"Oras sa Brasilia"}
- ls{"Standard na Oras sa Brasilia"}
+ ls{"Standard Time sa Brasilia"}
}
"meta:Brunei"{
- ls{"Brunei Darussalam Time"}
+ ls{"Oras sa Brunie Darussalam"}
}
"meta:Cape_Verde"{
- ld{"Cape Verde Summer Time"}
- lg{"Cape Verde Time"}
- ls{"Cape Verde Standard Time"}
+ ld{"Summer Time sa Cape Verde"}
+ lg{"Oras sa Cape Verde"}
+ ls{"Standard Time sa Cape Verde"}
}
"meta:Chamorro"{
- ls{"Chamorro Standard Time"}
+ ls{"Standard Time sa Chamorro"}
}
"meta:Chatham"{
- ld{"Chatham Daylight Time"}
- lg{"Chatham Time"}
- ls{"Chatham Standard Time"}
+ ld{"Daylight Time sa Chatham"}
+ lg{"Oras sa Chatham"}
+ ls{"Standard Time sa Chatham"}
}
"meta:Chile"{
- ld{"Chile Summer Time"}
- lg{"Chile Time"}
- ls{"Chile Standard Time"}
+ ld{"Summer Time sa Chile"}
+ lg{"Oras sa Chile"}
+ ls{"Standard Time sa Chile"}
}
"meta:China"{
- ld{"China Daylight Time"}
- lg{"China Time"}
- ls{"China Standard Time"}
+ ld{"Daylight Time sa China"}
+ lg{"Oras sa China"}
+ ls{"Standard Time sa China"}
}
"meta:Choibalsan"{
- ld{"Panahon ng Tag-init sa Choibalsan"}
- lg{"Oras sa Choibalsan"}
- ls{"Standard na Oras sa Choibalsan"}
+ ld{"Summer Time sa Choibalsan"}
+ lg{"Oras sa Oras sa Choibalsan"}
+ ls{"Standard Time sa Choibalsan"}
}
"meta:Christmas"{
- ls{"Christmas Island Time"}
+ ls{"Oras sa Christmas Island"}
}
"meta:Cocos"{
- ls{"Cocos Islands Time"}
+ ls{"Oras sa Cocos Islands"}
}
"meta:Colombia"{
- ld{"Colombia Summer Time"}
- lg{"Colombia Time"}
- ls{"Colombia Standard Time"}
+ ld{"Summer Time sa Colombia"}
+ lg{"Oras sa Colombia"}
+ ls{"Standard Time sa Colombia"}
}
"meta:Cook"{
- ld{"Cook Islands Half Summer Time"}
- lg{"Cook Islands Time"}
- ls{"Cook Islands Standard Time"}
+ ld{"Half Summer Time sa Cook Islands"}
+ lg{"Oras sa Cook Islands"}
+ ls{"Standard Time sa Cook Islands"}
}
"meta:Cuba"{
- ld{"Cuba Daylight Time"}
- lg{"Cuba Time"}
- ls{"Cuba Standard Time"}
+ ld{"Daylight Time sa Cuba"}
+ lg{"Oras sa Cuba"}
+ ls{"Standard Time sa Cuba"}
}
"meta:Davis"{
- ls{"Davis Time"}
+ ls{"Oras sa Davis"}
}
"meta:DumontDUrville"{
- ls{"Dumont-d’Urville Time"}
+ ls{"Oras sa Dumont-d’Urville"}
}
"meta:East_Timor"{
- ls{"East Timor Time"}
+ ls{"Oras sa East Timor"}
}
"meta:Easter"{
- ld{"Easter Island Summer Time"}
- lg{"Easter Island Time"}
- ls{"Easter Island Standard Time"}
+ ld{"Summer Time sa Easter Island"}
+ lg{"Oras sa Easter Island"}
+ ls{"Standard Time sa Easter Island"}
}
"meta:Ecuador"{
- ls{"Ecuador Time"}
+ ls{"Oras sa Ecuador"}
}
"meta:Europe_Central"{
ld{"Central European Summer Time"}
@@ -250,17 +250,17 @@
ls{"Western European Standard Time"}
}
"meta:Falkland"{
- ld{"Falkland Islands Summer Time"}
- lg{"Falkland Islands Time"}
- ls{"Falkland Islands Standard Time"}
+ ld{"Summer Time sa Falkland"}
+ lg{"Oras sa Falkland"}
+ ls{"Standard Time sa Falkland"}
}
"meta:Fiji"{
- ld{"Fiji Summer Time"}
- lg{"Fiji Time"}
- ls{"Fiji Standard Time"}
+ ld{"Summer Time sa Fiji"}
+ lg{"Oras sa Fiji"}
+ ls{"Standard Time sa Fiji"}
}
"meta:French_Guiana"{
- ls{"French Guiana Time"}
+ ls{"Oras sa French Guiana"}
}
"meta:French_Southern"{
ls{"French Southern and Antarctic Time"}
@@ -269,359 +269,361 @@
ls{"Greenwich Mean Time"}
}
"meta:Galapagos"{
- ls{"Galapagos Time"}
+ ls{"Oras sa Galapagos"}
}
"meta:Gambier"{
- ls{"Gambier Time"}
+ ls{"Oras sa Gambier"}
}
"meta:Georgia"{
- ld{"Georgia Summer Time"}
- lg{"Georgia Time"}
- ls{"Georgia Standard Time"}
+ ld{"Summer Time sa Georgia"}
+ lg{"Oras sa Georgia"}
+ ls{"Standard Time sa Georgia"}
}
"meta:Gilbert_Islands"{
- ls{"Gilbert Islands Time"}
+ ls{"Oras sa Gilbert Islands"}
}
"meta:Greenland_Eastern"{
- ld{"East Greenland Summer Time"}
- lg{"East Greenland Time"}
- ls{"East Greenland Standard Time"}
+ ld{"Summer Time sa East Greenland"}
+ lg{"Oras sa East Greenland"}
+ ls{"Standard Time sa East Greenland"}
}
"meta:Greenland_Western"{
- ld{"West Greenland Summer Time"}
- lg{"West Greenland Time"}
- ls{"West Greenland Standard Time"}
+ ld{"Summer Time sa West Greenland"}
+ lg{"Oras sa West Greenland"}
+ ls{"Standard Time sa West Greenland"}
}
"meta:Gulf"{
- ls{"Gulf Standard Time"}
+ ls{"Standard Time sa Gulf"}
}
"meta:Guyana"{
- ls{"Guyana Time"}
+ ls{"Oras sa Guyana"}
}
"meta:Hawaii_Aleutian"{
- ld{"Hawaii-Aleutian Daylight Time"}
- lg{"Hawaii-Aleutian Time"}
- ls{"Hawaii-Aleutian Standard Time"}
+ ld{"Daylight Time sa Hawaii-Aleutian"}
+ lg{"Oras sa Hawaii-Aleutian"}
+ ls{"Standard Time sa Hawaii-Aleutian"}
}
"meta:Hong_Kong"{
- ld{"Hong Kong Summer Time"}
- lg{"Hong Kong Time"}
- ls{"Hong Kong Standard Time"}
+ ld{"Summer Time sa Hongkong"}
+ lg{"Oras sa Hongkong"}
+ ls{"Standard Time sa Hongkong"}
}
"meta:Hovd"{
- ld{"Panahon ng Tag-init sa Hovd"}
+ ld{"Summer Time sa Hovd"}
lg{"Oras sa Hovd"}
- ls{"Standard na Oras sa Hovd"}
+ ls{"Standard Time sa Hovd"}
}
"meta:India"{
- ls{"India Standard Time"}
+ ls{"Oras sa India"}
}
"meta:Indian_Ocean"{
- ls{"Indian Ocean Time"}
+ ls{"Oras sa Indian Ocean"}
}
"meta:Indochina"{
- ls{"Indochina Time"}
+ ls{"Oras sa Indochina"}
}
"meta:Indonesia_Central"{
- ls{"Central Indonesia Time"}
+ ls{"Oras sa Central Indonesia"}
}
"meta:Indonesia_Eastern"{
- ls{"Eastern Indonesia Time"}
+ ls{"Oras sa Eastern Indonesia"}
}
"meta:Indonesia_Western"{
- ls{"Western Indonesia Time"}
+ ls{"Oras sa Western Indonesia"}
}
"meta:Iran"{
- ld{"Iran Daylight Time"}
- lg{"Iran Time"}
- ls{"Iran Standard Time"}
+ ld{"Daylight Time sa Iran"}
+ lg{"Oras sa Iran"}
+ ls{"Standard Time sa Iran"}
}
"meta:Irkutsk"{
- ld{"Panahon ng Tag-init sa Irkutsk"}
+ ld{"Summer Time sa Irkutsk"}
lg{"Oras sa Irkutsk"}
- ls{"Standard na Oras sa Irkutsk"}
+ ls{"Standard Time sa Irkutsk"}
}
"meta:Israel"{
- ld{"Israel Daylight Time"}
- lg{"Israel Time"}
- ls{"Israel Standard Time"}
+ ld{"Daylight Time sa Israel"}
+ lg{"Oras sa Israel"}
+ ls{"Standard Time sa Israel"}
}
"meta:Japan"{
- ld{"Japan Daylight Time"}
- lg{"Japan Time"}
- ls{"Japan Standard Time"}
+ ld{"Daylight Time sa Japan"}
+ lg{"Oras sa Japan"}
+ ls{"Standard Time sa Japan"}
}
"meta:Kamchatka"{
- ld{"Panahon ng Tag-init sa Petropavlovsk-Kamchatski"}
+ ld{"Summer Time sa Petropavlovsk-Kamchatski"}
lg{"Oras sa Petropavlovsk-Kamchatski"}
- ls{"Standard na Oras sa Petropavlovsk-Kamchatski"}
+ ls{"Standard Time sa Petropavlovsk-Kamchatski"}
}
"meta:Kazakhstan_Eastern"{
- ls{"East Kazakhstan Time"}
+ ls{"Standard Time sa East Kazakhstan"}
}
"meta:Kazakhstan_Western"{
- ls{"West Kazakhstan Time"}
+ ls{"Standard Time sa West Kazakhstan"}
}
"meta:Korea"{
- ld{"Korean Daylight Time"}
- lg{"Korean Time"}
- ls{"Korean Standard Time"}
+ ld{"Daylight Time sa Korea"}
+ lg{"Oras sa Korea"}
+ ls{"Standard Time sa Korea"}
}
"meta:Kosrae"{
- ls{"Kosrae Time"}
+ ls{"Oras sa Kosrae"}
}
"meta:Krasnoyarsk"{
- ld{"Panahon ng Tag-init sa Krasnoyarsk"}
+ ld{"Summer Time sa Krasnoyarsk"}
lg{"Oras sa Krasnoyarsk"}
- ls{"Standard na Oras sa Krasnoyarsk"}
+ ls{"Standard Time sa Krasnoyarsk"}
}
"meta:Kyrgystan"{
- ls{"Kyrgystan Time"}
+ ls{"Oras sa Kyrgystan"}
}
"meta:Line_Islands"{
- ls{"Line Islands Time"}
+ ls{"Oras sa Line Islands"}
}
"meta:Lord_Howe"{
- ld{"Oras na Lord Howe Daylight"}
+ ld{"Daylight Time sa Lord Howe"}
lg{"Oras sa Lord Howe"}
- ls{"Standard na Oras sa Lord Howe"}
+ ls{"Standard Time sa Lord Howe"}
}
"meta:Macquarie"{
- ls{"Macquarie Island Time"}
+ ls{"Oras sa Macquarie Island"}
}
"meta:Magadan"{
- ld{"Panahon ng Tag-init sa Magadan Summer"}
+ ld{"Summer Time sa Magadan"}
lg{"Oras sa Magadan"}
- ls{"Standard na Oras sa Magadan"}
+ ls{"Standard Time sa Magadan"}
}
"meta:Malaysia"{
- ls{"Malaysia Time"}
+ ls{"Oras sa Malaysia"}
}
"meta:Maldives"{
- ls{"Maldives Time"}
+ ls{"Oras sa Maldives"}
}
"meta:Marquesas"{
- ls{"Marquesas Time"}
+ ls{"Oras sa Marquesas"}
}
"meta:Marshall_Islands"{
- ls{"Marshall Islands Time"}
+ ls{"Oras sa Marshall Islands"}
}
"meta:Mauritius"{
- ld{"Mauritius Summer Time"}
- lg{"Mauritius Time"}
- ls{"Mauritius Standard Time"}
+ ld{"Summer Time sa Mauritius"}
+ lg{"Oras sa Mauritius"}
+ ls{"Standard Time sa Mauritius"}
}
"meta:Mawson"{
- ls{"Mawson Time"}
+ ls{"Oras sa Mawson"}
}
"meta:Mongolia"{
- ld{"Panahon ng Tag-init sa Ulan Bator"}
- lg{"Ulan Bator Time"}
- ls{"Ulan Bator Standard Time"}
+ ld{"Summer Time sa Ulan Bator"}
+ lg{"Oras sa Ulan Bator"}
+ ls{"Standard Time sa Ulan Bator"}
}
"meta:Moscow"{
- ld{"Panahon ng Tag-init sa Moscow"}
+ ld{"Summer Time sa Moscow"}
lg{"Oras sa Moscow"}
- ls{"Standard na Oras sa Moscow"}
+ ls{"Standard Time sa Moscow"}
}
"meta:Myanmar"{
- ls{"Myanmar Time"}
+ ls{"Oras sa Myanmar"}
}
"meta:Nauru"{
- ls{"Nauru Time"}
+ ls{"Oras sa Nauru"}
}
"meta:Nepal"{
- ls{"Nepal Time"}
+ ls{"Oras sa Nepal"}
}
"meta:New_Caledonia"{
- ld{"New Caledonia Summer Time"}
- lg{"New Caledonia Time"}
- ls{"New Caledonia Standard Time"}
+ ld{"Summer Time sa New Caledonia"}
+ lg{"Oras sa New Caledonia"}
+ ls{"Standard Time sa New Caledonia"}
}
"meta:New_Zealand"{
- ld{"New Zealand Daylight Time"}
- lg{"New Zealand Time"}
- ls{"New Zealand Standard Time"}
+ ld{"Daylight Time sa New Zealand"}
+ lg{"Oras sa New Zealand"}
+ ls{"Standard Time sa New Zealand"}
}
"meta:Newfoundland"{
- ld{"Oras na Newfoundland Daylight"}
+ ld{"Daylight Time sa Newfoundland"}
lg{"Oras sa Newfoundland"}
- ls{"Standard na Oras sa Newfoundland"}
+ ls{"Standard Time sa Newfoundland"}
}
"meta:Niue"{
- ls{"Niue Time"}
+ ls{"Oras sa Niue"}
}
"meta:Norfolk"{
- ls{"Norfolk Islands Time"}
+ ls{"Oras sa Norfolk Islands"}
}
"meta:Noronha"{
- ld{"Panahon ng Tag-init sa Fernando de Noronha"}
- lg{"Fernando de Noronha Time"}
- ls{"Fernando de Noronha Standard Time"}
+ ld{"Summer Time sa Fernando de Noronha"}
+ lg{"Oras sa Fernando de Noronha"}
+ ls{"Standard Time sa Fernando de Noronha"}
}
"meta:Novosibirsk"{
- ld{"Panahon ng Tag-init sa Novosibirsk"}
+ ld{"Summer Time sa Novosibirsk"}
lg{"Oras sa Novosibirsk"}
- ls{"Standard na Oras sa Novosibirsk"}
+ ls{"Standard Time sa Novosibirsk"}
}
"meta:Omsk"{
- ld{"Panahon ng Tag-init sa Omsk"}
+ ld{"Summer Time sa Omsk"}
lg{"Oras sa Omsk"}
- ls{"Standard na Oras sa Omsk"}
+ ls{"Standard Time sa Omsk"}
}
"meta:Pakistan"{
- ld{"Pakistan Summer Time"}
- lg{"Pakistan Time"}
- ls{"Pakistan Standard Time"}
+ ld{"Summer Time sa Pakistan"}
+ lg{"Oras sa Pakistan"}
+ ls{"Standard Time sa Pakistan"}
}
"meta:Palau"{
- ls{"Palau Time"}
+ ls{"Oras sa Palau"}
}
"meta:Papua_New_Guinea"{
- ls{"Papua New Guinea Time"}
+ ls{"Oras sa Papua New Guinea"}
}
"meta:Paraguay"{
- ld{"Paraguay Summer Time"}
- lg{"Paraguay Time"}
- ls{"Paraguay Standard Time"}
+ ld{"Summer Time sa Paraguay"}
+ lg{"Oras sa Paraguay"}
+ ls{"Standard Time sa Paraguay"}
}
"meta:Peru"{
- ld{"Peru Summer Time"}
- lg{"Peru Time"}
- ls{"Peru Standard Time"}
+ ld{"Summer Time Peru"}
+ lg{"Oras sa Peru"}
+ ls{"Standard Time sa Peru"}
}
"meta:Philippines"{
- ld{"Philippine Summer Time"}
- lg{"Philippine Time"}
- ls{"Philippine Standard Time"}
+ ld{"Summer Time sa Pilipinas"}
+ lg{"Oras sa Pilipinas"}
+ ls{"Standard Time sa Pilipinas"}
}
"meta:Phoenix_Islands"{
- ls{"Phoenix Islands Time"}
+ ls{"Oras sa Phoenix Islands"}
}
"meta:Pierre_Miquelon"{
- ld{"Saint Pierre and Miquelon Daylight Time"}
- lg{"Saint Pierre and Miquelon Time"}
- ls{"Saint Pierre and Miquelon Standard Time"}
+ ld{"Daylight Time sa Saint Pierre and Miquelon"}
+ lg{"Oras sa Saint Pierre and Miquelon"}
+ ls{"Standard Time sa Saint Pierre and Miquelon"}
}
"meta:Pitcairn"{
- ls{"Pitcairn Time"}
+ ls{"Oras sa Pitcairn"}
}
"meta:Ponape"{
- ls{"Ponape Time"}
+ ls{"Oras sa Pohnpei"}
}
"meta:Reunion"{
- ls{"Reunion Time"}
+ ls{"Oras sa Reunion"}
}
"meta:Rothera"{
- ls{"Rothera Time"}
+ ls{"Oras sa Rothera"}
}
"meta:Sakhalin"{
- ld{"Panahon ng Tag-init sa Sakhalin"}
+ ld{"Summer Time sa Sakhalin"}
lg{"Oras sa Sakhalin"}
- ls{"Standard na Oras sa Sakhalin"}
+ ls{"Standard Time sa Sakhalin"}
}
"meta:Samara"{
- ld{"Samara Daylight Time"}
+ ld{"Samara Daylight"}
lg{"Oras sa Samara"}
- ls{"Standard na Oras sa Samara"}
+ ls{"Standard Time sa Samara"}
}
"meta:Samoa"{
- ls{"Samoa Standard Time"}
+ ld{"Summer Time sa Samoa"}
+ lg{"Oras sa Samoa"}
+ ls{"Standard Time sa Samoa"}
}
"meta:Seychelles"{
- ls{"Seychelles Time"}
+ ls{"Oras sa Seychelles"}
}
"meta:Singapore"{
- ls{"Singapore Standard Time"}
+ ls{"Oras sa Singapore"}
}
"meta:Solomon"{
- ls{"Solomon Islands Time"}
+ ls{"Oras sa Solomon Islands"}
}
"meta:South_Georgia"{
- ls{"South Georgia Time"}
+ ls{"Oras sa South Georgia"}
}
"meta:Suriname"{
ls{"Suriname Time"}
}
"meta:Syowa"{
- ls{"Syowa Time"}
+ ls{"Oras sa Syowa"}
}
"meta:Tahiti"{
- ls{"Tahiti Time"}
+ ls{"Oras sa Tahiti"}
}
"meta:Taipei"{
- ld{"Taipei Daylight Time"}
- lg{"Taipei Time"}
- ls{"Taipei Standard Time"}
+ ld{"Daylight Time sa Taipei"}
+ lg{"Oras sa Taipei"}
+ ls{"Standard Time sa Taipei"}
}
"meta:Tajikistan"{
- ls{"Tajikistan Time"}
+ ls{"Oras sa Tajikistan"}
}
"meta:Tokelau"{
- ls{"Tokelau Time"}
+ ls{"Oras sa Tokelau"}
}
"meta:Tonga"{
- ld{"Tonga Summer Time"}
- lg{"Tonga Time"}
- ls{"Tonga Standard Time"}
+ ld{"Summer Time sa Tonga"}
+ lg{"Oras sa Tonga"}
+ ls{"Standard Time sa Tonga"}
}
"meta:Truk"{
- ls{"Chuuk Time"}
+ ls{"Oras sa Chuuk"}
}
"meta:Turkmenistan"{
- ld{"Turkmenistan Summer Time"}
- lg{"Turkmenistan Time"}
- ls{"Turkmenistan Standard Time"}
+ ld{"Summer Time sa Turkmenistan"}
+ lg{"Oras sa Turkmenistan"}
+ ls{"Standard Time sa Turkmenistan"}
}
"meta:Tuvalu"{
- ls{"Tuvalu Time"}
+ ls{"Oras sa Tuvalu"}
}
"meta:Uruguay"{
- ld{"Uruguay Summer Time"}
- lg{"Uruguay Time"}
- ls{"Uruguay Standard Time"}
+ ld{"Summer Time sa Uruguay"}
+ lg{"Oras sa Uruguay"}
+ ls{"Standard Time sa Uruguay"}
}
"meta:Uzbekistan"{
- ld{"Uzbekistan Summer Time"}
- lg{"Uzbekistan Time"}
- ls{"Uzbekistan Standard Time"}
+ ld{"Summer Time sa Uzbekistan"}
+ lg{"Oras sa Uzbekistan"}
+ ls{"Standard Time sa Uzbekistan"}
}
"meta:Vanuatu"{
- ld{"Vanuatu Summer Time"}
- lg{"Vanuatu Time"}
- ls{"Vanuatu Standard Time"}
+ ld{"Summer Time sa Vanuatu"}
+ lg{"Oras sa Vanuatu"}
+ ls{"Standard Time sa Vanuatu"}
}
"meta:Venezuela"{
- ls{"Venezuela Time"}
+ ls{"Oras sa Venezuela"}
}
"meta:Vladivostok"{
- ld{"Panahon ng Tag-init sa Vladivostok"}
+ ld{"Summer Time sa Vladivostok"}
lg{"Oras sa Vladivostok"}
- ls{"Standard na Oras sa Vladivostok"}
+ ls{"Standard Time sa Vladivostok"}
}
"meta:Volgograd"{
- ld{"Volgograd Daylight Time"}
+ ld{"Summer Time sa Volgograd"}
lg{"Oras sa Volgograd"}
- ls{"Standard na Oras sa Volgograd"}
+ ls{"Standard Time sa Volgograd"}
}
"meta:Vostok"{
- ls{"Vostok Time"}
+ ls{"Oras sa Vostok"}
}
"meta:Wake"{
- ls{"Wake Island Time"}
+ ls{"Oras sa Wake Island"}
}
"meta:Wallis"{
- ls{"Wallis and Futuna Time"}
+ ls{"Oras sa Wallis and Futuna"}
}
"meta:Yakutsk"{
- ld{"Panahon ng Tag-init sa Yakutsk"}
+ ld{"Summer Time sa Yakutsk"}
lg{"Oras sa Yakutsk"}
- ls{"Standard na Oras sa Yakutsk"}
+ ls{"Standard Time sa Yakutsk"}
}
"meta:Yekaterinburg"{
- ld{"Panahon ng Tag-init sa Yekaterinburg"}
+ ld{"Summer Time sa Yekaterinburg"}
lg{"Oras sa Yekaterinburg"}
- ls{"Standard na Oras sa Yekaterinburg"}
+ ls{"Standard Time sa Yekaterinburg"}
}
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"{1} Oras ({0})"}
diff --git a/data/zone/fil_PH.txt b/data/zone/fil_PH.txt
index 42baeba..3a691b4 100755
--- a/data/zone/fil_PH.txt
+++ b/data/zone/fil_PH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/fo.txt b/data/zone/fo.txt
index 4b1c0ad..9344234 100644
--- a/data/zone/fo.txt
+++ b/data/zone/fo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fo.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/fo.xml
*/
fo{
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/fr.txt b/data/zone/fr.txt
index 913fb2b..13c6d11 100644
--- a/data/zone/fr.txt
+++ b/data/zone/fr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/fr.xml
*/
fr{
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
zoneStrings{
"Africa:Addis_Ababa"{
ec{"Addis-Abeba"}
@@ -473,21 +473,11 @@
lg{"heure d’Afrique de l’Ouest"}
ls{"heure normale d’Afrique de l’Ouest"}
}
- "meta:Aktyubinsk"{
- ld{"heure avancée d’Aktioubé"}
- lg{"heure d’Aktioubé"}
- ls{"heure normale d’Aktioubé"}
- }
"meta:Alaska"{
ld{"heure avancée de l’Alaska"}
lg{"heure de l’Alaska"}
ls{"heure normale de l’Alaska"}
}
- "meta:Alaska_Hawaii"{
- ld{"heure avancée d’Alaska - Hawaii"}
- lg{"heure d’Alaska - Hawaii"}
- ls{"heure normale d’Alaska - Hawaii"}
- }
"meta:Almaty"{
ld{"heure avancée d’Alma Ata"}
lg{"heure d’Alma Ata"}
@@ -553,11 +543,6 @@
lg{"heure d’Arménie"}
ls{"heure normale d’Arménie"}
}
- "meta:Ashkhabad"{
- ld{"heure avancée d’Achgabat"}
- lg{"heure d’Achgabat"}
- ls{"heure normale d’Achgabat"}
- }
"meta:Atlantic"{
ld{"heure avancée de l’Atlantique"}
lg{"heure de l’Atlantique"}
@@ -593,32 +578,17 @@
lg{"heure des Açores"}
ls{"heure normale des Açores"}
}
- "meta:Baku"{
- ld{"heure avancée de Bakou"}
- lg{"heure de Bakou"}
- ls{"heure normale de Bakou"}
- }
"meta:Bangladesh"{
ld{"heure avancée du Bangladesh"}
lg{"heure du Bangladesh"}
ls{"heure normale du Bangladesh"}
}
- "meta:Bering"{
- ld{"heure avancée de Bering"}
- lg{"heure de Bering"}
- ls{"heure normale de Bering"}
- }
"meta:Bhutan"{
ls{"heure du Bhoutan"}
}
"meta:Bolivia"{
ls{"heure de Bolivie"}
}
- "meta:Borneo"{
- ld{"heure avancée de Bornéo"}
- lg{"heure de Bornéo"}
- ls{"heure normale de Bornéo"}
- }
"meta:Brasilia"{
ld{"heure avancée de Brasilia"}
lg{"heure de Brasilia"}
@@ -635,9 +605,6 @@
"meta:Chamorro"{
ls{"heure des Chamorro"}
}
- "meta:Changbai"{
- ls{"heure du Changbai"}
- }
"meta:Chatham"{
ld{"heure avancée des Îles Chatham"}
lg{"heure des Îles Chatham"}
@@ -679,23 +646,12 @@
lg{"heure de Cuba"}
ls{"heure normale de Cuba"}
}
- "meta:Dacca"{
- ls{"heure de Dhâkâ"}
- }
"meta:Davis"{
ls{"heure de Davis"}
}
"meta:DumontDUrville"{
ls{"heure de Dumont-d’Urville"}
}
- "meta:Dushanbe"{
- ld{"heure avancée de Duchanbé"}
- lg{"heure de Duchanbé"}
- ls{"heure normale de Duchanbé"}
- }
- "meta:Dutch_Guiana"{
- ls{"heure de Guyane néerlandaise"}
- }
"meta:East_Timor"{
ls{"heure du Timor oriental"}
}
@@ -738,11 +694,6 @@
"meta:French_Southern"{
ls{"heure des Terres australes et antarctiques françaises"}
}
- "meta:Frunze"{
- ld{"heure avancée de Frounzé"}
- lg{"heure de Frounzé"}
- ls{"heure normale de Frounzé"}
- }
"meta:GMT"{
ls{"heure moyenne de Greenwich"}
}
@@ -760,11 +711,6 @@
"meta:Gilbert_Islands"{
ls{"heure des îles Gilbert"}
}
- "meta:Greenland_Central"{
- ld{"heure avancée du Centre du Groenland"}
- lg{"heure du Centre du Groenland"}
- ls{"heure normale du Centre du Groenland"}
- }
"meta:Greenland_Eastern"{
ld{"heure avancée de l’Est du Groenland"}
lg{"heure de l’Est du Groenland"}
@@ -842,23 +788,12 @@
lg{"heure de Petropavlovsk-Kamchatski"}
ls{"heure normale de Petropavlovsk-Kamchatski"}
}
- "meta:Karachi"{
- ls{"heure de Karâchi"}
- }
- "meta:Kashgar"{
- ls{"heure de Kachgar"}
- }
"meta:Kazakhstan_Eastern"{
ls{"heure de l’Est kazakh"}
}
"meta:Kazakhstan_Western"{
ls{"heure de l’Ouest kazakh"}
}
- "meta:Kizilorda"{
- ld{"heure avancée de Kyzylorda"}
- lg{"heure de Kyzylorda"}
- ls{"heure normale de Kyzylorda"}
- }
"meta:Korea"{
ld{"heure avancée de Corée"}
lg{"heure de Corée"}
@@ -872,14 +807,6 @@
lg{"heure de Krasnoïarsk"}
ls{"heure normale de Krasnoïarsk"}
}
- "meta:Kuybyshev"{
- ld{"heure avancée de Kouïbychev"}
- lg{"heure de Kouïbychev"}
- ls{"heure normale de Kouïbychev"}
- }
- "meta:Kwajalein"{
- ls{"heure de Kwajalein"}
- }
"meta:Kyrgystan"{
ls{"heure du Kirghizistan"}
}
@@ -1034,7 +961,9 @@
ls{"heure normale de Samara"}
}
"meta:Samoa"{
- ls{"heure de Samoa"}
+ ld{"heure avancée de Samoa"}
+ lg{"heure de Samoa"}
+ ls{"heure normale de Samoa"}
}
"meta:Seychelles"{
ls{"heure des Seychelles"}
@@ -1076,11 +1005,6 @@
"meta:Truk"{
ls{"heure de Truk"}
}
- "meta:Turkey"{
- ld{"heure avancée de Turquie"}
- lg{"heure de Turquie"}
- ls{"heure normale de Turquie"}
- }
"meta:Turkmenistan"{
ld{"heure avancée du Turkménistan"}
lg{"heure du Turkménistan"}
@@ -1136,11 +1060,6 @@
lg{"heure d’Ekaterinbourg"}
ls{"heure normale d’Ekaterinbourg"}
}
- "meta:Yukon"{
- ld{"heure avancée du Yukon"}
- lg{"heure du Yukon"}
- ls{"heure normale du Yukon"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"Heure : {1} ({0})"}
gmtFormat{"UTC{0}"}
diff --git a/data/zone/fr_CA.txt b/data/zone/fr_CA.txt
index f1ccf04..573acc4 100644
--- a/data/zone/fr_CA.txt
+++ b/data/zone/fr_CA.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/fr_CA.xml
// *
// ***************************************************************************
fr_CA{
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Ndjamena"{
ec{"Ndjamena"}
diff --git a/data/zone/ga.txt b/data/zone/ga.txt
index 169c948..053779a 100644
--- a/data/zone/ga.txt
+++ b/data/zone/ga.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ga.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/ga.xml
*/
ga{
- Version{"2.0.77.27"}
+ Version{"2.0.82.45"}
zoneStrings{
"Europe:Dublin"{
ec{"Baile Átha Cliath"}
diff --git a/data/zone/gl.txt b/data/zone/gl.txt
index 09c8ac5..25f6531 100644
--- a/data/zone/gl.txt
+++ b/data/zone/gl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gl.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/gl.xml
*/
gl{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Djibouti"{
ec{"Xibutí"}
@@ -685,6 +685,8 @@
ls{"Horario estándar de Samara"}
}
"meta:Samoa"{
+ ld{"Horario de verán de Samoa"}
+ lg{"Horario de Samoa"}
ls{"Horario estándar de Samoa"}
}
"meta:Seychelles"{
@@ -699,9 +701,6 @@
"meta:South_Georgia"{
ls{"Horario de Xeorxia do Sur"}
}
- "meta:Suriname"{
- ls{"Horario de Surinam"}
- }
"meta:Syowa"{
ls{"Horario de Syowa"}
}
diff --git a/data/zone/gsw.txt b/data/zone/gsw.txt
index 98daad3..03b0d1e 100644
--- a/data/zone/gsw.txt
+++ b/data/zone/gsw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gsw.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/gsw.xml
*/
gsw{
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Accra"{
ec{"Akkra"}
@@ -292,21 +292,11 @@
lg{"Weschtafrikanischi Ziit"}
ls{"Weschtafrikanischi Schtandardziit"}
}
- "meta:Aktyubinsk"{
- ld{"Aktyubinsk-Summerziit"}
- lg{"Aktyubinsk-Ziit"}
- ls{"Aktyubinsk-Schtandardziit"}
- }
"meta:Alaska"{
ld{"Alaska-Summerziit"}
lg{"Alaska-Ziit"}
ls{"Alaska-Schtandardziit"}
}
- "meta:Alaska_Hawaii"{
- ld{"Alaska-Hawaii-Summerziit"}
- lg{"Alaska-Hawaii-Ziit"}
- ls{"Alaska-Hawaii-Schtandardziit"}
- }
"meta:Almaty"{
ld{"Almaty-Summerziit"}
lg{"Almaty-Ziit"}
diff --git a/data/zone/gu.txt b/data/zone/gu.txt
index 72b9b10..b6b042b 100644
--- a/data/zone/gu.txt
+++ b/data/zone/gu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gu.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/gu.xml
*/
gu{
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
zoneStrings{
"Africa:Abidjan"{
ec{"આબિદ્જાન"}
@@ -1246,21 +1246,11 @@
lg{"પશ્ચિમ આફ્રિકા સમય"}
ls{"પશ્ચિમ આફ્રિકા માનક સમય"}
}
- "meta:Aktyubinsk"{
- ld{"અક્તયુબિન્સ્ક ગ્રીષ્મ સમય"}
- lg{"અક્તયુબિન્સ્ક સમય"}
- ls{"અક્તયુબિન્સ્ક પ્રમાણભૂત સમય"}
- }
"meta:Alaska"{
ld{"અલાસ્કા દિવસ સમય"}
lg{"અલાસ્કા સમય"}
ls{"અલાસ્કા પ્રમાણભૂત સમય"}
}
- "meta:Alaska_Hawaii"{
- ld{"અલાસ્કા-હવાઇ દિવસ સમય"}
- lg{"અલાસ્કા-હવાઇ સમય"}
- ls{"અલાસ્કા-હવાઇ પ્રમાણભૂત સમય"}
- }
"meta:Almaty"{
ld{"અલ્માટી ગ્રીષ્મ સમય"}
lg{"અલ્માટી સમય"}
@@ -1326,11 +1316,6 @@
lg{"આર્મેનિયા સમય"}
ls{"આર્મેનિયા માનક સમય"}
}
- "meta:Ashkhabad"{
- ld{"અશ્ખાબાદ ગ્રીષ્મ સમય"}
- lg{"અશ્ખાબાદ સમય"}
- ls{"અશ્ખાબાદ પ્રમાણભૂત સમય"}
- }
"meta:Atlantic"{
ld{"અટલાન્ટિક દિવસ સમય"}
lg{"અટલાન્ટિક સમય"}
@@ -1366,32 +1351,17 @@
lg{"એઝોર્સ સમય"}
ls{"એઝોર્સ માનક સમય"}
}
- "meta:Baku"{
- ld{"બકુ ગ્રીષ્મ સમય"}
- lg{"બકુ સમય"}
- ls{"બકુ પ્રમાણભૂત સમય"}
- }
"meta:Bangladesh"{
ld{"બાંગ્લાદેશ ગ્રીષ્મ સમય"}
lg{"બાંગ્લાદેશ સમય"}
ls{"બાંગ્લાદેશ માનક સમય"}
}
- "meta:Bering"{
- ld{"બેરિંગ દિવસ સમય"}
- lg{"બેરિંગ સમય"}
- ls{"બેરિંગ પ્રમાણભૂત સમય"}
- }
"meta:Bhutan"{
ls{"ભૂટાન સમય"}
}
"meta:Bolivia"{
ls{"બોલિવિયા સમય"}
}
- "meta:Borneo"{
- ld{"બોર્નિયા ગ્રીષ્મ સમય"}
- lg{"બોર્નિયા સમય"}
- ls{"બોર્નિયા પ્રમાણભૂત સમય"}
- }
"meta:Brasilia"{
ld{"બ્રાઝિલિયા ગ્રીષ્મ સમય"}
lg{"બ્રાઝિલિયા સમય"}
@@ -1408,9 +1378,6 @@
"meta:Chamorro"{
ls{"કેમોરો માનક સમય"}
}
- "meta:Changbai"{
- ls{"ચેગબાઇ સમય"}
- }
"meta:Chatham"{
ld{"ચેતહામ દિવસ સમય"}
lg{"ચેતહામ સમય"}
@@ -1452,23 +1419,12 @@
lg{"ક્યૂબા સમય"}
ls{"ક્યૂબા માનક સમય"}
}
- "meta:Dacca"{
- ls{"ડાકા સમય"}
- }
"meta:Davis"{
ls{"ડેવિસ સમય"}
}
"meta:DumontDUrville"{
ls{"ડ્યુમોન્ટ-ડી'ઉર્વિલ સમય"}
}
- "meta:Dushanbe"{
- ld{"દુશાન્બે ગ્રીષ્મ સમય"}
- lg{"દુશાન્બે ગ્સમય"}
- ls{"દુશાન્બે પ્રમાણભૂત ગ્સમય"}
- }
- "meta:Dutch_Guiana"{
- ls{"ડચ ગયાના સમય"}
- }
"meta:East_Timor"{
ls{"પૂર્વ તિમોર સમય"}
}
@@ -1511,11 +1467,6 @@
"meta:French_Southern"{
ls{"ફ્રેન્ચ સાઉધર્ન અને એન્ટાર્કટિક સમય"}
}
- "meta:Frunze"{
- ld{"ફ્રુન્ઝ ગ્રીષ્મ સમય"}
- lg{"ફ્રુન્ઝ સમય"}
- ls{"ફ્રુન્ઝ પ્રમાણભૂત સમય"}
- }
"meta:GMT"{
ls{"ગ્રીનવિચ મધ્યમ સમય"}
}
@@ -1533,11 +1484,6 @@
"meta:Gilbert_Islands"{
ls{"ગિલબર્ટ આઇલેન્ડ સમય"}
}
- "meta:Greenland_Central"{
- ld{"મધ્ય ગ્રિનલેન્ડ ગ્રીષ્મ સમય"}
- lg{"મધ્ય ગ્રિનલેન્ડ સમય"}
- ls{"મધ્ય ગ્રિનલેન્ડ પ્રમાણભૂત સમય"}
- }
"meta:Greenland_Eastern"{
ld{"પૂર્વ ગ્રીનલેન્ડ ગ્રીષ્મ સમય"}
lg{"પૂર્વ ગ્રીનલેન્ડ સમય"}
@@ -1616,12 +1562,6 @@
lg{"પેટ્રોપેવલોવ્સ્ક-કામચતસ્કી સમય"}
ls{"પેટ્રોપેવલોવ્સ્ક-કામચતસ્કી પ્રમાણભૂત સમય"}
}
- "meta:Karachi"{
- ls{"કરાચી સમય"}
- }
- "meta:Kashgar"{
- ls{"કશગાર સમય"}
- }
"meta:Kazakhstan_Eastern"{
ls{"પૂર્વ કઝાકિસ્તાન સમય"}
}
@@ -1641,14 +1581,6 @@
lg{"ક્રેસ્નોયાર્સ્કી સમય"}
ls{"ક્રસ્નોયાર્સ્ક માનક સમય"}
}
- "meta:Kuybyshev"{
- ld{"કુયબાઇશેવ ગ્રીષ્મ સમય"}
- lg{"કુયબાઇશેવ સમય"}
- ls{"કુયબાઇશેવ પ્રમાણભૂત સમય"}
- }
- "meta:Kwajalein"{
- ls{"ક્વાજાલીન સમય"}
- }
"meta:Kyrgystan"{
ls{"કિર્ગિઝતાન સમય"}
}
@@ -1658,9 +1590,6 @@
"meta:Line_Islands"{
ls{"લાઇન આઇલેન્ડ્સ સમય"}
}
- "meta:Long_Shu"{
- ls{"લોંગ-શુ સમય"}
- }
"meta:Lord_Howe"{
ld{"લોર્ડ હોવ દિવસ સમય"}
lg{"લોર્ડ હોવ સમય"}
@@ -1679,9 +1608,6 @@
lg{"મેગાડન સમય"}
ls{"માગાદાન માનક સમય"}
}
- "meta:Malaya"{
- ls{"મલય સમય"}
- }
"meta:Malaysia"{
ls{"મલેશિયા સમય"}
}
@@ -1821,22 +1747,14 @@
lg{"સમારા સમય"}
ls{"સમારા પ્રમાણભૂત સમય"}
}
- "meta:Samarkand"{
- ld{"સમરકંદ ગ્રીષ્મ સમય"}
- lg{"સમરકંદ સમય"}
- ls{"સમરકંદ પ્રમાણભૂત સમય"}
- }
"meta:Samoa"{
+ ld{"સમોઆ ગ્રીષ્મ સમય"}
+ lg{"સમોઆ સમય"}
ls{"સમોઆ માનક સમય"}
}
"meta:Seychelles"{
ls{"સેશલ્સ સમય"}
}
- "meta:Shevchenko"{
- ld{"શેવચેન્કો ગ્રીષ્મ સમય"}
- lg{"શેવચેન્કો સમય"}
- ls{"શેવચેન્કો પ્રમાણભૂત સમય"}
- }
"meta:Singapore"{
ls{"સિંગાપુર માનક સમય"}
}
@@ -1849,11 +1767,6 @@
"meta:Suriname"{
ls{"સૂરીનામ સમય"}
}
- "meta:Sverdlovsk"{
- ld{"સ્વર્ડલોવ્સ્ક ગ્રીષ્મ સમય"}
- lg{"સ્વર્ડલોવ્સ્ક સમય"}
- ls{"સ્વર્ડલોવ્સ્ક પ્રમાણભૂત સમય"}
- }
"meta:Syowa"{
ls{"સ્યોવા સમય"}
}
@@ -1868,16 +1781,6 @@
"meta:Tajikistan"{
ls{"તાજીકિસ્તાન સમય"}
}
- "meta:Tashkent"{
- ld{"તાશકેન્ટ ગ્રીષ્મ સમય"}
- lg{"તાશકેન્ટ સમય"}
- ls{"તાશકેન્ટ પ્રમાણભૂત સમય"}
- }
- "meta:Tbilisi"{
- ld{"ત્બિલિસી ગ્રીષ્મ સમય"}
- lg{"ત્બિલિસી સમય"}
- ls{"ત્બિલિસી પ્રમાણભૂત સમય"}
- }
"meta:Tokelau"{
ls{"ટોકલાઉ સમય"}
}
@@ -1889,11 +1792,6 @@
"meta:Truk"{
ls{"ચુઉક સમય"}
}
- "meta:Turkey"{
- ld{"ટર્કી ગ્રીષ્મ સમય"}
- lg{"ટર્કી સમય"}
- ls{"ટર્કી પ્રમાણભૂત સમય"}
- }
"meta:Turkmenistan"{
ld{"તુર્કમેનિસ્તાન ગ્રીષ્મ સમય"}
lg{"તુર્કમેનિસ્તાન સમય"}
@@ -1902,19 +1800,11 @@
"meta:Tuvalu"{
ls{"ટવાલૂ સમય"}
}
- "meta:Uralsk"{
- ld{"ઉરાલ'સ્ક ગ્રીષ્મ સમય"}
- lg{"ઉરાલ'સ્ક સમય"}
- ls{"ઉરાલ'સ્ક પ્રમાણભૂત સમય"}
- }
"meta:Uruguay"{
ld{"ઉરૂગ્વે ગ્રીષ્મ સમય"}
lg{"ઉરૂગ્વે સમય"}
ls{"ઉરૂગ્વે માનક સમય"}
}
- "meta:Urumqi"{
- ls{"ઉરુમ્કી સમય"}
- }
"meta:Uzbekistan"{
ld{"ઉઝ્બેકિસ્તાન ગ્રીષ્મ સમય"}
lg{"ઉઝ્બેકિસ્તાન સમય"}
@@ -1957,16 +1847,6 @@
lg{"યેકાતેરિંબર્ગ સમય"}
ls{"યેકાટેરીન્બર્ગ માનક સમય"}
}
- "meta:Yerevan"{
- ld{"યેરેવેન ગ્રીષ્મ સમય"}
- lg{"યેરેવેન સમય"}
- ls{"યેરેવેન પ્રમાણભૂત સમય"}
- }
- "meta:Yukon"{
- ld{"યકોન દિવસ સમય"}
- lg{"યકોન સમય"}
- ls{"યકોન પ્રમાણભૂત સમય"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"{1} સમય ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/guz.txt b/data/zone/guz.txt
index 006e60a..63901d7 100755
--- a/data/zone/guz.txt
+++ b/data/zone/guz.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/guz.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/guz.xml
*/
guz{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/gv.txt b/data/zone/gv.txt
index fc39c1c..08375a5 100644
--- a/data/zone/gv.txt
+++ b/data/zone/gv.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/gv.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/gv.xml
*/
gv{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/ha.txt b/data/zone/ha.txt
index c5d0309..173c59d 100644
--- a/data/zone/ha.txt
+++ b/data/zone/ha.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ha.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/ha.xml
*/
ha{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/ha_GH.txt b/data/zone/ha_GH.txt
index a414604..5a59b2e 100644
--- a/data/zone/ha_GH.txt
+++ b/data/zone/ha_GH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/ha_Latn.txt b/data/zone/ha_Latn.txt
index 649d47f..bdcc668 100644
--- a/data/zone/ha_Latn.txt
+++ b/data/zone/ha_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ha_Latn.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/ha_Latn.xml
*/
ha_Latn{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/ha_Latn_GH.txt b/data/zone/ha_Latn_GH.txt
index 4a7717b..c10a415 100644
--- a/data/zone/ha_Latn_GH.txt
+++ b/data/zone/ha_Latn_GH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/ha_Latn_NE.txt b/data/zone/ha_Latn_NE.txt
index b383c7c..e80f6f7 100644
--- a/data/zone/ha_Latn_NE.txt
+++ b/data/zone/ha_Latn_NE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/ha_Latn_NG.txt b/data/zone/ha_Latn_NG.txt
index 1b09876..bb60f3c 100644
--- a/data/zone/ha_Latn_NG.txt
+++ b/data/zone/ha_Latn_NG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/ha_NE.txt b/data/zone/ha_NE.txt
index 5c06d78..f28adee 100644
--- a/data/zone/ha_NE.txt
+++ b/data/zone/ha_NE.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/ha_NG.txt b/data/zone/ha_NG.txt
index 66e2170..1a5e209 100644
--- a/data/zone/ha_NG.txt
+++ b/data/zone/ha_NG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/haw.txt b/data/zone/haw.txt
index f93ded0..d7ede4d 100644
--- a/data/zone/haw.txt
+++ b/data/zone/haw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/haw.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/haw.xml
*/
haw{
- Version{"2.0.74.85"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/he.txt b/data/zone/he.txt
index 1358b71..ac59fb2 100644
--- a/data/zone/he.txt
+++ b/data/zone/he.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/he.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/he.xml
*/
he{
- Version{"2.0.78.38"}
+ Version{"2.0.82.47"}
zoneStrings{
"Africa:Abidjan"{
ec{"אביג'אן"}
@@ -1256,7 +1256,7 @@
"meta:America_Central"{
ld{"שעון קיץ, צפון אמריקה"}
lg{"שעון מרכז ארה״ב (אמריקה/שיקגו)"}
- ls{"שעון רגיל מרכז ארה\"ב"}
+ ls{"שעון רגיל מרכז ארה\u0022ב"}
}
"meta:America_Eastern"{
ld{"שעון קיץ מזרח ארה״ב"}
@@ -1339,9 +1339,6 @@
lg{"שעון ברזיליה"}
ls{"שעון רגיל ברזיליה"}
}
- "meta:Changbai"{
- ls{"שעון צ'אנגבאי"}
- }
"meta:Chatham"{
ld{"שעון קיץ צ'טהאם"}
lg{"שעון צ'טהאם"}
diff --git a/data/zone/he_IL.txt b/data/zone/he_IL.txt
index 9925868..2324002 100644
--- a/data/zone/he_IL.txt
+++ b/data/zone/he_IL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/hi.txt b/data/zone/hi.txt
index a9714a4..1e7a632 100644
--- a/data/zone/hi.txt
+++ b/data/zone/hi.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hi.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/hi.xml
*/
hi{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"एबिजान"}
@@ -1709,6 +1709,8 @@
ls{"समारा मानक समय"}
}
"meta:Samoa"{
+ ld{"समोआ का ग्रीष्मकालीन समय"}
+ lg{"समोआ का समय"}
ls{"समोआ का मानक समय"}
}
"meta:Seychelles"{
diff --git a/data/zone/hr.txt b/data/zone/hr.txt
index 4ebb97b..1420a67 100644
--- a/data/zone/hr.txt
+++ b/data/zone/hr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hr.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/hr.xml
*/
hr{
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Algiers"{
ec{"alžirsko"}
@@ -555,14 +555,6 @@
lg{"krasnojarsko vrijeme"}
ls{"krasnojarsko standardno vrijeme"}
}
- "meta:Kuybyshev"{
- ld{"kujbiševsko ljetno vrijeme"}
- lg{"kujbiševsko vrijeme"}
- ls{"kujbiševsko standardno vrijeme"}
- }
- "meta:Kwajalein"{
- ls{"kwajaleinsko vrijeme"}
- }
"meta:Kyrgystan"{
ls{"kirgistansko vrijeme"}
}
@@ -717,7 +709,9 @@
ls{"samarsko standardno vrijeme"}
}
"meta:Samoa"{
- ls{"samoansko vrijeme"}
+ ld{"samoansko ljetno vrijeme"}
+ lg{"samoansko vrijeme"}
+ ls{"samoansko standardno vrijeme"}
}
"meta:Seychelles"{
ls{"sejšelsko vrijeme"}
@@ -759,11 +753,6 @@
"meta:Truk"{
ls{"vrijeme Truka"}
}
- "meta:Turkey"{
- ld{"tursko ljetno vrijeme"}
- lg{"tursko vrijeme"}
- ls{"tursko standardno vrijeme"}
- }
"meta:Turkmenistan"{
ld{"turkmenistansko ljetno vrijeme"}
lg{"turkmenistansko vrijeme"}
diff --git a/data/zone/hu.txt b/data/zone/hu.txt
index acf6908..ad5ae45 100644
--- a/data/zone/hu.txt
+++ b/data/zone/hu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hu.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/hu.xml
*/
hu{
- Version{"2.0.78.47"}
+ Version{"2.0.82.47"}
zoneStrings{
"Africa:Addis_Ababa"{
ec{"Addisz-Abeba"}
@@ -571,21 +571,11 @@
lg{"Nyugat-afrikai idő"}
ls{"Nyugat-afrikai zónaidő"}
}
- "meta:Aktyubinsk"{
- ld{"Aktyubinszki nyári idő"}
- lg{"Aktyubinszki idő"}
- ls{"Aktyubinszki zónaidő"}
- }
"meta:Alaska"{
ld{"Alaszkai nyári idő"}
lg{"Alaszkai idő"}
ls{"Alaszkai zónaidő"}
}
- "meta:Alaska_Hawaii"{
- ld{"Alaszkai-hawaii nyári idő"}
- lg{"Alaszkai-hawaii idő"}
- ls{"Alaszkai-hawaii zónaidő"}
- }
"meta:Almaty"{
ld{"Almati nyári idő"}
lg{"Almati idő"}
@@ -651,11 +641,6 @@
lg{"Örmény idő"}
ls{"Örmény zónaidő"}
}
- "meta:Ashkhabad"{
- ld{"Ashabadi nyári idő"}
- lg{"Ashabadi idő"}
- ls{"Ashabadi zónaidő"}
- }
"meta:Atlantic"{
ld{"Atlanti-óceáni nyári idő"}
lg{"Atlanti-óceáni idő"}
@@ -691,32 +676,17 @@
lg{"Azori idő"}
ls{"Azori zónaidő"}
}
- "meta:Baku"{
- ld{"Bakui nyári idő"}
- lg{"Bakui idő"}
- ls{"Bakui zónaidő"}
- }
"meta:Bangladesh"{
ld{"Bangladesi nyári idő"}
lg{"Bangladesi idő"}
ls{"Bangladesi zónaidő"}
}
- "meta:Bering"{
- ld{"Beringi nyári idő"}
- lg{"Beringi idő"}
- ls{"Beringi zónaidő"}
- }
"meta:Bhutan"{
ls{"Butáni idő"}
}
"meta:Bolivia"{
ls{"Bolíviai idő"}
}
- "meta:Borneo"{
- ld{"Borneói nyári idő"}
- lg{"Borneói idő"}
- ls{"Borneói zónaidő"}
- }
"meta:Brasilia"{
ld{"Brazíliai nyári idő"}
lg{"Brazíliai idő"}
@@ -733,9 +703,6 @@
"meta:Chamorro"{
ls{"Chamorrói idő"}
}
- "meta:Changbai"{
- ls{"Changbai idő"}
- }
"meta:Chatham"{
ld{"Chathami nyári idő"}
lg{"Chathami idő"}
@@ -777,23 +744,12 @@
lg{"Kubai idő"}
ls{"Kubai zónaidő"}
}
- "meta:Dacca"{
- ls{"Daccai idő"}
- }
"meta:Davis"{
ls{"Davisi idő"}
}
"meta:DumontDUrville"{
ls{"Dumont-d'Urville-i idő"}
}
- "meta:Dushanbe"{
- ld{"Dusanbei nyári idő"}
- lg{"Dusanbei idő"}
- ls{"Dusanbei zónaidő"}
- }
- "meta:Dutch_Guiana"{
- ls{"Holland-guianai idő"}
- }
"meta:East_Timor"{
ls{"Kelet-timori idő"}
}
@@ -845,11 +801,6 @@
"meta:French_Southern"{
ls{"Francia déli és antarktikus idő"}
}
- "meta:Frunze"{
- ld{"Frunzei nyári idő"}
- lg{"Frunzei idő"}
- ls{"Frunzei zónaidő"}
- }
"meta:GMT"{
ls{"Greenwichi középidő"}
ss{"GMT"}
@@ -868,11 +819,6 @@
"meta:Gilbert_Islands"{
ls{"Gilbert-szigeteki idő"}
}
- "meta:Greenland_Central"{
- ld{"Közép-grönlandi nyári idő"}
- lg{"Közép-grönlandi idő"}
- ls{"Közép-grönlandi zónaidő"}
- }
"meta:Greenland_Eastern"{
ld{"Kelet-grönlandi nyári idő"}
lg{"Kelet-grönlandi idő"}
@@ -950,23 +896,12 @@
lg{"Petropavlovszk-kamcsatkai idő"}
ls{"Petropavlovszk-kamcsatkai zónaidő"}
}
- "meta:Karachi"{
- ls{"Karacsi idő"}
- }
- "meta:Kashgar"{
- ls{"Kasgár idő"}
- }
"meta:Kazakhstan_Eastern"{
ls{"Kelet-kazahsztáni idő"}
}
"meta:Kazakhstan_Western"{
ls{"Nyugat-kazahsztáni idő"}
}
- "meta:Kizilorda"{
- ld{"Kizilordai nyári idő"}
- lg{"Kizilordai idő"}
- ls{"Kizilordai zónaidő"}
- }
"meta:Korea"{
ld{"Koreai nyári idő"}
lg{"Koreai idő"}
@@ -980,14 +915,6 @@
lg{"Krasznojarszki idő"}
ls{"Krasznojarszki zónaidő"}
}
- "meta:Kuybyshev"{
- ld{"Kujbisevi nyári idő"}
- lg{"Kujbisevi idő"}
- ls{"Kujbisevi zónaidő"}
- }
- "meta:Kwajalein"{
- ls{"Kwajaleini idő"}
- }
"meta:Kyrgystan"{
ls{"Kirgiz idő"}
}
@@ -997,9 +924,6 @@
"meta:Line_Islands"{
ls{"Line-szigeteki idő"}
}
- "meta:Long_Shu"{
- ls{"Long-Shu idő"}
- }
"meta:Lord_Howe"{
ld{"Lord howei nyári idő"}
lg{"Lord howei idő"}
@@ -1018,9 +942,6 @@
lg{"Magadáni idő"}
ls{"Magadáni zónaidő"}
}
- "meta:Malaya"{
- ls{"Malayai idő"}
- }
"meta:Malaysia"{
ls{"Malajziai idő"}
}
@@ -1160,22 +1081,14 @@
lg{"Szamarai idő"}
ls{"Szamarai zónaidő"}
}
- "meta:Samarkand"{
- ld{"Szamarkandi nyári idő"}
- lg{"Szamarkandi idő"}
- ls{"Szamarkandi zónaidő"}
- }
"meta:Samoa"{
+ ld{"Szamoai nyári idő"}
+ lg{"Szamoai idő"}
ls{"Szamoai zónaidő"}
}
"meta:Seychelles"{
ls{"Seychelle-szigeteki idő"}
}
- "meta:Shevchenko"{
- ld{"Sevcsenkói nyári idő"}
- lg{"Sevcsenkói idő"}
- ls{"Sevcsenkói zónaidő"}
- }
"meta:Singapore"{
ls{"Szingapúri zónaidő"}
}
@@ -1188,11 +1101,6 @@
"meta:Suriname"{
ls{"Szurinámi idő"}
}
- "meta:Sverdlovsk"{
- ld{"Szverdlovszki nyári idő"}
- lg{"Szverdlovszki idő"}
- ls{"Szverdlovszki zónaidő"}
- }
"meta:Syowa"{
ls{"Syowai idő"}
}
@@ -1207,16 +1115,6 @@
"meta:Tajikistan"{
ls{"Tádzsikisztáni idő"}
}
- "meta:Tashkent"{
- ld{"Taskenti nyári idő"}
- lg{"Taskenti idő"}
- ls{"Taskenti zónaidő"}
- }
- "meta:Tbilisi"{
- ld{"Tbiliszi nyári idő"}
- lg{"Tbiliszi idő"}
- ls{"Tbiliszi zónaidő"}
- }
"meta:Tokelau"{
ls{"Tokelaui idő"}
}
@@ -1228,11 +1126,6 @@
"meta:Truk"{
ls{"Truki idő"}
}
- "meta:Turkey"{
- ld{"Törökországi nyári idő"}
- lg{"Törökországi idő"}
- ls{"Törökországi zónaidő"}
- }
"meta:Turkmenistan"{
ld{"Türkmenisztáni nyári idő"}
lg{"Türkmenisztáni idő"}
@@ -1241,19 +1134,11 @@
"meta:Tuvalu"{
ls{"Tuvalui idő"}
}
- "meta:Uralsk"{
- ld{"Uráli nyári idő"}
- lg{"Uráli idő"}
- ls{"Uráli zónaidő"}
- }
"meta:Uruguay"{
ld{"Uruguayi nyári idő"}
lg{"Uruguayi idő"}
ls{"Uruguayi zónaidő"}
}
- "meta:Urumqi"{
- ls{"Urumqi idő"}
- }
"meta:Uzbekistan"{
ld{"Üzbegisztáni nyári idő"}
lg{"Üzbegisztáni idő"}
@@ -1296,16 +1181,6 @@
lg{"Jekatyerinburgi idő"}
ls{"Jekatyerinburgi zónaidő"}
}
- "meta:Yerevan"{
- ld{"Jereváni nyári idő"}
- lg{"Jereváni idő"}
- ls{"Jereváni zónaidő"}
- }
- "meta:Yukon"{
- ld{"Yukoni nyári idő"}
- lg{"Yukoni idő"}
- ls{"Yukoni zónaidő"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"{1} idő ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/hy.txt b/data/zone/hy.txt
index 920cd8c..c8bb5b9 100644
--- a/data/zone/hy.txt
+++ b/data/zone/hy.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/hy.xml
// *
@@ -10,8 +10,1828 @@
* ICU <specials> source: <path>/xml/main/hy.xml
*/
hy{
- Version{"2.0.78.38"}
+ Version{"2.0.82.51"}
zoneStrings{
+ "Africa:Abidjan"{
+ ec{"Աբիջան"}
+ }
+ "Africa:Accra"{
+ ec{"Ակրա"}
+ }
+ "Africa:Addis_Ababa"{
+ ec{"Ադիս Աբեբա"}
+ }
+ "Africa:Algiers"{
+ ec{"Ալժիր"}
+ }
+ "Africa:Asmera"{
+ ec{"Ասմարա"}
+ }
+ "Africa:Bamako"{
+ ec{"Բամակո"}
+ }
+ "Africa:Bangui"{
+ ec{"Բանգի"}
+ }
+ "Africa:Banjul"{
+ ec{"Բանժուլ"}
+ }
+ "Africa:Bissau"{
+ ec{"Բիսաու"}
+ }
+ "Africa:Blantyre"{
+ ec{"Բլանթայր"}
+ }
+ "Africa:Brazzaville"{
+ ec{"Բրազավիլ"}
+ }
+ "Africa:Bujumbura"{
+ ec{"Բուժումբուրա"}
+ }
+ "Africa:Cairo"{
+ ec{"Կահիրե"}
+ }
+ "Africa:Casablanca"{
+ ec{"Կասաբլանկա"}
+ }
+ "Africa:Ceuta"{
+ ec{"Սեուտա"}
+ }
+ "Africa:Conakry"{
+ ec{"Կոնակրի"}
+ }
+ "Africa:Dakar"{
+ ec{"Դակար"}
+ }
+ "Africa:Dar_es_Salaam"{
+ ec{"Դար-Էս-Սալամ"}
+ }
+ "Africa:Djibouti"{
+ ec{"Ջիբութի"}
+ }
+ "Africa:Douala"{
+ ec{"Դուալա"}
+ }
+ "Africa:El_Aaiun"{
+ ec{"Էլ Այուն"}
+ }
+ "Africa:Freetown"{
+ ec{"Ֆրիթաուն"}
+ }
+ "Africa:Gaborone"{
+ ec{"Գաբորոնե"}
+ }
+ "Africa:Harare"{
+ ec{"Հարարե"}
+ }
+ "Africa:Johannesburg"{
+ ec{"Յոհանեսբուրգ"}
+ }
+ "Africa:Juba"{
+ ec{"Ջուբա"}
+ }
+ "Africa:Kampala"{
+ ec{"Կամպալա"}
+ }
+ "Africa:Khartoum"{
+ ec{"Խարթում"}
+ }
+ "Africa:Kigali"{
+ ec{"Կիգալի"}
+ }
+ "Africa:Kinshasa"{
+ ec{"Կինշասա"}
+ }
+ "Africa:Lagos"{
+ ec{"Լագոս"}
+ }
+ "Africa:Libreville"{
+ ec{"Լիբրևիլ"}
+ }
+ "Africa:Lome"{
+ ec{"Լոմե"}
+ }
+ "Africa:Luanda"{
+ ec{"Լուանդա"}
+ }
+ "Africa:Lubumbashi"{
+ ec{"Լուբումբաշի"}
+ }
+ "Africa:Lusaka"{
+ ec{"Լուսակա"}
+ }
+ "Africa:Malabo"{
+ ec{"Մալաբո"}
+ }
+ "Africa:Maputo"{
+ ec{"Մապուտու"}
+ }
+ "Africa:Maseru"{
+ ec{"Մասերու"}
+ }
+ "Africa:Mbabane"{
+ ec{"Մբաբանե"}
+ }
+ "Africa:Mogadishu"{
+ ec{"Մոգադիշո"}
+ }
+ "Africa:Monrovia"{
+ ec{"Մոնրովիա"}
+ }
+ "Africa:Nairobi"{
+ ec{"Նայրոբի"}
+ }
+ "Africa:Ndjamena"{
+ ec{"Նջամենա"}
+ }
+ "Africa:Niamey"{
+ ec{"Նիամեյ"}
+ }
+ "Africa:Nouakchott"{
+ ec{"Նուակշոտ"}
+ }
+ "Africa:Ouagadougou"{
+ ec{"Ուագադուգու"}
+ }
+ "Africa:Porto-Novo"{
+ ec{"Պորտո Նովո"}
+ }
+ "Africa:Sao_Tome"{
+ ec{"Սան Տոմե"}
+ }
+ "Africa:Tripoli"{
+ ec{"Տրիպոլի"}
+ }
+ "Africa:Tunis"{
+ ec{"Թունիս"}
+ }
+ "Africa:Windhoek"{
+ ec{"Վինդհուկ"}
+ }
+ "America:Adak"{
+ ec{"Ադակ կղզի"}
+ }
+ "America:Anchorage"{
+ ec{"Անքորիջ"}
+ }
+ "America:Anguilla"{
+ ec{"Անգիլիա"}
+ }
+ "America:Antigua"{
+ ec{"Անտիգուա"}
+ }
+ "America:Araguaina"{
+ ec{"Արագուայնա"}
+ }
+ "America:Argentina:La_Rioja"{
+ ec{"Լա-Ռիոխա"}
+ }
+ "America:Argentina:Rio_Gallegos"{
+ ec{"Ռիո Գալյեգոս"}
+ }
+ "America:Argentina:Salta"{
+ ec{"Սալտա"}
+ }
+ "America:Argentina:San_Juan"{
+ ec{"Սան Խուան"}
+ }
+ "America:Argentina:San_Luis"{
+ ec{"Սան Լուիս"}
+ }
+ "America:Argentina:Tucuman"{
+ ec{"Տուկուման"}
+ }
+ "America:Argentina:Ushuaia"{
+ ec{"Ուշուայա"}
+ }
+ "America:Aruba"{
+ ec{"Արուբա"}
+ }
+ "America:Asuncion"{
+ ec{"Ասունսյոն"}
+ }
+ "America:Bahia"{
+ ec{"Բայա"}
+ }
+ "America:Bahia_Banderas"{
+ ec{"Բայա Բանդերաս"}
+ }
+ "America:Barbados"{
+ ec{"Բարբադոս"}
+ }
+ "America:Belem"{
+ ec{"Բելեմ"}
+ }
+ "America:Belize"{
+ ec{"Բելիզ"}
+ }
+ "America:Blanc-Sablon"{
+ ec{"Բլան-Սաբլոն"}
+ }
+ "America:Boa_Vista"{
+ ec{"Բոա-Վիստա"}
+ }
+ "America:Bogota"{
+ ec{"Բոգոտա"}
+ }
+ "America:Boise"{
+ ec{"Բոյսե"}
+ }
+ "America:Buenos_Aires"{
+ ec{"Բուենոս Այրես"}
+ }
+ "America:Cambridge_Bay"{
+ ec{"Քեմբրիջ-Բեյ"}
+ }
+ "America:Campo_Grande"{
+ ec{"Կամպո Գրանգե"}
+ }
+ "America:Cancun"{
+ ec{"Կանկուն"}
+ }
+ "America:Caracas"{
+ ec{"Կարակաս"}
+ }
+ "America:Catamarca"{
+ ec{"Կատամարկա"}
+ }
+ "America:Cayenne"{
+ ec{"Կայեն"}
+ }
+ "America:Cayman"{
+ ec{"Կայմանի կղզիներ"}
+ }
+ "America:Chicago"{
+ ec{"Չիկագո"}
+ }
+ "America:Chihuahua"{
+ ec{"Չիուաուա"}
+ }
+ "America:Coral_Harbour"{
+ ec{"Ատիկոկան"}
+ }
+ "America:Cordoba"{
+ ec{"Կորդովա"}
+ }
+ "America:Costa_Rica"{
+ ec{"Կոստա Ռիկա"}
+ }
+ "America:Creston"{
+ ec{"Քրեսթոն"}
+ }
+ "America:Cuiaba"{
+ ec{"Կույաբա"}
+ }
+ "America:Curacao"{
+ ec{"Կյուրասաո"}
+ }
+ "America:Danmarkshavn"{
+ ec{"Դենմարքսհավն"}
+ }
+ "America:Dawson"{
+ ec{"Դոուսոն"}
+ }
+ "America:Dawson_Creek"{
+ ec{"Դոուսոն Կրիկ"}
+ }
+ "America:Denver"{
+ ec{"Դենվեր"}
+ }
+ "America:Detroit"{
+ ec{"Դետրոյթ"}
+ }
+ "America:Dominica"{
+ ec{"Դոմինիկա"}
+ }
+ "America:Edmonton"{
+ ec{"Էդմոնտոն"}
+ }
+ "America:Eirunepe"{
+ ec{"Էյրունեպե"}
+ }
+ "America:El_Salvador"{
+ ec{"Սալվադոր"}
+ }
+ "America:Fortaleza"{
+ ec{"Ֆորտալեզա"}
+ }
+ "America:Glace_Bay"{
+ ec{"Գլեյս Բեյ"}
+ }
+ "America:Godthab"{
+ ec{"Գոդթաբ"}
+ }
+ "America:Goose_Bay"{
+ ec{"Գուս Բեյ"}
+ }
+ "America:Grand_Turk"{
+ ec{"Գրանդ Տուրկ"}
+ }
+ "America:Grenada"{
+ ec{"Գրենադա"}
+ }
+ "America:Guadeloupe"{
+ ec{"Գվադելուպա"}
+ }
+ "America:Guatemala"{
+ ec{"Գվատեմալա"}
+ }
+ "America:Guayaquil"{
+ ec{"Գուայակիլ"}
+ }
+ "America:Guyana"{
+ ec{"Գայանա"}
+ }
+ "America:Halifax"{
+ ec{"Հալիֆաքս"}
+ }
+ "America:Havana"{
+ ec{"Հավանա"}
+ }
+ "America:Hermosillo"{
+ ec{"Էրմոսիլյո"}
+ }
+ "America:Indiana:Knox"{
+ ec{"Նոքս, Ինդիանա"}
+ }
+ "America:Indiana:Marengo"{
+ ec{"Մարենգո, Ինդիանա"}
+ }
+ "America:Indiana:Petersburg"{
+ ec{"Պետերսբուրգ, Ինդիանա"}
+ }
+ "America:Indiana:Tell_City"{
+ ec{"Թել-Սիթի, Ինդիանա"}
+ }
+ "America:Indiana:Vevay"{
+ ec{"Վիվեյ, Ինդիանա"}
+ }
+ "America:Indiana:Vincennes"{
+ ec{"Վինսենս, Ինդիանա"}
+ }
+ "America:Indiana:Winamac"{
+ ec{"Վինամակ, Ինդիանա"}
+ }
+ "America:Indianapolis"{
+ ec{"Ինդիանապոլիս"}
+ }
+ "America:Inuvik"{
+ ec{"Ինուվիկ"}
+ }
+ "America:Iqaluit"{
+ ec{"Իկալուիտ"}
+ }
+ "America:Jamaica"{
+ ec{"Ջամայկա"}
+ }
+ "America:Jujuy"{
+ ec{"Ժուժույ"}
+ }
+ "America:Juneau"{
+ ec{"Ջունո"}
+ }
+ "America:Kentucky:Monticello"{
+ ec{"Մոնտիսելո, Կենտուկի"}
+ }
+ "America:Kralendijk"{
+ ec{"Կրալենդեյկ"}
+ }
+ "America:La_Paz"{
+ ec{"Լա Պաս"}
+ }
+ "America:Lima"{
+ ec{"Լիմա"}
+ }
+ "America:Los_Angeles"{
+ ec{"Լոս Անջելես"}
+ }
+ "America:Louisville"{
+ ec{"Լուիսվիլ"}
+ }
+ "America:Lower_Princes"{
+ ec{"Լոուեր Պրինսես Քվորթեր"}
+ }
+ "America:Maceio"{
+ ec{"Մասեյո"}
+ }
+ "America:Managua"{
+ ec{"Մանագուա"}
+ }
+ "America:Manaus"{
+ ec{"Մանաուս"}
+ }
+ "America:Marigot"{
+ ec{"Մարիգո"}
+ }
+ "America:Martinique"{
+ ec{"Մարտինիկա"}
+ }
+ "America:Matamoros"{
+ ec{"Մատամորոս"}
+ }
+ "America:Mazatlan"{
+ ec{"Մազաթլան"}
+ }
+ "America:Mendoza"{
+ ec{"Մենդոսա"}
+ }
+ "America:Menominee"{
+ ec{"Մենոմինի"}
+ }
+ "America:Merida"{
+ ec{"Մերիդա"}
+ }
+ "America:Metlakatla"{
+ ec{"Մետլակատլա"}
+ }
+ "America:Mexico_City"{
+ ec{"Մեխիկո"}
+ }
+ "America:Miquelon"{
+ ec{"Միքելոն"}
+ }
+ "America:Moncton"{
+ ec{"Մոնկտոն"}
+ }
+ "America:Monterrey"{
+ ec{"Մոնտերեյ"}
+ }
+ "America:Montevideo"{
+ ec{"Մոնտեվիդեո"}
+ }
+ "America:Montreal"{
+ ec{"Մոնրեալ"}
+ }
+ "America:Montserrat"{
+ ec{"Մոնտսեռատ"}
+ }
+ "America:Nassau"{
+ ec{"Նասաու"}
+ }
+ "America:New_York"{
+ ec{"Նյու Յորք"}
+ }
+ "America:Nipigon"{
+ ec{"Նիպիգոն"}
+ }
+ "America:Nome"{
+ ec{"Նոմ"}
+ }
+ "America:Noronha"{
+ ec{"Նորոնխա"}
+ }
+ "America:North_Dakota:Beulah"{
+ ec{"Բոյլա, Հյուսիսային Դակոտա"}
+ }
+ "America:North_Dakota:Center"{
+ ec{"Հյուսիսային Դակոտա - Կենտրոն"}
+ }
+ "America:North_Dakota:New_Salem"{
+ ec{"Նյու Սալեմ, Հյուսիսային Դակոտա"}
+ }
+ "America:Ojinaga"{
+ ec{"Օխինագա"}
+ }
+ "America:Panama"{
+ ec{"Պանամա"}
+ }
+ "America:Pangnirtung"{
+ ec{"Պանգնիրտանգ"}
+ }
+ "America:Paramaribo"{
+ ec{"Պարամարիբո"}
+ }
+ "America:Phoenix"{
+ ec{"Ֆինիքս"}
+ }
+ "America:Port-au-Prince"{
+ ec{"Պորտ-օ-Պրենս"}
+ }
+ "America:Port_of_Spain"{
+ ec{"Պորտ-օֆ-Սփեյն"}
+ }
+ "America:Porto_Velho"{
+ ec{"Պորտու Վելյու"}
+ }
+ "America:Puerto_Rico"{
+ ec{"Պուերտո Ռիկո"}
+ }
+ "America:Rainy_River"{
+ ec{"Ռեյնի-Ռիվեր"}
+ }
+ "America:Rankin_Inlet"{
+ ec{"Ռանկին-Ինլետ"}
+ }
+ "America:Recife"{
+ ec{"Ռեսիֆի"}
+ }
+ "America:Regina"{
+ ec{"Ռեջայնա"}
+ }
+ "America:Resolute"{
+ ec{"Ռեզոլյուտ"}
+ }
+ "America:Rio_Branco"{
+ ec{"Ռիո Բրանկու"}
+ }
+ "America:Santa_Isabel"{
+ ec{"Սանտա Իսաբել"}
+ }
+ "America:Santarem"{
+ ec{"Սանտարեմ"}
+ }
+ "America:Santiago"{
+ ec{"Սանտյագո"}
+ }
+ "America:Santo_Domingo"{
+ ec{"Սանտո Դոմինգո"}
+ }
+ "America:Sao_Paulo"{
+ ec{"Սան Պաուլու"}
+ }
+ "America:Scoresbysund"{
+ ec{"Սկորսբիսուն"}
+ }
+ "America:Shiprock"{
+ ec{"Շիփռոք"}
+ }
+ "America:Sitka"{
+ ec{"Սիտկա"}
+ }
+ "America:St_Barthelemy"{
+ ec{"Սեն Բարտելմի"}
+ }
+ "America:St_Johns"{
+ ec{"Սենթ-Ջոնս"}
+ }
+ "America:St_Kitts"{
+ ec{"Սենթ Քիթս"}
+ }
+ "America:St_Lucia"{
+ ec{"Սենթ Լյուսիա"}
+ }
+ "America:St_Thomas"{
+ ec{"Սենթ Թոմաս"}
+ }
+ "America:St_Vincent"{
+ ec{"Սենթ Վինսենթ"}
+ }
+ "America:Swift_Current"{
+ ec{"Սվիֆթ-Քարենտ"}
+ }
+ "America:Tegucigalpa"{
+ ec{"Տեգուսիգալպա"}
+ }
+ "America:Thule"{
+ ec{"Տուլե"}
+ }
+ "America:Thunder_Bay"{
+ ec{"Տանդեր-Բեյ"}
+ }
+ "America:Tijuana"{
+ ec{"Տիխուանա"}
+ }
+ "America:Toronto"{
+ ec{"Տորոնտո"}
+ }
+ "America:Tortola"{
+ ec{"Տորտոլա"}
+ }
+ "America:Vancouver"{
+ ec{"Վանկուվեր"}
+ }
+ "America:Whitehorse"{
+ ec{"Ուայթհորս"}
+ }
+ "America:Winnipeg"{
+ ec{"Վինիպեգ"}
+ }
+ "America:Yakutat"{
+ ec{"Յակուտատ"}
+ }
+ "America:Yellowknife"{
+ ec{"Յելոունայֆ"}
+ }
+ "Antarctica:Casey"{
+ ec{"Քեյսի"}
+ }
+ "Antarctica:Davis"{
+ ec{"Դեյվիս"}
+ }
+ "Antarctica:DumontDUrville"{
+ ec{"Դյումոն դ'Յուրվիլ"}
+ }
+ "Antarctica:Macquarie"{
+ ec{"Մակկուորի կղզի"}
+ }
+ "Antarctica:Mawson"{
+ ec{"Մոուսոն"}
+ }
+ "Antarctica:McMurdo"{
+ ec{"Մակ-Մերդո"}
+ }
+ "Antarctica:Palmer"{
+ ec{"Պալմեր"}
+ }
+ "Antarctica:Rothera"{
+ ec{"Ռոտերա"}
+ }
+ "Antarctica:South_Pole"{
+ ec{"Հարավային բևեռ"}
+ }
+ "Antarctica:Syowa"{
+ ec{"Սյովա"}
+ }
+ "Antarctica:Vostok"{
+ ec{"Վոստոկ"}
+ }
+ "Arctic:Longyearbyen"{
+ ec{"Լոնգյիր"}
+ }
+ "Asia:Aden"{
+ ec{"Ադեն"}
+ }
+ "Asia:Almaty"{
+ ec{"Ալմաթի"}
+ }
+ "Asia:Amman"{
+ ec{"Ամման"}
+ }
+ "Asia:Anadyr"{
+ ec{"Անադիր"}
+ }
+ "Asia:Aqtau"{
+ ec{"Ակտաու"}
+ }
+ "Asia:Aqtobe"{
+ ec{"Ակտոբե"}
+ }
+ "Asia:Ashgabat"{
+ ec{"Աշխաբադ"}
+ }
+ "Asia:Baghdad"{
+ ec{"Բաղդադ"}
+ }
+ "Asia:Bahrain"{
+ ec{"Բահրեյն"}
+ }
+ "Asia:Baku"{
+ ec{"Բաքու"}
+ }
+ "Asia:Bangkok"{
+ ec{"Բանգկոկ"}
+ }
+ "Asia:Beirut"{
+ ec{"Բեյրութ"}
+ }
+ "Asia:Bishkek"{
+ ec{"Բիշքեկ"}
+ }
+ "Asia:Brunei"{
+ ec{"Բրունեյ"}
+ }
+ "Asia:Calcutta"{
+ ec{"Կալկուտա"}
+ }
+ "Asia:Choibalsan"{
+ ec{"Չոյբալսան"}
+ }
+ "Asia:Chongqing"{
+ ec{"Չունցին"}
+ }
+ "Asia:Colombo"{
+ ec{"Կոլոմբո"}
+ }
+ "Asia:Damascus"{
+ ec{"Դամասկոս"}
+ }
+ "Asia:Dhaka"{
+ ec{"Դաքքա"}
+ }
+ "Asia:Dili"{
+ ec{"Դիլի"}
+ }
+ "Asia:Dubai"{
+ ec{"Դուբայ"}
+ }
+ "Asia:Dushanbe"{
+ ec{"Դուշանբե"}
+ }
+ "Asia:Gaza"{
+ ec{"Գազա"}
+ }
+ "Asia:Harbin"{
+ ec{"Հարբին"}
+ }
+ "Asia:Hebron"{
+ ec{"Հեբրոն"}
+ }
+ "Asia:Hong_Kong"{
+ ec{"Հոնկոնգ"}
+ }
+ "Asia:Hovd"{
+ ec{"Հովդ"}
+ }
+ "Asia:Irkutsk"{
+ ec{"Իրկուտսկ"}
+ }
+ "Asia:Jakarta"{
+ ec{"Ջակարտա"}
+ }
+ "Asia:Jayapura"{
+ ec{"Ջայպուրա"}
+ }
+ "Asia:Jerusalem"{
+ ec{"Երուսաղեմ"}
+ }
+ "Asia:Kabul"{
+ ec{"Կաբուլ"}
+ }
+ "Asia:Kamchatka"{
+ ec{"Կամչատկա"}
+ }
+ "Asia:Karachi"{
+ ec{"Կարաչի"}
+ }
+ "Asia:Kashgar"{
+ ec{"Քաշգար"}
+ }
+ "Asia:Katmandu"{
+ ec{"Կատմանդու"}
+ }
+ "Asia:Krasnoyarsk"{
+ ec{"Կրասնոյարսկ"}
+ }
+ "Asia:Kuala_Lumpur"{
+ ec{"Կուալա Լումպուր"}
+ }
+ "Asia:Kuching"{
+ ec{"Կուչինգ"}
+ }
+ "Asia:Kuwait"{
+ ec{"Քուվեյթ"}
+ }
+ "Asia:Macau"{
+ ec{"Մակաո"}
+ }
+ "Asia:Magadan"{
+ ec{"Մագադան"}
+ }
+ "Asia:Makassar"{
+ ec{"Մակասար"}
+ }
+ "Asia:Manila"{
+ ec{"Մանիլա"}
+ }
+ "Asia:Muscat"{
+ ec{"Մուսկատ"}
+ }
+ "Asia:Nicosia"{
+ ec{"Նիկոսիա"}
+ }
+ "Asia:Novokuznetsk"{
+ ec{"Նովոկուզնեցկ"}
+ }
+ "Asia:Novosibirsk"{
+ ec{"Նովոսիբիրսկ"}
+ }
+ "Asia:Omsk"{
+ ec{"Օմսկ"}
+ }
+ "Asia:Oral"{
+ ec{"Օրալ"}
+ }
+ "Asia:Phnom_Penh"{
+ ec{"Պնոմպեն"}
+ }
+ "Asia:Pontianak"{
+ ec{"Պոնտիանակ"}
+ }
+ "Asia:Pyongyang"{
+ ec{"Փխենյան"}
+ }
+ "Asia:Qatar"{
+ ec{"Կատար"}
+ }
+ "Asia:Qyzylorda"{
+ ec{"Քիզիլօրդա"}
+ }
+ "Asia:Rangoon"{
+ ec{"Ռանգուն"}
+ }
+ "Asia:Riyadh"{
+ ec{"Էր Ռիադ"}
+ }
+ "Asia:Saigon"{
+ ec{"Հոշիմին"}
+ }
+ "Asia:Sakhalin"{
+ ec{"Սախալին"}
+ }
+ "Asia:Samarkand"{
+ ec{"Սամարղանդ"}
+ }
+ "Asia:Seoul"{
+ ec{"Սեուլ"}
+ }
+ "Asia:Shanghai"{
+ ec{"Շանխայ"}
+ }
+ "Asia:Singapore"{
+ ec{"Սինգապուր"}
+ }
+ "Asia:Taipei"{
+ ec{"Թայպեյ"}
+ }
+ "Asia:Tashkent"{
+ ec{"Տաշքենդ"}
+ }
+ "Asia:Tbilisi"{
+ ec{"Թբիլիսի"}
+ }
+ "Asia:Tehran"{
+ ec{"Թեհրան"}
+ }
+ "Asia:Thimphu"{
+ ec{"Թիմփու"}
+ }
+ "Asia:Tokyo"{
+ ec{"Տոկիո"}
+ }
+ "Asia:Ulaanbaatar"{
+ ec{"Ուլան Բատոր"}
+ }
+ "Asia:Urumqi"{
+ ec{"Ուրումչի"}
+ }
+ "Asia:Vientiane"{
+ ec{"Վյենտյան"}
+ }
+ "Asia:Vladivostok"{
+ ec{"Վլադիվոստոկ"}
+ }
+ "Asia:Yakutsk"{
+ ec{"Յակուտսկ"}
+ }
+ "Asia:Yekaterinburg"{
+ ec{"Եկատերինբուրգ"}
+ }
+ "Asia:Yerevan"{
+ ec{"Երևան"}
+ }
+ "Atlantic:Azores"{
+ ec{"Ազորյան կղզիներ"}
+ }
+ "Atlantic:Bermuda"{
+ ec{"Բերմուդյան կղզիներ"}
+ }
+ "Atlantic:Canary"{
+ ec{"Կանարյան կղզիներ"}
+ }
+ "Atlantic:Cape_Verde"{
+ ec{"Կաբո Վերդե"}
+ }
+ "Atlantic:Faeroe"{
+ ec{"Ֆարերյան կղզիներ"}
+ }
+ "Atlantic:Madeira"{
+ ec{"Մադեյրա"}
+ }
+ "Atlantic:Reykjavik"{
+ ec{"Ռեյկյավիկ"}
+ }
+ "Atlantic:South_Georgia"{
+ ec{"Հարավային Ջորջիա"}
+ }
+ "Atlantic:St_Helena"{
+ ec{"Սուրբ Հեղինեի կղզի"}
+ }
+ "Atlantic:Stanley"{
+ ec{"Սթենլի"}
+ }
+ "Australia:Adelaide"{
+ ec{"Ադելաիդա"}
+ }
+ "Australia:Brisbane"{
+ ec{"Բրիսբեն"}
+ }
+ "Australia:Broken_Hill"{
+ ec{"Բրոքեն Հիլ"}
+ }
+ "Australia:Currie"{
+ ec{"Քերի"}
+ }
+ "Australia:Darwin"{
+ ec{"Դարվին"}
+ }
+ "Australia:Eucla"{
+ ec{"Յուկլա"}
+ }
+ "Australia:Hobart"{
+ ec{"Հոբարտ"}
+ }
+ "Australia:Lindeman"{
+ ec{"Լինդեման"}
+ }
+ "Australia:Lord_Howe"{
+ ec{"Լորդ Հաու"}
+ }
+ "Australia:Melbourne"{
+ ec{"Մելբուրն"}
+ }
+ "Australia:Perth"{
+ ec{"Պերթ"}
+ }
+ "Australia:Sydney"{
+ ec{"Սիդնեյ"}
+ }
+ "Etc:Unknown"{
+ ec{"Անհայտ քաղաք"}
+ }
+ "Europe:Amsterdam"{
+ ec{"Ամստերդամ"}
+ }
+ "Europe:Andorra"{
+ ec{"Անդորա"}
+ }
+ "Europe:Athens"{
+ ec{"Աթենք"}
+ }
+ "Europe:Belgrade"{
+ ec{"Բելգրադ"}
+ }
+ "Europe:Berlin"{
+ ec{"Բեռլին"}
+ }
+ "Europe:Bratislava"{
+ ec{"Բրատիսլավա"}
+ }
+ "Europe:Brussels"{
+ ec{"Բրյուսել"}
+ }
+ "Europe:Bucharest"{
+ ec{"Բուխարեստ"}
+ }
+ "Europe:Budapest"{
+ ec{"Բուդապեշտ"}
+ }
+ "Europe:Chisinau"{
+ ec{"Քիշնև"}
+ }
+ "Europe:Copenhagen"{
+ ec{"Կոպենհագեն"}
+ }
+ "Europe:Dublin"{
+ ec{"Դուբլին"}
+ ld{"Իռլանդական ամառային ժամանակ"}
+ }
+ "Europe:Gibraltar"{
+ ec{"Ջիբրալթար"}
+ }
+ "Europe:Guernsey"{
+ ec{"Գերնսի"}
+ }
+ "Europe:Helsinki"{
+ ec{"Հելսինկի"}
+ }
+ "Europe:Isle_of_Man"{
+ ec{"Մեն կղզի"}
+ }
+ "Europe:Istanbul"{
+ ec{"Ստամբուլ"}
+ }
+ "Europe:Jersey"{
+ ec{"Ջերսի"}
+ }
+ "Europe:Kaliningrad"{
+ ec{"Կալինինգրադ"}
+ }
+ "Europe:Kiev"{
+ ec{"Կիև"}
+ }
+ "Europe:Lisbon"{
+ ec{"Լիսաբոն"}
+ }
+ "Europe:Ljubljana"{
+ ec{"Լյուբլյանա"}
+ }
+ "Europe:London"{
+ ec{"Լոնդոն"}
+ ld{"Բրիտանական ամառային ժամանակ"}
+ }
+ "Europe:Luxembourg"{
+ ec{"Լյուքսեմբուրգ"}
+ }
+ "Europe:Madrid"{
+ ec{"Մադրիդ"}
+ }
+ "Europe:Malta"{
+ ec{"Մալթա"}
+ }
+ "Europe:Mariehamn"{
+ ec{"Մարիեհամն"}
+ }
+ "Europe:Minsk"{
+ ec{"Մինսկ"}
+ }
+ "Europe:Monaco"{
+ ec{"Մոնակո"}
+ }
+ "Europe:Moscow"{
+ ec{"Մոսկվա"}
+ }
+ "Europe:Oslo"{
+ ec{"Օսլո"}
+ }
+ "Europe:Paris"{
+ ec{"Փարիզ"}
+ }
+ "Europe:Podgorica"{
+ ec{"Պոդգորիցա"}
+ }
+ "Europe:Prague"{
+ ec{"Պրահա"}
+ }
+ "Europe:Riga"{
+ ec{"Ռիգա"}
+ }
+ "Europe:Rome"{
+ ec{"Հռոմ"}
+ }
+ "Europe:Samara"{
+ ec{"Սամարա"}
+ }
+ "Europe:San_Marino"{
+ ec{"Սան Մարինո"}
+ }
+ "Europe:Sarajevo"{
+ ec{"Սարաևո"}
+ }
+ "Europe:Simferopol"{
+ ec{"Սիմֆերոպոլ"}
+ }
+ "Europe:Skopje"{
+ ec{"Սկոպյե"}
+ }
+ "Europe:Sofia"{
+ ec{"Սոֆիա"}
+ }
+ "Europe:Stockholm"{
+ ec{"Ստոքհոլմ"}
+ }
+ "Europe:Tallinn"{
+ ec{"Տալլին"}
+ }
+ "Europe:Tirane"{
+ ec{"Տիրանա"}
+ }
+ "Europe:Uzhgorod"{
+ ec{"Ուժգորոդ"}
+ }
+ "Europe:Vaduz"{
+ ec{"Վադուց"}
+ }
+ "Europe:Vatican"{
+ ec{"Վատիկան"}
+ }
+ "Europe:Vienna"{
+ ec{"Վիեննա"}
+ }
+ "Europe:Vilnius"{
+ ec{"Վիլնյուս"}
+ }
+ "Europe:Volgograd"{
+ ec{"Վոլգոգրադ"}
+ }
+ "Europe:Warsaw"{
+ ec{"Վարշավա"}
+ }
+ "Europe:Zagreb"{
+ ec{"Զագրեբ"}
+ }
+ "Europe:Zaporozhye"{
+ ec{"Զապորոժյե"}
+ }
+ "Europe:Zurich"{
+ ec{"Ցյուրիխ"}
+ }
+ "Indian:Antananarivo"{
+ ec{"Անտանանարիվու"}
+ }
+ "Indian:Chagos"{
+ ec{"Չագոս"}
+ }
+ "Indian:Christmas"{
+ ec{"Ծննդյան կղզի"}
+ }
+ "Indian:Cocos"{
+ ec{"Կոկոսյան կղզիներ"}
+ }
+ "Indian:Comoro"{
+ ec{"Կոմորյան կղզիներ"}
+ }
+ "Indian:Kerguelen"{
+ ec{"Կերգելեն"}
+ }
+ "Indian:Mahe"{
+ ec{"Մաէ"}
+ }
+ "Indian:Maldives"{
+ ec{"Մալդիվյան կղզիներ"}
+ }
+ "Indian:Mauritius"{
+ ec{"Մավրիկիոս"}
+ }
+ "Indian:Mayotte"{
+ ec{"Մայոտ"}
+ }
+ "Indian:Reunion"{
+ ec{"Ռեյունիոն"}
+ }
+ "Pacific:Apia"{
+ ec{"Ապիա"}
+ }
+ "Pacific:Auckland"{
+ ec{"Օկլենդ"}
+ }
+ "Pacific:Chatham"{
+ ec{"Չաթեմ կղզի"}
+ }
+ "Pacific:Easter"{
+ ec{"Զատիկի կղզի"}
+ }
+ "Pacific:Efate"{
+ ec{"Էֆատե"}
+ }
+ "Pacific:Enderbury"{
+ ec{"Էնդերբերի կղզի"}
+ }
+ "Pacific:Fakaofo"{
+ ec{"Ֆակաոֆո"}
+ }
+ "Pacific:Fiji"{
+ ec{"Ֆիջի"}
+ }
+ "Pacific:Funafuti"{
+ ec{"Ֆունաֆուտի"}
+ }
+ "Pacific:Galapagos"{
+ ec{"Գալապագոսյան կղզիներ"}
+ }
+ "Pacific:Gambier"{
+ ec{"Գամբյե կղզիներ"}
+ }
+ "Pacific:Guadalcanal"{
+ ec{"Գուադալկանալ"}
+ }
+ "Pacific:Guam"{
+ ec{"Գուամ"}
+ }
+ "Pacific:Honolulu"{
+ ec{"Հոնոլուլու"}
+ }
+ "Pacific:Johnston"{
+ ec{"Ջոնսթոն ատոլ"}
+ }
+ "Pacific:Kiritimati"{
+ ec{"Կիրիտիմատի"}
+ }
+ "Pacific:Kosrae"{
+ ec{"Կոսրաե"}
+ }
+ "Pacific:Kwajalein"{
+ ec{"Քվաջալեյն"}
+ }
+ "Pacific:Majuro"{
+ ec{"Մաջուրո"}
+ }
+ "Pacific:Marquesas"{
+ ec{"Մարկիզյան կղզիներ"}
+ }
+ "Pacific:Midway"{
+ ec{"Միդուեյ կղզի"}
+ }
+ "Pacific:Nauru"{
+ ec{"Նաուրու"}
+ }
+ "Pacific:Niue"{
+ ec{"Նիուե"}
+ }
+ "Pacific:Norfolk"{
+ ec{"Նորֆոլկ"}
+ }
+ "Pacific:Noumea"{
+ ec{"Նումեա"}
+ }
+ "Pacific:Pago_Pago"{
+ ec{"Պագո Պագո"}
+ }
+ "Pacific:Palau"{
+ ec{"Պալաու"}
+ }
+ "Pacific:Pitcairn"{
+ ec{"Պիտկեռն"}
+ }
+ "Pacific:Ponape"{
+ ec{"Պոնապե կղզի"}
+ }
+ "Pacific:Port_Moresby"{
+ ec{"Պորտ Մորսբի"}
+ }
+ "Pacific:Rarotonga"{
+ ec{"Ռառատոնգա"}
+ }
+ "Pacific:Saipan"{
+ ec{"Սայպան"}
+ }
+ "Pacific:Tahiti"{
+ ec{"Թաիթի"}
+ }
+ "Pacific:Tarawa"{
+ ec{"Տարավա"}
+ }
+ "Pacific:Tongatapu"{
+ ec{"Տոնգատապու"}
+ }
+ "Pacific:Truk"{
+ ec{"Չուուկ"}
+ }
+ "Pacific:Wake"{
+ ec{"Ուեյք կղզի"}
+ }
+ "Pacific:Wallis"{
+ ec{"Ուոլլիս"}
+ }
+ "meta:Afghanistan"{
+ ls{"Աֆղանստանի ժամանակ"}
+ }
+ "meta:Africa_Central"{
+ ls{"Կենտրոնաաֆրիկյան ժամանակ"}
+ }
+ "meta:Africa_Eastern"{
+ ls{"Արևելաաֆրիկյան ժամանակ"}
+ }
+ "meta:Africa_Southern"{
+ ls{"Հարավաֆրիկյան ժամանակ"}
+ }
+ "meta:Africa_Western"{
+ ld{"Արևմտաաֆրիկյան ամառային ժամանակ"}
+ lg{"Արևմտաաֆրիկյան ժամանակ"}
+ ls{"Արևմտաաֆրիկյան ստանդարտ ժամանակ"}
+ }
+ "meta:Alaska"{
+ ld{"Ալյասկա, ամառային ժամանակ"}
+ lg{"Ալյասկայի ժամանակ"}
+ ls{"Ալյասկա, ստանդարտ ժամանակ"}
+ }
+ "meta:Amazon"{
+ ld{"Ամազոնյան ամառային ժամանակ"}
+ lg{"Ամազոնյան ժամանակ"}
+ ls{"Ամազոնյան ստանդարտ ժամանակ"}
+ }
+ "meta:America_Central"{
+ ld{"Միջին ամերիկյան ամառային ժամանակ"}
+ lg{"Միջին ամերիկյան ժամանակ"}
+ ls{"Միջին ամերիկյան ստանդարտ ժամանակ"}
+ }
+ "meta:America_Eastern"{
+ ld{"Արևելաամերիկյան ամառային ժամանակ"}
+ lg{"Արևելաամերիկյան ժամանակ"}
+ ls{"Արևելաամերիկյան ստանդարտ ժամանակ"}
+ }
+ "meta:America_Mountain"{
+ ld{"Լեռնային ամառային ժամանակ (Հյուսիսային Ամերիկա)"}
+ lg{"Լեռնային ժամանակ (Հյուսիսային Ամերիկա)"}
+ ls{"Լեռնային ստանդարտ ժամանակ (Հյուսիսային Ամերիկա)"}
+ }
+ "meta:America_Pacific"{
+ ld{"Խաղաղօվկիանոսային ամառային ժամանակ (Հյուսիսային Ամերիկա)"}
+ lg{"Խաղաղօվկիանոսային ժամանակ (Հյուսիսային Ամերիկա)"}
+ ls{"Խաղաղօվկիանոսային ստանդարտ ժամանակ (Հյուսիսային Ամերիկա)"}
+ }
+ "meta:Arabian"{
+ ld{"Սաուդյան Արաբիայի ամառային ժամանակ"}
+ lg{"Սաուդյան Արաբիայի ժամանակ"}
+ ls{"Սաուդյան Արաբիայի ստանդարտ ժամանակ"}
+ }
+ "meta:Argentina"{
+ ld{"Արգենտինայի ամառային ժամանակ"}
+ lg{"Արգենտինայի ժամանակ"}
+ ls{"Արգենտինայի ստնադարտ ժամանակ"}
+ }
+ "meta:Argentina_Western"{
+ ld{"Արևմտյան Արգենտինայի ամառային ժամանակ"}
+ lg{"Արևմտյան Արգենտինայի ժամանակ"}
+ ls{"Արևմտյան Արգենտինայի ստնադարտ ժամանակ"}
+ }
+ "meta:Armenia"{
+ ld{"Հայաստանի ամառային ժամանակ"}
+ lg{"Հայաստանի ժամանակ"}
+ ls{"Հայաստանի ստանդարտ ժամանակ"}
+ }
+ "meta:Atlantic"{
+ ld{"Ատլատյան ամառային ժամանակ"}
+ lg{"Ատլատյան ժամանակ"}
+ ls{"Ատլատյան ստանդարտ ժամանակ"}
+ }
+ "meta:Australia_Central"{
+ ld{"Կենտրոնաավստրալիական ամառային ժամանակ"}
+ lg{"Կենտրոնաավստրալիական ժամանակ"}
+ ls{"Կենտրոնաավստրալիական ստանդարտ ժամանակ"}
+ }
+ "meta:Australia_CentralWestern"{
+ ld{"Կենտրոնաավստրալիական արևմտյան ամառային ժամանակ"}
+ lg{"Կենտրոնաավստրալիական արևմտյան ժամանակ"}
+ ls{"Կենտրոնաավստրալիական արևմտյան ստանդարտ ժամանակ"}
+ }
+ "meta:Australia_Eastern"{
+ ld{"Արևելաավստրալիական ամառային ժամանակ"}
+ lg{"Արևելաավստրալիական ժամանակ"}
+ ls{"Արևելաավստրալիական ստանդարտ ժամանակ"}
+ }
+ "meta:Australia_Western"{
+ ld{"Արևմտաավստրալիական ամառային ժամանակ"}
+ lg{"Արևմտաավստրալիական ժամանակ"}
+ ls{"Արևմտաավստրալիական ստանդարտ ժամանակ"}
+ }
+ "meta:Azerbaijan"{
+ ld{"Ադրբեջանի ամառային ժամանակ"}
+ lg{"Ադրբեջանի ժամանակ"}
+ ls{"Ադրբեջանի ստանդարտ ժամանակ"}
+ }
+ "meta:Azores"{
+ ld{"Ազորյան կղզիների ամառային ժամանակ"}
+ lg{"Ազորյան կղզիների ժամանակ"}
+ ls{"Ազորյան կղզիների ստանդարտ ժամանակ"}
+ }
+ "meta:Bangladesh"{
+ ld{"Բանգլադեշի ամառային ժամանակ"}
+ lg{"Բանգլադեշի ժամանակ"}
+ ls{"Բանգլադեշի ստանդարտ ժամանակ"}
+ }
+ "meta:Bhutan"{
+ ls{"Բութանի ժամանակ"}
+ }
+ "meta:Bolivia"{
+ ls{"Բոլիվիայի ժամանակ"}
+ }
+ "meta:Brasilia"{
+ ld{"Բրազիլիայի ամառային ժամանակ"}
+ lg{"Բրազիլիայի ժամանակ"}
+ ls{"Բրազիլիայի ստանդարտ ժամանակ"}
+ }
+ "meta:Brunei"{
+ ls{"Բրունեյի ժամանակ"}
+ }
+ "meta:Cape_Verde"{
+ ld{"Կաբո Վերդեի ամառային ժամանակ"}
+ lg{"Կաբո Վերդեի ժամանակ"}
+ ls{"Կաբո Վերդեի ստանդարտ ժամանակ"}
+ }
+ "meta:Chamorro"{
+ ls{"Չամորոյի ժամանակ"}
+ }
+ "meta:Chatham"{
+ ld{"Չաթեմ կղզու ամառային ժամանակ"}
+ lg{"Չաթեմ կղզու ժամանակ"}
+ ls{"Չաթեմ կղզու ստանդարտ ժամանակ"}
+ }
+ "meta:Chile"{
+ ld{"Չիլիի ամառային ժամանակ"}
+ lg{"Չիլիի ժամանակ"}
+ ls{"Չիլիի ստանդարտ ժամանակ"}
+ }
+ "meta:China"{
+ ld{"Չինաստանի ամառային ժամանակ"}
+ lg{"Չինաստանի ժամանակ"}
+ ls{"Չինաստանի ստանդարտ ժամանակ"}
+ }
+ "meta:Choibalsan"{
+ ld{"Չոյբալսանի ամառային ժամանակ"}
+ lg{"Չոյբալսանի ժամանակ"}
+ ls{"Չոյբալսանի ստանդարտ ժամանակ"}
+ }
+ "meta:Christmas"{
+ ls{"Ծննդյան կղզու ժամանակ"}
+ }
+ "meta:Cocos"{
+ ls{"Կոկոսյան կղզիների ժամանակ"}
+ }
+ "meta:Colombia"{
+ ld{"Կոլումբիայի ամառային ժամանակ"}
+ lg{"Կոլումբիայի ժամանակ"}
+ ls{"Կոլումբիայի ստանդարտ ժամանակ"}
+ }
+ "meta:Cook"{
+ ld{"Կուկի կղզիների կիսաամառային ժամանակ"}
+ lg{"Կուկի կղզիների ժամանակ"}
+ ls{"Կուկի կղզիների ստանդարտ ժամանակ"}
+ }
+ "meta:Cuba"{
+ ld{"Կուբայի ամառային ժամանակ"}
+ lg{"Կուբայի ժամանակ"}
+ ls{"Կուբայի ստանդարտ ժամանակ"}
+ }
+ "meta:Davis"{
+ ls{"Դեյվիսի ժամանակ"}
+ }
+ "meta:DumontDUrville"{
+ ls{"Դյումոն դ'Յուրվիլի ժամանակ"}
+ }
+ "meta:East_Timor"{
+ ls{"Արևելյան Թիմորի ժամանակ"}
+ }
+ "meta:Easter"{
+ ld{"Զատկի կղզու ամառային ժամանակ"}
+ lg{"Զատկի կղզու ժամանակ"}
+ ls{"Զատկի կղզու ստանդարտ ժամանակ"}
+ }
+ "meta:Ecuador"{
+ ls{"Էկվադորի ժամանակ"}
+ }
+ "meta:Europe_Central"{
+ ld{"Կենտրոնաևրոպական ամառային ժամանակ"}
+ lg{"Կենտրոնաևրոպական ժամանակ"}
+ ls{"Կենտրոնաևրոպական ստանդարտ ժամանակ"}
+ }
+ "meta:Europe_Eastern"{
+ ld{"Արևելաևրոպական ամառային ժամանակ"}
+ lg{"Արևելաևրոպական ժամանակ"}
+ ls{"Արևելաևրոպական ստանդարտ ժամանակ"}
+ }
+ "meta:Europe_Western"{
+ ld{"Արևմտաևրոպական ամառային ժամանակ"}
+ lg{"Արևմտաևրոպական ժամանակ"}
+ ls{"Արևմտաևրոպական ստանդարտ ժամանակ"}
+ }
+ "meta:Falkland"{
+ ld{"Ֆոլկլենդյան կղզիների ամառային ժամանակ"}
+ lg{"Ֆոլկլենդյան կղզիների ժամանակ"}
+ ls{"Ֆոլկլենդյան կղզիների ստանդարտ ժամանակ"}
+ }
+ "meta:Fiji"{
+ ld{"Ֆիջիի ամառային ժամանակ"}
+ lg{"Ֆիջիի ժամանակ"}
+ ls{"Ֆիջիի ստանդարտ ժամանակ"}
+ }
+ "meta:French_Guiana"{
+ ls{"Ֆրանսիական Գվիանայի ժամանակ"}
+ }
+ "meta:French_Southern"{
+ ls{"Ֆրանսիական հարավային և անտարկտիդյան ժամանակ"}
+ }
+ "meta:GMT"{
+ ls{"Գրինվիչի ժամանակ"}
+ }
+ "meta:Galapagos"{
+ ls{"Գալապագոսյան կղզիների ժամանակ"}
+ }
+ "meta:Gambier"{
+ ls{"Գամբյե կղզիների ժամանակ"}
+ }
+ "meta:Georgia"{
+ ld{"Վրաստանի ամառային ժամանակ"}
+ lg{"Վրաստանի ժամանակ"}
+ ls{"Վրաստանի ստանդարտ ժամանակ"}
+ }
+ "meta:Gilbert_Islands"{
+ ls{"Ջլիբերթի կղզիների ժամանակ"}
+ }
+ "meta:Greenland_Eastern"{
+ ld{"Արևելյան Գրենլանդիայի ամառային ժամանակ"}
+ lg{"Արևելյան Գրենլանդիայի ժամանակ"}
+ ls{"Արևելյան Գրենլանդիայի ստանդարտ ժամանակ"}
+ }
+ "meta:Greenland_Western"{
+ ld{"Արևմտյան Գրենլանդիայի ամառային ժամանակ"}
+ lg{"Արևմտյան Գրենլանդիայի ժամանակ"}
+ ls{"Արևմտյան Գրենլանդիայի ստանդարտ ժամանակ"}
+ }
+ "meta:Gulf"{
+ ls{"Պարսից ծոցի ժամանակ"}
+ }
+ "meta:Guyana"{
+ ls{"Գայանայի ժամանակ"}
+ }
+ "meta:Hawaii_Aleutian"{
+ ld{"Հավայան-ալեուտյան ամառային ժամանակ"}
+ lg{"Հավայան-ալեուտյան ժամանակ"}
+ ls{"Հավայան-ալեուտյան ստանդարտ ժամանակ"}
+ }
+ "meta:Hong_Kong"{
+ ld{"Հոնկոնգի ամառային ժամանակ"}
+ lg{"Հոնկոնգի ժամանակ"}
+ ls{"Հոնկոնգի ստանդարտ ժամանակ"}
+ }
+ "meta:Hovd"{
+ ld{"Հովդի ամառային ժամանակ"}
+ lg{"Հովդի ժամանակ"}
+ ls{"Հովդի ստանդարտ ժամանակ"}
+ }
+ "meta:India"{
+ ls{"Հնդկաստանի ժամանակ"}
+ }
+ "meta:Indian_Ocean"{
+ ls{"Հնդկական օվկիանոսի ժամանակ"}
+ }
+ "meta:Indochina"{
+ ls{"Հնդկաչինական ժամանակ"}
+ }
+ "meta:Indonesia_Central"{
+ ls{"Կենտրոնական Ինդոնեզիայի ժամանակ"}
+ }
+ "meta:Indonesia_Eastern"{
+ ls{"Արևելյան Ինդոնեզիայի ժամանակ"}
+ }
+ "meta:Indonesia_Western"{
+ ls{"Արևմտյան Ինդոնեզիայի ժամանակ"}
+ }
+ "meta:Iran"{
+ ld{"Պարսկաստանի ամառային ժամանակ"}
+ lg{"Պարսկաստանի ժամանակ"}
+ ls{"Պարսկաստանի ստանդարտ ժամանակ"}
+ }
+ "meta:Irkutsk"{
+ ld{"Իրկուտսկի ամառային ժամանակ"}
+ lg{"Իրկուտսկի ժամանակ"}
+ ls{"Իրկուտսկի ստանդարտ ժամանակ"}
+ }
+ "meta:Israel"{
+ ld{"Իսրայելի ամառային ժամանակ"}
+ lg{"Իսրայելի ժամանակ"}
+ ls{"Իսրայելի ստանդարտ ժամանակ"}
+ }
+ "meta:Japan"{
+ ld{"Ճապոնիայի ամառային ժամանակ"}
+ lg{"Ճապոնիայի ժամանակ"}
+ ls{"Ճապոնիայի ստանդարտ ժամանակ"}
+ }
+ "meta:Kazakhstan_Eastern"{
+ ls{"Արևելյան Ղազախստանի ժամանակ"}
+ }
+ "meta:Kazakhstan_Western"{
+ ls{"Արևմտյան Ղազախստանի ժամանակ"}
+ }
+ "meta:Korea"{
+ ld{"Կորեայի ամառային ժամանակ"}
+ lg{"Կորեայի ժամանակ"}
+ ls{"Կորեայի ստանդարտ ժամանակ"}
+ }
+ "meta:Kosrae"{
+ ls{"Կոսրաեյի ժամանակ"}
+ }
+ "meta:Krasnoyarsk"{
+ ld{"Կրասնոյարսկի ամառային ժամանակ"}
+ lg{"Կրասնոյարսկի ժամանակ"}
+ ls{"Կրասնոյարսկի ստանդարտ ժամանակ"}
+ }
+ "meta:Kyrgystan"{
+ ls{"Ղրղզստանի ժամանակ"}
+ }
+ "meta:Line_Islands"{
+ ls{"Լայն կղզիների ժամանակ"}
+ }
+ "meta:Lord_Howe"{
+ ld{"Լորդ Հաուի ամառային ժամանակ"}
+ lg{"Լորդ Հաուի ժամանակ"}
+ ls{"Լորդ Հաուի ստանդարտ ժամանակ"}
+ }
+ "meta:Macquarie"{
+ ls{"Մակկուորի կղզու ժամանակ"}
+ }
+ "meta:Magadan"{
+ ld{"Մագադանի ամառային ժամանակ"}
+ lg{"Մագադանի ժամանակ"}
+ ls{"Մագադանի ստանդարտ ժամանակ"}
+ }
+ "meta:Malaysia"{
+ ls{"Մալայզիայի ժամանակ"}
+ }
+ "meta:Maldives"{
+ ls{"Մալդիվյան կղզիների ժամանակ"}
+ }
+ "meta:Marquesas"{
+ ls{"Մարկիզյան կղզիների ժամանակ"}
+ }
+ "meta:Marshall_Islands"{
+ ls{"Մարշալյան կղզիների ժամանակ"}
+ }
+ "meta:Mauritius"{
+ ld{"Մավրիկիոսի ամառային ժամանակ"}
+ lg{"Մավրիկիոսի ժամանակ"}
+ ls{"Մավրիկիոսի ստանդարտ ժամանակ"}
+ }
+ "meta:Mawson"{
+ ls{"Մոուսոնի ժամանակ"}
+ }
+ "meta:Mongolia"{
+ ld{"Ուլան-Բատորի ամառային ժամանակ"}
+ lg{"Ուլան-Բատորի ժամանակ"}
+ ls{"Ուլան-Բատորի ստանդարտ ժամանակ"}
+ }
+ "meta:Moscow"{
+ ld{"Մոսկվայի ամառային ժամանակ"}
+ lg{"Մոսկվայի ժամանակ"}
+ ls{"Մոսկվայի ստանդարտ ժամանակ"}
+ }
+ "meta:Myanmar"{
+ ls{"Մյանմայի ժամանակ"}
+ }
+ "meta:Nauru"{
+ ls{"Նաուրուի ժամանակ"}
+ }
+ "meta:Nepal"{
+ ls{"Նեպալի ժամանակ"}
+ }
+ "meta:New_Caledonia"{
+ ld{"Նոր Կալեդոնիայի ամառային ժամանակ"}
+ lg{"Նոր Կալեդոնիայի ժամանակ"}
+ ls{"Նոր Կալեդոնիայի ստանդարտ ժամանակ"}
+ }
+ "meta:New_Zealand"{
+ ld{"Նոր Զելանդիայի ամառային ժամանակ"}
+ lg{"Նոր Զելանդիայի ժամանակ"}
+ ls{"Նոր Զելանդիայի ստանդարտ ժամանակ"}
+ }
+ "meta:Newfoundland"{
+ ld{"Նյուֆաունդլենդի ամառային ժամանակ"}
+ lg{"Նյուֆաունդլենդի ժամանակ"}
+ ls{"Նյուֆաունդլենդի ստանդարտ ժամանակ"}
+ }
+ "meta:Niue"{
+ ls{"Նիուեյի ժամանակ"}
+ }
+ "meta:Norfolk"{
+ ls{"Նորֆոլկ կղզու ժամանակ"}
+ }
+ "meta:Noronha"{
+ ld{"Ֆերնանդու դի Նորոնյայի ամառային ժամանակ"}
+ lg{"Ֆերնանդու դի Նորոնյայի ժամանակ"}
+ ls{"Ֆերնանդու դի Նորոնյայի ստանդարտ ժամանակ"}
+ }
+ "meta:Novosibirsk"{
+ ld{"Նովոսիբիրսկի ամառային ժամանակ"}
+ lg{"Նովոսիբիրսկի ժամանակ"}
+ ls{"Նովոսիբիրսկի ստանդարտ ժամանակ"}
+ }
+ "meta:Omsk"{
+ ld{"Օմսկի ամառային ժամանակ"}
+ lg{"Օմսկի ժամանակ"}
+ ls{"Օմսկի ստանդարտ ժամանակ"}
+ }
+ "meta:Pakistan"{
+ ld{"Պակիստանի ամառային ժամանակ"}
+ lg{"Պակիստանի ժամանակ"}
+ ls{"Պակիստանի ստանդարտ ժամանակ"}
+ }
+ "meta:Palau"{
+ ls{"Պալաույի ժամանակ"}
+ }
+ "meta:Papua_New_Guinea"{
+ ls{"Պապուա Նոր Գվինեայի ժամանակ"}
+ }
+ "meta:Paraguay"{
+ ld{"Պարագվայի ամառային ժամանակ"}
+ lg{"Պարագվայի ժամանակ"}
+ ls{"Պարագվայի ստանդարտ ժամանակ"}
+ }
+ "meta:Peru"{
+ ld{"Պերուի ամառային ժամանակ"}
+ lg{"Պերուի ժամանակ"}
+ ls{"Պերուի ստանդարտ ժամանակ"}
+ }
+ "meta:Philippines"{
+ ld{"Ֆիլիպինների ամառային ժամանակ"}
+ lg{"Ֆիլիպինների ժամանակ"}
+ ls{"Ֆիլիպինների ստանդարտ ժամանակ"}
+ }
+ "meta:Phoenix_Islands"{
+ ls{"Ֆինիքս կղզիների ժամանակ"}
+ }
+ "meta:Pierre_Miquelon"{
+ ld{"Սեն Պիեր և Միկելոնի ամառային ժամանակ"}
+ lg{"Սեն Պիեր և Միկելոնի ժամանակ"}
+ ls{"Սեն Պիեր և Միկելոնի ստանդարտ ժամանակ"}
+ }
+ "meta:Pitcairn"{
+ ls{"Պիտկերնի ժամանակ"}
+ }
+ "meta:Ponape"{
+ ls{"Պոնապե կղզու ժամանակ"}
+ }
+ "meta:Reunion"{
+ ls{"Ռեյունիոնի ժամանակ"}
+ }
+ "meta:Rothera"{
+ ls{"Ռոտերայի ժամանակ"}
+ }
+ "meta:Sakhalin"{
+ ld{"Սախալինի ամառային ժամանակ"}
+ lg{"Սախալինի ժամանակ"}
+ ls{"Սախալինի ստանդարտ ժամանակ"}
+ }
+ "meta:Samoa"{
+ ld{"Սամոայի ամառային ժամանակ"}
+ lg{"Սամոայի ժամանակ"}
+ ls{"Սամոայի ստանդարտ ժամանակ"}
+ }
+ "meta:Seychelles"{
+ ls{"Սեյշելյան կղզիների ժամանակ"}
+ }
+ "meta:Singapore"{
+ ls{"Սինգապուրի ժամանակ"}
+ }
+ "meta:Solomon"{
+ ls{"Սողոմոնյան կղզիների ժամանակ"}
+ }
+ "meta:South_Georgia"{
+ ls{"Հարավային Ջորջիայի ժամանակ"}
+ }
+ "meta:Syowa"{
+ ls{"Սյովայի ժամանակ"}
+ }
+ "meta:Tahiti"{
+ ls{"Թաիթիի ժամանակ"}
+ }
+ "meta:Taipei"{
+ ld{"Թայպեյի ամառային ժամանակ"}
+ lg{"Թայպեյի ժամանակ"}
+ ls{"Թայպեյի ստանդարտ ժամանակ"}
+ }
+ "meta:Tajikistan"{
+ ls{"Տաջիկստանի ժամանակ"}
+ }
+ "meta:Tokelau"{
+ ls{"Տոկելաույի ժամանակ"}
+ }
+ "meta:Tonga"{
+ ld{"Տոնգայի ամառային ժամանակ"}
+ lg{"Տոնգայի ժամանակ"}
+ ls{"Տոնգայի ստանդարտ ժամանակ"}
+ }
+ "meta:Truk"{
+ ls{"Չուուկի ժամանակ"}
+ }
+ "meta:Turkmenistan"{
+ ld{"Թուրքմենստանի ամառային ժամանակ"}
+ lg{"Թուրքմենստանի ժամանակ"}
+ ls{"Թուրքմենստանի ստանդարտ ժամանակ"}
+ }
+ "meta:Tuvalu"{
+ ls{"Տուվալույի ժամանակ"}
+ }
+ "meta:Uruguay"{
+ ld{"Ուրուգվայի ամառային ժամանակ"}
+ lg{"Ուրուգվայի ժամանակ"}
+ ls{"Ուրուգվայի ստանդարտ ժամանակ"}
+ }
+ "meta:Uzbekistan"{
+ ld{"Ուզբեկստանի ամառային ժամանակ"}
+ lg{"Ուզբեկստանի ժամանակ"}
+ ls{"Ուզբեկստանի ստանդարտ ժամանակ"}
+ }
+ "meta:Vanuatu"{
+ ld{"Վանուատույի ամառային ժամանակ"}
+ lg{"Վանուատույի ժամանակ"}
+ ls{"Վանուատույի ստանդարտ ժամանակ"}
+ }
+ "meta:Venezuela"{
+ ls{"Վենեսուելայի ժամանակ"}
+ }
+ "meta:Vladivostok"{
+ ld{"Վլադիվոստոկի ամառային ժամանակ"}
+ lg{"Վլադիվոստոկի ժամանակ"}
+ ls{"Վլադիվոստոկի ստանդարտ ժամանակ"}
+ }
+ "meta:Volgograd"{
+ ld{"Վոլգոգրադի ամառային ժամանակ"}
+ lg{"Վոլգոգրադի ժամանակ"}
+ ls{"Վոլգոգրադի ստանդարտ ժամանակ"}
+ }
+ "meta:Vostok"{
+ ls{"Վոստոկի ժամանակ"}
+ }
+ "meta:Wake"{
+ ls{"Ուեյք կղզու ժամանակ"}
+ }
+ "meta:Wallis"{
+ ls{"Ուոլիս և Ֆուտունայի ժամանակ"}
+ }
+ "meta:Yakutsk"{
+ ld{"Յակուտսկի ամառային ժամանակ"}
+ lg{"Յակուտսկի ժամանակ"}
+ ls{"Յակուտսկի ստանդարտ ժամանակ"}
+ }
+ "meta:Yekaterinburg"{
+ ld{"Եկատերինբուրգի ամառային ժամանակ"}
+ lg{"Եկատերինբուրգի ժամանակ"}
+ ls{"Եկատերինբուրգի ստանդարտ ժամանակ"}
+ }
+ fallbackFormat{"{1} ({0})"}
+ fallbackRegionFormat{"{1} ({0})"}
+ gmtFormat{"GMT{0}"}
+ gmtZeroFormat{"GMT"}
+ hourFormat{"+HH:mm;-HH:mm"}
regionFormat{"Ժամանակ՝ {0}"}
}
}
diff --git a/data/zone/id.txt b/data/zone/id.txt
index 960c99f..e349aa7 100644
--- a/data/zone/id.txt
+++ b/data/zone/id.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/id.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/id.xml
*/
id{
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
zoneStrings{
"Africa:Accra"{
ec{"Akra"}
@@ -295,21 +295,11 @@
lg{"Waktu Afrika Barat"}
ls{"Waktu Standar Afrika Barat"}
}
- "meta:Aktyubinsk"{
- ld{"Waktu Musim Panas Aktyubinsk"}
- lg{"Waktu Aktyubinsk"}
- ls{"Waktu Standar Aktyubinsk"}
- }
"meta:Alaska"{
ld{"Waktu Terang Alaska"}
lg{"Waktu Alaska"}
ls{"Waktu Standar Alaska"}
}
- "meta:Alaska_Hawaii"{
- ld{"Waktu Terang Alaska-Hawaii"}
- lg{"Waktu Alaska-Hawaii"}
- ls{"Waktu Standar Alaska-Hawaii"}
- }
"meta:Almaty"{
ld{"Waktu Musim Panas Almaty"}
lg{"Waktu Almaty"}
@@ -375,11 +365,6 @@
lg{"Waktu Armenia"}
ls{"Waktu Standar Armenia"}
}
- "meta:Ashkhabad"{
- ld{"Waktu Musim Panas Ashkhabad"}
- lg{"Waktu Ashkhabad"}
- ls{"Waktu Standar Ashkhabad"}
- }
"meta:Atlantic"{
ld{"Waktu Terang Atlantik"}
lg{"Waktu Atlantik"}
@@ -415,32 +400,17 @@
lg{"Waktu Azores"}
ls{"Waktu Standar Azores"}
}
- "meta:Baku"{
- ld{"Waktu Musim Panas Kota Baku"}
- lg{"Waktu Kota Baku"}
- ls{"Waktu Standar Kota Baku"}
- }
"meta:Bangladesh"{
ld{"Waktu Musim Panas Bangladesh"}
lg{"Waktu Bangladesh"}
ls{"Waktu Standar Bangladesh"}
}
- "meta:Bering"{
- ld{"Waktu Terang Bering"}
- lg{"Waktu Bering"}
- ls{"Waktu Standar Bering"}
- }
"meta:Bhutan"{
ls{"Waktu Bhutan"}
}
"meta:Bolivia"{
ls{"Waktu Bolivia"}
}
- "meta:Borneo"{
- ld{"Waktu Musim Panas Kalimantan"}
- lg{"Waktu Kalimantan"}
- ls{"Waktu Standar Kalimantan"}
- }
"meta:Brasilia"{
ld{"Waktu Musim Panas Brasil"}
lg{"Waktu Brasil"}
@@ -460,9 +430,6 @@
"meta:Chamorro"{
ls{"Waktu Chamorro"}
}
- "meta:Changbai"{
- ls{"Waktu Changbai"}
- }
"meta:Chatham"{
ld{"Waktu Terang Chatham"}
lg{"Waktu Chatham"}
@@ -504,23 +471,12 @@
lg{"Waktu Kuba"}
ls{"Waktu Standar Kuba"}
}
- "meta:Dacca"{
- ls{"Waktu Dhaka"}
- }
"meta:Davis"{
ls{"Waktu Davis"}
}
"meta:DumontDUrville"{
ls{"Waktu Dumont-d’Urville"}
}
- "meta:Dushanbe"{
- ld{"Waktu Musim Panas Dushanbe"}
- lg{"Waktu Dushanbe"}
- ls{"Waktu Standar Dushanbe"}
- }
- "meta:Dutch_Guiana"{
- ls{"Waktu Guyana Belanda"}
- }
"meta:East_Timor"{
ls{"Waktu Timor Leste"}
}
@@ -563,11 +519,6 @@
"meta:French_Southern"{
ls{"Waktu Antartika dan Selatan Prancis"}
}
- "meta:Frunze"{
- ld{"Waktu Musim Panas Frunze"}
- lg{"Waktu Frunze"}
- ls{"Waktu Standar Frunze"}
- }
"meta:GMT"{
ls{"Waktu Rata-Rata Greenwich"}
}
@@ -585,11 +536,6 @@
"meta:Gilbert_Islands"{
ls{"Waktu Kep. Gilbert"}
}
- "meta:Greenland_Central"{
- ld{"Waktu Musim Panas Greenland Tengah"}
- lg{"Waktu Greenland Tengah"}
- ls{"Waktu Standar Greenland Tengah"}
- }
"meta:Greenland_Eastern"{
ld{"Waktu Musim Panas Greenland Timur"}
lg{"Waktu Greenland Timur"}
@@ -670,23 +616,12 @@
lg{"Waktu Petropavlovsk-Kamchatsky"}
ls{"Waktu Standar Petropavlovsk-Kamchatsky"}
}
- "meta:Karachi"{
- ls{"Waktu Karachi"}
- }
- "meta:Kashgar"{
- ls{"Waktu Kashgar"}
- }
"meta:Kazakhstan_Eastern"{
ls{"Waktu Kazakhstan Timur"}
}
"meta:Kazakhstan_Western"{
ls{"Waktu Kazakhstan Barat"}
}
- "meta:Kizilorda"{
- ld{"Waktu Musim Panas Kizilorda"}
- lg{"Waktu Kizilorda"}
- ls{"Waktu Standar Kizilorda"}
- }
"meta:Korea"{
ld{"Waktu Musim Panas Korea"}
lg{"Waktu Korea"}
@@ -700,14 +635,6 @@
lg{"Waktu Krasnoyarsk"}
ls{"Waktu Standar Krasnoyarsk"}
}
- "meta:Kuybyshev"{
- ld{"Waktu Musim Panas Kuibyshev"}
- lg{"Waktu Kuibyshev"}
- ls{"Waktu Standar Kuibyshev"}
- }
- "meta:Kwajalein"{
- ls{"Waktu Kwajalein"}
- }
"meta:Kyrgystan"{
ls{"Waktu Kirghizia"}
}
@@ -717,9 +644,6 @@
"meta:Line_Islands"{
ls{"Waktu Kep. Line"}
}
- "meta:Long_Shu"{
- ls{"Waktu Long-Shu"}
- }
"meta:Lord_Howe"{
ld{"Waktu Terang Lord Howe"}
lg{"Waktu Lord Howe"}
@@ -738,9 +662,6 @@
lg{"Waktu Magadan"}
ls{"Waktu Standar Magadan"}
}
- "meta:Malaya"{
- ls{"Waktu Malaya"}
- }
"meta:Malaysia"{
ls{"Waktu Malaysia"}
}
@@ -880,22 +801,14 @@
lg{"Waktu Samara"}
ls{"Waktu Standar Samara"}
}
- "meta:Samarkand"{
- ld{"Waktu Musim Panas Samarkand"}
- lg{"Waktu Samarkand"}
- ls{"Waktu Standar Samarkand"}
- }
"meta:Samoa"{
- ls{"Waktu Samoa"}
+ ld{"Waktu Musim Panas Samoa"}
+ lg{"Waktu Samoa"}
+ ls{"Waktu Standar Samoa"}
}
"meta:Seychelles"{
ls{"Waktu Seychelles"}
}
- "meta:Shevchenko"{
- ld{"Waktu Musim Panas Shevchenko"}
- lg{"Waktu Shevchenko"}
- ls{"Waktu Standar Shevchenko"}
- }
"meta:Singapore"{
ls{"Waktu Standar Singapura"}
}
@@ -908,11 +821,6 @@
"meta:Suriname"{
ls{"Waktu Suriname"}
}
- "meta:Sverdlovsk"{
- ld{"Waktu Musim Panas Sverdlovsk"}
- lg{"Waktu Sverdlovsk"}
- ls{"Waktu Standar Sverdlovsk"}
- }
"meta:Syowa"{
ls{"Waktu Syowa"}
}
@@ -927,16 +835,6 @@
"meta:Tajikistan"{
ls{"Waktu Tajikistan"}
}
- "meta:Tashkent"{
- ld{"Waktu Musim Panas Tashkent"}
- lg{"Waktu Tashkent"}
- ls{"Waktu Standar Tashkent"}
- }
- "meta:Tbilisi"{
- ld{"Waktu Musim Panas Tbilisi"}
- lg{"Waktu Tbilisi"}
- ls{"Waktu Standar Tbilisi"}
- }
"meta:Tokelau"{
ls{"Waktu Tokelau"}
}
@@ -948,11 +846,6 @@
"meta:Truk"{
ls{"Waktu Chuuk"}
}
- "meta:Turkey"{
- ld{"Waktu Musim Panas Turki"}
- lg{"Waktu Turki"}
- ls{"Waktu Standar Turki"}
- }
"meta:Turkmenistan"{
ld{"Waktu Musim Panas Turkimenistan"}
lg{"Waktu Turkimenistan"}
@@ -961,19 +854,11 @@
"meta:Tuvalu"{
ls{"Waktu Tuvalu"}
}
- "meta:Uralsk"{
- ld{"Waktu Musim Panas Uralʹsk"}
- lg{"Waktu Uralʹsk"}
- ls{"Waktu Standar Uralʹsk"}
- }
"meta:Uruguay"{
ld{"Waktu Musim Panas Uruguay"}
lg{"Waktu Uruguay"}
ls{"Waktu Standar Uruguay"}
}
- "meta:Urumqi"{
- ls{"Waktu Urumqi"}
- }
"meta:Uzbekistan"{
ld{"Waktu Musim Panas Uzbekistan"}
lg{"Waktu Uzbekistan"}
@@ -1016,16 +901,6 @@
lg{"Waktu Yekaterinburg"}
ls{"Waktu Standar Yekaterinburg"}
}
- "meta:Yerevan"{
- ld{"Waktu Musim Panas Yerevan"}
- lg{"Waktu Yerevan"}
- ls{"Waktu Standar Yerevan"}
- }
- "meta:Yukon"{
- ld{"Waktu Terang Yukon"}
- lg{"Waktu Yukon"}
- ls{"Waktu Standar Yukon"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"Waktu {1} ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/id_ID.txt b/data/zone/id_ID.txt
index 6593209..85fc819 100644
--- a/data/zone/id_ID.txt
+++ b/data/zone/id_ID.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/ig.txt b/data/zone/ig.txt
index 465e178..0df3442 100755
--- a/data/zone/ig.txt
+++ b/data/zone/ig.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ig.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/ig.xml
*/
ig{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/ii.txt b/data/zone/ii.txt
index 5b0a207..185ee09 100644
--- a/data/zone/ii.txt
+++ b/data/zone/ii.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ii.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/ii.xml
*/
ii{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
zoneStrings{
"Etc:Unknown"{
ec{"ꅉꀋꐚꌠ"}
diff --git a/data/zone/in.txt b/data/zone/in.txt
index cb3e2e0..2a3360a 100644
--- a/data/zone/in.txt
+++ b/data/zone/in.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/in_ID.txt b/data/zone/in_ID.txt
index d22885f..bc2b4af 100644
--- a/data/zone/in_ID.txt
+++ b/data/zone/in_ID.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/is.txt b/data/zone/is.txt
index 5ccf394..51a921a 100644
--- a/data/zone/is.txt
+++ b/data/zone/is.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/is.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/is.xml
*/
is{
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Algiers"{
ec{"Algeirsborg"}
@@ -733,6 +733,8 @@
ls{"Staðaltími í Samara"}
}
"meta:Samoa"{
+ ld{"Sumartími í Samóa"}
+ lg{"Tími í Samóa"}
ls{"Staðaltími á Samóa"}
}
"meta:Seychelles"{
diff --git a/data/zone/it.txt b/data/zone/it.txt
index 1d6afff..8b1282c 100644
--- a/data/zone/it.txt
+++ b/data/zone/it.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/it.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/it.xml
*/
it{
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Addis_Ababa"{
ec{"Addis Abeba"}
@@ -737,7 +737,8 @@
"meta:Seychelles"{
ls{"Ora delle Seychelles"}
}
- "meta:Suriname"{
+
+ "meta:Suriname"{
ls{"Ora del Suriname"}
}
"meta:Syowa"{
diff --git a/data/zone/iw.txt b/data/zone/iw.txt
index c10c184..8352a34 100644
--- a/data/zone/iw.txt
+++ b/data/zone/iw.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/iw_IL.txt b/data/zone/iw_IL.txt
index 6963f2d..5a4954b 100644
--- a/data/zone/iw_IL.txt
+++ b/data/zone/iw_IL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/ja.txt b/data/zone/ja.txt
index 1ca5dae..ef7e8b3 100644
--- a/data/zone/ja.txt
+++ b/data/zone/ja.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ja.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/ja.xml
*/
ja{
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
zoneStrings{
"Africa:Abidjan"{
ec{"アビジャン"}
@@ -909,51 +909,6 @@
"Australia:Sydney"{
ec{"シドニー"}
}
- "Etc:GMT"{
- ec{"グリニッジ標準時[GMT]"}
- }
- "Etc:GMT-1"{
- ec{"グリニッジ標準時[GMT]-1"}
- }
- "Etc:GMT-10"{
- ec{"グリニッジ標準時[GMT]-10"}
- }
- "Etc:GMT-11"{
- ec{"グリニッジ標準時[GMT]-11"}
- }
- "Etc:GMT-12"{
- ec{"グリニッジ標準時[GMT]-12"}
- }
- "Etc:GMT-13"{
- ec{"グリニッジ標準時[GMT]-13"}
- }
- "Etc:GMT-14"{
- ec{"グリニッジ標準時[GMT]-14"}
- }
- "Etc:GMT-2"{
- ec{"グリニッジ標準時[GMT]-2"}
- }
- "Etc:GMT-3"{
- ec{"グリニッジ標準時[GMT]-3"}
- }
- "Etc:GMT-4"{
- ec{"グリニッジ標準時[GMT]-4"}
- }
- "Etc:GMT-5"{
- ec{"グリニッジ標準時[GMT]-5"}
- }
- "Etc:GMT-6"{
- ec{"グリニッジ標準時[GMT]-6"}
- }
- "Etc:GMT-7"{
- ec{"グリニッジ標準時[GMT]-7"}
- }
- "Etc:GMT-8"{
- ec{"グリニッジ標準時[GMT]-8"}
- }
- "Etc:GMT-9"{
- ec{"グリニッジ標準時[GMT]-9"}
- }
"Etc:Unknown"{
ec{"地域不明"}
}
@@ -1293,21 +1248,11 @@
lg{"西アフリカ時間"}
ls{"西アフリカ標準時"}
}
- "meta:Aktyubinsk"{
- ld{"アクチュービンスク夏時間"}
- lg{"アクチュービンスク時間"}
- ls{"アクチュービンスク標準時"}
- }
"meta:Alaska"{
ld{"アラスカ夏時間"}
lg{"アラスカ時間"}
ls{"アラスカ標準時"}
}
- "meta:Alaska_Hawaii"{
- ld{"アラスカ・ハワイ夏時間"}
- lg{"アラスカ・ハワイ時間"}
- ls{"アラスカ・ハワイ標準時"}
- }
"meta:Almaty"{
ld{"アルマトイ夏時間"}
lg{"アルトマイ時間"}
@@ -1373,11 +1318,6 @@
lg{"アルメニア時間"}
ls{"アルメニア標準時"}
}
- "meta:Ashkhabad"{
- ld{"アシガバート夏時間"}
- lg{"アシガバート時間"}
- ls{"アシガバート標準時"}
- }
"meta:Atlantic"{
ld{"大西洋夏時間"}
lg{"大西洋時間"}
@@ -1413,32 +1353,17 @@
lg{"アゾレス時間"}
ls{"アゾレス標準時"}
}
- "meta:Baku"{
- ld{"バクー夏時間"}
- lg{"バクー時間"}
- ls{"バクー標準時"}
- }
"meta:Bangladesh"{
ld{"バングラデシュ夏時間"}
lg{"バングラデシュ時間"}
ls{"バングラデシュ標準時"}
}
- "meta:Bering"{
- ld{"ベーリング夏時間"}
- lg{"ベーリング時間"}
- ls{"ベーリング標準時"}
- }
"meta:Bhutan"{
ls{"ブータン時間"}
}
"meta:Bolivia"{
ls{"ボリビア時間"}
}
- "meta:Borneo"{
- ld{"ボルネオ夏時間"}
- lg{"ボルネオ時間"}
- ls{"ボルネオ標準時"}
- }
"meta:Brasilia"{
ld{"ブラジリア夏時間"}
lg{"ブラジリア時間"}
@@ -1455,9 +1380,6 @@
"meta:Chamorro"{
ls{"チャモロ時間"}
}
- "meta:Changbai"{
- ls{"チャンバイ時間"}
- }
"meta:Chatham"{
ld{"チャタム夏時間"}
lg{"チャタム時間"}
@@ -1499,23 +1421,12 @@
lg{"キューバ時間"}
ls{"キューバ標準時"}
}
- "meta:Dacca"{
- ls{"ダッカ時間"}
- }
"meta:Davis"{
ls{"デービス基地時間"}
}
"meta:DumontDUrville"{
ls{"デュモン・デュルヴィル基地時間"}
}
- "meta:Dushanbe"{
- ld{"ドゥシャンベ夏時間"}
- lg{"ドゥシャンベ時間"}
- ls{"ドゥシャンベ標準時"}
- }
- "meta:Dutch_Guiana"{
- ls{"オランダ領ギアナ標準時"}
- }
"meta:East_Timor"{
ls{"東ティモール時間"}
}
@@ -1558,11 +1469,6 @@
"meta:French_Southern"{
ls{"仏領南方南極時間"}
}
- "meta:Frunze"{
- ld{"フルンゼ夏時間"}
- lg{"フルンゼ時間"}
- ls{"フルンゼ標準時"}
- }
"meta:GMT"{
ls{"グリニッジ標準時"}
}
@@ -1580,11 +1486,6 @@
"meta:Gilbert_Islands"{
ls{"ギルバート諸島時間"}
}
- "meta:Greenland_Central"{
- ld{"グリーンランド中部夏時間"}
- lg{"グリーンランド中部時間"}
- ls{"グリーンランド中部標準時"}
- }
"meta:Greenland_Eastern"{
ld{"グリーンランド東部夏時間"}
lg{"グリーンランド東部時間"}
@@ -1657,7 +1558,7 @@
lg{"日本時間"}
ls{"日本標準時"}
sd{"JDT"}
- sg{"∅∅∅"}
+ sg{"JT"}
ss{"JST"}
}
"meta:Kamchatka"{
@@ -1665,23 +1566,12 @@
lg{"ペトロパブロフスク・カムチャツキー時間"}
ls{"ペトロパブロフスク・カムチャツキー標準時"}
}
- "meta:Karachi"{
- ls{"カラチ時間"}
- }
- "meta:Kashgar"{
- ls{"カシュガル時間"}
- }
"meta:Kazakhstan_Eastern"{
ls{"東カザフスタン時間"}
}
"meta:Kazakhstan_Western"{
ls{"西カザフスタン時間"}
}
- "meta:Kizilorda"{
- ld{"キジロルダ夏時間"}
- lg{"キジロルダ時間"}
- ls{"キジロルダ標準時"}
- }
"meta:Korea"{
ld{"韓国夏時間"}
lg{"韓国時間"}
@@ -1695,14 +1585,6 @@
lg{"クラスノヤルスク時間"}
ls{"クラスノヤルスク標準時"}
}
- "meta:Kuybyshev"{
- ld{"クイビシェフ夏時間"}
- lg{"クイビシェフ時間"}
- ls{"クイビシェフ標準時"}
- }
- "meta:Kwajalein"{
- ls{"クェゼリン時間"}
- }
"meta:Kyrgystan"{
ls{"キルギスタン時間"}
}
@@ -1730,9 +1612,6 @@
lg{"マガダン時間"}
ls{"マガダン標準時"}
}
- "meta:Malaya"{
- ls{"マラヤ時間"}
- }
"meta:Malaysia"{
ls{"マレーシア時間"}
}
@@ -1872,22 +1751,14 @@
lg{"サマラ時間"}
ls{"サマラ標準時"}
}
- "meta:Samarkand"{
- ld{"サマルカンド夏時間"}
- lg{"サマルカンド時間"}
- ls{"サマルカンド標準時"}
- }
"meta:Samoa"{
- ls{"サモア時間"}
+ ld{"サモア夏時間"}
+ lg{"サモア時間"}
+ ls{"サモア標準時"}
}
"meta:Seychelles"{
ls{"セーシェル時間"}
}
- "meta:Shevchenko"{
- ld{"シェフチェンコ夏時間"}
- lg{"シェフチェンコ時間"}
- ls{"シェフチェンコ標準時"}
- }
"meta:Singapore"{
ls{"シンガポール時間"}
}
@@ -1914,16 +1785,6 @@
"meta:Tajikistan"{
ls{"タジキスタン時間"}
}
- "meta:Tashkent"{
- ld{"タシュケント夏時間"}
- lg{"タシュケント時間"}
- ls{"タシュケント標準時"}
- }
- "meta:Tbilisi"{
- ld{"トビリシ夏時間"}
- lg{"トビリシ時間"}
- ls{"トビリシ標準時"}
- }
"meta:Tokelau"{
ls{"トケラウ時間"}
}
@@ -1935,11 +1796,6 @@
"meta:Truk"{
ls{"チューク時間"}
}
- "meta:Turkey"{
- ld{"トルコ夏時間"}
- lg{"トルコ時間"}
- ls{"トルコ標準時"}
- }
"meta:Turkmenistan"{
ld{"トルクメニスタン夏時間"}
lg{"トルクメニスタン時間"}
@@ -1948,19 +1804,11 @@
"meta:Tuvalu"{
ls{"ツバル時間"}
}
- "meta:Uralsk"{
- ld{"オラル夏時間"}
- lg{"オラル時間"}
- ls{"オラル標準時"}
- }
"meta:Uruguay"{
ld{"ウルグアイ夏時間"}
lg{"ウルグアイ時間"}
ls{"ウルグアイ標準時"}
}
- "meta:Urumqi"{
- ls{"ウルムチ時間"}
- }
"meta:Uzbekistan"{
ld{"ウズベキスタン夏時間"}
lg{"ウズベキスタン時間"}
@@ -2003,16 +1851,6 @@
lg{"エカテリンブルグ時間"}
ls{"エカテリンブルグ標準時"}
}
- "meta:Yerevan"{
- ld{"エレバン夏時間"}
- lg{"エレバン時間"}
- ls{"エレバン標準時"}
- }
- "meta:Yukon"{
- ld{"ユーコン夏時間"}
- lg{"ユーコン時間"}
- ls{"ユーコン標準時"}
- }
fallbackFormat{"{1}（{0}）"}
fallbackRegionFormat{"{1}時間（{0}）"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/ja_JP.txt b/data/zone/ja_JP.txt
index c049867..c0ce246 100644
--- a/data/zone/ja_JP.txt
+++ b/data/zone/ja_JP.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/ja_JP_TRADITIONAL.txt b/data/zone/ja_JP_TRADITIONAL.txt
index ca942f1..e95c34a 100644
--- a/data/zone/ja_JP_TRADITIONAL.txt
+++ b/data/zone/ja_JP_TRADITIONAL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/jgo.txt b/data/zone/jgo.txt
index 7b41bf7..6650904 100755
--- a/data/zone/jgo.txt
+++ b/data/zone/jgo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/jgo.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/jgo.xml
*/
jgo{
- Version{"2.0.77.53"}
+ Version{"2.0.82.45"}
zoneStrings{
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"{1} ({0})"}
diff --git a/data/zone/jmc.txt b/data/zone/jmc.txt
index e800fbf..79dcac5 100755
--- a/data/zone/jmc.txt
+++ b/data/zone/jmc.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/jmc.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/jmc.xml
*/
jmc{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/ka.txt b/data/zone/ka.txt
index 8a57793..0a105c0 100644
--- a/data/zone/ka.txt
+++ b/data/zone/ka.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ka.xml
// *
@@ -10,23 +10,176 @@
* ICU <specials> source: <path>/xml/main/ka.xml
*/
ka{
- Version{"2.0.78.32"}
+ Version{"2.0.82.61"}
zoneStrings{
+ "Africa:Abidjan"{
+ ec{"აბიჯანი"}
+ }
+ "Africa:Accra"{
+ ec{"აკრა"}
+ }
+ "Africa:Addis_Ababa"{
+ ec{"ადის-აბება"}
+ }
+ "Africa:Algiers"{
+ ec{"ალჟირი"}
+ }
+ "Africa:Asmera"{
+ ec{"ასმარა"}
+ }
+ "Africa:Bamako"{
+ ec{"ბამაკო"}
+ }
+ "Africa:Bangui"{
+ ec{"ბანგი"}
+ }
+ "Africa:Banjul"{
+ ec{"ბანჯული"}
+ }
+ "Africa:Bissau"{
+ ec{"ბისაუ"}
+ }
+ "Africa:Blantyre"{
+ ec{"ბლანტირი"}
+ }
+ "Africa:Brazzaville"{
+ ec{"ბრაზავილი"}
+ }
+ "Africa:Bujumbura"{
+ ec{"ბუჯუმბურა"}
+ }
+ "Africa:Cairo"{
+ ec{"კაირო"}
+ }
+ "Africa:Casablanca"{
+ ec{"კასაბლანკა"}
+ }
"Africa:Ceuta"{
ec{"სეუტა"}
}
+ "Africa:Conakry"{
+ ec{"კონაკრი"}
+ }
+ "Africa:Dakar"{
+ ec{"დაკარი"}
+ }
+ "Africa:Dar_es_Salaam"{
+ ec{"დარ-ეს-სალამი"}
+ }
+ "Africa:Djibouti"{
+ ec{"ჯიბუტი"}
+ }
+ "Africa:Douala"{
+ ec{"დუალა"}
+ }
+ "Africa:El_Aaiun"{
+ ec{"ელ-ააიუნი"}
+ }
+ "Africa:Freetown"{
+ ec{"ფრიტაუნი"}
+ }
+ "Africa:Gaborone"{
+ ec{"გაბორონე"}
+ }
+ "Africa:Harare"{
+ ec{"ჰარარე"}
+ }
+ "Africa:Johannesburg"{
+ ec{"იოჰანესბურგი"}
+ }
+ "Africa:Juba"{
+ ec{"ჯუბა"}
+ }
+ "Africa:Kampala"{
+ ec{"კამპალა"}
+ }
+ "Africa:Khartoum"{
+ ec{"ხარტუმი"}
+ }
+ "Africa:Kigali"{
+ ec{"კიგალი"}
+ }
"Africa:Kinshasa"{
ec{"კინშასა"}
}
+ "Africa:Lagos"{
+ ec{"ლაგოსი"}
+ }
+ "Africa:Libreville"{
+ ec{"ლიბრევილი"}
+ }
+ "Africa:Lome"{
+ ec{"ლომე"}
+ }
+ "Africa:Luanda"{
+ ec{"ლუანდა"}
+ }
"Africa:Lubumbashi"{
ec{"ლუბუმბაში"}
}
+ "Africa:Lusaka"{
+ ec{"ლუსაკა"}
+ }
+ "Africa:Malabo"{
+ ec{"მალაბო"}
+ }
+ "Africa:Maputo"{
+ ec{"მაპუტო"}
+ }
+ "Africa:Maseru"{
+ ec{"მასერუ"}
+ }
+ "Africa:Mbabane"{
+ ec{"მბაბანე"}
+ }
+ "Africa:Mogadishu"{
+ ec{"მოგადიშუ"}
+ }
+ "Africa:Monrovia"{
+ ec{"მონროვია"}
+ }
+ "Africa:Nairobi"{
+ ec{"ნაირობი"}
+ }
+ "Africa:Ndjamena"{
+ ec{"ნჯამენა"}
+ }
+ "Africa:Niamey"{
+ ec{"ნიამეი"}
+ }
+ "Africa:Nouakchott"{
+ ec{"ნუაკშოტი"}
+ }
+ "Africa:Ouagadougou"{
+ ec{"უაგადუგუ"}
+ }
+ "Africa:Porto-Novo"{
+ ec{"პორტო-ნოვო"}
+ }
+ "Africa:Sao_Tome"{
+ ec{"სენ-ტომე"}
+ }
+ "Africa:Tripoli"{
+ ec{"ტრიპოლი"}
+ }
+ "Africa:Tunis"{
+ ec{"ტუნისი"}
+ }
+ "Africa:Windhoek"{
+ ec{"ვინდხუკი"}
+ }
"America:Adak"{
ec{"ადაკი"}
}
"America:Anchorage"{
ec{"ენქორაჯი"}
}
+ "America:Anguilla"{
+ ec{"ანგილა"}
+ }
+ "America:Antigua"{
+ ec{"ანტიგუა"}
+ }
"America:Araguaina"{
ec{"არაგუაინა"}
}
@@ -36,11 +189,14 @@
"America:Argentina:Rio_Gallegos"{
ec{"რიო გალეგოსი"}
}
+ "America:Argentina:Salta"{
+ ec{"სალტა"}
+ }
"America:Argentina:San_Juan"{
ec{"სან ხუანი"}
}
"America:Argentina:San_Luis"{
- ec{"სან ლუისი"}
+ ec{"სან-ლუისი"}
}
"America:Argentina:Tucuman"{
ec{"ტუკუმანი"}
@@ -48,23 +204,41 @@
"America:Argentina:Ushuaia"{
ec{"უშუაია"}
}
+ "America:Aruba"{
+ ec{"არუბა"}
+ }
+ "America:Asuncion"{
+ ec{"ასუნსიონი"}
+ }
"America:Bahia"{
ec{"ბაია"}
}
+ "America:Bahia_Banderas"{
+ ec{"ბაჰია ბანდერასი"}
+ }
+ "America:Barbados"{
+ ec{"ბარბადოსი"}
+ }
"America:Belem"{
ec{"ბელემი"}
}
+ "America:Belize"{
+ ec{"ბელიზი"}
+ }
"America:Blanc-Sablon"{
ec{"ბლან-საბლონი"}
}
"America:Boa_Vista"{
ec{"ბოა ვისტა"}
}
+ "America:Bogota"{
+ ec{"ბოგოტა"}
+ }
"America:Boise"{
ec{"ბუასი"}
}
"America:Buenos_Aires"{
- ec{"ბუენოს აირესი"}
+ ec{"ბუენოს-აირესი"}
}
"America:Cambridge_Bay"{
ec{"კემბრიჯ ბეი"}
@@ -75,9 +249,18 @@
"America:Cancun"{
ec{"კანკუნი"}
}
+ "America:Caracas"{
+ ec{"კარაკასი"}
+ }
"America:Catamarca"{
ec{"კატამარკა"}
}
+ "America:Cayenne"{
+ ec{"კაიენა"}
+ }
+ "America:Cayman"{
+ ec{"კაიმანი"}
+ }
"America:Chicago"{
ec{"ჩიკაგო"}
}
@@ -85,14 +268,23 @@
ec{"ჩიჰუაჰუა"}
}
"America:Coral_Harbour"{
- ec{"ქორალ ჰარბორი"}
+ ec{"ატიკოკანი"}
}
"America:Cordoba"{
ec{"კორდობა"}
}
+ "America:Costa_Rica"{
+ ec{"კოსტა-რიკა"}
+ }
+ "America:Creston"{
+ ec{"კრესტონი"}
+ }
"America:Cuiaba"{
ec{"კუიაბა"}
}
+ "America:Curacao"{
+ ec{"კიურასაო"}
+ }
"America:Danmarkshavn"{
ec{"დენმარკშავნი"}
}
@@ -108,35 +300,65 @@
"America:Detroit"{
ec{"დეტროიტი"}
}
+ "America:Dominica"{
+ ec{"დომინიკა"}
+ }
"America:Edmonton"{
ec{"ედმონტონი"}
}
"America:Eirunepe"{
ec{"ეირუნეპე"}
}
+ "America:El_Salvador"{
+ ec{"სალვადორი"}
+ }
"America:Fortaleza"{
ec{"ფორტალეზა"}
}
"America:Glace_Bay"{
ec{"გლეის ბეი"}
}
+ "America:Godthab"{
+ ec{"გოდთები"}
+ }
"America:Goose_Bay"{
ec{"გუზ ბეი"}
}
+ "America:Grand_Turk"{
+ ec{"გრანდ-ტურკი"}
+ }
+ "America:Grenada"{
+ ec{"გრენადა"}
+ }
+ "America:Guadeloupe"{
+ ec{"გვადელუპე"}
+ }
+ "America:Guatemala"{
+ ec{"გვატემალა"}
+ }
+ "America:Guayaquil"{
+ ec{"გუაიაკილი"}
+ }
+ "America:Guyana"{
+ ec{"გაიანა"}
+ }
"America:Halifax"{
ec{"ჰალიფაქსი"}
}
+ "America:Havana"{
+ ec{"ჰავანა"}
+ }
"America:Hermosillo"{
- ec{"ჰერმოსიო"}
+ ec{"ჰერმოსილო"}
}
"America:Indiana:Knox"{
ec{"ნოქსი, ინდიანა"}
}
"America:Indiana:Marengo"{
- ec{"მარენგო"}
+ ec{"მარენგო, ინდიანა"}
}
"America:Indiana:Petersburg"{
- ec{"პიტერსბურგი"}
+ ec{"პიტერსბურგი, ინდიანა"}
}
"America:Indiana:Tell_City"{
ec{"თელ სითი, ინდიანა"}
@@ -159,6 +381,9 @@
"America:Iqaluit"{
ec{"იქალუიტი"}
}
+ "America:Jamaica"{
+ ec{"იამაიკა"}
+ }
"America:Jujuy"{
ec{"ჯუჯუი"}
}
@@ -166,20 +391,44 @@
ec{"ჯუნო"}
}
"America:Kentucky:Monticello"{
- ec{"მონტიჩელო"}
+ ec{"მონტიჩელო, კენტუკი"}
+ }
+ "America:Kralendijk"{
+ ec{"კრალენდიიკი"}
+ }
+ "America:La_Paz"{
+ ec{"ლა-პაზი"}
+ }
+ "America:Lima"{
+ ec{"ლიმა"}
}
"America:Los_Angeles"{
- ec{"ლოს ანჯელესი"}
+ ec{"ლოს-ანჯელესი"}
}
"America:Louisville"{
ec{"ლუისვილი"}
}
+ "America:Lower_Princes"{
+ ec{"ლოერ პრინც კვორტერი"}
+ }
"America:Maceio"{
ec{"მასეიო"}
}
+ "America:Managua"{
+ ec{"მანაგუა"}
+ }
"America:Manaus"{
ec{"მანაუსი"}
}
+ "America:Marigot"{
+ ec{"მარიგო"}
+ }
+ "America:Martinique"{
+ ec{"მარტინიკი"}
+ }
+ "America:Matamoros"{
+ ec{"მატამოროსი"}
+ }
"America:Mazatlan"{
ec{"მაზატლანი"}
}
@@ -192,8 +441,14 @@
"America:Merida"{
ec{"მერიდა"}
}
+ "America:Metlakatla"{
+ ec{"მეტლაკატლა"}
+ }
"America:Mexico_City"{
- ec{"მექსიკო სითი"}
+ ec{"მეხიკო"}
+ }
+ "America:Miquelon"{
+ ec{"მიკელონი"}
}
"America:Moncton"{
ec{"მონქტონი"}
@@ -201,11 +456,20 @@
"America:Monterrey"{
ec{"მონტერეი"}
}
+ "America:Montevideo"{
+ ec{"მონტევიდეო"}
+ }
"America:Montreal"{
ec{"მონრეალი"}
}
+ "America:Montserrat"{
+ ec{"მონსერატი"}
+ }
+ "America:Nassau"{
+ ec{"ნასაუ"}
+ }
"America:New_York"{
- ec{"ნიუ იორკი"}
+ ec{"ნიუ-იორკი"}
}
"America:Nipigon"{
ec{"ნიპიგონი"}
@@ -216,20 +480,41 @@
"America:Noronha"{
ec{"ნორონია"}
}
+ "America:North_Dakota:Beulah"{
+ ec{"ბიულა, ჩრდილოეთი დაკოტა"}
+ }
"America:North_Dakota:Center"{
ec{"ცენტრი, ჩრდილოეთი დაკოტა"}
}
"America:North_Dakota:New_Salem"{
ec{"ნიუ სალემი, ჩრდილოეთი დაკოტა"}
}
+ "America:Ojinaga"{
+ ec{"ოხინაგა"}
+ }
+ "America:Panama"{
+ ec{"პანამა"}
+ }
"America:Pangnirtung"{
ec{"პანგნირტუნგი"}
}
+ "America:Paramaribo"{
+ ec{"პარამარიბო"}
+ }
"America:Phoenix"{
ec{"ფენიქსი"}
}
+ "America:Port-au-Prince"{
+ ec{"პორტ-ა-პრინსი"}
+ }
+ "America:Port_of_Spain"{
+ ec{"პორტ-ოვ-სპეინი"}
+ }
"America:Porto_Velho"{
- ec{"პორტო ველჰო"}
+ ec{"პორტუ-ველიო"}
+ }
+ "America:Puerto_Rico"{
+ ec{"პუერტო-რიკო"}
}
"America:Rainy_River"{
ec{"რეინი რივერი"}
@@ -249,8 +534,20 @@
"America:Rio_Branco"{
ec{"რიო ბრანკო"}
}
+ "America:Santa_Isabel"{
+ ec{"სანტა ისაბელი"}
+ }
+ "America:Santarem"{
+ ec{"სანტარემი"}
+ }
+ "America:Santiago"{
+ ec{"სანტიაგო"}
+ }
+ "America:Santo_Domingo"{
+ ec{"სანტო-დომინგო"}
+ }
"America:Sao_Paulo"{
- ec{"საო პაულო"}
+ ec{"სან-პაულუ"}
}
"America:Scoresbysund"{
ec{"სკორსბისუნდი"}
@@ -258,12 +555,33 @@
"America:Shiprock"{
ec{"შიპროკი"}
}
+ "America:Sitka"{
+ ec{"სიტკა"}
+ }
+ "America:St_Barthelemy"{
+ ec{"სენ-ბართელემი"}
+ }
"America:St_Johns"{
ec{"სენტ ჯონსი"}
}
+ "America:St_Kitts"{
+ ec{"სენტ-კიტსი"}
+ }
+ "America:St_Lucia"{
+ ec{"სენტ-ლუსია"}
+ }
+ "America:St_Thomas"{
+ ec{"სენ-ტომასი"}
+ }
+ "America:St_Vincent"{
+ ec{"სენ-ვინსენტი"}
+ }
"America:Swift_Current"{
ec{"სვიფტ კარენტი"}
}
+ "America:Tegucigalpa"{
+ ec{"ტეგუჩიგალპა"}
+ }
"America:Thule"{
ec{"თულე"}
}
@@ -276,6 +594,9 @@
"America:Toronto"{
ec{"ტორონტო"}
}
+ "America:Tortola"{
+ ec{"ტორტოლა"}
+ }
"America:Vancouver"{
ec{"ვანკუვერი"}
}
@@ -300,6 +621,9 @@
"Antarctica:DumontDUrville"{
ec{"დიუმონ დ'ურვილი"}
}
+ "Antarctica:Macquarie"{
+ ec{"მექვორი"}
+ }
"Antarctica:Mawson"{
ec{"მოუსონი"}
}
@@ -321,9 +645,18 @@
"Antarctica:Vostok"{
ec{"ვოსტოკი"}
}
+ "Arctic:Longyearbyen"{
+ ec{"ლონგირბიენი"}
+ }
+ "Asia:Aden"{
+ ec{"ადენი"}
+ }
"Asia:Almaty"{
ec{"ალმატი"}
}
+ "Asia:Amman"{
+ ec{"ამანი"}
+ }
"Asia:Anadyr"{
ec{"ანადირი"}
}
@@ -333,15 +666,69 @@
"Asia:Aqtobe"{
ec{"აქტობე"}
}
+ "Asia:Ashgabat"{
+ ec{"აშხაბადი"}
+ }
+ "Asia:Baghdad"{
+ ec{"ბაღდადი"}
+ }
+ "Asia:Bahrain"{
+ ec{"ბაჰრეინი"}
+ }
+ "Asia:Baku"{
+ ec{"ბაქო"}
+ }
+ "Asia:Bangkok"{
+ ec{"ბანგკოკი"}
+ }
+ "Asia:Beirut"{
+ ec{"ბეირუთი"}
+ }
+ "Asia:Bishkek"{
+ ec{"ბიშკეკი"}
+ }
+ "Asia:Brunei"{
+ ec{"ბრუნეი"}
+ }
+ "Asia:Calcutta"{
+ ec{"კალკუტა"}
+ }
"Asia:Choibalsan"{
ec{"ჩოიბალსანი"}
}
"Asia:Chongqing"{
ec{"ჩონგქინგი"}
}
+ "Asia:Colombo"{
+ ec{"კოლომბო"}
+ }
+ "Asia:Damascus"{
+ ec{"დამასკი"}
+ }
+ "Asia:Dhaka"{
+ ec{"დაკა"}
+ }
+ "Asia:Dili"{
+ ec{"დილი"}
+ }
+ "Asia:Dubai"{
+ ec{"დუბაი"}
+ }
+ "Asia:Dushanbe"{
+ ec{"დუშანბე"}
+ }
+ "Asia:Gaza"{
+ ec{"გაზა"}
+ }
"Asia:Harbin"{
ec{"ჰარბინი"}
}
+ "Asia:Hebron"{
+ ec{"ჰებრონი"}
+ }
+ "Asia:Hong_Kong"{
+ ec{"ჰონკონგი"}
+ }
"Asia:Hovd"{
ec{"ჰოვდი"}
}
@@ -354,24 +741,57 @@
"Asia:Jayapura"{
ec{"ჯაიაპურა"}
}
+ "Asia:Jerusalem"{
+ ec{"იერუსალიმი"}
+ }
+ "Asia:Kabul"{
+ ec{"ქაბული"}
+ }
"Asia:Kamchatka"{
ec{"კამჩატკა"}
}
+ "Asia:Karachi"{
+ ec{"კარაჩი"}
+ }
"Asia:Kashgar"{
ec{"კაშგარი"}
}
+ "Asia:Katmandu"{
+ ec{"კატმანდუ"}
+ }
"Asia:Krasnoyarsk"{
ec{"კრასნოიარსკი"}
}
+ "Asia:Kuala_Lumpur"{
+ ec{"კუალა-ლუმპური"}
+ }
"Asia:Kuching"{
ec{"კუჩინგი"}
}
+ "Asia:Kuwait"{
+ ec{"ქუვეითი"}
+ }
+ "Asia:Macau"{
+ ec{"მაკაო"}
+ }
"Asia:Magadan"{
ec{"მაგადანი"}
}
"Asia:Makassar"{
ec{"მაკასარი"}
}
+ "Asia:Manila"{
+ ec{"მანილა"}
+ }
+ "Asia:Muscat"{
+ ec{"მუსკატი"}
+ }
+ "Asia:Nicosia"{
+ ec{"ნიკოსია"}
+ }
+ "Asia:Novokuznetsk"{
+ ec{"ნოვოკუზნეცკი"}
+ }
"Asia:Novosibirsk"{
ec{"ნოვოსიბირსკი"}
}
@@ -381,24 +801,72 @@
"Asia:Oral"{
ec{"ორალი"}
}
+ "Asia:Phnom_Penh"{
+ ec{"პნომპენი"}
+ }
"Asia:Pontianak"{
ec{"პონტიანაკი"}
}
+ "Asia:Pyongyang"{
+ ec{"ფხენიანი"}
+ }
+ "Asia:Qatar"{
+ ec{"კატარი"}
+ }
"Asia:Qyzylorda"{
ec{"ყიზილორდა"}
}
+ "Asia:Rangoon"{
+ ec{"რანგუნი"}
+ }
+ "Asia:Riyadh"{
+ ec{"ერ-რიადი"}
+ }
+ "Asia:Saigon"{
+ ec{"ჰოჩიმინი"}
+ }
"Asia:Sakhalin"{
ec{"სახალინი"}
}
"Asia:Samarkand"{
ec{"სამარყანდი"}
}
+ "Asia:Seoul"{
+ ec{"სეული"}
+ }
+ "Asia:Shanghai"{
+ ec{"შანხაი"}
+ }
+ "Asia:Singapore"{
+ ec{"სინგაპური"}
+ }
+ "Asia:Taipei"{
+ ec{"ტაიპეი"}
+ }
+ "Asia:Tashkent"{
+ ec{"ტაშკენტი"}
+ }
+ "Asia:Tbilisi"{
+ ec{"თბილისი"}
+ }
+ "Asia:Tehran"{
+ ec{"თეირანი"}
+ }
+ "Asia:Thimphu"{
+ ec{"თხიმფხუ"}
+ }
+ "Asia:Tokyo"{
+ ec{"ტოკიო"}
+ }
"Asia:Ulaanbaatar"{
ec{"ულანბატარი"}
}
"Asia:Urumqi"{
ec{"ურუმქი"}
}
+ "Asia:Vientiane"{
+ ec{"ვიენტიანი"}
+ }
"Asia:Vladivostok"{
ec{"ვლადივოსტოკი"}
}
@@ -408,15 +876,39 @@
"Asia:Yekaterinburg"{
ec{"ეკატერინბურგი"}
}
+ "Asia:Yerevan"{
+ ec{"ერევანი"}
+ }
"Atlantic:Azores"{
- ec{"აზორეს"}
+ ec{"აზორის კუნძულები"}
+ }
+ "Atlantic:Bermuda"{
+ ec{"ბერმუდი"}
}
"Atlantic:Canary"{
ec{"კანარი"}
}
+ "Atlantic:Cape_Verde"{
+ ec{"კაბო-ვერდე"}
+ }
+ "Atlantic:Faeroe"{
+ ec{"ფარერის კუნძულები"}
+ }
"Atlantic:Madeira"{
ec{"მადეირა"}
}
+ "Atlantic:Reykjavik"{
+ ec{"რეიკიავიკი"}
+ }
+ "Atlantic:South_Georgia"{
+ ec{"სამხრეთ ჯორჯია"}
+ }
+ "Atlantic:St_Helena"{
+ ec{"წმ. ელენეს კუნძული"}
+ }
+ "Atlantic:Stanley"{
+ ec{"სტენლი"}
+ }
"Australia:Adelaide"{
ec{"ადელაიდა"}
}
@@ -454,7 +946,62 @@
ec{"სიდნეი"}
}
"Etc:Unknown"{
- ec{"უცნობი"}
+ ec{"უცნობი ქალაქი"}
+ }
+ "Europe:Amsterdam"{
+ ec{"ამსტერდამი"}
+ }
+ "Europe:Andorra"{
+ ec{"ანდორა"}
+ }
+ "Europe:Athens"{
+ ec{"ათენი"}
+ }
+ "Europe:Belgrade"{
+ ec{"ბელგრადი"}
+ }
+ "Europe:Berlin"{
+ ec{"ბერლინი"}
+ }
+ "Europe:Bratislava"{
+ ec{"ბრატისლავა"}
+ }
+ "Europe:Brussels"{
+ ec{"ბრიუსელი"}
+ }
+ "Europe:Bucharest"{
+ ec{"ბუხარესტი"}
+ }
+ "Europe:Budapest"{
+ ec{"ბუდაპეშტი"}
+ }
+ "Europe:Chisinau"{
+ ec{"კიშინიოვი"}
+ }
+ "Europe:Copenhagen"{
+ ec{"კოპენჰაგენი"}
+ }
+ "Europe:Dublin"{
+ ec{"დუბლინი"}
+ ld{"ირლანდიის ზაფხულის დრო"}
+ }
+ "Europe:Gibraltar"{
+ ec{"გიბრალტარი"}
+ }
+ "Europe:Guernsey"{
+ ec{"გერნსი"}
+ }
+ "Europe:Helsinki"{
+ ec{"ჰელსინკი"}
+ }
+ "Europe:Isle_of_Man"{
+ ec{"მენის კუნძული"}
+ }
+ "Europe:Istanbul"{
+ ec{"სტამბოლი"}
+ }
+ "Europe:Jersey"{
+ ec{"ჯერსი"}
}
"Europe:Kaliningrad"{
ec{"კალინინგრადი"}
@@ -462,39 +1009,184 @@
"Europe:Kiev"{
ec{"კიევი"}
}
+ "Europe:Lisbon"{
+ ec{"ლისაბონი"}
+ }
+ "Europe:Ljubljana"{
+ ec{"ლიუბლიანა"}
+ }
+ "Europe:London"{
+ ec{"ლონდონი"}
+ ld{"ბრიტანეთის ზაფხულის დრო"}
+ }
+ "Europe:Luxembourg"{
+ ec{"ლუქსემბურგი"}
+ }
+ "Europe:Madrid"{
+ ec{"მადრიდი"}
+ }
+ "Europe:Malta"{
+ ec{"მალტა"}
+ }
+ "Europe:Mariehamn"{
+ ec{"მარიჰამნი"}
+ }
+ "Europe:Minsk"{
+ ec{"მინსკი"}
+ }
+ "Europe:Monaco"{
+ ec{"მონაკო"}
+ }
"Europe:Moscow"{
ec{"მოსკოვი"}
}
+ "Europe:Oslo"{
+ ec{"ოსლო"}
+ }
+ "Europe:Paris"{
+ ec{"პარიზი"}
+ }
+ "Europe:Podgorica"{
+ ec{"პოდგორიცა"}
+ }
+ "Europe:Prague"{
+ ec{"პრაღა"}
+ }
+ "Europe:Riga"{
+ ec{"რიგა"}
+ }
+ "Europe:Rome"{
+ ec{"რომი"}
+ }
"Europe:Samara"{
ec{"სამარა"}
}
+ "Europe:San_Marino"{
+ ec{"სან-მარინო"}
+ }
+ "Europe:Sarajevo"{
+ ec{"სარაევო"}
+ }
"Europe:Simferopol"{
ec{"სიმფეროპოლი"}
}
+ "Europe:Skopje"{
+ ec{"სკოპიე"}
+ }
+ "Europe:Sofia"{
+ ec{"სოფია"}
+ }
+ "Europe:Stockholm"{
+ ec{"სტოკჰოლმი"}
+ }
+ "Europe:Tallinn"{
+ ec{"ტალინი"}
+ }
+ "Europe:Tirane"{
+ ec{"ტირანა"}
+ }
"Europe:Uzhgorod"{
ec{"უჟგოროდი"}
}
+ "Europe:Vaduz"{
+ ec{"ვადუზი"}
+ }
+ "Europe:Vatican"{
+ ec{"ვატიკანი"}
+ }
+ "Europe:Vienna"{
+ ec{"ვენა"}
+ }
+ "Europe:Vilnius"{
+ ec{"ვილნიუსი"}
+ }
"Europe:Volgograd"{
ec{"ვოლგოგრადი"}
}
+ "Europe:Warsaw"{
+ ec{"ვარშავა"}
+ }
+ "Europe:Zagreb"{
+ ec{"ზაგრები"}
+ }
"Europe:Zaporozhye"{
ec{"ზაპოროჟიე"}
}
+ "Europe:Zurich"{
+ ec{"ციურიხი"}
+ }
+ "Indian:Antananarivo"{
+ ec{"ანტანანარივუ"}
+ }
+ "Indian:Chagos"{
+ ec{"ჩაგოსი"}
+ }
+ "Indian:Christmas"{
+ ec{"შობის კუნძული"}
+ }
+ "Indian:Cocos"{
+ ec{"ქოქოსი"}
+ }
+ "Indian:Comoro"{
+ ec{"კომორო"}
+ }
+ "Indian:Kerguelen"{
+ ec{"კერგელენი"}
+ }
+ "Indian:Mahe"{
+ ec{"მაჰე"}
+ }
+ "Indian:Maldives"{
+ ec{"მალდივები"}
+ }
+ "Indian:Mauritius"{
+ ec{"მავრიკი"}
+ }
+ "Indian:Mayotte"{
+ ec{"მაიოტი"}
+ }
+ "Indian:Reunion"{
+ ec{"რეიუნიონი"}
+ }
+ "Pacific:Apia"{
+ ec{"აპია"}
+ }
+ "Pacific:Auckland"{
+ ec{"ოკლენდი"}
+ }
"Pacific:Chatham"{
ec{"ჩათამი"}
}
"Pacific:Easter"{
ec{"ისთერი"}
}
+ "Pacific:Efate"{
+ ec{"ეფატე"}
+ }
"Pacific:Enderbury"{
ec{"ენდერბური"}
}
+ "Pacific:Fakaofo"{
+ ec{"ფაკაოფო"}
+ }
+ "Pacific:Fiji"{
+ ec{"ფიჯი"}
+ }
+ "Pacific:Funafuti"{
+ ec{"ფუნაფუტი"}
+ }
"Pacific:Galapagos"{
ec{"გალაპაგოსი"}
}
"Pacific:Gambier"{
ec{"გამბიერი"}
}
+ "Pacific:Guadalcanal"{
+ ec{"გვადალკანალი"}
+ }
+ "Pacific:Guam"{
+ ec{"გუამი"}
+ }
"Pacific:Honolulu"{
ec{"ჰონოლულუ"}
}
@@ -519,19 +1211,626 @@
"Pacific:Midway"{
ec{"მიდუეი"}
}
+ "Pacific:Nauru"{
+ ec{"ნაურუ"}
+ }
+ "Pacific:Niue"{
+ ec{"ნიუე"}
+ }
+ "Pacific:Norfolk"{
+ ec{"ნორფოლკი"}
+ }
+ "Pacific:Noumea"{
+ ec{"ნუმეა"}
+ }
+ "Pacific:Pago_Pago"{
+ ec{"პაგო-პაგო"}
+ }
+ "Pacific:Palau"{
+ ec{"პალაუ"}
+ }
+ "Pacific:Pitcairn"{
+ ec{"პიტკერნი"}
+ }
"Pacific:Ponape"{
- ec{"პონაპე"}
+ ec{"პონპეი"}
+ }
+ "Pacific:Port_Moresby"{
+ ec{"პორტ მორსბი"}
+ }
+ "Pacific:Rarotonga"{
+ ec{"რაროტონგა"}
+ }
+ "Pacific:Saipan"{
+ ec{"საიპანი"}
+ }
+ "Pacific:Tahiti"{
+ ec{"ტაიტი"}
}
"Pacific:Tarawa"{
ec{"ტარაუა"}
}
+ "Pacific:Tongatapu"{
+ ec{"ტონგატაპუ"}
+ }
"Pacific:Truk"{
- ec{"ტრუკი"}
+ ec{"ჩუუკი"}
}
"Pacific:Wake"{
ec{"უეიკი"}
}
+ "Pacific:Wallis"{
+ ec{"ვალისი"}
+ }
+ "meta:Afghanistan"{
+ ls{"ავღანეთის დრო"}
+ }
+ "meta:Africa_Central"{
+ ls{"ცენტრალური აფრიკის დრო"}
+ }
+ "meta:Africa_Eastern"{
+ ls{"აღმოსავლეთ აფრიკის დრო"}
+ }
+ "meta:Africa_Southern"{
+ ls{"სამხრეთ აფრიკის დრო"}
+ }
+ "meta:Africa_Western"{
+ ld{"დასავლეთ აფრიკის ზაფხულის დრო"}
+ lg{"დასავლეთ აფრიკის დრო"}
+ ls{"დასავლეთ აფრიკის სტანდარტული დრო"}
+ }
+ "meta:Alaska"{
+ ld{"ალასკის დროის სარტყელი"}
+ lg{"ალასკის დრო"}
+ ls{"ალასკის სტანდარტული დრო"}
+ }
+ "meta:Amazon"{
+ ld{"ამაზონიის ზაფხულის დრო"}
+ lg{"ამაზონიის დრო"}
+ ls{"ამაზონიის სტანდარტული დრო"}
+ }
+ "meta:America_Central"{
+ ld{"ჩრდილოეთ ამერიკის ცენტრალური დროის სარტყელი"}
+ lg{"ჩრდილოეთ ამერიკის ცენტრალური დრო"}
+ ls{"ჩრდილოეთ ამერიკის ცენტრალური სტანდარტული დრო"}
+ }
+ "meta:America_Eastern"{
+ ld{"ჩრდილოეთ ამერიკის აღმოსავლეთის დროის სარტყელი"}
+ lg{"ჩრდილოეთ ამერიკის აღმოსავლეთის დრო"}
+ ls{"ჩრდილოეთ ამერიკის აღმოსავლეთის სტანდარტული დრო"}
+ }
+ "meta:America_Mountain"{
+ ld{"ჩრდილოეთ ამერიკის მაუნთინის დროის სარტყელი"}
+ lg{"ჩრდილოეთ ამერიკის მაუნთინის დრო"}
+ ls{"ჩრდილოეთ ამერიკის მაუნთინის სტანდარტული დრო"}
+ }
+ "meta:America_Pacific"{
+ ld{"ჩრდილოეთ ამერიკის წყნარი ოკეანის დროის სარტყელი"}
+ lg{"ჩრდილოეთ ამერიკის წყნარი ოკეანის დრო"}
+ ls{"ჩრდილოეთ ამერიკის წყნარი ოკეანის სტანდარტული დრო"}
+ }
+ "meta:Arabian"{
+ ld{"არაბეთის დროის სარტყელი"}
+ lg{"არაბეთის დრო"}
+ ls{"არაბეთის სტანდარტული დრო"}
+ }
+ "meta:Argentina"{
+ ld{"არგენტინის ზაფხულის დრო"}
+ lg{"არგენტინის დრო"}
+ ls{"არგენტინის სტანდარტული დრო"}
+ }
+ "meta:Argentina_Western"{
+ ld{"დასავლეთ არგენტინის ზაფხულის დრო"}
+ lg{"დასავლეთ არგენტინის დრო"}
+ ls{"დასავლეთ არგენტინის სტანდარტული დრო"}
+ }
+ "meta:Armenia"{
+ ld{"სომხეთის ზაფხულის დრო"}
+ lg{"სომხეთის დრო"}
+ ls{"სომხეთის სტანდარტული დრო"}
+ }
+ "meta:Atlantic"{
+ ld{"ატლანტიკის ოკეანის დროის სარტყელი"}
+ lg{"ატლანტიკის ოკეანის დრო"}
+ ls{"ატლანტიკის ოკეანის სტანდარტული დრო"}
+ }
+ "meta:Australia_Central"{
+ ld{"ცენტრალური ავსტრალიის დროის სარტყელი"}
+ lg{"ცენტრალური ავსტრალიის დრო"}
+ ls{"ავსტრალიის ცენტრალური სტანდარტული დრო"}
+ }
+ "meta:Australia_CentralWestern"{
+ ld{"ცენტრალური და დასავლეთ ავსტრალიის დროის სარტყელი"}
+ lg{"ცენტრალური და დასავლეთ ავსტრალიის დრო"}
+ ls{"ცენტრალური და დასავლეთ ავსტრალიის სტანდარტული დრო"}
+ }
+ "meta:Australia_Eastern"{
+ ld{"აღმოსავლეთ ავსტრალიის დროის სარტყელი"}
+ lg{"აღმოსავლეთ ავსტრალიის დრო"}
+ ls{"აღმოსავლეთ ავსტრალიის სტანდარტული დრო"}
+ }
+ "meta:Australia_Western"{
+ ld{"დასავლეთ ავსტრალიის დროის სარტყელი"}
+ lg{"დასავლეთ ავსტრალიის დრო"}
+ ls{"დასავლეთ ავსტრალიის სტანდარტული დრო"}
+ }
+ "meta:Azerbaijan"{
+ ld{"აზერბაიჯანის ზაფხულის დრო"}
+ lg{"აზერბაიჯანის დრო"}
+ ls{"აზერბაიჯანის სტანდარტული დრო"}
+ }
+ "meta:Azores"{
+ ld{"აზორის კუნძულების ზაფხულის დრო"}
+ lg{"აზორის კუნძულების დრო"}
+ ls{"აზორის კუნძულების სტანდარტული დრო"}
+ }
+ "meta:Bangladesh"{
+ ld{"ბანგლადეშის ზაფხულის დრო"}
+ lg{"ბანგლადეშის დრო"}
+ ls{"ბანგლადეშის სტანდარტული დრო"}
+ }
+ "meta:Bhutan"{
+ ls{"ბუტანის დრო"}
+ }
+ "meta:Bolivia"{
+ ls{"ბოლივიის დრო"}
+ }
+ "meta:Brasilia"{
+ ld{"ბრაზილიის ზაფხულის დრო"}
+ lg{"ბრაზილიის დრო"}
+ ls{"ბრაზილიის სტანდარტული დრო"}
+ }
+ "meta:Brunei"{
+ ls{"ბრუნეი-დარუსალამის დრო"}
+ }
+ "meta:Cape_Verde"{
+ ld{"კაბო-ვერდეს ზაფხულის დრო"}
+ lg{"კაბო-ვერდეს დრო"}
+ ls{"კაბო-ვერდეს სტანდარტული დრო"}
+ }
+ "meta:Chamorro"{
+ ls{"ჩამოროს დრო"}
+ }
+ "meta:Chatham"{
+ ld{"ჩატემის დროის სარტყელი"}
+ lg{"ჩატემის დრო"}
+ ls{"ჩატემის სტანდარტული დრო"}
+ }
+ "meta:Chile"{
+ ld{"ჩილეს ზაფხულის დრო"}
+ lg{"ჩილეს დრო"}
+ ls{"ჩილეს სტანდარტული დრო"}
+ }
+ "meta:China"{
+ ld{"ჩინეთის დროის სარტყელი"}
+ lg{"ჩინეთის დრო"}
+ ls{"ჩინეთის სტანდარტული დრო"}
+ }
+ "meta:Choibalsan"{
+ ld{"ჩოიბალსანის ზაფხულის დრო"}
+ lg{"ჩოიბალსანის დრო"}
+ ls{"ჩოიბალსანის სტანდარტული დრო"}
+ }
+ "meta:Christmas"{
+ ls{"შობის კუნძულის დრო"}
+ }
+ "meta:Cocos"{
+ ls{"ქოქოსის კუნძულების დრო"}
+ }
+ "meta:Colombia"{
+ ld{"კოლუმბიის ზაფხულის დრო"}
+ lg{"კოლუმბიის დრო"}
+ ls{"კოლუმბიის სტანდარტული დრო"}
+ }
+ "meta:Cook"{
+ ld{"კუკის კუნძულების ნახევრად ზაფხულის დრო"}
+ lg{"კუკის კუნძულების დრო"}
+ ls{"კუკის კუნძულების სტანდარტული დრო"}
+ }
+ "meta:Cuba"{
+ ld{"კუბის დროის სარტყელი"}
+ lg{"კუბის დრო"}
+ ls{"კუბის სტანდარტული დრო"}
+ }
+ "meta:Davis"{
+ ls{"დევისის დრო"}
+ }
+ "meta:DumontDUrville"{
+ ls{"დუმონ-დურვილის დრო"}
+ }
+ "meta:East_Timor"{
+ ls{"აღმოსავლეთ ტიმორის დრო"}
+ }
+ "meta:Easter"{
+ ld{"აღდგომის კუნძულის ზაფხულის დრო"}
+ lg{"აღდგომის კუნძულის დრო"}
+ ls{"აღდგომის კუნძულის სტანდარტული დრო"}
+ }
+ "meta:Ecuador"{
+ ls{"ეკვადორის დრო"}
+ }
+ "meta:Europe_Central"{
+ ld{"ცენტრალური ევროპის ზაფხულის დრო"}
+ lg{"ცენტრალური ევროპის დრო"}
+ ls{"ცენტრალური ევროპის სტანდარტული დრო"}
+ }
+ "meta:Europe_Eastern"{
+ ld{"აღმოსავლეთ ევროპის ზაფხულის დრო"}
+ lg{"აღმოსავლეთ ევროპის დრო"}
+ ls{"აღმოსავლეთ ევროპის სტანდარტული დრო"}
+ }
+ "meta:Europe_Western"{
+ ld{"დასავლეთ ევროპის ზაფხულის დრო"}
+ lg{"დასავლეთ ევროპის დრო"}
+ ls{"დასავლეთ ევროპის სტანდარტული დრო"}
+ }
+ "meta:Falkland"{
+ ld{"ფოლკლენდის კუნძულების ზაფხულის დრო"}
+ lg{"ფოლკლენდის კუნძულების დრო"}
+ ls{"ფოლკლენდის კუნძულების სტანდარტული დრო"}
+ }
+ "meta:Fiji"{
+ ld{"ფიჯის ზაფხულის დრო"}
+ lg{"ფიჯის დრო"}
+ ls{"ფიჯის სტანდარტული დრო"}
+ }
+ "meta:French_Guiana"{
+ ls{"საფრანგეთის გვიანის დრო"}
+ }
+ "meta:French_Southern"{
+ ls{"ფრანგული სამხრეთის და ანტარქტიკის დრო"}
+ }
+ "meta:GMT"{
+ ls{"გრინვიჩის საშუალო დრო"}
+ }
+ "meta:Galapagos"{
+ ls{"გალაპაგოსის დრო"}
+ }
+ "meta:Gambier"{
+ ls{"გამბიერის დრო"}
+ }
+ "meta:Georgia"{
+ ld{"საქართველოს ზაფხულის დრო"}
+ lg{"საქართველოს დრო"}
+ ls{"საქართველოს სტანდარტული დრო"}
+ }
+ "meta:Gilbert_Islands"{
+ ls{"გილბერტის კუნძულების დრო"}
+ }
+ "meta:Greenland_Eastern"{
+ ld{"აღმოსავლეთ გრენლანდიის ზაფხულის დრო"}
+ lg{"აღმოსავლეთ გრენლანდიის დრო"}
+ ls{"აღმოსავლეთ გრენლანდიის სტანდარტული დრო"}
+ }
+ "meta:Greenland_Western"{
+ ld{"დასავლეთ გრენლანდიის ზაფხულის დრო"}
+ lg{"დასავლეთ გრენლანდიის დრო"}
+ ls{"დასავლეთ გრენლანდიის სტანდარტული დრო"}
+ }
+ "meta:Gulf"{
+ ls{"გალფის დრო"}
+ }
+ "meta:Guyana"{
+ ls{"გაიანის დრო"}
+ }
+ "meta:Hawaii_Aleutian"{
+ ld{"ჰავაის და ალეუტის დროის სარტყელი"}
+ lg{"ჰავაის და ალეუტის დრო"}
+ ls{"ჰავაის და ალეუტის სტანდარტული დრო"}
+ }
+ "meta:Hong_Kong"{
+ ld{"ჰონკონგის ზაფხულის დრო"}
+ lg{"ჰონკონგის დრო"}
+ ls{"ჰონკონგის სტანდარტული დრო"}
+ }
+ "meta:Hovd"{
+ ld{"ჰოვდის ზაფხულის დრო"}
+ lg{"ჰოვდის დრო"}
+ ls{"ჰოვდის სტანდარტული დრო"}
+ }
+ "meta:India"{
+ ls{"ინდოეთის დრო"}
+ }
+ "meta:Indian_Ocean"{
+ ls{"ინდოეთის ოკეანის კუნძულების დრო"}
+ }
+ "meta:Indochina"{
+ ls{"ინდოჩინეთის დრო"}
+ }
+ "meta:Indonesia_Central"{
+ ls{"ცენტრალური ინდონეზიის დრო"}
+ }
+ "meta:Indonesia_Eastern"{
+ ls{"აღმოსავლეთ ინდონეზიის დრო"}
+ }
+ "meta:Indonesia_Western"{
+ ls{"დასავლეთ ინდონეზიის დრო"}
+ }
+ "meta:Iran"{
+ ld{"ირანის დროის სარტყელი"}
+ lg{"ირანის დრო"}
+ ls{"ირანის სტანდარტული დრო"}
+ }
+ "meta:Irkutsk"{
+ ld{"ირკუტსკის ზაფხულის დრო"}
+ lg{"ირკუტსკის დრო"}
+ ls{"ირკუტსკის სტანდარტული დრო"}
+ }
+ "meta:Israel"{
+ ld{"ისრაელის დროის სარტყელი"}
+ lg{"ისრაელის დრო"}
+ ls{"ისრაელის სტანდარტული დრო"}
+ }
+ "meta:Japan"{
+ ld{"იაპონიის დროის სარტყელი"}
+ lg{"იაპონიის დრო"}
+ ls{"იაპონიის სტანდარტული დრო"}
+ }
+ "meta:Kazakhstan_Eastern"{
+ ls{"აღმოსავლეთ ყაზახეთის დრო"}
+ }
+ "meta:Kazakhstan_Western"{
+ ls{"დასავლეთ ყაზახეთის დრო"}
+ }
+ "meta:Korea"{
+ ld{"კორეის დროის სარტყელი"}
+ lg{"კორეის დრო"}
+ ls{"კორეის სტანდარტული დრო"}
+ }
+ "meta:Kosrae"{
+ ls{"კოსრეს დრო"}
+ }
+ "meta:Krasnoyarsk"{
+ ld{"კრასნოიარსკის ზაფხულის დრო"}
+ lg{"კრასნოიარსკის დრო"}
+ ls{"კრასნოიარსკის სტანდარტული დრო"}
+ }
+ "meta:Kyrgystan"{
+ ls{"ყირგიზეთის დრო"}
+ }
+ "meta:Line_Islands"{
+ ls{"ლაინის კუნძულების დრო"}
+ }
+ "meta:Lord_Howe"{
+ ld{"ლორდ-ჰაუს დროის სარტყელი"}
+ lg{"ლორდ-ჰაუს დრო"}
+ ls{"ლორდ-ჰაუს სტანდარტული დრო"}
+ }
+ "meta:Macquarie"{
+ ls{"მაქკუორის კუნძულის დრო"}
+ }
+ "meta:Magadan"{
+ ld{"მაგადანის ზაფხულის დრო"}
+ lg{"მაგადანის დრო"}
+ ls{"მაგადანის სტანდარტული დრო"}
+ }
+ "meta:Malaysia"{
+ ls{"მალაიზიის დრო"}
+ }
+ "meta:Maldives"{
+ ls{"მალდივების დრო"}
+ }
+ "meta:Marquesas"{
+ ls{"მარკიზის კუნძულების დრო"}
+ }
+ "meta:Marshall_Islands"{
+ ls{"მარშალის კუნძულების დრო"}
+ }
+ "meta:Mauritius"{
+ ld{"მავრიკის ზაფხულის დრო"}
+ lg{"მავრიკის დრო"}
+ ls{"მავრიკის სტანდარტული დრო"}
+ }
+ "meta:Mawson"{
+ ls{"მოუსონის დრო"}
+ }
+ "meta:Mongolia"{
+ ld{"ულან-ბატორის ზაფხულის დრო"}
+ lg{"ულან-ბატორის დრო"}
+ ls{"ულან-ბატორის სტანდარტული დრო"}
+ }
+ "meta:Moscow"{
+ ld{"მოსკოვის ზაფხულის დრო"}
+ lg{"მოსკოვის დრო"}
+ ls{"მოსკოვის სტანდარტული დრო"}
+ }
+ "meta:Myanmar"{
+ ls{"მიანმარის დრო"}
+ }
+ "meta:Nauru"{
+ ls{"ნაურუს დრო"}
+ }
+ "meta:Nepal"{
+ ls{"ნეპალის დრო"}
+ }
+ "meta:New_Caledonia"{
+ ld{"ახალი კალედონიის ზაფხულის დრო"}
+ lg{"ახალი კალედონიის დრო"}
+ ls{"ახალი კალედონიის სტანდარტული დრო"}
+ }
+ "meta:New_Zealand"{
+ ld{"ახალი ზელანდიის დროის სარტყელი"}
+ lg{"ახალი ზელანდიის დრო"}
+ ls{"ახალი ზელანდიის სტანდარტული დრო"}
+ }
+ "meta:Newfoundland"{
+ ld{"ნიუფაუნდლენდის დროის სარტყელი"}
+ lg{"ნიუფაუნდლენდის დრო"}
+ ls{"ნიუფაუნდლენდის სტანდარტული დრო"}
+ }
+ "meta:Niue"{
+ ls{"ნიუეს დრო"}
+ }
+ "meta:Norfolk"{
+ ls{"ნორფოლკის კუნძულის დრო"}
+ }
+ "meta:Noronha"{
+ ld{"ფერნანდო-დე-ნორონიას ზაფხულის დრო"}
+ lg{"ფერნანდო-დე-ნორონიას დრო"}
+ ls{"ფერნანდო-დე-ნორონიას სტანდარტული დრო"}
+ }
+ "meta:Novosibirsk"{
+ ld{"ნოვოსიბირსკის ზაფხულის დრო"}
+ lg{"ნოვოსიბირსკის დრო"}
+ ls{"ნოვოსიბირსკის სტანდარტული დრო"}
+ }
+ "meta:Omsk"{
+ ld{"ომსკის ზაფხულის დრო"}
+ lg{"ომსკის დრო"}
+ ls{"ომსკის სტანდარტული დრო"}
+ }
+ "meta:Pakistan"{
+ ld{"პაკისტანის ზაფხულის დრო"}
+ lg{"პაკისტანის დრო"}
+ ls{"პაკისტანის სტანდარტული დრო"}
+ }
+ "meta:Palau"{
+ ls{"პალაუს დრო"}
+ }
+ "meta:Papua_New_Guinea"{
+ ls{"პაპუა-ახალი გვინეის დრო"}
+ }
+ "meta:Paraguay"{
+ ld{"პარაგვაის ზაფხულის დრო"}
+ lg{"პარაგვაის დრო"}
+ ls{"პარაგვაის სტანდარტული დრო"}
+ }
+ "meta:Peru"{
+ ld{"პერუს ზაფხულის დრო"}
+ lg{"პერუს დრო"}
+ ls{"პერუს სტანდარტული დრო"}
+ }
+ "meta:Philippines"{
+ ld{"ფილიპინების ზაფხულის დრო"}
+ lg{"ფილიპინების დრო"}
+ ls{"ფილიპინების სტანდარტული დრო"}
+ }
+ "meta:Phoenix_Islands"{
+ ls{"ფენიქსის კუნძულების დრო"}
+ }
+ "meta:Pierre_Miquelon"{
+ ld{"სენ-პიერის და მიკელონის დროის სარტყელი"}
+ lg{"სენ-პიერის და მიკელონის დრო"}
+ ls{"სენ-პიერის და მიკელონის სტანდარტული დრო"}
+ }
+ "meta:Pitcairn"{
+ ls{"პიტკერნის დრო"}
+ }
+ "meta:Ponape"{
+ ls{"პონაპეს დრო"}
+ }
+ "meta:Reunion"{
+ ls{"რეიუნიონის დრო"}
+ }
+ "meta:Rothera"{
+ ls{"როთერის დრო"}
+ }
+ "meta:Sakhalin"{
+ ld{"სახალინის ზაფხულის დრო"}
+ lg{"სახალინის დრო"}
+ ls{"სახალინის სტანდარტული დრო"}
+ }
+ "meta:Samoa"{
+ ld{"სამოას ზაფხულის დრო"}
+ lg{"სამოას დრო"}
+ ls{"სამოას სტანდარტული დრო"}
+ }
+ "meta:Seychelles"{
+ ls{"სეიშელის კუნძულების დრო"}
+ }
+ "meta:Singapore"{
+ ls{"სინგაპურის დრო"}
+ }
+ "meta:Solomon"{
+ ls{"სოლომონის კუნძულების დრო"}
+ }
+ "meta:South_Georgia"{
+ ls{"სამხრეთ გეორგიის დრო"}
+ }
+ "meta:Syowa"{
+ ls{"სიოვას დრო"}
+ }
+ "meta:Tahiti"{
+ ls{"ტაიტის დრო"}
+ }
+ "meta:Taipei"{
+ ld{"ტაიბეის დროის სარტყელი"}
+ lg{"ტაიბეის დრო"}
+ ls{"ტაიბეის სტანდარტული დრო"}
+ }
+ "meta:Tajikistan"{
+ ls{"ტაჯიკეთის დრო"}
+ }
+ "meta:Tokelau"{
+ ls{"ტოკელაუს დრო"}
+ }
+ "meta:Tonga"{
+ ld{"ტონგის ზაფხულის დრო"}
+ lg{"ტონგის დრო"}
+ ls{"ტონგის სტანდარტული დრო"}
+ }
+ "meta:Truk"{
+ ls{"ჩუუკის დრო"}
+ }
+ "meta:Turkmenistan"{
+ ld{"თურქმენეთის ზაფხულის დრო"}
+ lg{"თურქმენეთის დრო"}
+ ls{"თურქმენეთის სტანდარტული დრო"}
+ }
+ "meta:Tuvalu"{
+ ls{"ტუვალუს დრო"}
+ }
+ "meta:Uruguay"{
+ ld{"ურუგვაის ზაფხულის დრო"}
+ lg{"ურუგვაის დრო"}
+ ls{"ურუგვაის სტანდარტული დრო"}
+ }
+ "meta:Uzbekistan"{
+ ld{"უზბეკეთის ზაფხულის დრო"}
+ lg{"უზბეკეთის დრო"}
+ ls{"უზბეკეთის სტანდარტული დრო"}
+ }
+ "meta:Vanuatu"{
+ ld{"ვანუატუს ზაფხულის დრო"}
+ lg{"ვანუატუს დრო"}
+ ls{"ვანუატუს სტანდარტული დრო"}
+ }
+ "meta:Venezuela"{
+ ls{"ვენესუელის დრო"}
+ }
+ "meta:Vladivostok"{
+ ld{"ვლადივოსტოკის ზაფხულის დრო"}
+ lg{"ვლადივოსტოკის დრო"}
+ ls{"ვლადივოსტოკის სტანდარტული დრო"}
+ }
+ "meta:Volgograd"{
+ ld{"ვოლგოგრადის ზაფხულის დრო"}
+ lg{"ვოლგოგრადის დრო"}
+ ls{"ვოლგოგრადის სტანდარტული დრო"}
+ }
+ "meta:Vostok"{
+ ls{"ვოსტოკის დრო"}
+ }
+ "meta:Wake"{
+ ls{"ვეიკის კუნძულის დრო"}
+ }
+ "meta:Wallis"{
+ ls{"ვოლისი და ფუტუნას დრო"}
+ }
+ "meta:Yakutsk"{
+ ld{"იაკუტსკის ზაფხულის დრო"}
+ lg{"იაკუტსკის დრო"}
+ ls{"იაკუტსკის სტანდარტული დრო"}
+ }
+ "meta:Yekaterinburg"{
+ ld{"ეკატერინბურგის ზაფხულის დრო"}
+ lg{"ეკატერინბურგის დრო"}
+ ls{"ეკატერინბურგის სტანდარტული დრო"}
+ }
fallbackFormat{"{1} ({0})"}
+ fallbackRegionFormat{"დრო: {1} ({0})"}
+ gmtFormat{"GMT{0}"}
+ gmtZeroFormat{"GMT"}
hourFormat{"+HH:mm;-HH:mm"}
regionFormat{"დრო: {0}"}
}
diff --git a/data/zone/kab.txt b/data/zone/kab.txt
index b7f11e1..d037d9a 100755
--- a/data/zone/kab.txt
+++ b/data/zone/kab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kab.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/kab.xml
*/
kab{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/kam.txt b/data/zone/kam.txt
index bca8720..4e156f1 100755
--- a/data/zone/kam.txt
+++ b/data/zone/kam.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kam.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/kam.xml
*/
kam{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/kde.txt b/data/zone/kde.txt
index a5302ce..db66a26 100755
--- a/data/zone/kde.txt
+++ b/data/zone/kde.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kde.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/kde.xml
*/
kde{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/kea.txt b/data/zone/kea.txt
index 6512ea2..c543830 100755
--- a/data/zone/kea.txt
+++ b/data/zone/kea.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kea.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/kea.xml
*/
kea{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
zoneStrings{
"America:Blanc-Sablon"{
ec{"Blank-Sablon"}
diff --git a/data/zone/khq.txt b/data/zone/khq.txt
index 0bb6f9d..400b67f 100755
--- a/data/zone/khq.txt
+++ b/data/zone/khq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/khq.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/khq.xml
*/
khq{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/ki.txt b/data/zone/ki.txt
index 7dc8b70..61feed3 100755
--- a/data/zone/ki.txt
+++ b/data/zone/ki.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ki.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/ki.xml
*/
ki{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/kk.txt b/data/zone/kk.txt
index 2fccd8a..e67429a 100644
--- a/data/zone/kk.txt
+++ b/data/zone/kk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kk.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/kk.xml
*/
kk{
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
zoneStrings{
"Asia:Almaty"{
ec{"Алматы"}
diff --git a/data/zone/kk_Cyrl.txt b/data/zone/kk_Cyrl.txt
index 6e5a261..a368107 100644
--- a/data/zone/kk_Cyrl.txt
+++ b/data/zone/kk_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kk_Cyrl.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/kk_Cyrl.xml
*/
kk_Cyrl{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/kk_Cyrl_KZ.txt b/data/zone/kk_Cyrl_KZ.txt
index ec163a4..6917b0e 100644
--- a/data/zone/kk_Cyrl_KZ.txt
+++ b/data/zone/kk_Cyrl_KZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/kk_KZ.txt b/data/zone/kk_KZ.txt
index 6702eea..f94bda6 100644
--- a/data/zone/kk_KZ.txt
+++ b/data/zone/kk_KZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/kl.txt b/data/zone/kl.txt
index 16105e1..92c8b2e 100644
--- a/data/zone/kl.txt
+++ b/data/zone/kl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kl.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/kl.xml
*/
kl{
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/kln.txt b/data/zone/kln.txt
index 8e436d7..44b4f3e 100755
--- a/data/zone/kln.txt
+++ b/data/zone/kln.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kln.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/kln.xml
*/
kln{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/km.txt b/data/zone/km.txt
index 49d9a6f..7e97d25 100644
--- a/data/zone/km.txt
+++ b/data/zone/km.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/km.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/km.xml
*/
km{
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"អាប៊ីដ្យាន"}
@@ -1692,7 +1692,9 @@
ls{"ម៉ោងស្តង់ដារនៅ Sakhalin"}
}
"meta:Samoa"{
- ls{"ម៉ោងនៅសាម៉ៅ"}
+ ld{"ម៉ោងនៅសាម៉ៅ រដូវក្ដៅ"}
+ lg{"ម៉ោងនៅសាម៉ៅ"}
+ ls{"ម៉ោងស្តង់ដារនៅសាម៉ៅ"}
}
"meta:Seychelles"{
ls{"ម៉ោងនៅសីស្ហែល"}
diff --git a/data/zone/kn.txt b/data/zone/kn.txt
index dff4ff8..b4e37bd 100644
--- a/data/zone/kn.txt
+++ b/data/zone/kn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kn.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/kn.xml
*/
kn{
- Version{"2.0.78.40"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"ಅಬಿದ್ಜನ್"}
@@ -1709,6 +1709,8 @@
ls{"ಸಮರ ಪ್ರಮಾಣಿತ ಸಮಯ"}
}
"meta:Samoa"{
+ ld{"ಸಮೋವಾ ಬೇಸಿಗೆ ಸಮಯ"}
+ lg{"ಸಮೋವಾ ಸಮಯ"}
ls{"ಸಮೋವಾ ಪ್ರಮಾಣಿತ ಸಮಯ"}
}
"meta:Seychelles"{
diff --git a/data/zone/ko.txt b/data/zone/ko.txt
index 79b45ad..702fa7a 100644
--- a/data/zone/ko.txt
+++ b/data/zone/ko.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ko.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/ko.xml
*/
ko{
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
zoneStrings{
"Africa:Abidjan"{
ec{"아비장"}
@@ -1253,11 +1253,6 @@
lg{"알래스카 시간"}
ls{"알래스카 표준시"}
}
- "meta:Alaska_Hawaii"{
- ld{"알래스카-하와이 하계 표준시"}
- lg{"알래스카-하와이 시간"}
- ls{"알래스카-하와이 표준시"}
- }
"meta:Amazon"{
ld{"아마존 하계 표준시"}
lg{"아마존 시간"}
@@ -1420,9 +1415,6 @@
"meta:DumontDUrville"{
ls{"뒤몽뒤르빌 시간"}
}
- "meta:Dutch_Guiana"{
- ls{"네덜란드령 기아나 표준시"}
- }
"meta:East_Timor"{
ls{"동티모르 시간"}
}
@@ -1465,11 +1457,6 @@
"meta:French_Southern"{
ls{"프랑스령 남부 식민지 및 남극 시간"}
}
- "meta:Frunze"{
- ld{"프룬제 일광 절약 시간"}
- lg{"프룬제 시간"}
- ls{"프룬제 표준시"}
- }
"meta:GMT"{
ls{"그리니치 표준시"}
}
@@ -1487,11 +1474,6 @@
"meta:Gilbert_Islands"{
ls{"길버트 제도 시간"}
}
- "meta:Greenland_Central"{
- ld{"그린란드 중부 하계 표준시"}
- lg{"그린란드 중부 시간"}
- ls{"그린란드 중부 표준시"}
- }
"meta:Greenland_Eastern"{
ld{"그린란드 동부 하계 표준시"}
lg{"그린란드 동부 시간"}
@@ -1736,6 +1718,8 @@
ls{"사마라 표준시"}
}
"meta:Samoa"{
+ ld{"사모아 하계 표준시"}
+ lg{"사모아 시간"}
ls{"사모아 표준시"}
}
"meta:Seychelles"{
diff --git a/data/zone/ko_KP.txt b/data/zone/ko_KP.txt
index 9521b15..ccbc050 100755
--- a/data/zone/ko_KP.txt
+++ b/data/zone/ko_KP.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ko_KP.xml
// *
// ***************************************************************************
ko_KP{
- Version{"2.0.76.82"}
+ Version{"2.0.82.45"}
zoneStrings{
"meta:Korea"{
ld{"조선 하계 표준시"}
diff --git a/data/zone/kok.txt b/data/zone/kok.txt
index 19daee0..287bb7d 100644
--- a/data/zone/kok.txt
+++ b/data/zone/kok.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kok.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/kok.xml
*/
kok{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
zoneStrings{
"meta:India"{
ls{"भारतीय समय"}
diff --git a/data/zone/ks.txt b/data/zone/ks.txt
index b096768..455f924 100755
--- a/data/zone/ks.txt
+++ b/data/zone/ks.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ks.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/ks.xml
*/
ks{
- Version{"2.0.78.55"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"عابِدجان"}
@@ -1170,21 +1170,11 @@
lg{"مغربی افریٖقا ٹایِم"}
ls{"مغربی افریٖقا سٹینڑاڑ ٹایِم"}
}
- "meta:Aktyubinsk"{
- ld{"اٮ۪کٹیوٗبِنسک سَمَر ٹایِم"}
- lg{"اٮ۪کٹیوٗبِنسک ٹایِم"}
- ls{"اٮ۪کٹیوٗبِنسک سٹینڑاڑ ٹایِم"}
- }
"meta:Alaska"{
ld{"اٮ۪لاسکا ڈےلایِٔٹ ٹایِم"}
lg{"اٮ۪لاسکا ٹایِم"}
ls{"اٮ۪لاسکا سٹینڑاڑ ٹایِم"}
}
- "meta:Alaska_Hawaii"{
- ld{"اٮ۪لاسکا حواے ڈےلایِٔٹ ٹایِم"}
- lg{"اٮ۪لاسکا حواے ٹایِم"}
- ls{"اٮ۪لاسکا حواے سٹینڑاڑ ٹایِم"}
- }
"meta:Almaty"{
ld{"اٮ۪لمٮ۪ٹی سَمَر ٹایِم"}
lg{"اٮ۪لمٮ۪ٹی ٹایِم"}
@@ -1250,11 +1240,6 @@
lg{"ارمیٖنِیا ٹایِم"}
ls{"ارمیٖنِیا سٹینڑاڑ ٹایِم"}
}
- "meta:Ashkhabad"{
- ld{"اشخاباد سَمَر ٹایِم"}
- lg{"اشخاباد ٹایِم"}
- ls{"اشخاباد سٹینڑاڑ ٹایِم"}
- }
"meta:Atlantic"{
ld{"اٮ۪ٹلانٹِک ڈےلایِٔٹ ٹایِم"}
lg{"اٮ۪ٹلانٹِک ٹایِم"}
@@ -1290,32 +1275,17 @@
lg{"اٮ۪زورٕس ٹایِم"}
ls{"اٮ۪زورٕس سٹینڑاڑ ٹایِم"}
}
- "meta:Baku"{
- ld{"باکوٗ سَمَر ٹایِم"}
- lg{"باکوٗ ٹایِم"}
- ls{"باکوٗ سٹینڑاڑ ٹایِم"}
- }
"meta:Bangladesh"{
ld{"بَنٛگلادیش سَمَر ٹایِم"}
lg{"بَنٛگلادیش ٹایِم"}
ls{"بَنٛگلادیش سٹینڑاڑ ٹایِم"}
}
- "meta:Bering"{
- ld{"بٔرِنٛگ ڈےلایِٔٹ ٹایِم"}
- lg{"بٔرِنٛگ ٹایِم"}
- ls{"بٔرِنٛگ سٹینڑاڑ ٹایِم"}
- }
"meta:Bhutan"{
ls{"بوٗٹان ٹایِم"}
}
"meta:Bolivia"{
ls{"بولِوِیا ٹایِم"}
}
- "meta:Borneo"{
- ld{"بورنِیو سَمَر ٹایِم"}
- lg{"بورنِیو ٹایِم"}
- ls{"بورنِیو سٹینڑاڑ ٹایِم"}
- }
"meta:Brasilia"{
ld{"برٮ۪سِلِیا سَمَر ٹایِم"}
lg{"برٮ۪سِلِیا ٹایِم"}
@@ -1332,9 +1302,6 @@
"meta:Chamorro"{
ls{"کٮ۪مورو سٹینڑاڑ ٹایِم"}
}
- "meta:Changbai"{
- ls{"کٮ۪نگباے ٹایِم"}
- }
"meta:Chatham"{
ld{"چٮ۪تھَم سَمَر ٹایِم"}
lg{"کٮ۪تھَم ٹایِم"}
@@ -1376,23 +1343,12 @@
lg{"کیوٗبا ٹایِم"}
ls{"کیوٗبا سٹینڑاڑ ٹایِم"}
}
- "meta:Dacca"{
- ls{"ڈاکا ٹایِم"}
- }
"meta:Davis"{
ls{"ڑیوِس ٹایِم"}
}
"meta:DumontDUrville"{
ls{"ڑمانٹ ڈی اُرویٖل ٹایِم"}
}
- "meta:Dushanbe"{
- ld{"دشانٛبے سَمَر ٹایِم"}
- lg{"دَشانٛبے ٹایِم"}
- ls{"دَشانٛبے سٹینڑاڑ ٹایِم"}
- }
- "meta:Dutch_Guiana"{
- ls{"ڑَچ گیوٗٮ۪نا ٹایِم"}
- }
"meta:East_Timor"{
ls{"ایٖسٹ ٹیٖمَر ٹایِم"}
}
@@ -1435,11 +1391,6 @@
"meta:French_Southern"{
ls{"جنوٗبی فرٮ۪نٛچ ٹایِم"}
}
- "meta:Frunze"{
- ld{"فرٛیوٗنٛز سَمَر ٹایِم"}
- lg{"فرٛیوٗنٛز ٹایِم"}
- ls{"فرٛیوٗنٛز سٹینڑاڑ ٹایِم"}
- }
"meta:GMT"{
ls{"گرٛیٖن وِچ میٖن ٹایِم"}
}
@@ -1457,11 +1408,6 @@
"meta:Gilbert_Islands"{
ls{"گِلبٲٹ ججیٖرُک ٹایِم"}
}
- "meta:Greenland_Central"{
- ld{"مرکزی گریٖن لینڑُک سَمَر ٹایِم"}
- lg{"مرکزی گریٖنلینڑُک ٹایِم"}
- ls{"مرکزی گریٖنلینڑُک سٹینڑاڑ ٹایِم"}
- }
"meta:Greenland_Eastern"{
ld{"مشرِقی گریٖن لینڑُک سَمَر ٹایِم"}
lg{"مشرِقی گریٖن لینڑُک ٹایِم"}
@@ -1539,23 +1485,12 @@
lg{"کَمچَٹکا ٹایِم"}
ls{"کَمچَٹکا سٹینڑاڑ ٹایِم"}
}
- "meta:Karachi"{
- ls{"کَراچی ٹایِم"}
- }
- "meta:Kashgar"{
- ls{"کَشگَر ٹایِم"}
- }
"meta:Kazakhstan_Eastern"{
ls{"مشرِقی کَزاکھِستان ٹایِم"}
}
"meta:Kazakhstan_Western"{
ls{"مغرِبی کَزاکھِستان ٹایِم"}
}
- "meta:Kizilorda"{
- ld{"کِزِلوڑا سَمَر ٹایِم"}
- lg{"کِزِلوڑا ٹایِم"}
- ls{"کِزِلوڑا سٹینڑاڑ ٹایِم"}
- }
"meta:Korea"{
ld{"کورِیا ڑےلایِٔٹ ٹایِم"}
lg{"کورِیا ٹایِم"}
@@ -1569,14 +1504,6 @@
lg{"کرٮ۪سنوےیارسک ٹایِم"}
ls{"کرٮ۪سنوےیارسک سٹینڑاڑ ٹایِم"}
}
- "meta:Kuybyshev"{
- ld{"کَےبَےشٮ۪و سَمَر ٹایِم"}
- lg{"کَےبَےشٮ۪و ٹایِم"}
- ls{"کَےبَےشٮ۪و سٹینڑاڑ ٹایِم"}
- }
- "meta:Kwajalein"{
- ls{"کواجٮ۪لین ٹایِم"}
- }
"meta:Kyrgystan"{
ls{"کِرگِستان ٹایِم"}
}
@@ -1586,9 +1513,6 @@
"meta:Line_Islands"{
ls{"لایِٔن ججیٖرُک ٹایِم"}
}
- "meta:Long_Shu"{
- ls{"لانگ شوٗ ٹایِم"}
- }
"meta:Lord_Howe"{
ld{"لعاڑ ڑےلایٔٹ ٹایِم"}
lg{"لعاڑ حووے ٹایِم"}
@@ -1604,9 +1528,6 @@
lg{"مَگَدَن ٹایِم"}
ls{"مَگَدَن سٹینڑاڑ ٹایِم"}
}
- "meta:Malaya"{
- ls{"مَلَیا ٹایِم"}
- }
"meta:Malaysia"{
ls{"مَلیشِیا ٹایِم"}
}
@@ -1746,22 +1667,14 @@
lg{"سمٮ۪را ٹایِم"}
ls{"سمٮ۪را سٹینڑاڑ ٹایِم"}
}
- "meta:Samarkand"{
- ld{"سَمَرکَنٛد سَمَر ٹایِم"}
- lg{"سَمَرکَنٛد ٹایِم"}
- ls{"سَمَرکَنٛد سٹینڑاڑ ٹایِم"}
- }
"meta:Samoa"{
- ls{"سٮ۪موآ"}
+ ld{"سٮ۪موآ سَمَر ٹایِم"}
+ lg{"سٮ۪موآ ٹایِم"}
+ ls{"سٮ۪موآ سٹینڑاڑ ٹایِم"}
}
"meta:Seychelles"{
ls{"سیشٮ۪لٕز ٹایِم"}
}
- "meta:Shevchenko"{
- ld{"شٮ۪وشٮ۪نکو سَمَر ٹایِم"}
- lg{"شٮ۪وشٮ۪نکو ٹایِم"}
- ls{"شٮ۪وشٮ۪نکو سٹینڑاڑ ٹایِم"}
- }
"meta:Singapore"{
ls{"سِنٛگاپوٗر ٹایِم"}
}
@@ -1774,11 +1687,6 @@
"meta:Suriname"{
ls{"سُرِنام ٹایِم"}
}
- "meta:Sverdlovsk"{
- ld{"سٕؤرڑلووسک سَمَر ٹایِم"}
- lg{"سٕؤرڑلووسک ٹایِم"}
- ls{"سٕؤرڑلووسک سٹینڑاڑ ٹایِم"}
- }
"meta:Syowa"{
ls{"سیووا ٹایِم"}
}
@@ -1788,16 +1696,6 @@
"meta:Tajikistan"{
ls{"تازِکِستان ٹایِم"}
}
- "meta:Tashkent"{
- ld{"تاشکند سَمَر ٹایِم"}
- lg{"تاشکَند ٹایِم"}
- ls{"تاشکَند سٹینڑاڑ ٹایِم"}
- }
- "meta:Tbilisi"{
- ld{"تِبلِسی سَمَر ٹایِم"}
- lg{"تِبلِسی ٹایِم"}
- ls{"تِبلِسی سٹینڑاڑ ٹایِم"}
- }
"meta:Tokelau"{
ls{"ٹوکٮ۪لو ٹایِم"}
}
@@ -1809,11 +1707,6 @@
"meta:Truk"{
ls{"ٹٔرک ٹایِم"}
}
- "meta:Turkey"{
- ld{"تُرکی سَمَر ٹایِم"}
- lg{"تُرکی ٹایِم"}
- ls{"تُرکی سٹینڑاڑ ٹایِم"}
- }
"meta:Turkmenistan"{
ld{"تُرکمٮ۪نِستان سَمَر ٹایِم"}
lg{"تُرکمٮ۪نِستان ٹایِم"}
@@ -1822,19 +1715,11 @@
"meta:Tuvalu"{
ls{"ٹوٗوَلوٗ ٹایِم"}
}
- "meta:Uralsk"{
- ld{"یوٗرالسک سَمَر ٹایِم"}
- lg{"یوٗرالسک ٹایِم"}
- ls{"یوٗرالسک سٹینڑاڑ ٹایِم"}
- }
"meta:Uruguay"{
ld{"یوٗرٮ۪گوَے سَمَر ٹایِم"}
lg{"یوٗرٮ۪گوَے ٹایِم"}
ls{"یوٗرٮ۪گوَے سٹینڑاڑ ٹایِم"}
}
- "meta:Urumqi"{
- ls{"اُرُمکی ٹایِم"}
- }
"meta:Uzbekistan"{
ld{"اُزبیکِستانُک سَمَر ٹایِم"}
lg{"اُزبیکِستان ٹایِم"}
@@ -1877,16 +1762,6 @@
lg{"یٮ۪کَٹٔرِنبٔرگ ٹایِم"}
ls{"یٮ۪کَٹٔرِنبٔرگ سٹینڑاڑ ٹایِم"}
}
- "meta:Yerevan"{
- ld{"ییٚرٮ۪وَن سَمَر ٹایِم"}
- lg{"ییٚرٮ۪وَن ٹایِم"}
- ls{"ییٚرٮ۪وَن سٹینڑاڑ ٹایِم"}
- }
- "meta:Yukon"{
- ld{"یَکَن ڈے لایِٹ ٹایِم"}
- lg{"یَکَن ٹایِم"}
- ls{"یَکَن سٹینڑاڑ سٹینڑاڑ ٹایِم"}
- }
gmtFormat{"GMT{0}"}
hourFormat{"+HH:mm;-HH:mm"}
}
diff --git a/data/zone/ks_Arab.txt b/data/zone/ks_Arab.txt
index cbef02c..903481b 100755
--- a/data/zone/ks_Arab.txt
+++ b/data/zone/ks_Arab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ks_Arab.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/ks_Arab.xml
*/
ks_Arab{
- Version{"2.0.75.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/ks_Arab_IN.txt b/data/zone/ks_Arab_IN.txt
index 47b5e54..9eac4af 100755
--- a/data/zone/ks_Arab_IN.txt
+++ b/data/zone/ks_Arab_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/ks_IN.txt b/data/zone/ks_IN.txt
index 558e1ea..fa6550f 100755
--- a/data/zone/ks_IN.txt
+++ b/data/zone/ks_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/ksb.txt b/data/zone/ksb.txt
index fb2f319..8c927f6 100755
--- a/data/zone/ksb.txt
+++ b/data/zone/ksb.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ksb.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/ksb.xml
*/
ksb{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/ksf.txt b/data/zone/ksf.txt
index 5df82e9..6a80151 100755
--- a/data/zone/ksf.txt
+++ b/data/zone/ksf.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ksf.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/ksf.xml
*/
ksf{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/kw.txt b/data/zone/kw.txt
index 687e864..4416e85 100644
--- a/data/zone/kw.txt
+++ b/data/zone/kw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/kw.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/kw.xml
*/
kw{
- Version{"2.0.74.74"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/lag.txt b/data/zone/lag.txt
index 65f1747..8461776 100755
--- a/data/zone/lag.txt
+++ b/data/zone/lag.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lag.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/lag.xml
*/
lag{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/lg.txt b/data/zone/lg.txt
index aad6b55..bacfaa7 100755
--- a/data/zone/lg.txt
+++ b/data/zone/lg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lg.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/lg.xml
*/
lg{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/ln.txt b/data/zone/ln.txt
index 9fce6fa..3b03a01 100755
--- a/data/zone/ln.txt
+++ b/data/zone/ln.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ln.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/ln.xml
*/
ln{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
zoneStrings{
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"Ngonga ya {1} ({0})"}
diff --git a/data/zone/lo.txt b/data/zone/lo.txt
index 004a26c..b6a5446 100755
--- a/data/zone/lo.txt
+++ b/data/zone/lo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lo.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/lo.xml
*/
lo{
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
zoneStrings{
"Africa:Abidjan"{
ec{"ອາບິດແຈນ"}
@@ -1248,21 +1248,11 @@
lg{"ເວລາອາຟຣິລິກາຕາເວັນຕົກ"}
ls{"ເວລາມາດຕະຖານອາຟຣິລິກາຕາເວັນຕົກ"}
}
- "meta:Aktyubinsk"{
- ld{"ເວລາລະດູຮ້ອນອັກທຸຍບິງ"}
- lg{"ເວລາອັກທຸຍບິງ"}
- ls{"ເວລາມາດຕະຖານອັກທຸຍບິງ"}
- }
"meta:Alaska"{
ld{"ເວລາຕອນທ່ຽງຂອງອະແລສກາ"}
lg{"ເວລາອະແລສກາ"}
ls{"ເວລາມາດຕະຖານອະແລສກາ"}
}
- "meta:Alaska_Hawaii"{
- ld{"ເວລາຕອນທ່ຽງຂອງອະແລສກາ-ຮາວາຍ"}
- lg{"ເວລາອະແລສກາ-ຮາວາຍ"}
- ls{"ເວລາມາດຕະຖານອະແລສກາ-ຮາວາຍ"}
- }
"meta:Almaty"{
ld{"ເວລາລະດູຮ້ອນອໍມາຕີ"}
lg{"ເວລາອໍມາຕີ"}
@@ -1323,11 +1313,6 @@
lg{"ເວລາອາເມເນຍ"}
ls{"ເວລາມາດຕະຖານອາເມເນຍ"}
}
- "meta:Ashkhabad"{
- ld{"ເວລາລະດູຮ້ອນອາກກາບັດ"}
- lg{"ເວລາອາກກາບັດ"}
- ls{"ເວລາມາດຕະຖານອາກກາບັດ"}
- }
"meta:Atlantic"{
ld{"ເວລາຕອນທ່ຽງຂອງອາແລນຕິກ"}
lg{"ເວລາຂອງອາແລນຕິກ"}
@@ -1368,22 +1353,12 @@
lg{"ເວລາ ບັງກະລາເທດ"}
ls{"ເວລາມາດຕະຖານ ບັງກະລາເທດ"}
}
- "meta:Bering"{
- ld{"ເວລາຕອນທ່ຽງຂອງເບຈິງ"}
- lg{"ເວລາຂອງເບຈິງ"}
- ls{"ເວລາມາດຕະຖານຂອງເບຈິງ"}
- }
"meta:Bhutan"{
ls{"ເວລາ ບູຖານ"}
}
"meta:Bolivia"{
ls{"ເວລາໂບລີເວີຍ"}
}
- "meta:Borneo"{
- ld{"ເວລາລະດູຮ້ອນບໍນຽວ"}
- lg{"ເວລາບໍນຽວ"}
- ls{"ເວລາມາດຕະຖານບໍນຽວ"}
- }
"meta:Brasilia"{
ld{"ເວລາລະດູຮ້ອນເບຣຊີເລຍ"}
lg{"ເວລາເບຣຊີເລຍ"}
@@ -1403,9 +1378,6 @@
"meta:Chamorro"{
ls{"ເວລາຊາມໍໂລ"}
}
- "meta:Changbai"{
- ls{"ເວລາຊ່າງໄປ"}
- }
"meta:Chatham"{
ld{"ເວລາກາງເວັນ ຊາທາມ"}
lg{"ເວລາ ຊາທາມ"}
@@ -1447,23 +1419,12 @@
lg{"ເວລາຄິວບາ"}
ls{"ເວລາມາດຕະຖານຂອງຄິວບາ"}
}
- "meta:Dacca"{
- ls{"ເວລາດາຄາ"}
- }
"meta:Davis"{
ls{"ເວລາເດວິດ"}
}
"meta:DumontDUrville"{
ls{"ເວລາດູມອງດູວິລ"}
}
- "meta:Dushanbe"{
- ld{"ເວລາລະດູຮ້ອນດູຊານເບ"}
- lg{"ເວລາດູຊານເບ"}
- ls{"ເວລາມາດຕະຖານດູຊານເບ"}
- }
- "meta:Dutch_Guiana"{
- ls{"ເວລາຂອງດັດກີອານາ"}
- }
"meta:East_Timor"{
ls{"ເວລາຕີມໍຕາເວັນອອກ"}
}
@@ -1506,11 +1467,6 @@
"meta:French_Southern"{
ls{"ເວລາຝຣັ່ງຕອນໃຕ້ແລະແອນຕາກຕິກ"}
}
- "meta:Frunze"{
- ld{"ເວລາລະດູຮ້ອນຝຸນ"}
- lg{"ເວລາຝຸນ"}
- ls{"ເວລາມາດຕະຖານຝຸນ"}
- }
"meta:GMT"{
ls{"ເວລາກຣີນີສ"}
}
@@ -1528,11 +1484,6 @@
"meta:Gilbert_Islands"{
ls{"ເວລາຫມູ່ເກາະກິລເບີດ"}
}
- "meta:Greenland_Central"{
- ld{"ເວລາລະດູຮ້ອນກຮີນແລນກາງ"}
- lg{"ເວລາກຮີນແລນກາງ"}
- ls{"ເວລາມາດຕະຖານກຮີນແລນກາງ"}
- }
"meta:Greenland_Eastern"{
ld{"ເວລາລະດູຮ້ອນກຮີນແລນຕາເວັນອອກ"}
lg{"ເວລາຕາເວັນອອກຂອງກຮີນແລນ"}
@@ -1605,23 +1556,12 @@
lg{"ເວລາ ຍີ່ປຸ່ນ"}
ls{"ເວລາມາດຕະຖານຂອງຍີ່ປຸ່ນ"}
}
- "meta:Karachi"{
- ls{"ເວລາກາລາຈິ"}
- }
- "meta:Kashgar"{
- ls{"ເວລາຄັດກາ"}
- }
"meta:Kazakhstan_Eastern"{
ls{"ເວລາກາຊັກສະຖານຕາເວັນອອກ"}
}
"meta:Kazakhstan_Western"{
ls{"ເວລາກາຊັກສະຖານຕາເວັນຕົກ"}
}
- "meta:Kizilorda"{
- ld{"ເວລາລະດູຮ້ອນຄີຊີລໍດາ"}
- lg{"ເວລາຄີຊີລໍດາ"}
- ls{"ເວລາມາດຕະຖານຄີຊີລໍດາ"}
- }
"meta:Korea"{
ld{"ເວລາກາງເວັນ ເກົາຫຼີ"}
lg{"ເວລາເກົາຫຼີ"}
@@ -1635,9 +1575,6 @@
lg{"ເວລາຄຣາສໂນຢາດສ"}
ls{"ເວລາມາດຕະຖານຄຣາສໂນຢາດສ"}
}
- "meta:Kwajalein"{
- ls{"ເວລາຄວາຈາເລນ"}
- }
"meta:Kyrgystan"{
ls{"ເວລາຄຣີກິສຖານ"}
}
@@ -1647,9 +1584,6 @@
"meta:Line_Islands"{
ls{"ເວລາຫມູ່ເກາະໄລນ໌"}
}
- "meta:Long_Shu"{
- ls{"ເວລາລອງຊູ"}
- }
"meta:Lord_Howe"{
ld{"ເວລາກາງເວັນ ລອດໂຮ"}
lg{"ເວລາ ລອດໂຮ"}
@@ -1668,9 +1602,6 @@
lg{"ເວລາເມັກກາເດນ"}
ls{"ເວລາມາດຕະຖານເມັກກາເດນ"}
}
- "meta:Malaya"{
- ls{"ເວລາມາລາຢາ"}
- }
"meta:Malaysia"{
ls{"ເວລາມາເລເຊັຍ"}
}
@@ -1805,22 +1736,14 @@
lg{"ເວລາສາຄາລິງ"}
ls{"ເວລາມາດຕະຖານສາຄາລິງ"}
}
- "meta:Samarkand"{
- ld{"ເວລາລະດູຮ້ອນສະມາກການ"}
- lg{"ເວລາສະມາກການ"}
- ls{"ເວລາມາດຕະຖານສະມາກການ"}
- }
"meta:Samoa"{
- ls{"ເວລາຊາມົວ"}
+ ld{"ເວລາລະດູຮ້ອນຊາມົວ"}
+ lg{"ເວລາຊາມົວ"}
+ ls{"ເວລາມາດຕະຖານຊາມົວ"}
}
"meta:Seychelles"{
ls{"ເວລາເຊເຊວ"}
}
- "meta:Shevchenko"{
- ld{"ເວລາລະດູຮ້ອນເຊບເຊນໂກ"}
- lg{"ເວລາເຊບເຊນໂກ"}
- ls{"ເວລາມາດຕະຖານເຊບເຊນໂກ"}
- }
"meta:Singapore"{
ls{"ເວລາສີງກະໂປ"}
}
@@ -1847,11 +1770,6 @@
"meta:Tajikistan"{
ls{"ເວລາທາຈິກິສຖານ"}
}
- "meta:Tashkent"{
- ld{"ເວລາລະດູຮ້ອນທາສເກັນ"}
- lg{"ເວລາທາສເກັນ"}
- ls{"ເວລາມາດຕະຖານທາສເກັນ"}
- }
"meta:Tokelau"{
ls{"ເວລາໂຕເກເລົາ"}
}
@@ -1871,19 +1789,11 @@
"meta:Tuvalu"{
ls{"ເວລາຕູວາລູ"}
}
- "meta:Uralsk"{
- ld{"ເວລາລະດູຮ້ອນອູລາສ"}
- lg{"ເວລາອູລາສ"}
- ls{"ເວລາມາດຕະຖານອູລາສ"}
- }
"meta:Uruguay"{
ld{"ເວລາລະດູຮ້ອນອຸກູໄວ"}
lg{"ເວລາອຸກູໄວ"}
ls{"ເວລາມາດຕະຖານອຸກູໄວ"}
}
- "meta:Urumqi"{
- ls{"ເວລາອຸລຳຊີ"}
- }
"meta:Uzbekistan"{
ld{"ເວລາລະດູຮ້ອນອຸສເບກິດສະຖານ"}
lg{"ເວລາອຸສເບກິດສະຖານ"}
@@ -1926,11 +1836,6 @@
lg{"ເວລາເຢກາເຕລິນເບີກ"}
ls{"ເວລາມາດຕະຖານເຢກາເຕລິນເບີກ"}
}
- "meta:Yukon"{
- ld{"ເວລາຕອນທ່ຽງຂອງຍູຄອນ"}
- lg{"ເວລາຂອງຍູຄອນ"}
- ls{"ເວລາມາດຕະຖານຍູຄອນ"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"{1} ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/lt.txt b/data/zone/lt.txt
index 31e656f..afcd284 100644
--- a/data/zone/lt.txt
+++ b/data/zone/lt.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lt.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/lt.xml
*/
lt{
- Version{"2.0.78.38"}
+ Version{"2.0.82.57"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidžanas"}
@@ -838,21 +838,11 @@
lg{"Vakarų Afrikos laikas"}
ls{"Vakarų Afrikos žiemos laikas"}
}
- "meta:Aktyubinsk"{
- ld{"Achtubinsko vasaros laikas"}
- lg{"Achtubinsko laikas"}
- ls{"Achtubinsko žiemos laikas"}
- }
"meta:Alaska"{
ld{"Aliaskos vasaros laikas"}
lg{"Aliaskos laikas"}
ls{"Aliaskos žiemos laikas"}
}
- "meta:Alaska_Hawaii"{
- ld{"Aliaskos-Havajų vasaros laikas"}
- lg{"Aliaskos-Havajų laikas"}
- ls{"Aliaskos-Havajų žiemos laikas"}
- }
"meta:Almaty"{
ld{"Almatos vasaros laikas"}
lg{"Almatos laikas"}
@@ -918,11 +908,6 @@
lg{"Armėnijos laikas"}
ls{"Armėnijos žiemos laikas"}
}
- "meta:Ashkhabad"{
- ld{"Ašchabado vasaros laikas"}
- lg{"Ašchabado laikas"}
- ls{"Ašchabado žiemos laikas"}
- }
"meta:Atlantic"{
ld{"Atlanto vasaros laikas"}
lg{"Atlanto laikas"}
@@ -958,32 +943,17 @@
lg{"Azorų Salų laikas"}
ls{"Azorų Salų žiemos laikas"}
}
- "meta:Baku"{
- ld{"Baku vasaros laikas"}
- lg{"Baku laikas"}
- ls{"Baku žiemos laikas"}
- }
"meta:Bangladesh"{
ld{"Bangladešo vasaros laikas"}
lg{"Bangladešo laikas"}
ls{"Bangladešo žiemos laikas"}
}
- "meta:Bering"{
- ld{"Beringo vasaros laikas"}
- lg{"Beringo laikas"}
- ls{"Beringo žiemos laikas"}
- }
"meta:Bhutan"{
ls{"Butano laikas"}
}
"meta:Bolivia"{
ls{"Bolivijos laikas"}
}
- "meta:Borneo"{
- ld{"Borneo vasaros laikas"}
- lg{"Borneo laikas"}
- ls{"Borneo žiemos laikas"}
- }
"meta:Brasilia"{
ld{"Brazilijos vasaros laikas"}
lg{"Brazilijos laikas"}
@@ -1000,9 +970,6 @@
"meta:Chamorro"{
ls{"Čamoro laikas"}
}
- "meta:Changbai"{
- ls{"Changbai laikas"}
- }
"meta:Chatham"{
ld{"Čatamo vasaros laikas"}
lg{"Čatamo laikas"}
@@ -1044,23 +1011,12 @@
lg{"Kubos laikas"}
ls{"Kubos žiemos laikas"}
}
- "meta:Dacca"{
- ls{"Dakos laikas"}
- }
"meta:Davis"{
ls{"Deiviso laikas"}
}
"meta:DumontDUrville"{
ls{"Diumono d'Urvilio laikas"}
}
- "meta:Dushanbe"{
- ld{"Dušanbės vasaros laikas"}
- lg{"Dušanbės laikas"}
- ls{"Dušanbės žiemos laikas"}
- }
- "meta:Dutch_Guiana"{
- ls{"Olandų Gajanos laikas"}
- }
"meta:East_Timor"{
ls{"Rytų Timoro laikas"}
}
@@ -1103,11 +1059,6 @@
"meta:French_Southern"{
ls{"Pietų Prancūzijos ir Antarktinis laikas"}
}
- "meta:Frunze"{
- ld{"Frunzės vasaros laikas"}
- lg{"Frunzės laikas"}
- ls{"Frunzės žiemos laikas"}
- }
"meta:GMT"{
ls{"Grinvičo laikas"}
}
@@ -1125,11 +1076,6 @@
"meta:Gilbert_Islands"{
ls{"Gilberto Salų laikas"}
}
- "meta:Greenland_Central"{
- ld{"Grenlandijos centro vasaros laikas"}
- lg{"Grenlandijos centro laikas"}
- ls{"Grenlandijos centro žiemos laikas"}
- }
"meta:Greenland_Eastern"{
ld{"Grenlandijos rytų vasaros laikas"}
lg{"Grenlandijos rytų laikas"}
@@ -1207,23 +1153,12 @@
lg{"Kamčiatkos Petropavlovsko laikas"}
ls{"Kamčiatkos Petropavlovsko žiemos laikas"}
}
- "meta:Karachi"{
- ls{"Karačio laikas"}
- }
- "meta:Kashgar"{
- ls{"Kašgaro laikas"}
- }
"meta:Kazakhstan_Eastern"{
ls{"Rytų Kazachstano laikas"}
}
"meta:Kazakhstan_Western"{
ls{"Vakarų Kazachstano laikas"}
}
- "meta:Kizilorda"{
- ld{"Kizilordos vasaros laikas"}
- lg{"Kizilordos laikas"}
- ls{"Kizilordos žiemos laikas"}
- }
"meta:Korea"{
ld{"Korėjos vasaros laikas"}
lg{"Korėjos laikas"}
@@ -1237,14 +1172,6 @@
lg{"Krasnojarsko laikas"}
ls{"Krasnojarsko žiemos laikas"}
}
- "meta:Kuybyshev"{
- ld{"Kuibyševo vasaros laikas"}
- lg{"Kuibyševo laikas"}
- ls{"Kuibyševo žiemos laikas"}
- }
- "meta:Kwajalein"{
- ls{"Maršalo Salos laikas"}
- }
"meta:Kyrgystan"{
ls{"Kirgistano laikas"}
}
@@ -1254,9 +1181,6 @@
"meta:Line_Islands"{
ls{"Laino Salų laikas"}
}
- "meta:Long_Shu"{
- ls{"Long-Shu laikas"}
- }
"meta:Lord_Howe"{
ld{"Lordo Hau vasaros laikas"}
lg{"Lordo Hau laikas"}
@@ -1275,9 +1199,6 @@
lg{"Magadano laikas"}
ls{"Magadano žiemos laikas"}
}
- "meta:Malaya"{
- ls{"Malajos laikas"}
- }
"meta:Malaysia"{
ls{"Malaizijos laikas"}
}
@@ -1417,22 +1338,14 @@
lg{"Samaros laikas"}
ls{"Samaros žiemos laikas"}
}
- "meta:Samarkand"{
- ld{"Samarkando vasaros laikas"}
- lg{"Samarkando laikas"}
- ls{"Samarkando žiemos laikas"}
- }
"meta:Samoa"{
- ls{"Samoa laikas"}
+ ld{"Samoa vasaros laikas"}
+ lg{"Samoa laikas"}
+ ls{"Samoa žiemos laikas"}
}
"meta:Seychelles"{
ls{"Seišelių laikas"}
}
- "meta:Shevchenko"{
- ld{"Ševčenkos vasaros laikas"}
- lg{"Ševčenkos laikas"}
- ls{"Ševčenkos žiemos laikas"}
- }
"meta:Singapore"{
ls{"Singapūro laikas"}
}
@@ -1445,11 +1358,6 @@
"meta:Suriname"{
ls{"Surinamo laikas"}
}
- "meta:Sverdlovsk"{
- ld{"Sverdlovsko vasaros laikas"}
- lg{"Sverdlovsko laikas"}
- ls{"Sverdlovsko žiemos laikas"}
- }
"meta:Syowa"{
ls{"Siovos laikas"}
}
@@ -1464,16 +1372,6 @@
"meta:Tajikistan"{
ls{"Tadžikistano laikas"}
}
- "meta:Tashkent"{
- ld{"Taškento vasaros laikas"}
- lg{"Taškento laikas"}
- ls{"Taškento žiemos laikas"}
- }
- "meta:Tbilisi"{
- ld{"Tbilisio vasaros laikas"}
- lg{"Tbilisio laikas"}
- ls{"Tbilisio žiemos laikas"}
- }
"meta:Tokelau"{
ls{"Tokelau laikas"}
}
@@ -1485,11 +1383,6 @@
"meta:Truk"{
ls{"Čuko laikas"}
}
- "meta:Turkey"{
- ld{"Turkijos vasaros laikas"}
- lg{"Turkijos laikas"}
- ls{"Turkijos žiemos laikas"}
- }
"meta:Turkmenistan"{
ld{"Turkmėnistano vasaros laikas"}
lg{"Turkmėnistano laikas"}
@@ -1498,19 +1391,11 @@
"meta:Tuvalu"{
ls{"Tuvalu laikas"}
}
- "meta:Uralsk"{
- ld{"Uralsko vasaros laikas"}
- lg{"Uralsko laikas"}
- ls{"Uralsko žiemos laikas"}
- }
"meta:Uruguay"{
ld{"Urugvajaus vasaros laikas"}
lg{"Urugvajaus laikas"}
ls{"Urugvajaus žiemos laikas"}
}
- "meta:Urumqi"{
- ls{"Urumčio laikas"}
- }
"meta:Uzbekistan"{
ld{"Uzbekistano vasaros laikas"}
lg{"Uzbekistano laikas"}
@@ -1553,11 +1438,6 @@
lg{"Jekaterinburgo laikas"}
ls{"Jekaterinburgo žiemos laikas"}
}
- "meta:Yerevan"{
- ld{"Jerevano vasaros laikas"}
- lg{"Jerevano laikas"}
- ls{"Jerevano žiemos laikas"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"{1} ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/lu.txt b/data/zone/lu.txt
index 66e7227..706dff0 100755
--- a/data/zone/lu.txt
+++ b/data/zone/lu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lu.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/lu.xml
*/
lu{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/luo.txt b/data/zone/luo.txt
index 184d7ec..af7c2cf 100755
--- a/data/zone/luo.txt
+++ b/data/zone/luo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/luo.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/luo.xml
*/
luo{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/luy.txt b/data/zone/luy.txt
index db967de..04bb337 100755
--- a/data/zone/luy.txt
+++ b/data/zone/luy.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/luy.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/luy.xml
*/
luy{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/lv.txt b/data/zone/lv.txt
index e75202d..68bba1a 100644
--- a/data/zone/lv.txt
+++ b/data/zone/lv.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/lv.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/lv.xml
*/
lv{
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidžana"}
@@ -1148,11 +1148,6 @@
lg{"Armēnijas laiks"}
ls{"Armēnijas ziemas laiks"}
}
- "meta:Ashkhabad"{
- ld{"Ašhabadas vasaras laiks"}
- lg{"Ašhabadas laiks"}
- ls{"Ašhabadas ziemas laiks"}
- }
"meta:Atlantic"{
ld{"Atlantijas vasaras laiks"}
lg{"Atlantijas laiks"}
@@ -1188,11 +1183,6 @@
lg{"Azoru salu laiks"}
ls{"Azoru salu ziemas laiks"}
}
- "meta:Baku"{
- ld{"Baku vasaras laiks"}
- lg{"Baku laiks"}
- ls{"Baku ziemas laiks"}
- }
"meta:Bangladesh"{
ld{"Bangladešas vasaras laiks"}
lg{"Bangladešas laiks"}
@@ -1204,11 +1194,6 @@
"meta:Bolivia"{
ls{"Bolīvijas laiks"}
}
- "meta:Borneo"{
- ld{"Borneo vasaras laiks"}
- lg{"Borneo laiks"}
- ls{"Borneo ziemas laiks"}
- }
"meta:Brasilia"{
ld{"Brazīlijas vasaras laiks"}
lg{"Brazīlijas laiks"}
@@ -1272,11 +1257,6 @@
"meta:DumontDUrville"{
ls{"Dimondirvilas laiks"}
}
- "meta:Dushanbe"{
- ld{"Dušanbe vasaras laiks"}
- lg{"Dušanbe laiks"}
- ls{"Dušanbe ziemas laiks"}
- }
"meta:East_Timor"{
ls{"Austrumtimoras laiks"}
}
@@ -1328,11 +1308,6 @@
"meta:French_Southern"{
ls{"Francijas Dienidjūru un Antarktikas teritorijas laiks"}
}
- "meta:Frunze"{
- ld{"Frunzes vasaras laiks"}
- lg{"Frunzes laiks"}
- ls{"Frunzes ziemas laiks"}
- }
"meta:GMT"{
ls{"Griničas laiks"}
}
@@ -1443,11 +1418,6 @@
lg{"Krasnojarskas laiks"}
ls{"Krasnojarskas ziemas laiks"}
}
- "meta:Kuybyshev"{
- ld{"Kuibiševas vasaras laiks"}
- lg{"Kuibiševas laiks"}
- ls{"Kuibiševas ziemas laiks"}
- }
"meta:Kyrgystan"{
ls{"Kirgizstānas laiks"}
}
@@ -1598,13 +1568,10 @@
lg{"Samaras laiks"}
ls{"Samaras ziemas laiks"}
}
- "meta:Samarkand"{
- ld{"Samarkandas vasaras laiks"}
- lg{"Samarkandas laiks"}
- ls{"Samarkandas ziemas laiks"}
- }
"meta:Samoa"{
- ls{"Samoa standarta laiks"}
+ ld{"Samoa vasaras laiks"}
+ lg{"Samoa laiks"}
+ ls{"Samoa ziemas laiks"}
}
"meta:Seychelles"{
ls{"Seišeļu salu laiks"}
@@ -1621,11 +1588,6 @@
"meta:Suriname"{
ls{"Surinamas laiks"}
}
- "meta:Sverdlovsk"{
- ld{"Sverdlovskas vasaras laiks"}
- lg{"Sverdlovskas laiks"}
- ls{"Sverdlovskas ziemas laiks"}
- }
"meta:Syowa"{
ls{"Šovas laiks"}
}
@@ -1640,16 +1602,6 @@
"meta:Tajikistan"{
ls{"Tadžikistānas laiks"}
}
- "meta:Tashkent"{
- ld{"Taškentas vasaras laiks"}
- lg{"Taškentas laiks"}
- ls{"Taškentas ziemas laiks"}
- }
- "meta:Tbilisi"{
- ld{"Tbilisi vasaras laiks"}
- lg{"Tbilisi laiks"}
- ls{"Tbilisi ziemas laiks"}
- }
"meta:Tokelau"{
ls{"Tokelau laiks"}
}
@@ -1661,11 +1613,6 @@
"meta:Truk"{
ls{"Čūkas laiks"}
}
- "meta:Turkey"{
- ld{"Turcijas vasaras laiks"}
- lg{"Turcijas laiks"}
- ls{"Turcijas ziemas laiks"}
- }
"meta:Turkmenistan"{
ld{"Turkmenistānas vasaras laiks"}
lg{"Turkmenistānas laiks"}
@@ -1721,16 +1668,6 @@
lg{"Jekaterinburgas laiks"}
ls{"Jekaterinburgas ziemas laiks"}
}
- "meta:Yerevan"{
- ld{"Erevānas vasaras laiks"}
- lg{"Erevānas laiks"}
- ls{"Erevānas ziemas laiks"}
- }
- "meta:Yukon"{
- ld{"Jukonas vasaras laiks"}
- lg{"Jukonas laiks"}
- ls{"Jukonas ziemas laiks"}
- }
fallbackFormat{"{0} ({1})"}
fallbackRegionFormat{"Laika josla: {1} ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/mas.txt b/data/zone/mas.txt
index 3e6fd9d..026e458 100755
--- a/data/zone/mas.txt
+++ b/data/zone/mas.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mas.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/mas.xml
*/
mas{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/mer.txt b/data/zone/mer.txt
index 7202cc2..f0851d9 100755
--- a/data/zone/mer.txt
+++ b/data/zone/mer.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mer.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/mer.xml
*/
mer{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/mfe.txt b/data/zone/mfe.txt
index 685d69d..7480232 100755
--- a/data/zone/mfe.txt
+++ b/data/zone/mfe.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mfe.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/mfe.xml
*/
mfe{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/mg.txt b/data/zone/mg.txt
index f75b852..1fc9d40 100755
--- a/data/zone/mg.txt
+++ b/data/zone/mg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mg.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/mg.xml
*/
mg{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/mgh.txt b/data/zone/mgh.txt
index c45e6d7..6898a66 100755
--- a/data/zone/mgh.txt
+++ b/data/zone/mgh.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mgh.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/mgh.xml
*/
mgh{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/mgo.txt b/data/zone/mgo.txt
index 7d2ec22..c639d77 100755
--- a/data/zone/mgo.txt
+++ b/data/zone/mgo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mgo.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/mgo.xml
*/
mgo{
- Version{"2.0.77.53"}
+ Version{"2.0.82.45"}
zoneStrings{
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"{1} ({0})"}
diff --git a/data/zone/mk.txt b/data/zone/mk.txt
index 7f92574..783c24a 100644
--- a/data/zone/mk.txt
+++ b/data/zone/mk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mk.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/mk.xml
*/
mk{
- Version{"2.0.78.17"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Ceuta"{
ec{"Сеута"}
@@ -652,11 +652,6 @@
lg{"Време во Бангладеш"}
ls{"Стандардно време во Бангладеш"}
}
- "meta:Bering"{
- ld{"Беринг летно сметање на времето"}
- lg{"Беринг време"}
- ls{"Беринг стандардно време"}
- }
"meta:Bhutan"{
ls{"Време во Бутан"}
}
@@ -726,9 +721,6 @@
"meta:DumontDUrville"{
ls{"Димон-дурвил време"}
}
- "meta:Dutch_Guiana"{
- ls{"Холандска Гвајана време"}
- }
"meta:East_Timor"{
ls{"Време во Источен Тимор"}
}
@@ -797,11 +789,6 @@
"meta:Gilbert_Islands"{
ls{"Време на Островите Гилберт"}
}
- "meta:Greenland_Central"{
- ld{"Централен Гренланд летно сметање на времето"}
- lg{"Централен Гренланд време"}
- ls{"Централен Гренланд стандардно време"}
- }
"meta:Greenland_Eastern"{
ld{"Источен Гренланд летно сметање на времето"}
lg{"Источен Гренланд време"}
@@ -890,11 +877,6 @@
lg{"Време во Краснојарск"}
ls{"Стандардно време во Краснојарск"}
}
- "meta:Kuybyshev"{
- ld{"Кујбишев летно сметање на времето"}
- lg{"Кујбишев време"}
- ls{"Кујбишев стандардно време"}
- }
"meta:Kyrgystan"{
ls{"Време во Киргистан"}
}
@@ -1046,7 +1028,9 @@
ls{"Самара стандардно време"}
}
"meta:Samoa"{
- ls{"Време во Самоа"}
+ ld{"Летно време во Самоа"}
+ lg{"Време во Самоа"}
+ ls{"Стандардно време во Самоа"}
}
"meta:Seychelles"{
ls{"Време на Сејшели"}
@@ -1088,11 +1072,6 @@
"meta:Truk"{
ls{"Време во Чуук"}
}
- "meta:Turkey"{
- ld{"Турција летно сметање на времето"}
- lg{"Турција време"}
- ls{"Турција стандардно време"}
- }
"meta:Turkmenistan"{
ld{"Летно време во Туркменистан"}
lg{"Време во Туркменистан"}
@@ -1148,11 +1127,6 @@
lg{"Време во Екатеринбург"}
ls{"Стандардно време во Екатеринбург"}
}
- "meta:Yukon"{
- ld{"Јукон летно сметање на времето"}
- lg{"Јукон време"}
- ls{"Јукон стандардно време"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"{1} ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/ml.txt b/data/zone/ml.txt
index 34e0e67..9b34a1c 100644
--- a/data/zone/ml.txt
+++ b/data/zone/ml.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ml.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/ml.xml
*/
ml{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"അബിദ്ജാൻ"}
@@ -1246,21 +1246,11 @@
lg{"പശ്ചിമാഫ്രിക്കൻ സമയം"}
ls{"പശ്ചിമാഫ്രിക്കൻ സ്റ്റാൻഡേർഡ് സമയം"}
}
- "meta:Aktyubinsk"{
- ld{"അക്ത്യുബിൻസ്ക് വേനൽക്കാല സമയം"}
- lg{"അക്ത്യുബിൻസ്ക് സമയം"}
- ls{"അക്ത്യുബിൻസ്ക് സ്റ്റാൻഡേർഡ് സമയം"}
- }
"meta:Alaska"{
ld{"അലാസ്ക പകൽ സമയം"}
lg{"അലാസ്ക്ക സമയം"}
ls{"അലാസ്ക സ്റ്റാൻഡേർഡ് സമയം"}
}
- "meta:Alaska_Hawaii"{
- ld{"അലാസ്ക-ഹവായി പകൽ സമയം"}
- lg{"അലാസ്ക-ഹവായി സമയം"}
- ls{"അലാസ്ക-ഹവായി സ്റ്റാൻഡേർഡ് സമയം"}
- }
"meta:Almaty"{
ld{"അൽമതി വേനൽക്കാല സമയം"}
lg{"അൽമതി സമയം"}
@@ -1326,11 +1316,6 @@
lg{"അർമേനിയ സമയം"}
ls{"അർമേനിയ സ്റ്റാൻഡേർഡ് സമയം"}
}
- "meta:Ashkhabad"{
- ld{"അഷ്ഖാബാദ് വേനൽക്കാല സമയം"}
- lg{"അഷ്ഖാബാദ് സമയം"}
- ls{"അഷ്ഖാബാദ് സ്റ്റാൻഡേർഡ് സമയം"}
- }
"meta:Atlantic"{
ld{"അറ്റ്ലാൻറിക് പകൽ സമയം"}
lg{"അറ്റ്ലാൻറിക് സമയം"}
@@ -1366,32 +1351,17 @@
lg{"എയ്സോർസ് സമയം"}
ls{"എയ്സോർസ് സ്റ്റാൻഡേർഡ് സമയം"}
}
- "meta:Baku"{
- ld{"ബാകു വേനൽക്കാല സമയം"}
- lg{"ബാകു സമയം"}
- ls{"ബാകു സ്റ്റാൻഡേർഡ് സമയം"}
- }
"meta:Bangladesh"{
ld{"ബംഗ്ലാദേശ് വേനൽക്കാല സമയം"}
lg{"ബംഗ്ലാദേശ് സമയം"}
ls{"ബംഗ്ലാദേശ് സ്റ്റാൻഡേർഡ് സമയം"}
}
- "meta:Bering"{
- ld{"ബെറിങ് പകൽ സമയം"}
- lg{"ബെറിങ് സമയം"}
- ls{"ബെറിങ് സ്റ്റാൻഡേർഡ് സമയം"}
- }
"meta:Bhutan"{
ls{"ഭൂട്ടാൻ സമയം"}
}
"meta:Bolivia"{
ls{"ബൊളീവിയ സമയം"}
}
- "meta:Borneo"{
- ld{"ബോർണിയോ വേനൽക്കാല സമയം"}
- lg{"ബോർണിയോ സമയം"}
- ls{"ബോർണിയോ സ്റ്റാൻഡേർഡ് സമയം"}
- }
"meta:Brasilia"{
ld{"ബ്രസീലിയ വേനൽക്കാല സമയം"}
lg{"ബ്രാസിലിയ സമയം"}
@@ -1408,9 +1378,6 @@
"meta:Chamorro"{
ls{"കമോറോ സമയം"}
}
- "meta:Changbai"{
- ls{"ചാങ്ബയ് സമയം"}
- }
"meta:Chatham"{
ld{"ചാതം വേനൽക്കാല സമയം"}
lg{"ചാതം സമയം"}
@@ -1452,23 +1419,12 @@
lg{"ക്യൂബ സമയം"}
ls{"ക്യൂബ സ്റ്റാൻഡേർഡ് സമയം"}
}
- "meta:Dacca"{
- ls{"ഡാക്ക സമയം"}
- }
"meta:Davis"{
ls{"ഡെയ്വിസ് സമയം"}
}
"meta:DumontDUrville"{
ls{"ഡ്യൂമണ്ട് ഡി യൂർവിൽ സമയം"}
}
- "meta:Dushanbe"{
- ld{"ദുഷാൻബെ വേനൽക്കാല സമയം"}
- lg{"ദുഷാൻബെ സമയം"}
- ls{"ദുഷാൻബെ സ്റ്റാൻഡേർഡ് സമയം"}
- }
- "meta:Dutch_Guiana"{
- ls{"ഡച്ച് ഗയാന സമയം"}
- }
"meta:East_Timor"{
ls{"കിഴക്കൻ തിമൂർ സമയം"}
}
@@ -1511,11 +1467,6 @@
"meta:French_Southern"{
ls{"ഫ്രെഞ്ച് സതേൺ ആൻഡ് അൻറാർട്ടിക് സമയം"}
}
- "meta:Frunze"{
- ld{"ഫ്രൂൻസ് വേനൽക്കാല സമയം"}
- lg{"ഫ്രൂൻസ് സമയം"}
- ls{"ഫ്രൂൻസ് സ്റ്റാൻഡേർഡ് സമയം"}
- }
"meta:GMT"{
ls{"ഗ്രീൻവിച്ച് മീൻ സമയം"}
}
@@ -1533,11 +1484,6 @@
"meta:Gilbert_Islands"{
ls{"ഗിൽബർട്ട് ദ്വീപുകൾ സമയം"}
}
- "meta:Greenland_Central"{
- ld{"സെൻട്രൽ ഗ്രീൻലാൻഡ് വേനൽക്കാല സമയം"}
- lg{"സെൻട്രൽ ഗ്രീൻലാൻഡ് സമയം"}
- ls{"സെൻട്രൽ ഗ്രീൻലാൻഡ് സ്റ്റാൻഡേർഡ് സമയം"}
- }
"meta:Greenland_Eastern"{
ld{"കിഴക്കൻ ഗ്രീൻലാൻഡ് വേനൽക്കാല സമയം"}
lg{"കിഴക്കൻ ഗ്രീൻലാൻഡ് സമയം"}
@@ -1616,23 +1562,12 @@
lg{"പെട്രോപാവ്ലോസ്ക് കംചാസ്കി സമയം"}
ls{"പെട്രോപാവ്ലോസ്ക് കംചാസ്കി സ്റ്റാൻഡേർഡ് സമയം"}
}
- "meta:Karachi"{
- ls{"കറാച്ചി സമയം"}
- }
- "meta:Kashgar"{
- ls{"കാഷ്ഗർ സമയം"}
- }
"meta:Kazakhstan_Eastern"{
ls{"കിഴക്കൻ കസാഖ്സ്ഥാൻ സമയം"}
}
"meta:Kazakhstan_Western"{
ls{"പടിഞ്ഞാറൻ കസാഖ്സ്ഥാൻ സമയം"}
}
- "meta:Kizilorda"{
- ld{"കിസിലോർഡ വേനൽക്കാല സമയം"}
- lg{"കിസിലോർഡ സമയം"}
- ls{"കിസിലോർഡ സ്റ്റാൻഡേർഡ് സമയം"}
- }
"meta:Korea"{
ld{"കൊറിയൻ പകൽ സമയം"}
lg{"കൊറിയൻ സമയം"}
@@ -1646,14 +1581,6 @@
lg{"ക്രിസ്നോയാർസ്കി സമയം"}
ls{"ക്രാസ്നോയാഴ്സ്ക് സ്റ്റാൻഡേർഡ് സമയം"}
}
- "meta:Kuybyshev"{
- ld{"കുയ്ബൈഷെവ് വേനൽക്കാല സമയം"}
- lg{"കുയ്ബൈഷെവ് സമയം"}
- ls{"കുയ്ബൈഷെവ് സ്റ്റാൻഡേർഡ് സമയം"}
- }
- "meta:Kwajalein"{
- ls{"ക്വാജലെയ്ൻ സമയം"}
- }
"meta:Kyrgystan"{
ls{"കിർഗിസ്ഥാൻ സമയം"}
}
@@ -1663,9 +1590,6 @@
"meta:Line_Islands"{
ls{"ലൈൻ ദ്വീപുകൾ സമയം"}
}
- "meta:Long_Shu"{
- ls{"ലോങ്-ഷു സമയം"}
- }
"meta:Lord_Howe"{
ld{"ലോർഡ് ഹോവ് പകൽ സമയം"}
lg{"ലോർഡ് ഹോവ് സമയം"}
@@ -1684,9 +1608,6 @@
lg{"മഗഡാൻ സ്മയം"}
ls{"മഗാഡൻ സ്റ്റാൻഡേർഡ് സമയം"}
}
- "meta:Malaya"{
- ls{"മലയ സമയം"}
- }
"meta:Malaysia"{
ls{"മലേഷ്യ സമയം"}
}
@@ -1826,22 +1747,14 @@
lg{"സമാര സമയം"}
ls{"സമാറ സ്റ്റാൻഡേർഡ് സമയം"}
}
- "meta:Samarkand"{
- ld{"സമർകന്ദ് വേനൽക്കാല സമയം"}
- lg{"സമർകന്ദ് സമയം"}
- ls{"സമർകന്ദ് സ്റ്റാൻഡേർഡ് സമയം"}
- }
"meta:Samoa"{
+ ld{"സമോവാ വേനൽക്കാല സമയം"}
+ lg{"സമോവാ സമയം"}
ls{"സമോവാ സ്റ്റാൻഡേർഡ് സമയം"}
}
"meta:Seychelles"{
ls{"സെയ്ഷെൽസ് സമയം"}
}
- "meta:Shevchenko"{
- ld{"ഷെവ്ചെങ്കോ വേനൽക്കാല സമയം"}
- lg{"ഷെവ്ചെങ്കോ സമയം"}
- ls{"ഷെവ്ചെങ്കോ സ്റ്റാൻഡേർഡ് സമയം"}
- }
"meta:Singapore"{
ls{"സിങ്കപ്പൂർ സ്റ്റാൻഡേർഡ് സമയം"}
}
@@ -1854,11 +1767,6 @@
"meta:Suriname"{
ls{"സൂറിനാം സമയം"}
}
- "meta:Sverdlovsk"{
- ld{"സ്വേഡ്ലോവ്സ്ക് വേനൽക്കാല സമയം"}
- lg{"സ്വേഡ്ലോവ്സ്ക് സമയം"}
- ls{"സ്വേഡ്ലോവ്സ്ക് സ്റ്റാൻഡേർഡ് സമയം"}
- }
"meta:Syowa"{
ls{"സ്യോവ സമയം"}
}
@@ -1873,16 +1781,6 @@
"meta:Tajikistan"{
ls{"തജികിസ്ഥാൻ സമയം"}
}
- "meta:Tashkent"{
- ld{"താഷ്കന്ദ് വേനൽക്കാല സമയം"}
- lg{"താഷ്കന്ദ് സമയം"}
- ls{"താഷ്കന്ദ് സ്റ്റാൻഡേർഡ് സമയം"}
- }
- "meta:Tbilisi"{
- ld{"തിബിലീസി വേനൽക്കാല സമയം"}
- lg{"തിബിലീസി സമയം"}
- ls{"തിബിലീസി സ്റ്റാൻഡേർഡ് സമയം"}
- }
"meta:Tokelau"{
ls{"റ്റോക്കിലൌ സമയം"}
}
@@ -1894,11 +1792,6 @@
"meta:Truk"{
ls{"ട്രക്ക് സമയം"}
}
- "meta:Turkey"{
- ld{"തുർക്കി വേനൽക്കാല സമയം"}
- lg{"തുർക്കി സമയം"}
- ls{"തുർക്കി സ്റ്റാൻഡേർഡ് സമയം"}
- }
"meta:Turkmenistan"{
ld{"തുർക്ക്മെനിസ്ഥാൻ വേനൽക്കാല സമയം"}
lg{"തുർക്ക്മെനിസ്ഥാൻ സമയം"}
@@ -1907,19 +1800,11 @@
"meta:Tuvalu"{
ls{"തുവാലു സമയം"}
}
- "meta:Uralsk"{
- ld{"യുറാൽസ്ക് വേനൽക്കാല സമയം"}
- lg{"യുറാൽസ്ക് സമയം"}
- ls{"യുറാൽസ്ക് സ്റ്റാൻഡേർഡ് സമയം"}
- }
"meta:Uruguay"{
ld{"ഉറുഗ്വെ വേനൽക്കാല സമയം"}
lg{"ഉറുഗ്വെ സമയം"}
ls{"ഉറുഗ്വെ സ്റ്റാൻഡേർഡ് സമയം"}
}
- "meta:Urumqi"{
- ls{"ഉറുംഖി വേനൽക്കാല സമയം"}
- }
"meta:Uzbekistan"{
ld{"ഉസ്ബക്കിസ്ഥാൻ വേനൽക്കാല സമയം"}
lg{"ഉസ്ബക്കിസ്ഥാൻ സമയം"}
@@ -1962,16 +1847,6 @@
lg{"യിക്കാരെറിൻബർഗ് സമയം"}
ls{"യെക്കാറ്ററിൻബർഗ് സ്റ്റാൻഡേർഡ് സമയം"}
}
- "meta:Yerevan"{
- ld{"യെരെവാൻ വേനൽക്കാല സമയം"}
- lg{"യെരെവാൻ സമയം"}
- ls{"യെരെവാൻ സ്റ്റാൻഡേർഡ് സമയം"}
- }
- "meta:Yukon"{
- ld{"യൂക്കൺ പകൽ സമയം"}
- lg{"യൂക്കോൺ സമയം"}
- ls{"യൂക്കോൺ സ്റ്റാൻഡേർഡ് സമയം"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"{1} സമയം ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/mn.txt b/data/zone/mn.txt
new file mode 100755
index 0000000..0a8897e
--- /dev/null
+++ b/data/zone/mn.txt
@@ -0,0 +1,1837 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/mn.xml
+// *
+// ***************************************************************************
+/**
+ * ICU <specials> source: <path>/xml/main/mn.xml
+ */
+mn{
+ Version{"2.0.82.51"}
+ zoneStrings{
+ "Africa:Abidjan"{
+ ec{"Абижан"}
+ }
+ "Africa:Accra"{
+ ec{"Аккра"}
+ }
+ "Africa:Addis_Ababa"{
+ ec{"Аддис-абеба"}
+ }
+ "Africa:Algiers"{
+ ec{"Алжир"}
+ }
+ "Africa:Asmera"{
+ ec{"Асмара"}
+ }
+ "Africa:Bamako"{
+ ec{"Бамако"}
+ }
+ "Africa:Bangui"{
+ ec{"Бангуй"}
+ }
+ "Africa:Banjul"{
+ ec{"Банжул"}
+ }
+ "Africa:Bissau"{
+ ec{"Биссау"}
+ }
+ "Africa:Blantyre"{
+ ec{"Блантайр"}
+ }
+ "Africa:Brazzaville"{
+ ec{"Браззавиль"}
+ }
+ "Africa:Bujumbura"{
+ ec{"Бужумбура"}
+ }
+ "Africa:Cairo"{
+ ec{"Каир"}
+ }
+ "Africa:Casablanca"{
+ ec{"Касабланка"}
+ }
+ "Africa:Ceuta"{
+ ec{"Сеута"}
+ }
+ "Africa:Conakry"{
+ ec{"Конакри"}
+ }
+ "Africa:Dakar"{
+ ec{"Дакар"}
+ }
+ "Africa:Dar_es_Salaam"{
+ ec{"Дар-эс-Салам"}
+ }
+ "Africa:Djibouti"{
+ ec{"Жибоути"}
+ }
+ "Africa:Douala"{
+ ec{"Дуала"}
+ }
+ "Africa:El_Aaiun"{
+ ec{"Эль-Аюн"}
+ }
+ "Africa:Freetown"{
+ ec{"Фритаун"}
+ }
+ "Africa:Gaborone"{
+ ec{"Габороне"}
+ }
+ "Africa:Harare"{
+ ec{"Хараре"}
+ }
+ "Africa:Johannesburg"{
+ ec{"Йоханнесбург"}
+ }
+ "Africa:Juba"{
+ ec{"Жуба"}
+ }
+ "Africa:Kampala"{
+ ec{"Кампала"}
+ }
+ "Africa:Khartoum"{
+ ec{"Хартум"}
+ }
+ "Africa:Kigali"{
+ ec{"Кигали"}
+ }
+ "Africa:Kinshasa"{
+ ec{"Киншаса"}
+ }
+ "Africa:Lagos"{
+ ec{"Лагос"}
+ }
+ "Africa:Libreville"{
+ ec{"Либревиль"}
+ }
+ "Africa:Lome"{
+ ec{"Ломе"}
+ }
+ "Africa:Luanda"{
+ ec{"Луанда"}
+ }
+ "Africa:Lubumbashi"{
+ ec{"Лубумбаши"}
+ }
+ "Africa:Lusaka"{
+ ec{"Лусака"}
+ }
+ "Africa:Malabo"{
+ ec{"Малабо"}
+ }
+ "Africa:Maputo"{
+ ec{"Мапуто"}
+ }
+ "Africa:Maseru"{
+ ec{"Масеру"}
+ }
+ "Africa:Mbabane"{
+ ec{"Мбабане"}
+ }
+ "Africa:Mogadishu"{
+ ec{"Могадишу"}
+ }
+ "Africa:Monrovia"{
+ ec{"Монрова"}
+ }
+ "Africa:Nairobi"{
+ ec{"Найроби"}
+ }
+ "Africa:Ndjamena"{
+ ec{"Нжамена"}
+ }
+ "Africa:Niamey"{
+ ec{"Ниамей"}
+ }
+ "Africa:Nouakchott"{
+ ec{"Нуакшот"}
+ }
+ "Africa:Ouagadougou"{
+ ec{"Уагадугу"}
+ }
+ "Africa:Porto-Novo"{
+ ec{"Порто-Ново"}
+ }
+ "Africa:Sao_Tome"{
+ ec{"Сан-Том"}
+ }
+ "Africa:Tripoli"{
+ ec{"Триполи"}
+ }
+ "Africa:Tunis"{
+ ec{"Тунис"}
+ }
+ "Africa:Windhoek"{
+ ec{"Виндхук"}
+ }
+ "America:Adak"{
+ ec{"Адак"}
+ }
+ "America:Anchorage"{
+ ec{"Анкораж"}
+ }
+ "America:Anguilla"{
+ ec{"Ангилла"}
+ }
+ "America:Antigua"{
+ ec{"Антигуа"}
+ }
+ "America:Araguaina"{
+ ec{"Арагуана"}
+ }
+ "America:Argentina:La_Rioja"{
+ ec{"Ла-Риоха"}
+ }
+ "America:Argentina:Rio_Gallegos"{
+ ec{"Рио-Гальегос"}
+ }
+ "America:Argentina:Salta"{
+ ec{"Салта"}
+ }
+ "America:Argentina:San_Juan"{
+ ec{"Сан-Хуан"}
+ }
+ "America:Argentina:San_Luis"{
+ ec{"Сан Луи"}
+ }
+ "America:Argentina:Tucuman"{
+ ec{"Тукуман"}
+ }
+ "America:Argentina:Ushuaia"{
+ ec{"Ушуайя"}
+ }
+ "America:Aruba"{
+ ec{"Аруба"}
+ }
+ "America:Asuncion"{
+ ec{"Асунсьон"}
+ }
+ "America:Bahia"{
+ ec{"Байя"}
+ }
+ "America:Bahia_Banderas"{
+ ec{"Бахья Бандерас"}
+ }
+ "America:Barbados"{
+ ec{"Барбадос"}
+ }
+ "America:Belem"{
+ ec{"Белем"}
+ }
+ "America:Belize"{
+ ec{"Белизе"}
+ }
+ "America:Blanc-Sablon"{
+ ec{"Бланк-Саблон"}
+ }
+ "America:Boa_Vista"{
+ ec{"Боа-Виста"}
+ }
+ "America:Bogota"{
+ ec{"Богота"}
+ }
+ "America:Boise"{
+ ec{"Боисе"}
+ }
+ "America:Buenos_Aires"{
+ ec{"Буэнос-Айрес"}
+ }
+ "America:Cambridge_Bay"{
+ ec{"Кэмбриж булан"}
+ }
+ "America:Campo_Grande"{
+ ec{"Кампо-Гранде"}
+ }
+ "America:Cancun"{
+ ec{"Канкун"}
+ }
+ "America:Caracas"{
+ ec{"Каракас"}
+ }
+ "America:Catamarca"{
+ ec{"Катамарка"}
+ }
+ "America:Cayenne"{
+ ec{"Кайенна"}
+ }
+ "America:Cayman"{
+ ec{"Кайман"}
+ }
+ "America:Chicago"{
+ ec{"Чикаго"}
+ }
+ "America:Chihuahua"{
+ ec{"Чихуахуа"}
+ }
+ "America:Coral_Harbour"{
+ ec{"Атикокан"}
+ }
+ "America:Cordoba"{
+ ec{"Кордова"}
+ }
+ "America:Costa_Rica"{
+ ec{"Коста Рика"}
+ }
+ "America:Creston"{
+ ec{"Крестон"}
+ }
+ "America:Cuiaba"{
+ ec{"Куяба"}
+ }
+ "America:Curacao"{
+ ec{"Куракао"}
+ }
+ "America:Danmarkshavn"{
+ ec{"Данмаркшавн"}
+ }
+ "America:Dawson"{
+ ec{"Доусон"}
+ }
+ "America:Dawson_Creek"{
+ ec{"Доусон Грик"}
+ }
+ "America:Denver"{
+ ec{"Денвер"}
+ }
+ "America:Detroit"{
+ ec{"Детройт"}
+ }
+ "America:Dominica"{
+ ec{"Доминика"}
+ }
+ "America:Edmonton"{
+ ec{"Эдмонтон"}
+ }
+ "America:Eirunepe"{
+ ec{"Эйрунепе"}
+ }
+ "America:El_Salvador"{
+ ec{"Эль Сальвадор"}
+ }
+ "America:Fortaleza"{
+ ec{"Форталеза"}
+ }
+ "America:Glace_Bay"{
+ ec{"Глейс булан"}
+ }
+ "America:Godthab"{
+ ec{"Годтаб"}
+ }
+ "America:Goose_Bay"{
+ ec{"Гуус булан"}
+ }
+ "America:Grand_Turk"{
+ ec{"Гранд Турк"}
+ }
+ "America:Grenada"{
+ ec{"Гренада"}
+ }
+ "America:Guadeloupe"{
+ ec{"Гваделуп"}
+ }
+ "America:Guatemala"{
+ ec{"Гватемал"}
+ }
+ "America:Guayaquil"{
+ ec{"Гуаякиль"}
+ }
+ "America:Guyana"{
+ ec{"Гуяана"}
+ }
+ "America:Halifax"{
+ ec{"Халифакс"}
+ }
+ "America:Havana"{
+ ec{"Хавана"}
+ }
+ "America:Hermosillo"{
+ ec{"Хермосилло"}
+ }
+ "America:Indiana:Knox"{
+ ec{"Нокс, Индиана"}
+ }
+ "America:Indiana:Marengo"{
+ ec{"Маренго, Индиана"}
+ }
+ "America:Indiana:Petersburg"{
+ ec{"Питерсбург, Индиана"}
+ }
+ "America:Indiana:Tell_City"{
+ ec{"Тел Сити, Индиана"}
+ }
+ "America:Indiana:Vevay"{
+ ec{"Вивей, Индиана"}
+ }
+ "America:Indiana:Vincennes"{
+ ec{"Винсенес, Индиана"}
+ }
+ "America:Indiana:Winamac"{
+ ec{"Винамак, Индиана"}
+ }
+ "America:Indianapolis"{
+ ec{"Индианаполис"}
+ }
+ "America:Inuvik"{
+ ec{"Инувик"}
+ }
+ "America:Iqaluit"{
+ ec{"Икалуит"}
+ }
+ "America:Jamaica"{
+ ec{"Ямайка"}
+ }
+ "America:Jujuy"{
+ ec{"Жужуй"}
+ }
+ "America:Juneau"{
+ ec{"Жуно"}
+ }
+ "America:Kentucky:Monticello"{
+ ec{"Монтичелло, Кентаки"}
+ }
+ "America:Kralendijk"{
+ ec{"Кралендик"}
+ }
+ "America:La_Paz"{
+ ec{"Ла Паз"}
+ }
+ "America:Lima"{
+ ec{"Лима"}
+ }
+ "America:Los_Angeles"{
+ ec{"Лос-Анжелес"}
+ }
+ "America:Louisville"{
+ ec{"Луисвилл"}
+ }
+ "America:Lower_Princes"{
+ ec{"Доод хунтайжийн орон"}
+ }
+ "America:Maceio"{
+ ec{"Масейо"}
+ }
+ "America:Managua"{
+ ec{"Манагуа"}
+ }
+ "America:Manaus"{
+ ec{"Манаус"}
+ }
+ "America:Marigot"{
+ ec{"Маригот"}
+ }
+ "America:Martinique"{
+ ec{"Мартиник"}
+ }
+ "America:Matamoros"{
+ ec{"Матаморос"}
+ }
+ "America:Mazatlan"{
+ ec{"Мазатлан"}
+ }
+ "America:Mendoza"{
+ ec{"Мендоза"}
+ }
+ "America:Menominee"{
+ ec{"Меномини"}
+ }
+ "America:Merida"{
+ ec{"Мерида"}
+ }
+ "America:Metlakatla"{
+ ec{"Метлакатла"}
+ }
+ "America:Mexico_City"{
+ ec{"Мехико хот"}
+ }
+ "America:Miquelon"{
+ ec{"Микелон"}
+ }
+ "America:Moncton"{
+ ec{"Монктон"}
+ }
+ "America:Monterrey"{
+ ec{"Монтерей"}
+ }
+ "America:Montevideo"{
+ ec{"Монтевидео"}
+ }
+ "America:Montreal"{
+ ec{"Монтреаль"}
+ }
+ "America:Montserrat"{
+ ec{"Монтсеррат"}
+ }
+ "America:Nassau"{
+ ec{"Нассау"}
+ }
+ "America:New_York"{
+ ec{"Нью-Йорк"}
+ }
+ "America:Nipigon"{
+ ec{"Нипигон"}
+ }
+ "America:Nome"{
+ ec{"Ном"}
+ }
+ "America:Noronha"{
+ ec{"Норона"}
+ }
+ "America:North_Dakota:Beulah"{
+ ec{"Била, Хойд Дакота"}
+ }
+ "America:North_Dakota:Center"{
+ ec{"Төв, Хойд Дакота"}
+ }
+ "America:North_Dakota:New_Salem"{
+ ec{"Нью-Салем, Хойд Дакота"}
+ }
+ "America:Ojinaga"{
+ ec{"Ожинага"}
+ }
+ "America:Panama"{
+ ec{"Панама"}
+ }
+ "America:Pangnirtung"{
+ ec{"Пангниртунг"}
+ }
+ "America:Paramaribo"{
+ ec{"Парамарибо"}
+ }
+ "America:Phoenix"{
+ ec{"Феникс"}
+ }
+ "America:Port-au-Prince"{
+ ec{"Порт-о-Принс"}
+ }
+ "America:Port_of_Spain"{
+ ec{"Порт-оф-Спейн"}
+ }
+ "America:Porto_Velho"{
+ ec{"Порто-Велью"}
+ }
+ "America:Puerto_Rico"{
+ ec{"Пуэрто-Рико"}
+ }
+ "America:Rainy_River"{
+ ec{"Рейни Ривер"}
+ }
+ "America:Rankin_Inlet"{
+ ec{"Рэнкин Инлет"}
+ }
+ "America:Recife"{
+ ec{"Ресифи"}
+ }
+ "America:Regina"{
+ ec{"Регина"}
+ }
+ "America:Resolute"{
+ ec{"Резолют"}
+ }
+ "America:Rio_Branco"{
+ ec{"Рио-Бранко"}
+ }
+ "America:Santa_Isabel"{
+ ec{"Санта Изабель"}
+ }
+ "America:Santarem"{
+ ec{"Сантарем"}
+ }
+ "America:Santiago"{
+ ec{"Сантьяго"}
+ }
+ "America:Santo_Domingo"{
+ ec{"Санта Доминго"}
+ }
+ "America:Sao_Paulo"{
+ ec{"Сан-Паулу"}
+ }
+ "America:Scoresbysund"{
+ ec{"Скорсбисунн"}
+ }
+ "America:Shiprock"{
+ ec{"Шипрок"}
+ }
+ "America:Sitka"{
+ ec{"Ситка"}
+ }
+ "America:St_Barthelemy"{
+ ec{"Сент Бартельми"}
+ }
+ "America:St_Johns"{
+ ec{"Сент Жонс"}
+ }
+ "America:St_Kitts"{
+ ec{"Сент-Киттс"}
+ }
+ "America:St_Lucia"{
+ ec{"Сент Люсиа"}
+ }
+ "America:St_Thomas"{
+ ec{"Сент Томас"}
+ }
+ "America:St_Vincent"{
+ ec{"Сент Винсент"}
+ }
+ "America:Swift_Current"{
+ ec{"Свифт Каррент"}
+ }
+ "America:Tegucigalpa"{
+ ec{"Тегусигальпа"}
+ }
+ "America:Thule"{
+ ec{"Туле"}
+ }
+ "America:Thunder_Bay"{
+ ec{"Сандер Бэй"}
+ }
+ "America:Tijuana"{
+ ec{"Тижуана"}
+ }
+ "America:Toronto"{
+ ec{"Торонто"}
+ }
+ "America:Tortola"{
+ ec{"Тортола"}
+ }
+ "America:Vancouver"{
+ ec{"Ванкувер"}
+ }
+ "America:Whitehorse"{
+ ec{"Уайтхорз"}
+ }
+ "America:Winnipeg"{
+ ec{"Виннипег"}
+ }
+ "America:Yakutat"{
+ ec{"Якутат"}
+ }
+ "America:Yellowknife"{
+ ec{"Йелоунайф"}
+ }
+ "Antarctica:Casey"{
+ ec{"Кэсей"}
+ }
+ "Antarctica:Davis"{
+ ec{"Дэвис"}
+ }
+ "Antarctica:DumontDUrville"{
+ ec{"Дюмон д’Юрвиль"}
+ }
+ "Antarctica:Macquarie"{
+ ec{"Маккуори"}
+ }
+ "Antarctica:Mawson"{
+ ec{"Моусон"}
+ }
+ "Antarctica:McMurdo"{
+ ec{"Мак-Мёрдо"}
+ }
+ "Antarctica:Palmer"{
+ ec{"Палмер"}
+ }
+ "Antarctica:Rothera"{
+ ec{"Ротера"}
+ }
+ "Antarctica:South_Pole"{
+ ec{"Өмнөд туйл"}
+ }
+ "Antarctica:Syowa"{
+ ec{"Сьёва"}
+ }
+ "Antarctica:Vostok"{
+ ec{"Восток"}
+ }
+ "Arctic:Longyearbyen"{
+ ec{"Лонгирбюен"}
+ }
+ "Asia:Aden"{
+ ec{"Аден"}
+ }
+ "Asia:Almaty"{
+ ec{"Алматы"}
+ }
+ "Asia:Amman"{
+ ec{"Амман"}
+ }
+ "Asia:Anadyr"{
+ ec{"Анадыр"}
+ }
+ "Asia:Aqtau"{
+ ec{"Актау"}
+ }
+ "Asia:Aqtobe"{
+ ec{"Актөбе"}
+ }
+ "Asia:Ashgabat"{
+ ec{"Ашхабад"}
+ }
+ "Asia:Baghdad"{
+ ec{"Багдад"}
+ }
+ "Asia:Bahrain"{
+ ec{"Бахрейн"}
+ }
+ "Asia:Baku"{
+ ec{"Баку"}
+ }
+ "Asia:Bangkok"{
+ ec{"Бангкок"}
+ }
+ "Asia:Beirut"{
+ ec{"Бейрут"}
+ }
+ "Asia:Bishkek"{
+ ec{"Бишкек"}
+ }
+ "Asia:Brunei"{
+ ec{"Бруней"}
+ }
+ "Asia:Calcutta"{
+ ec{"Кольката"}
+ }
+ "Asia:Choibalsan"{
+ ec{"Чойбалсан"}
+ }
+ "Asia:Chongqing"{
+ ec{"Чунцин"}
+ }
+ "Asia:Colombo"{
+ ec{"Коломбо"}
+ }
+ "Asia:Damascus"{
+ ec{"Дамаск"}
+ }
+ "Asia:Dhaka"{
+ ec{"Дака"}
+ }
+ "Asia:Dili"{
+ ec{"Дили"}
+ }
+ "Asia:Dubai"{
+ ec{"Дубай"}
+ }
+ "Asia:Dushanbe"{
+ ec{"Душанбе"}
+ }
+ "Asia:Gaza"{
+ ec{"Газа"}
+ }
+ "Asia:Harbin"{
+ ec{"Харбин"}
+ }
+ "Asia:Hebron"{
+ ec{"Хеброн"}
+ }
+ "Asia:Hong_Kong"{
+ ec{"Хонг Конг"}
+ }
+ "Asia:Hovd"{
+ ec{"Ховд"}
+ }
+ "Asia:Irkutsk"{
+ ec{"Эрхүү"}
+ }
+ "Asia:Jakarta"{
+ ec{"Жакарта"}
+ }
+ "Asia:Jayapura"{
+ ec{"Жайпур"}
+ }
+ "Asia:Jerusalem"{
+ ec{"Ерусалем"}
+ }
+ "Asia:Kabul"{
+ ec{"Кабул"}
+ }
+ "Asia:Kamchatka"{
+ ec{"Камчатка"}
+ }
+ "Asia:Karachi"{
+ ec{"Карачи"}
+ }
+ "Asia:Kashgar"{
+ ec{"Кашгар"}
+ }
+ "Asia:Katmandu"{
+ ec{"Катманду"}
+ }
+ "Asia:Krasnoyarsk"{
+ ec{"Красноярск"}
+ }
+ "Asia:Kuala_Lumpur"{
+ ec{"Куала Лумпур"}
+ }
+ "Asia:Kuching"{
+ ec{"Кучин"}
+ }
+ "Asia:Kuwait"{
+ ec{"Кувейт"}
+ }
+ "Asia:Macau"{
+ ec{"Макао"}
+ }
+ "Asia:Magadan"{
+ ec{"Магадан"}
+ }
+ "Asia:Makassar"{
+ ec{"Макассар"}
+ }
+ "Asia:Manila"{
+ ec{"Манила"}
+ }
+ "Asia:Muscat"{
+ ec{"Мускат"}
+ }
+ "Asia:Nicosia"{
+ ec{"Никосия"}
+ }
+ "Asia:Novokuznetsk"{
+ ec{"Новокузнецк"}
+ }
+ "Asia:Novosibirsk"{
+ ec{"Новосибирск"}
+ }
+ "Asia:Omsk"{
+ ec{"Омск"}
+ }
+ "Asia:Oral"{
+ ec{"Орал"}
+ }
+ "Asia:Phnom_Penh"{
+ ec{"Пномпень"}
+ }
+ "Asia:Pontianak"{
+ ec{"Понтианак"}
+ }
+ "Asia:Pyongyang"{
+ ec{"Пхеньян"}
+ }
+ "Asia:Qatar"{
+ ec{"Катар"}
+ }
+ "Asia:Qyzylorda"{
+ ec{"Кызылорд"}
+ }
+ "Asia:Rangoon"{
+ ec{"Рангун"}
+ }
+ "Asia:Riyadh"{
+ ec{"Рияд"}
+ }
+ "Asia:Saigon"{
+ ec{"Хо Ши Мин"}
+ }
+ "Asia:Sakhalin"{
+ ec{"Сахалин"}
+ }
+ "Asia:Samarkand"{
+ ec{"Самарканд"}
+ }
+ "Asia:Seoul"{
+ ec{"Сөүл"}
+ }
+ "Asia:Shanghai"{
+ ec{"Шанхай"}
+ }
+ "Asia:Singapore"{
+ ec{"Сингапур"}
+ }
+ "Asia:Taipei"{
+ ec{"Тайпей"}
+ }
+ "Asia:Tashkent"{
+ ec{"Ташкент"}
+ }
+ "Asia:Tbilisi"{
+ ec{"Тбилиси"}
+ }
+ "Asia:Tehran"{
+ ec{"Тегеран"}
+ }
+ "Asia:Thimphu"{
+ ec{"Тхимпху"}
+ }
+ "Asia:Tokyo"{
+ ec{"Токио"}
+ }
+ "Asia:Ulaanbaatar"{
+ ec{"Улаанбаатар"}
+ }
+ "Asia:Urumqi"{
+ ec{"Үрүмчи"}
+ }
+ "Asia:Vientiane"{
+ ec{"Вьентьян"}
+ }
+ "Asia:Vladivostok"{
+ ec{"Владивосток"}
+ }
+ "Asia:Yakutsk"{
+ ec{"Якутск"}
+ }
+ "Asia:Yekaterinburg"{
+ ec{"Екатеринбург"}
+ }
+ "Asia:Yerevan"{
+ ec{"Ереван"}
+ }
+ "Atlantic:Azores"{
+ ec{"Азор"}
+ }
+ "Atlantic:Bermuda"{
+ ec{"Бермуда"}
+ }
+ "Atlantic:Canary"{
+ ec{"Канари"}
+ }
+ "Atlantic:Cape_Verde"{
+ ec{"Капе-Верде"}
+ }
+ "Atlantic:Faeroe"{
+ ec{"Фароэ"}
+ }
+ "Atlantic:Madeira"{
+ ec{"Мадейра"}
+ }
+ "Atlantic:Reykjavik"{
+ ec{"Рекьявик"}
+ }
+ "Atlantic:South_Georgia"{
+ ec{"Өмнөд Жоржиа"}
+ }
+ "Atlantic:St_Helena"{
+ ec{"Сент Хелена"}
+ }
+ "Atlantic:Stanley"{
+ ec{"Стэнлей"}
+ }
+ "Australia:Adelaide"{
+ ec{"Аделэйд"}
+ }
+ "Australia:Brisbane"{
+ ec{"Брисбэн"}
+ }
+ "Australia:Broken_Hill"{
+ ec{"Брокен Хилл"}
+ }
+ "Australia:Currie"{
+ ec{"Кюрри"}
+ }
+ "Australia:Darwin"{
+ ec{"Дарвин"}
+ }
+ "Australia:Eucla"{
+ ec{"Еукла"}
+ }
+ "Australia:Hobart"{
+ ec{"Хобарт"}
+ }
+ "Australia:Lindeman"{
+ ec{"Линдемэн"}
+ }
+ "Australia:Lord_Howe"{
+ ec{"Лорд Хау"}
+ }
+ "Australia:Melbourne"{
+ ec{"Мельбурн"}
+ }
+ "Australia:Perth"{
+ ec{"Перс"}
+ }
+ "Australia:Sydney"{
+ ec{"Сидней"}
+ }
+ "Etc:Unknown"{
+ ec{"Тодорхойгүй хот"}
+ }
+ "Europe:Amsterdam"{
+ ec{"Амстердам"}
+ }
+ "Europe:Andorra"{
+ ec{"Андорра"}
+ }
+ "Europe:Athens"{
+ ec{"Афин"}
+ }
+ "Europe:Belgrade"{
+ ec{"Белград"}
+ }
+ "Europe:Berlin"{
+ ec{"Берлин"}
+ }
+ "Europe:Bratislava"{
+ ec{"Братислав"}
+ }
+ "Europe:Brussels"{
+ ec{"Брюссель"}
+ }
+ "Europe:Bucharest"{
+ ec{"Бухарест"}
+ }
+ "Europe:Budapest"{
+ ec{"Будапешт"}
+ }
+ "Europe:Chisinau"{
+ ec{"Кишинёв"}
+ }
+ "Europe:Copenhagen"{
+ ec{"Копенгаген"}
+ }
+ "Europe:Dublin"{
+ ec{"Дублин"}
+ ld{"Ирландын зуны цаг"}
+ }
+ "Europe:Gibraltar"{
+ ec{"Гибралтар"}
+ }
+ "Europe:Guernsey"{
+ ec{"Гернси"}
+ }
+ "Europe:Helsinki"{
+ ec{"Хельсинк"}
+ }
+ "Europe:Isle_of_Man"{
+ ec{"Мэн Арал"}
+ }
+ "Europe:Istanbul"{
+ ec{"Истанбул"}
+ }
+ "Europe:Jersey"{
+ ec{"Жерси"}
+ }
+ "Europe:Kaliningrad"{
+ ec{"Калининград"}
+ }
+ "Europe:Kiev"{
+ ec{"Киев"}
+ }
+ "Europe:Lisbon"{
+ ec{"Лисбон"}
+ }
+ "Europe:Ljubljana"{
+ ec{"Любляна"}
+ }
+ "Europe:London"{
+ ec{"Лондон"}
+ ld{"Британийн зуны цаг"}
+ }
+ "Europe:Luxembourg"{
+ ec{"Люксембург"}
+ }
+ "Europe:Madrid"{
+ ec{"Мадрид"}
+ }
+ "Europe:Malta"{
+ ec{"Мальта"}
+ }
+ "Europe:Mariehamn"{
+ ec{"Мариехамн"}
+ }
+ "Europe:Minsk"{
+ ec{"Минск"}
+ }
+ "Europe:Monaco"{
+ ec{"Монако"}
+ }
+ "Europe:Moscow"{
+ ec{"Москва"}
+ }
+ "Europe:Oslo"{
+ ec{"Осло"}
+ }
+ "Europe:Paris"{
+ ec{"Парис"}
+ }
+ "Europe:Podgorica"{
+ ec{"Подгорица"}
+ }
+ "Europe:Prague"{
+ ec{"Прага"}
+ }
+ "Europe:Riga"{
+ ec{"Рига"}
+ }
+ "Europe:Rome"{
+ ec{"Ром"}
+ }
+ "Europe:Samara"{
+ ec{"Самара"}
+ }
+ "Europe:San_Marino"{
+ ec{"Сан-Марино"}
+ }
+ "Europe:Sarajevo"{
+ ec{"Сараево"}
+ }
+ "Europe:Simferopol"{
+ ec{"Симферополь"}
+ }
+ "Europe:Skopje"{
+ ec{"Скопье"}
+ }
+ "Europe:Sofia"{
+ ec{"София"}
+ }
+ "Europe:Stockholm"{
+ ec{"Стогкольм"}
+ }
+ "Europe:Tallinn"{
+ ec{"Таллин"}
+ }
+ "Europe:Tirane"{
+ ec{"Тирана"}
+ }
+ "Europe:Uzhgorod"{
+ ec{"Ужгород"}
+ }
+ "Europe:Vaduz"{
+ ec{"Вадуз"}
+ }
+ "Europe:Vatican"{
+ ec{"Ватикан"}
+ }
+ "Europe:Vienna"{
+ ec{"Вена"}
+ }
+ "Europe:Vilnius"{
+ ec{"Вильнюс"}
+ }
+ "Europe:Volgograd"{
+ ec{"Волгоград"}
+ }
+ "Europe:Warsaw"{
+ ec{"Варшав"}
+ }
+ "Europe:Zagreb"{
+ ec{"Загреб"}
+ }
+ "Europe:Zaporozhye"{
+ ec{"Запорожье"}
+ }
+ "Europe:Zurich"{
+ ec{"Цюрих"}
+ }
+ "Indian:Antananarivo"{
+ ec{"Антананариво"}
+ }
+ "Indian:Chagos"{
+ ec{"Чагос"}
+ }
+ "Indian:Christmas"{
+ ec{"Зул Сар"}
+ }
+ "Indian:Cocos"{
+ ec{"Кокос"}
+ }
+ "Indian:Comoro"{
+ ec{"Коморо"}
+ }
+ "Indian:Kerguelen"{
+ ec{"Кергелен"}
+ }
+ "Indian:Mahe"{
+ ec{"Махе"}
+ }
+ "Indian:Maldives"{
+ ec{"Мальдив"}
+ }
+ "Indian:Mauritius"{
+ ec{"Мавриту"}
+ }
+ "Indian:Mayotte"{
+ ec{"Майотта"}
+ }
+ "Indian:Reunion"{
+ ec{"Реюньон"}
+ }
+ "Pacific:Apia"{
+ ec{"Апиа"}
+ }
+ "Pacific:Auckland"{
+ ec{"Оклэнд"}
+ }
+ "Pacific:Chatham"{
+ ec{"Чатем"}
+ }
+ "Pacific:Easter"{
+ ec{"Истер"}
+ }
+ "Pacific:Efate"{
+ ec{"Эфате"}
+ }
+ "Pacific:Enderbury"{
+ ec{"Эндербери"}
+ }
+ "Pacific:Fakaofo"{
+ ec{"Факаофо"}
+ }
+ "Pacific:Fiji"{
+ ec{"Фижи"}
+ }
+ "Pacific:Funafuti"{
+ ec{"Фунафути"}
+ }
+ "Pacific:Galapagos"{
+ ec{"Галапагос"}
+ }
+ "Pacific:Gambier"{
+ ec{"Гамбьер"}
+ }
+ "Pacific:Guadalcanal"{
+ ec{"Гуадалканал"}
+ }
+ "Pacific:Guam"{
+ ec{"Гуам"}
+ }
+ "Pacific:Honolulu"{
+ ec{"Хонолулу"}
+ }
+ "Pacific:Johnston"{
+ ec{"Жонстон"}
+ }
+ "Pacific:Kiritimati"{
+ ec{"Киритимати"}
+ }
+ "Pacific:Kosrae"{
+ ec{"Косраэ"}
+ }
+ "Pacific:Kwajalein"{
+ ec{"Кважалейн"}
+ }
+ "Pacific:Majuro"{
+ ec{"Мажуро"}
+ }
+ "Pacific:Marquesas"{
+ ec{"Маркизас"}
+ }
+ "Pacific:Midway"{
+ ec{"Мидвей"}
+ }
+ "Pacific:Nauru"{
+ ec{"Науру"}
+ }
+ "Pacific:Niue"{
+ ec{"Ниуэ"}
+ }
+ "Pacific:Norfolk"{
+ ec{"Норфолк"}
+ }
+ "Pacific:Noumea"{
+ ec{"Нумеа"}
+ }
+ "Pacific:Pago_Pago"{
+ ec{"Паго Паго"}
+ }
+ "Pacific:Palau"{
+ ec{"Палау"}
+ }
+ "Pacific:Pitcairn"{
+ ec{"Питкейрн"}
+ }
+ "Pacific:Ponape"{
+ ec{"Понпей"}
+ }
+ "Pacific:Port_Moresby"{
+ ec{"Порт-Морсби"}
+ }
+ "Pacific:Rarotonga"{
+ ec{"Раротонга"}
+ }
+ "Pacific:Saipan"{
+ ec{"Сайпан"}
+ }
+ "Pacific:Tahiti"{
+ ec{"Таити"}
+ }
+ "Pacific:Tarawa"{
+ ec{"Тарава"}
+ }
+ "Pacific:Tongatapu"{
+ ec{"Тонгатапу"}
+ }
+ "Pacific:Truk"{
+ ec{"Чүүк"}
+ }
+ "Pacific:Wake"{
+ ec{"Уэйк"}
+ }
+ "Pacific:Wallis"{
+ ec{"Уоллис"}
+ }
+ "meta:Afghanistan"{
+ ls{"Афганистаны цаг"}
+ }
+ "meta:Africa_Central"{
+ ls{"Төв Африкийн цаг"}
+ }
+ "meta:Africa_Eastern"{
+ ls{"Зүүн Африкийн цаг"}
+ }
+ "meta:Africa_Southern"{
+ ls{"Өмнөд Африкийн цаг"}
+ }
+ "meta:Africa_Western"{
+ ld{"Баруун Африкийн зуны цаг"}
+ lg{"Баруун Африкийн цаг"}
+ ls{"Баруун Африкийн стандарт цаг"}
+ }
+ "meta:Alaska"{
+ ld{"Аляскийн зуны цаг"}
+ lg{"Аляскийн цаг"}
+ ls{"Аляскийн стандарт цаг"}
+ }
+ "meta:Amazon"{
+ ld{"Амазоны зуны цаг"}
+ lg{"Амазоны цаг"}
+ ls{"Амазоны стандарт цаг"}
+ }
+ "meta:America_Central"{
+ ld{"Хойд Америкийн зуны цаг"}
+ lg{"Хойд Америкийн төв цаг"}
+ ls{"Хойд Америкийн төв стандарт цаг"}
+ }
+ "meta:America_Eastern"{
+ ld{"Хойд Америкийн зүүн эргийн зуны цаг"}
+ lg{"Хойд Америкийн зүүн эргийн цаг"}
+ ls{"Хойд Америкийн зүүн эргийн стандарт цаг"}
+ }
+ "meta:America_Mountain"{
+ ld{"Хойд Америкийн уулын зуны цаг"}
+ lg{"Хойд Америкийн уулын цаг"}
+ ls{"Хойд Америкийн уулын стандарт цаг"}
+ }
+ "meta:America_Pacific"{
+ ld{"Хойд Америкийн Номхон далайн зуны цаг"}
+ lg{"Хойд Америкийн Номхон далайн цаг"}
+ ls{"Хойд Америкийн Номхон далайн стандарт цаг"}
+ }
+ "meta:Arabian"{
+ ld{"Арабын зуны цаг"}
+ lg{"Арабын цаг"}
+ ls{"Арабын стандарт цаг"}
+ }
+ "meta:Argentina"{
+ ld{"Аргентины зуны цаг"}
+ lg{"Аргентины цаг"}
+ ls{"Аргентины стандарт цаг"}
+ }
+ "meta:Argentina_Western"{
+ ld{"Баруун Аргентины зуны цаг"}
+ lg{"Баруун Аргентины цаг"}
+ ls{"Баруун Аргентины стандарт цаг"}
+ }
+ "meta:Armenia"{
+ ld{"Армений зуны цаг"}
+ lg{"Армений цаг"}
+ ls{"Армений стандарт цаг"}
+ }
+ "meta:Atlantic"{
+ ld{"Атлантын зуны цаг"}
+ lg{"Атлантын цаг"}
+ ls{"Атлантын стандарт цаг"}
+ }
+ "meta:Australia_Central"{
+ ld{"Австралийн төв зуны цаг"}
+ lg{"Төв Австралийн цаг"}
+ ls{"Австралийн төв стандарт цаг"}
+ }
+ "meta:Australia_CentralWestern"{
+ ld{"Австралийн төв баруун эргийн зуны цаг"}
+ lg{"Австралийн төв баруун эргийн цаг"}
+ ls{"Австралийн төв баруун эргийн стандарт цаг"}
+ }
+ "meta:Australia_Eastern"{
+ ld{"Австралийн зүүн эргийн зуны цаг"}
+ lg{"Зүүн Австралийн цаг"}
+ ls{"Австралийн зүүн эргийн стандарт цаг"}
+ }
+ "meta:Australia_Western"{
+ ld{"Австралийн баруун эргийн зуны цаг"}
+ lg{"Баруун Австралийн цаг"}
+ ls{"Австралийн баруун эргийн стандарт цаг"}
+ }
+ "meta:Azerbaijan"{
+ ld{"Азербайжаны зуны цаг"}
+ lg{"Азербайжаны цаг"}
+ ls{"Азербайжаны стандарт цаг"}
+ }
+ "meta:Azores"{
+ ld{"Азорын зуны цаг"}
+ lg{"Азорын цаг"}
+ ls{"Азорын стандарт цаг"}
+ }
+ "meta:Bangladesh"{
+ ld{"Бангладешийн зуны цаг"}
+ lg{"Бангладешийн цаг"}
+ ls{"Бангладешийн стандарт цаг"}
+ }
+ "meta:Bhutan"{
+ ls{"Бутаны цаг"}
+ }
+ "meta:Bolivia"{
+ ls{"Боливийн цаг"}
+ }
+ "meta:Brasilia"{
+ ld{"Бразилийн зуны цаг"}
+ lg{"Бразилийн цаг"}
+ ls{"Бразилийн стандарт цаг"}
+ }
+ "meta:Brunei"{
+ ls{"Бруней Дарассаламын цаг"}
+ }
+ "meta:Cape_Verde"{
+ ld{"Капе-Вердегийн зуны цаг"}
+ lg{"Капе-Вердегийн цаг"}
+ ls{"Капе-Вердегийн стандарт цаг"}
+ }
+ "meta:Chamorro"{
+ ls{"Чаморрогийн цаг"}
+ }
+ "meta:Chatham"{
+ ld{"Чэтамын зуны цаг"}
+ lg{"Чэтамын цаг"}
+ ls{"Чэтамын стандарт цаг"}
+ }
+ "meta:Chile"{
+ ld{"Чилийн зуны цаг"}
+ lg{"Чилийн цаг"}
+ ls{"Чилийн стандарт цаг"}
+ }
+ "meta:China"{
+ ld{"Хятадын зуны цаг"}
+ lg{"Хятадын цаг"}
+ ls{"Хятадын стандарт цаг"}
+ }
+ "meta:Choibalsan"{
+ ld{"Чойбалсангийн зуны цаг"}
+ lg{"Чойбалсангийн цаг"}
+ ls{"Чойбалсангийн стандарт цаг"}
+ }
+ "meta:Christmas"{
+ ls{"Зул Сарын Арлын цаг"}
+ }
+ "meta:Cocos"{
+ ls{"Кокос Арлуудын цаг"}
+ }
+ "meta:Colombia"{
+ ld{"Колумбын зуны цаг"}
+ lg{"Колумбын цаг"}
+ ls{"Колумбын стандарт цаг"}
+ }
+ "meta:Cook"{
+ ld{"Күүкийн Арлуудын хагас зуны цаг"}
+ lg{"Күүкийн Арлуудын цаг"}
+ ls{"Күүкийн Арлуудын стандарт цаг"}
+ }
+ "meta:Cuba"{
+ ld{"Кубын зуны цаг"}
+ lg{"Кубын цаг"}
+ ls{"Кубын стандарт цаг"}
+ }
+ "meta:Davis"{
+ ls{"Дэвисын цаг"}
+ }
+ "meta:DumontDUrville"{
+ ls{"Дюмон д’Юрвилийн цаг"}
+ }
+ "meta:East_Timor"{
+ ls{"Зүүн Тиморын цаг"}
+ }
+ "meta:Easter"{
+ ld{"Истерын Арлын зуны цаг"}
+ lg{"Истерын Арлын цаг"}
+ ls{"Истерын Арлын стандарт цаг"}
+ }
+ "meta:Ecuador"{
+ ls{"Эквадорын цаг"}
+ }
+ "meta:Europe_Central"{
+ ld{"Төв Европын зуны цаг"}
+ lg{"Төв Европын цаг"}
+ ls{"Төв Европын стандарт цаг"}
+ }
+ "meta:Europe_Eastern"{
+ ld{"Зүүн Европын зуны цаг"}
+ lg{"Зүүн Европын цаг"}
+ ls{"Зүүн Европын стандарт цаг"}
+ }
+ "meta:Europe_Western"{
+ ld{"Баруун Европын зуны цаг"}
+ lg{"Баруун Европын цаг"}
+ ls{"Баруун Европын стандарт цаг"}
+ }
+ "meta:Falkland"{
+ ld{"Фолькландын Арлуудын зуны цаг"}
+ lg{"Фолькландын Арлуудын цаг"}
+ ls{"Фолькландын Арлуудын стандарт цаг"}
+ }
+ "meta:Fiji"{
+ ld{"Фижигийн зуны цаг"}
+ lg{"Фижигийн цаг"}
+ ls{"Фижигийн стандарт цаг"}
+ }
+ "meta:French_Guiana"{
+ ls{"Францын Гияанагийн цаг"}
+ }
+ "meta:French_Southern"{
+ ls{"Францын Өмнөд ба Антарктик цаг"}
+ }
+ "meta:GMT"{
+ ls{"Гринвичийн үндсэн цаг"}
+ }
+ "meta:Galapagos"{
+ ls{"Галапагосын цаг"}
+ }
+ "meta:Gambier"{
+ ls{"Гамбьегийн цаг"}
+ }
+ "meta:Georgia"{
+ ld{"Гүржийн зуны цаг"}
+ lg{"Гүржийн цаг"}
+ ls{"Гүржийн стандарт цаг"}
+ }
+ "meta:Gilbert_Islands"{
+ ls{"Жильбертын Арлуудын цаг"}
+ }
+ "meta:Greenland_Eastern"{
+ ld{"Зүүн Гринландын зуны цаг"}
+ lg{"Зүүн Гринландын цаг"}
+ ls{"Зүүн Гринландын стандарт цаг"}
+ }
+ "meta:Greenland_Western"{
+ ld{"Баруун Гринландын зуны цаг"}
+ lg{"Баруун Гринландын цаг"}
+ ls{"Баруун Гринландын стандарт цаг"}
+ }
+ "meta:Gulf"{
+ ls{"Гульфын цаг"}
+ }
+ "meta:Guyana"{
+ ls{"Гуяанагийн цаг"}
+ }
+ "meta:Hawaii_Aleutian"{
+ ld{"Хавай-Алеутын зуны цаг"}
+ lg{"Хавай-Алеутын цаг"}
+ ls{"Хавай-Алеутын стандарт цаг"}
+ }
+ "meta:Hong_Kong"{
+ ld{"Хонг Конгын зуны цаг"}
+ lg{"Хонг Конгын цаг"}
+ ls{"Хонг Конгын стандарт цаг"}
+ }
+ "meta:Hovd"{
+ ld{"Ховдын зуны цаг"}
+ lg{"Ховдын цаг"}
+ ls{"Ховдын стандарт цаг"}
+ }
+ "meta:India"{
+ ls{"Энэтхэгийн цаг"}
+ }
+ "meta:Indian_Ocean"{
+ ls{"Энэтхэг далайн цаг"}
+ }
+ "meta:Indochina"{
+ ls{"Энэтхэг-Хятадын хойгийн цаг"}
+ }
+ "meta:Indonesia_Central"{
+ ls{"Төв Индонезийн цаг"}
+ }
+ "meta:Indonesia_Eastern"{
+ ls{"Зүүн Индонезийн цаг"}
+ }
+ "meta:Indonesia_Western"{
+ ls{"Баруун Индонезийн цаг"}
+ }
+ "meta:Iran"{
+ ld{"Ираны зуны цаг"}
+ lg{"Ираны цаг"}
+ ls{"Ираны стандарт цаг"}
+ }
+ "meta:Irkutsk"{
+ ld{"Эрхүүгийн зуны цаг"}
+ lg{"Эрхүүгийн цаг"}
+ ls{"Эрхүүгийн стандарт цаг"}
+ }
+ "meta:Israel"{
+ ld{"Израилийн зуны цаг"}
+ lg{"Израилийн цаг"}
+ ls{"Израилийн стандарт цаг"}
+ }
+ "meta:Japan"{
+ ld{"Японы зуны цаг"}
+ lg{"Японы цаг"}
+ ls{"Японы стандарт цаг"}
+ }
+ "meta:Kazakhstan_Eastern"{
+ ls{"Зүүн Казахстаны цаг"}
+ }
+ "meta:Kazakhstan_Western"{
+ ls{"Баруун Казахстаны цаг"}
+ }
+ "meta:Korea"{
+ ld{"Өмнөд Солонгосын зуны цаг"}
+ lg{"Өмнөд Солонгосын цаг"}
+ ls{"Өмнөд Солонгосын стандарт цаг"}
+ }
+ "meta:Kosrae"{
+ ls{"Косраегийн цаг"}
+ }
+ "meta:Krasnoyarsk"{
+ ld{"Красноярскийн зуны цаг"}
+ lg{"Красноярскийн цаг"}
+ ls{"Красноярскийн стандарт цаг"}
+ }
+ "meta:Kyrgystan"{
+ ls{"Кыргызстаны цаг"}
+ }
+ "meta:Line_Islands"{
+ ls{"Лайн Арлуудын цаг"}
+ }
+ "meta:Lord_Howe"{
+ ld{"Лорд Хаугийн зуны цаг"}
+ lg{"Лорд Хаугийн цаг"}
+ ls{"Лорд Хаугийн стандарт цаг"}
+ }
+ "meta:Macquarie"{
+ ls{"Маккуори Арлын цаг"}
+ }
+ "meta:Magadan"{
+ ld{"Магаданы зуны цаг"}
+ lg{"Магаданы цаг"}
+ ls{"Магаданы стандарт цаг"}
+ }
+ "meta:Malaysia"{
+ ls{"Малайзийн цаг"}
+ }
+ "meta:Maldives"{
+ ls{"Мальдивийн цаг"}
+ }
+ "meta:Marquesas"{
+ ls{"Маркесасын цаг"}
+ }
+ "meta:Marshall_Islands"{
+ ls{"Маршаллын Арлуудын цаг"}
+ }
+ "meta:Mauritius"{
+ ld{"Мавритусын зуны цаг"}
+ lg{"Мавритусын цаг"}
+ ls{"Мавритусын стандарт цаг"}
+ }
+ "meta:Mawson"{
+ ls{"Моусоны цаг"}
+ }
+ "meta:Mongolia"{
+ ld{"Улаанбаатарын зуны цаг"}
+ lg{"Улаанбаатарын цаг"}
+ ls{"Улаанбаатарын стандарт цаг"}
+ }
+ "meta:Moscow"{
+ ld{"Москвагийн зуны цаг"}
+ lg{"Москвагийн цаг"}
+ ls{"Москвагийн стандарт цаг"}
+ }
+ "meta:Myanmar"{
+ ls{"Мьянмарын цаг"}
+ }
+ "meta:Nauru"{
+ ls{"Науругийн цаг"}
+ }
+ "meta:Nepal"{
+ ls{"Балбын цаг"}
+ }
+ "meta:New_Caledonia"{
+ ld{"Шинэ Каледонийн зуны цаг"}
+ lg{"Шинэ Каледонийн цаг"}
+ ls{"Шинэ Каледонийн стандарт цаг"}
+ }
+ "meta:New_Zealand"{
+ ld{"Шинэ Зеландын зуны цаг"}
+ lg{"Шинэ Зеландын цаг"}
+ ls{"Шинэ Зеландын стандарт цаг"}
+ }
+ "meta:Newfoundland"{
+ ld{"Нью-Фаундлендын зуны цаг"}
+ lg{"Нью-Фаундлендын цаг"}
+ ls{"Нью-Фаундлендын стандарт цаг"}
+ }
+ "meta:Niue"{
+ ls{"Ниуэгийн цаг"}
+ }
+ "meta:Norfolk"{
+ ls{"Норфолк Арлын цаг"}
+ }
+ "meta:Noronha"{
+ ld{"Фернандо де Норонагийн зуны цаг"}
+ lg{"Фернандо де Норонагийн цаг"}
+ ls{"Фернандо де Норонагийн стандарт цаг"}
+ }
+ "meta:Novosibirsk"{
+ ld{"Новосибирскийн зуны цаг"}
+ lg{"Новосибирскийн цаг"}
+ ls{"Новосибирскийн стандарт цаг"}
+ }
+ "meta:Omsk"{
+ ld{"Омскийн зуны цаг"}
+ lg{"Омскийн цаг"}
+ ls{"Омскийн стандарт цаг"}
+ }
+ "meta:Pakistan"{
+ ld{"Пакистаны зуны цаг"}
+ lg{"Пакистаны цаг"}
+ ls{"Пакистаны стандарт цаг"}
+ }
+ "meta:Palau"{
+ ls{"Палаугийн цаг"}
+ }
+ "meta:Papua_New_Guinea"{
+ ls{"Папуа Шинэ Гвинейн цаг"}
+ }
+ "meta:Paraguay"{
+ ld{"Парагвайн зуны цаг"}
+ lg{"Парагвайн цаг"}
+ ls{"Парагвайн стандарт цаг"}
+ }
+ "meta:Peru"{
+ ld{"Перугийн зуны цаг"}
+ lg{"Перугийн цаг"}
+ ls{"Перугийн стандарт цаг"}
+ }
+ "meta:Philippines"{
+ ld{"Филиппины зуны цаг"}
+ lg{"Филиппины цаг"}
+ ls{"Филиппины стандарт цаг"}
+ }
+ "meta:Phoenix_Islands"{
+ ls{"Феникс арлуудын цаг"}
+ }
+ "meta:Pierre_Miquelon"{
+ ld{"Сент-Пьерре ба Микелоны зуны цаг"}
+ lg{"Сент-Пьерре ба Микелоны цаг"}
+ ls{"Сент-Пьерре ба Микелоны стандарт цаг"}
+ }
+ "meta:Pitcairn"{
+ ls{"Питкерны цаг"}
+ }
+ "meta:Ponape"{
+ ls{"Понапегийн цаг"}
+ }
+ "meta:Reunion"{
+ ls{"Реюньоны цаг"}
+ }
+ "meta:Rothera"{
+ ls{"Ротерагийн цаг"}
+ }
+ "meta:Sakhalin"{
+ ld{"Сахалины зуны цаг"}
+ lg{"Сахалины цаг"}
+ ls{"Сахалины стандарт цаг"}
+ }
+ "meta:Samoa"{
+ ld{"Самоагийн зуны цаг"}
+ lg{"Самоагийн цаг"}
+ ls{"Самоагийн стандарт цаг"}
+ }
+ "meta:Seychelles"{
+ ls{"Сейшелийн цаг"}
+ }
+ "meta:Singapore"{
+ ls{"Сингапурын цаг"}
+ }
+ "meta:Solomon"{
+ ls{"Соломоны Арлуудын цаг"}
+ }
+ "meta:South_Georgia"{
+ ls{"Өмнөд Жоржийн цаг"}
+ }
+ "meta:Syowa"{
+ ls{"Сёвагийн цаг"}
+ }
+ "meta:Tahiti"{
+ ls{"Таитигийн цаг"}
+ }
+ "meta:Taipei"{
+ ld{"Тайпейн зуны цаг"}
+ lg{"Тайпейн цаг"}
+ ls{"Тайпейн стандарт цаг"}
+ }
+ "meta:Tajikistan"{
+ ls{"Тажикистаны цаг"}
+ }
+ "meta:Tokelau"{
+ ls{"Токелаугийн цаг"}
+ }
+ "meta:Tonga"{
+ ld{"Тонгагийн зуны цаг"}
+ lg{"Тонгагийн цаг"}
+ ls{"Тонгагийн стандарт цаг"}
+ }
+ "meta:Truk"{
+ ls{"Чүүкийн цаг"}
+ }
+ "meta:Turkmenistan"{
+ ld{"Туркменистаны зуны цаг"}
+ lg{"Туркменистаны цаг"}
+ ls{"Туркменистаны стандарт цаг"}
+ }
+ "meta:Tuvalu"{
+ ls{"Тувалугийн цаг"}
+ }
+ "meta:Uruguay"{
+ ld{"Уругвайн зуны цаг"}
+ lg{"Уругвайн цаг"}
+ ls{"Уругвайн стандарт цаг"}
+ }
+ "meta:Uzbekistan"{
+ ld{"Узбекистаны зуны цаг"}
+ lg{"Узбекистаны цаг"}
+ ls{"Узбекистаны стандарт цаг"}
+ }
+ "meta:Vanuatu"{
+ ld{"Вануатугийн зуны цаг"}
+ lg{"Вануатугийн цаг"}
+ ls{"Вануатугийн стандарт цаг"}
+ }
+ "meta:Venezuela"{
+ ls{"Венесуэлийн цаг"}
+ }
+ "meta:Vladivostok"{
+ ld{"Владивостокийн зуны цаг"}
+ lg{"Владивостокийн цаг"}
+ ls{"Владивостокийн стандарт цаг"}
+ }
+ "meta:Volgograd"{
+ ld{"Волгоградын зуны цаг"}
+ lg{"Волгоградын цаг"}
+ ls{"Волгоградын стандарт цаг"}
+ }
+ "meta:Vostok"{
+ ls{"Востокийн цаг"}
+ }
+ "meta:Wake"{
+ ls{"Уэйк Арлуудын цаг"}
+ }
+ "meta:Wallis"{
+ ls{"Уоллис ба Футунагийн цаг"}
+ }
+ "meta:Yakutsk"{
+ ld{"Якутскийн зуны цаг"}
+ lg{"Якутскийн цаг"}
+ ls{"Якутскийн стандарт цаг"}
+ }
+ "meta:Yekaterinburg"{
+ ld{"Екатеринбургийн зуны цаг"}
+ lg{"Екатеринбургийн цаг"}
+ ls{"Екатеринбургийн стандарт цаг"}
+ }
+ fallbackFormat{"{1} ({0})"}
+ fallbackRegionFormat{"{1} ({0})"}
+ gmtFormat{"GMT{0}"}
+ gmtZeroFormat{"GMT"}
+ hourFormat{"+HH:mm;-HH:mm"}
+ regionFormat{"{0}"}
+ }
+}
diff --git a/data/zone/mn_Cyrl.txt b/data/zone/mn_Cyrl.txt
new file mode 100755
index 0000000..55d4dd3
--- /dev/null
+++ b/data/zone/mn_Cyrl.txt
@@ -0,0 +1,14 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/mn_Cyrl.xml
+// *
+// ***************************************************************************
+/**
+ * ICU <specials> source: <path>/xml/main/mn_Cyrl.xml
+ */
+mn_Cyrl{
+ Version{"2.0.82.45"}
+}
diff --git a/data/zone/shi_Latn_MA.txt b/data/zone/mn_Cyrl_MN.txt
similarity index 86%
rename from data/zone/shi_Latn_MA.txt
rename to data/zone/mn_Cyrl_MN.txt
index cd7fd64..5d61306 100755
--- a/data/zone/shi_Latn_MA.txt
+++ b/data/zone/mn_Cyrl_MN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* generated alias target
*/
-shi_Latn_MA{
+mn_Cyrl_MN{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/coll/hi__DIRECT.txt b/data/zone/mn_MN.txt
old mode 100644
new mode 100755
similarity index 73%
copy from data/coll/hi__DIRECT.txt
copy to data/zone/mn_MN.txt
index fd5973f..cf689b7
--- a/data/coll/hi__DIRECT.txt
+++ b/data/zone/mn_MN.txt
@@ -1,13 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
-hi__DIRECT{
- collations{
- default{"direct"}
- }
+mn_MN{
+ "%%ALIAS"{"mn_Cyrl_MN"}
}
diff --git a/data/zone/mo.txt b/data/zone/mo.txt
index ef3bdd7..55f72d2 100755
--- a/data/zone/mo.txt
+++ b/data/zone/mo.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/mr.txt b/data/zone/mr.txt
index bc499b6..d503e7b 100644
--- a/data/zone/mr.txt
+++ b/data/zone/mr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mr.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/mr.xml
*/
mr{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"अबिद्जान"}
@@ -1246,21 +1246,11 @@
lg{"पश्चिम आफ्रिका वेळ"}
ls{"पश्चिम आफ्रिका मानक वेळ"}
}
- "meta:Aktyubinsk"{
- ld{"अॅक्ट्युबिन्स्क ग्रीष्मकालीन वेळ"}
- lg{"अॅक्ट्युबिन्स्क वेळ"}
- ls{"अॅक्ट्युबिन्स्क प्रमाणवेळ"}
- }
"meta:Alaska"{
ld{"अलास्का दिवस वेळ"}
lg{"अलास्का वेळ"}
ls{"अलास्का प्रमाणवेळ"}
}
- "meta:Alaska_Hawaii"{
- ld{"अलास्का-हवाई दिवस वेळ"}
- lg{"अलास्का-हवाई वेळ"}
- ls{"अलास्का-हवाई प्रमाणवेळ"}
- }
"meta:Almaty"{
ld{"अल्माटी ग्रीष्मकालीन वेळ"}
lg{"अल्माटी वेळ"}
@@ -1326,11 +1316,6 @@
lg{"आर्मेनिया वेळ"}
ls{"आर्मेनिया मानक वेळ"}
}
- "meta:Ashkhabad"{
- ld{"अश्खाबाद ग्रीष्मकालीन वेळ"}
- lg{"अश्खाबाद वेळ"}
- ls{"अश्खाबाद प्रमाणवेळ"}
- }
"meta:Atlantic"{
ld{"अटलांटिक दिवस वेळ"}
lg{"अटलांटिक वेळ"}
@@ -1366,32 +1351,17 @@
lg{"अॅझोरेस वेळ"}
ls{"अॅझोरेस मानक वेळ"}
}
- "meta:Baku"{
- ld{"बाकू ग्रीष्मकालीन वेळ"}
- lg{"बाकू वेळ"}
- ls{"बाकू प्रमाणवेळ"}
- }
"meta:Bangladesh"{
ld{"बांग्लादेश उन्हाळी वेळ"}
lg{"बांग्लादेश वेळ"}
ls{"बांग्लादेश मानक वेळ"}
}
- "meta:Bering"{
- ld{"बेरिंग दिवस वेळ"}
- lg{"बेरिंग वेळ"}
- ls{"बेरिंग प्रमाणवेळ"}
- }
"meta:Bhutan"{
ls{"भूतान वेळ"}
}
"meta:Bolivia"{
ls{"बोलिव्हिया वेळ"}
}
- "meta:Borneo"{
- ld{"बोर्नेओ ग्रीष्मकालीन वेळ"}
- lg{"बोर्नेओ वेळ"}
- ls{"बोर्नेओ प्रमाणवेळ"}
- }
"meta:Brasilia"{
ld{"ब्रासिलिया ग्रीष्मकालीन वेळ"}
lg{"ब्रासिलिया वेळ"}
@@ -1408,9 +1378,6 @@
"meta:Chamorro"{
ls{"चमारो मानक वेळ"}
}
- "meta:Changbai"{
- ls{"चांगबाय वेळ"}
- }
"meta:Chatham"{
ld{"चॅथम सूर्यप्रकाश वेळ"}
lg{"चॅथम वेळ"}
@@ -1452,23 +1419,12 @@
lg{"क्यूबा वेळ"}
ls{"क्यूबा मानक वेळ"}
}
- "meta:Dacca"{
- ls{"ढाका वेळ"}
- }
"meta:Davis"{
ls{"डेव्हिस वेळ"}
}
"meta:DumontDUrville"{
ls{"डरमाँट-डी'उर्व्हिले वेळ"}
}
- "meta:Dushanbe"{
- ld{"दुशांबे ग्रीष्मकालीन वेळ"}
- lg{"दुशांबे वेळ"}
- ls{"दुशांबे प्रमाणवेळ"}
- }
- "meta:Dutch_Guiana"{
- ls{"डच गयाना वेळ"}
- }
"meta:East_Timor"{
ls{"पूर्व तिमोर वेळ"}
}
@@ -1511,11 +1467,6 @@
"meta:French_Southern"{
ls{"फ्रेंच दक्षिण आणि अंटार्कक्टिक वेळ"}
}
- "meta:Frunze"{
- ld{"फ्रंझे ग्रीष्मकालीन वेळ"}
- lg{"फ्रंझे वेळ"}
- ls{"फ्रंझे प्रमाणवेळ"}
- }
"meta:GMT"{
ls{"ग्रीनीच प्रमाण वेळ"}
}
@@ -1533,11 +1484,6 @@
"meta:Gilbert_Islands"{
ls{"गिल्बर्ट बेटे वेळ"}
}
- "meta:Greenland_Central"{
- ld{"मध्य ग्रीनलँड ग्रीष्मकालीन वेळ"}
- lg{"मध्य ग्रीनलँड वेळ"}
- ls{"मध्य ग्रीनलँड प्रमाणवेळ"}
- }
"meta:Greenland_Eastern"{
ld{"पूर्व ग्रीनलँड उन्हाळी वेळ"}
lg{"पूर्व ग्रीनलँड वेळ"}
@@ -1616,23 +1562,12 @@
lg{"पेट्रोपाव्हलोस्क- कामचाट्स्की वेळ"}
ls{"पेट्रोपाव्हलोस्क- कामचाट्स्की प्रमाणवेळ"}
}
- "meta:Karachi"{
- ls{"कराची वेळ"}
- }
- "meta:Kashgar"{
- ls{"कश्गार वेळ"}
- }
"meta:Kazakhstan_Eastern"{
ls{"पूर्व कझाकस्तान वेळ"}
}
"meta:Kazakhstan_Western"{
ls{"पश्चिम कझाकस्तान वेळ"}
}
- "meta:Kizilorda"{
- ld{"किझिलोर्डा ग्रीष्मकालीन वेळ"}
- lg{"किझिलोर्डा वेळ"}
- ls{"किझिलोर्डा प्रमाणवेळ"}
- }
"meta:Korea"{
ld{"कोरियन सूर्यप्रकाश वेळ"}
lg{"कोरियन वेळ"}
@@ -1646,9 +1581,6 @@
lg{"क्रोस्नोयार्स्क वेळ"}
ls{"क्रास्नोयार्स्क मानक वेळ"}
}
- "meta:Kwajalein"{
- ls{"क्वाजालेइन वेळ"}
- }
"meta:Kyrgystan"{
ls{"किरगिस्तान वेळ"}
}
@@ -1658,9 +1590,6 @@
"meta:Line_Islands"{
ls{"लाइन बेटे वेळ"}
}
- "meta:Long_Shu"{
- ls{"लोंग-शू वेळ"}
- }
"meta:Lord_Howe"{
ld{"लॉर्ड होवे दिवस वेळ"}
lg{"लॉर्ड होवे वेळ"}
@@ -1679,9 +1608,6 @@
lg{"मेगाडन वेळ"}
ls{"मागाडन मानक वेळ"}
}
- "meta:Malaya"{
- ls{"मलाया वेळ"}
- }
"meta:Malaysia"{
ls{"मलेशिया वेळ"}
}
@@ -1821,22 +1747,14 @@
lg{"समारा वेळ"}
ls{"सामरा प्रमाणवेळ"}
}
- "meta:Samarkand"{
- ld{"समरकंद ग्रीष्मकालीन वेळ"}
- lg{"समरकंद वेळ"}
- ls{"समरकंद प्रमाणवेळ"}
- }
"meta:Samoa"{
+ ld{"सामोआ ग्रीष्मकालीन वेळ"}
+ lg{"सामोआ वेळ"}
ls{"सामोआ मानक वेळ"}
}
"meta:Seychelles"{
ls{"सेशेल्स वेळ"}
}
- "meta:Shevchenko"{
- ld{"शेवचेन्को ग्रीष्मकालीन वेळ"}
- lg{"शेवचेन्को वेळ"}
- ls{"शेवचेन्को प्रमाणवेळ"}
- }
"meta:Singapore"{
ls{"सिंगापूर मानक वेळ"}
}
@@ -1849,11 +1767,6 @@
"meta:Suriname"{
ls{"सुरिनाम वेळ"}
}
- "meta:Sverdlovsk"{
- ld{"स्वर्डलोव्हस्क ग्रीष्मकालीन वेळ"}
- lg{"स्वर्डलोव्हस्क वेळ"}
- ls{"स्वर्डलोव्हस्क प्रमाणवेळ"}
- }
"meta:Syowa"{
ls{"स्योवा वेळ"}
}
@@ -1868,16 +1781,6 @@
"meta:Tajikistan"{
ls{"ताजिकिस्तान वेळ"}
}
- "meta:Tashkent"{
- ld{"ताश्कंद ग्रीष्मकालीन वेळ"}
- lg{"ताश्कंद वेळ"}
- ls{"ताश्कंद प्रमाणवेळ"}
- }
- "meta:Tbilisi"{
- ld{"बिलिसी ग्रीष्मकालीन वेळ"}
- lg{"बिलिसी वेळ"}
- ls{"बिलिसी प्रमाणवेळ"}
- }
"meta:Tokelau"{
ls{"टोकेलाऊ वेळ"}
}
@@ -1889,11 +1792,6 @@
"meta:Truk"{
ls{"छूक वेळ"}
}
- "meta:Turkey"{
- ld{"तुर्की ग्रीष्मकालीन वेळ"}
- lg{"तुर्की वेळ"}
- ls{"तुर्की प्रमाणवेळ"}
- }
"meta:Turkmenistan"{
ld{"तुर्कमेनिस्तान उन्हाळी वेळ"}
lg{"तुर्कमेनिस्तान वेळ"}
@@ -1902,19 +1800,11 @@
"meta:Tuvalu"{
ls{"तुवालू वेळ"}
}
- "meta:Uralsk"{
- ld{"उराल्स्क ग्रीष्मकालीन वेळ"}
- lg{"उराल्स्क वेळ"}
- ls{"उराल्स्क प्रमाणवेळ"}
- }
"meta:Uruguay"{
ld{"उरुग्वे उन्हाळी वेळ"}
lg{"उरुग्वे वेळ"}
ls{"उरुग्वे मानक वेळ"}
}
- "meta:Urumqi"{
- ls{"उरुमची वेळ"}
- }
"meta:Uzbekistan"{
ld{"उझबेकिस्तान उन्हाळी वेळ"}
lg{"उझबेकिस्तान वेळ"}
@@ -1957,16 +1847,6 @@
lg{"येक्तेरिनबर्ग वेळ"}
ls{"येकातेरिनबर्ग मानक वेळ"}
}
- "meta:Yerevan"{
- ld{"येरेवन ग्रीष्मकालीन वेळ"}
- lg{"येरेवन वेळ"}
- ls{"येरेवन प्रमाणवेळ"}
- }
- "meta:Yukon"{
- ld{"युकोन दिवस वेळ"}
- lg{"युकोन वेळ"}
- ls{"युकोन प्रमाणवेळ"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"{1} वेळ ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/ms.txt b/data/zone/ms.txt
index 1b089ab..118a14a 100644
--- a/data/zone/ms.txt
+++ b/data/zone/ms.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ms.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/ms.xml
*/
ms{
- Version{"2.0.78.20"}
+ Version{"2.0.82.45"}
zoneStrings{
"America:Lower_Princes"{
ec{"Lower Prince's Quarter"}
@@ -517,6 +517,8 @@
ls{"Waktu Piawai Samara"}
}
"meta:Samoa"{
+ ld{"Waktu Musim Panas Samoa"}
+ lg{"Waktu Samoa"}
ls{"Waktu Piawai Samoa"}
}
"meta:Seychelles"{
diff --git a/data/coll/hi__DIRECT.txt b/data/zone/ms_BN.txt
similarity index 73%
copy from data/coll/hi__DIRECT.txt
copy to data/zone/ms_BN.txt
index fd5973f..3f5c08a 100644
--- a/data/coll/hi__DIRECT.txt
+++ b/data/zone/ms_BN.txt
@@ -1,13 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
-hi__DIRECT{
- collations{
- default{"direct"}
- }
+ms_BN{
+ "%%ALIAS"{"ms_Latn_BN"}
}
diff --git a/data/zone/ms_Latn.txt b/data/zone/ms_Latn.txt
new file mode 100644
index 0000000..62fa3e2
--- /dev/null
+++ b/data/zone/ms_Latn.txt
@@ -0,0 +1,14 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/ms_Latn.xml
+// *
+// ***************************************************************************
+/**
+ * ICU <specials> source: <path>/xml/main/ms_Latn.xml
+ */
+ms_Latn{
+ Version{"2.0.82.68"}
+}
diff --git a/data/zone/shi_Latn_MA.txt b/data/zone/ms_Latn_BN.txt
old mode 100755
new mode 100644
similarity index 86%
copy from data/zone/shi_Latn_MA.txt
copy to data/zone/ms_Latn_BN.txt
index cd7fd64..a54fd72
--- a/data/zone/shi_Latn_MA.txt
+++ b/data/zone/ms_Latn_BN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* generated alias target
*/
-shi_Latn_MA{
+ms_Latn_BN{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/zone/shi_Latn_MA.txt b/data/zone/ms_Latn_MY.txt
old mode 100755
new mode 100644
similarity index 86%
copy from data/zone/shi_Latn_MA.txt
copy to data/zone/ms_Latn_MY.txt
index cd7fd64..dc26b90
--- a/data/zone/shi_Latn_MA.txt
+++ b/data/zone/ms_Latn_MY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* generated alias target
*/
-shi_Latn_MA{
+ms_Latn_MY{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/zone/shi_Latn_MA.txt b/data/zone/ms_Latn_SG.txt
old mode 100755
new mode 100644
similarity index 86%
copy from data/zone/shi_Latn_MA.txt
copy to data/zone/ms_Latn_SG.txt
index cd7fd64..c65bf0a
--- a/data/zone/shi_Latn_MA.txt
+++ b/data/zone/ms_Latn_SG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* generated alias target
*/
-shi_Latn_MA{
+ms_Latn_SG{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/coll/hi__DIRECT.txt b/data/zone/ms_MY.txt
similarity index 73%
copy from data/coll/hi__DIRECT.txt
copy to data/zone/ms_MY.txt
index fd5973f..c926ea92 100644
--- a/data/coll/hi__DIRECT.txt
+++ b/data/zone/ms_MY.txt
@@ -1,13 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
-hi__DIRECT{
- collations{
- default{"direct"}
- }
+ms_MY{
+ "%%ALIAS"{"ms_Latn_MY"}
}
diff --git a/data/coll/hi__DIRECT.txt b/data/zone/ms_SG.txt
similarity index 73%
copy from data/coll/hi__DIRECT.txt
copy to data/zone/ms_SG.txt
index fd5973f..841c737 100644
--- a/data/coll/hi__DIRECT.txt
+++ b/data/zone/ms_SG.txt
@@ -1,13 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
-hi__DIRECT{
- collations{
- default{"direct"}
- }
+ms_SG{
+ "%%ALIAS"{"ms_Latn_SG"}
}
diff --git a/data/zone/mt.txt b/data/zone/mt.txt
index 7965518..fcfd404 100644
--- a/data/zone/mt.txt
+++ b/data/zone/mt.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mt.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/mt.xml
*/
mt{
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
zoneStrings{
"Etc:Unknown"{
ec{"Mhux Magħruf"}
diff --git a/data/zone/mua.txt b/data/zone/mua.txt
index 59ed81c..faa91dc 100755
--- a/data/zone/mua.txt
+++ b/data/zone/mua.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/mua.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/mua.xml
*/
mua{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/my.txt b/data/zone/my.txt
index f559a0b..8fa79b2 100644
--- a/data/zone/my.txt
+++ b/data/zone/my.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/my.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/my.xml
*/
my{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
zoneStrings{
"America:Anchorage"{
ec{"အန်ကာရေ့ဂျ်"}
@@ -174,9 +174,6 @@
lg{"ကျူးဘား အချိန်"}
ls{"ကျူးဘား စံတော်ချိန်"}
}
- "meta:Dutch_Guiana"{
- ls{"ဒတ်ချ် ဂီယာနာ အချိန်"}
- }
"meta:East_Timor"{
ls{"အရှေ့တီမော အချိန်"}
}
@@ -214,11 +211,6 @@
lg{"ဂျော်ဂျီယာ အချိန်"}
ls{"ဂျော်ဂျီယာ စံတော်ချိန်"}
}
- "meta:Greenland_Central"{
- ld{"အလယ်ဂရင်းလန်း နွေရာသီ အချိန်"}
- lg{"အလယ်ဂရင်းလန်း အချိန်"}
- ls{"အလယ်ဂရင်းလန်း စံတော်ချိန်"}
- }
"meta:Greenland_Eastern"{
ld{"အရှေ့ဂရင်းလန်း နွေရာသီ အချိန်"}
lg{"အရှေ့ဂရင်းလန်း အချိန်"}
@@ -339,11 +331,6 @@
"meta:South_Georgia"{
ls{"တောင်ဂျော်ဂျီယာ အချိန်"}
}
- "meta:Turkey"{
- ld{"တူရကီ နွေရာသီ အချိန်"}
- lg{"တူရကီ အချိန်"}
- ls{"တူရကီ စံတော်ချိန်"}
- }
"meta:Uruguay"{
ld{"ဥရုဂွေး နွေရာသီ အချိန်"}
lg{"ဥရုဂွေး အချိန်"}
diff --git a/data/zone/naq.txt b/data/zone/naq.txt
index 0563c7e..15ad08e 100755
--- a/data/zone/naq.txt
+++ b/data/zone/naq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/naq.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/naq.xml
*/
naq{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/nb.txt b/data/zone/nb.txt
index bd3e1f7..af383cb 100644
--- a/data/zone/nb.txt
+++ b/data/zone/nb.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nb.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/nb.xml
*/
nb{
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
zoneStrings{
"Africa:Addis_Ababa"{
ec{"Addis Abeba"}
@@ -597,6 +597,9 @@
lg{"Russisk (Samara) tid"}
ls{"Russisk (Samara) normaltid"}
}
+ "meta:Suriname"{
+ ls{"Surinam-tid"}
+ }
"meta:Vladivostok"{
ld{"Russisk (Vladivostok) sommertid"}
lg{"Russisk (Vladivostok) tid"}
diff --git a/data/zone/nb_NO.txt b/data/zone/nb_NO.txt
index a1437d3..db840a9 100644
--- a/data/zone/nb_NO.txt
+++ b/data/zone/nb_NO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/nd.txt b/data/zone/nd.txt
index 5580d45..bed2057 100755
--- a/data/zone/nd.txt
+++ b/data/zone/nd.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nd.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/nd.xml
*/
nd{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/ne.txt b/data/zone/ne.txt
index 3cba1b4..ac2b5d4 100644
--- a/data/zone/ne.txt
+++ b/data/zone/ne.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ne.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/ne.xml
*/
ne{
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"अविड्जान"}
@@ -810,51 +810,6 @@
"Australia:Sydney"{
ec{"सिड्नी"}
}
- "Etc:GMT"{
- ec{"जीएम्टी"}
- }
- "Etc:GMT-1"{
- ec{"जीएम्टी-१"}
- }
- "Etc:GMT-10"{
- ec{"जीएम्टी-१०"}
- }
- "Etc:GMT-11"{
- ec{"जीएम्टी-११"}
- }
- "Etc:GMT-12"{
- ec{"जीएम्टी-१२"}
- }
- "Etc:GMT-13"{
- ec{"जीएम्टी-१३"}
- }
- "Etc:GMT-14"{
- ec{"जीएम्टी-१४"}
- }
- "Etc:GMT-2"{
- ec{"जीएम्टी-२"}
- }
- "Etc:GMT-3"{
- ec{"जीएम्टी-३"}
- }
- "Etc:GMT-4"{
- ec{"जीएम्टी-४"}
- }
- "Etc:GMT-5"{
- ec{"जीएम्टी-५"}
- }
- "Etc:GMT-6"{
- ec{"जीएम्टी-६"}
- }
- "Etc:GMT-7"{
- ec{"जीएम्टी-७"}
- }
- "Etc:GMT-8"{
- ec{"जीएम्टी-८"}
- }
- "Etc:GMT-9"{
- ec{"जीएम्टी-९"}
- }
"Etc:Unknown"{
ec{"अज्ञात सिटी"}
}
diff --git a/data/zone/nl.txt b/data/zone/nl.txt
index 0b6c5f2..501ad09 100644
--- a/data/zone/nl.txt
+++ b/data/zone/nl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nl.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/nl.xml
*/
nl{
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Addis_Ababa"{
ec{"Addis Abeba"}
@@ -380,21 +380,11 @@
lg{"West-Afrikaanse tijd"}
ls{"West-Afrikaanse standaardtijd"}
}
- "meta:Aktyubinsk"{
- ld{"Aktyubinsk-zomertijd"}
- lg{"Aktyubinsk-tijd"}
- ls{"Aktyubinsk-standaardtijd"}
- }
"meta:Alaska"{
ld{"Alaska-zomertijd"}
lg{"Alaska-tijd"}
ls{"Alaska-standaardtijd"}
}
- "meta:Alaska_Hawaii"{
- ld{"Alaska-Hawaii-zomertijd"}
- lg{"Alaska-Hawaii-tijd"}
- ls{"Alaska-Hawaii-standaardtijd"}
- }
"meta:Almaty"{
ld{"Alma-Ata-zomertijd"}
lg{"Alma-Ata-tijd"}
@@ -460,11 +450,6 @@
lg{"Armeense tijd"}
ls{"Armeense standaardtijd"}
}
- "meta:Ashkhabad"{
- ld{"Ashkhabad-zomertijd"}
- lg{"Ashkhabad-tijd"}
- ls{"Ashkhabad-standaardtijd"}
- }
"meta:Atlantic"{
ld{"Atlantic-zomertijd"}
lg{"Atlantic-tijd"}
@@ -500,32 +485,17 @@
lg{"Azoren-tijd"}
ls{"Azoren-standaardtijd"}
}
- "meta:Baku"{
- ld{"Bakoe-zomertijd"}
- lg{"Bakoe-tijd"}
- ls{"Bakoe-standaardtijd"}
- }
"meta:Bangladesh"{
ld{"Bengalese zomertijd"}
lg{"Bengalese tijd"}
ls{"Bengalese standaardtijd"}
}
- "meta:Bering"{
- ld{"Bering-zomertijd"}
- lg{"Bering-tijd"}
- ls{"Bering-standaardtijd"}
- }
"meta:Bhutan"{
ls{"Bhutaanse tijd"}
}
"meta:Bolivia"{
ls{"Boliviaanse tijd"}
}
- "meta:Borneo"{
- ld{"Borneose zomertijd"}
- lg{"Borneose tijd"}
- ls{"Borneose standaardtijd"}
- }
"meta:Brasilia"{
ld{"Braziliaanse zomertijd"}
lg{"Brasilia-tijd"}
@@ -542,9 +512,6 @@
"meta:Chamorro"{
ls{"Chamorro-tijd"}
}
- "meta:Changbai"{
- ls{"Changbai-tijd"}
- }
"meta:Chatham"{
ld{"Chatham zomertijd"}
lg{"Chatham tijd"}
@@ -586,23 +553,12 @@
lg{"Cubaanse tijd"}
ls{"Cubaanse standaardtijd"}
}
- "meta:Dacca"{
- ls{"Dhaka-tijd"}
- }
"meta:Davis"{
ls{"Davis tijd"}
}
"meta:DumontDUrville"{
ls{"Dumont-d'Urville tijd"}
}
- "meta:Dushanbe"{
- ld{"Dushanbe-zomertijd"}
- lg{"Dushanbe-tijd"}
- ls{"Dushanbe-standaardtijd"}
- }
- "meta:Dutch_Guiana"{
- ls{"Nederlands-Guyaanse tijd"}
- }
"meta:East_Timor"{
ls{"Oost-Timorese tijd"}
}
@@ -654,11 +610,6 @@
"meta:French_Southern"{
ls{"Franse zuidelijke en Antarctische tijd"}
}
- "meta:Frunze"{
- ld{"Frunze-zomertijd"}
- lg{"Frunze-tijd"}
- ls{"Frunze-standaardtijd"}
- }
"meta:GMT"{
ls{"Greenwich Mean Time"}
}
@@ -676,11 +627,6 @@
"meta:Gilbert_Islands"{
ls{"Gilberteilandse tijd"}
}
- "meta:Greenland_Central"{
- ld{"Centraal-Groenlandse zomertijd"}
- lg{"Centraal-Groenlandse tijd"}
- ls{"Centraal-Groenlandse standaardtijd"}
- }
"meta:Greenland_Eastern"{
ld{"Oost-Groenlandse zomertijd"}
lg{"Oost-Groenlandse tijd"}
@@ -758,23 +704,12 @@
lg{"Petropavlovsk-Kamtsjatski-tijd"}
ls{"Petropavlovsk-Kamtsjatski-standaardtijd"}
}
- "meta:Karachi"{
- ls{"Karachi-tijd"}
- }
- "meta:Kashgar"{
- ls{"Kashgar-tijd"}
- }
"meta:Kazakhstan_Eastern"{
ls{"Oost-Kazachse tijd"}
}
"meta:Kazakhstan_Western"{
ls{"West-Kazachse tijd"}
}
- "meta:Kizilorda"{
- ld{"Kizilorda-zomertijd"}
- lg{"Kizilorda-tijd"}
- ls{"Kizilorda-standaardtijd"}
- }
"meta:Korea"{
ld{"Koreaanse zomertijd"}
lg{"Koreaanse tijd"}
@@ -788,14 +723,6 @@
lg{"Krasnojarsk-tijd"}
ls{"Krasnojarsk-standaardtijd"}
}
- "meta:Kuybyshev"{
- ld{"Kuybyshev-zomertijd"}
- lg{"Kuybyshev-tijd"}
- ls{"Kuybyshev-standaardtijd"}
- }
- "meta:Kwajalein"{
- ls{"Kwajaleinse tijd"}
- }
"meta:Kyrgystan"{
ls{"Kirgizische tijd"}
}
@@ -805,9 +732,6 @@
"meta:Line_Islands"{
ls{"Line-eilandse tijd"}
}
- "meta:Long_Shu"{
- ls{"Long-Shu-tijd"}
- }
"meta:Lord_Howe"{
ld{"Lord Howe-zomertijd"}
lg{"Lord Howe-tijd"}
@@ -826,9 +750,6 @@
lg{"Magadan-tijd"}
ls{"Magadan-standaardtijd"}
}
- "meta:Malaya"{
- ls{"Malakka-tijd"}
- }
"meta:Malaysia"{
ls{"Maleisische tijd"}
}
@@ -968,22 +889,14 @@
lg{"Samara-tijd"}
ls{"Samara-standaardtijd"}
}
- "meta:Samarkand"{
- ld{"Samarkand-zomertijd"}
- lg{"Samarkand-tijd"}
- ls{"Samarkand-standaardtijd"}
- }
"meta:Samoa"{
+ ld{"Samoaanse zomertijd"}
+ lg{"Samoaanse tijd"}
ls{"Samoaanse standaardtijd"}
}
"meta:Seychelles"{
ls{"Seychelse tijd"}
}
- "meta:Shevchenko"{
- ld{"Shevchenko-zomertijd"}
- lg{"Shevchenko-tijd"}
- ls{"Shevchenko-standaardtijd"}
- }
"meta:Singapore"{
ls{"Singaporese standaardtijd"}
}
@@ -996,11 +909,6 @@
"meta:Suriname"{
ls{"Surinaamse tijd"}
}
- "meta:Sverdlovsk"{
- ld{"Sverdlovsk-zomertijd"}
- lg{"Sverdlovsk-tijd"}
- ls{"Sverdlovsk-standaardtijd"}
- }
"meta:Syowa"{
ls{"Syowa tijd"}
}
@@ -1015,16 +923,6 @@
"meta:Tajikistan"{
ls{"Tadzjiekse tijd"}
}
- "meta:Tashkent"{
- ld{"Tasjkent-zomertijd"}
- lg{"Tasjkent-tijd"}
- ls{"Tasjkent-standaardtijd"}
- }
- "meta:Tbilisi"{
- ld{"Tbilisi-zomertijd"}
- lg{"Tbilisi-tijd"}
- ls{"Tbilisi-standaardtijd"}
- }
"meta:Tokelau"{
ls{"Tokelau-eilandse tijd"}
}
@@ -1036,11 +934,6 @@
"meta:Truk"{
ls{"Chuukse tijd"}
}
- "meta:Turkey"{
- ld{"Turkse zomertijd"}
- lg{"Turkse tijd"}
- ls{"Turkse standaardtijd"}
- }
"meta:Turkmenistan"{
ld{"Turkmeense zomertijd"}
lg{"Turkmeense tijd"}
@@ -1049,19 +942,11 @@
"meta:Tuvalu"{
ls{"Tuvaluaanse tijd"}
}
- "meta:Uralsk"{
- ld{"Oral-zomertijd"}
- lg{"Oral-tijd"}
- ls{"Oral-standaardtijd"}
- }
"meta:Uruguay"{
ld{"Uruguayaanse zomertijd"}
lg{"Uruguayaanse tijd"}
ls{"Uruguayaanse standaardtijd"}
}
- "meta:Urumqi"{
- ls{"Ürümqi-tijd"}
- }
"meta:Uzbekistan"{
ld{"Oezbeekse zomertijd"}
lg{"Oezbeekse tijd"}
@@ -1104,16 +989,6 @@
lg{"Jekaterinenburg-tijd"}
ls{"Jekaterinenburg-standaardtijd"}
}
- "meta:Yerevan"{
- ld{"Jerevan-zomertijd"}
- lg{"Jerevan-tijd"}
- ls{"Jerevan-standaardtijd"}
- }
- "meta:Yukon"{
- ld{"Yukon-zomertijd"}
- lg{"Yukon-tijd"}
- ls{"Yukon-standaardtijd"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"{1}-tijd ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/nmg.txt b/data/zone/nmg.txt
index 064e5d8..eb533e8 100755
--- a/data/zone/nmg.txt
+++ b/data/zone/nmg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nmg.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/nmg.xml
*/
nmg{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/nn.txt b/data/zone/nn.txt
index 6b308e6..cf9ff8e 100644
--- a/data/zone/nn.txt
+++ b/data/zone/nn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nn.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/nn.xml
*/
nn{
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
zoneStrings{
"America:Belem"{
ec{"Belém"}
diff --git a/data/zone/nn_NO.txt b/data/zone/nn_NO.txt
index e8050a8..e297007 100644
--- a/data/zone/nn_NO.txt
+++ b/data/zone/nn_NO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/no.txt b/data/zone/no.txt
index 49a17b2..6dc26b5 100644
--- a/data/zone/no.txt
+++ b/data/zone/no.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/no_NO.txt b/data/zone/no_NO.txt
index 4b958f6..408deef 100644
--- a/data/zone/no_NO.txt
+++ b/data/zone/no_NO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/no_NO_NY.txt b/data/zone/no_NO_NY.txt
index 61d8107..38940c7c 100644
--- a/data/zone/no_NO_NY.txt
+++ b/data/zone/no_NO_NY.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/nus.txt b/data/zone/nus.txt
index 638a1d0..887ddc2 100755
--- a/data/zone/nus.txt
+++ b/data/zone/nus.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nus.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/nus.xml
*/
nus{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/nyn.txt b/data/zone/nyn.txt
index de66853..384f1a6 100755
--- a/data/zone/nyn.txt
+++ b/data/zone/nyn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/nyn.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/nyn.xml
*/
nyn{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/om.txt b/data/zone/om.txt
index eaeb5fb..05c94a7 100644
--- a/data/zone/om.txt
+++ b/data/zone/om.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/om.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/om.xml
*/
om{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
zoneStrings{
gmtFormat{"GMT{0}"}
hourFormat{"+HH:mm;-HH:mm"}
diff --git a/data/zone/or.txt b/data/zone/or.txt
index a5eb8fa..3a4cb97 100644
--- a/data/zone/or.txt
+++ b/data/zone/or.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/or.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/or.xml
*/
or{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
zoneStrings{
"meta:Christmas"{
ls{"ଖ୍ରୀଷ୍ଟମାସ ଆଇଲ୍ୟାଣ୍ଡ ସମୟ"}
diff --git a/data/zone/pa.txt b/data/zone/pa.txt
index 6d8f399..171c38c 100644
--- a/data/zone/pa.txt
+++ b/data/zone/pa.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pa.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/pa.xml
*/
pa{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
zoneStrings{
"meta:India"{
ss{"IST"}
diff --git a/data/zone/pa_Arab.txt b/data/zone/pa_Arab.txt
index 1970ab3..a15afd2 100644
--- a/data/zone/pa_Arab.txt
+++ b/data/zone/pa_Arab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pa_Arab.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/pa_Arab.xml
*/
pa_Arab{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/pa_Arab_PK.txt b/data/zone/pa_Arab_PK.txt
index a535601..d07b5c6 100644
--- a/data/zone/pa_Arab_PK.txt
+++ b/data/zone/pa_Arab_PK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/pa_Guru.txt b/data/zone/pa_Guru.txt
index e2feb97..0562443 100644
--- a/data/zone/pa_Guru.txt
+++ b/data/zone/pa_Guru.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pa_Guru.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/pa_Guru.xml
*/
pa_Guru{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/pa_Guru_IN.txt b/data/zone/pa_Guru_IN.txt
index 69fdff4..7f5e984 100644
--- a/data/zone/pa_Guru_IN.txt
+++ b/data/zone/pa_Guru_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/pa_IN.txt b/data/zone/pa_IN.txt
index f8f230a..8a52933 100644
--- a/data/zone/pa_IN.txt
+++ b/data/zone/pa_IN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/pa_PK.txt b/data/zone/pa_PK.txt
index 22fb56e..8478504 100644
--- a/data/zone/pa_PK.txt
+++ b/data/zone/pa_PK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/pl.txt b/data/zone/pl.txt
index f7f87bf..1bac36b 100644
--- a/data/zone/pl.txt
+++ b/data/zone/pl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pl.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/pl.xml
*/
pl{
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidżan"}
@@ -834,11 +834,6 @@
"meta:Gilbert_Islands"{
ls{"Wyspy Gilberta"}
}
- "meta:Greenland_Central"{
- ld{"Czas centralnogrenlandzki letni"}
- lg{"Czas centralnogrenlandzki"}
- ls{"Czas standardowy centralnogrenlandzki"}
- }
"meta:Greenland_Eastern"{
ld{"Grenlandia Wschodnia (czas letni)"}
lg{"Grenlandia Wschodnia"}
diff --git a/data/zone/pool.res b/data/zone/pool.res
index 19a0ae5..bf2ce0f 100644
--- a/data/zone/pool.res
+++ b/data/zone/pool.res
Binary files differ
diff --git a/data/zone/ps.txt b/data/zone/ps.txt
index 46c2bef..26cfe09 100644
--- a/data/zone/ps.txt
+++ b/data/zone/ps.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ps.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/ps.xml
*/
ps{
- Version{"2.0.75.94"}
+ Version{"2.0.82.45"}
zoneStrings{
"Asia:Kabul"{
ec{"کابل"}
diff --git a/data/zone/pt.txt b/data/zone/pt.txt
index 55289b0..3dab0a6 100644
--- a/data/zone/pt.txt
+++ b/data/zone/pt.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/pt.xml
*/
pt{
- Version{"2.0.78.30"}
+ Version{"2.0.82.47"}
zoneStrings{
"Africa:Algiers"{
ec{"Argel"}
@@ -425,21 +425,11 @@
lg{"Horário da África Ocidental"}
ls{"Horário Padrão da África Ocidental"}
}
- "meta:Aktyubinsk"{
- ld{"Horário de Verão do Aktyubinsk"}
- lg{"Horário do Aktyubinsk"}
- ls{"Horário Padrão do Aktyubinsk"}
- }
"meta:Alaska"{
ld{"Horário de Verão do Alasca"}
lg{"Horário do Alasca"}
ls{"Horário Padrão do Alasca"}
}
- "meta:Alaska_Hawaii"{
- ld{"Horário de Verão do Alasca-Havaí"}
- lg{"Horário do Alasca-Havaí"}
- ls{"Horário Padrão do Alasca-Havaí"}
- }
"meta:Almaty"{
ld{"Horário de Verão do Almaty"}
lg{"Horário do Almaty"}
@@ -508,11 +498,6 @@
lg{"Horário da Armênia"}
ls{"Horário Padrão da Armênia"}
}
- "meta:Ashkhabad"{
- ld{"Horário de Verão de Ashkhabad"}
- lg{"Horário de Ashkhabad"}
- ls{"Horário Padrão de Ashkhabad"}
- }
"meta:Atlantic"{
ld{"Horário de Verão do Atlântico"}
lg{"Horário do Atlântico"}
@@ -548,32 +533,17 @@
lg{"Horário dos Açores"}
ls{"Horário Padrão dos Açores"}
}
- "meta:Baku"{
- ld{"Horário de Verão de Baku"}
- lg{"Horário de Baku"}
- ls{"Horário Padrão de Baku"}
- }
"meta:Bangladesh"{
ld{"Horário de Verão de Bangladesh"}
lg{"Horário de Bangladesh"}
ls{"Horário Padrão de Bangladesh"}
}
- "meta:Bering"{
- ld{"Horário de Verão de Bering"}
- lg{"Horário de Bering"}
- ls{"Horário Padrão de Bering"}
- }
"meta:Bhutan"{
ls{"Horário do Butão"}
}
"meta:Bolivia"{
ls{"Horário da Bolívia"}
}
- "meta:Borneo"{
- ld{"Horário de Verão de Bornéu"}
- lg{"Horário de Bornéu"}
- ls{"Horário Padrão de Bornéu"}
- }
"meta:Brasilia"{
ld{"Horário de Verão de Brasília"}
lg{"Horário de Brasília"}
@@ -593,9 +563,6 @@
"meta:Chamorro"{
ls{"Horário de Chamorro"}
}
- "meta:Changbai"{
- ls{"Horário de Changbai"}
- }
"meta:Chatham"{
ld{"Horário de Verão de Chatham"}
lg{"Horário de Chatham"}
@@ -637,23 +604,12 @@
lg{"Horário de Cuba"}
ls{"Horário Padrão de Cuba"}
}
- "meta:Dacca"{
- ls{"Horário de Dacca"}
- }
"meta:Davis"{
ls{"Horário de Davis"}
}
"meta:DumontDUrville"{
ls{"Horário de Dumont-d'Urville"}
}
- "meta:Dushanbe"{
- ld{"Horário de Verão de Dushanbe"}
- lg{"Horário de Dushanbe"}
- ls{"Horário Padrão de Dushanbe"}
- }
- "meta:Dutch_Guiana"{
- ls{"Horário da Guiana Holandesa"}
- }
"meta:East_Timor"{
ls{"Horário do Timor-Leste"}
}
@@ -696,11 +652,6 @@
"meta:French_Southern"{
ls{"Horário da Antártida e do Sul da França"}
}
- "meta:Frunze"{
- ld{"Horário de Verão de Frunze"}
- lg{"Horário de Frunze"}
- ls{"Horário Padrão de Frunze"}
- }
"meta:GMT"{
ls{"Horário do Meridiano de Greenwich"}
}
@@ -718,11 +669,6 @@
"meta:Gilbert_Islands"{
ls{"Horário das Ilhas Gilberto"}
}
- "meta:Greenland_Central"{
- ld{"Horário de Verão da Groenlândia Central"}
- lg{"Horário da Groelândia Central"}
- ls{"Horário Padrão da Groelândia Central"}
- }
"meta:Greenland_Eastern"{
ld{"Horário de Verão da Groelândia Oriental"}
lg{"Horário da Groelândia Oriental"}
@@ -800,23 +746,12 @@
lg{"Horário de Petropavlovsk-Kamchatski"}
ls{"Horário Padrão de Petropavlovsk-Kamchatski"}
}
- "meta:Karachi"{
- ls{"Horário de Karachi"}
- }
- "meta:Kashgar"{
- ls{"Horário de Kashgar"}
- }
"meta:Kazakhstan_Eastern"{
ls{"Horário do Casaquistão Oriental"}
}
"meta:Kazakhstan_Western"{
ls{"Horário do Casaquistão Ocidental"}
}
- "meta:Kizilorda"{
- ld{"Horário de Verão de Kizilorda"}
- lg{"Horário de Kizilorda"}
- ls{"Horário Padrão de Kizilorda"}
- }
"meta:Korea"{
ld{"Horário de Verão da Coreia"}
lg{"Horário da Coreia"}
@@ -830,14 +765,6 @@
lg{"Horário de Krasnoyarsk"}
ls{"Horário Padrão de Krasnoyarsk"}
}
- "meta:Kuybyshev"{
- ld{"Horário de Verão de Kuybyshev"}
- lg{"Horário de Kuybyshev"}
- ls{"Horário Padrão de Kuybyshev"}
- }
- "meta:Kwajalein"{
- ls{"Horário de Kwajalein"}
- }
"meta:Kyrgystan"{
ls{"Horário do Quirguistão"}
}
@@ -847,9 +774,6 @@
"meta:Line_Islands"{
ls{"Horário das Ilhas Line"}
}
- "meta:Long_Shu"{
- ls{"Horário de Long-Shu"}
- }
"meta:Lord_Howe"{
ld{"Horário de Verão de Lord Howe"}
lg{"Horário de Lord Howe"}
@@ -868,9 +792,6 @@
lg{"Horário de Magadan"}
ls{"Horário Padrão de Magadan"}
}
- "meta:Malaya"{
- ls{"Horário de Malaia"}
- }
"meta:Malaysia"{
ls{"Horário da Malásia"}
}
@@ -1010,22 +931,14 @@
lg{"Horário de Samara"}
ls{"Horário Padrão de Samara"}
}
- "meta:Samarkand"{
- ld{"Horário de Verão de Samarkand"}
- lg{"Horário de Samarkand"}
- ls{"Horário Padrão de Samarkand"}
- }
"meta:Samoa"{
+ ld{"Horário de Verão de Samoa"}
+ lg{"Horário de Samoa"}
ls{"Horário Padrão de Samoa"}
}
"meta:Seychelles"{
ls{"Horário das Ilhas Seychelles"}
}
- "meta:Shevchenko"{
- ld{"Horário de Verão de Shevchenko"}
- lg{"Horário de Shevchenko"}
- ls{"Horário Padrão de Shevchenko"}
- }
"meta:Singapore"{
ls{"Horário Padrão de Cingapura"}
}
@@ -1038,11 +951,6 @@
"meta:Suriname"{
ls{"Horário do Suriname"}
}
- "meta:Sverdlovsk"{
- ld{"Horário de Verão de Sverdlovsk"}
- lg{"Horário de Sverdlovsk"}
- ls{"Horário Padrão de Sverdlovsk"}
- }
"meta:Syowa"{
ls{"Horário de Syowa"}
}
@@ -1057,16 +965,6 @@
"meta:Tajikistan"{
ls{"Horário do Tajiquistão"}
}
- "meta:Tashkent"{
- ld{"Horário de Verão de Tashkent"}
- lg{"Horário de Tashkent"}
- ls{"Horário Padrão de Tashkent"}
- }
- "meta:Tbilisi"{
- ld{"Horário de Verão de Tbilisi"}
- lg{"Horário de Tbilisi"}
- ls{"Horário Padrão de Tbilisi"}
- }
"meta:Tokelau"{
ls{"Horário de Tokelau"}
}
@@ -1078,11 +976,6 @@
"meta:Truk"{
ls{"Horário de Chuuk"}
}
- "meta:Turkey"{
- ld{"Horário de Verão da Turquia"}
- lg{"Horário da Turquia"}
- ls{"Horário Padrão da Turquia"}
- }
"meta:Turkmenistan"{
ld{"Horário de Verão do Turcomenistão"}
lg{"Horário do Turcomenistão"}
@@ -1091,19 +984,11 @@
"meta:Tuvalu"{
ls{"Horário de Tuvalu"}
}
- "meta:Uralsk"{
- ld{"Horário de Verão de Ural'sk"}
- lg{"Horário de Ural'sk"}
- ls{"Horário Padrão de Ural'sk"}
- }
"meta:Uruguay"{
ld{"Horário de Verão do Uruguai"}
lg{"Horário do Uruguai"}
ls{"Horário Padrão do Uruguai"}
}
- "meta:Urumqi"{
- ls{"Horário de Urumqi"}
- }
"meta:Uzbekistan"{
ld{"Horário de Verão do Uzbequistão"}
lg{"Horário do Uzbequistão"}
@@ -1146,16 +1031,6 @@
lg{"Horário de Ecaterimburgo"}
ls{"Horário Padrão de Ecaterimburgo"}
}
- "meta:Yerevan"{
- ld{"Horário de Verão de Yerevan"}
- lg{"Horário de Yerevan"}
- ls{"Horário Padrão de Yerevan"}
- }
- "meta:Yukon"{
- ld{"Horário de Verão de Yukon"}
- lg{"Horário de Yukon"}
- ls{"Horário Padrão de Yukon"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"{1} Horário ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/pt_AO.txt b/data/zone/pt_AO.txt
index 53ac266..3cbf9a6 100755
--- a/data/zone/pt_AO.txt
+++ b/data/zone/pt_AO.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_AO.xml
// *
// ***************************************************************************
pt_AO{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"meta:Azores"{
sd{"∅∅∅"}
diff --git a/data/zone/pt_CV.txt b/data/zone/pt_CV.txt
index b5a6e7f..a5dafd1 100755
--- a/data/zone/pt_CV.txt
+++ b/data/zone/pt_CV.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_CV.xml
// *
// ***************************************************************************
pt_CV{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"meta:Azores"{
sd{"∅∅∅"}
diff --git a/data/zone/pt_GW.txt b/data/zone/pt_GW.txt
index b92a5d1..427cbda 100755
--- a/data/zone/pt_GW.txt
+++ b/data/zone/pt_GW.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_GW.xml
// *
// ***************************************************************************
pt_GW{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"meta:Azores"{
sd{"∅∅∅"}
diff --git a/data/zone/pt_MO.txt b/data/zone/pt_MO.txt
index 0c9b736..8a47fd5 100755
--- a/data/zone/pt_MO.txt
+++ b/data/zone/pt_MO.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_MO.xml
// *
// ***************************************************************************
pt_MO{
- Version{"2.0.74.87"}
+ Version{"2.0.82.68"}
zoneStrings{
"meta:Azores"{
sd{"∅∅∅"}
diff --git a/data/zone/pt_MZ.txt b/data/zone/pt_MZ.txt
index cdb61f1..2eb2042 100755
--- a/data/zone/pt_MZ.txt
+++ b/data/zone/pt_MZ.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_MZ.xml
// *
// ***************************************************************************
pt_MZ{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"meta:Azores"{
sd{"∅∅∅"}
diff --git a/data/zone/pt_PT.txt b/data/zone/pt_PT.txt
index 2216db6..1f4d2bd 100644
--- a/data/zone/pt_PT.txt
+++ b/data/zone/pt_PT.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_PT.xml
// *
// ***************************************************************************
pt_PT{
- Version{"2.0.78.47"}
+ Version{"2.0.82.51"}
zoneStrings{
"Africa:Djibouti"{
ec{"Jibuti"}
@@ -121,21 +121,11 @@
lg{"Hora da África Ocidental"}
ls{"Hora Padrão da África Ocidental"}
}
- "meta:Aktyubinsk"{
- ld{"Hora de Verão de Aktyubinsk"}
- lg{"Hora de Aktyubinsk"}
- ls{"Hora Padrão de Aktyubinsk"}
- }
"meta:Alaska"{
ld{"Hora de Verão do Alasca"}
lg{"Hora do Alasca"}
ls{"Hora Padrão do Alasca"}
}
- "meta:Alaska_Hawaii"{
- ld{"Hora de Verão do Alasca-Havaí"}
- lg{"Hora do Alasca-Havaí"}
- ls{"Hora Padrão do Alasca-Havaí"}
- }
"meta:Almaty"{
ld{"Hora de Verão de Almaty"}
lg{"Hora de Almaty"}
@@ -204,11 +194,6 @@
lg{"Hora da Arménia"}
ls{"Hora Padrão da Arménia"}
}
- "meta:Ashkhabad"{
- ld{"Hora de Verão de Ashkhabad"}
- lg{"Hora de Ashkhabad"}
- ls{"Hora Padrão de Ashkhabad"}
- }
"meta:Atlantic"{
ld{"Hora de Verão do Atlântico"}
lg{"Hora do Atlântico"}
@@ -247,32 +232,17 @@
sg{"AZOT"}
ss{"AZOT"}
}
- "meta:Baku"{
- ld{"Hora de Verão de Baku"}
- lg{"Hora de Baku"}
- ls{"Hora Padrão de Baku"}
- }
"meta:Bangladesh"{
ld{"Hora de Verão do Bangladeche"}
lg{"Hora do Bangladeche"}
ls{"Hora Padrão do Bangladeche"}
}
- "meta:Bering"{
- ld{"Hora de Verão de Bering"}
- lg{"Hora de Bering"}
- ls{"Hora Padrão de Bering"}
- }
"meta:Bhutan"{
ls{"Hora do Butão"}
}
"meta:Bolivia"{
ls{"Hora da Bolívia"}
}
- "meta:Borneo"{
- ld{"Hora de Verão do Bornéu"}
- lg{"Hora do Bornéu"}
- ls{"Hora Padrão do Bornéu"}
- }
"meta:Brasilia"{
ld{"Hora de Verão de Brasília"}
lg{"Hora de Brasília"}
@@ -292,9 +262,6 @@
"meta:Chamorro"{
ls{"Hora Padrão do Chamorro"}
}
- "meta:Changbai"{
- ls{"Hora de Changbai"}
- }
"meta:Chatham"{
ld{"Hora de Verão do Chatham"}
lg{"Hora do Chatham"}
@@ -336,23 +303,12 @@
lg{"Hora de Cuba"}
ls{"Hora Padrão de Cuba"}
}
- "meta:Dacca"{
- ls{"Hora de Dacca"}
- }
"meta:Davis"{
ls{"Hora de Davis"}
}
"meta:DumontDUrville"{
ls{"Hora de Dumont-d'Urville"}
}
- "meta:Dushanbe"{
- ld{"Hora de Verão de Dushanbe"}
- lg{"Hora de Dushanbe"}
- ls{"Hora Padrão de Dushanbe"}
- }
- "meta:Dutch_Guiana"{
- ls{"Hora da Guiana Holandesa"}
- }
"meta:East_Timor"{
ls{"Hora de Timor Leste"}
}
@@ -404,11 +360,6 @@
"meta:French_Southern"{
ls{"Hora das Terras Austrais e Antártidas Francesas"}
}
- "meta:Frunze"{
- ld{"Hora de Verão de Frunze"}
- lg{"Hora de Frunze"}
- ls{"Hora Padrão de Frunze"}
- }
"meta:GMT"{
ls{"Hora de Greenwich"}
}
@@ -426,11 +377,6 @@
"meta:Gilbert_Islands"{
ls{"Hora das Ilhas Gilbert"}
}
- "meta:Greenland_Central"{
- ld{"Hora de Verão da Gronelândia Central"}
- lg{"Hora da Gronelândia Central"}
- ls{"Hora Padrão da Gronelândia Central"}
- }
"meta:Greenland_Eastern"{
ld{"Hora de Verão da Gronelândia Oriental"}
lg{"Hora da Gronelândia Oriental"}
@@ -508,23 +454,12 @@
lg{"Hora de Petropavlovsk-Kamchatski"}
ls{"Hora Padrão de Petropavlovsk-Kamchatski"}
}
- "meta:Karachi"{
- ls{"Hora de Carachi"}
- }
- "meta:Kashgar"{
- ls{"Hora de Kashgar"}
- }
"meta:Kazakhstan_Eastern"{
ls{"Hora do Cazaquistão Oriental"}
}
"meta:Kazakhstan_Western"{
ls{"Hora do Cazaquistão Ocidental"}
}
- "meta:Kizilorda"{
- ld{"Hora de Verão de Kizilorda"}
- lg{"Hora de Kizilorda"}
- ls{"Hora Padrão de Kizilorda"}
- }
"meta:Korea"{
ld{"Hora de Verão da Coreia"}
lg{"Hora da Coreia"}
@@ -538,14 +473,6 @@
lg{"Hora de Krasnoiarsk"}
ls{"Hora Padrão de Krasnoyarsk"}
}
- "meta:Kuybyshev"{
- ld{"Hora de Verão de Kuybyshev"}
- lg{"Hora de Kuybyshev"}
- ls{"Hora Padrão de Kuybyshev"}
- }
- "meta:Kwajalein"{
- ls{"Hora de Kwajalein"}
- }
"meta:Kyrgystan"{
ls{"Hora do Quirguistão"}
}
@@ -555,9 +482,6 @@
"meta:Line_Islands"{
ls{"Hora das Ilhas Line"}
}
- "meta:Long_Shu"{
- ls{"Hora de Long-Shu"}
- }
"meta:Lord_Howe"{
ld{"Hora de Verão de Lord Howe"}
lg{"Hora de Lord Howe"}
@@ -576,9 +500,6 @@
lg{"Hora de Magadan"}
ls{"Hora Padrão de Magadan"}
}
- "meta:Malaya"{
- ls{"Hora de Malaia"}
- }
"meta:Malaysia"{
ls{"Hora da Malásia"}
}
@@ -718,22 +639,12 @@
lg{"Hora de Samara"}
ls{"Hora Padrão de Samara"}
}
- "meta:Samarkand"{
- ld{"Hora de Verão de Samarkand"}
- lg{"Hora de Samarkand"}
- ls{"Hora Padrão de Samarkand"}
- }
"meta:Samoa"{
ls{"Hora Padrão de Samoa"}
}
"meta:Seychelles"{
ls{"Hora das Seicheles"}
}
- "meta:Shevchenko"{
- ld{"Hora de Verão de Shevchenko"}
- lg{"Hora de Shevchenko"}
- ls{"Hora Padrão de Shevchenko"}
- }
"meta:Singapore"{
ls{"Hora Padrão de Singapura"}
}
@@ -746,11 +657,6 @@
"meta:Suriname"{
ls{"Hora do Suriname"}
}
- "meta:Sverdlovsk"{
- ld{"Hora de Verão de Sverdlovsk"}
- lg{"Hora de Sverdlovsk"}
- ls{"Hora Padrão de Sverdlovsk"}
- }
"meta:Syowa"{
ls{"Hora de Syowa"}
}
@@ -765,16 +671,6 @@
"meta:Tajikistan"{
ls{"Hora do Tajiquistão"}
}
- "meta:Tashkent"{
- ld{"Hora de Verão de Tashkent"}
- lg{"Hora de Tashkent"}
- ls{"Hora Padrão de Tashkent"}
- }
- "meta:Tbilisi"{
- ld{"Hora de Verão de Tbilisi"}
- lg{"Hora da Tbilisi"}
- ls{"Hora Padrão de Tbilisi"}
- }
"meta:Tokelau"{
ls{"Hora de Tokelau"}
}
@@ -786,11 +682,6 @@
"meta:Truk"{
ls{"Hora de Chuuk"}
}
- "meta:Turkey"{
- ld{"Hora de Verão da Turquia"}
- lg{"Hora da Turquia"}
- ls{"Hora Padrão da Turquia"}
- }
"meta:Turkmenistan"{
ld{"Hora de Verão do Turquemenistão"}
lg{"Hora do Turquemenistão"}
@@ -799,23 +690,15 @@
"meta:Tuvalu"{
ls{"Hora de Tuvalu"}
}
- "meta:Uralsk"{
- ld{"Hora de Verão de Ural'sk"}
- lg{"Hora de Ural'sk"}
- ls{"Hora Padrão de Ural'sk"}
- }
"meta:Uruguay"{
ld{"Hora de Verão do Uruguai"}
lg{"Hora do Uruguai"}
ls{"Hora Padrão do Uruguai"}
}
- "meta:Urumqi"{
- ls{"Hora de Urumqi"}
- }
"meta:Uzbekistan"{
- ld{"Hora de Verão do Usbequistão"}
- lg{"Hora do Usbequistão"}
- ls{"Hora Padrão do Usbequistão"}
+ ld{"Hora de Verão do Uzbequistão"}
+ lg{"Hora do Uzbequistão"}
+ ls{"Hora Padrão do Uzbequistão"}
}
"meta:Vanuatu"{
ld{"Hora de Verão do Vanuatu"}
@@ -854,16 +737,6 @@
lg{"Hora de Ecaterimburgo"}
ls{"Hora Padrão de Ecaterimburgo"}
}
- "meta:Yerevan"{
- ld{"Hora de Verão de Yerevan"}
- lg{"Hora de Yerevan"}
- ls{"Hora Padrão de Yerevan"}
- }
- "meta:Yukon"{
- ld{"Hora de Verão de Yukon"}
- lg{"Hora de Yukon"}
- ls{"Hora Padrão de Yukon"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"Hora de {1} ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/pt_ST.txt b/data/zone/pt_ST.txt
index 594ba18..c5bfe38 100755
--- a/data/zone/pt_ST.txt
+++ b/data/zone/pt_ST.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_ST.xml
// *
// ***************************************************************************
pt_ST{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"meta:Azores"{
sd{"∅∅∅"}
diff --git a/data/zone/pt_TL.txt b/data/zone/pt_TL.txt
index 1af2339..7a133fa 100755
--- a/data/zone/pt_TL.txt
+++ b/data/zone/pt_TL.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/pt_TL.xml
// *
// ***************************************************************************
pt_TL{
- Version{"2.0.75.60"}
+ Version{"2.0.82.45"}
zoneStrings{
"meta:Azores"{
sd{"∅∅∅"}
diff --git a/data/zone/resfiles.mk b/data/zone/resfiles.mk
index d911d5f..d73d652 100644
--- a/data/zone/resfiles.mk
+++ b/data/zone/resfiles.mk
@@ -1,6 +1,6 @@
-# * Copyright (C) 1998-2012, International Business Machines
+# * Copyright (C) 1998-2013, International Business Machines
# * Corporation and others. All Rights Reserved.
-ZONE_CLDR_VERSION = 22.1.1
+ZONE_CLDR_VERSION = 23
# A list of txt's to build
# Note:
#
@@ -31,17 +31,18 @@
ha_Latn_NE.txt ha_Latn_NG.txt ha_NE.txt ha_NG.txt he_IL.txt\
id_ID.txt in.txt in_ID.txt iw.txt iw_IL.txt\
ja_JP.txt ja_JP_TRADITIONAL.txt kk_Cyrl_KZ.txt kk_KZ.txt ks_Arab_IN.txt\
- ks_IN.txt mo.txt nb_NO.txt nn_NO.txt no.txt\
- no_NO.txt no_NO_NY.txt pa_Arab_PK.txt pa_Guru_IN.txt pa_IN.txt\
- pa_PK.txt ro_MD.txt sh.txt sh_BA.txt sh_CS.txt\
- sh_YU.txt shi_Latn_MA.txt shi_MA.txt sr_BA.txt sr_CS.txt\
- sr_Cyrl_BA.txt sr_Cyrl_CS.txt sr_Cyrl_RS.txt sr_Cyrl_YU.txt sr_Latn_BA.txt\
- sr_Latn_CS.txt sr_Latn_ME.txt sr_Latn_RS.txt sr_Latn_YU.txt sr_ME.txt\
- sr_RS.txt sr_YU.txt th_TH.txt th_TH_TRADITIONAL.txt tl.txt\
- tl_PH.txt tzm_Latn_MA.txt tzm_MA.txt uz_AF.txt uz_Arab_AF.txt\
- uz_Cyrl_UZ.txt uz_UZ.txt vai_LR.txt vai_Vaii_LR.txt zh_CN.txt\
- zh_HK.txt zh_Hans_CN.txt zh_Hant_MO.txt zh_Hant_TW.txt zh_MO.txt\
- zh_SG.txt zh_TW.txt
+ ks_IN.txt mn_Cyrl_MN.txt mn_MN.txt mo.txt ms_BN.txt\
+ ms_Latn_BN.txt ms_Latn_MY.txt ms_Latn_SG.txt ms_MY.txt ms_SG.txt\
+ nb_NO.txt nn_NO.txt no.txt no_NO.txt no_NO_NY.txt\
+ pa_Arab_PK.txt pa_Guru_IN.txt pa_IN.txt pa_PK.txt ro_MD.txt\
+ sh.txt sh_BA.txt sh_CS.txt sh_YU.txt shi_MA.txt\
+ shi_Tfng_MA.txt sr_BA.txt sr_CS.txt sr_Cyrl_BA.txt sr_Cyrl_CS.txt\
+ sr_Cyrl_RS.txt sr_Cyrl_YU.txt sr_Latn_BA.txt sr_Latn_CS.txt sr_Latn_ME.txt\
+ sr_Latn_RS.txt sr_Latn_YU.txt sr_ME.txt sr_RS.txt sr_YU.txt\
+ th_TH.txt th_TH_TRADITIONAL.txt tl.txt tl_PH.txt tzm_Latn_MA.txt\
+ tzm_MA.txt uz_AF.txt uz_Arab_AF.txt uz_Cyrl_UZ.txt uz_UZ.txt\
+ vai_LR.txt vai_Vaii_LR.txt zh_CN.txt zh_HK.txt zh_Hans_CN.txt\
+ zh_Hant_MO.txt zh_Hant_TW.txt zh_MO.txt zh_SG.txt zh_TW.txt
# All aliases (to not be included under 'installed'), but not including root.
@@ -83,23 +84,24 @@
lg.txt ln.txt lo.txt lt.txt lu.txt\
luo.txt luy.txt lv.txt mas.txt mer.txt\
mfe.txt mg.txt mgh.txt mgo.txt mk.txt\
- ml.txt mr.txt ms.txt mt.txt mua.txt\
- my.txt naq.txt nb.txt nd.txt ne.txt\
- nl.txt nmg.txt nn.txt nus.txt nyn.txt\
- om.txt or.txt pa.txt pa_Arab.txt pa_Guru.txt\
- pl.txt ps.txt pt.txt pt_AO.txt pt_CV.txt\
- pt_GW.txt pt_MO.txt pt_MZ.txt pt_PT.txt pt_ST.txt\
- pt_TL.txt rm.txt rn.txt ro.txt rof.txt\
- ru.txt rw.txt rwk.txt saq.txt sbp.txt\
- seh.txt ses.txt sg.txt shi.txt shi_Latn.txt\
- shi_Tfng.txt si.txt sk.txt sl.txt sn.txt\
- so.txt sq.txt sr.txt sr_Cyrl.txt sr_Latn.txt\
- sv.txt sv_FI.txt sw.txt swc.txt ta.txt\
- ta_MY.txt ta_SG.txt te.txt teo.txt th.txt\
- ti.txt to.txt tr.txt twq.txt tzm.txt\
- tzm_Latn.txt uk.txt ur.txt uz.txt uz_Arab.txt\
- uz_Cyrl.txt uz_Latn.txt vai.txt vai_Latn.txt vai_Vaii.txt\
- vi.txt vun.txt xog.txt yav.txt yo.txt\
- zh.txt zh_Hans.txt zh_Hans_HK.txt zh_Hans_MO.txt zh_Hans_SG.txt\
- zh_Hant.txt zh_Hant_HK.txt zu.txt
+ ml.txt mn.txt mn_Cyrl.txt mr.txt ms.txt\
+ ms_Latn.txt mt.txt mua.txt my.txt naq.txt\
+ nb.txt nd.txt ne.txt nl.txt nmg.txt\
+ nn.txt nus.txt nyn.txt om.txt or.txt\
+ pa.txt pa_Arab.txt pa_Guru.txt pl.txt ps.txt\
+ pt.txt pt_AO.txt pt_CV.txt pt_GW.txt pt_MO.txt\
+ pt_MZ.txt pt_PT.txt pt_ST.txt pt_TL.txt rm.txt\
+ rn.txt ro.txt rof.txt ru.txt rw.txt\
+ rwk.txt saq.txt sbp.txt seh.txt ses.txt\
+ sg.txt shi.txt shi_Latn.txt shi_Tfng.txt si.txt\
+ sk.txt sl.txt sn.txt so.txt sq.txt\
+ sr.txt sr_Cyrl.txt sr_Latn.txt sv.txt sv_FI.txt\
+ sw.txt swc.txt ta.txt ta_MY.txt ta_SG.txt\
+ te.txt teo.txt th.txt ti.txt to.txt\
+ tr.txt twq.txt tzm.txt tzm_Latn.txt uk.txt\
+ ur.txt uz.txt uz_Arab.txt uz_Cyrl.txt uz_Latn.txt\
+ vai.txt vai_Latn.txt vai_Vaii.txt vi.txt vun.txt\
+ xog.txt yav.txt yo.txt zh.txt zh_Hans.txt\
+ zh_Hans_HK.txt zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt zh_Hant_HK.txt\
+ zu.txt
diff --git a/data/zone/rm.txt b/data/zone/rm.txt
index b9877ee..34f0bde 100755
--- a/data/zone/rm.txt
+++ b/data/zone/rm.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rm.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/rm.xml
*/
rm{
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Addis_Ababa"{
ec{"Addis Abeba"}
diff --git a/data/zone/rn.txt b/data/zone/rn.txt
index d3692ad..4d7d29e 100755
--- a/data/zone/rn.txt
+++ b/data/zone/rn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rn.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/rn.xml
*/
rn{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/ro.txt b/data/zone/ro.txt
index 7f8f2b6..6bcd231 100644
--- a/data/zone/ro.txt
+++ b/data/zone/ro.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ro.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/ro.xml
*/
ro{
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Addis_Ababa"{
ec{"Addis Abeba"}
@@ -370,11 +370,6 @@
lg{"Ora Alaska"}
ls{"Ora standard Alaska"}
}
- "meta:Alaska_Hawaii"{
- ld{"Ora de vară Alaska-Hawaii"}
- lg{"Ora Alaska-Hawaii"}
- ls{"Ora standard Alaska-Hawaii"}
- }
"meta:Amazon"{
ld{"Ora de vară a Amazonului"}
lg{"Ora Amazon"}
@@ -460,11 +455,6 @@
lg{"Ora din Bangladesh"}
ls{"Ora standard din Bangladesh"}
}
- "meta:Bering"{
- ld{"Ora de vară Bering"}
- lg{"Ora Bering"}
- ls{"Ora standard Bering"}
- }
"meta:Bhutan"{
ls{"Ora Bhutanului"}
}
@@ -567,11 +557,6 @@
lg{"Ora Georgiei"}
ls{"Ora standard a Georgiei"}
}
- "meta:Greenland_Central"{
- ld{"Ora de vară a Groenlandei centrale"}
- lg{"Ora Groenlandei centrale"}
- ls{"Ora standard a Groenlandei centrale"}
- }
"meta:Greenland_Eastern"{
ld{"Ora de vară a Groenlandei orientale"}
lg{"Ora Groenlandei orientale"}
@@ -749,6 +734,8 @@
ls{"Ora standard din Samara"}
}
"meta:Samoa"{
+ ld{"Ora de vară din Samoa"}
+ lg{"Ora din Samoa"}
ls{"Ora standard din Samoa"}
}
"meta:Seychelles"{
diff --git a/data/zone/ro_MD.txt b/data/zone/ro_MD.txt
index eed93a7..cb90da0 100755
--- a/data/zone/ro_MD.txt
+++ b/data/zone/ro_MD.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/rof.txt b/data/zone/rof.txt
index 2385453..bd720d7 100755
--- a/data/zone/rof.txt
+++ b/data/zone/rof.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rof.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/rof.xml
*/
rof{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/root.txt b/data/zone/root.txt
index 2ac7e42..521bcb1 100644
--- a/data/zone/root.txt
+++ b/data/zone/root.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/root.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/root.xml
*/
root{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
zoneStrings{
// Begin android-added
""{
@@ -21,12 +21,15 @@
ss{""}
}
// End android-added
- "Africa:Asmera"{
+ "Africa:Asmera"{
ec{"Asmara"}
}
"America:Coral_Harbour"{
ec{"Atikokan"}
}
+ "America:Godthab"{
+ ec{"Nuuk"}
+ }
"America:Indiana:Knox"{
ec{"Knox, Indiana"}
}
@@ -63,6 +66,9 @@
"America:North_Dakota:New_Salem"{
ec{"New Salem, North Dakota"}
}
+ "America:Scoresbysund"{
+ ec{"Ittoqqortoormiit"}
+ }
"America:St_Barthelemy"{
ec{"St. Barthelemy"}
}
@@ -167,21 +173,5 @@
gmtZeroFormat{"GMT"}
hourFormat{"+HH:mm;-HH:mm"}
regionFormat{"{0}"}
- singleCountries{
- "Europe/Kiev",
- "Pacific/Majuro",
- "Africa/Bamako",
- "America/Godthab",
- "America/Santiago",
- "America/Guayaquil",
- "Asia/Shanghai",
- "Asia/Tashkent",
- "Asia/Kuala_Lumpur",
- "Europe/Madrid",
- "Europe/Lisbon",
- "Europe/London",
- "Pacific/Auckland",
- "Pacific/Tahiti",
- }
}
}
diff --git a/data/zone/ru.txt b/data/zone/ru.txt
index 5ce0105..62cf0d6 100644
--- a/data/zone/ru.txt
+++ b/data/zone/ru.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ru.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/ru.xml
*/
ru{
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"Абиджан"}
@@ -1248,21 +1248,11 @@
lg{"Западноафриканское время"}
ls{"Западноафриканское стандартное время"}
}
- "meta:Aktyubinsk"{
- ld{"Актюбинск летнее время"}
- lg{"Актюбинск время"}
- ls{"Актюбинск стандартное время"}
- }
"meta:Alaska"{
ld{"Аляска, летнее время"}
lg{"Аляска"}
ls{"Аляска, стандартное время"}
}
- "meta:Alaska_Hawaii"{
- ld{"Аляска - Гавайи, летнее время"}
- lg{"Аляска - Гавайи"}
- ls{"Аляска - Гавайи, стандартное время"}
- }
"meta:Almaty"{
ld{"Алма-Ата летнее время"}
lg{"Алма-Ата время"}
@@ -1328,11 +1318,6 @@
lg{"Армения"}
ls{"Армения, стандартное время"}
}
- "meta:Ashkhabad"{
- ld{"Ашхабад, летнее время"}
- lg{"Ашхабад"}
- ls{"Ашхабад, стандартное время"}
- }
"meta:Atlantic"{
ld{"Атлантическое летнее время"}
lg{"Атлантическое время"}
@@ -1363,16 +1348,6 @@
lg{"Азорское время"}
ls{"Азорское стандартное время"}
}
- "meta:Baku"{
- ld{"Баку, летнее время"}
- lg{"Баку"}
- ls{"Баку, стандартное время"}
- }
- "meta:Borneo"{
- ld{"Борнео, летнее время"}
- lg{"Борнео"}
- ls{"Борнео, стандартное время"}
- }
"meta:Brasilia"{
ld{"Бразилия дневное время"}
lg{"Время в Бразилии"}
@@ -1389,9 +1364,6 @@
"meta:Chamorro"{
ls{"Чаморро время"}
}
- "meta:Changbai"{
- ls{"Чанбай"}
- }
"meta:Chatham"{
ld{"Чатем летнее время"}
lg{"Чатем время"}
@@ -1423,20 +1395,12 @@
lg{"Время Кубы"}
ls{"Куба, стандартное время"}
}
- "meta:Dacca"{
- ls{"Бутан"}
- }
"meta:Davis"{
ls{"Дейвис время"}
}
"meta:DumontDUrville"{
ls{"Дюмон д'Юрвиль время"}
}
- "meta:Dushanbe"{
- ld{"Душанбе, летнее время"}
- lg{"Душанбе"}
- ls{"Душанбе, стандартное время"}
- }
"meta:Easter"{
ld{"Остров Пасхи летнее время"}
lg{"Остров Пасхи время"}
@@ -1470,11 +1434,6 @@
"meta:French_Southern"{
ls{"Французское южное и антарктическое время"}
}
- "meta:Frunze"{
- ld{"Фрунзе, летнее время"}
- lg{"Фрунзе"}
- ls{"Фрунзе, стандартное время"}
- }
"meta:GMT"{
ls{"Среднее время по Гринвичу"}
}
@@ -1553,20 +1512,12 @@
lg{"Время в Петропавловску-Камчатскому"}
ls{"Стандартное время в Петропавловску-Камчатскому"}
}
- "meta:Karachi"{
- ls{"Карачи"}
- }
"meta:Kazakhstan_Eastern"{
ls{"Время в Восточном Казахстане"}
}
"meta:Kazakhstan_Western"{
ls{"Время в Западном Казахстане"}
}
- "meta:Kizilorda"{
- ld{"Кызылорда, летнее время"}
- lg{"Кызылорда"}
- ls{"Кызылорда, стандартное время"}
- }
"meta:Korea"{
ld{"Корейское летнее время"}
lg{"Корейское время"}
@@ -1580,14 +1531,6 @@
lg{"Время по Красноярску"}
ls{"Стандартное время по Красноярску"}
}
- "meta:Kuybyshev"{
- ld{"Куйбышевское летнее время"}
- lg{"Куйбышевское время"}
- ls{"Куйбышевское стандартное время"}
- }
- "meta:Kwajalein"{
- ls{"Кваджалейн"}
- }
"meta:Lanka"{
ls{"Шри-Ланка"}
}
@@ -1612,9 +1555,6 @@
lg{"Время по Магадану"}
ls{"Стандартное время по Магадану"}
}
- "meta:Malaya"{
- ls{"Малайя"}
- }
"meta:Maldives"{
ls{"Мальдивское время"}
}
@@ -1696,53 +1636,18 @@
lg{"Время в Самаре"}
ls{"Самарское стандартное время"}
}
- "meta:Samarkand"{
- ld{"Самарканд, летнее время"}
- lg{"Самарканд"}
- ls{"Самарканд, стандартное время"}
- }
"meta:Seychelles"{
ls{"Сейшельское время"}
}
- "meta:Shevchenko"{
- ld{"Шевченко, летнее время"}
- lg{"Шевченко"}
- ls{"Шевченко, стандартное время"}
- }
"meta:South_Georgia"{
ls{"Южная Георгия время"}
}
- "meta:Sverdlovsk"{
- ld{"Свердловск, летнее время"}
- lg{"Свердловск"}
- ls{"Свердловск, стандартное время"}
+ "meta:Suriname"{
+ ls{"Время Суринама"}
}
"meta:Syowa"{
ls{"Сёва время"}
}
- "meta:Tashkent"{
- ld{"Ташкент, летнее время"}
- lg{"Ташкент"}
- ls{"Ташкент, стандартное время"}
- }
- "meta:Tbilisi"{
- ld{"Тбилиси, летнее время"}
- lg{"Тбилиси"}
- ls{"Тбилиси, стандартное время"}
- }
- "meta:Turkey"{
- ld{"Турецкое летнее время"}
- lg{"Турецкое время"}
- ls{"Турецкое стандартное время"}
- }
- "meta:Uralsk"{
- ld{"Уральск, летнее время"}
- lg{"Уральск"}
- ls{"Уральск, стандартное время"}
- }
- "meta:Urumqi"{
- ls{"Урумчи"}
- }
"meta:Vladivostok"{
ld{"Летнее время по Владивостоку"}
lg{"Время по Владивостоку"}
@@ -1766,16 +1671,6 @@
lg{"Время по Екатеринбургу"}
ls{"Стандартное время по Екатеринбургу"}
}
- "meta:Yerevan"{
- ld{"Ереван, летнее время"}
- lg{"Ереван"}
- ls{"Ереван, стандартное время"}
- }
- "meta:Yukon"{
- ld{"Юкон, летнее время"}
- lg{"Юкон"}
- ls{"Юкон, стандартное время"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"{1} время ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/rw.txt b/data/zone/rw.txt
index 1228779..9c56c1f 100755
--- a/data/zone/rw.txt
+++ b/data/zone/rw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rw.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/rw.xml
*/
rw{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
zoneStrings{
gmtFormat{"GMT{0}"}
hourFormat{"+HH:mm;-HH:mm"}
diff --git a/data/zone/rwk.txt b/data/zone/rwk.txt
index 209e103..584aa6b 100755
--- a/data/zone/rwk.txt
+++ b/data/zone/rwk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/rwk.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/rwk.xml
*/
rwk{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/saq.txt b/data/zone/saq.txt
index d675fc2..441e5c8 100755
--- a/data/zone/saq.txt
+++ b/data/zone/saq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/saq.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/saq.xml
*/
saq{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/sbp.txt b/data/zone/sbp.txt
index a6c8f38..3da7748 100755
--- a/data/zone/sbp.txt
+++ b/data/zone/sbp.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sbp.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/sbp.xml
*/
sbp{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/seh.txt b/data/zone/seh.txt
index fc041de..6486471 100755
--- a/data/zone/seh.txt
+++ b/data/zone/seh.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/seh.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/seh.xml
*/
seh{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/ses.txt b/data/zone/ses.txt
index 8b867a6..6a3c373 100755
--- a/data/zone/ses.txt
+++ b/data/zone/ses.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ses.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/ses.xml
*/
ses{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/sg.txt b/data/zone/sg.txt
index 6b517ff..5df29ee 100755
--- a/data/zone/sg.txt
+++ b/data/zone/sg.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sg.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/sg.xml
*/
sg{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/sh.txt b/data/zone/sh.txt
index 3f0a236..1433f43 100644
--- a/data/zone/sh.txt
+++ b/data/zone/sh.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/sh_BA.txt b/data/zone/sh_BA.txt
index af5634f..82a1a16 100644
--- a/data/zone/sh_BA.txt
+++ b/data/zone/sh_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/sh_CS.txt b/data/zone/sh_CS.txt
index 2adfb4a..8967fc8 100644
--- a/data/zone/sh_CS.txt
+++ b/data/zone/sh_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/sh_YU.txt b/data/zone/sh_YU.txt
index 516cdf3..85f7ad6 100644
--- a/data/zone/sh_YU.txt
+++ b/data/zone/sh_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/shi.txt b/data/zone/shi.txt
index 67c2c48..f22aead 100755
--- a/data/zone/shi.txt
+++ b/data/zone/shi.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/shi.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/shi.xml
*/
shi{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/shi_Latn.txt b/data/zone/shi_Latn.txt
index 0045d3d..b60aa51 100755
--- a/data/zone/shi_Latn.txt
+++ b/data/zone/shi_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/shi_Latn.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/shi_Latn.xml
*/
shi_Latn{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/shi_MA.txt b/data/zone/shi_MA.txt
index 91d13a9..084cfbe 100755
--- a/data/zone/shi_MA.txt
+++ b/data/zone/shi_MA.txt
@@ -1,11 +1,11 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
// *
// ***************************************************************************
shi_MA{
- "%%ALIAS"{"shi_Latn_MA"}
+ "%%ALIAS"{"shi_Tfng_MA"}
}
diff --git a/data/zone/shi_Tfng.txt b/data/zone/shi_Tfng.txt
index 12bcee9..49f4299 100755
--- a/data/zone/shi_Tfng.txt
+++ b/data/zone/shi_Tfng.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/shi_Tfng.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/shi_Tfng.xml
*/
shi_Tfng{
- Version{"2.0.75.56"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/shi_Latn_MA.txt b/data/zone/shi_Tfng_MA.txt
similarity index 86%
copy from data/zone/shi_Latn_MA.txt
copy to data/zone/shi_Tfng_MA.txt
index cd7fd64..0573400 100755
--- a/data/zone/shi_Latn_MA.txt
+++ b/data/zone/shi_Tfng_MA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
@@ -9,7 +9,7 @@
/**
* generated alias target
*/
-shi_Latn_MA{
+shi_Tfng_MA{
/**
* so genrb doesn't issue warnings
*/
diff --git a/data/zone/si.txt b/data/zone/si.txt
index b2c1012..a3ff09d 100644
--- a/data/zone/si.txt
+++ b/data/zone/si.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/si.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/si.xml
*/
si{
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"අබිජාන්"}
@@ -399,51 +399,6 @@
"Australia:Sydney"{
ec{"සිඩ්නි"}
}
- "Etc:GMT"{
- ec{"ග්රිමවේ"}
- }
- "Etc:GMT-1"{
- ec{"ග්රිමවේ - 1"}
- }
- "Etc:GMT-10"{
- ec{"ග්රිමවේ - 10"}
- }
- "Etc:GMT-11"{
- ec{"ග්රිමවේ - 11"}
- }
- "Etc:GMT-12"{
- ec{"ග්රිමවේ - 12"}
- }
- "Etc:GMT-13"{
- ec{"ග්රිමවේ - 13"}
- }
- "Etc:GMT-14"{
- ec{"ග්රිමවේ - 14"}
- }
- "Etc:GMT-2"{
- ec{"ග්රිමවේ - 2"}
- }
- "Etc:GMT-3"{
- ec{"ග්රිමවේ - 3"}
- }
- "Etc:GMT-4"{
- ec{"ග්රිමවේ - 4"}
- }
- "Etc:GMT-5"{
- ec{"ග්රිමවේ - 5"}
- }
- "Etc:GMT-6"{
- ec{"ග්රිමවේ - 6"}
- }
- "Etc:GMT-7"{
- ec{"ග්රිමවේ - 7"}
- }
- "Etc:GMT-8"{
- ec{"ග්රිමවේ - 8"}
- }
- "Etc:GMT-9"{
- ec{"ග්රිමවේ - 9"}
- }
"Etc:Unknown"{
ec{"හඳුනා නොගත් නගරය"}
}
diff --git a/data/zone/sk.txt b/data/zone/sk.txt
index 93eb5ba..589193f 100644
--- a/data/zone/sk.txt
+++ b/data/zone/sk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sk.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/sk.xml
*/
sk{
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Djibouti"{
ec{"Džibutsko"}
@@ -658,6 +658,8 @@
ls{"Samarský štandardný čas"}
}
"meta:Samoa"{
+ ld{"Samojský letný čas"}
+ lg{"Samojský čas"}
ls{"Samojský štandardný čas"}
}
"meta:Seychelles"{
diff --git a/data/zone/sl.txt b/data/zone/sl.txt
index 2474a74..efc8e4d 100644
--- a/data/zone/sl.txt
+++ b/data/zone/sl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sl.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/sl.xml
*/
sl{
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidžan"}
@@ -805,6 +805,8 @@
ls{"Samarski standardni čas"}
}
"meta:Samoa"{
+ ld{"Samoanski poletni čas"}
+ lg{"Samoanski čas"}
ls{"Samoanski standardni čas"}
}
"meta:Seychelles"{
@@ -847,11 +849,6 @@
"meta:Truk"{
ls{"Čas: Otok Chuuk"}
}
- "meta:Turkey"{
- ld{"Turški poletni čas"}
- lg{"Turški čas"}
- ls{"Turški standardni čas"}
- }
"meta:Turkmenistan"{
ld{"Turkmenistanski poletni čas"}
lg{"Turkmenistanski čas"}
diff --git a/data/zone/sn.txt b/data/zone/sn.txt
index 5db2a53..46011f8 100755
--- a/data/zone/sn.txt
+++ b/data/zone/sn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sn.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/sn.xml
*/
sn{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/so.txt b/data/zone/so.txt
index 454c8a1..cd483b9 100644
--- a/data/zone/so.txt
+++ b/data/zone/so.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/so.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/so.xml
*/
so{
- Version{"2.0.78.32"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/sq.txt b/data/zone/sq.txt
index f110099..5c28358 100644
--- a/data/zone/sq.txt
+++ b/data/zone/sq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sq.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/sq.xml
*/
sq{
- Version{"2.0.77.38"}
+ Version{"2.0.82.45"}
zoneStrings{
"Etc:Unknown"{
ec{"I panjohur"}
diff --git a/data/zone/sr.txt b/data/zone/sr.txt
index 2e6cde7..c845986 100644
--- a/data/zone/sr.txt
+++ b/data/zone/sr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/sr.xml
*/
sr{
- Version{"2.0.78.39"}
+ Version{"2.0.82.47"}
zoneStrings{
"Africa:Abidjan"{
ec{"Абиџан"}
@@ -1230,7 +1230,7 @@
ls{"Акре стандардно време"}
}
"meta:Afghanistan"{
- ls{"Авганистан"}
+ ls{"Авганистан време"}
}
"meta:Africa_Central"{
ls{"Централно-афричко време"}
@@ -1246,11 +1246,6 @@
lg{"Западно-афричко време"}
ls{"Западно-афричко стандардно време"}
}
- "meta:Aktyubinsk"{
- ld{"Актјубинск летње рачунање времена"}
- lg{"Актјубинск време"}
- ls{"Актјубинск стандардно време"}
- }
"meta:Alaska"{
ld{"Аљашко летње време"}
lg{"Аљашко време"}
@@ -1267,24 +1262,24 @@
ls{"Амазон стандардно време"}
}
"meta:America_Central"{
- ld{"Централно летње рачунање времена"}
- lg{"Централно време"}
- ls{"Централно стандардно време"}
+ ld{"Северноамерички Централно летње рачунање времена"}
+ lg{"Северноамерички Централно време"}
+ ls{"Северноамерички Централно стандардно време"}
}
"meta:America_Eastern"{
- ld{"Источно летње рачунање времена"}
- lg{"Источно време"}
- ls{"Источно стандардно време"}
+ ld{"Северноамерички Источно летње рачунање времена"}
+ lg{"Северноамерички Источно време"}
+ ls{"Северноамерички Источно стандардно време"}
}
"meta:America_Mountain"{
- ld{"Планинско летње рачунање времена"}
- lg{"Планинско време"}
- ls{"Планинско стандардно време"}
+ ld{"Северноамерички Планинско летње рачунање времена"}
+ lg{"Северноамерички Планинско време"}
+ ls{"Северноамерички Планинско стандардно време"}
}
"meta:America_Pacific"{
- ld{"Пацифичко летње рачунање времена"}
- lg{"Пацифичко време"}
- ls{"Пацифичко стандардно време"}
+ ld{"Северноамерички Пацифичко летње рачунање времена"}
+ lg{"Северноамерички Пацифичко време"}
+ ls{"Северноамерички Пацифичко стандардно време"}
}
"meta:Anadyr"{
ld{"Анадир летње рачунање времена"}
@@ -1321,11 +1316,6 @@
lg{"Арменија време"}
ls{"Арменија стандардно време"}
}
- "meta:Ashkhabad"{
- ld{"Ашкабад летње рачунање времена"}
- lg{"Ашкабад време"}
- ls{"Ашкабад стандардно време"}
- }
"meta:Atlantic"{
ld{"Атланско лтње рачунање времена"}
lg{"Атланско време"}
@@ -1361,32 +1351,17 @@
lg{"Азори време"}
ls{"Азори стандардно време"}
}
- "meta:Baku"{
- ld{"Баку летње рачунање времена"}
- lg{"Баку време"}
- ls{"Баку стандардно време"}
- }
"meta:Bangladesh"{
ld{"Бангладеш летње рачунање времена"}
lg{"Бангладеш време"}
ls{"Бангладеш стандардно време"}
}
- "meta:Bering"{
- ld{"Беринг летње рачунање времена"}
- lg{"Беринг време"}
- ls{"Беринг стандардно време"}
- }
"meta:Bhutan"{
ls{"Бутан време"}
}
"meta:Bolivia"{
ls{"Боливија време"}
}
- "meta:Borneo"{
- ld{"Борнео летње рачунање времена"}
- lg{"Борнео време"}
- ls{"Борнео стандардно време"}
- }
"meta:Brasilia"{
ld{"Бразилија летње рачунање времена"}
lg{"Бразилија време"}
@@ -1403,9 +1378,6 @@
"meta:Chamorro"{
ls{"Чаморо време"}
}
- "meta:Changbai"{
- ls{"Чангбаи време"}
- }
"meta:Chatham"{
ld{"Чатам летње рачунање времена"}
lg{"Чатам време"}
@@ -1447,23 +1419,12 @@
lg{"Куба време"}
ls{"Куба стандардно време"}
}
- "meta:Dacca"{
- ls{"Дача време"}
- }
"meta:Davis"{
ls{"Дејвис време"}
}
"meta:DumontDUrville"{
ls{"Димон д’Урвил време"}
}
- "meta:Dushanbe"{
- ld{"Душанбе летње рачунање времена"}
- lg{"Душанбе време"}
- ls{"Душанбе стандардно време"}
- }
- "meta:Dutch_Guiana"{
- ls{"Холандска Гвајана време"}
- }
"meta:East_Timor"{
ls{"Источни тимор време"}
}
@@ -1506,11 +1467,6 @@
"meta:French_Southern"{
ls{"Француско јужно и антарктичко време"}
}
- "meta:Frunze"{
- ld{"Фрунзе летње рачунање времена"}
- lg{"Фрунзе време"}
- ls{"Фрунзе стандардно време"}
- }
"meta:GMT"{
ls{"Гринвич средње време"}
}
@@ -1528,11 +1484,6 @@
"meta:Gilbert_Islands"{
ls{"Гилберт острва време"}
}
- "meta:Greenland_Central"{
- ld{"Централни Гренланд летње рачунање времена"}
- lg{"Централни Гренланд време"}
- ls{"Централни Гренланд стандардно време"}
- }
"meta:Greenland_Eastern"{
ld{"Источни Гренланд летње рачунање времена"}
lg{"Источни Гренланд време"}
@@ -1558,7 +1509,7 @@
ls{"Хавајско-алеутско стандардно време"}
}
"meta:Hong_Kong"{
- ld{"Хонгконшко летње рачунање времена"}
+ ld{"Хонг Конг летње рачунање времена"}
lg{"Хонг Конг време"}
ls{"Хонг Конг стандардно време"}
}
@@ -1606,16 +1557,10 @@
ls{"Јапанско стандардно време"}
}
"meta:Kamchatka"{
- ld{"Петропавловско-камчатско летње рачунање вемена"}
+ ld{"Петропавловско-камчатско летње рачунање времена"}
lg{"Петропавловско-камчатско време"}
ls{"Петропавловско-камчатско стандардно време"}
}
- "meta:Karachi"{
- ls{"Карачи време"}
- }
- "meta:Kashgar"{
- ls{"Кашгар време"}
- }
"meta:Kazakhstan_Eastern"{
ls{"Источно-казахстанско време"}
}
@@ -1624,7 +1569,7 @@
}
"meta:Korea"{
ld{"Корејско летње рачунање времена"}
- lg{"Кореја време"}
+ lg{"Корејско време"}
ls{"Корејско стандардно време"}
}
"meta:Kosrae"{
@@ -1635,14 +1580,6 @@
lg{"Краснојарск време"}
ls{"Краснојарск стандардно време"}
}
- "meta:Kuybyshev"{
- ld{"Кујбишев летње рачунање времена"}
- lg{"Кујбишев време"}
- ls{"Кујбишев стандардно време"}
- }
- "meta:Kwajalein"{
- ls{"Кваџалејин време"}
- }
"meta:Kyrgystan"{
ls{"Киргизстан време"}
}
@@ -1652,16 +1589,13 @@
"meta:Line_Islands"{
ls{"Лине Острва време"}
}
- "meta:Long_Shu"{
- ls{"Лонг Шу време"}
- }
"meta:Lord_Howe"{
ld{"Лорд Хов летње рачунање времена"}
lg{"Лорд Хов време"}
ls{"Лорд Хов стандардно време"}
}
"meta:Macau"{
- ld{"Макао летње рачунање вемена"}
+ ld{"Макао летње рачунање времена"}
lg{"Макао време"}
ls{"Макао стандардно време"}
}
@@ -1669,13 +1603,10 @@
ls{"Макверијско време"}
}
"meta:Magadan"{
- ld{"Магадан летње рачунање вемена"}
+ ld{"Магадан летње рачунање времена"}
lg{"Магадан време"}
ls{"Магадан стандардно време"}
}
- "meta:Malaya"{
- ls{"Малаја време"}
- }
"meta:Malaysia"{
ls{"Малезија време"}
}
@@ -1760,7 +1691,7 @@
ls{"Пакистан стандардно време"}
}
"meta:Palau"{
- ls{"Палау"}
+ ls{"Палау време"}
}
"meta:Papua_New_Guinea"{
ls{"Папуа Нова Гвинеја време"}
@@ -1784,7 +1715,7 @@
ls{"Феникс острва време"}
}
"meta:Pierre_Miquelon"{
- ld{"Сен Пјер и Микелон летње рачунање вемена"}
+ ld{"Сен Пјер и Микелон летње рачунање времена"}
lg{"Сен Пјер и Микелон време"}
ls{"Сен Пјер и Микелон стандардно време"}
}
@@ -1792,7 +1723,7 @@
ls{"Питкерн време"}
}
"meta:Ponape"{
- ls{"Понапе време"}
+ ls{"Понпеи време"}
}
"meta:Qyzylorda"{
ld{"Кизилорда летње рачунање времена"}
@@ -1815,22 +1746,14 @@
lg{"Самара време"}
ls{"Самара стандардно време"}
}
- "meta:Samarkand"{
- ld{"Самарканд летње рачунање времена"}
- lg{"Самарканд време"}
- ls{"Самарканд стандардно време"}
- }
"meta:Samoa"{
+ ld{"Самоа летње рачунање времена"}
+ lg{"Самоа време"}
ls{"Самоа стандардно време"}
}
"meta:Seychelles"{
ls{"Сејшели време"}
}
- "meta:Shevchenko"{
- ld{"Шевченко летње рачунање времена"}
- lg{"Шевченко време"}
- ls{"Шевченко стандардно време"}
- }
"meta:Singapore"{
ls{"Сингапур стандардно време"}
}
@@ -1843,11 +1766,6 @@
"meta:Suriname"{
ls{"Суринам време"}
}
- "meta:Sverdlovsk"{
- ld{"Свердловск летње рачунање времена"}
- lg{"Свердловск време"}
- ls{"Свердловск стандардно време"}
- }
"meta:Syowa"{
ls{"Шова време"}
}
@@ -1857,21 +1775,11 @@
"meta:Taipei"{
ld{"Таипеи летње рачунање времена"}
lg{"Таипеи време"}
- ls{"Таипеи стандардно веме"}
+ ls{"Таипеи стандардно време"}
}
"meta:Tajikistan"{
ls{"Таџикистан време"}
}
- "meta:Tashkent"{
- ld{"Ташкент летње рачунање времена"}
- lg{"Ташкент време"}
- ls{"Ташкент стандардно време"}
- }
- "meta:Tbilisi"{
- ld{"Тбилиси летње рачунање времена"}
- lg{"Тбилиси време"}
- ls{"Тбилиси стандардно време"}
- }
"meta:Tokelau"{
ls{"Токелау време"}
}
@@ -1881,12 +1789,7 @@
ls{"Тонга стандардно време"}
}
"meta:Truk"{
- ls{"Трук време"}
- }
- "meta:Turkey"{
- ld{"Турска летње рачунање времена"}
- lg{"Турска време"}
- ls{"Турска стандардно време"}
+ ls{"Чуук време"}
}
"meta:Turkmenistan"{
ld{"Туркменистан летње рачунање времена"}
@@ -1896,19 +1799,11 @@
"meta:Tuvalu"{
ls{"Тувалу време"}
}
- "meta:Uralsk"{
- ld{"Уралск летње рачунање времена"}
- lg{"Уралск време"}
- ls{"Уралск стандардно време"}
- }
"meta:Uruguay"{
ld{"Уругвај летње рачунање времена"}
lg{"Уругвај време"}
ls{"Уругвај стандардно време"}
}
- "meta:Urumqi"{
- ls{"Урумки време"}
- }
"meta:Uzbekistan"{
ld{"Узбекистан летње рачунање времена"}
lg{"Узбекистан време"}
@@ -1951,16 +1846,6 @@
lg{"Јекатеринбург време"}
ls{"Јекатеринбург стандардно време"}
}
- "meta:Yerevan"{
- ld{"Јереван летње рачунање времена"}
- lg{"Јереван време"}
- ls{"Јереван стандардно време"}
- }
- "meta:Yukon"{
- ld{"Јукон летње рачунање времена"}
- lg{"Јукон време"}
- ls{"Јукон стандардно време"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"Време у земљи: {1} ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/sr_BA.txt b/data/zone/sr_BA.txt
index bad5005..9754916 100644
--- a/data/zone/sr_BA.txt
+++ b/data/zone/sr_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/sr_CS.txt b/data/zone/sr_CS.txt
index b6ee46c..23bc131 100644
--- a/data/zone/sr_CS.txt
+++ b/data/zone/sr_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/sr_Cyrl.txt b/data/zone/sr_Cyrl.txt
index 426675a..4d109a8 100644
--- a/data/zone/sr_Cyrl.txt
+++ b/data/zone/sr_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr_Cyrl.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/sr_Cyrl.xml
*/
sr_Cyrl{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/sr_Cyrl_BA.txt b/data/zone/sr_Cyrl_BA.txt
index 6db5bfa..34df035 100644
--- a/data/zone/sr_Cyrl_BA.txt
+++ b/data/zone/sr_Cyrl_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/sr_Cyrl_CS.txt b/data/zone/sr_Cyrl_CS.txt
index 99b0d57..54c3633 100644
--- a/data/zone/sr_Cyrl_CS.txt
+++ b/data/zone/sr_Cyrl_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/sr_Cyrl_RS.txt b/data/zone/sr_Cyrl_RS.txt
index 5475cea..dfb1855 100644
--- a/data/zone/sr_Cyrl_RS.txt
+++ b/data/zone/sr_Cyrl_RS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/sr_Cyrl_YU.txt b/data/zone/sr_Cyrl_YU.txt
index 088b496..608f5f9 100644
--- a/data/zone/sr_Cyrl_YU.txt
+++ b/data/zone/sr_Cyrl_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/sr_Latn.txt b/data/zone/sr_Latn.txt
index ceca35e..4d237c9 100644
--- a/data/zone/sr_Latn.txt
+++ b/data/zone/sr_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sr_Latn.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/sr_Latn.xml
*/
sr_Latn{
- Version{"2.0.78.38"}
+ Version{"2.0.82.51"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidžan"}
@@ -22,7 +22,7 @@
ec{"Adis Abeba"}
}
"Africa:Algiers"{
- ec{"Alžir"}
+ ec{"alžirsko"}
}
"Africa:Asmera"{
ec{"Asmera"}
@@ -111,12 +111,12 @@
"Africa:Porto-Novo"{
ec{"Porto Novo"}
}
+ "Africa:Tunis"{
+ ec{"tunižansko"}
+ }
"Africa:Windhoek"{
ec{"Vindhuk"}
}
- "America:Adak"{
- ec{"Adak (SAD)"}
- }
"America:Anchorage"{
ec{"Enkoridž"}
}
@@ -130,43 +130,43 @@
ec{"Aragvajana"}
}
"America:Argentina:Rio_Gallegos"{
- ec{"Rio galegos"}
+ ec{"Rio Gelegos"}
}
"America:Argentina:San_Juan"{
- ec{"San Huan (Argentina)"}
+ ec{"San Huan"}
+ }
+ "America:Argentina:San_Luis"{
+ ec{"San Lui"}
}
"America:Argentina:Tucuman"{
ec{"Tukuman"}
}
"America:Argentina:Ushuaia"{
- ec{"Ušuaia"}
+ ec{"Ušuaija"}
}
"America:Asuncion"{
ec{"Asunsion"}
}
- "America:Bahia"{
- ec{"Bahia (Brazil)"}
- }
"America:Blanc-Sablon"{
- ec{"Blanc-Sejblon (kanada)"}
+ ec{"Blank-Sejblon"}
}
"America:Boise"{
- ec{"Bojzi (SAD)"}
+ ec{"Bojzi"}
}
"America:Cambridge_Bay"{
- ec{"Kembridž Bej (Kanada)"}
+ ec{"Kembridž Bej"}
}
"America:Campo_Grande"{
ec{"Kampo Grande"}
}
"America:Cancun"{
- ec{"Kankun (Meksiko)"}
+ ec{"Kankun"}
}
"America:Caracas"{
ec{"Karakas"}
}
"America:Catamarca"{
- ec{"Katamarka (Argentina)"}
+ ec{"Katamarka"}
}
"America:Cayenne"{
ec{"Kajen"}
@@ -175,16 +175,16 @@
ec{"Kajmanska ostrva"}
}
"America:Chicago"{
- ec{"Čikago (SAD)"}
+ ec{"Čikago"}
}
"America:Chihuahua"{
- ec{"Čihuahua (Meksiko)"}
+ ec{"Čihuahua"}
}
"America:Coral_Harbour"{
- ec{"Koral Harbur (Kanada)"}
+ ec{"Koral Harbur"}
}
"America:Cordoba"{
- ec{"Kordoba (Argentina)"}
+ ec{"Kordoba"}
}
"America:Costa_Rica"{
ec{"Kostarika"}
@@ -196,37 +196,28 @@
ec{"Kiraso"}
}
"America:Danmarkshavn"{
- ec{"Danmarkšavn"}
+ ec{"Danmarkshagen"}
}
"America:Dawson"{
- ec{"Doson (Kanada)"}
+ ec{"Doson"}
}
"America:Dawson_Creek"{
- ec{"Doson Krik (Kanada)"}
- }
- "America:Denver"{
- ec{"Denver (SAD)"}
- }
- "America:Detroit"{
- ec{"Detroit (SAD)"}
+ ec{"Doson Krik"}
}
"America:Dominica"{
ec{"Dominika"}
}
- "America:Edmonton"{
- ec{"Edmonton (Kanada)"}
- }
- "America:Eirunepe"{
- ec{"Eirunepe (Brazil)"}
- }
"America:El_Salvador"{
ec{"Salvador"}
}
"America:Glace_Bay"{
- ec{"Glejs Bej (Kanada)"}
+ ec{"Glejs Bej"}
+ }
+ "America:Godthab"{
+ ec{"Gothab"}
}
"America:Goose_Bay"{
- ec{"Gus Bej (Kanada)"}
+ ec{"Gus Bej"}
}
"America:Guadeloupe"{
ec{"Gvadalupe"}
@@ -241,58 +232,55 @@
ec{"Guana"}
}
"America:Halifax"{
- ec{"Halifaks (kanada)"}
+ ec{"Halifaks"}
}
"America:Hermosillo"{
- ec{"Hermosiljo (Meksiko)"}
+ ec{"Hermosiljo"}
}
"America:Indiana:Knox"{
- ec{"Konks (SAD)"}
+ ec{"Knoks, Indijana"}
}
"America:Indiana:Marengo"{
- ec{"Marengo (SAD)"}
+ ec{"Marengo, Indijana"}
}
"America:Indiana:Petersburg"{
- ec{"Petesburg (SAD)"}
+ ec{"Petersburg, Indijana"}
}
"America:Indiana:Tell_City"{
- ec{"Tel Siti (SAD)"}
+ ec{"Tel Siti"}
}
"America:Indiana:Vevay"{
- ec{"Vevej, Indijana"}
+ ec{"Vevaj, Indijana"}
}
"America:Indiana:Vincennes"{
- ec{"Vincenis, Indijana"}
+ ec{"Vincenes, Indijana"}
}
"America:Indiana:Winamac"{
ec{"Vinamak, Indijana"}
}
- "America:Indianapolis"{
- ec{"Indianapolis (SAD)"}
- }
- "America:Inuvik"{
- ec{"Inuvik (Kanada)"}
- }
"America:Iqaluit"{
- ec{"Ikaluit"}
+ ec{"Ikvaluit"}
}
"America:Jamaica"{
ec{"Jamajka"}
}
"America:Jujuy"{
- ec{"Jujui"}
+ ec{"Žužui"}
}
"America:Juneau"{
- ec{"Žano"}
+ ec{"Žuno"}
}
"America:Kentucky:Monticello"{
- ec{"Montičelo (SAD)"}
+ ec{"Montičelo, Kentaki"}
}
"America:Los_Angeles"{
- ec{"Los Anđeles (SAD)"}
+ ec{"Los Anđeles"}
}
"America:Louisville"{
- ec{"Luivil (SAD)"}
+ ec{"Luivile"}
+ }
+ "America:Lower_Princes"{
+ ec{"Louer Prinsiz Kvorter"}
}
"America:Maceio"{
ec{"Masejo"}
@@ -300,23 +288,17 @@
"America:Managua"{
ec{"Managva"}
}
+ "America:Marigot"{
+ ec{"Marigo"}
+ }
"America:Martinique"{
ec{"Martinik"}
}
- "America:Mazatlan"{
- ec{"Mazatlan (Meksiko)"}
- }
- "America:Mendoza"{
- ec{"Mendoza (Argentina)"}
- }
"America:Menominee"{
- ec{"Menomine"}
- }
- "America:Merida"{
- ec{"Merida (Meksika)"}
+ ec{"Menomini"}
}
"America:Mexico_City"{
- ec{"Meksiko siti (Meksiko)"}
+ ec{"Meksiko Siti"}
}
"America:Miquelon"{
ec{"Mikelon"}
@@ -325,10 +307,7 @@
ec{"Monkton"}
}
"America:Monterrey"{
- ec{"Montrej (Meksiko)"}
- }
- "America:Montreal"{
- ec{"Montreal (kanada)"}
+ ec{"Monterej"}
}
"America:Montserrat"{
ec{"Montserat"}
@@ -337,7 +316,7 @@
ec{"Nasau"}
}
"America:New_York"{
- ec{"Njujork (SAD)"}
+ ec{"Njujork"}
}
"America:Nome"{
ec{"Nom"}
@@ -345,21 +324,27 @@
"America:Noronha"{
ec{"Noronja"}
}
+ "America:North_Dakota:Beulah"{
+ ec{"Bijula, Severna Dakota"}
+ }
"America:North_Dakota:Center"{
- ec{"Centar, Severna Dakota (SAD)"}
+ ec{"Centar, Severna Dakota"}
}
"America:North_Dakota:New_Salem"{
- ec{"Novi Salem, Severna Dakota (SAD)"}
+ ec{"Novi Salem, Severna Datkoa"}
}
"America:Paramaribo"{
ec{"Paramirbo"}
}
"America:Phoenix"{
- ec{"Feniks (SAD)"}
+ ec{"Feniks"}
}
"America:Port-au-Prince"{
ec{"Port-o-Prens"}
}
+ "America:Port_of_Spain"{
+ ec{"Port of Spejn"}
+ }
"America:Porto_Velho"{
ec{"Porto Veljo"}
}
@@ -367,13 +352,13 @@
ec{"Porto Riko"}
}
"America:Rainy_River"{
- ec{"Rejni river"}
+ ec{"Rejni River"}
}
"America:Recife"{
ec{"Resife"}
}
"America:Resolute"{
- ec{"Rezolut"}
+ ec{"Resolut"}
}
"America:Rio_Branco"{
ec{"Rio Branko"}
@@ -388,10 +373,13 @@
ec{"Skorezbisund"}
}
"America:Shiprock"{
- ec{"Šiprok (SAD)"}
+ ec{"Šiprok"}
+ }
+ "America:St_Barthelemy"{
+ ec{"Sv. Bartolomej"}
}
"America:St_Johns"{
- ec{"Sv. Džon (Kanada)"}
+ ec{"Sv. Džon"}
}
"America:St_Kitts"{
ec{"Sent Kits"}
@@ -408,6 +396,9 @@
"America:Swift_Current"{
ec{"Svift Kurent"}
}
+ "America:Tegucigalpa"{
+ ec{"Tegusigalpa"}
+ }
"America:Thule"{
ec{"Tule"}
}
@@ -415,25 +406,22 @@
ec{"Tander Bej"}
}
"America:Tijuana"{
- ec{"Tihuana (Meksiko)"}
- }
- "America:Toronto"{
- ec{"Toronto (Kanada)"}
+ ec{"Tihuana"}
}
"America:Vancouver"{
- ec{"Vankuver (kanada)"}
+ ec{"Vankuver"}
}
"America:Whitehorse"{
ec{"Vajthors"}
}
"America:Winnipeg"{
- ec{"Vinipeg (Kanada)"}
+ ec{"Vinipeg"}
}
"America:Yakutat"{
- ec{"Jakuta"}
+ ec{"Jakutat"}
}
"America:Yellowknife"{
- ec{"Jelonajf"}
+ ec{"Jelounajf"}
}
"Antarctica:Casey"{
ec{"Kasej"}
@@ -448,7 +436,7 @@
ec{"Moson"}
}
"Antarctica:McMurdo"{
- ec{"MakMurdo"}
+ ec{"Makmurdo"}
}
"Antarctica:Rothera"{
ec{"Rotera"}
@@ -459,8 +447,11 @@
"Antarctica:Syowa"{
ec{"Šova"}
}
+ "Arctic:Longyearbyen"{
+ ec{"Longjerbjen"}
+ }
"Asia:Almaty"{
- ec{"Almati (Kazahstan)"}
+ ec{"Almati"}
}
"Asia:Amman"{
ec{"Aman"}
@@ -495,11 +486,14 @@
"Asia:Brunei"{
ec{"Bruneji"}
}
+ "Asia:Calcutta"{
+ ec{"Kalkuta"}
+ }
"Asia:Choibalsan"{
ec{"Čojbalsan"}
}
"Asia:Chongqing"{
- ec{"Čongking (Kina)"}
+ ec{"Čongking"}
}
"Asia:Colombo"{
ec{"Kolombo"}
@@ -513,11 +507,8 @@
"Asia:Dushanbe"{
ec{"Dušanbe"}
}
- "Asia:Harbin"{
- ec{"Harbin (Kina)"}
- }
"Asia:Irkutsk"{
- ec{"Irkuck (Rusija)"}
+ ec{"Irkuck"}
}
"Asia:Jakarta"{
ec{"Džakarta"}
@@ -525,6 +516,9 @@
"Asia:Jayapura"{
ec{"Džajapura"}
}
+ "Asia:Jerusalem"{
+ ec{"Jerusalim"}
+ }
"Asia:Kamchatka"{
ec{"Kamčatka"}
}
@@ -532,7 +526,7 @@
ec{"Karači"}
}
"Asia:Kashgar"{
- ec{"Kašgar (Kina)"}
+ ec{"Kašgar"}
}
"Asia:Katmandu"{
ec{"Katmandu"}
@@ -549,9 +543,6 @@
"Asia:Macau"{
ec{"Makau"}
}
- "Asia:Magadan"{
- ec{"Magadan (Rusija)"}
- }
"Asia:Makassar"{
ec{"Makasar"}
}
@@ -561,50 +552,71 @@
"Asia:Nicosia"{
ec{"Nikozija"}
}
- "Asia:Novosibirsk"{
- ec{"Novosibirsk (Rusija)"}
- }
- "Asia:Omsk"{
- ec{"Omsk (Rusija)"}
- }
- "Asia:Oral"{
- ec{"Oral (Kazakhstan)"}
- }
"Asia:Phnom_Penh"{
ec{"Pnom Pen"}
}
"Asia:Pyongyang"{
ec{"Pjongjang"}
}
+ "Asia:Qatar"{
+ ec{"Katar"}
+ }
"Asia:Qyzylorda"{
ec{"Kizilorda"}
}
- "Asia:Sakhalin"{
- ec{"Sahalin (Rusija)"}
+ "Asia:Rangoon"{
+ ec{"Rangun"}
}
- "Asia:Samarkand"{
- ec{"Samarkand (Uzbekistan)"}
+ "Asia:Riyadh"{
+ ec{"Rijad"}
+ }
+ "Asia:Saigon"{
+ ec{"Ho Ši Min"}
+ }
+ "Asia:Sakhalin"{
+ ec{"Sahalin"}
+ }
+ "Asia:Seoul"{
+ ec{"Seul"}
}
"Asia:Shanghai"{
ec{"Šangaj"}
}
+ "Asia:Singapore"{
+ ec{"Singapur"}
+ }
+ "Asia:Taipei"{
+ ec{"Tajpej"}
+ }
"Asia:Tashkent"{
ec{"Taškent"}
}
+ "Asia:Tehran"{
+ ec{"Teheran"}
+ }
+ "Asia:Thimphu"{
+ ec{"Timpu"}
+ }
+ "Asia:Tokyo"{
+ ec{"Tokio"}
+ }
"Asia:Ulaanbaatar"{
ec{"Ulan Bator"}
}
"Asia:Urumqi"{
- ec{"Urumki"}
+ ec{"Urumkvi"}
}
- "Asia:Vladivostok"{
- ec{"Vladivostok (Rusija)"}
+ "Asia:Vientiane"{
+ ec{"Vijentijan"}
}
"Asia:Yakutsk"{
- ec{"Jakutsk (Rusija)"}
+ ec{"Jakutsk"}
}
"Asia:Yekaterinburg"{
- ec{"Jekatepinburg (Rusija)"}
+ ec{"Jekaterinburg"}
+ }
+ "Asia:Yerevan"{
+ ec{"Jerevan"}
}
"Atlantic:Azores"{
ec{"Azori"}
@@ -612,74 +624,209 @@
"Atlantic:Canary"{
ec{"Kanarska ostrva"}
}
+ "Atlantic:Cape_Verde"{
+ ec{"Zelenortska Ostrva"}
+ }
+ "Atlantic:Faeroe"{
+ ec{"Farska ostrva"}
+ }
+ "Atlantic:Madeira"{
+ ec{"Madera"}
+ }
+ "Atlantic:Reykjavik"{
+ ec{"Rejkjavik"}
+ }
+ "Atlantic:South_Georgia"{
+ ec{"Južna Džordžija"}
+ }
+ "Atlantic:St_Helena"{
+ ec{"Sv. Jelena"}
+ }
+ "Atlantic:Stanley"{
+ ec{"Stenli"}
+ }
"Australia:Adelaide"{
- ec{"Adelaida (Australija)"}
+ ec{"Adelaida"}
}
"Australia:Brisbane"{
- ec{"Brizbejn (Australija)"}
+ ec{"Brizbejn"}
}
"Australia:Broken_Hill"{
- ec{"Broken Hil (Australija)"}
+ ec{"Broken Hil"}
}
"Australia:Currie"{
- ec{"Kurie (Australija)"}
+ ec{"Kurie"}
}
"Australia:Darwin"{
- ec{"Darvin (Australija)"}
+ ec{"Darvin"}
}
"Australia:Eucla"{
- ec{"Iukla (Australija)"}
- }
- "Australia:Hobart"{
- ec{"Horbat (Australija)"}
+ ec{"Iukla"}
}
"Australia:Lord_Howe"{
ec{"Lord Hov"}
}
"Australia:Melbourne"{
- ec{"Melburn (Australija)"}
+ ec{"Melburn"}
}
"Australia:Perth"{
- ec{"Pert (Australija)"}
+ ec{"Pert"}
}
"Australia:Sydney"{
- ec{"Sidnej (Australija)"}
+ ec{"Sidnej"}
}
"Etc:Unknown"{
ec{"Nepoznat ili nevažeći grad"}
}
+ "Europe:Andorra"{
+ ec{"Andora"}
+ }
+ "Europe:Athens"{
+ ec{"Atina"}
+ }
+ "Europe:Belgrade"{
+ ec{"Beograd"}
+ }
+ "Europe:Brussels"{
+ ec{"Brisel"}
+ }
+ "Europe:Bucharest"{
+ ec{"Bukurešt"}
+ }
+ "Europe:Budapest"{
+ ec{"Budimpešta"}
+ }
+ "Europe:Chisinau"{
+ ec{"Kišinjev"}
+ }
+ "Europe:Copenhagen"{
+ ec{"Kopenhagen"}
+ }
+ "Europe:Dublin"{
+ ec{"Dablin"}
+ }
+ "Europe:Guernsey"{
+ ec{"Gernzi"}
+ }
+ "Europe:Isle_of_Man"{
+ ec{"Ostrvo Man"}
+ }
+ "Europe:Jersey"{
+ ec{"Džersi"}
+ }
"Europe:Kiev"{
ec{"Kijev"}
}
+ "Europe:Lisbon"{
+ ec{"Lisabon"}
+ }
+ "Europe:Luxembourg"{
+ ec{"Luksemburg"}
+ }
+ "Europe:Mariehamn"{
+ ec{"Marihamn"}
+ }
+ "Europe:Monaco"{
+ ec{"Monako"}
+ }
"Europe:Moscow"{
ec{"Moskva"}
}
- "Europe:Samara"{
- ec{"Samara (Rusija)"}
+ "Europe:Paris"{
+ ec{"Pariz"}
+ }
+ "Europe:Prague"{
+ ec{"Prag"}
+ }
+ "Europe:Rome"{
+ ec{"Rim"}
+ }
+ "Europe:Skopje"{
+ ec{"Skoplje"}
+ }
+ "Europe:Sofia"{
+ ec{"Sofija"}
+ }
+ "Europe:Stockholm"{
+ ec{"Stokholm"}
+ }
+ "Europe:Tallinn"{
+ ec{"Talin"}
+ }
+ "Europe:Tirane"{
+ ec{"Tirana"}
}
"Europe:Uzhgorod"{
ec{"Užgorod"}
}
- "Europe:Volgograd"{
- ec{"Volgograd (Rusija)"}
+ "Europe:Vatican"{
+ ec{"Vatikan"}
+ }
+ "Europe:Vienna"{
+ ec{"Beč"}
+ }
+ "Europe:Vilnius"{
+ ec{"Viljnus"}
+ }
+ "Europe:Warsaw"{
+ ec{"Varšava"}
}
"Europe:Zaporozhye"{
ec{"Zaporožje"}
}
+ "Europe:Zurich"{
+ ec{"Cirih"}
+ }
+ "Indian:Chagos"{
+ ec{"Čagos"}
+ }
+ "Indian:Christmas"{
+ ec{"Božić"}
+ }
+ "Indian:Cocos"{
+ ec{"Kokos"}
+ }
+ "Indian:Comoro"{
+ ec{"Komoro"}
+ }
+ "Indian:Kerguelen"{
+ ec{"Kergelen"}
+ }
+ "Indian:Maldives"{
+ ec{"Maldivi"}
+ }
+ "Indian:Mauritius"{
+ ec{"Mauricijus"}
+ }
+ "Indian:Mayotte"{
+ ec{"Majot"}
+ }
+ "Pacific:Apia"{
+ ec{"Apija"}
+ }
+ "Pacific:Auckland"{
+ ec{"Okland"}
+ }
"Pacific:Chatham"{
- ec{"Katham (Novi Zeland)"}
+ ec{"Katham"}
}
"Pacific:Easter"{
ec{"Uskršnje ostrvo"}
}
+ "Pacific:Efate"{
+ ec{"Efat"}
+ }
"Pacific:Enderbury"{
ec{"Enderberi"}
}
+ "Pacific:Fiji"{
+ ec{"Fidži"}
+ }
"Pacific:Gambier"{
ec{"Gambije"}
}
- "Pacific:Honolulu"{
- ec{"Honolulu (SAD)"}
+ "Pacific:Guadalcanal"{
+ ec{"Gvadalkanal"}
}
"Pacific:Johnston"{
ec{"Džonston"}
@@ -718,52 +865,42 @@
ec{"Truk"}
}
"Pacific:Wake"{
- ec{"Vake"}
+ ec{"Vejk"}
}
"Pacific:Wallis"{
ec{"Valis"}
}
"meta:Acre"{
- ld{"Acre letnje računanje vremena"}
- lg{"Acre vreme"}
- ls{"Acre standardno vreme"}
+ ld{"Akre letnje računanje vremena"}
+ lg{"Akre vreme"}
+ ls{"Akre standardno vreme"}
}
"meta:Afghanistan"{
ls{"Avganistan vreme"}
}
"meta:Africa_Central"{
- ls{"Centralna Afrika vreme"}
+ ls{"Centralno-afričko vreme"}
}
"meta:Africa_Eastern"{
- ls{"Istočna Afrika vreme"}
+ ls{"Istočno-afričko vreme"}
}
"meta:Africa_Southern"{
- ls{"Južna Afrika vreme"}
+ ls{"Južno-afričko vreme"}
}
"meta:Africa_Western"{
- ld{"Zapadna Afrika letnje računanje vremena"}
- lg{"Zapadna Afrika vreme"}
- ls{"Zapadna Afrika standardno vreme"}
- }
- "meta:Aktyubinsk"{
- ld{"Aktjubinsk letnje računanje vremena"}
- lg{"Aktjubinsk vreme"}
- ls{"Aktjubinsk standardno vreme"}
+ ld{"Zapadno-afričko letnje računanje vremena"}
+ lg{"Zapadno-afričko vreme"}
+ ls{"Zapadno-afričko standardno vreme"}
}
"meta:Alaska"{
- ld{"Aljaska letnje računanje vremena"}
- lg{"Aljaska vreme"}
- ls{"Aljaska standardno vreme"}
- }
- "meta:Alaska_Hawaii"{
- ld{"Aljaska-Havaji letnje računanje vremena"}
- lg{"Aljaska-Havaji vreme"}
- ls{"Aljaska-Havaji standardno vreme"}
+ ld{"Aljaško letnje vreme"}
+ lg{"Aljaško vreme"}
+ ls{"Aljaško standardno vreme"}
}
"meta:Almaty"{
- ld{"Almatu letnje računanje vremena"}
- lg{"Almatu vreme"}
- ls{"Almatu standardno vreme"}
+ ld{"Almati letnje računanje vremena"}
+ lg{"Almati vreme"}
+ ls{"Almati standardno vreme"}
}
"meta:Amazon"{
ld{"Amazon letnje računanje vremena"}
@@ -771,24 +908,24 @@
ls{"Amazon standardno vreme"}
}
"meta:America_Central"{
- ld{"Centralno letnje merenje vremena (SAD)"}
- lg{"Centralno vreme (SAD)"}
- ls{"Centralno standardno vreme (SAD)"}
+ ld{"Severnoamerički Centralno letnje računanje vremena"}
+ lg{"Severnoamerički Centralno vreme"}
+ ls{"Severnoamerički Centralno standardno vreme"}
}
"meta:America_Eastern"{
- ld{"Istočno letnje računanje vremena (SAD)"}
- lg{"Istočno vreme (SAD)"}
- ls{"Istočno standardno vreme (SAD)"}
+ ld{"Severnoamerički Istočno letnje računanje vremena"}
+ lg{"Severnoamerički Istočno vreme"}
+ ls{"Severnoamerički Istočno standardno vreme"}
}
"meta:America_Mountain"{
- ld{"Planinsko letnje računanje vremena (SAD)"}
- lg{"Planinsko vreme (SAD)"}
- ls{"Planinsko standardno vreme (SAD)"}
+ ld{"Severnoamerički Planinsko letnje računanje vremena"}
+ lg{"Severnoamerički Planinsko vreme"}
+ ls{"Severnoamerički Planinsko standardno vreme"}
}
"meta:America_Pacific"{
- ld{"Pacifičko letnje računanje vremena (SAD)"}
- lg{"Pacifičko vreme (SAD)"}
- ls{"Pacifičko standardno vreme (SAD)"}
+ ld{"Severnoamerički Pacifičko letnje računanje vremena"}
+ lg{"Severnoamerički Pacifičko vreme"}
+ ls{"Severnoamerički Pacifičko standardno vreme"}
}
"meta:Anadyr"{
ld{"Anadir letnje računanje vremena"}
@@ -796,17 +933,17 @@
ls{"Anadir standardno vreme"}
}
"meta:Aqtau"{
- ld{"Akvtau letnje računanje vremena"}
- lg{"Akvtau vreme"}
- ls{"Akvtau standardno vreme"}
+ ld{"Akvatau letnje računanje vremena"}
+ lg{"Akvatau vreme"}
+ ls{"Akvatau standardno vreme"}
}
"meta:Aqtobe"{
- ld{"Akvtobe letnje računanje vremena"}
- lg{"Akvtobe vreme"}
- ls{"Akvtobe standardno vreme"}
+ ld{"Akutobe letnje računanje vremena"}
+ lg{"Akutobe vreme"}
+ ls{"Akutobe standardno vreme"}
}
"meta:Arabian"{
- ld{"Arapsko letnje računanje vremena"}
+ ld{"Arabijsko letnje računanje vremena"}
lg{"Arabijsko vreme"}
ls{"Arabijsko standardno vreme"}
}
@@ -825,20 +962,15 @@
lg{"Armenija vreme"}
ls{"Armenija standardno vreme"}
}
- "meta:Ashkhabad"{
- ld{"Aškabad letnje računanje vremena"}
- lg{"Aškabad vreme"}
- ls{"Aškabad standardno vreme"}
- }
"meta:Atlantic"{
- ld{"Atlantsko letnje računanje vremena"}
- lg{"Atlantsko vreme"}
- ls{"Atlantsko standardno vreme"}
+ ld{"Atlansko ltnje računanje vremena"}
+ lg{"Atlansko vreme"}
+ ls{"Atlansko standardno vreme"}
}
"meta:Australia_Central"{
- ld{"Centralno australijsko letnje računanje vremena"}
- lg{"Centralno australijsko vreme"}
- ls{"Centralno australijsko standardno vreme"}
+ ld{"Australijsko centralno letnje računanje vremena"}
+ lg{"Australijsko centralno vreme"}
+ ls{"Australijsko centralno standardno vreme"}
}
"meta:Australia_CentralWestern"{
ld{"Australijsko centralno zapadno letnje računanje vremena"}
@@ -865,51 +997,33 @@
lg{"Azori vreme"}
ls{"Azori standardno vreme"}
}
- "meta:Baku"{
- ld{"Baku letnje računanje vremena"}
- lg{"Baku vreme"}
- ls{"Baku standardno vreme"}
- }
"meta:Bangladesh"{
ld{"Bangladeš letnje računanje vremena"}
lg{"Bangladeš vreme"}
ls{"Bangladeš standardno vreme"}
}
- "meta:Bering"{
- ld{"Bering letnje računanje vremena"}
- lg{"Bering vreme"}
- ls{"Bering standardno vreme"}
- }
"meta:Bhutan"{
ls{"Butan vreme"}
}
"meta:Bolivia"{
ls{"Bolivija vreme"}
}
- "meta:Borneo"{
- ld{"Borneo letnje računanje vremena"}
- lg{"Borneo vreme"}
- ls{"Borneo standardno vreme"}
- }
"meta:Brasilia"{
ld{"Brazilija letnje računanje vremena"}
lg{"Brazilija vreme"}
ls{"Brazilija standardno vreme"}
}
"meta:Brunei"{
- ls{"Brunei Darusalam vreme"}
+ ls{"Brunej Darusalum vreme"}
}
"meta:Cape_Verde"{
- ld{"Zelenortska ostrva letnje računanje vermena"}
- lg{"Zelenortska ostrva vreme"}
- ls{"Zelenortska ostrva standardno vreme"}
+ ld{"Zelenortsko letnje računanje vremena"}
+ lg{"Zelenirtsko vreme"}
+ ls{"Zelenirtsko standardno vreme"}
}
"meta:Chamorro"{
ls{"Čamoro vreme"}
}
- "meta:Changbai"{
- ls{"Čangbai vreme"}
- }
"meta:Chatham"{
ld{"Čatam letnje računanje vremena"}
lg{"Čatam vreme"}
@@ -931,7 +1045,7 @@
ls{"Čojbalsan standardno vreme"}
}
"meta:Christmas"{
- ls{"Božićna Ostrva vreme"}
+ ls{"Božićna ostrva vreme"}
}
"meta:Cocos"{
ls{"Kokos (Keling) Ostrva vreme"}
@@ -942,7 +1056,7 @@
ls{"Kolumbija standardno vreme"}
}
"meta:Cook"{
- ld{"Kukova ostrva, polu-letnje računanje vremena"}
+ ld{"Kukova ostrva polu-letnje računanje vremena"}
lg{"Kukova ostrva vreme"}
ls{"Kukova ostrva standardno vreme"}
}
@@ -951,25 +1065,14 @@
lg{"Kuba vreme"}
ls{"Kuba standardno vreme"}
}
- "meta:Dacca"{
- ls{"Dača vreme"}
- }
"meta:Davis"{
ls{"Dejvis vreme"}
}
"meta:DumontDUrville"{
ls{"Dimon d’Urvil vreme"}
}
- "meta:Dushanbe"{
- ld{"Dušanbe letnje računanje vremena"}
- lg{"Dušanbe vreme"}
- ls{"Dušanbe standardno vreme"}
- }
- "meta:Dutch_Guiana"{
- ls{"Holandska Gvijana vreme"}
- }
"meta:East_Timor"{
- ls{"Istočni Timor vreme"}
+ ls{"Istočni timor vreme"}
}
"meta:Easter"{
ld{"Uskršnja ostrva letnje računanje vremena"}
@@ -980,22 +1083,22 @@
ls{"Ekvador vreme"}
}
"meta:Europe_Central"{
- ld{"Centralnoevropsko letnje računanje vremena"}
- lg{"Centralnoevropsko vreme"}
- ls{"Centralnoevropsko standardno vreme"}
+ ld{"Srednjeevropsko letnje računanje vremena"}
+ lg{"Srednjeevropsko vreme"}
+ ls{"Srednjeevropsko standardno vreme"}
}
"meta:Europe_Eastern"{
- ld{"Istočnoevropsko letnje računanje vemena"}
+ ld{"Istočnoevropsko letnje računanje vremena"}
lg{"Istočnoevropsko vreme"}
ls{"Istočnoevropsko standardno vreme"}
}
"meta:Europe_Western"{
- ld{"Zapadno evropsko letnje računanje vremena"}
- lg{"Zapadna evropsko vreme"}
- ls{"Zapadna evropsko standardno vreme"}
+ ld{"Zapadnoevropsko letnje računanje vremena"}
+ lg{"Zapadnoevropsko vreme"}
+ ls{"Zapadnoevropsko standardno vreme"}
}
"meta:Falkland"{
- ld{"Folklandska ostrva letnje računanje vremena"}
+ ld{"Folklandska Ostrva letnje računanje vremena"}
lg{"Folklandska Ostrva vreme"}
ls{"Folklandska Ostrva standardno vreme"}
}
@@ -1008,15 +1111,10 @@
ls{"Francuska Gvajana vreme"}
}
"meta:French_Southern"{
- ls{"Francuske Južne Teritorije vreme"}
- }
- "meta:Frunze"{
- ld{"Frunze letnje računanje vremena"}
- lg{"Frunze vreme"}
- ls{"Frunze standardno vreme"}
+ ls{"Francusko južno i antarktičko vreme"}
}
"meta:GMT"{
- ls{"Grinvič vreme"}
+ ls{"Grinvič srednje vreme"}
}
"meta:Galapagos"{
ls{"Galapagos vreme"}
@@ -1029,10 +1127,8 @@
lg{"Gruzija vreme"}
ls{"Gruzija standardno vreme"}
}
- "meta:Greenland_Central"{
- ld{"Centralni Grenland letnje računanje vremena"}
- lg{"Centralni Grenland vreme"}
- ls{"Centralni Grenland standardno vreme"}
+ "meta:Gilbert_Islands"{
+ ls{"Gilbert ostrva vreme"}
}
"meta:Greenland_Eastern"{
ld{"Istočni Grenland letnje računanje vremena"}
@@ -1048,15 +1144,15 @@
ls{"Guam standardno vreme"}
}
"meta:Gulf"{
- ls{"Zaliv standardno vreme"}
+ ls{"Zaliv vreme"}
}
"meta:Guyana"{
ls{"Gvajana vreme"}
}
"meta:Hawaii_Aleutian"{
- ld{"Havaǰsko-aleućansko letnje računanje vremena"}
- lg{"Havaǰsko-aleućansko vreme"}
- ls{"Havaǰsko-aleućansko standardno vreme"}
+ ld{"Havajsko-aleutsko letnje računanje vremena"}
+ lg{"Havajsko-aleutsko vreme"}
+ ls{"Havajsko-aleutsko standardno vreme"}
}
"meta:Hong_Kong"{
ld{"Hong Kong letnje računanje vremena"}
@@ -1072,19 +1168,19 @@
ls{"Indijsko standardno vreme"}
}
"meta:Indian_Ocean"{
- ls{"Indijski okean vreme"}
+ ls{"Indijsko okeansko vreme"}
}
"meta:Indochina"{
ls{"Indokina vreme"}
}
"meta:Indonesia_Central"{
- ls{"Centralno indonezijsko vreme"}
+ ls{"Centralno-indonezijsko vreme"}
}
"meta:Indonesia_Eastern"{
- ls{"Istočno indonezijsko vreme"}
+ ls{"Istočno-indonezijsko vreme"}
}
"meta:Indonesia_Western"{
- ls{"Zapadno indonezijsko vreme"}
+ ls{"Zapadno-indonezijsko vreme"}
}
"meta:Iran"{
ld{"Iran letnje računanje vremena"}
@@ -1107,21 +1203,15 @@
ls{"Japansko standardno vreme"}
}
"meta:Kamchatka"{
- ld{"Petropavlovsk-Kamčatski letnje računanje vremena"}
- lg{"Petropavlovsk-Kamčatski vreme"}
- ls{"Petropavlovsk-Kamčatski standardno vreme"}
- }
- "meta:Karachi"{
- ls{"Karači vreme"}
- }
- "meta:Kashgar"{
- ls{"Kašgar vreme"}
+ ld{"Petropavlovsko-kamčatsko letnje računanje vremena"}
+ lg{"Petropavlovsko-kamčatsko vreme"}
+ ls{"Petropavlovsko-kamčatsko standardno vreme"}
}
"meta:Kazakhstan_Eastern"{
- ls{"Istočni Kazahstan vreme"}
+ ls{"Istočno-kazahstansko vreme"}
}
"meta:Kazakhstan_Western"{
- ls{"Zapadni Kazahstan vreme"}
+ ls{"Zapadno-kazahstansko vreme"}
}
"meta:Korea"{
ld{"Korejsko letnje računanje vremena"}
@@ -1136,25 +1226,14 @@
lg{"Krasnojarsk vreme"}
ls{"Krasnojarsk standardno vreme"}
}
- "meta:Kuybyshev"{
- ld{"Kujbišev letnje računanje vemena"}
- lg{"Kujbišev vreme"}
- ls{"Kujbišev standardno vreme"}
- }
- "meta:Kwajalein"{
- ls{"Kvajalejnsko vreme"}
- }
"meta:Kyrgystan"{
ls{"Kirgizstan vreme"}
}
"meta:Lanka"{
- ls{"Lanka vreme"}
+ ls{"Šri Lanka vreme"}
}
"meta:Line_Islands"{
- ls{"Lajn ostrva vreme"}
- }
- "meta:Long_Shu"{
- ls{"Long Šu vreme"}
+ ls{"Line Ostrva vreme"}
}
"meta:Lord_Howe"{
ld{"Lord Hov letnje računanje vremena"}
@@ -1166,14 +1245,14 @@
lg{"Makao vreme"}
ls{"Makao standardno vreme"}
}
+ "meta:Macquarie"{
+ ls{"Makverijsko vreme"}
+ }
"meta:Magadan"{
ld{"Magadan letnje računanje vremena"}
lg{"Magadan vreme"}
ls{"Magadan standardno vreme"}
}
- "meta:Malaya"{
- ls{"Malaja vreme"}
- }
"meta:Malaysia"{
ls{"Malezija vreme"}
}
@@ -1279,7 +1358,7 @@
ls{"Filipini standardno vreme"}
}
"meta:Phoenix_Islands"{
- ls{"Fenička ostrva vreme"}
+ ls{"Feniks ostrva vreme"}
}
"meta:Pierre_Miquelon"{
ld{"Sen Pjer i Mikelon letnje računanje vremena"}
@@ -1287,10 +1366,10 @@
ls{"Sen Pjer i Mikelon standardno vreme"}
}
"meta:Pitcairn"{
- ls{"Pitkairn vreme"}
+ ls{"Pitkern vreme"}
}
"meta:Ponape"{
- ls{"Ponape vreme"}
+ ls{"Ponpei vreme"}
}
"meta:Qyzylorda"{
ld{"Kizilorda letnje računanje vremena"}
@@ -1298,10 +1377,10 @@
ls{"Kizilorda standardno vreme"}
}
"meta:Reunion"{
- ls{"Rejunion vreme"}
+ ls{"Reinion vreme"}
}
"meta:Rothera"{
- ls{"Roter vreme"}
+ ls{"Rotera vreme"}
}
"meta:Sakhalin"{
ld{"Sahalin letnje računanje vremena"}
@@ -1313,22 +1392,14 @@
lg{"Samara vreme"}
ls{"Samara standardno vreme"}
}
- "meta:Samarkand"{
- ld{"Samarkand letnje računanje vremena"}
- lg{"Samarkand vreme"}
- ls{"Samarkand standardno vreme"}
- }
"meta:Samoa"{
+ ld{"Samoa letnje računanje vremena"}
+ lg{"Samoa vreme"}
ls{"Samoa standardno vreme"}
}
"meta:Seychelles"{
ls{"Sejšeli vreme"}
}
- "meta:Shevchenko"{
- ld{"Ševčenko letnje računanje vremena"}
- lg{"Ševčenko vreme"}
- ls{"Ševčenko standardno vreme"}
- }
"meta:Singapore"{
ls{"Singapur standardno vreme"}
}
@@ -1341,32 +1412,22 @@
"meta:Suriname"{
ls{"Surinam vreme"}
}
- "meta:Sverdlovsk"{
- ld{"Sverdlovsk letnje računanje vremena"}
- lg{"Sverdlovsk vreme"}
- ls{"Sverdlovsk standardno vreme"}
- }
"meta:Syowa"{
ls{"Šova vreme"}
}
"meta:Tahiti"{
ls{"Tahiti vreme"}
}
+ "meta:Taipei"{
+ ld{"Taipei letnje računanje vremena"}
+ lg{"Taipei vreme"}
+ ls{"Taipei standardno vreme"}
+ }
"meta:Tajikistan"{
ls{"Tadžikistan vreme"}
}
- "meta:Tashkent"{
- ld{"Taškent letnje računanje vremena"}
- lg{"Taškent vreme"}
- ls{"Taškent standardno vreme"}
- }
- "meta:Tbilisi"{
- ld{"Tbilisi letnje računanje vremena"}
- lg{"Tbilisi vreme"}
- ls{"Tbilisi standardno vreme"}
- }
"meta:Tokelau"{
- ls{"Tokelo vreme"}
+ ls{"Tokelau vreme"}
}
"meta:Tonga"{
ld{"Tonga letnje računanje vremena"}
@@ -1374,12 +1435,7 @@
ls{"Tonga standardno vreme"}
}
"meta:Truk"{
- ls{"Truk vreme"}
- }
- "meta:Turkey"{
- ld{"Turska letnje računanje vremena"}
- lg{"Turska vreme"}
- ls{"Turska standardno vreme"}
+ ls{"Čuuk vreme"}
}
"meta:Turkmenistan"{
ld{"Turkmenistan letnje računanje vremena"}
@@ -1389,19 +1445,11 @@
"meta:Tuvalu"{
ls{"Tuvalu vreme"}
}
- "meta:Uralsk"{
- ld{"Ural'sk letnje računanje vremena"}
- lg{"Ural'sk vreme"}
- ls{"Ural'sk standardno vreme"}
- }
"meta:Uruguay"{
ld{"Urugvaj letnje računanje vremena"}
lg{"Urugvaj vreme"}
ls{"Urugvaj standardno vreme"}
}
- "meta:Urumqi"{
- ls{"Urumki vreme"}
- }
"meta:Uzbekistan"{
ld{"Uzbekistan letnje računanje vremena"}
lg{"Uzbekistan vreme"}
@@ -1429,7 +1477,7 @@
ls{"Vostok vreme"}
}
"meta:Wake"{
- ls{"Vejk vreme"}
+ ls{"Vejk ostrvo vreme"}
}
"meta:Wallis"{
ls{"Valis i Futuna Ostrva vreme"}
@@ -1444,17 +1492,11 @@
lg{"Jekaterinburg vreme"}
ls{"Jekaterinburg standardno vreme"}
}
- "meta:Yerevan"{
- ld{"Jerevan letnje računanje vremena"}
- lg{"Jerevan vreme"}
- ls{"Jerevan standardno vreme"}
- }
- "meta:Yukon"{
- ld{"Jukon letnje računanje vremena"}
- lg{"Jukon vreme"}
- ls{"Jukon standardno vreme"}
- }
- fallbackRegionFormat{"{1} vreme ({0})"}
- regionFormat{"{0} vreme"}
+ fallbackFormat{"{1} ({0})"}
+ fallbackRegionFormat{"Vreme u zemlji: {1} ({0})"}
+ gmtFormat{"GMT{0}"}
+ gmtZeroFormat{"GMT"}
+ hourFormat{"+HHmm;-HHmm"}
+ regionFormat{"Vreme u zemlji: {0}"}
}
}
diff --git a/data/zone/sr_Latn_BA.txt b/data/zone/sr_Latn_BA.txt
index cb015a6..1a5f126 100644
--- a/data/zone/sr_Latn_BA.txt
+++ b/data/zone/sr_Latn_BA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/sr_Latn_CS.txt b/data/zone/sr_Latn_CS.txt
index f80a8a8..9df1eb2 100644
--- a/data/zone/sr_Latn_CS.txt
+++ b/data/zone/sr_Latn_CS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/sr_Latn_ME.txt b/data/zone/sr_Latn_ME.txt
index fefdf54..700e1cb 100755
--- a/data/zone/sr_Latn_ME.txt
+++ b/data/zone/sr_Latn_ME.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/sr_Latn_RS.txt b/data/zone/sr_Latn_RS.txt
index 418f50c..4e4b742 100644
--- a/data/zone/sr_Latn_RS.txt
+++ b/data/zone/sr_Latn_RS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/sr_Latn_YU.txt b/data/zone/sr_Latn_YU.txt
index 56911ca..9451580 100644
--- a/data/zone/sr_Latn_YU.txt
+++ b/data/zone/sr_Latn_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/sr_ME.txt b/data/zone/sr_ME.txt
index 76ef7f7..8535ec0 100644
--- a/data/zone/sr_ME.txt
+++ b/data/zone/sr_ME.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/sr_RS.txt b/data/zone/sr_RS.txt
index d9c7dc2..2fba029 100644
--- a/data/zone/sr_RS.txt
+++ b/data/zone/sr_RS.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/sr_YU.txt b/data/zone/sr_YU.txt
index 9bb7c27..e3b8f74 100644
--- a/data/zone/sr_YU.txt
+++ b/data/zone/sr_YU.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/sv.txt b/data/zone/sv.txt
index 20c2a3a..cdcab0a 100644
--- a/data/zone/sv.txt
+++ b/data/zone/sv.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sv.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/sv.xml
*/
sv{
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
zoneStrings{
"Africa:Addis_Ababa"{
ec{"Addis Abeba"}
@@ -238,7 +238,7 @@
ec{"Köpenhamn"}
}
"Europe:Dublin"{
- ld{"irländsk sommartd"}
+ ld{"irländsk sommartid"}
}
"Europe:Helsinki"{
ec{"Helsingfors"}
@@ -331,21 +331,11 @@
lg{"västafrikansk tid"}
ls{"västafrikansk normaltid"}
}
- "meta:Aktyubinsk"{
- ld{"Aktyubinsksommartid"}
- lg{"Aktyubinsktid"}
- ls{"Aktyubinsknormaltid"}
- }
"meta:Alaska"{
ld{"Alaska, sommartid"}
lg{"alaskatid"}
ls{"Alaska, normaltid"}
}
- "meta:Alaska_Hawaii"{
- ld{"hawaiisk sommartid"}
- lg{"hawaiiansk tid"}
- ls{"hawaiisk normaltid"}
- }
"meta:Almaty"{
ld{"Almatysommartid"}
lg{"Almatytid"}
@@ -411,11 +401,6 @@
lg{"armenisk tid"}
ls{"armenisk normaltid"}
}
- "meta:Ashkhabad"{
- ld{"Ashkhabadsommartid"}
- lg{"Ashkhabadtid"}
- ls{"Ashkhabadnormaltid"}
- }
"meta:Atlantic"{
ld{"Atlantic, sommartid"}
lg{"nordamerikansk atlanttid"}
@@ -451,32 +436,17 @@
lg{"azorisk tid"}
ls{"azorisk normaltid"}
}
- "meta:Baku"{
- ld{"Bakusommartid"}
- lg{"Bakutid"}
- ls{"Bakunormaltid"}
- }
"meta:Bangladesh"{
ld{"bangladeshisk sommartid"}
lg{"bangladeshisk tid"}
ls{"bangladeshisk normaltid"}
}
- "meta:Bering"{
- ld{"beringsundssommartid"}
- lg{"beringsundstid"}
- ls{"beringsundsnormaltid"}
- }
"meta:Bhutan"{
ls{"bhutansk tid"}
}
"meta:Bolivia"{
ls{"boliviansk tid"}
}
- "meta:Borneo"{
- ld{"Borneosommartid"}
- lg{"borneotid"}
- ls{"Borneonormaltid"}
- }
"meta:Brasilia"{
ld{"Brasiliasommartid"}
lg{"brasiliansk tid"}
@@ -496,9 +466,6 @@
"meta:Chamorro"{
ls{"Chamorrotid"}
}
- "meta:Changbai"{
- ls{"Changbaitid"}
- }
"meta:Chatham"{
ld{"Chathamsommartid"}
lg{"Chathamtid"}
@@ -540,23 +507,12 @@
lg{"kubansk tid"}
ls{"kubansk normaltid"}
}
- "meta:Dacca"{
- ls{"Dhakatid"}
- }
"meta:Davis"{
ls{"Davistid"}
}
"meta:DumontDUrville"{
ls{"Dumont d’Urville-tid"}
}
- "meta:Dushanbe"{
- ld{"Dusjanbesommartid"}
- lg{"Dusjanbetid"}
- ls{"Dusjanbenormaltid"}
- }
- "meta:Dutch_Guiana"{
- ls{"Holländska Guianatid"}
- }
"meta:East_Timor"{
ls{"östtimorisk tid"}
}
@@ -608,11 +564,6 @@
"meta:French_Southern"{
ls{"Franska Sydterritoriernas tid"}
}
- "meta:Frunze"{
- ld{"Bisjkeksommartid"}
- lg{"Bisjkektid"}
- ls{"Bisjkeknormaltid"}
- }
"meta:GMT"{
ls{"Greenwichtid"}
ss{"GMT"}
@@ -631,11 +582,6 @@
"meta:Gilbert_Islands"{
ls{"Kiribatitid"}
}
- "meta:Greenland_Central"{
- ld{"centralgrönländsk sommartid"}
- lg{"centralgrönländsk tid"}
- ls{"centralgrönländsk normaltid"}
- }
"meta:Greenland_Eastern"{
ld{"östgrönländsk sommartid"}
lg{"östgrönländsk tid"}
@@ -713,12 +659,6 @@
lg{"Kamtjatkatid"}
ls{"Kamtjatkanormaltid"}
}
- "meta:Karachi"{
- ls{"Karachitid"}
- }
- "meta:Kashgar"{
- ls{"Kashgartid"}
- }
"meta:Kazakhstan_Eastern"{
ls{"östkazakstansk tid"}
}
@@ -738,9 +678,6 @@
lg{"Krasnojarsktid"}
ls{"Krasnojarsknormaltid"}
}
- "meta:Kwajalein"{
- ls{"Kwajaleintid"}
- }
"meta:Kyrgystan"{
ls{"kirgizisk tid"}
}
@@ -750,9 +687,6 @@
"meta:Line_Islands"{
ls{"Lineöarnas tid"}
}
- "meta:Long_Shu"{
- ls{"Chongqingtid"}
- }
"meta:Lord_Howe"{
ld{"Lord Howesommartid"}
lg{"Lord Howetid"}
@@ -771,9 +705,6 @@
lg{"Magadantid"}
ls{"Magadannormaltid"}
}
- "meta:Malaya"{
- ls{"malayisk tid"}
- }
"meta:Malaysia"{
ls{"malaysisk tid"}
}
@@ -871,7 +802,7 @@
"meta:Peru"{
ld{"peruansk sommartid"}
lg{"peruansk tid"}
- ls{"peruansk normalid"}
+ ls{"peruansk normaltid"}
}
"meta:Philippines"{
ld{"filippinsk sommartid"}
@@ -913,22 +844,14 @@
lg{"Samaratid"}
ls{"Samaranormaltid"}
}
- "meta:Samarkand"{
- ld{"Samarkandsommartid"}
- lg{"Samarkandtid"}
- ls{"Samarkandnormaltid"}
- }
"meta:Samoa"{
- ls{"samoansk tid"}
+ ld{"samoansk sommartid"}
+ lg{"samoansk tid"}
+ ls{"samoansk normaltid"}
}
"meta:Seychelles"{
ls{"Seychellernatid"}
}
- "meta:Shevchenko"{
- ld{"Shevchenkosommartid"}
- lg{"Shevchenkotid"}
- ls{"Shevchenkonormaltid"}
- }
"meta:Singapore"{
ls{"Singaporetid"}
}
@@ -941,11 +864,6 @@
"meta:Suriname"{
ls{"Surinamtid"}
}
- "meta:Sverdlovsk"{
- ld{"Sverdlovsksommartid"}
- lg{"Sverdlovsktid"}
- ls{"Sverdlovsknormaltid"}
- }
"meta:Syowa"{
ls{"Syowatid"}
}
@@ -960,16 +878,6 @@
"meta:Tajikistan"{
ls{"Tadzjikistantid"}
}
- "meta:Tashkent"{
- ld{"Tashkentsommartid"}
- lg{"Tashkenttid"}
- ls{"Tashkentnormaltid"}
- }
- "meta:Tbilisi"{
- ld{"Tbilisisommartid"}
- lg{"Tbilisitid"}
- ls{"Tbilisinormaltid"}
- }
"meta:Tokelau"{
ls{"Tokelautid"}
}
@@ -981,11 +889,6 @@
"meta:Truk"{
ls{"Truktid"}
}
- "meta:Turkey"{
- ld{"turkisk sommartid"}
- lg{"turkisk tid"}
- ls{"turkisk normaltid"}
- }
"meta:Turkmenistan"{
ld{"turkmensk sommartid"}
lg{"turkmensk tid"}
@@ -994,19 +897,11 @@
"meta:Tuvalu"{
ls{"Tuvalutid"}
}
- "meta:Uralsk"{
- ld{"Oralsommartid"}
- lg{"Oraltid"}
- ls{"Oralnormaltid"}
- }
"meta:Uruguay"{
ld{"uruguayansk sommartid"}
lg{"uruguayansk tid"}
ls{"uruguayansk normaltid"}
}
- "meta:Urumqi"{
- ls{"Urumqitid"}
- }
"meta:Uzbekistan"{
ld{"uzbekisk sommartid"}
lg{"uzbekisk tid"}
@@ -1049,16 +944,6 @@
lg{"Jekaterinburgtid"}
ls{"Jekaterinburgnormaltid"}
}
- "meta:Yerevan"{
- ld{"Jerevansommartid"}
- lg{"Jerevantid"}
- ls{"Jerevannormaltid"}
- }
- "meta:Yukon"{
- ld{"Yukonsommartid"}
- lg{"Yukontid"}
- ls{"Yukonnormaltid"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"{1}tid ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/sv_FI.txt b/data/zone/sv_FI.txt
index 3a72bc2..4b2aa10 100755
--- a/data/zone/sv_FI.txt
+++ b/data/zone/sv_FI.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sv_FI.xml
// *
// ***************************************************************************
sv_FI{
- Version{"2.0.75.99"}
+ Version{"2.0.82.45"}
zoneStrings{
"America:Tegucigalpa"{
ec{"Tegucigalpa"}
diff --git a/data/zone/sw.txt b/data/zone/sw.txt
index 4f78d3c..4f406d0 100644
--- a/data/zone/sw.txt
+++ b/data/zone/sw.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/sw.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/sw.xml
*/
sw{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Sao_Tome"{
ec{"São Tomé"}
@@ -517,6 +517,8 @@
ls{"Saa za Wastani za Samara"}
}
"meta:Samoa"{
+ ld{"Saa ya Majira ya joto ya Samoa"}
+ lg{"Saa ya Samoa"}
ls{"Saa Wastani ya Samoa"}
}
"meta:Seychelles"{
diff --git a/data/zone/swc.txt b/data/zone/swc.txt
index 0e02b5f..53f5fbe 100755
--- a/data/zone/swc.txt
+++ b/data/zone/swc.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/swc.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/swc.xml
*/
swc{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/ta.txt b/data/zone/ta.txt
index b66a7c8..0d543ff 100644
--- a/data/zone/ta.txt
+++ b/data/zone/ta.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ta.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/ta.xml
*/
ta{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"அபிட்ஜான்"}
@@ -1246,21 +1246,11 @@
lg{"மேற்கு ஆப்பிரிக்க நேரம்"}
ls{"மேற்கு ஆப்ரிக்க தர நேரம்"}
}
- "meta:Aktyubinsk"{
- ld{"அக்டையுபின்ஸ்க் கோடை நேரம்"}
- lg{"அக்டையுபின்ஸ்க் நேரம்"}
- ls{"அக்டையுபின்ஸ்க் தர நேரம்"}
- }
"meta:Alaska"{
ld{"அலாஸ்கா பகலொளி நேரம்"}
lg{"அலாஸ்கா நேரம்"}
ls{"அலாஸ்கா தர நேரம்"}
}
- "meta:Alaska_Hawaii"{
- ld{"அலாஸ்கா ஹவாய் பகலொளி நேரம்"}
- lg{"அலாஸ்கா ஹவாய் நேரம்"}
- ls{"அலாஸ்கா ஹவாய் தர நேரம்"}
- }
"meta:Almaty"{
ld{"அல்மாடி கோடை நேரம்"}
lg{"அல்மாடி நேரம்"}
@@ -1326,11 +1316,6 @@
lg{"ஆர்மேனியா நேரம்"}
ls{"அர்மேனியா தர நேரம்"}
}
- "meta:Ashkhabad"{
- ld{"அஸ்காபாத் கோடை நேரம்"}
- lg{"அஸ்காபாத் நேரம்"}
- ls{"அஸ்காபாத் தர நேரம்"}
- }
"meta:Atlantic"{
ld{"அட்லாண்டிக் பகலொளி நேரம்"}
lg{"அட்லாண்டிக் நேரம்"}
@@ -1366,32 +1351,17 @@
lg{"அசோர்ஸ் நேரம்"}
ls{"அஜோர்ஸ் தர நேரம்"}
}
- "meta:Baku"{
- ld{"பகு கோடை நேரம்"}
- lg{"பகு நேரம்"}
- ls{"பகு தர நேரம்"}
- }
"meta:Bangladesh"{
ld{"வங்கதேச கோடை நேரம்"}
lg{"வங்கதேச நேரம்"}
ls{"வங்கதேச நேரப்படி"}
}
- "meta:Bering"{
- ld{"பெரிங் பகலொளி நேரம்"}
- lg{"பெரிங் நேரம்"}
- ls{"பெரிங் தர நேரம்"}
- }
"meta:Bhutan"{
ls{"பூட்டான் நேரம்"}
}
"meta:Bolivia"{
ls{"பொலிவியா நேரம்"}
}
- "meta:Borneo"{
- ld{"போர்னியோ கோடை நேரம்"}
- lg{"போர்னியோ நேரம்"}
- ls{"போர்னியோ தர நேரம்"}
- }
"meta:Brasilia"{
ld{"ப்ரசிலியா கோடை நேரம்"}
lg{"ப்ரசிலியா நேரம்"}
@@ -1408,9 +1378,6 @@
"meta:Chamorro"{
ls{"சாமோரோ நேரப்படி"}
}
- "meta:Changbai"{
- ls{"சாங்பாய் நேரம்"}
- }
"meta:Chatham"{
ld{"சத்தாம் பகலொளி நேரம்"}
lg{"சத்தாம் நேரம்"}
@@ -1452,23 +1419,12 @@
lg{"கியூபா நேரம்"}
ls{"கியூபா தர நேரம்"}
}
- "meta:Dacca"{
- ls{"டக்கா நேரம்"}
- }
"meta:Davis"{
ls{"டேவிஸ் நேரம்"}
}
"meta:DumontDUrville"{
ls{"ட்யூமோண்ட்-டி உர்வில்லே நேரம்"}
}
- "meta:Dushanbe"{
- ld{"டுஷன்பே கோடை நேரம்"}
- lg{"டுஷன்பே நேரம்"}
- ls{"டுஷன்பே தர நேரம்"}
- }
- "meta:Dutch_Guiana"{
- ls{"டச்சு கயானா நேரம்"}
- }
"meta:East_Timor"{
ls{"கிழக்கு திமோர் நேரம்"}
}
@@ -1511,11 +1467,6 @@
"meta:French_Southern"{
ls{"ஃபிரஞ்சு தெற்கத்திய மற்றும் அண்டார்டிக் நேரம்"}
}
- "meta:Frunze"{
- ld{"ப்ருன்சே கோடை நேரம்"}
- lg{"ப்ருன்சே நேரம்"}
- ls{"ப்ருன்சே தர நேரம்"}
- }
"meta:GMT"{
ls{"கிரீன்விச் இடைநிலை நேரம்"}
}
@@ -1533,11 +1484,6 @@
"meta:Gilbert_Islands"{
ls{"கில்பர்ட் தீவுகள் நேரம்"}
}
- "meta:Greenland_Central"{
- ld{"மத்திய க்ரீன்லாந்து கோடை நேரம்"}
- lg{"மத்திய க்ரீன்லாந்து நேரம்"}
- ls{"மத்திய க்ரீன்லாந்து தர நேரம்"}
- }
"meta:Greenland_Eastern"{
ld{"கிழக்கு கிரீன்லாந்து கோடை நேரம்"}
lg{"கிழக்கு கிரீன்லாந்து நேரம்"}
@@ -1616,23 +1562,12 @@
lg{"பெட்ரோபவ்லோவ்ஸ்க் கம்சட்ஸ்கி நேரம்"}
ls{"பெட்ரோபவ்லோவ்ஸ்க் கம்சட்ஸ்கி தர நேரம்"}
}
- "meta:Karachi"{
- ls{"கராச்சி நேரம்"}
- }
- "meta:Kashgar"{
- ls{"கஷ்கர் நேரம்"}
- }
"meta:Kazakhstan_Eastern"{
ls{"கிழக்கு கஜகஸ்தான் நேரம்"}
}
"meta:Kazakhstan_Western"{
ls{"மேற்கு கஜகஸ்தான் நேரம்"}
}
- "meta:Kizilorda"{
- ld{"கிஜிலோர்டா கோடை நேரம்"}
- lg{"கிஜிலோர்டா நேரம்"}
- ls{"கிஜிலோர்டா தர நேரம்"}
- }
"meta:Korea"{
ld{"கொரியன் பகலொளி நேரம்"}
lg{"கொரியன் நேரம்"}
@@ -1646,14 +1581,6 @@
lg{"க்ரஸ்னோயார்ஸ்க் நேரம்"}
ls{"க்ரஸ்னோயார்ஸ்க் தர நேரம்"}
}
- "meta:Kuybyshev"{
- ld{"குய்பய்ஷெவ் கோடை நேரம்"}
- lg{"குய்பய்ஷெவ் நேரம்"}
- ls{"குய்பய்ஷெவ் தர நேரம்"}
- }
- "meta:Kwajalein"{
- ls{"க்வாஜலென் நேரம்"}
- }
"meta:Kyrgystan"{
ls{"கிர்கிஸ்தான் நேரம்"}
}
@@ -1663,9 +1590,6 @@
"meta:Line_Islands"{
ls{"லைன் தீவுகள் நேரம்"}
}
- "meta:Long_Shu"{
- ls{"லாங்-ஷு நேரம்"}
- }
"meta:Lord_Howe"{
ld{"லார்ட் ஹோவ் பகலொளி நேரம்"}
lg{"லார்ட் ஹோவ் நேரம்"}
@@ -1684,9 +1608,6 @@
lg{"மகதன் நேரம்"}
ls{"மகதன் தர நேரம்"}
}
- "meta:Malaya"{
- ls{"மலாயா நேரம்"}
- }
"meta:Malaysia"{
ls{"மலேஷியா நேரம்"}
}
@@ -1826,22 +1747,14 @@
lg{"சமரா நேரம்"}
ls{"சமரா தர நேரம்"}
}
- "meta:Samarkand"{
- ld{"சமர்கன்ட் கோடை நேரம்"}
- lg{"சமர்கன்ட் நேரம்"}
- ls{"சமர்கன்ட் தர நேரம்"}
- }
"meta:Samoa"{
- ls{"சமோயா நேரப்படி"}
+ ld{"சமோயா கோடை நேரம்"}
+ lg{"சமோயா நேரம்"}
+ ls{"சமோயா தர நேரம்"}
}
"meta:Seychelles"{
ls{"சீசெல்லெஸ் நேரம்"}
}
- "meta:Shevchenko"{
- ld{"ஷெவ்சென்கோ கோடை நேரம்"}
- lg{"ஷெவ்சென்கோ நேரம்"}
- ls{"ஷெவ்சென்கோ தர நேரம்"}
- }
"meta:Singapore"{
ls{"சிங்கப்பூர் நேரப்படி"}
}
@@ -1854,11 +1767,6 @@
"meta:Suriname"{
ls{"சூரினாம் நேரம்"}
}
- "meta:Sverdlovsk"{
- ld{"ஸ்வர்ட்லோவ்ஸ்க் கோடை நேரம்"}
- lg{"ஸ்வர்ட்லோவ்ஸ்க் நேரம்"}
- ls{"ஸ்வர்ட்லோவ்ஸ்க் தர நேரம்"}
- }
"meta:Syowa"{
ls{"ஸ்யோவா நேரம்"}
}
@@ -1873,16 +1781,6 @@
"meta:Tajikistan"{
ls{"தஜிகிஸ்தான் நேரம்"}
}
- "meta:Tashkent"{
- ld{"தஷ்கென்ட் கோடை நேரம்"}
- lg{"தஷ்கென்ட் நேரம்"}
- ls{"தஷ்கென்ட் தர நேரம்"}
- }
- "meta:Tbilisi"{
- ld{"ட்பிலிஸி கோடை நேரம்"}
- lg{"ட்பிலிஸி நேரம்"}
- ls{"ட்பிலிஸி தர நேரம்"}
- }
"meta:Tokelau"{
ls{"டோக்கெலாவ் நேரம்"}
}
@@ -1894,11 +1792,6 @@
"meta:Truk"{
ls{"சுக் நேரம்"}
}
- "meta:Turkey"{
- ld{"துருக்கி கோடை நேரம்"}
- lg{"துருக்கி நேரம்"}
- ls{"துருக்கி தர நேரம்"}
- }
"meta:Turkmenistan"{
ld{"துர்க்மெனிஸ்தான் கோடை நேரம்"}
lg{"துர்க்மெனிஸ்தான் நேரம்"}
@@ -1907,19 +1800,11 @@
"meta:Tuvalu"{
ls{"துவாலு நேரம்"}
}
- "meta:Uralsk"{
- ld{"உரல்ஸ்க் கோடை நேரம்"}
- lg{"உரல்ஸ்க் நேரம்"}
- ls{"உரல்ஸ்க் தர நேரம்"}
- }
"meta:Uruguay"{
ld{"உருகுவே கோடை நேரம்"}
lg{"உருகுவே நேரம்"}
ls{"உருகுவே தர நேரம்"}
}
- "meta:Urumqi"{
- ls{"உரும்கி நேரம்"}
- }
"meta:Uzbekistan"{
ld{"உஸ்பெகிஸ்தான் கோடை நேரம்"}
lg{"உஸ்பெகிஸ்தான் நேரம்"}
@@ -1962,16 +1847,6 @@
lg{"யேகாடெரின்பர்க் நேரம்"}
ls{"யேகாடெரின்பர்க் தர நேரம்"}
}
- "meta:Yerevan"{
- ld{"யெரெவன் கோடை நேரம்"}
- lg{"யெரெவன் நேரம்"}
- ls{"யெரெவன் தர நேரம்"}
- }
- "meta:Yukon"{
- ld{"யுகோன் பகலொளி நேரம்"}
- lg{"யுகோன் நேரம்"}
- ls{"யுகோன் தர நேரம்"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"{1} ({0}) நேரம்"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/ta_MY.txt b/data/zone/ta_MY.txt
index f4b787a..f6cf7cf 100755
--- a/data/zone/ta_MY.txt
+++ b/data/zone/ta_MY.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ta_MY.xml
// *
// ***************************************************************************
ta_MY{
- Version{"2.0.74.95"}
+ Version{"2.0.82.45"}
zoneStrings{
"meta:Brunei"{
ls{"புருணை டாரு சலாம் நேரம்"}
diff --git a/data/zone/ta_SG.txt b/data/zone/ta_SG.txt
index 6d8f253..052e0c4 100755
--- a/data/zone/ta_SG.txt
+++ b/data/zone/ta_SG.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ta_SG.xml
// *
// ***************************************************************************
ta_SG{
- Version{"2.0.74.95"}
+ Version{"2.0.82.45"}
zoneStrings{
"meta:Brunei"{
ls{"புருணை டாரு சலாம் நேரம்"}
diff --git a/data/zone/te.txt b/data/zone/te.txt
index 2e40797..037df12 100644
--- a/data/zone/te.txt
+++ b/data/zone/te.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/te.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/te.xml
*/
te{
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"అబిడ్జాన్"}
@@ -1246,21 +1246,11 @@
lg{"పశ్చిమ ఆఫ్రికా సమయం"}
ls{"పశ్చిమ ఆఫ్రికా ప్రామాణిక సమయం"}
}
- "meta:Aktyubinsk"{
- ld{"అక్టియుబినిస్క్ వేసవి సమయం"}
- lg{"అక్టియుబినిస్క్ సమయం"}
- ls{"అక్టియుబినిస్క్ ప్రామాణిక సమయం"}
- }
"meta:Alaska"{
ld{"అలాస్కా పగటి సమయం"}
lg{"అలాస్కా సమయం"}
ls{"అలాస్కా ప్రామాణిక సమయం"}
}
- "meta:Alaska_Hawaii"{
- ld{"అలాస్కా-హవాయి పగటి సమయం"}
- lg{"అలాస్కా-హవాయి సమయం"}
- ls{"అలాస్కా-హవాయి ప్రామాణిక సమయం"}
- }
"meta:Almaty"{
ld{"అల్మాటి వేసవి సమయం"}
lg{"అల్మాటి సమయం"}
@@ -1326,11 +1316,6 @@
lg{"ఆర్మేనియా సమయం"}
ls{"ఆర్మేనియా ప్రామాణిక సమయం"}
}
- "meta:Ashkhabad"{
- ld{"అష్ఖాబాద్ వేసవి సమయం"}
- lg{"అష్ఖాబాద్ సమయం"}
- ls{"అష్ఖాబాద్ ప్రామాణిక సమయం"}
- }
"meta:Atlantic"{
ld{"అట్లాంటిక్ పగటి సమయం"}
lg{"అట్లాంటిక్ సమయం"}
@@ -1366,32 +1351,17 @@
lg{"అజోర్స్ సమయం"}
ls{"అజోర్స్ ప్రామాణిక సమయం"}
}
- "meta:Baku"{
- ld{"బాకు వేసవి సమయం"}
- lg{"బాకు సమయం"}
- ls{"బాకు ప్రామాణిక సమయం"}
- }
"meta:Bangladesh"{
ld{"బంగ్లాదేశ్ వేసవి సమయం"}
lg{"బంగ్లాదేశ్ సమయం"}
ls{"బంగ్లాదేశ్ ప్రామాణిక సమయం"}
}
- "meta:Bering"{
- ld{"బెరింగ్ పగటి సమయం"}
- lg{"బెరింగ్ సమయం"}
- ls{"బెరింగ్ ప్రామాణిక సమయం"}
- }
"meta:Bhutan"{
ls{"భూటాన్ సమయం"}
}
"meta:Bolivia"{
ls{"బొలీవియా సమయం"}
}
- "meta:Borneo"{
- ld{"బొర్నియో వేసవి సమయం"}
- lg{"బొర్నియో సమయం"}
- ls{"బొర్నియో ప్రామాణిక సమయం"}
- }
"meta:Brasilia"{
ld{"బ్రెసిలియా వేసవి సమయం"}
lg{"బ్రెజిలియా సమయం"}
@@ -1408,9 +1378,6 @@
"meta:Chamorro"{
ls{"చామర్రో ప్రామాణిక సమయం"}
}
- "meta:Changbai"{
- ls{"ఛాంగ్బాయి సమయం"}
- }
"meta:Chatham"{
ld{"చాథమ్ పగటి వెలుతురు సమయం"}
lg{"చాథమ్ సమయం"}
@@ -1452,23 +1419,12 @@
lg{"క్యూబా సమయం"}
ls{"క్యూబా ప్రామాణిక సమయం"}
}
- "meta:Dacca"{
- ls{"డక్కా సమయం"}
- }
"meta:Davis"{
ls{"డేవిస్ సమయం"}
}
"meta:DumontDUrville"{
ls{"డ్యూమాంట్-డి’ఉర్విల్లే సమయం"}
}
- "meta:Dushanbe"{
- ld{"డుషాన్బె వేసవి సమయం"}
- lg{"డుషాన్బె సమయం"}
- ls{"డుషాన్బె ప్రామాణిక సమయం"}
- }
- "meta:Dutch_Guiana"{
- ls{"డచ్ గియానా సమయం"}
- }
"meta:East_Timor"{
ls{"తూర్పు తైమూర్ సమయం"}
}
@@ -1511,11 +1467,6 @@
"meta:French_Southern"{
ls{"ఫ్రెంచ్ దక్షిణ మరియు అంటార్కిటిక్ సమయం"}
}
- "meta:Frunze"{
- ld{"ఫ్రున్జ్ వేసవి సమయం"}
- lg{"ఫ్రున్జ్ సమయం"}
- ls{"ఫ్రున్జ్ ప్రామాణిక సమయం"}
- }
"meta:GMT"{
ls{"గ్రీన్విచ్ సగటు సమయం"}
}
@@ -1533,11 +1484,6 @@
"meta:Gilbert_Islands"{
ls{"గిల్బర్ట్ దీవుల సమయం"}
}
- "meta:Greenland_Central"{
- ld{"మధ్యమ గ్రీన్ ల్యాండ్ వేసని సమయం"}
- lg{"మధ్యమ గ్రీన్ ల్యాండ్ సమయం"}
- ls{"మధ్యమ గ్రీన్ ల్యాండ్ ప్రామాణిక సమయం"}
- }
"meta:Greenland_Eastern"{
ld{"తూర్పు గ్రీన్ల్యాండ్ వేసవి సమయం"}
lg{"తూర్పు గ్రీన్ల్యాండ్ సమయం"}
@@ -1616,12 +1562,6 @@
lg{"పెట్రోపావ్లోవ్స్క్-కామ్ఛాట్స్కి సమయం"}
ls{"పెట్రోపావ్లోవ్స్క్-కామ్ఛాట్స్కి ప్రామాణిక సమయం"}
}
- "meta:Karachi"{
- ls{"కరాచి సమయం"}
- }
- "meta:Kashgar"{
- ls{"కాష్గార్ సమయం"}
- }
"meta:Kazakhstan_Eastern"{
ls{"తూర్పు కజకిస్థాన్ సమయం"}
}
@@ -1641,14 +1581,6 @@
lg{"క్రస్నోయార్స్క్ సమయం"}
ls{"క్రాస్నోయార్స్క్ ప్రామాణిక సమయం"}
}
- "meta:Kuybyshev"{
- ld{"కుయిబైషెవ్ వేసవి సమయం"}
- lg{"కుయిబైషెవ్ సమయం"}
- ls{"కుయిబైషెవ్ ప్రామాణిక సమయం"}
- }
- "meta:Kwajalein"{
- ls{"క్వాజలేన్ సమయం"}
- }
"meta:Kyrgystan"{
ls{"కిర్గిస్థాన్ సమయం"}
}
@@ -1658,9 +1590,6 @@
"meta:Line_Islands"{
ls{"లైన్ దీవుల సమయం"}
}
- "meta:Long_Shu"{
- ls{"లాంగ్-షూ సమయం"}
- }
"meta:Lord_Howe"{
ld{"లార్డ్ హోవ్ పగటి సమయం"}
lg{"లార్డ్ హోవ్ సమయం"}
@@ -1679,9 +1608,6 @@
lg{"మగడాన్ సమయం"}
ls{"మగడాన్ ప్రామాణిక సమయం"}
}
- "meta:Malaya"{
- ls{"మలయా సమయం"}
- }
"meta:Malaysia"{
ls{"మలేషియా సమయం"}
}
@@ -1818,25 +1744,17 @@
}
"meta:Samara"{
ld{"సమారా వేసవి సమయం"}
- lg{"సమార సమయం"}
+ lg{"సమారా సమయం"}
ls{"సమారా ప్రామాణిక సమయం"}
}
- "meta:Samarkand"{
- ld{"సమర్ఖండ్ వేసవి సమయం"}
- lg{"సమర్ఖండ్ సమయం"}
- ls{"సమర్ఖండ్ ప్రామాణిక సమయం"}
- }
"meta:Samoa"{
+ ld{"సమోవా వేసవి సమయం"}
+ lg{"సమోవా సమయం"}
ls{"సమోవా ప్రామాణిక సమయం"}
}
"meta:Seychelles"{
ls{"సీషెల్స్ సమయం"}
}
- "meta:Shevchenko"{
- ld{"షెవ్ఛెంకో వేసవి సమయం"}
- lg{"షెవ్ఛెంకో సమయం"}
- ls{"షెవ్ఛెంకో ప్రామాణిక సమయం"}
- }
"meta:Singapore"{
ls{"సింగపూర్ ప్రామాణిక సమయం"}
}
@@ -1849,11 +1767,6 @@
"meta:Suriname"{
ls{"సూరినామ్ సమయం"}
}
- "meta:Sverdlovsk"{
- ld{"స్వెర్డ్లోవ్స్క్ వేసవి సమయం"}
- lg{"స్వెర్డ్లోవ్స్క్ సమయం"}
- ls{"స్వెర్డ్లోవ్స్క్ ప్రామాణిక సమయం"}
- }
"meta:Syowa"{
ls{"స్యోవా సమయం"}
}
@@ -1868,16 +1781,6 @@
"meta:Tajikistan"{
ls{"తజికిస్థాన్ సమయం"}
}
- "meta:Tashkent"{
- ld{"టాష్కెంట్ వేసవి సమయం"}
- lg{"టాష్కెంట్ సమయం"}
- ls{"టాష్కెంట్ ప్రామాణిక సమయం"}
- }
- "meta:Tbilisi"{
- ld{"టిబ్లీసీ వేసవి సమయం"}
- lg{"టిబ్లీసీ సమయం"}
- ls{"టిబ్లీసీ ప్రామాణిక సమయం"}
- }
"meta:Tokelau"{
ls{"టోకెలావ్ సమయం"}
}
@@ -1889,11 +1792,6 @@
"meta:Truk"{
ls{"చక్ సమయం"}
}
- "meta:Turkey"{
- ld{"టర్కీ వేసవి సమయం"}
- lg{"టర్కీ సమయం"}
- ls{"టర్కీ ప్రామాణిక సమయం"}
- }
"meta:Turkmenistan"{
ld{"తుర్క్మెనిస్థాన్ వేసవి సమయం"}
lg{"తుర్క్మెనిస్థాన్ సమయం"}
@@ -1902,19 +1800,11 @@
"meta:Tuvalu"{
ls{"తువాలు సమయం"}
}
- "meta:Uralsk"{
- ld{"ఉరాల్స్క్ వేసవి సమయం"}
- lg{"ఉరాల్స్క్ సమయం"}
- ls{"ఉరాల్స్క్ ప్రామాణిక సమయం"}
- }
"meta:Uruguay"{
ld{"ఉరుగ్వే వేసవి సమయం"}
lg{"ఉరుగ్వే సమయం"}
ls{"ఉరుగ్వే ప్రామాణిక సమయం"}
}
- "meta:Urumqi"{
- ls{"ఉరుమ్కి సమయం"}
- }
"meta:Uzbekistan"{
ld{"ఉజ్బెకిస్థాన్ వేసవి సమయం"}
lg{"ఉజ్బెకిస్థాన్ సమయం"}
@@ -1957,11 +1847,6 @@
lg{"యెకటెరింగ్బర్గ్ సమయం"}
ls{"ఎకటేరిన్బర్గ్ ప్రామాణిక సమయం"}
}
- "meta:Yerevan"{
- ld{"ఏరెవాన్ వేసవి సమయం"}
- lg{"ఏరెవాన్ సమయం"}
- ls{"ఏరెవాన్ ప్రామాణిక సమయం"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"{1} సమయం ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/teo.txt b/data/zone/teo.txt
index fea9206..08365e7 100755
--- a/data/zone/teo.txt
+++ b/data/zone/teo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/teo.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/teo.xml
*/
teo{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/th.txt b/data/zone/th.txt
index c66fa52..e46d343 100644
--- a/data/zone/th.txt
+++ b/data/zone/th.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/th.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/th.xml
*/
th{
- Version{"2.0.79.79"}
+ Version{"2.0.82.57"}
zoneStrings{
"Africa:Abidjan"{
ec{"อาบีจาน"}
@@ -1248,21 +1248,11 @@
lg{"เวลาแอฟริกาตะวันตก"}
ls{"เวลามาตรฐานแอฟริกาตะวันตก"}
}
- "meta:Aktyubinsk"{
- ld{"เวลาฤดูร้อนอัคเทียวบิงส์ค"}
- lg{"เวลาอัคเทียวบิงส์ค"}
- ls{"เวลามาตรฐานอัคเทียวบิงส์ค"}
- }
"meta:Alaska"{
ld{"เวลาออมแสงของอะแลสกา"}
lg{"เวลาอะแลสกา"}
ls{"เวลามาตรฐานอะแลสกา"}
}
- "meta:Alaska_Hawaii"{
- ld{"เวลาออมแสงของอะแลสกา-ฮาวาย"}
- lg{"เวลาอะแลสกา-ฮาวาย"}
- ls{"เวลามาตรฐานอะแลสกา-ฮาวาย"}
- }
"meta:Almaty"{
ld{"เวลาฤดูร้อนอัลมาตี"}
lg{"เวลาอัลมาตี"}
@@ -1328,11 +1318,6 @@
lg{"เวลาอาร์เมเนีย"}
ls{"เวลามาตรฐานอาร์เมเนีย"}
}
- "meta:Ashkhabad"{
- ld{"เวลาฤดูร้อนอาชกาบัต"}
- lg{"เวลาอาชกาบัต"}
- ls{"เวลามาตรฐานอาชกาบัต"}
- }
"meta:Atlantic"{
ld{"เวลาออมแสงของแอตแลนติก"}
lg{"เวลาแอตแลนติก"}
@@ -1368,32 +1353,17 @@
lg{"เวลาอะโซร์ส"}
ls{"เวลามาตรฐานอะโซร์ส"}
}
- "meta:Baku"{
- ld{"เวลาฤดูร้อนบากู"}
- lg{"เวลาบากู"}
- ls{"เวลามาตรฐานบากู"}
- }
"meta:Bangladesh"{
ld{"เวลาฤดูร้อนบังกลาเทศ"}
lg{"เวลาบังกลาเทศ"}
ls{"เวลามาตรฐานบังกลาเทศ"}
}
- "meta:Bering"{
- ld{"เวลาออมแสงของเบริง"}
- lg{"เวลาเบริง"}
- ls{"เวลามาตรฐานเบริง"}
- }
"meta:Bhutan"{
ls{"เวลาภูฏาน"}
}
"meta:Bolivia"{
ls{"เวลาโบลิเวีย"}
}
- "meta:Borneo"{
- ld{"เวลาฤดูร้อนบอร์เนียว"}
- lg{"เวลาบอร์เนียว"}
- ls{"เวลามาตรฐานบอร์เนียว"}
- }
"meta:Brasilia"{
ld{"เวลาฤดูร้อนบราซิเลีย"}
lg{"เวลาบราซิเลีย"}
@@ -1413,9 +1383,6 @@
"meta:Chamorro"{
ls{"เวลาชามอร์โร"}
}
- "meta:Changbai"{
- ls{"เวลาฉางไป๋"}
- }
"meta:Chatham"{
ld{"เวลาออมแสงแชทัม"}
lg{"เวลาแชทัม"}
@@ -1457,23 +1424,12 @@
lg{"เวลาคิวบา"}
ls{"เวลามาตรฐานคิวบา"}
}
- "meta:Dacca"{
- ls{"เวลาธากา"}
- }
"meta:Davis"{
ls{"เวลาเดวิส"}
}
"meta:DumontDUrville"{
ls{"เวลาดูมองต์ดูร์วิลล์"}
}
- "meta:Dushanbe"{
- ld{"เวลาฤดูร้อนดูชานเบ"}
- lg{"เวลาดูชานเบ"}
- ls{"เวลามาตรฐานดูชานเบ"}
- }
- "meta:Dutch_Guiana"{
- ls{"เวลาของดัชต์กีอานา"}
- }
"meta:East_Timor"{
ls{"เวลาติมอร์ตะวันออก"}
}
@@ -1516,11 +1472,6 @@
"meta:French_Southern"{
ls{"เวลาเฟรนช์เซาเทิร์นและแอนตาร์กติก"}
}
- "meta:Frunze"{
- ld{"เวลาฤดูร้อนฟรุนซ์"}
- lg{"เวลาฟรุนซ์"}
- ls{"เวลามาตรฐานฟรุนซ์"}
- }
"meta:GMT"{
ls{"เวลามาตรฐานกรีนิช"}
}
@@ -1538,11 +1489,6 @@
"meta:Gilbert_Islands"{
ls{"เวลาหมู่เกาะกิลเบิร์ต"}
}
- "meta:Greenland_Central"{
- ld{"เวลาฤดูร้อนกรีนแลนด์กลาง"}
- lg{"เวลากรีนแลนด์กลาง"}
- ls{"เวลามาตรฐานกรีนแลนด์กลาง"}
- }
"meta:Greenland_Eastern"{
ld{"เวลาฤดูร้อนกรีนแลนด์ตะวันออก"}
lg{"เวลากรีนแลนด์ตะวันออก"}
@@ -1615,23 +1561,12 @@
lg{"เวลาคัมชัตคา"}
ls{"เวลาเปโตรปัฟลอฟสค์-คัมชัตสกี"}
}
- "meta:Karachi"{
- ls{"เวลาการาจี"}
- }
- "meta:Kashgar"{
- ls{"เวลาคัชการ์"}
- }
"meta:Kazakhstan_Eastern"{
ls{"เวลาคาซัคสถานตะวันออก"}
}
"meta:Kazakhstan_Western"{
ls{"เวลาคาซัคสถานตะวันตก"}
}
- "meta:Kizilorda"{
- ld{"เวลาฤดูร้อนคีซีลออร์ดา"}
- lg{"เวลาคีซีลออร์ดา"}
- ls{"เวลามาตรฐานคีซีลออร์ดา"}
- }
"meta:Korea"{
ld{"เวลาออมแสงเกาหลี"}
lg{"เวลาเกาหลี"}
@@ -1645,14 +1580,6 @@
lg{"เวลาครัสโนยาสค์"}
ls{"เวลามาตรฐานครัสโนยาสค์"}
}
- "meta:Kuybyshev"{
- ld{"เวลาฤดูร้อนของกุยบุสเฮฟ"}
- lg{"เวลากุยบุสเฮฟ"}
- ls{"เวลามาตรฐานกุยบุสเฮฟ"}
- }
- "meta:Kwajalein"{
- ls{"เวลาควาจาเลน"}
- }
"meta:Kyrgystan"{
ls{"เวลาคีร์กีซสถาน"}
}
@@ -1662,9 +1589,6 @@
"meta:Line_Islands"{
ls{"เวลาหมู่เกาะไลน์"}
}
- "meta:Long_Shu"{
- ls{"เวลาหลงซู"}
- }
"meta:Lord_Howe"{
ld{"เวลาออมแสงของลอร์ดโฮว์"}
lg{"เวลาลอร์ดโฮว"}
@@ -1683,9 +1607,6 @@
lg{"เวลามากาดาน"}
ls{"เวลามาตรฐานมากาดาน"}
}
- "meta:Malaya"{
- ls{"เวลามาลายา"}
- }
"meta:Malaysia"{
ls{"เวลามาเลเซีย"}
}
@@ -1816,22 +1737,14 @@
lg{"เวลาซามารา"}
ls{"เวลามาตรฐานซามารา"}
}
- "meta:Samarkand"{
- ld{"เวลาฤดูร้อนซามาร์คันด์"}
- lg{"เวลาซามาร์คันด์"}
- ls{"เวลามาตรฐานซามาร์คันด์"}
- }
"meta:Samoa"{
- ls{"เวลาซามัว"}
+ ld{"เวลาฤดูร้อนซามัว"}
+ lg{"เวลาซามัว"}
+ ls{"เวลามาตรฐานซามัว"}
}
"meta:Seychelles"{
ls{"เวลาเซเชลส์"}
}
- "meta:Shevchenko"{
- ld{"เวลาฤดูร้อนเชฟเชนโค"}
- lg{"เวลาเชฟเชนโค"}
- ls{"เวลามาตรฐานเชฟเชนโค"}
- }
"meta:Singapore"{
ls{"เวลาสิงคโปร์"}
}
@@ -1844,11 +1757,6 @@
"meta:Suriname"{
ls{"เวลาซูรินาเม"}
}
- "meta:Sverdlovsk"{
- ld{"เวลาฤดูร้อนสเวียร์ดลอฟสค์"}
- lg{"เวลาสเวียร์ดลอฟสค์"}
- ls{"เวลามาตรฐานสเวียร์ดลอฟสค์"}
- }
"meta:Tahiti"{
ls{"เวลาตาฮีตี"}
}
@@ -1860,16 +1768,6 @@
"meta:Tajikistan"{
ls{"เวลาทาจิกิสถาน"}
}
- "meta:Tashkent"{
- ld{"เวลาฤดูร้อนทาชเคนต์"}
- lg{"เวลาทาชเคนต์"}
- ls{"เวลามาตรฐานทาชเคนต์"}
- }
- "meta:Tbilisi"{
- ld{"เวลาฤดูร้อนทบิลิซิ"}
- lg{"เวลาทบิลิซิ"}
- ls{"เวลามาตรฐานทบิลิซิ"}
- }
"meta:Tokelau"{
ls{"เวลาโตเกเลา"}
}
@@ -1881,11 +1779,6 @@
"meta:Truk"{
ls{"เวลาชุก"}
}
- "meta:Turkey"{
- ld{"เวลาฤดูร้อนตุรกี"}
- lg{"เวลาตุรกี"}
- ls{"เวลามาตรฐานตุรกี"}
- }
"meta:Turkmenistan"{
ld{"เวลาฤดูร้อนเติร์กเมนิสถาน"}
lg{"เวลาเติร์กเมนิสถาน"}
@@ -1894,19 +1787,11 @@
"meta:Tuvalu"{
ls{"เวลาตูวาลู"}
}
- "meta:Uralsk"{
- ld{"เวลาฤดูร้อนอุรัลสก์"}
- lg{"เวลาอุรัลสก์"}
- ls{"เวลามาตรฐานอุรัลสก์"}
- }
"meta:Uruguay"{
ld{"เวลาฤดูร้อนอุรุกวัย"}
lg{"เวลาอุรุกวัย"}
ls{"เวลามาตรฐานอุรุกวัย"}
}
- "meta:Urumqi"{
- ls{"เวลาอุรุมชี"}
- }
"meta:Uzbekistan"{
ld{"เวลาฤดูร้อนอุซเบกิสถาน"}
lg{"เวลาอุซเบกิสถาน"}
@@ -1949,16 +1834,6 @@
lg{"เวลาเยกาเตรินบุร์ก"}
ls{"เวลามาตรฐานเยคาเทรินเบิร์ก"}
}
- "meta:Yerevan"{
- ld{"เวลาฤดูร้อนเยเรวาน"}
- lg{"เวลาเยเรวาน"}
- ls{"เวลามาตรฐานเยเรวาน"}
- }
- "meta:Yukon"{
- ld{"เวลาออมแสงของยูคอน"}
- lg{"เวลายูคอน"}
- ls{"เวลามาตรฐานยูคอน"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"เวลา {1} ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/th_TH.txt b/data/zone/th_TH.txt
index 94c4a72..9820811 100644
--- a/data/zone/th_TH.txt
+++ b/data/zone/th_TH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/th_TH_TRADITIONAL.txt b/data/zone/th_TH_TRADITIONAL.txt
index 9a5620e..37548cf 100644
--- a/data/zone/th_TH_TRADITIONAL.txt
+++ b/data/zone/th_TH_TRADITIONAL.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/ti.txt b/data/zone/ti.txt
index 97bb305..ff318b7 100644
--- a/data/zone/ti.txt
+++ b/data/zone/ti.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ti.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/ti.xml
*/
ti{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
zoneStrings{
gmtFormat{"GMT{0}"}
hourFormat{"+HH:mm;-HH:mm"}
diff --git a/data/zone/tl.txt b/data/zone/tl.txt
index 2a55f9a..85b090c 100755
--- a/data/zone/tl.txt
+++ b/data/zone/tl.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/tl_PH.txt b/data/zone/tl_PH.txt
index 52f1969..c788c54 100755
--- a/data/zone/tl_PH.txt
+++ b/data/zone/tl_PH.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/to.txt b/data/zone/to.txt
index 7fdec0b..88ef36a 100755
--- a/data/zone/to.txt
+++ b/data/zone/to.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/to.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/to.xml
*/
to{
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
zoneStrings{
"America:Anchorage"{
ec{"Houa Puleʻanga fakataha ʻAmelika (Anchorage)"}
@@ -76,7 +76,9 @@
ls{"houa fakaniuē"}
}
"meta:Samoa"{
- ls{"houa fakahaʻamoa"}
+ ld{"houa fakahaʻamoa fakamaama"}
+ lg{"houa fakahaʻamoa"}
+ ls{"houa fakahaʻamoa fakasīpinga"}
}
"meta:Tahiti"{
ls{"houa fakatahisi"}
diff --git a/data/zone/tr.txt b/data/zone/tr.txt
index 3ac8a5e..4a28470 100644
--- a/data/zone/tr.txt
+++ b/data/zone/tr.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/tr.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/tr.xml
*/
tr{
- Version{"2.0.79.79"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abican"}
@@ -449,21 +449,11 @@
lg{"Batı Afrika Saati"}
ls{"Batı Afrika Standart Saati"}
}
- "meta:Aktyubinsk"{
- ld{"Aktyubinsk Yaz Saati"}
- lg{"Aktyubinsk Saati"}
- ls{"Aktyubinsk Standart Saati"}
- }
"meta:Alaska"{
ld{"Alaska Yaz Saati"}
lg{"Alaska Saati"}
ls{"Alaska Standart Saati"}
}
- "meta:Alaska_Hawaii"{
- ld{"Alaska-Hawaii Yaz Saati"}
- lg{"Alaska-Hawaii Saati"}
- ls{"Alaska-Hawaii Standart Saati"}
- }
"meta:Almaty"{
ld{"Almatı Yaz Saati"}
lg{"Almatı Saati"}
@@ -529,11 +519,6 @@
lg{"Ermenistan Saati"}
ls{"Ermenistan Standart Saati"}
}
- "meta:Ashkhabad"{
- ld{"Aşkabat Yaz Saati"}
- lg{"Aşkabat Saati"}
- ls{"Aşkabat Standart Saati"}
- }
"meta:Atlantic"{
ld{"Atlantik Yaz Saati"}
lg{"Atlantik Saati"}
@@ -569,32 +554,17 @@
lg{"Azorlar Saati"}
ls{"Azorlar Standart Saati"}
}
- "meta:Baku"{
- ld{"Bakü Yaz Saati"}
- lg{"Bakü Saati"}
- ls{"Bakü Standart Saati"}
- }
"meta:Bangladesh"{
ld{"Bangladeş Yaz Saati"}
lg{"Bangladeş Saati"}
ls{"Bangladeş Standart Saati"}
}
- "meta:Bering"{
- ld{"Bering Yaz Saati"}
- lg{"Bering Saati"}
- ls{"Bering Standart Saati"}
- }
"meta:Bhutan"{
ls{"Bhutan Saati"}
}
"meta:Bolivia"{
ls{"Bolivya Saati"}
}
- "meta:Borneo"{
- ld{"Borneo Yaz Saati"}
- lg{"Borneo Saati"}
- ls{"Borneo Standart Saati"}
- }
"meta:Brasilia"{
ld{"Brasilia Yaz Saati"}
lg{"Brasilia Saati"}
@@ -614,9 +584,6 @@
"meta:Chamorro"{
ls{"Chamorro Saati"}
}
- "meta:Changbai"{
- ls{"Changbai Saati"}
- }
"meta:Chatham"{
ld{"Chatham Yaz Saati"}
lg{"Chatham Saati"}
@@ -658,23 +625,12 @@
lg{"Küba Saati"}
ls{"Küba Standart Saati"}
}
- "meta:Dacca"{
- ls{"Dakka Saati"}
- }
"meta:Davis"{
ls{"Davis Saati"}
}
"meta:DumontDUrville"{
ls{"Dumont-d’Urville Saati"}
}
- "meta:Dushanbe"{
- ld{"Duşanbe Yaz Saati"}
- lg{"Duşanbe Saati"}
- ls{"Duşanbe Standart Saati"}
- }
- "meta:Dutch_Guiana"{
- ls{"Hollanda Guyanası Saati"}
- }
"meta:East_Timor"{
ls{"Doğu Timor Saati"}
}
@@ -717,11 +673,6 @@
"meta:French_Southern"{
ls{"Fransız Güney ve Antarktika Saati"}
}
- "meta:Frunze"{
- ld{"Bişkek Yaz Saati"}
- lg{"Bişkek Saati"}
- ls{"Bişkek Standart Saati"}
- }
"meta:GMT"{
ls{"Greenwich Ortalama Saati"}
}
@@ -739,11 +690,6 @@
"meta:Gilbert_Islands"{
ls{"Gilbert Adaları Saati"}
}
- "meta:Greenland_Central"{
- ld{"Orta Grönland Yaz Saati"}
- lg{"Orta Grönland Saati"}
- ls{"Orta Grönland Standart Saati"}
- }
"meta:Greenland_Eastern"{
ld{"Doğu Grönland Yaz Saati"}
lg{"Doğu Grönland Saati"}
@@ -821,12 +767,6 @@
lg{"Petropavlovsk-Kamçatski Saati"}
ls{"Petropavlovsk-Kamçatski Standart Saati"}
}
- "meta:Karachi"{
- ls{"Karaçi Saati"}
- }
- "meta:Kashgar"{
- ls{"Kaşgar Saati"}
- }
"meta:Kazakhstan_Eastern"{
ls{"Doğu Kazakistan Saati"}
}
@@ -846,14 +786,6 @@
lg{"Krasnoyarsk Saati"}
ls{"Krasnoyarsk Standart Saati"}
}
- "meta:Kuybyshev"{
- ld{"Kuybişev Yaz Saati"}
- lg{"Kuybişev Saati"}
- ls{"Kuybişev Standart Saati"}
- }
- "meta:Kwajalein"{
- ls{"Kwajalein Saati"}
- }
"meta:Kyrgystan"{
ls{"Kırgızistan Saati"}
}
@@ -863,9 +795,6 @@
"meta:Line_Islands"{
ls{"Line Adaları Saati"}
}
- "meta:Long_Shu"{
- ls{"Long-Shu Saati"}
- }
"meta:Lord_Howe"{
ld{"Lord Howe Yaz Saati"}
lg{"Lord Howe Saati"}
@@ -884,9 +813,6 @@
lg{"Magadan Saati"}
ls{"Magadan Standart Saati"}
}
- "meta:Malaya"{
- ls{"Malaya Saati"}
- }
"meta:Malaysia"{
ls{"Malezya Saati"}
}
@@ -1026,22 +952,14 @@
lg{"Samara Saati"}
ls{"Samara Standart Saati"}
}
- "meta:Samarkand"{
- ld{"Semerkand Yaz Saati"}
- lg{"Semerkand Saati"}
- ls{"Semerkand Standart Saati"}
- }
"meta:Samoa"{
- ls{"Samoa Saati"}
+ ld{"Samoa Yaz Saati"}
+ lg{"Samoa Saati"}
+ ls{"Samoa Standart Saati"}
}
"meta:Seychelles"{
ls{"Seyşeller Saati"}
}
- "meta:Shevchenko"{
- ld{"Şevçenko Yaz Saati"}
- lg{"Şevçenko Saati"}
- ls{"Şevçenko Standart Saati"}
- }
"meta:Singapore"{
ls{"Singapur Saati"}
}
@@ -1054,11 +972,6 @@
"meta:Suriname"{
ls{"Surinam Saati"}
}
- "meta:Sverdlovsk"{
- ld{"Sverdlovsk Yaz Saati"}
- lg{"Sverdlovsk Saati"}
- ls{"Sverdlovsk Standart Saati"}
- }
"meta:Syowa"{
ls{"Showa Saati"}
}
@@ -1073,16 +986,6 @@
"meta:Tajikistan"{
ls{"Tacikistan Saati"}
}
- "meta:Tashkent"{
- ld{"Taşkent Yaz Saati"}
- lg{"Taşkent Saati"}
- ls{"Taşkent Standart Saati"}
- }
- "meta:Tbilisi"{
- ld{"Tiflis Yaz Saati"}
- lg{"Tiflis Saati"}
- ls{"Tiflis Standart Saati"}
- }
"meta:Tokelau"{
ls{"Tokelau Saati"}
}
@@ -1094,11 +997,6 @@
"meta:Truk"{
ls{"Chuuk Saati"}
}
- "meta:Turkey"{
- ld{"Türkiye Yaz Saati"}
- lg{"Türkiye Saati"}
- ls{"Türkiye Standart Saati"}
- }
"meta:Turkmenistan"{
ld{"Türkmenistan Yaz Saati"}
lg{"Türkmenistan Saati"}
@@ -1107,19 +1005,11 @@
"meta:Tuvalu"{
ls{"Tuvalu Saati"}
}
- "meta:Uralsk"{
- ld{"Oral Yaz Saati"}
- lg{"Oral Saati"}
- ls{"Oral Standart Saati"}
- }
"meta:Uruguay"{
ld{"Uruguay Yaz Saati"}
lg{"Uruguay Saati"}
ls{"Uruguay Standart Saati"}
}
- "meta:Urumqi"{
- ls{"Urumçi Saati"}
- }
"meta:Uzbekistan"{
ld{"Özbekistan Yaz Saati"}
lg{"Özbekistan Saati"}
@@ -1162,16 +1052,6 @@
lg{"Yekaterinburg Saati"}
ls{"Yekaterinburg Standart Saati"}
}
- "meta:Yerevan"{
- ld{"Erivan Yaz Saati"}
- lg{"Erivan Saati"}
- ls{"Erivan Standart Saati"}
- }
- "meta:Yukon"{
- ld{"Yukon Yaz Saati"}
- lg{"Yukon Saati"}
- ls{"Yukon Standart Saati"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"{1} Saati ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/twq.txt b/data/zone/twq.txt
index 7131bd3..8eb4e8b 100755
--- a/data/zone/twq.txt
+++ b/data/zone/twq.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/twq.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/twq.xml
*/
twq{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/tzm.txt b/data/zone/tzm.txt
index a8ab207..53b656d 100755
--- a/data/zone/tzm.txt
+++ b/data/zone/tzm.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/tzm.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/tzm.xml
*/
tzm{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/tzm_Latn.txt b/data/zone/tzm_Latn.txt
index 0bbb4b4..72fe963 100755
--- a/data/zone/tzm_Latn.txt
+++ b/data/zone/tzm_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/tzm_Latn.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/tzm_Latn.xml
*/
tzm_Latn{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/tzm_Latn_MA.txt b/data/zone/tzm_Latn_MA.txt
index 271f885..6465f27 100755
--- a/data/zone/tzm_Latn_MA.txt
+++ b/data/zone/tzm_Latn_MA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/tzm_MA.txt b/data/zone/tzm_MA.txt
index ebd194c..ee6f521 100755
--- a/data/zone/tzm_MA.txt
+++ b/data/zone/tzm_MA.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/uk.txt b/data/zone/uk.txt
index cc74811..8842f00 100644
--- a/data/zone/uk.txt
+++ b/data/zone/uk.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uk.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/uk.xml
*/
uk{
- Version{"2.0.78.38"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"Абіджан"}
@@ -1318,11 +1318,6 @@
lg{"Час: Австралія, західний"}
ls{"Час: Австралія, західний стандартний"}
}
- "meta:Baku"{
- ld{"Час: Баку, літній"}
- lg{"Час: Баку"}
- ls{"Час: Баку, стандартний"}
- }
"meta:Bolivia"{
ls{"Час: Болівія"}
}
@@ -1362,9 +1357,6 @@
lg{"за часом на островах Кука"}
ls{"за стандартним часом на островах Кука"}
}
- "meta:Dacca"{
- ls{"Час: Дака"}
- }
"meta:Davis"{
ls{"Час: Девіс"}
}
@@ -1465,9 +1457,6 @@
lg{"за камчатським часом"}
ls{"за камчатським стандартним часом"}
}
- "meta:Karachi"{
- ls{"Час: Карачі"}
- }
"meta:Kazakhstan_Eastern"{
ls{"Час: Казахстан, східний"}
}
@@ -1487,11 +1476,6 @@
lg{"за красноярським часом"}
ls{"за красноярським стандартним часом"}
}
- "meta:Kuybyshev"{
- ld{"за куйбишевським літнім часом"}
- lg{"за куйбишевським часом"}
- ls{"за куйбишевським стандартним часом"}
- }
"meta:Kyrgystan"{
ls{"Час: Киргизстан"}
}
@@ -1615,6 +1599,8 @@
ls{"за самарським стандартним часом"}
}
"meta:Samoa"{
+ ld{"за літнім часом на острові Самоа"}
+ lg{"за часом на острові Самоа"}
ls{"за стандартним часом на острові Самоа"}
}
"meta:Solomon"{
@@ -1623,9 +1609,6 @@
"meta:South_Georgia"{
ls{"за часом на острові Південна Джорджія"}
}
- "meta:Suriname"{
- ls{"Час: Суринам"}
- }
"meta:Tahiti"{
ls{"за часом на острові Таїті"}
}
@@ -1634,11 +1617,6 @@
lg{"Час: Тайбей"}
ls{"Час: Тайбей, стандартний"}
}
- "meta:Tbilisi"{
- ld{"Час: Тбілісі, літній"}
- lg{"Час: Тбілісі"}
- ls{"Час: Тбілісі, стандартний"}
- }
"meta:Tokelau"{
ls{"за часом на островах Токелау"}
}
@@ -1650,11 +1628,6 @@
"meta:Truk"{
ls{"за часом на островах Чуук"}
}
- "meta:Turkey"{
- ld{"за турецьким літнім часом"}
- lg{"за турецьким часом"}
- ls{"за турецьким стандартним часом"}
- }
"meta:Turkmenistan"{
ld{"Час: Туркменістан, літній"}
lg{"Час: Туркменістан"}
@@ -1710,11 +1683,6 @@
lg{"за єкатеринбурзьким часом"}
ls{"за єкатеринбурзьким стандартним часом"}
}
- "meta:Yerevan"{
- ld{"Час: Єреван, літній"}
- lg{"Час: Єреван"}
- ls{"Час: Єреван, стандартний"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"Час: {1} ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/ur.txt b/data/zone/ur.txt
index aa79e52..da6a3b8 100644
--- a/data/zone/ur.txt
+++ b/data/zone/ur.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/ur.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/ur.xml
*/
ur{
- Version{"2.0.78.39"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Abidjan"{
ec{"عابدجان"}
@@ -1708,6 +1708,8 @@
ls{"سمارا اسٹینڈرڈ ٹائم"}
}
"meta:Samoa"{
+ ld{"ساموآ سمر وقت"}
+ lg{"ساموآ وقت"}
ls{"ساموآ کا معیاری وقت"}
}
"meta:Seychelles"{
@@ -1722,9 +1724,6 @@
"meta:South_Georgia"{
ls{"جنوبی جارجیا کا وقت"}
}
- "meta:Suriname"{
- ls{"سورینام کا وقت"}
- }
"meta:Syowa"{
ls{"سیووا کا وقت"}
}
diff --git a/data/zone/uz.txt b/data/zone/uz.txt
index 26db50d..7ddf21d 100644
--- a/data/zone/uz.txt
+++ b/data/zone/uz.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/uz.xml
*/
uz{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/uz_AF.txt b/data/zone/uz_AF.txt
index 0010d89..5996fc9 100644
--- a/data/zone/uz_AF.txt
+++ b/data/zone/uz_AF.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/uz_Arab.txt b/data/zone/uz_Arab.txt
index 326a007..64b6a67 100644
--- a/data/zone/uz_Arab.txt
+++ b/data/zone/uz_Arab.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz_Arab.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/uz_Arab.xml
*/
uz_Arab{
- Version{"2.0.76.36"}
+ Version{"2.0.82.45"}
zoneStrings{
"Asia:Kabul"{
ec{"کابل"}
diff --git a/data/zone/uz_Arab_AF.txt b/data/zone/uz_Arab_AF.txt
index 972b280..9e5d31f 100644
--- a/data/zone/uz_Arab_AF.txt
+++ b/data/zone/uz_Arab_AF.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/uz_Cyrl.txt b/data/zone/uz_Cyrl.txt
index 4f1cc29..9f16779 100644
--- a/data/zone/uz_Cyrl.txt
+++ b/data/zone/uz_Cyrl.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz_Cyrl.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/uz_Cyrl.xml
*/
uz_Cyrl{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/uz_Cyrl_UZ.txt b/data/zone/uz_Cyrl_UZ.txt
index 0776fef..97d565c 100644
--- a/data/zone/uz_Cyrl_UZ.txt
+++ b/data/zone/uz_Cyrl_UZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/uz_Latn.txt b/data/zone/uz_Latn.txt
index 65a7f6e..5363f76 100644
--- a/data/zone/uz_Latn.txt
+++ b/data/zone/uz_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/uz_Latn.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/uz_Latn.xml
*/
uz_Latn{
- Version{"2.0.74.98"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/uz_UZ.txt b/data/zone/uz_UZ.txt
index a419389..35e0a7f 100644
--- a/data/zone/uz_UZ.txt
+++ b/data/zone/uz_UZ.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/vai.txt b/data/zone/vai.txt
index d42b6c9..c06ffa1 100755
--- a/data/zone/vai.txt
+++ b/data/zone/vai.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vai.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/vai.xml
*/
vai{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/vai_LR.txt b/data/zone/vai_LR.txt
index 9d1560d..403f4c0 100755
--- a/data/zone/vai_LR.txt
+++ b/data/zone/vai_LR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/vai_Latn.txt b/data/zone/vai_Latn.txt
index 57479e1..71135e0 100755
--- a/data/zone/vai_Latn.txt
+++ b/data/zone/vai_Latn.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vai_Latn.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/vai_Latn.xml
*/
vai_Latn{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/vai_Vaii.txt b/data/zone/vai_Vaii.txt
index a7f9e21..42c6a51 100755
--- a/data/zone/vai_Vaii.txt
+++ b/data/zone/vai_Vaii.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vai_Vaii.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/vai_Vaii.xml
*/
vai_Vaii{
- Version{"2.0.74.65"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/vai_Vaii_LR.txt b/data/zone/vai_Vaii_LR.txt
index edccde9..dd7fb4c 100755
--- a/data/zone/vai_Vaii_LR.txt
+++ b/data/zone/vai_Vaii_LR.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/vi.txt b/data/zone/vi.txt
index 397b531..b0ecd88 100644
--- a/data/zone/vi.txt
+++ b/data/zone/vi.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vi.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/vi.xml
*/
vi{
- Version{"2.0.78.30"}
+ Version{"2.0.82.57"}
zoneStrings{
"Africa:Asmera"{
ec{"Asmara"}
@@ -166,21 +166,11 @@
lg{"Giờ Tây Phi"}
ls{"Giờ Chuẩn Tây Phi"}
}
- "meta:Aktyubinsk"{
- ld{"Giờ Mùa Hè Aktyubinsk"}
- lg{"Giờ Aktyubinsk"}
- ls{"Giờ Chuẩn Aktyubinsk"}
- }
"meta:Alaska"{
ld{"Giờ Mùa Hè Alaska"}
lg{"Giờ Alaska"}
ls{"Giờ Chuẩn Alaska"}
}
- "meta:Alaska_Hawaii"{
- ld{"Giờ Mùa Hè Alaska-Hawaii"}
- lg{"Giờ Alaska-Hawaii"}
- ls{"Giờ Chuẩn Alaska-Hawaii"}
- }
"meta:Almaty"{
ld{"Giờ Mùa Hè Almaty"}
lg{"Giờ Almaty"}
@@ -246,11 +236,6 @@
lg{"Giờ Armenia"}
ls{"Giờ Chuẩn Armenia"}
}
- "meta:Ashkhabad"{
- ld{"Giờ Mùa Hè Ashkhabad"}
- lg{"Giờ Ashkhabad"}
- ls{"Giờ Chuẩn Ashkhabad"}
- }
"meta:Atlantic"{
ld{"Giờ Mùa hè Đại Tây Dương"}
lg{"Giờ Đại Tây Dương"}
@@ -286,32 +271,17 @@
lg{"Giờ Azores"}
ls{"Giờ Chuẩn Azores"}
}
- "meta:Baku"{
- ld{"Giờ Mùa Hè Baku"}
- lg{"Giờ Baku"}
- ls{"Giờ Chuẩn Baku"}
- }
"meta:Bangladesh"{
ld{"Giờ Mùa Hè Bangladesh"}
lg{"Giờ Bangladesh"}
ls{"Giờ Chuẩn Bangladesh"}
}
- "meta:Bering"{
- ld{"Giờ Mùa Hè Bering"}
- lg{"Giờ Bering"}
- ls{"Giờ Chuẩn Bering"}
- }
"meta:Bhutan"{
ls{"Giờ Bhutan"}
}
"meta:Bolivia"{
ls{"Giờ Bolivia"}
}
- "meta:Borneo"{
- ld{"Giờ Mùa Hè Borneo"}
- lg{"Giờ Borneo"}
- ls{"Giờ Chuẩn Borneo"}
- }
"meta:Brasilia"{
ld{"Giờ Mùa Hè Brasilia"}
lg{"Giờ Brasilia"}
@@ -328,9 +298,6 @@
"meta:Chamorro"{
ls{"Giờ Chamorro"}
}
- "meta:Changbai"{
- ls{"Giờ Changbai"}
- }
"meta:Chatham"{
ld{"Giờ Mùa Hè Chatham"}
lg{"Giờ Chatham"}
@@ -372,23 +339,12 @@
lg{"Giờ Cuba"}
ls{"Giờ Chuẩn Cuba"}
}
- "meta:Dacca"{
- ls{"Giờ Dacca"}
- }
"meta:Davis"{
ls{"Giờ Davis"}
}
"meta:DumontDUrville"{
ls{"Giờ Dumont-d'Urville"}
}
- "meta:Dushanbe"{
- ld{"Giờ Mùa Hè Dushanbe"}
- lg{"Giờ Dushanbe"}
- ls{"Giờ Chuẩn Dushanbe"}
- }
- "meta:Dutch_Guiana"{
- ls{"Giờ Guiana thuộc Hà Lan"}
- }
"meta:East_Timor"{
ls{"Giờ Đông Timor"}
}
@@ -431,11 +387,6 @@
"meta:French_Southern"{
ls{"Giờ Nam Cực và Nam Nước Pháp"}
}
- "meta:Frunze"{
- ld{"Giờ Mùa Hè Frunze"}
- lg{"Giờ Frunze"}
- ls{"Giờ Chuẩn Frunze"}
- }
"meta:GMT"{
ls{"Giờ Trung Bình Greenwich"}
}
@@ -453,11 +404,6 @@
"meta:Gilbert_Islands"{
ls{"Giờ Quần Đảo Gilbert"}
}
- "meta:Greenland_Central"{
- ld{"Giờ Mùa Hè Miền Trung Greenland"}
- lg{"Giờ Miền Trung Greenland"}
- ls{"Giờ Chuẩn Miền Trung Greenland"}
- }
"meta:Greenland_Eastern"{
ld{"Giờ Mùa Hè Miền Đông Greenland"}
lg{"Giờ Miền Đông Greenland"}
@@ -535,23 +481,12 @@
lg{"Giờ Petropavlovsk-Kamchatski"}
ls{"Giờ chuẩn Petropavlovsk-Kamchatski"}
}
- "meta:Karachi"{
- ls{"Giờ Karachi"}
- }
- "meta:Kashgar"{
- ls{"Giờ Kashgar"}
- }
"meta:Kazakhstan_Eastern"{
ls{"Giờ Miền Đông Kazakhstan"}
}
"meta:Kazakhstan_Western"{
ls{"Giờ Miền Tây Kazakhstan"}
}
- "meta:Kizilorda"{
- ld{"Giờ Mùa Hè Kizilorda"}
- lg{"Giờ Kizilorda"}
- ls{"Giờ Chuẩn Kizilorda"}
- }
"meta:Korea"{
ld{"Giờ Mùa Hè Hàn Quốc"}
lg{"Giờ Hàn Quốc"}
@@ -565,14 +500,6 @@
lg{"Giờ Krasnoyarsk"}
ls{"Giờ Chuẩn Krasnoyarsk"}
}
- "meta:Kuybyshev"{
- ld{"Giờ Mùa Hè Kuybyshev"}
- lg{"Giờ Kuybyshev"}
- ls{"Giờ Chuẩn Kuybyshev"}
- }
- "meta:Kwajalein"{
- ls{"Giờ Kwajalein"}
- }
"meta:Kyrgystan"{
ls{"Giờ Kyrgystan"}
}
@@ -582,9 +509,6 @@
"meta:Line_Islands"{
ls{"Giờ Quần Đảo Line"}
}
- "meta:Long_Shu"{
- ls{"Giờ Long-Shu"}
- }
"meta:Lord_Howe"{
ld{"Giờ Mùa Hè Lord Howe"}
lg{"Giờ Lord Howe"}
@@ -603,9 +527,6 @@
lg{"Giờ Magadan"}
ls{"Giờ Chuẩn Magadan"}
}
- "meta:Malaya"{
- ls{"Giờ Malaya"}
- }
"meta:Malaysia"{
ls{"Giờ Malaysia"}
}
@@ -742,22 +663,14 @@
lg{"Giờ Samara"}
ls{"Giờ Chuẩn Samara"}
}
- "meta:Samarkand"{
- ld{"Giờ Mùa Hè Samarkand"}
- lg{"Giờ Samarkand"}
- ls{"Giờ Chuẩn Samarkand"}
- }
"meta:Samoa"{
+ ld{"Giờ mùa hè Samoa"}
+ lg{"Giờ Samoa"}
ls{"Giờ Chuẩn Samoa"}
}
"meta:Seychelles"{
ls{"Giờ Seychelles"}
}
- "meta:Shevchenko"{
- ld{"Giờ Mùa Hè Shevchenko"}
- lg{"Giờ Shevchenko"}
- ls{"Giờ Chuẩn Shevchenko"}
- }
"meta:Singapore"{
ls{"Giờ Chuẩn Singapo"}
}
@@ -770,11 +683,6 @@
"meta:Suriname"{
ls{"Giờ Suriname"}
}
- "meta:Sverdlovsk"{
- ld{"Giờ Mùa Hè Sverdlovsk"}
- lg{"Giờ Sverdlovsk"}
- ls{"Giờ Chuẩn Sverdlovsk"}
- }
"meta:Syowa"{
ls{"Giờ Syowa"}
}
@@ -789,16 +697,6 @@
"meta:Tajikistan"{
ls{"Giờ Tajikistan"}
}
- "meta:Tashkent"{
- ld{"Giờ Mùa Hè Tashkent"}
- lg{"Giờ Tashkent"}
- ls{"Giờ Chuẩn Tashkent"}
- }
- "meta:Tbilisi"{
- ld{"Giờ Mùa Hè Tbilisi"}
- lg{"Giờ Tbilisi"}
- ls{"Giờ Chuẩn Tbilisi"}
- }
"meta:Tokelau"{
ls{"Giờ Tokelau"}
}
@@ -810,11 +708,6 @@
"meta:Truk"{
ls{"Giờ Chuuk"}
}
- "meta:Turkey"{
- ld{"Giờ Mùa Hè Thổ Nhĩ Kỳ"}
- lg{"Giờ Thổ Nhĩ Kỳ"}
- ls{"Giờ Chuẩn Thổ Nhĩ Kỳ"}
- }
"meta:Turkmenistan"{
ld{"Giờ Mùa Hè Turkmenistan"}
lg{"Giờ Turkmenistan"}
@@ -823,19 +716,11 @@
"meta:Tuvalu"{
ls{"Giờ Tuvalu"}
}
- "meta:Uralsk"{
- ld{"Giờ Mùa Hè Ural'sk"}
- lg{"Giờ Ural'sk"}
- ls{"Giờ Chuẩn Ural'sk"}
- }
"meta:Uruguay"{
ld{"Giờ Mùa Hè Uruguay"}
lg{"Giờ Uruguay"}
ls{"Giờ Chuẩn Uruguay"}
}
- "meta:Urumqi"{
- ls{"Giờ Urumqi"}
- }
"meta:Uzbekistan"{
ld{"Giờ Mùa Hè Uzbekistan"}
lg{"Giờ Uzbekistan"}
@@ -878,16 +763,6 @@
lg{"Giờ Yekaterinburg"}
ls{"Giờ Chuẩn Yekaterinburg"}
}
- "meta:Yerevan"{
- ld{"Giờ Mùa Hè Yerevan"}
- lg{"Giờ Yerevan"}
- ls{"Giờ Chuẩn Yerevan"}
- }
- "meta:Yukon"{
- ld{"Giờ Mùa Hè Yukon"}
- lg{"Giờ Yukon"}
- ls{"Giờ Chuẩn Yukon"}
- }
fallbackFormat{"{1} ({0})"}
fallbackRegionFormat{"Giờ {1} ({0})"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/vun.txt b/data/zone/vun.txt
index 9c01770..cf4ca1a 100755
--- a/data/zone/vun.txt
+++ b/data/zone/vun.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/vun.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/vun.xml
*/
vun{
- Version{"2.0.78.30"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/xog.txt b/data/zone/xog.txt
index c95b6bf..6667cd0 100755
--- a/data/zone/xog.txt
+++ b/data/zone/xog.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/xog.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/xog.xml
*/
xog{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/yav.txt b/data/zone/yav.txt
index 887a620..0cd9468 100755
--- a/data/zone/yav.txt
+++ b/data/zone/yav.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/yav.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/yav.xml
*/
yav{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/yo.txt b/data/zone/yo.txt
index 561b418..3667c43 100755
--- a/data/zone/yo.txt
+++ b/data/zone/yo.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/yo.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/yo.xml
*/
yo{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/zh.txt b/data/zone/zh.txt
index 77bbf63..8c3f986 100644
--- a/data/zone/zh.txt
+++ b/data/zone/zh.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/zh.xml
*/
zh{
- Version{"2.0.78.39"}
+ Version{"2.0.82.60"}
zoneStrings{
"Africa:Abidjan"{
ec{"阿比让"}
@@ -806,6 +806,12 @@
}
"Asia:Taipei"{
ec{"台北"}
+ ld{"台北夏令时间"}
+ lg{"台北时间"}
+ ls{"台北标准时间"}
+ sd{"台北"}
+ sg{"台北"}
+ ss{"台北"}
}
"Asia:Tashkent"{
ec{"塔什干"}
@@ -1248,21 +1254,11 @@
lg{"西部非洲时间"}
ls{"西部非洲标准时间"}
}
- "meta:Aktyubinsk"{
- ld{"阿克纠宾斯克夏令时间"}
- lg{"阿克纠宾斯克时间"}
- ls{"阿克纠宾斯克标准时间"}
- }
"meta:Alaska"{
ld{"阿拉斯加夏令时间"}
lg{"阿拉斯加时间"}
ls{"阿拉斯加标准时间"}
}
- "meta:Alaska_Hawaii"{
- ld{"阿拉斯加－夏威夷夏令时间"}
- lg{"阿拉斯加－夏威夷时间"}
- ls{"阿拉斯加－夏威夷标准时间"}
- }
"meta:Almaty"{
ld{"阿拉木图夏令时间"}
lg{"阿拉木图时间"}
@@ -1328,11 +1324,6 @@
lg{"亚美尼亚时间"}
ls{"亚美尼亚标准时间"}
}
- "meta:Ashkhabad"{
- ld{"阿什哈巴德夏令时间"}
- lg{"阿什哈巴德时间"}
- ls{"阿什哈巴德标准时间"}
- }
"meta:Atlantic"{
ld{"大西洋夏令时间"}
lg{"大西洋时间"}
@@ -1368,32 +1359,17 @@
lg{"亚速尔群岛时间"}
ls{"亚速尔群岛标准时间"}
}
- "meta:Baku"{
- ld{"巴库夏令时间"}
- lg{"巴库时间"}
- ls{"巴库标准时间"}
- }
"meta:Bangladesh"{
ld{"孟加拉夏令时间"}
lg{"孟加拉时间"}
ls{"孟加拉标准时间"}
}
- "meta:Bering"{
- ld{"白令夏令时间"}
- lg{"白令时间"}
- ls{"白令标准时间"}
- }
"meta:Bhutan"{
ls{"不丹时间"}
}
"meta:Bolivia"{
ls{"玻利维亚时间"}
}
- "meta:Borneo"{
- ld{"婆罗洲夏令时间"}
- lg{"婆罗洲时间"}
- ls{"婆罗洲标准时间"}
- }
"meta:Brasilia"{
ld{"巴西利亚夏令时间"}
lg{"巴西利亚时间"}
@@ -1413,9 +1389,6 @@
"meta:Chamorro"{
ls{"查莫罗时间"}
}
- "meta:Changbai"{
- ls{"长白山时间"}
- }
"meta:Chatham"{
ld{"查坦夏令时间"}
lg{"查坦时间"}
@@ -1457,23 +1430,12 @@
lg{"古巴时间"}
ls{"古巴标准时间"}
}
- "meta:Dacca"{
- ls{"达卡时间"}
- }
"meta:Davis"{
ls{"戴维斯时间"}
}
"meta:DumontDUrville"{
ls{"迪蒙迪尔维尔时间"}
}
- "meta:Dushanbe"{
- ld{"杜尚别夏令时间"}
- lg{"杜尚别时间"}
- ls{"杜尚别标准时间"}
- }
- "meta:Dutch_Guiana"{
- ls{"荷属圭亚那时间"}
- }
"meta:East_Timor"{
ls{"东帝汶时间"}
}
@@ -1516,11 +1478,6 @@
"meta:French_Southern"{
ls{"法属南方和南极领地时间"}
}
- "meta:Frunze"{
- ld{"伏龙芝夏令时间"}
- lg{"伏龙芝时间"}
- ls{"伏龙芝标准时间"}
- }
"meta:GMT"{
ls{"格林尼治标准时间"}
}
@@ -1538,11 +1495,6 @@
"meta:Gilbert_Islands"{
ls{"吉尔伯特群岛时间"}
}
- "meta:Greenland_Central"{
- ld{"格陵兰岛中部夏令时间"}
- lg{"格陵兰岛中部时间"}
- ls{"格陵兰岛中部标准时间"}
- }
"meta:Greenland_Eastern"{
ld{"格陵兰岛东部夏令时间"}
lg{"格陵兰岛东部时间"}
@@ -1620,12 +1572,6 @@
lg{"彼得罗巴甫洛夫斯克-堪察加时间"}
ls{"彼得罗巴甫洛夫斯克-堪察加标准时间"}
}
- "meta:Karachi"{
- ls{"卡拉奇时间"}
- }
- "meta:Kashgar"{
- ls{"喀什时间"}
- }
"meta:Kazakhstan_Eastern"{
ls{"哈萨克斯坦东部时间"}
}
@@ -1645,14 +1591,6 @@
lg{"克拉斯诺亚尔斯克时间"}
ls{"克拉斯诺亚尔斯克标准时间"}
}
- "meta:Kuybyshev"{
- ld{"古比雪夫夏令时间"}
- lg{"古比雪夫时间"}
- ls{"古比雪夫标准时间"}
- }
- "meta:Kwajalein"{
- ls{"夸贾林时间"}
- }
"meta:Kyrgystan"{
ls{"吉尔吉斯斯坦时间"}
}
@@ -1662,9 +1600,6 @@
"meta:Line_Islands"{
ls{"莱恩群岛时间"}
}
- "meta:Long_Shu"{
- ls{"陇蜀时间"}
- }
"meta:Lord_Howe"{
ld{"豪勋爵岛夏令时间"}
lg{"豪勋爵岛时间"}
@@ -1683,9 +1618,6 @@
lg{"马加丹时间"}
ls{"马加丹标准时间"}
}
- "meta:Malaya"{
- ls{"马来亚时间"}
- }
"meta:Malaysia"{
ls{"马来西亚时间"}
}
@@ -1825,22 +1757,14 @@
lg{"萨马拉时间"}
ls{"萨马拉标准时间"}
}
- "meta:Samarkand"{
- ld{"撒马尔罕夏令时间"}
- lg{"撒马尔罕时间"}
- ls{"撒马尔罕标准时间"}
- }
"meta:Samoa"{
- ls{"萨摩亚时间"}
+ ld{"萨摩亚夏令时间"}
+ lg{"萨摩亚时间"}
+ ls{"萨摩亚标准时间"}
}
"meta:Seychelles"{
ls{"塞舌尔时间"}
}
- "meta:Shevchenko"{
- ld{"舍甫琴科夏令时间"}
- lg{"舍甫琴科时间"}
- ls{"舍甫琴科标准时间"}
- }
"meta:Singapore"{
ls{"新加坡时间"}
}
@@ -1853,11 +1777,6 @@
"meta:Suriname"{
ls{"苏里南时间"}
}
- "meta:Sverdlovsk"{
- ld{"斯维尔德洛夫斯克夏令时间"}
- lg{"斯维尔德洛夫斯克时间"}
- ls{"斯维尔德洛夫斯克标准时间"}
- }
"meta:Syowa"{
ls{"昭和时间"}
}
@@ -1872,16 +1791,6 @@
"meta:Tajikistan"{
ls{"塔吉克斯坦时间"}
}
- "meta:Tashkent"{
- ld{"塔什干夏令时间"}
- lg{"塔什干时间"}
- ls{"塔什干标准时间"}
- }
- "meta:Tbilisi"{
- ld{"第比利斯夏令时间"}
- lg{"第比利斯时间"}
- ls{"第比利斯标准时间"}
- }
"meta:Tokelau"{
ls{"托克劳时间"}
}
@@ -1893,11 +1802,6 @@
"meta:Truk"{
ls{"楚克时间"}
}
- "meta:Turkey"{
- ld{"土耳其夏令时间"}
- lg{"土耳其时间"}
- ls{"土耳其标准时间"}
- }
"meta:Turkmenistan"{
ld{"土库曼斯坦夏令时间"}
lg{"土库曼斯坦时间"}
@@ -1906,19 +1810,11 @@
"meta:Tuvalu"{
ls{"图瓦卢时间"}
}
- "meta:Uralsk"{
- ld{"乌拉尔斯克夏令时间"}
- lg{"乌拉尔斯克时间"}
- ls{"乌拉尔斯克标准时间"}
- }
"meta:Uruguay"{
ld{"乌拉圭夏令时间"}
lg{"乌拉圭时间"}
ls{"乌拉圭标准时间"}
}
- "meta:Urumqi"{
- ls{"乌鲁木齐时间"}
- }
"meta:Uzbekistan"{
ld{"乌兹别克斯坦夏令时间"}
lg{"乌兹别克斯坦时间"}
@@ -1961,16 +1857,6 @@
lg{"叶卡捷琳堡时间"}
ls{"叶卡捷琳堡标准时间"}
}
- "meta:Yerevan"{
- ld{"埃里温夏令时间"}
- lg{"埃里温时间"}
- ls{"埃里温标准时间"}
- }
- "meta:Yukon"{
- ld{"育空夏令时间"}
- lg{"育空时间"}
- ls{"育空标准时间"}
- }
fallbackFormat{"{1}（{0}）"}
fallbackRegionFormat{"{1}时间（{0}）"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/zh_CN.txt b/data/zone/zh_CN.txt
index 348f06e..28103b9 100644
--- a/data/zone/zh_CN.txt
+++ b/data/zone/zh_CN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/zh_HK.txt b/data/zone/zh_HK.txt
index 8e03c71..67efd92 100644
--- a/data/zone/zh_HK.txt
+++ b/data/zone/zh_HK.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/zh_Hans.txt b/data/zone/zh_Hans.txt
index e8cbcd7..1542b90 100644
--- a/data/zone/zh_Hans.txt
+++ b/data/zone/zh_Hans.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans.xml
// *
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/zh_Hans.xml
*/
zh_Hans{
- Version{"2.0.41.23"}
+ Version{"2.0.82.45"}
}
diff --git a/data/zone/zh_Hans_CN.txt b/data/zone/zh_Hans_CN.txt
index c4f5185..6e6723b 100644
--- a/data/zone/zh_Hans_CN.txt
+++ b/data/zone/zh_Hans_CN.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/zh_Hans_HK.txt b/data/zone/zh_Hans_HK.txt
index 14bba8f..62bfa9a 100755
--- a/data/zone/zh_Hans_HK.txt
+++ b/data/zone/zh_Hans_HK.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans_HK.xml
// *
// ***************************************************************************
zh_Hans_HK{
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
zoneStrings{
"America:Danmarkshavn"{
ec{"丹马克沙伏"}
@@ -45,11 +45,6 @@
"meta:Gilbert_Islands"{
ls{"吉尔柏特群岛时间"}
}
- "meta:Kizilorda"{
- ld{"克孜勒奥尔达夏令时间"}
- lg{"克孜勒奥尔达时间"}
- ls{"克孜勒奥尔达标准时间"}
- }
"meta:Phoenix_Islands"{
ls{"凤凰岛时间"}
}
diff --git a/data/zone/zh_Hans_MO.txt b/data/zone/zh_Hans_MO.txt
index ba26992..c648e1f 100755
--- a/data/zone/zh_Hans_MO.txt
+++ b/data/zone/zh_Hans_MO.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans_MO.xml
// *
// ***************************************************************************
zh_Hans_MO{
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
zoneStrings{
"America:Grand_Turk"{
ec{"大特克"}
@@ -45,11 +45,6 @@
"meta:Gilbert_Islands"{
ls{"吉尔柏特群岛时间"}
}
- "meta:Kizilorda"{
- ld{"克孜勒奥尔达夏令时间"}
- lg{"克孜勒奥尔达时间"}
- ls{"克孜勒奥尔达标准时间"}
- }
"meta:Phoenix_Islands"{
ls{"凤凰岛时间"}
}
diff --git a/data/zone/zh_Hans_SG.txt b/data/zone/zh_Hans_SG.txt
index b434104..73f8d58 100644
--- a/data/zone/zh_Hans_SG.txt
+++ b/data/zone/zh_Hans_SG.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hans_SG.xml
// *
// ***************************************************************************
zh_Hans_SG{
- Version{"2.0.78.47"}
+ Version{"2.0.82.45"}
zoneStrings{
"America:Grand_Turk"{
ec{"大特克"}
@@ -51,11 +51,6 @@
"meta:Gilbert_Islands"{
ls{"吉尔柏特群岛时间"}
}
- "meta:Kizilorda"{
- ld{"克孜勒奥尔达夏令时间"}
- lg{"克孜勒奥尔达时间"}
- ls{"克孜勒奥尔达标准时间"}
- }
"meta:Phoenix_Islands"{
ls{"凤凰岛时间"}
}
diff --git a/data/zone/zh_Hant.txt b/data/zone/zh_Hant.txt
index 8ae3417..cdf0fa1 100644
--- a/data/zone/zh_Hant.txt
+++ b/data/zone/zh_Hant.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hant.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/zh_Hant.xml
*/
zh_Hant{
- Version{"2.0.78.39"}
+ Version{"2.0.82.57"}
zoneStrings{
"Africa:Abidjan"{
ec{"阿必尚"}
@@ -806,6 +806,12 @@
}
"Asia:Taipei"{
ec{"台北"}
+ ld{"台北夏令時間"}
+ lg{"台北時間"}
+ ls{"台北標準時間"}
+ sd{"台北"}
+ sg{"台北"}
+ ss{"台北"}
}
"Asia:Tashkent"{
ec{"塔什干"}
@@ -909,9 +915,6 @@
"Australia:Sydney"{
ec{"雪梨"}
}
- "Etc:GMT"{
- ec{"格林威治標準時間"}
- }
"Etc:Unknown"{
ec{"未知地區"}
}
@@ -1251,21 +1254,11 @@
lg{"西非時間"}
ls{"西非標準時間"}
}
- "meta:Aktyubinsk"{
- ld{"阿克秋賓斯克夏令時間"}
- lg{"阿克秋賓斯克時間"}
- ls{"阿克秋賓斯克標準時間"}
- }
"meta:Alaska"{
ld{"阿拉斯加夏令時間"}
lg{"阿拉斯加時間"}
ls{"阿拉斯加標準時間"}
}
- "meta:Alaska_Hawaii"{
- ld{"阿拉斯加-夏威夷夏令時間"}
- lg{"阿拉斯加-夏威夷時間"}
- ls{"阿拉斯加-夏威夷標準時間"}
- }
"meta:Almaty"{
ld{"阿拉木圖夏令時間"}
lg{"阿拉木圖時間"}
@@ -1331,11 +1324,6 @@
lg{"亞美尼亞時間"}
ls{"亞美尼亞標準時間"}
}
- "meta:Ashkhabad"{
- ld{"阿什哈巴德夏令時間"}
- lg{"阿什哈巴德時間"}
- ls{"阿什哈巴德標準時間"}
- }
"meta:Atlantic"{
ld{"大西洋夏令時間"}
lg{"大西洋時間"}
@@ -1371,32 +1359,17 @@
lg{"亞速爾群島時間"}
ls{"亞速爾群島標準時間"}
}
- "meta:Baku"{
- ld{"巴庫夏令時間"}
- lg{"巴庫時間"}
- ls{"巴庫標準時間"}
- }
"meta:Bangladesh"{
ld{"孟加拉夏令時間"}
lg{"孟加拉時間"}
ls{"孟加拉標準時間"}
}
- "meta:Bering"{
- ld{"白令夏令時間"}
- lg{"白令時間"}
- ls{"白令標準時間"}
- }
"meta:Bhutan"{
ls{"不丹時間"}
}
"meta:Bolivia"{
ls{"玻利維亞時間"}
}
- "meta:Borneo"{
- ld{"婆羅洲夏令時間"}
- lg{"婆羅洲時間"}
- ls{"婆羅洲標準時間"}
- }
"meta:Brasilia"{
ld{"巴西利亞夏令時間"}
lg{"巴西利亞時間"}
@@ -1416,9 +1389,6 @@
"meta:Chamorro"{
ls{"查莫洛時間"}
}
- "meta:Changbai"{
- ls{"長白山時間"}
- }
"meta:Chatham"{
ld{"查坦群島夏令時間"}
lg{"查坦群島時間"}
@@ -1460,23 +1430,12 @@
lg{"古巴時間"}
ls{"古巴標準時間"}
}
- "meta:Dacca"{
- ls{"達卡時間"}
- }
"meta:Davis"{
ls{"戴維斯時間"}
}
"meta:DumontDUrville"{
ls{"杜蒙杜比爾時間"}
}
- "meta:Dushanbe"{
- ld{"杜尚別夏令時間"}
- lg{"杜尚別時間"}
- ls{"杜尚別標準時間"}
- }
- "meta:Dutch_Guiana"{
- ls{"荷屬圭亞那時間"}
- }
"meta:East_Timor"{
ls{"東帝汶時間"}
}
@@ -1519,11 +1478,6 @@
"meta:French_Southern"{
ls{"法國南方及南極時間"}
}
- "meta:Frunze"{
- ld{"伏龍芝夏令時間"}
- lg{"伏龍芝時間"}
- ls{"伏龍芝標準時間"}
- }
"meta:GMT"{
ls{"格林威治標準時間"}
}
@@ -1541,11 +1495,6 @@
"meta:Gilbert_Islands"{
ls{"吉爾伯特群島時間"}
}
- "meta:Greenland_Central"{
- ld{"格陵蘭中部夏令時間"}
- lg{"格陵蘭中部時間"}
- ls{"格陵蘭中部標準時間"}
- }
"meta:Greenland_Eastern"{
ld{"格陵蘭東部夏令時間"}
lg{"格陵蘭東部時間"}
@@ -1623,23 +1572,12 @@
lg{"彼得羅巴甫洛夫斯克時間"}
ls{"彼得羅巴甫洛夫斯克標準時間"}
}
- "meta:Karachi"{
- ls{"喀拉蚩時間"}
- }
- "meta:Kashgar"{
- ls{"喀什時間"}
- }
"meta:Kazakhstan_Eastern"{
ls{"東哈薩克時間"}
}
"meta:Kazakhstan_Western"{
ls{"西哈薩克時間"}
}
- "meta:Kizilorda"{
- ld{"吉力羅達夏令時間"}
- lg{"吉力羅達時間"}
- ls{"吉力羅達標準時間"}
- }
"meta:Korea"{
ld{"韓國夏令時間"}
lg{"韓國時間"}
@@ -1653,14 +1591,6 @@
lg{"克拉斯諾亞爾斯克時間"}
ls{"克拉斯諾亞爾斯克標準時間"}
}
- "meta:Kuybyshev"{
- ld{"古比雪夫夏令時間"}
- lg{"古比雪夫時間"}
- ls{"古比雪夫標準時間"}
- }
- "meta:Kwajalein"{
- ls{"瓜加林環礁時間"}
- }
"meta:Kyrgystan"{
ls{"吉爾吉斯時間"}
}
@@ -1670,9 +1600,6 @@
"meta:Line_Islands"{
ls{"萊恩群島時間"}
}
- "meta:Long_Shu"{
- ls{"隴蜀時間"}
- }
"meta:Lord_Howe"{
ld{"豪勳爵島夏令時間"}
lg{"豪勳爵島時間"}
@@ -1691,9 +1618,6 @@
lg{"馬加丹時間"}
ls{"馬加丹標準時間"}
}
- "meta:Malaya"{
- ls{"馬來亞時間"}
- }
"meta:Malaysia"{
ls{"馬來西亞時間"}
}
@@ -1833,22 +1757,14 @@
lg{"薩馬拉時間"}
ls{"薩馬拉標準時間"}
}
- "meta:Samarkand"{
- ld{"撒馬爾罕夏令時間"}
- lg{"撒馬爾罕時間"}
- ls{"撒馬爾罕標準時間"}
- }
"meta:Samoa"{
+ ld{"薩摩亞夏令時間"}
+ lg{"薩摩亞時間"}
ls{"薩摩亞標準時間"}
}
"meta:Seychelles"{
ls{"塞席爾時間"}
}
- "meta:Shevchenko"{
- ld{"舍甫琴科夏令時間"}
- lg{"舍甫琴科時間"}
- ls{"舍甫琴科標準時間"}
- }
"meta:Singapore"{
ls{"新加坡標準時間"}
}
@@ -1861,11 +1777,6 @@
"meta:Suriname"{
ls{"蘇利南時間"}
}
- "meta:Sverdlovsk"{
- ld{"斯維爾德洛夫斯克夏令時間"}
- lg{"斯維爾德洛夫斯克時間"}
- ls{"斯維爾德洛夫斯克標準時間"}
- }
"meta:Syowa"{
ls{"昭和站時間"}
}
@@ -1880,16 +1791,6 @@
"meta:Tajikistan"{
ls{"塔吉克時間"}
}
- "meta:Tashkent"{
- ld{"塔什干夏令時間"}
- lg{"塔什干時間"}
- ls{"塔什干標準時間"}
- }
- "meta:Tbilisi"{
- ld{"第比利斯夏令時間"}
- lg{"第比利斯時間"}
- ls{"第比利斯標準時間"}
- }
"meta:Tokelau"{
ls{"托克勞群島時間"}
}
@@ -1901,11 +1802,6 @@
"meta:Truk"{
ls{"楚克島時間"}
}
- "meta:Turkey"{
- ld{"土耳其夏令時間"}
- lg{"土耳其時間"}
- ls{"土耳其標準時間"}
- }
"meta:Turkmenistan"{
ld{"土庫曼夏令時間"}
lg{"土庫曼時間"}
@@ -1914,19 +1810,11 @@
"meta:Tuvalu"{
ls{"吐瓦魯時間"}
}
- "meta:Uralsk"{
- ld{"烏拉斯克夏令時間"}
- lg{"烏拉斯克時間"}
- ls{"烏拉斯克標準時間"}
- }
"meta:Uruguay"{
ld{"烏拉圭夏令時間"}
lg{"烏拉圭時間"}
ls{"烏拉圭標準時間"}
}
- "meta:Urumqi"{
- ls{"烏魯木齊時間"}
- }
"meta:Uzbekistan"{
ld{"烏茲別克夏令時間"}
lg{"烏茲別克時間"}
@@ -1969,16 +1857,6 @@
lg{"葉卡捷琳堡時間"}
ls{"葉卡捷琳堡標準時間"}
}
- "meta:Yerevan"{
- ld{"葉里溫夏令時間"}
- lg{"葉里溫時間"}
- ls{"葉里溫標準時間"}
- }
- "meta:Yukon"{
- ld{"育空夏令時間"}
- lg{"育空時間"}
- ls{"育空標準時間"}
- }
fallbackFormat{"{1}（{0}）"}
fallbackRegionFormat{"{1}時間（{0}）"}
gmtFormat{"GMT{0}"}
diff --git a/data/zone/zh_Hant_HK.txt b/data/zone/zh_Hant_HK.txt
index cbaf8bf..8baddbb 100644
--- a/data/zone/zh_Hant_HK.txt
+++ b/data/zone/zh_Hant_HK.txt
@@ -1,13 +1,13 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zh_Hant_HK.xml
// *
// ***************************************************************************
zh_Hant_HK{
- Version{"2.0.78.47"}
+ Version{"2.0.82.47"}
zoneStrings{
"Africa:Abidjan"{
ec{"阿比贊"}
diff --git a/data/zone/zh_Hant_MO.txt b/data/zone/zh_Hant_MO.txt
index 686610b..08cadc7 100644
--- a/data/zone/zh_Hant_MO.txt
+++ b/data/zone/zh_Hant_MO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/zh_Hant_TW.txt b/data/zone/zh_Hant_TW.txt
index 659b708..99d5a6f 100644
--- a/data/zone/zh_Hant_TW.txt
+++ b/data/zone/zh_Hant_TW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/zh_MO.txt b/data/zone/zh_MO.txt
index 7a340a7..0492740 100644
--- a/data/zone/zh_MO.txt
+++ b/data/zone/zh_MO.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/zh_SG.txt b/data/zone/zh_SG.txt
index e5b7c41..4ebb462 100644
--- a/data/zone/zh_SG.txt
+++ b/data/zone/zh_SG.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/zh_TW.txt b/data/zone/zh_TW.txt
index 5957fe3..dc597d3 100644
--- a/data/zone/zh_TW.txt
+++ b/data/zone/zh_TW.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
+// * Copyright (C) 2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/icu-config.xml & build.xml
diff --git a/data/zone/zu.txt b/data/zone/zu.txt
index 73476c2..4d37019 100644
--- a/data/zone/zu.txt
+++ b/data/zone/zu.txt
@@ -1,7 +1,7 @@
// ***************************************************************************
// *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others. All Rights Reserved.
+// * Copyright (C) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/common/main/zu.xml
// *
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/zu.xml
*/
zu{
- Version{"2.0.77.46"}
+ Version{"2.0.82.45"}
zoneStrings{
"Africa:Sao_Tome"{
ec{"I-São Tomé"}
@@ -517,6 +517,8 @@
ls{"esase-Samara Standard Time"}
}
"meta:Samoa"{
+ ld{"Isikhathi sehlobo sase-Samoa"}
+ lg{"Isikhathi sase-Samoa"}
ls{"Isikhathi esivamile sase-Samoa"}
}
"meta:Seychelles"{
diff --git a/extra/uconv/uconv.cpp b/extra/uconv/uconv.cpp
index aaa0ab8..5668265 100644
--- a/extra/uconv/uconv.cpp
+++ b/extra/uconv/uconv.cpp
@@ -1,6 +1,6 @@
/*****************************************************************************
*
-* Copyright (C) 1999-2012, International Business Machines
+* Copyright (C) 1999-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************/
@@ -89,7 +89,7 @@
ps = 1;
/* Set up our static data - if any */
-#ifdef UCONVMSG_LINK
+#if defined(UCONVMSG_LINK) && U_PLATFORM != U_PF_OS390 /* On z/OS, this is failing. */
udata_setAppData(UCONVMSG, (const void*) uconvmsg_dat, &err);
if (U_FAILURE(err)) {
fprintf(stderr, "%s: warning, problem installing our static resource bundle data uconvmsg: %s - trying anyways.\n",
diff --git a/i18n/Android.mk b/i18n/Android.mk
index a7bf5b4..34c0118 100644
--- a/i18n/Android.mk
+++ b/i18n/Android.mk
@@ -33,16 +33,19 @@
anytrans.cpp astro.cpp buddhcal.cpp \
basictz.cpp calendar.cpp casetrn.cpp \
choicfmt.cpp coleitr.cpp coll.cpp \
+ compactdecimalformat.cpp \
cpdtrans.cpp csdetect.cpp csmatch.cpp \
csr2022.cpp csrecog.cpp csrmbcs.cpp \
csrsbcs.cpp csrucode.cpp csrutf8.cpp \
curramt.cpp currfmt.cpp currunit.cpp \
+ dangical.cpp \
datefmt.cpp dcfmtsym.cpp decimfmt.cpp \
digitlst.cpp dtfmtsym.cpp esctrn.cpp \
fmtable_cnv.cpp fmtable.cpp format.cpp \
funcrepl.cpp gender.cpp \
gregocal.cpp gregoimp.cpp \
- hebrwcal.cpp inputext.cpp islamcal.cpp \
+ hebrwcal.cpp identifier_info.cpp \
+ inputext.cpp islamcal.cpp \
japancal.cpp measfmt.cpp measure.cpp \
msgfmt.cpp name2uni.cpp nfrs.cpp \
nfrule.cpp nfsubs.cpp nortrans.cpp \
@@ -50,8 +53,9 @@
quant.cpp rbnf.cpp rbt.cpp \
rbt_data.cpp rbt_pars.cpp rbt_rule.cpp \
rbt_set.cpp regexcmp.cpp regexst.cpp \
- regeximp.cpp \
+ regeximp.cpp region.cpp \
rematch.cpp remtrans.cpp repattrn.cpp \
+ scriptset.cpp \
search.cpp simpletz.cpp smpdtfmt.cpp \
sortkey.cpp strmatch.cpp strrepl.cpp \
stsearch.cpp tblcoll.cpp timezone.cpp \
@@ -70,7 +74,6 @@
brktrans.cpp wintzimpl.cpp plurrule.cpp \
plurfmt.cpp dtitvfmt.cpp dtitvinf.cpp \
tmunit.cpp tmutamt.cpp tmutfmt.cpp \
- colldata.cpp bmsearch.cpp bms.cpp \
currpinf.cpp uspoof.cpp uspoof_impl.cpp \
uspoof_build.cpp \
regextxt.cpp selfmt.cpp uspoof_conf.cpp \
diff --git a/i18n/Makefile.in b/i18n/Makefile.in
index 6ea83dc..d19e770 100644
--- a/i18n/Makefile.in
+++ b/i18n/Makefile.in
@@ -1,6 +1,6 @@
#******************************************************************************
#
-# Copyright (C) 1998-2012, International Business Machines
+# Copyright (C) 1998-2013, International Business Machines
# Corporation and others. All Rights Reserved.
#
#******************************************************************************
@@ -69,7 +69,7 @@
nfrs.o nfrule.o nfsubs.o rbnf.o numsys.o ucsdet.o \
ucal.o calendar.o gregocal.o timezone.o simpletz.o olsontz.o \
astro.o taiwncal.o buddhcal.o persncal.o islamcal.o japancal.o gregoimp.o hebrwcal.o \
-indiancal.o chnsecal.o cecal.o coptccal.o ethpccal.o \
+indiancal.o chnsecal.o cecal.o coptccal.o dangical.o ethpccal.o \
coleitr.o coll.o tblcoll.o sortkey.o bocsu.o ucoleitr.o \
ucol.o ucol_res.o ucol_bld.o ucol_sit.o ucol_tok.o ucol_wgt.o ucol_cnt.o ucol_elm.o \
strmatch.o usearch.o search.o stsearch.o \
@@ -82,11 +82,11 @@
csdetect.o csmatch.o csr2022.o csrecog.o csrmbcs.o csrsbcs.o csrucode.o csrutf8.o inputext.o \
wintzimpl.o windtfmt.o winnmfmt.o basictz.o dtrule.o rbtz.o tzrule.o tztrans.o vtzone.o zonemeta.o \
upluralrules.o plurrule.o plurfmt.o selfmt.o dtitvfmt.o dtitvinf.o udateintervalformat.o \
-tmunit.o tmutamt.o tmutfmt.o colldata.o bmsearch.o bms.o currpinf.o \
+tmunit.o tmutamt.o tmutfmt.o currpinf.o \
uspoof.o uspoof_impl.o uspoof_build.o uspoof_conf.o uspoof_wsconf.o decfmtst.o smpdtfst.o \
ztrans.o zrule.o vzone.o fphdlimp.o fpositer.o locdspnm.o \
decNumber.o decContext.o alphaindex.o tznames.o tznames_impl.o tzgnames.o \
-tzfmt.o gender.o
+tzfmt.o compactdecimalformat.o gender.o region.o scriptset.o identifier_info.o
## Header files to install
HEADERS = $(srcdir)/unicode/*.h
diff --git a/i18n/alphaindex.cpp b/i18n/alphaindex.cpp
index e94cdcc..88dcaab 100644
--- a/i18n/alphaindex.cpp
+++ b/i18n/alphaindex.cpp
@@ -132,12 +132,9 @@
}
}
- virtual ~BucketList() {
- delete bucketList_;
- if (immutableVisibleList_ != bucketList_) {
- delete immutableVisibleList_;
- }
- }
+ // The virtual destructor must not be inline.
+ // See ticket #8454 for details.
+ virtual ~BucketList();
int32_t getBucketCount() const {
return immutableVisibleList_->size();
@@ -172,6 +169,13 @@
UVector *immutableVisibleList_;
};
+BucketList::~BucketList() {
+ delete bucketList_;
+ if (immutableVisibleList_ != bucketList_) {
+ delete immutableVisibleList_;
+ }
+}
+
AlphabeticIndex::ImmutableIndex::~ImmutableIndex() {
delete buckets_;
delete collatorPrimaryOnly_;
diff --git a/i18n/basictz.cpp b/i18n/basictz.cpp
index 6b4889a..7fee4d0 100644
--- a/i18n/basictz.cpp
+++ b/i18n/basictz.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2007-2010, International Business Machines Corporation and
+* Copyright (C) 2007-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
@@ -34,8 +34,8 @@
}
UBool
-BasicTimeZone::hasEquivalentTransitions(/*const*/ BasicTimeZone& tz, UDate start, UDate end,
- UBool ignoreDstAmount, UErrorCode& status) /*const*/ {
+BasicTimeZone::hasEquivalentTransitions(const BasicTimeZone& tz, UDate start, UDate end,
+ UBool ignoreDstAmount, UErrorCode& status) const {
if (U_FAILURE(status)) {
return FALSE;
}
@@ -128,7 +128,7 @@
void
BasicTimeZone::getSimpleRulesNear(UDate date, InitialTimeZoneRule*& initial,
- AnnualTimeZoneRule*& std, AnnualTimeZoneRule*& dst, UErrorCode& status) /*const*/ {
+ AnnualTimeZoneRule*& std, AnnualTimeZoneRule*& dst, UErrorCode& status) const {
initial = NULL;
std = NULL;
dst = NULL;
@@ -285,7 +285,7 @@
void
BasicTimeZone::getTimeZoneRulesAfter(UDate start, InitialTimeZoneRule*& initial,
- UVector*& transitionRules, UErrorCode& status) /*const*/ {
+ UVector*& transitionRules, UErrorCode& status) const {
if (U_FAILURE(status)) {
return;
}
@@ -546,7 +546,7 @@
void
BasicTimeZone::getOffsetFromLocal(UDate /*date*/, int32_t /*nonExistingTimeOpt*/, int32_t /*duplicatedTimeOpt*/,
- int32_t& /*rawOffset*/, int32_t& /*dstOffset*/, UErrorCode& status) /*const*/ {
+ int32_t& /*rawOffset*/, int32_t& /*dstOffset*/, UErrorCode& status) const {
if (U_FAILURE(status)) {
return;
}
diff --git a/i18n/bms.cpp b/i18n/bms.cpp
deleted file mode 100644
index 0a1de08..0000000
--- a/i18n/bms.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 2008-2011, International Business Machines Corporation and Others.
- * All rights reserved.
- */
-
-#include "unicode/utypes.h"
-#include "cmemory.h"
-#include "unicode/bms.h"
-#include "unicode/unistr.h"
-#include "unicode/colldata.h"
-#include "unicode/bmsearch.h"
-
-
-#if !UCONFIG_NO_COLLATION && !UCONFIG_NO_BREAK_ITERATION
-
-
-//#define USE_SAFE_CASTS
-#ifdef USE_SAFE_CASTS
-#define STATIC_CAST(type,value) static_cast<type>(value)
-#define CONST_CAST(type,value) const_cast<type>(value)
-#else
-#define STATIC_CAST(type,value) (type) (value)
-#define CONST_CAST(type,value) (type) (value)
-#endif
-
-U_NAMESPACE_USE
-
-U_CAPI UCD * U_EXPORT2
-ucd_open(UCollator *coll, UErrorCode *status)
-{
- return STATIC_CAST(UCD *, CollData::open(coll, *status));
-}
-
-U_CAPI void U_EXPORT2
-ucd_close(UCD *ucd)
-{
- if (ucd != NULL) {
- CollData *data = STATIC_CAST(CollData *, ucd);
-
- CollData::close(data);
- }
-}
-
-U_CAPI UCollator * U_EXPORT2
-ucd_getCollator(UCD *ucd)
-{
- CollData *data = STATIC_CAST(CollData *, ucd);
-
- return data->getCollator();
-}
-
-U_CAPI void U_EXPORT2
-ucd_freeCache()
-{
- CollData::freeCollDataCache();
-}
-
-U_CAPI void U_EXPORT2
-ucd_flushCache()
-{
- CollData::flushCollDataCache();
-}
-
-struct BMS
-{
- BoyerMooreSearch *bms;
- const UnicodeString *targetString;
-};
-
-U_CAPI BMS * U_EXPORT2
-bms_open(UCD *ucd,
- const UChar *pattern, int32_t patternLength,
- const UChar *target, int32_t targetLength,
- UErrorCode *status)
-{
- BMS *bms = STATIC_CAST(BMS *, uprv_malloc(sizeof(BMS)));
-
- if (bms == NULL) {
- *status = U_MEMORY_ALLOCATION_ERROR;
- return NULL;
- }
-
- CollData *data = (CollData *) ucd;
- UnicodeString patternString(pattern, patternLength);
-
- if (target != NULL) {
- bms->targetString = new UnicodeString(target, targetLength);
-
- if (bms->targetString == NULL) {
- bms->bms = NULL;
- *status = U_MEMORY_ALLOCATION_ERROR;
- return bms;
- }
- } else {
- bms->targetString = NULL;
- }
-
- bms->bms = new BoyerMooreSearch(data, patternString, bms->targetString, *status);
-
- if (bms->bms == NULL) {
- *status = U_MEMORY_ALLOCATION_ERROR;
- }
-
- return bms;
-}
-
-U_CAPI void U_EXPORT2
-bms_close(BMS *bms)
-{
- delete bms->bms;
-
- delete bms->targetString;
-
- uprv_free(bms);
-}
-
-U_CAPI UBool U_EXPORT2
-bms_empty(BMS *bms)
-{
- return bms->bms->empty();
-}
-
-U_CAPI UCD * U_EXPORT2
-bms_getData(BMS *bms)
-{
- return STATIC_CAST(UCD *, bms->bms->getData());
-}
-
-U_CAPI UBool U_EXPORT2
-bms_search(BMS *bms, int32_t offset, int32_t *start, int32_t *end)
-{
- return bms->bms->search(offset, *start, *end);
-}
-
-U_CAPI void U_EXPORT2
-bms_setTargetString(BMS *bms, const UChar *target, int32_t targetLength, UErrorCode *status)
-{
- if (U_FAILURE(*status)) {
- return;
- }
-
- if (bms->targetString != NULL) {
- delete bms->targetString;
- }
-
- if (target != NULL) {
- bms->targetString = new UnicodeString(target, targetLength);
- } else {
- bms->targetString = NULL;
- }
-
- bms->bms->setTargetString(bms->targetString, *status);
-}
-
-#endif
diff --git a/i18n/bmsearch.cpp b/i18n/bmsearch.cpp
deleted file mode 100644
index e6d8159..0000000
--- a/i18n/bmsearch.cpp
+++ /dev/null
@@ -1,827 +0,0 @@
-/*
- ******************************************************************************
- * Copyright (C) 1996-2012, International Business Machines *
- * Corporation and others. All Rights Reserved. *
- ******************************************************************************
- */
-
-#include "unicode/utypes.h"
-
-#if !UCONFIG_NO_COLLATION && !UCONFIG_NO_BREAK_ITERATION
-
-#include "unicode/unistr.h"
-#include "unicode/putil.h"
-#include "unicode/usearch.h"
-
-#include "cmemory.h"
-#include "unicode/coll.h"
-#include "unicode/tblcoll.h"
-#include "unicode/coleitr.h"
-#include "unicode/ucoleitr.h"
-
-#include "unicode/regex.h" // TODO: make conditional on regexp being built.
-
-#include "unicode/uniset.h"
-#include "unicode/uset.h"
-#include "unicode/ustring.h"
-#include "hash.h"
-#include "uhash.h"
-#include "ucol_imp.h"
-#include "normalizer2impl.h"
-
-#include "unicode/colldata.h"
-#include "unicode/bmsearch.h"
-
-U_NAMESPACE_BEGIN
-
-#define ARRAY_SIZE(array) (sizeof(array)/sizeof(array[0]))
-#define NEW_ARRAY(type, count) (type *) uprv_malloc((count) * sizeof(type))
-#define DELETE_ARRAY(array) uprv_free((void *) (array))
-
-
-struct CEI
-{
- uint32_t order;
- int32_t lowOffset;
- int32_t highOffset;
-};
-
-class Target : public UMemory
-{
-public:
- Target(UCollator *theCollator, const UnicodeString *target, int32_t patternLength, UErrorCode &status);
- ~Target();
-
- void setTargetString(const UnicodeString *target);
-
- const CEI *nextCE(int32_t offset);
- const CEI *prevCE(int32_t offset);
-
- int32_t stringLength();
- UChar charAt(int32_t offset);
-
- UBool isBreakBoundary(int32_t offset);
- int32_t nextBreakBoundary(int32_t offset);
- int32_t nextSafeBoundary(int32_t offset);
-
- UBool isIdentical(UnicodeString &pattern, int32_t start, int32_t end);
-
- void setOffset(int32_t offset);
- void setLast(int32_t last);
- int32_t getOffset();
-
-private:
- CEI *ceb;
- int32_t bufferSize;
- int32_t bufferMin;
- int32_t bufferMax;
-
- uint32_t strengthMask;
- UCollationStrength strength;
- uint32_t variableTop;
- UBool toShift;
- UCollator *coll;
- const Normalizer2 &nfd;
-
- const UnicodeString *targetString;
- const UChar *targetBuffer;
- int32_t targetLength;
-
- UCollationElements *elements;
- UBreakIterator *charBreakIterator;
-};
-
-Target::Target(UCollator *theCollator, const UnicodeString *target, int32_t patternLength, UErrorCode &status)
- : bufferSize(0), bufferMin(0), bufferMax(0),
- strengthMask(0), strength(UCOL_PRIMARY), variableTop(0), toShift(FALSE), coll(theCollator),
- nfd(*Normalizer2Factory::getNFDInstance(status)),
- targetString(NULL), targetBuffer(NULL), targetLength(0), elements(NULL), charBreakIterator(NULL)
-{
- strength = ucol_getStrength(coll);
- toShift = ucol_getAttribute(coll, UCOL_ALTERNATE_HANDLING, &status) == UCOL_SHIFTED;
- variableTop = ucol_getVariableTop(coll, &status);
-
- // find the largest expansion
- uint8_t maxExpansion = 0;
- for (const uint8_t *expansion = coll->expansionCESize; *expansion != 0; expansion += 1) {
- if (*expansion > maxExpansion) {
- maxExpansion = *expansion;
- }
- }
-
- // room for an extra character on each end, plus 4 for safety
- bufferSize = patternLength + (2 * maxExpansion) + 4;
-
- ceb = NEW_ARRAY(CEI, bufferSize);
-
- if (ceb == NULL) {
- status = U_MEMORY_ALLOCATION_ERROR;
- return;
- }
-
- if (target != NULL) {
- setTargetString(target);
- }
-
- switch (strength)
- {
- default:
- strengthMask |= UCOL_TERTIARYORDERMASK;
- /* fall through */
-
- case UCOL_SECONDARY:
- strengthMask |= UCOL_SECONDARYORDERMASK;
- /* fall through */
-
- case UCOL_PRIMARY:
- strengthMask |= UCOL_PRIMARYORDERMASK;
- }
-}
-
-Target::~Target()
-{
- ubrk_close(charBreakIterator);
- ucol_closeElements(elements);
-
- DELETE_ARRAY(ceb);
-}
-
-void Target::setTargetString(const UnicodeString *target)
-{
- if (charBreakIterator != NULL) {
- ubrk_close(charBreakIterator);
- ucol_closeElements(elements);
- }
-
- targetString = target;
-
- if (targetString != NULL) {
- UErrorCode status = U_ZERO_ERROR;
-
- targetBuffer = targetString->getBuffer();
- targetLength = targetString->length();
-
- elements = ucol_openElements(coll, target->getBuffer(), target->length(), &status);
- ucol_forceHanImplicit(elements, &status);
-
- charBreakIterator = ubrk_open(UBRK_CHARACTER, ucol_getLocaleByType(coll, ULOC_VALID_LOCALE, &status),
- targetBuffer, targetLength, &status);
- } else {
- targetBuffer = NULL;
- targetLength = 0;
- }
-}
-
-const CEI *Target::nextCE(int32_t offset)
-{
- UErrorCode status = U_ZERO_ERROR;
- int32_t low = -1, high = -1;
- uint32_t order;
- UBool cont = FALSE;
-
- if (offset >= bufferMin && offset < bufferMax) {
- return &ceb[offset];
- }
-
- if (bufferMax >= bufferSize || offset != bufferMax) {
- return NULL;
- }
-
- do {
- low = ucol_getOffset(elements);
- order = ucol_next(elements, &status);
- high = ucol_getOffset(elements);
-
- if (order == (uint32_t)UCOL_NULLORDER) {
- //high = low = -1;
- break;
- }
-
- cont = isContinuation(order);
- order &= strengthMask;
-
- if (toShift && variableTop > order && (order & UCOL_PRIMARYORDERMASK) != 0) {
- if (strength >= UCOL_QUATERNARY) {
- order &= UCOL_PRIMARYORDERMASK;
- } else {
- order = UCOL_IGNORABLE;
- }
- }
- } while (order == UCOL_IGNORABLE);
-
- if (cont) {
- order |= UCOL_CONTINUATION_MARKER;
- }
-
- ceb[offset].order = order;
- ceb[offset].lowOffset = low;
- ceb[offset].highOffset = high;
-
- bufferMax += 1;
-
- return &ceb[offset];
-}
-
-const CEI *Target::prevCE(int32_t offset)
-{
- UErrorCode status = U_ZERO_ERROR;
- int32_t low = -1, high = -1;
- uint32_t order;
- UBool cont = FALSE;
-
- if (offset >= bufferMin && offset < bufferMax) {
- return &ceb[offset];
- }
-
- if (bufferMax >= bufferSize || offset != bufferMax) {
- return NULL;
- }
-
- do {
- high = ucol_getOffset(elements);
- order = ucol_previous(elements, &status);
- low = ucol_getOffset(elements);
-
- if (order == (uint32_t)UCOL_NULLORDER) {
- break;
- }
-
- cont = isContinuation(order);
- order &= strengthMask;
-
- if (toShift && variableTop > order && (order & UCOL_PRIMARYORDERMASK) != 0) {
- if (strength >= UCOL_QUATERNARY) {
- order &= UCOL_PRIMARYORDERMASK;
- } else {
- order = UCOL_IGNORABLE;
- }
- }
- } while (order == UCOL_IGNORABLE);
-
- bufferMax += 1;
-
- if (cont) {
- order |= UCOL_CONTINUATION_MARKER;
- }
-
- ceb[offset].order = order;
- ceb[offset].lowOffset = low;
- ceb[offset].highOffset = high;
-
- return &ceb[offset];
-}
-
-int32_t Target::stringLength()
-{
- if (targetString != NULL) {
- return targetLength;
- }
-
- return 0;
-}
-
-UChar Target::charAt(int32_t offset)
-{
- if (targetString != NULL) {
- return targetBuffer[offset];
- }
-
- return 0x0000;
-}
-
-void Target::setOffset(int32_t offset)
-{
- UErrorCode status = U_ZERO_ERROR;
-
- bufferMin = 0;
- bufferMax = 0;
-
- ucol_setOffset(elements, offset, &status);
-}
-
-void Target::setLast(int32_t last)
-{
- UErrorCode status = U_ZERO_ERROR;
-
- bufferMin = 0;
- bufferMax = 1;
-
- ceb[0].order = (uint32_t)UCOL_NULLORDER;
- ceb[0].lowOffset = last;
- ceb[0].highOffset = last;
-
- ucol_setOffset(elements, last, &status);
-}
-
-int32_t Target::getOffset()
-{
- return ucol_getOffset(elements);
-}
-
-UBool Target::isBreakBoundary(int32_t offset)
-{
- return ubrk_isBoundary(charBreakIterator, offset);
-}
-
-int32_t Target::nextBreakBoundary(int32_t offset)
-{
- return ubrk_following(charBreakIterator, offset);
-}
-
-int32_t Target::nextSafeBoundary(int32_t offset)
-{
- while (offset < targetLength) {
- //UChar ch = charAt(offset);
- UChar ch = targetBuffer[offset];
-
- if (U_IS_LEAD(ch) || ! ucol_unsafeCP(ch, coll)) {
- return offset;
- }
-
- offset += 1;
- }
-
- return targetLength;
-}
-
-UBool Target::isIdentical(UnicodeString &pattern, int32_t start, int32_t end)
-{
- if (strength < UCOL_IDENTICAL) {
- return TRUE;
- }
-
- // Note: We could use Normalizer::compare() or similar, but for short strings
- // which may not be in FCD it might be faster to just NFD them.
- UErrorCode status = U_ZERO_ERROR;
- UnicodeString t2, p2;
- nfd.normalize(UnicodeString(FALSE, targetBuffer + start, end - start), t2, status);
- nfd.normalize(pattern, p2, status);
- // return FALSE if NFD failed
- return U_SUCCESS(status) && t2 == p2;
-}
-
-#define HASH_TABLE_SIZE 257
-
-class BadCharacterTable : public UMemory
-{
-public:
- BadCharacterTable(CEList &patternCEs, CollData *data, UErrorCode &status);
- ~BadCharacterTable();
-
- int32_t operator[](uint32_t ce) const;
- int32_t getMaxSkip() const;
- int32_t minLengthInChars(int32_t index);
-
-private:
- static int32_t hash(uint32_t ce);
-
- int32_t maxSkip;
- int32_t badCharacterTable[HASH_TABLE_SIZE];
-
- int32_t *minLengthCache;
-};
-
-BadCharacterTable::BadCharacterTable(CEList &patternCEs, CollData *data, UErrorCode &status)
- : minLengthCache(NULL)
-{
- int32_t plen = patternCEs.size();
-
- // **** need a better way to deal with this ****
- if (U_FAILURE(status) || plen == 0) {
- return;
- }
-
- int32_t *history = NEW_ARRAY(int32_t, plen);
-
- if (history == NULL) {
- status = U_MEMORY_ALLOCATION_ERROR;
- return;
- }
-
- for (int32_t i = 0; i < plen; i += 1) {
- history[i] = -1;
- }
-
- minLengthCache = NEW_ARRAY(int32_t, plen + 1);
-
- if (minLengthCache == NULL) {
- DELETE_ARRAY(history);
- status = U_MEMORY_ALLOCATION_ERROR;
- return;
- }
-
- maxSkip = minLengthCache[0] = data->minLengthInChars(&patternCEs, 0, history);
-
- for(int32_t j = 0; j < HASH_TABLE_SIZE; j += 1) {
- badCharacterTable[j] = maxSkip;
- }
-
- for(int32_t p = 1; p < plen; p += 1) {
- minLengthCache[p] = data->minLengthInChars(&patternCEs, p, history);
-
- // Make sure this entry is not bigger than the previous one.
- // Otherwise, we might skip too far in some cases.
- if (minLengthCache[p] < 0 || minLengthCache[p] > minLengthCache[p - 1]) {
- minLengthCache[p] = minLengthCache[p - 1];
- }
- }
-
- minLengthCache[plen] = 0;
-
- for(int32_t p = 0; p < plen - 1; p += 1) {
- badCharacterTable[hash(patternCEs[p])] = minLengthCache[p + 1];
- }
-
- DELETE_ARRAY(history);
-}
-
-BadCharacterTable::~BadCharacterTable()
-{
- DELETE_ARRAY(minLengthCache);
-}
-
-int32_t BadCharacterTable::operator[](uint32_t ce) const
-{
- return badCharacterTable[hash(ce)];
-}
-
-int32_t BadCharacterTable::getMaxSkip() const
-{
- return maxSkip;
-}
-
-int32_t BadCharacterTable::minLengthInChars(int32_t index)
-{
- return minLengthCache[index];
-}
-
-int32_t BadCharacterTable::hash(uint32_t ce)
-{
- return UCOL_PRIMARYORDER(ce) % HASH_TABLE_SIZE;
-}
-
-class GoodSuffixTable : public UMemory
-{
-public:
- GoodSuffixTable(CEList &patternCEs, BadCharacterTable &badCharacterTable, UErrorCode &status);
- ~GoodSuffixTable();
-
- int32_t operator[](int32_t offset) const;
-
-private:
- int32_t *goodSuffixTable;
-};
-
-GoodSuffixTable::GoodSuffixTable(CEList &patternCEs, BadCharacterTable &badCharacterTable, UErrorCode &status)
- : goodSuffixTable(NULL)
-{
- int32_t patlen = patternCEs.size();
-
- // **** need a better way to deal with this ****
- if (U_FAILURE(status) || patlen <= 0) {
- return;
- }
-
- int32_t *suff = NEW_ARRAY(int32_t, patlen);
- int32_t start = patlen - 1, end = - 1;
- int32_t maxSkip = badCharacterTable.getMaxSkip();
-
- if (suff == NULL) {
- status = U_MEMORY_ALLOCATION_ERROR;
- return;
- }
-
- // initialze suff
- suff[patlen - 1] = patlen;
-
- for (int32_t i = patlen - 2; i >= 0; i -= 1) {
- // (i > start) means we're inside the last suffix match we found
- // ((patlen - 1) - end) is how far the end of that match is from end of pattern
- // (i - start) is how far we are from start of that match
- // (i + (patlen - 1) - end) is index of same character at end of pattern
- // so if any suffix match at that character doesn't extend beyond the last match,
- // it's the suffix for this character as well
- if (i > start && suff[i + patlen - 1 - end] < i - start) {
- suff[i] = suff[i + patlen - 1 - end];
- } else {
- start = end = i;
-
- int32_t s = patlen;
-
- while (start >= 0 && patternCEs[start] == patternCEs[--s]) {
- start -= 1;
- }
-
- suff[i] = end - start;
- }
- }
-
- // now build goodSuffixTable
- goodSuffixTable = NEW_ARRAY(int32_t, patlen);
-
- if (goodSuffixTable == NULL) {
- DELETE_ARRAY(suff);
- status = U_MEMORY_ALLOCATION_ERROR;
- return;
- }
-
-
- // initialize entries to minLengthInChars of the pattern
- for (int32_t i = 0; i < patlen; i += 1) {
- goodSuffixTable[i] = maxSkip;
- }
-
- int32_t prefix = 0;
-
- for (int32_t i = patlen - /*1*/ 2; i >= 0; i -= 1) {
- if (suff[i] == i + 1) {
- // this matching suffix is a prefix of the pattern
- int32_t prefixSkip = badCharacterTable.minLengthInChars(i + 1);
-
- // for any mis-match before this suffix, we should skip
- // so that the front of the pattern (i.e. the prefix)
- // lines up with the front of the suffix.
- // (patlen - 1 - i) is the start of the suffix
- while (prefix < patlen - 1 - i) {
- // value of maxSkip means never set...
- if (goodSuffixTable[prefix] == maxSkip) {
- goodSuffixTable[prefix] = prefixSkip;
- }
-
- prefix += 1;
- }
- }
- }
-
- for (int32_t i = 0; i < patlen - 1; i += 1) {
- goodSuffixTable[patlen - 1 - suff[i]] = badCharacterTable.minLengthInChars(i + 1);
- }
-
- DELETE_ARRAY(suff);
-}
-
-GoodSuffixTable::~GoodSuffixTable()
-{
- DELETE_ARRAY(goodSuffixTable);
-}
-
-int32_t GoodSuffixTable::operator[](int32_t offset) const
-{
- return goodSuffixTable[offset];
-}
-
-UOBJECT_DEFINE_RTTI_IMPLEMENTATION(BoyerMooreSearch)
-
-
-UBool BoyerMooreSearch::empty()
-{
- return patCEs->size() <= 0;
-}
-
-CollData *BoyerMooreSearch::getData()
-{
- return data;
-}
-
-CEList *BoyerMooreSearch::getPatternCEs()
-{
- return patCEs;
-}
-
-BadCharacterTable *BoyerMooreSearch::getBadCharacterTable()
-{
- return badCharacterTable;
-}
-
-GoodSuffixTable *BoyerMooreSearch::getGoodSuffixTable()
-{
- return goodSuffixTable;
-}
-
-BoyerMooreSearch::BoyerMooreSearch(CollData *theData, const UnicodeString &patternString, const UnicodeString *targetString,
- UErrorCode &status)
- : data(theData), patCEs(NULL), badCharacterTable(NULL), goodSuffixTable(NULL), pattern(patternString), target(NULL)
-{
-
- if (U_FAILURE(status)) {
- return;
- }
-
- UCollator *collator = data->getCollator();
-
- patCEs = new CEList(collator, patternString, status);
-
- if (patCEs == NULL || U_FAILURE(status)) {
- return;
- }
-
- badCharacterTable = new BadCharacterTable(*patCEs, data, status);
-
- if (badCharacterTable == NULL || U_FAILURE(status)) {
- return;
- }
-
- goodSuffixTable = new GoodSuffixTable(*patCEs, *badCharacterTable, status);
-
- if (targetString != NULL) {
- target = new Target(collator, targetString, patCEs->size(), status);
- }
-}
-
-BoyerMooreSearch::~BoyerMooreSearch()
-{
- delete target;
- delete goodSuffixTable;
- delete badCharacterTable;
- delete patCEs;
-}
-
-void BoyerMooreSearch::setTargetString(const UnicodeString *targetString, UErrorCode &status)
-{
- if (U_FAILURE(status)) {
- return;
- }
-
- if (target == NULL) {
- target = new Target(data->getCollator(), targetString, patCEs->size(), status);
- } else {
- target->setTargetString(targetString);
- }
-}
-
-// **** main flow of this code from Laura Werner's "Unicode Text Searching in Java" paper. ****
-/*
- * TODO:
- * * deal with trailing (and leading?) ignorables.
- * * Adding BoyerMooreSearch object slowed it down. How can we speed it up?
- */
-UBool BoyerMooreSearch::search(int32_t offset, int32_t &start, int32_t &end)
-{
- /*UCollator *coll =*/ data->getCollator();
- int32_t plen = patCEs->size();
- int32_t tlen = target->stringLength();
- int32_t maxSkip = badCharacterTable->getMaxSkip();
- int32_t tOffset = offset + maxSkip;
-
- if (plen <= 0) {
- // Searching for a zero length pattern always fails.
- start = end = -1;
- return FALSE;
- }
-
- while (tOffset <= tlen) {
- int32_t pIndex = plen - 1;
- int32_t tIndex = 0;
- int32_t lIndex = 0;
-
- if (tOffset < tlen) {
- // **** we really want to skip ahead enough to ****
- // **** be sure we get at least 1 non-ignorable ****
- // **** CE after the end of the pattern. ****
- int32_t next = target->nextSafeBoundary(tOffset + 1);
-
- target->setOffset(next);
-
- for (lIndex = 0; ; lIndex += 1) {
- const CEI *cei = target->prevCE(lIndex);
- int32_t low = cei->lowOffset;
- int32_t high = cei->highOffset;
-
- if (high == 0 || (low < high && low <= tOffset)) {
- if (low < tOffset) {
- while (lIndex >= 0 && target->prevCE(lIndex)->highOffset == high) {
- lIndex -= 1;
- }
-
- if (high > tOffset) {
- tOffset = high;
- }
- }
-
- break;
- }
- }
- } else {
- target->setLast(tOffset);
- lIndex = 0;
- }
-
- tIndex = ++lIndex;
-
- // Iterate backward until we hit the beginning of the pattern
- while (pIndex >= 0) {
- uint32_t pce = (*patCEs)[pIndex];
- const CEI *tcei = target->prevCE(tIndex++);
-
-
- if (tcei->order != pce) {
- // There is a mismatch at this position. Decide how far
- // over to shift the pattern, then try again.
-
- int32_t gsOffset = tOffset + (*goodSuffixTable)[pIndex];
-#ifdef EXTRA_CAUTIOUS
- int32_t old = tOffset;
-#endif
-
- tOffset += (*badCharacterTable)[tcei->order] - badCharacterTable->minLengthInChars(pIndex + 1);
-
- if (gsOffset > tOffset) {
- tOffset = gsOffset;
- }
-
-#ifdef EXTRA_CAUTIOUS
- // Make sure we don't skip backwards...
- if (tOffset <= old) {
- tOffset = old + 1;
- }
-#endif
-
- break;
- }
-
- pIndex -= 1;
- }
-
- if (pIndex < 0) {
- // We made it back to the beginning of the pattern,
- // which means we matched it all. Return the location.
- const CEI firstCEI = *target->prevCE(tIndex - 1);
- const CEI lastCEI = *target->prevCE(lIndex);
- int32_t mStart = firstCEI.lowOffset;
- int32_t minLimit = lastCEI.lowOffset;
- int32_t maxLimit = lastCEI.highOffset;
- int32_t mLimit;
- UBool found = TRUE;
-
- target->setOffset(/*tOffset*/maxLimit);
-
- const CEI nextCEI = *target->nextCE(0);
-
- if (nextCEI.lowOffset > maxLimit) {
- maxLimit = nextCEI.lowOffset;
- }
-
- if (nextCEI.lowOffset == nextCEI.highOffset && nextCEI.order != (uint32_t)UCOL_NULLORDER) {
- found = FALSE;
- }
-
- if (! target->isBreakBoundary(mStart)) {
- found = FALSE;
- }
-
- if (firstCEI.lowOffset == firstCEI.highOffset) {
- found = FALSE;
- }
-
- mLimit = maxLimit;
- if (minLimit < maxLimit) {
- // When the last CE's low index is same with its high index, the CE is likely
- // a part of expansion. In this case, the index is located just after the
- // character corresponding to the CEs compared above. If the index is right
- // at the break boundary, move the position to the next boundary will result
- // incorrect match length when there are ignorable characters exist between
- // the position and the next character produces CE(s). See ticket#8482.
- if (minLimit == lastCEI.highOffset && target->isBreakBoundary(minLimit)) {
- mLimit = minLimit;
- } else {
- int32_t nbb = target->nextBreakBoundary(minLimit);
-
- if (nbb >= lastCEI.highOffset) {
- mLimit = nbb;
- }
- }
- }
-
- if (mLimit > maxLimit) {
- found = FALSE;
- }
-
- if (! target->isBreakBoundary(mLimit)) {
- found = FALSE;
- }
-
- if (! target->isIdentical(pattern, mStart, mLimit)) {
- found = FALSE;
- }
-
- if (found) {
- start = mStart;
- end = mLimit;
-
- return TRUE;
- }
-
- tOffset += (*goodSuffixTable)[0]; // really? Maybe += 1 or += maxSkip?
- }
- // Otherwise, we're here because of a mismatch, so keep going....
- }
-
- // no match
- start = -1;
- end = -1;
- return FALSE;
-}
-
-U_NAMESPACE_END
-
-#endif // #if !UCONFIG_NO_COLLATION
diff --git a/i18n/calendar.cpp b/i18n/calendar.cpp
index 656b92f..bb5e788 100644
--- a/i18n/calendar.cpp
+++ b/i18n/calendar.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 1997-2012, International Business Machines Corporation and *
+* Copyright (C) 1997-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*
@@ -45,6 +45,7 @@
#include "indiancal.h"
#include "chnsecal.h"
#include "coptccal.h"
+#include "dangical.h"
#include "ethpccal.h"
#include "unicode/calendar.h"
#include "cpputils.h"
@@ -164,6 +165,7 @@
"ethiopic",
"ethiopic-amete-alem",
"iso8601",
+ "dangi",
NULL
};
@@ -183,7 +185,8 @@
CALTYPE_COPTIC,
CALTYPE_ETHIOPIC,
CALTYPE_ETHIOPIC_AMETE_ALEM,
- CALTYPE_ISO8601
+ CALTYPE_ISO8601,
+ CALTYPE_DANGI
} ECalType;
U_NAMESPACE_BEGIN
@@ -341,6 +344,9 @@
cal->setFirstDayOfWeek(UCAL_MONDAY);
cal->setMinimalDaysInFirstWeek(4);
break;
+ case CALTYPE_DANGI:
+ cal = new DangiCalendar(loc, status);
+ break;
default:
status = U_UNSUPPORTED_ERROR;
}
diff --git a/i18n/chnsecal.cpp b/i18n/chnsecal.cpp
index 9c9dc79..16a3c9a 100644
--- a/i18n/chnsecal.cpp
+++ b/i18n/chnsecal.cpp
@@ -1,6 +1,6 @@
/*
******************************************************************************
- * Copyright (C) 2007-2012, International Business Machines Corporation
+ * Copyright (C) 2007-2013, International Business Machines Corporation
* and others. All Rights Reserved.
******************************************************************************
*
@@ -21,6 +21,7 @@
#include <float.h>
#include "gregoimp.h" // Math
#include "astro.h" // CalendarAstronomer
+#include "unicode/simpletz.h"
#include "uhash.h"
#include "ucln_in.h"
@@ -52,6 +53,8 @@
static icu::CalendarAstronomer *gChineseCalendarAstro = NULL;
static icu::CalendarCache *gChineseCalendarWinterSolsticeCache = NULL;
static icu::CalendarCache *gChineseCalendarNewYearCache = NULL;
+static icu::TimeZone *gChineseCalendarZoneAstroCalc = NULL;
+static UBool gChineseCalendarZoneAstroCalcInitialized = FALSE;
/**
* The start year of the Chinese calendar, the 61st year of the reign
@@ -66,7 +69,7 @@
* computations. Some sources use a different historically accurate
* offset of GMT+7:45:40 for years before 1929; we do not do this.
*/
-static const double CHINA_OFFSET = 8 * kOneHour;
+static const int32_t CHINA_OFFSET = 8 * kOneHour;
/**
* Value to be added or subtracted from the local days of a new moon to
@@ -90,6 +93,11 @@
delete gChineseCalendarNewYearCache;
gChineseCalendarNewYearCache = NULL;
}
+ if (gChineseCalendarZoneAstroCalc) {
+ delete gChineseCalendarZoneAstroCalc;
+ gChineseCalendarZoneAstroCalc = NULL;
+ }
+ gChineseCalendarZoneAstroCalcInitialized = FALSE;
return TRUE;
}
U_CDECL_END
@@ -110,14 +118,28 @@
}
ChineseCalendar::ChineseCalendar(const Locale& aLocale, UErrorCode& success)
-: Calendar(TimeZone::createDefault(), aLocale, success)
+: Calendar(TimeZone::createDefault(), aLocale, success),
+ isLeapYear(FALSE),
+ fEpochYear(CHINESE_EPOCH_YEAR),
+ fZoneAstroCalc(getChineseCalZoneAstroCalc())
{
- isLeapYear = FALSE;
+ setTimeInMillis(getNow(), success); // Call this again now that the vtable is set up properly.
+}
+
+ChineseCalendar::ChineseCalendar(const Locale& aLocale, int32_t epochYear,
+ const TimeZone* zoneAstroCalc, UErrorCode &success)
+: Calendar(TimeZone::createDefault(), aLocale, success),
+ isLeapYear(FALSE),
+ fEpochYear(epochYear),
+ fZoneAstroCalc(zoneAstroCalc)
+{
setTimeInMillis(getNow(), success); // Call this again now that the vtable is set up properly.
}
ChineseCalendar::ChineseCalendar(const ChineseCalendar& other) : Calendar(other) {
isLeapYear = other.isLeapYear;
+ fEpochYear = other.fEpochYear;
+ fZoneAstroCalc = other.fZoneAstroCalc;
}
ChineseCalendar::~ChineseCalendar()
@@ -128,6 +150,23 @@
return "chinese";
}
+const TimeZone* ChineseCalendar::getChineseCalZoneAstroCalc(void) const {
+ UBool initialized;
+ UMTX_CHECK(&astroLock, gChineseCalendarZoneAstroCalcInitialized, initialized);
+ if (!initialized) {
+ umtx_lock(&astroLock);
+ {
+ if (!gChineseCalendarZoneAstroCalcInitialized) {
+ gChineseCalendarZoneAstroCalc = new SimpleTimeZone(CHINA_OFFSET, UNICODE_STRING_SIMPLE("CHINA_ZONE") );
+ gChineseCalendarZoneAstroCalcInitialized = TRUE;
+ ucln_i18n_registerCleanup(UCLN_I18N_CHINESE_CALENDAR, calendar_chinese_cleanup);
+ }
+ }
+ umtx_unlock(&astroLock);
+ }
+ return gChineseCalendarZoneAstroCalc;
+}
+
//-------------------------------------------------------------------------
// Minimum / Maximum access functions
//-------------------------------------------------------------------------
@@ -187,7 +226,8 @@
year = internalGet(UCAL_EXTENDED_YEAR, 1); // Default to year 1
} else {
int32_t cycle = internalGet(UCAL_ERA, 1) - 1; // 0-based cycle
- year = cycle * 60 + internalGet(UCAL_YEAR, 1);
+ // adjust to the instance specific epoch
+ year = cycle * 60 + internalGet(UCAL_YEAR, 1) - (fEpochYear - CHINESE_EPOCH_YEAR);
}
return year;
}
@@ -294,7 +334,7 @@
month = (int32_t)m;
}
- int32_t gyear = eyear + CHINESE_EPOCH_YEAR - 1; // Gregorian year
+ int32_t gyear = eyear + fEpochYear - 1; // Gregorian year
int32_t theNewYear = newYear(gyear);
int32_t newMoon = newMoonNear(theNewYear + month * 29, TRUE);
@@ -432,20 +472,44 @@
/**
* Convert local days to UTC epoch milliseconds.
- * @param days days after January 1, 1970 0:00 Asia/Shanghai
+ * This is not an accurate conversion in that getTimezoneOffset
+ * takes the milliseconds in GMT (not local time). In theory, more
+ * accurate algorithm can be implemented but practically we do not need
+ * to go through that complication as long as the historical timezone
+ * changes did not happen around the 'tricky' new moon (new moon around
+ * midnight).
+ *
+ * @param days days after January 1, 1970 0:00 in the astronomical base zone
* @return milliseconds after January 1, 1970 0:00 GMT
*/
-double ChineseCalendar::daysToMillis(double days) {
- return (days * kOneDay) - CHINA_OFFSET;
+double ChineseCalendar::daysToMillis(double days) const {
+ double millis = days * (double)kOneDay;
+ if (fZoneAstroCalc != NULL) {
+ int32_t rawOffset, dstOffset;
+ UErrorCode status = U_ZERO_ERROR;
+ fZoneAstroCalc->getOffset(millis, FALSE, rawOffset, dstOffset, status);
+ if (U_SUCCESS(status)) {
+ return millis - (double)(rawOffset + dstOffset);
+ }
+ }
+ return millis - (double)CHINA_OFFSET;
}
/**
* Convert UTC epoch milliseconds to local days.
* @param millis milliseconds after January 1, 1970 0:00 GMT
- * @return days after January 1, 1970 0:00 Asia/Shanghai
+ * @return days after January 1, 1970 0:00 in the astronomical base zone
*/
-double ChineseCalendar::millisToDays(double millis) {
- return ClockMath::floorDivide(millis + CHINA_OFFSET, kOneDay);
+double ChineseCalendar::millisToDays(double millis) const {
+ if (fZoneAstroCalc != NULL) {
+ int32_t rawOffset, dstOffset;
+ UErrorCode status = U_ZERO_ERROR;
+ fZoneAstroCalc->getOffset(millis, FALSE, rawOffset, dstOffset, status);
+ if (U_SUCCESS(status)) {
+ return ClockMath::floorDivide(millis + (double)(rawOffset + dstOffset), kOneDay);
+ }
+ }
+ return ClockMath::floorDivide(millis + (double)CHINA_OFFSET, kOneDay);
}
//------------------------------------------------------------------
@@ -570,10 +634,10 @@
/**
* Return true if there is a leap month on or after month newMoon1 and
* at or before month newMoon2.
- * @param newMoon1 days after January 1, 1970 0:00 Asia/Shanghai of a
- * new moon
- * @param newMoon2 days after January 1, 1970 0:00 Asia/Shanghai of a
- * new moon
+ * @param newMoon1 days after January 1, 1970 0:00 astronomical base zone
+ * of a new moon
+ * @param newMoon2 days after January 1, 1970 0:00 astronomical base zone
+ * of a new moon
*/
UBool ChineseCalendar::isLeapMonthBetween(int32_t newMoon1, int32_t newMoon2) const {
@@ -600,8 +664,8 @@
* <code>handleComputeMonthStart()</code>.
*
* <p>As a side effect, this method sets {@link #isLeapYear}.
- * @param days days after January 1, 1970 0:00 Asia/Shanghai of the
- * date to compute fields for
+ * @param days days after January 1, 1970 0:00 astronomical base zone
+ * of the date to compute fields for
* @param gyear the Gregorian year of the given date
* @param gmonth the Gregorian month of the given date
* @param setAllFields if true, set the EXTENDED_YEAR, ERA, YEAR,
@@ -650,18 +714,22 @@
if (setAllFields) {
- int32_t year = gyear - CHINESE_EPOCH_YEAR;
+ // Extended year and cycle year is based on the epoch year
+
+ int32_t extended_year = gyear - fEpochYear;
+ int cycle_year = gyear - CHINESE_EPOCH_YEAR;
if (month < 11 ||
gmonth >= UCAL_JULY) {
- year++;
+ extended_year++;
+ cycle_year++;
}
int32_t dayOfMonth = days - thisMoon + 1;
- internalSet(UCAL_EXTENDED_YEAR, year);
+ internalSet(UCAL_EXTENDED_YEAR, extended_year);
// 0->0,60 1->1,1 60->1,60 61->2,1 etc.
int32_t yearOfCycle;
- int32_t cycle = ClockMath::floorDivide(year - 1, 60, yearOfCycle);
+ int32_t cycle = ClockMath::floorDivide(cycle_year - 1, 60, yearOfCycle);
internalSet(UCAL_ERA, cycle + 1);
internalSet(UCAL_YEAR, yearOfCycle + 1);
@@ -687,7 +755,7 @@
/**
* Return the Chinese new year of the given Gregorian year.
* @param gyear a Gregorian year
- * @return days after January 1, 1970 0:00 Asia/Shanghai of the
+ * @return days after January 1, 1970 0:00 astronomical base zone of the
* Chinese new year of the given year (this will be a new moon)
*/
int32_t ChineseCalendar::newYear(int32_t gyear) const {
diff --git a/i18n/chnsecal.h b/i18n/chnsecal.h
index d379770..7d0e2a1 100644
--- a/i18n/chnsecal.h
+++ b/i18n/chnsecal.h
@@ -1,6 +1,6 @@
/*
*****************************************************************************
- * Copyright (C) 2007-2008, International Business Machines Corporation
+ * Copyright (C) 2007-2013, International Business Machines Corporation
* and others. All Rights Reserved.
*****************************************************************************
*
@@ -21,6 +21,7 @@
#if !UCONFIG_NO_FORMATTING
#include "unicode/calendar.h"
+#include "unicode/timezone.h"
U_NAMESPACE_BEGIN
@@ -82,7 +83,7 @@
* </ul>
*
* <p>
- * This class should not be subclassed.</p>
+ * This class should only be subclassed to implement variants of the Chinese lunar calendar.</p>
* <p>
* ChineseCalendar usually should be instantiated using
* {@link com.ibm.icu.util.Calendar#getInstance(ULocale)} passing in a <code>ULocale</code>
@@ -91,16 +92,16 @@
* @see com.ibm.icu.text.ChineseDateFormat
* @see com.ibm.icu.util.Calendar
* @author Alan Liu
- * @stable ICU 2.8
+ * @internal
*/
-class ChineseCalendar : public Calendar {
+class U_I18N_API ChineseCalendar : public Calendar {
public:
//-------------------------------------------------------------------------
// Constructors...
//-------------------------------------------------------------------------
/**
- * Constructs an ChineseCalendar based on the current time in the default time zone
+ * Constructs a ChineseCalendar based on the current time in the default time zone
* with the given locale.
*
* @param aLocale The given locale.
@@ -110,6 +111,24 @@
*/
ChineseCalendar(const Locale& aLocale, UErrorCode &success);
+ protected:
+
+ /**
+ * Constructs a ChineseCalendar based on the current time in the default time zone
+ * with the given locale, using the specified epoch year and time zone for
+ * astronomical calculations.
+ *
+ * @param aLocale The given locale.
+ * @param epochYear The epoch year to use for calculation.
+ * @param zoneAstroCalc The TimeZone to use for astronomical calculations. If null,
+ * will be set appropriately for Chinese calendar (UTC + 8:00).
+ * @param success Indicates the status of ChineseCalendar object construction;
+ * if successful, will not be changed to an error value.
+ * @internal
+ */
+ ChineseCalendar(const Locale& aLocale, int32_t epochYear, const TimeZone* zoneAstroCalc, UErrorCode &success);
+
+ public:
/**
* Copy Constructor
* @internal
@@ -132,6 +151,9 @@
//-------------------------------------------------------------------------
UBool isLeapYear;
+ int32_t fEpochYear; // Start year of this Chinese calendar instance.
+ const TimeZone* fZoneAstroCalc; // Zone used for the astronomical calculation
+ // of this Chinese calendar instance.
//----------------------------------------------------------------------
// Calendar framework
@@ -145,25 +167,22 @@
virtual void handleComputeFields(int32_t julianDay, UErrorCode &status);
virtual const UFieldResolutionTable* getFieldResolutionTable() const;
-
-
-public:
+ public:
virtual void add(UCalendarDateFields field, int32_t amount, UErrorCode &status);
virtual void add(EDateFields field, int32_t amount, UErrorCode &status);
virtual void roll(UCalendarDateFields field, int32_t amount, UErrorCode &status);
virtual void roll(EDateFields field, int32_t amount, UErrorCode &status);
-
//----------------------------------------------------------------------
// Internal methods & astronomical calculations
//----------------------------------------------------------------------
-private:
+ private:
static const UFieldResolutionTable CHINESE_DATE_PRECEDENCE[];
- static double daysToMillis(double days);
- static double millisToDays(double millis);
+ double daysToMillis(double days) const;
+ double millisToDays(double millis) const;
virtual int32_t winterSolstice(int32_t gyear) const;
virtual int32_t newMoonNear(double days, UBool after) const;
virtual int32_t synodicMonthsBetween(int32_t day1, int32_t day2) const;
@@ -174,7 +193,7 @@
int32_t gmonth, UBool setAllFields);
virtual int32_t newYear(int32_t gyear) const;
virtual void offsetMonth(int32_t newMoon, int32_t dom, int32_t delta);
-
+ const TimeZone* getChineseCalZoneAstroCalc(void) const;
// UObject stuff
public:
@@ -196,7 +215,7 @@
* @return The class ID for all objects of this class.
* @internal
*/
- U_I18N_API static UClassID U_EXPORT2 getStaticClassID(void);
+ static UClassID U_EXPORT2 getStaticClassID(void);
/**
* return the calendar type, "chinese".
@@ -289,6 +308,3 @@
#endif
#endif
-
-
-
diff --git a/i18n/compactdecimalformat.cpp b/i18n/compactdecimalformat.cpp
new file mode 100644
index 0000000..0e3c45f
--- /dev/null
+++ b/i18n/compactdecimalformat.cpp
@@ -0,0 +1,953 @@
+/*
+*******************************************************************************
+* Copyright (C) 1997-2012, International Business Machines Corporation and *
+* others. All Rights Reserved. *
+*******************************************************************************
+*
+* File COMPACTDECIMALFORMAT.CPP
+*
+********************************************************************************
+*/
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
+#include "charstr.h"
+#include "cstring.h"
+#include "digitlst.h"
+#include "mutex.h"
+#include "unicode/compactdecimalformat.h"
+#include "unicode/numsys.h"
+#include "unicode/plurrule.h"
+#include "unicode/ures.h"
+#include "ucln_in.h"
+#include "uhash.h"
+#include "umutex.h"
+#include "unicode/ures.h"
+#include "uresimp.h"
+
+#define LENGTHOF(array) (int32_t)(sizeof(array) / sizeof((array)[0]))
+
+// Maps locale name to CDFLocaleData struct.
+static UHashtable* gCompactDecimalData = NULL;
+static UMutex gCompactDecimalMetaLock = U_MUTEX_INITIALIZER;
+
+U_NAMESPACE_BEGIN
+
+static const int32_t MAX_DIGITS = 15;
+static const char gOther[] = "other";
+static const char gLatnTag[] = "latn";
+static const char gNumberElementsTag[] = "NumberElements";
+static const char gDecimalFormatTag[] = "decimalFormat";
+static const char gPatternsShort[] = "patternsShort";
+static const char gPatternsLong[] = "patternsLong";
+static const char gRoot[] = "root";
+
+static const UChar u_0 = 0x30;
+static const UChar u_apos = 0x27;
+
+static const UChar kZero[] = {u_0};
+
+// Used to unescape single quotes.
+enum QuoteState {
+ OUTSIDE,
+ INSIDE_EMPTY,
+ INSIDE_FULL
+};
+
+enum FallbackFlags {
+ ANY = 0,
+ MUST = 1,
+ NOT_ROOT = 2
+ // Next one will be 4 then 6 etc.
+};
+
+
+// CDFUnit represents a prefix-suffix pair for a particular variant
+// and log10 value.
+struct CDFUnit : public UMemory {
+ UnicodeString prefix;
+ UnicodeString suffix;
+ inline CDFUnit() : prefix(), suffix() {
+ prefix.setToBogus();
+ }
+ inline ~CDFUnit() {}
+ inline UBool isSet() const {
+ return !prefix.isBogus();
+ }
+ inline void markAsSet() {
+ prefix.remove();
+ }
+};
+
+// CDFLocaleStyleData contains formatting data for a particular locale
+// and style.
+class CDFLocaleStyleData : public UMemory {
+ public:
+ // What to divide by for each log10 value when formatting. These values
+ // will be powers of 10. For English, would be:
+ // 1, 1, 1, 1000, 1000, 1000, 1000000, 1000000, 1000000, 1000000000 ...
+ double divisors[MAX_DIGITS];
+ // Maps plural variants to CDFUnit[MAX_DIGITS] arrays.
+ // To format a number x,
+ // first compute log10(x). Compute displayNum = (x / divisors[log10(x)]).
+ // Compute the plural variant for displayNum
+ // (e.g zero, one, two, few, many, other).
+ // Compute cdfUnits = unitsByVariant[pluralVariant].
+ // Prefix and suffix to use at cdfUnits[log10(x)]
+ UHashtable* unitsByVariant;
+ inline CDFLocaleStyleData() : unitsByVariant(NULL) {}
+ ~CDFLocaleStyleData();
+ // Init initializes this object.
+ void Init(UErrorCode& status);
+ inline UBool isBogus() const {
+ return unitsByVariant == NULL;
+ }
+ void setToBogus();
+ private:
+ CDFLocaleStyleData(const CDFLocaleStyleData&);
+ CDFLocaleStyleData& operator=(const CDFLocaleStyleData&);
+};
+
+// CDFLocaleData contains formatting data for a particular locale.
+struct CDFLocaleData : public UMemory {
+ CDFLocaleStyleData shortData;
+ CDFLocaleStyleData longData;
+ inline CDFLocaleData() : shortData(), longData() { }
+ inline ~CDFLocaleData() { }
+ // Init initializes this object.
+ void Init(UErrorCode& status);
+};
+
+U_NAMESPACE_END
+
+U_CDECL_BEGIN
+
+static UBool U_CALLCONV cdf_cleanup(void) {
+ if (gCompactDecimalData != NULL) {
+ uhash_close(gCompactDecimalData);
+ gCompactDecimalData = NULL;
+ }
+ return TRUE;
+}
+
+static void U_CALLCONV deleteCDFUnits(void* ptr) {
+ delete [] (icu::CDFUnit*) ptr;
+}
+
+static void U_CALLCONV deleteCDFLocaleData(void* ptr) {
+ delete (icu::CDFLocaleData*) ptr;
+}
+
+U_CDECL_END
+
+U_NAMESPACE_BEGIN
+
+static UBool divisors_equal(const double* lhs, const double* rhs);
+static const CDFLocaleStyleData* getCDFLocaleStyleData(const Locale& inLocale, UNumberCompactStyle style, UErrorCode& status);
+
+static const CDFLocaleStyleData* extractDataByStyleEnum(const CDFLocaleData& data, UNumberCompactStyle style, UErrorCode& status);
+static CDFLocaleData* loadCDFLocaleData(const Locale& inLocale, UErrorCode& status);
+static void initCDFLocaleData(const Locale& inLocale, CDFLocaleData* result, UErrorCode& status);
+static UResourceBundle* tryGetDecimalFallback(const UResourceBundle* numberSystemResource, const char* style, UResourceBundle** fillIn, FallbackFlags flags, UErrorCode& status);
+static UResourceBundle* tryGetByKeyWithFallback(const UResourceBundle* rb, const char* path, UResourceBundle** fillIn, FallbackFlags flags, UErrorCode& status);
+static UBool isRoot(const UResourceBundle* rb, UErrorCode& status);
+static void initCDFLocaleStyleData(const UResourceBundle* decimalFormatBundle, CDFLocaleStyleData* result, UErrorCode& status);
+static void populatePower10(const UResourceBundle* power10Bundle, CDFLocaleStyleData* result, UErrorCode& status);
+static int32_t populatePrefixSuffix(const char* variant, int32_t log10Value, const UnicodeString& formatStr, UHashtable* result, UErrorCode& status);
+static UBool onlySpaces(UnicodeString u);
+static void fixQuotes(UnicodeString& s);
+static void fillInMissing(CDFLocaleStyleData* result);
+static int32_t computeLog10(double x, UBool inRange);
+static CDFUnit* createCDFUnit(const char* variant, int32_t log10Value, UHashtable* table, UErrorCode& status);
+static const CDFUnit* getCDFUnitFallback(const UHashtable* table, const UnicodeString& variant, int32_t log10Value);
+
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CompactDecimalFormat)
+
+CompactDecimalFormat::CompactDecimalFormat(
+ const DecimalFormat& decimalFormat,
+ const UHashtable* unitsByVariant,
+ const double* divisors,
+ PluralRules* pluralRules)
+ : DecimalFormat(decimalFormat), _unitsByVariant(unitsByVariant), _divisors(divisors), _pluralRules(pluralRules) {
+}
+
+CompactDecimalFormat::CompactDecimalFormat(const CompactDecimalFormat& source)
+ : DecimalFormat(source), _unitsByVariant(source._unitsByVariant), _divisors(source._divisors), _pluralRules(source._pluralRules->clone()) {
+}
+
+CompactDecimalFormat* U_EXPORT2
+CompactDecimalFormat::createInstance(
+ const Locale& inLocale, UNumberCompactStyle style, UErrorCode& status) {
+ LocalPointer<DecimalFormat> decfmt((DecimalFormat*) NumberFormat::makeInstance(inLocale, UNUM_DECIMAL, TRUE, status));
+ if (U_FAILURE(status)) {
+ return NULL;
+ }
+ LocalPointer<PluralRules> pluralRules(PluralRules::forLocale(inLocale, status));
+ if (U_FAILURE(status)) {
+ return NULL;
+ }
+ const CDFLocaleStyleData* data = getCDFLocaleStyleData(inLocale, style, status);
+ if (U_FAILURE(status)) {
+ return NULL;
+ }
+ CompactDecimalFormat* result =
+ new CompactDecimalFormat(*decfmt, data->unitsByVariant, data->divisors, pluralRules.getAlias());
+ if (result == NULL) {
+ status = U_MEMORY_ALLOCATION_ERROR;
+ return NULL;
+ }
+ pluralRules.orphan();
+ result->setMaximumSignificantDigits(3);
+ result->setSignificantDigitsUsed(TRUE);
+ result->setGroupingUsed(FALSE);
+ return result;
+}
+
+CompactDecimalFormat&
+CompactDecimalFormat::operator=(const CompactDecimalFormat& rhs) {
+ if (this != &rhs) {
+ DecimalFormat::operator=(rhs);
+ _unitsByVariant = rhs._unitsByVariant;
+ _divisors = rhs._divisors;
+ delete _pluralRules;
+ _pluralRules = rhs._pluralRules->clone();
+ }
+ return *this;
+}
+
+CompactDecimalFormat::~CompactDecimalFormat() {
+ delete _pluralRules;
+}
+
+
+Format*
+CompactDecimalFormat::clone(void) const {
+ return new CompactDecimalFormat(*this);
+}
+
+UBool
+CompactDecimalFormat::operator==(const Format& that) const {
+ if (this == &that) {
+ return TRUE;
+ }
+ return (DecimalFormat::operator==(that) && eqHelper((const CompactDecimalFormat&) that));
+}
+
+UBool
+CompactDecimalFormat::eqHelper(const CompactDecimalFormat& that) const {
+ return uhash_equals(_unitsByVariant, that._unitsByVariant) && divisors_equal(_divisors, that._divisors) && (*_pluralRules == *that._pluralRules);
+}
+
+UnicodeString&
+CompactDecimalFormat::format(
+ double number,
+ UnicodeString& appendTo,
+ FieldPosition& pos) const {
+ DigitList orig, rounded;
+ orig.set(number);
+ UBool isNegative;
+ UErrorCode status = U_ZERO_ERROR;
+ _round(orig, rounded, isNegative, status);
+ if (U_FAILURE(status)) {
+ return appendTo;
+ }
+ double roundedDouble = rounded.getDouble();
+ if (isNegative) {
+ roundedDouble = -roundedDouble;
+ }
+ int32_t baseIdx = computeLog10(roundedDouble, TRUE);
+ double numberToFormat = roundedDouble / _divisors[baseIdx];
+ UnicodeString variant = _pluralRules->select(numberToFormat);
+ if (isNegative) {
+ numberToFormat = -numberToFormat;
+ }
+ const CDFUnit* unit = getCDFUnitFallback(_unitsByVariant, variant, baseIdx);
+ appendTo += unit->prefix;
+ DecimalFormat::format(numberToFormat, appendTo, pos);
+ appendTo += unit->suffix;
+ return appendTo;
+}
+
+UnicodeString&
+CompactDecimalFormat::format(
+ double /* number */,
+ UnicodeString& appendTo,
+ FieldPositionIterator* /* posIter */,
+ UErrorCode& status) const {
+ status = U_UNSUPPORTED_ERROR;
+ return appendTo;
+}
+
+UnicodeString&
+CompactDecimalFormat::format(
+ int64_t number,
+ UnicodeString& appendTo,
+ FieldPosition& pos) const {
+ return format((double) number, appendTo, pos);
+}
+
+UnicodeString&
+CompactDecimalFormat::format(
+ int64_t /* number */,
+ UnicodeString& appendTo,
+ FieldPositionIterator* /* posIter */,
+ UErrorCode& status) const {
+ status = U_UNSUPPORTED_ERROR;
+ return appendTo;
+}
+
+UnicodeString&
+CompactDecimalFormat::format(
+ const StringPiece& /* number */,
+ UnicodeString& appendTo,
+ FieldPositionIterator* /* posIter */,
+ UErrorCode& status) const {
+ status = U_UNSUPPORTED_ERROR;
+ return appendTo;
+}
+
+UnicodeString&
+CompactDecimalFormat::format(
+ const DigitList& /* number */,
+ UnicodeString& appendTo,
+ FieldPositionIterator* /* posIter */,
+ UErrorCode& status) const {
+ status = U_UNSUPPORTED_ERROR;
+ return appendTo;
+}
+
+UnicodeString&
+CompactDecimalFormat::format(const DigitList& /* number */,
+ UnicodeString& appendTo,
+ FieldPosition& /* pos */,
+ UErrorCode& status) const {
+ status = U_UNSUPPORTED_ERROR;
+ return appendTo;
+}
+
+void
+CompactDecimalFormat::parse(
+ const UnicodeString& /* text */,
+ Formattable& /* result */,
+ ParsePosition& /* parsePosition */) const {
+}
+
+void
+CompactDecimalFormat::parse(
+ const UnicodeString& /* text */,
+ Formattable& /* result */,
+ UErrorCode& status) const {
+ status = U_UNSUPPORTED_ERROR;
+}
+
+CurrencyAmount*
+CompactDecimalFormat::parseCurrency(
+ const UnicodeString& /* text */,
+ ParsePosition& /* pos */) const {
+ return NULL;
+}
+
+void CDFLocaleStyleData::Init(UErrorCode& status) {
+ if (unitsByVariant != NULL) {
+ return;
+ }
+ unitsByVariant = uhash_open(uhash_hashChars, uhash_compareChars, NULL, &status);
+ if (U_FAILURE(status)) {
+ return;
+ }
+ uhash_setKeyDeleter(unitsByVariant, uprv_free);
+ uhash_setValueDeleter(unitsByVariant, deleteCDFUnits);
+}
+
+CDFLocaleStyleData::~CDFLocaleStyleData() {
+ setToBogus();
+}
+
+void CDFLocaleStyleData::setToBogus() {
+ if (unitsByVariant != NULL) {
+ uhash_close(unitsByVariant);
+ unitsByVariant = NULL;
+ }
+}
+
+void CDFLocaleData::Init(UErrorCode& status) {
+ shortData.Init(status);
+ if (U_FAILURE(status)) {
+ return;
+ }
+ longData.Init(status);
+}
+
+// Helper method for operator=
+static UBool divisors_equal(const double* lhs, const double* rhs) {
+ for (int32_t i = 0; i < MAX_DIGITS; ++i) {
+ if (lhs[i] != rhs[i]) {
+ return FALSE;
+ }
+ }
+ return TRUE;
+}
+
+// getCDFLocaleStyleData returns pointer to formatting data for given locale and
+// style within the global cache. On cache miss, getCDFLocaleStyleData loads
+// the data from CLDR into the global cache before returning the pointer. If a
+// UNUM_LONG data is requested for a locale, and that locale does not have
+// UNUM_LONG data, getCDFLocaleStyleData will fall back to UNUM_SHORT data for
+// that locale.
+static const CDFLocaleStyleData* getCDFLocaleStyleData(const Locale& inLocale, UNumberCompactStyle style, UErrorCode& status) {
+ if (U_FAILURE(status)) {
+ return NULL;
+ }
+ CDFLocaleData* result = NULL;
+ const char* key = inLocale.getName();
+ {
+ Mutex lock(&gCompactDecimalMetaLock);
+ if (gCompactDecimalData == NULL) {
+ gCompactDecimalData = uhash_open(uhash_hashChars, uhash_compareChars, NULL, &status);
+ if (U_FAILURE(status)) {
+ return NULL;
+ }
+ uhash_setKeyDeleter(gCompactDecimalData, uprv_free);
+ uhash_setValueDeleter(gCompactDecimalData, deleteCDFLocaleData);
+ ucln_i18n_registerCleanup(UCLN_I18N_CDFINFO, cdf_cleanup);
+ } else {
+ result = (CDFLocaleData*) uhash_get(gCompactDecimalData, key);
+ }
+ }
+ if (result != NULL) {
+ return extractDataByStyleEnum(*result, style, status);
+ }
+
+ result = loadCDFLocaleData(inLocale, status);
+ if (U_FAILURE(status)) {
+ return NULL;
+ }
+
+ {
+ Mutex lock(&gCompactDecimalMetaLock);
+ CDFLocaleData* temp = (CDFLocaleData*) uhash_get(gCompactDecimalData, key);
+ if (temp != NULL) {
+ delete result;
+ result = temp;
+ } else {
+ uhash_put(gCompactDecimalData, uprv_strdup(key), (void*) result, &status);
+ if (U_FAILURE(status)) {
+ return NULL;
+ }
+ }
+ }
+ return extractDataByStyleEnum(*result, style, status);
+}
+
+static const CDFLocaleStyleData* extractDataByStyleEnum(const CDFLocaleData& data, UNumberCompactStyle style, UErrorCode& status) {
+ switch (style) {
+ case UNUM_SHORT:
+ return &data.shortData;
+ case UNUM_LONG:
+ if (!data.longData.isBogus()) {
+ return &data.longData;
+ }
+ return &data.shortData;
+ default:
+ status = U_ILLEGAL_ARGUMENT_ERROR;
+ return NULL;
+ }
+}
+
+// loadCDFLocaleData loads formatting data from CLDR for a given locale. The
+// caller owns the returned pointer.
+static CDFLocaleData* loadCDFLocaleData(const Locale& inLocale, UErrorCode& status) {
+ if (U_FAILURE(status)) {
+ return NULL;
+ }
+ CDFLocaleData* result = new CDFLocaleData;
+ if (result == NULL) {
+ status = U_MEMORY_ALLOCATION_ERROR;
+ return NULL;
+ }
+ result->Init(status);
+ if (U_FAILURE(status)) {
+ delete result;
+ return NULL;
+ }
+
+ initCDFLocaleData(inLocale, result, status);
+ if (U_FAILURE(status)) {
+ delete result;
+ return NULL;
+ }
+ return result;
+}
+
+// initCDFLocaleData initializes result with data from CLDR.
+// inLocale is the locale, the CLDR data is stored in result.
+// We load the UNUM_SHORT and UNUM_LONG data looking first in local numbering
+// system and not including root locale in fallback. Next we try in the latn
+// numbering system where we fallback all the way to root. If we don't find
+// UNUM_SHORT data in these three places, we report an error. If we find
+// UNUM_SHORT data before finding UNUM_LONG data we make UNUM_LONG data fall
+// back to UNUM_SHORT data.
+static void initCDFLocaleData(const Locale& inLocale, CDFLocaleData* result, UErrorCode& status) {
+ LocalPointer<NumberingSystem> ns(NumberingSystem::createInstance(inLocale, status));
+ if (U_FAILURE(status)) {
+ return;
+ }
+ const char* numberingSystemName = ns->getName();
+ UResourceBundle* rb = ures_open(NULL, inLocale.getName(), &status);
+ rb = ures_getByKeyWithFallback(rb, gNumberElementsTag, rb, &status);
+ if (U_FAILURE(status)) {
+ ures_close(rb);
+ return;
+ }
+ UResourceBundle* shortDataFillIn = NULL;
+ UResourceBundle* longDataFillIn = NULL;
+ UResourceBundle* shortData = NULL;
+ UResourceBundle* longData = NULL;
+
+ if (uprv_strcmp(numberingSystemName, gLatnTag) != 0) {
+ LocalUResourceBundlePointer localResource(
+ tryGetByKeyWithFallback(rb, numberingSystemName, NULL, NOT_ROOT, status));
+ shortData = tryGetDecimalFallback(
+ localResource.getAlias(), gPatternsShort, &shortDataFillIn, NOT_ROOT, status);
+ longData = tryGetDecimalFallback(
+ localResource.getAlias(), gPatternsLong, &longDataFillIn, NOT_ROOT, status);
+ }
+ if (U_FAILURE(status)) {
+ ures_close(shortDataFillIn);
+ ures_close(longDataFillIn);
+ ures_close(rb);
+ return;
+ }
+
+ // If we haven't found UNUM_SHORT look in latn numbering system. We must
+ // succeed at finding UNUM_SHORT here.
+ if (shortData == NULL) {
+ LocalUResourceBundlePointer latnResource(tryGetByKeyWithFallback(rb, gLatnTag, NULL, MUST, status));
+ shortData = tryGetDecimalFallback(latnResource.getAlias(), gPatternsShort, &shortDataFillIn, MUST, status);
+ if (longData == NULL) {
+ longData = tryGetDecimalFallback(latnResource.getAlias(), gPatternsLong, &longDataFillIn, ANY, status);
+ if (longData != NULL && isRoot(longData, status) && !isRoot(shortData, status)) {
+ longData = NULL;
+ }
+ }
+ }
+ initCDFLocaleStyleData(shortData, &result->shortData, status);
+ ures_close(shortDataFillIn);
+ if (U_FAILURE(status)) {
+ ures_close(longDataFillIn);
+ ures_close(rb);
+ }
+
+ if (longData == NULL) {
+ result->longData.setToBogus();
+ } else {
+ initCDFLocaleStyleData(longData, &result->longData, status);
+ }
+ ures_close(longDataFillIn);
+ ures_close(rb);
+}
+
+/**
+ * tryGetDecimalFallback attempts to fetch the "decimalFormat" resource bundle
+ * with a particular style. style is either "patternsShort" or "patternsLong."
+ * FillIn, flags, and status work in the same way as in tryGetByKeyWithFallback.
+ */
+static UResourceBundle* tryGetDecimalFallback(const UResourceBundle* numberSystemResource, const char* style, UResourceBundle** fillIn, FallbackFlags flags, UErrorCode& status) {
+ UResourceBundle* first = tryGetByKeyWithFallback(numberSystemResource, style, fillIn, flags, status);
+ UResourceBundle* second = tryGetByKeyWithFallback(first, gDecimalFormatTag, fillIn, flags, status);
+ if (fillIn == NULL) {
+ ures_close(first);
+ }
+ return second;
+}
+
+// tryGetByKeyWithFallback returns a sub-resource bundle that matches given
+// criteria or NULL if none found. rb is the resource bundle that we are
+// searching. If rb == NULL then this function behaves as if no sub-resource
+// is found; path is the key of the sub-resource,
+// (i.e "foo" but not "foo/bar"); If fillIn is NULL, caller must always call
+// ures_close() on returned resource. See below for example when fillIn is
+// not NULL. flags is ANY or NOT_ROOT. Optionally, these values
+// can be ored with MUST. MUST by itself is the same as ANY | MUST.
+// The locale of the returned sub-resource will either match the
+// flags or the returned sub-resouce will be NULL. If MUST is included in
+// flags, and not suitable sub-resource is found then in addition to returning
+// NULL, this function also sets status to U_MISSING_RESOURCE_ERROR. If MUST
+// is not included in flags, then this function just returns NULL if no
+// such sub-resource is found and will never set status to
+// U_MISSING_RESOURCE_ERROR.
+//
+// Example: This code first searches for "foo/bar" sub-resource without falling
+// back to ROOT. Then searches for "baz" sub-resource as last resort.
+//
+// UResourcebundle* fillIn = NULL;
+// UResourceBundle* data = tryGetByKeyWithFallback(rb, "foo", &fillIn, NON_ROOT, status);
+// data = tryGetByKeyWithFallback(data, "bar", &fillIn, NON_ROOT, status);
+// if (!data) {
+// data = tryGetbyKeyWithFallback(rb, "baz", &fillIn, MUST, status);
+// }
+// if (U_FAILURE(status)) {
+// ures_close(fillIn);
+// return;
+// }
+// doStuffWithNonNullSubresource(data);
+//
+// /* Wrong! don't do the following as it can leak memory if fillIn gets set
+// to NULL. */
+// fillIn = tryGetByKeyWithFallback(rb, "wrong", &fillIn, ANY, status);
+//
+// ures_close(fillIn);
+//
+static UResourceBundle* tryGetByKeyWithFallback(const UResourceBundle* rb, const char* path, UResourceBundle** fillIn, FallbackFlags flags, UErrorCode& status) {
+ if (U_FAILURE(status)) {
+ return NULL;
+ }
+ UBool must = (flags & MUST);
+ if (rb == NULL) {
+ if (must) {
+ status = U_MISSING_RESOURCE_ERROR;
+ }
+ return NULL;
+ }
+ UResourceBundle* result = NULL;
+ UResourceBundle* ownedByUs = NULL;
+ if (fillIn == NULL) {
+ ownedByUs = ures_getByKeyWithFallback(rb, path, NULL, &status);
+ result = ownedByUs;
+ } else {
+ *fillIn = ures_getByKeyWithFallback(rb, path, *fillIn, &status);
+ result = *fillIn;
+ }
+ if (U_FAILURE(status)) {
+ ures_close(ownedByUs);
+ if (status == U_MISSING_RESOURCE_ERROR && !must) {
+ status = U_ZERO_ERROR;
+ }
+ return NULL;
+ }
+ flags = (FallbackFlags) (flags & ~MUST);
+ switch (flags) {
+ case NOT_ROOT:
+ {
+ UBool bRoot = isRoot(result, status);
+ if (bRoot || U_FAILURE(status)) {
+ ures_close(ownedByUs);
+ if (must && (status == U_ZERO_ERROR)) {
+ status = U_MISSING_RESOURCE_ERROR;
+ }
+ return NULL;
+ }
+ return result;
+ }
+ case ANY:
+ return result;
+ default:
+ ures_close(ownedByUs);
+ status = U_ILLEGAL_ARGUMENT_ERROR;
+ return NULL;
+ }
+}
+
+static UBool isRoot(const UResourceBundle* rb, UErrorCode& status) {
+ const char* actualLocale = ures_getLocaleByType(
+ rb, ULOC_ACTUAL_LOCALE, &status);
+ if (U_FAILURE(status)) {
+ return FALSE;
+ }
+ return uprv_strcmp(actualLocale, gRoot) == 0;
+}
+
+
+// initCDFLocaleStyleData loads formatting data for a particular style.
+// decimalFormatBundle is the "decimalFormat" resource bundle in CLDR.
+// Loaded data stored in result.
+static void initCDFLocaleStyleData(const UResourceBundle* decimalFormatBundle, CDFLocaleStyleData* result, UErrorCode& status) {
+ if (U_FAILURE(status)) {
+ return;
+ }
+ // Iterate through all the powers of 10.
+ int32_t size = ures_getSize(decimalFormatBundle);
+ UResourceBundle* power10 = NULL;
+ for (int32_t i = 0; i < size; ++i) {
+ power10 = ures_getByIndex(decimalFormatBundle, i, power10, &status);
+ if (U_FAILURE(status)) {
+ ures_close(power10);
+ return;
+ }
+ populatePower10(power10, result, status);
+ if (U_FAILURE(status)) {
+ ures_close(power10);
+ return;
+ }
+ }
+ ures_close(power10);
+ fillInMissing(result);
+}
+
+// populatePower10 grabs data for a particular power of 10 from CLDR.
+// The loaded data is stored in result.
+static void populatePower10(const UResourceBundle* power10Bundle, CDFLocaleStyleData* result, UErrorCode& status) {
+ if (U_FAILURE(status)) {
+ return;
+ }
+ char* endPtr = NULL;
+ double power10 = uprv_strtod(ures_getKey(power10Bundle), &endPtr);
+ if (*endPtr != 0) {
+ status = U_INTERNAL_PROGRAM_ERROR;
+ return;
+ }
+ int32_t log10Value = computeLog10(power10, FALSE);
+ // Silently ignore divisors that are too big.
+ if (log10Value == MAX_DIGITS) {
+ return;
+ }
+ int32_t size = ures_getSize(power10Bundle);
+ int32_t numZeros = 0;
+ UBool otherVariantDefined = FALSE;
+ UResourceBundle* variantBundle = NULL;
+ // Iterate over all the plural variants for the power of 10
+ for (int32_t i = 0; i < size; ++i) {
+ variantBundle = ures_getByIndex(power10Bundle, i, variantBundle, &status);
+ if (U_FAILURE(status)) {
+ ures_close(variantBundle);
+ return;
+ }
+ const char* variant = ures_getKey(variantBundle);
+ int32_t resLen;
+ const UChar* formatStrP = ures_getString(variantBundle, &resLen, &status);
+ if (U_FAILURE(status)) {
+ ures_close(variantBundle);
+ return;
+ }
+ UnicodeString formatStr(false, formatStrP, resLen);
+ if (uprv_strcmp(variant, gOther) == 0) {
+ otherVariantDefined = TRUE;
+ }
+ int32_t nz = populatePrefixSuffix(
+ variant, log10Value, formatStr, result->unitsByVariant, status);
+ if (U_FAILURE(status)) {
+ ures_close(variantBundle);
+ return;
+ }
+ if (nz != numZeros) {
+ // We expect all format strings to have the same number of 0's
+ // left of the decimal point.
+ if (numZeros != 0) {
+ status = U_INTERNAL_PROGRAM_ERROR;
+ ures_close(variantBundle);
+ return;
+ }
+ numZeros = nz;
+ }
+ }
+ ures_close(variantBundle);
+ // We expect to find an OTHER variant for each power of 10.
+ if (!otherVariantDefined) {
+ status = U_INTERNAL_PROGRAM_ERROR;
+ return;
+ }
+ double divisor = power10;
+ for (int32_t i = 1; i < numZeros; ++i) {
+ divisor /= 10.0;
+ }
+ result->divisors[log10Value] = divisor;
+}
+
+// populatePrefixSuffix Adds a specific prefix-suffix pair to result for a
+// given variant and log10 value.
+// variant is 'zero', 'one', 'two', 'few', 'many', or 'other'.
+// formatStr is the format string from which the prefix and suffix are
+// extracted. It is usually of form 'Pefix 000 suffix'.
+// populatePrefixSuffix returns the number of 0's found in formatStr
+// before the decimal point.
+// In the special case that formatStr contains only spaces for prefix
+// and suffix, populatePrefixSuffix returns log10Value + 1.
+static int32_t populatePrefixSuffix(
+ const char* variant, int32_t log10Value, const UnicodeString& formatStr, UHashtable* result, UErrorCode& status) {
+ if (U_FAILURE(status)) {
+ return 0;
+ }
+ int32_t firstIdx = formatStr.indexOf(kZero, LENGTHOF(kZero), 0);
+ // We must have 0's in format string.
+ if (firstIdx == -1) {
+ status = U_INTERNAL_PROGRAM_ERROR;
+ return 0;
+ }
+ int32_t lastIdx = formatStr.lastIndexOf(kZero, LENGTHOF(kZero), firstIdx);
+ CDFUnit* unit = createCDFUnit(variant, log10Value, result, status);
+ if (U_FAILURE(status)) {
+ return 0;
+ }
+ // Everything up to first 0 is the prefix
+ unit->prefix = formatStr.tempSubString(0, firstIdx);
+ fixQuotes(unit->prefix);
+ // Everything beyond the last 0 is the suffix
+ unit->suffix = formatStr.tempSubString(lastIdx + 1);
+ fixQuotes(unit->suffix);
+
+ // If there is effectively no prefix or suffix, ignore the actual number of
+ // 0's and act as if the number of 0's matches the size of the number.
+ if (onlySpaces(unit->prefix) && onlySpaces(unit->suffix)) {
+ return log10Value + 1;
+ }
+
+ // Calculate number of zeros before decimal point
+ int32_t idx = firstIdx + 1;
+ while (idx <= lastIdx && formatStr.charAt(idx) == u_0) {
+ ++idx;
+ }
+ return (idx - firstIdx);
+}
+
+static UBool onlySpaces(UnicodeString u) {
+ return u.trim().length() == 0;
+}
+
+// fixQuotes unescapes single quotes. Don''t -> Don't. Letter 'j' -> Letter j.
+// Modifies s in place.
+static void fixQuotes(UnicodeString& s) {
+ QuoteState state = OUTSIDE;
+ int32_t len = s.length();
+ int32_t dest = 0;
+ for (int32_t i = 0; i < len; ++i) {
+ UChar ch = s.charAt(i);
+ if (ch == u_apos) {
+ if (state == INSIDE_EMPTY) {
+ s.setCharAt(dest, ch);
+ ++dest;
+ }
+ } else {
+ s.setCharAt(dest, ch);
+ ++dest;
+ }
+
+ // Update state
+ switch (state) {
+ case OUTSIDE:
+ state = ch == u_apos ? INSIDE_EMPTY : OUTSIDE;
+ break;
+ case INSIDE_EMPTY:
+ case INSIDE_FULL:
+ state = ch == u_apos ? OUTSIDE : INSIDE_FULL;
+ break;
+ default:
+ break;
+ }
+ }
+ s.truncate(dest);
+}
+
+// fillInMissing ensures that the data in result is complete.
+// result data is complete if for each variant in result, there exists
+// a prefix-suffix pair for each log10 value and there also exists
+// a divisor for each log10 value.
+//
+// First this function figures out for which log10 values, the other
+// variant already had data. These are the same log10 values defined
+// in CLDR.
+//
+// For each log10 value not defined in CLDR, it uses the divisor for
+// the last defined log10 value or 1.
+//
+// Then for each variant, it does the following. For each log10
+// value not defined in CLDR, copy the prefix-suffix pair from the
+// previous log10 value. If log10 value is defined in CLDR but is
+// missing from given variant, copy the prefix-suffix pair for that
+// log10 value from the 'other' variant.
+static void fillInMissing(CDFLocaleStyleData* result) {
+ const CDFUnit* otherUnits =
+ (const CDFUnit*) uhash_get(result->unitsByVariant, gOther);
+ UBool definedInCLDR[MAX_DIGITS];
+ double lastDivisor = 1.0;
+ for (int32_t i = 0; i < MAX_DIGITS; ++i) {
+ if (!otherUnits[i].isSet()) {
+ result->divisors[i] = lastDivisor;
+ definedInCLDR[i] = FALSE;
+ } else {
+ lastDivisor = result->divisors[i];
+ definedInCLDR[i] = TRUE;
+ }
+ }
+ // Iterate over each variant.
+ int32_t pos = -1;
+ const UHashElement* element = uhash_nextElement(result->unitsByVariant, &pos);
+ for (;element != NULL; element = uhash_nextElement(result->unitsByVariant, &pos)) {
+ CDFUnit* units = (CDFUnit*) element->value.pointer;
+ for (int32_t i = 0; i < MAX_DIGITS; ++i) {
+ if (definedInCLDR[i]) {
+ if (!units[i].isSet()) {
+ units[i] = otherUnits[i];
+ }
+ } else {
+ if (i == 0) {
+ units[0].markAsSet();
+ } else {
+ units[i] = units[i - 1];
+ }
+ }
+ }
+ }
+}
+
+// computeLog10 computes floor(log10(x)). If inRange is TRUE, the biggest
+// value computeLog10 will return MAX_DIGITS -1 even for
+// numbers > 10^MAX_DIGITS. If inRange is FALSE, computeLog10 will return
+// up to MAX_DIGITS.
+static int32_t computeLog10(double x, UBool inRange) {
+ int32_t result = 0;
+ int32_t max = inRange ? MAX_DIGITS - 1 : MAX_DIGITS;
+ while (x >= 10.0) {
+ x /= 10.0;
+ ++result;
+ if (result == max) {
+ break;
+ }
+ }
+ return result;
+}
+
+// createCDFUnit returns a pointer to the prefix-suffix pair for a given
+// variant and log10 value within table. If no such prefix-suffix pair is
+// stored in table, one is created within table before returning pointer.
+static CDFUnit* createCDFUnit(const char* variant, int32_t log10Value, UHashtable* table, UErrorCode& status) {
+ if (U_FAILURE(status)) {
+ return NULL;
+ }
+ CDFUnit *cdfUnit = (CDFUnit*) uhash_get(table, variant);
+ if (cdfUnit == NULL) {
+ cdfUnit = new CDFUnit[MAX_DIGITS];
+ if (cdfUnit == NULL) {
+ status = U_MEMORY_ALLOCATION_ERROR;
+ return NULL;
+ }
+ uhash_put(table, uprv_strdup(variant), cdfUnit, &status);
+ if (U_FAILURE(status)) {
+ return NULL;
+ }
+ }
+ CDFUnit* result = &cdfUnit[log10Value];
+ result->markAsSet();
+ return result;
+}
+
+// getCDFUnitFallback returns a pointer to the prefix-suffix pair for a given
+// variant and log10 value within table. If the given variant doesn't exist, it
+// falls back to the OTHER variant. Therefore, this method will always return
+// some non-NULL value.
+static const CDFUnit* getCDFUnitFallback(const UHashtable* table, const UnicodeString& variant, int32_t log10Value) {
+ CharString cvariant;
+ UErrorCode status = U_ZERO_ERROR;
+ const CDFUnit *cdfUnit = NULL;
+ cvariant.appendInvariantChars(variant, status);
+ if (!U_FAILURE(status)) {
+ cdfUnit = (const CDFUnit*) uhash_get(table, cvariant.data());
+ }
+ if (cdfUnit == NULL) {
+ cdfUnit = (const CDFUnit*) uhash_get(table, gOther);
+ }
+ return &cdfUnit[log10Value];
+}
+
+U_NAMESPACE_END
+#endif
diff --git a/i18n/dangical.cpp b/i18n/dangical.cpp
new file mode 100644
index 0000000..489821b
--- /dev/null
+++ b/i18n/dangical.cpp
@@ -0,0 +1,144 @@
+/*
+ ******************************************************************************
+ * Copyright (C) 2013, International Business Machines Corporation
+ * and others. All Rights Reserved.
+ ******************************************************************************
+ *
+ * File DANGICAL.CPP
+ *****************************************************************************
+ */
+
+#include "chnsecal.h"
+#include "dangical.h"
+
+#if !UCONFIG_NO_FORMATTING
+
+#include "umutex.h"
+#include "gregoimp.h" // Math
+#include "unicode/rbtz.h"
+#include "unicode/tzrule.h"
+#include "ucln_in.h"
+
+// --- The cache --
+static UMutex dangiLock = U_MUTEX_INITIALIZER;
+static icu::TimeZone *gDangiCalendarZoneAstroCalc = NULL;
+static UBool gDangiCalendarZoneAstroCalcInitialized = FALSE;
+
+/**
+ * The start year of the Korean traditional calendar (Dan-gi) is the inaugural
+ * year of Dan-gun (BC 2333).
+ */
+static const int32_t DANGI_EPOCH_YEAR = -2332; // Gregorian year
+
+U_CDECL_BEGIN
+static UBool calendar_dangi_cleanup(void) {
+ if (gDangiCalendarZoneAstroCalc) {
+ delete gDangiCalendarZoneAstroCalc;
+ gDangiCalendarZoneAstroCalc = NULL;
+ }
+ gDangiCalendarZoneAstroCalcInitialized = FALSE;
+ return TRUE;
+}
+U_CDECL_END
+
+U_NAMESPACE_BEGIN
+
+// Implementation of the DangiCalendar class
+
+//-------------------------------------------------------------------------
+// Constructors...
+//-------------------------------------------------------------------------
+
+DangiCalendar::DangiCalendar(const Locale& aLocale, UErrorCode& success)
+: ChineseCalendar(aLocale, DANGI_EPOCH_YEAR, getDangiCalZoneAstroCalc(), success)
+{
+}
+
+DangiCalendar::DangiCalendar (const DangiCalendar& other)
+: ChineseCalendar(other)
+{
+}
+
+DangiCalendar::~DangiCalendar()
+{
+}
+
+Calendar*
+DangiCalendar::clone() const
+{
+ return new DangiCalendar(*this);
+}
+
+const char *DangiCalendar::getType() const {
+ return "dangi";
+}
+
+/**
+ * The time zone used for performing astronomical computations for
+ * Dangi calendar. In Korea various timezones have been used historically
+ * (cf. http://www.math.snu.ac.kr/~kye/others/lunar.html):
+ *
+ * - 1908/04/01: GMT+8
+ * 1908/04/01 - 1911/12/31: GMT+8.5
+ * 1912/01/01 - 1954/03/20: GMT+9
+ * 1954/03/21 - 1961/08/09: GMT+8.5
+ * 1961/08/10 - : GMT+9
+ *
+ * Note that, in 1908-1911, the government did not apply the timezone change
+ * but used GMT+8. In addition, 1954-1961's timezone change does not affect
+ * the lunar date calculation. Therefore, the following simpler rule works:
+ *
+ * -1911: GMT+8
+ * 1912-: GMT+9
+ *
+ * Unfortunately, our astronomer's approximation doesn't agree with the
+ * references (http://www.math.snu.ac.kr/~kye/others/lunar.html and
+ * http://astro.kasi.re.kr/Life/ConvertSolarLunarForm.aspx?MenuID=115)
+ * in 1897/7/30. So the following ad hoc fix is used here:
+ *
+ * -1896: GMT+8
+ * 1897: GMT+7
+ * 1898-1911: GMT+8
+ * 1912- : GMT+9
+ */
+const TimeZone* DangiCalendar::getDangiCalZoneAstroCalc(void) const {
+ UBool initialized;
+ UMTX_CHECK(&dangiLock, gDangiCalendarZoneAstroCalcInitialized, initialized);
+ if (!initialized) {
+ umtx_lock(&dangiLock);
+ {
+ if (!gDangiCalendarZoneAstroCalcInitialized) {
+ const UDate millis1897[] = { (UDate)((1897 - 1970) * 365 * kOneDay) }; // some days of error is not a problem here
+ const UDate millis1898[] = { (UDate)((1898 - 1970) * 365 * kOneDay) }; // some days of error is not a problem here
+ const UDate millis1912[] = { (UDate)((1912 - 1970) * 365 * kOneDay) }; // this doesn't create an issue for 1911/12/20
+ InitialTimeZoneRule* initialTimeZone = new InitialTimeZoneRule(UNICODE_STRING_SIMPLE("GMT+8"), 8*kOneHour, 0);
+ TimeZoneRule* rule1897 = new TimeArrayTimeZoneRule(UNICODE_STRING_SIMPLE("Korean 1897"), 7*kOneHour, 0, millis1897, 1, DateTimeRule::STANDARD_TIME);
+ TimeZoneRule* rule1898to1911 = new TimeArrayTimeZoneRule(UNICODE_STRING_SIMPLE("Korean 1898-1911"), 8*kOneHour, 0, millis1898, 1, DateTimeRule::STANDARD_TIME);
+ TimeZoneRule* ruleFrom1912 = new TimeArrayTimeZoneRule(UNICODE_STRING_SIMPLE("Korean 1912-"), 9*kOneHour, 0, millis1912, 1, DateTimeRule::STANDARD_TIME);
+ UErrorCode status = U_ZERO_ERROR;
+ RuleBasedTimeZone* dangiCalZoneAstroCalc = new RuleBasedTimeZone(UNICODE_STRING_SIMPLE("KOREA_ZONE"), initialTimeZone); // adopts initialTimeZone
+ dangiCalZoneAstroCalc->addTransitionRule(rule1897, status); // adopts rule1897
+ dangiCalZoneAstroCalc->addTransitionRule(rule1898to1911, status);
+ dangiCalZoneAstroCalc->addTransitionRule(ruleFrom1912, status);
+ dangiCalZoneAstroCalc->complete(status);
+ if (U_SUCCESS(status)) {
+ gDangiCalendarZoneAstroCalc = dangiCalZoneAstroCalc;
+ } else {
+ delete dangiCalZoneAstroCalc;
+ gDangiCalendarZoneAstroCalc = NULL;
+ }
+ gDangiCalendarZoneAstroCalcInitialized = TRUE;
+ ucln_i18n_registerCleanup(UCLN_I18N_DANGI_CALENDAR, calendar_dangi_cleanup);
+ }
+ }
+ umtx_unlock(&dangiLock);
+ }
+ return gDangiCalendarZoneAstroCalc;
+}
+
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(DangiCalendar)
+
+U_NAMESPACE_END
+
+#endif
+
diff --git a/i18n/dangical.h b/i18n/dangical.h
new file mode 100644
index 0000000..76dd3d4
--- /dev/null
+++ b/i18n/dangical.h
@@ -0,0 +1,119 @@
+/*
+ *****************************************************************************
+ * Copyright (C) 2013, International Business Machines Corporation
+ * and others. All Rights Reserved.
+ *****************************************************************************
+ *
+ * File DANGICAL.H
+ *****************************************************************************
+ */
+
+#ifndef DANGICAL_H
+#define DANGICAL_H
+
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
+#include "unicode/calendar.h"
+#include "unicode/timezone.h"
+#include "chnsecal.h"
+
+U_NAMESPACE_BEGIN
+
+/**
+ * <p><code>DangiCalendar</code> is a concrete subclass of {@link Calendar}
+ * that implements a traditional Korean lunisolar calendar.</p>
+ *
+ * <p>DangiCalendar usually should be instantiated using
+ * {@link com.ibm.icu.util.Calendar#getInstance(ULocale)} passing in a <code>ULocale</code>
+ * with the tag <code>"@calendar=dangi"</code>.</p>
+ *
+ * @internal
+ */
+class DangiCalendar : public ChineseCalendar {
+ public:
+ //-------------------------------------------------------------------------
+ // Constructors...
+ //-------------------------------------------------------------------------
+
+ /**
+ * Constructs a DangiCalendar based on the current time in the default time zone
+ * with the given locale.
+ *
+ * @param aLocale The given locale.
+ * @param success Indicates the status of DangiCalendar object construction.
+ * Returns U_ZERO_ERROR if constructed successfully.
+ * @internal
+ */
+ DangiCalendar(const Locale& aLocale, UErrorCode &success);
+
+ /**
+ * Copy Constructor
+ * @internal
+ */
+ DangiCalendar(const DangiCalendar& other);
+
+ /**
+ * Destructor.
+ * @internal
+ */
+ virtual ~DangiCalendar();
+
+ /**
+ * Clone.
+ * @internal
+ */
+ virtual Calendar* clone() const;
+
+ //----------------------------------------------------------------------
+ // Internal methods & astronomical calculations
+ //----------------------------------------------------------------------
+
+ private:
+
+ const TimeZone* getDangiCalZoneAstroCalc(void) const;
+
+ // UObject stuff
+ public:
+ /**
+ * @return The class ID for this object. All objects of a given class have the
+ * same class ID. Objects of other classes have different class IDs.
+ * @internal
+ */
+ virtual UClassID getDynamicClassID(void) const;
+
+ /**
+ * Return the class ID for this class. This is useful only for comparing to a return
+ * value from getDynamicClassID(). For example:
+ *
+ * Base* polymorphic_pointer = createPolymorphicObject();
+ * if (polymorphic_pointer->getDynamicClassID() ==
+ * Derived::getStaticClassID()) ...
+ *
+ * @return The class ID for all objects of this class.
+ * @internal
+ */
+ U_I18N_API static UClassID U_EXPORT2 getStaticClassID(void);
+
+ /**
+ * return the calendar type, "dangi".
+ *
+ * @return calendar type
+ * @internal
+ */
+ const char * getType() const;
+
+
+ private:
+
+ DangiCalendar(); // default constructor not implemented
+};
+
+U_NAMESPACE_END
+
+#endif
+#endif
+
+
+
diff --git a/i18n/decNumber.c b/i18n/decNumber.c
index 89d242a..0848540 100644
--- a/i18n/decNumber.c
+++ b/i18n/decNumber.c
@@ -7018,7 +7018,7 @@
if (cut==0) quot=*up; /* is at bottom of unit */
else /* cut>0 */ { /* it's not at bottom of unit */
#if DECDPUN<=4
- U_ASSERT(cut >= 0 && cut <= 4);
+ U_ASSERT(/* cut >= 0 &&*/ cut <= 4);
quot=QUOT10(*up, cut);
rem=*up-quot*powers[cut];
#else
diff --git a/i18n/decimfmt.cpp b/i18n/decimfmt.cpp
index 8e1cb0b..de6e2ec 100644
--- a/i18n/decimfmt.cpp
+++ b/i18n/decimfmt.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 1997-2012, International Business Machines Corporation and *
+* Copyright (C) 1997-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*
@@ -71,6 +71,15 @@
#include "decfmtst.h"
#include "dcfmtimp.h"
+/*
+ * On certain platforms, round is a macro defined in math.h
+ * This undefine is to avoid conflict between the macro and
+ * the function defined below.
+ */
+#ifdef round
+#undef round
+#endif
+
U_NAMESPACE_BEGIN
@@ -341,6 +350,7 @@
fNegSuffixPattern = 0;
fCurrencyChoice = 0;
fMultiplier = NULL;
+ fScale = 0;
fGroupingSize = 0;
fGroupingSize2 = 0;
fDecimalSeparatorAlwaysShown = FALSE;
@@ -1057,6 +1067,8 @@
debug("No format fastpath: fMinSignificantDigits!=1");
} else if(fMultiplier!=NULL) {
debug("No format fastpath: fMultiplier!=NULL");
+ } else if(fScale!=0) {
+ debug("No format fastpath: fScale!=0");
} else if(0x0030 != getConstSymbol(DecimalFormatSymbols::kZeroDigitSymbol).char32At(0)) {
debug("No format fastpath: 0x0030 != getConstSymbol(DecimalFormatSymbols::kZeroDigitSymbol).char32At(0)");
} else if(fDecimalSeparatorAlwaysShown) {
@@ -1344,7 +1356,94 @@
return appendTo;
}
+DigitList&
+DecimalFormat::_round(const DigitList &number, DigitList &adjustedNum, UBool& isNegative, UErrorCode &status) const {
+ if (U_FAILURE(status)) {
+ return adjustedNum;
+ }
+ adjustedNum = number;
+ isNegative = false;
+ if (number.isNaN()) {
+ return adjustedNum;
+ }
+ // Do this BEFORE checking to see if value is infinite or negative! Sets the
+ // begin and end index to be length of the string composed of
+ // localized name of Infinite and the positive/negative localized
+ // signs.
+
+ adjustedNum.setRoundingMode(fRoundingMode);
+ if (fMultiplier != NULL) {
+ adjustedNum.mult(*fMultiplier, status);
+ if (U_FAILURE(status)) {
+ return adjustedNum;
+ }
+ }
+
+ if (fScale != 0) {
+ DigitList ten;
+ ten.set(10);
+ if (fScale > 0) {
+ for (int32_t i = fScale ; i > 0 ; i--) {
+ adjustedNum.mult(ten, status);
+ if (U_FAILURE(status)) {
+ return adjustedNum;
+ }
+ }
+ } else {
+ for (int32_t i = fScale ; i < 0 ; i++) {
+ adjustedNum.div(ten, status);
+ if (U_FAILURE(status)) {
+ return adjustedNum;
+ }
+ }
+ }
+ }
+
+ /*
+ * Note: sign is important for zero as well as non-zero numbers.
+ * Proper detection of -0.0 is needed to deal with the
+ * issues raised by bugs 4106658, 4106667, and 4147706. Liu 7/6/98.
+ */
+ isNegative = !adjustedNum.isPositive();
+
+ // Apply rounding after multiplier
+
+ adjustedNum.fContext.status &= ~DEC_Inexact;
+ if (fRoundingIncrement != NULL) {
+ adjustedNum.div(*fRoundingIncrement, status);
+ adjustedNum.toIntegralValue();
+ adjustedNum.mult(*fRoundingIncrement, status);
+ adjustedNum.trim();
+ if (U_FAILURE(status)) {
+ return adjustedNum;
+ }
+ }
+ if (fRoundingMode == kRoundUnnecessary && (adjustedNum.fContext.status & DEC_Inexact)) {
+ status = U_FORMAT_INEXACT_ERROR;
+ return adjustedNum;
+ }
+
+ if (adjustedNum.isInfinite()) {
+ return adjustedNum;
+ }
+
+ if (fUseExponentialNotation || areSignificantDigitsUsed()) {
+ int32_t sigDigits = precision();
+ if (sigDigits > 0) {
+ adjustedNum.round(sigDigits);
+ }
+ } else {
+ // Fixed point format. Round to a set number of fraction digits.
+ int32_t numFractionDigits = precision();
+ adjustedNum.roundFixedPoint(numFractionDigits);
+ }
+ if (fRoundingMode == kRoundUnnecessary && (adjustedNum.fContext.status & DEC_Inexact)) {
+ status = U_FORMAT_INEXACT_ERROR;
+ return adjustedNum;
+ }
+ return adjustedNum;
+}
UnicodeString&
DecimalFormat::_format(const DigitList &number,
@@ -1352,6 +1451,10 @@
FieldPositionHandler& handler,
UErrorCode &status) const
{
+ if (U_FAILURE(status)) {
+ return appendTo;
+ }
+
// Special case for NaN, sets the begin and end index to be the
// the string length of localized name of NaN.
if (number.isNaN())
@@ -1365,38 +1468,12 @@
return appendTo;
}
- // Do this BEFORE checking to see if value is infinite or negative! Sets the
- // begin and end index to be length of the string composed of
- // localized name of Infinite and the positive/negative localized
- // signs.
-
- DigitList adjustedNum(number); // Copy, so we do not alter the original.
- adjustedNum.setRoundingMode(fRoundingMode);
- if (fMultiplier != NULL) {
- adjustedNum.mult(*fMultiplier, status);
- }
-
- /*
- * Note: sign is important for zero as well as non-zero numbers.
- * Proper detection of -0.0 is needed to deal with the
- * issues raised by bugs 4106658, 4106667, and 4147706. Liu 7/6/98.
- */
- UBool isNegative = !adjustedNum.isPositive();
-
- // Apply rounding after multiplier
-
- adjustedNum.fContext.status &= ~DEC_Inexact;
- if (fRoundingIncrement != NULL) {
- adjustedNum.div(*fRoundingIncrement, status);
- adjustedNum.toIntegralValue();
- adjustedNum.mult(*fRoundingIncrement, status);
- adjustedNum.trim();
- }
- if (fRoundingMode == kRoundUnnecessary && (adjustedNum.fContext.status & DEC_Inexact)) {
- status = U_FORMAT_INEXACT_ERROR;
+ DigitList adjustedNum;
+ UBool isNegative;
+ _round(number, adjustedNum, isNegative, status);
+ if (U_FAILURE(status)) {
return appendTo;
}
-
// Special case for INFINITE,
if (adjustedNum.isInfinite()) {
@@ -1412,26 +1489,9 @@
addPadding(appendTo, handler, prefixLen, suffixLen);
return appendTo;
}
-
- if (fUseExponentialNotation || areSignificantDigitsUsed()) {
- int32_t sigDigits = precision();
- if (sigDigits > 0) {
- adjustedNum.round(sigDigits);
- }
- } else {
- // Fixed point format. Round to a set number of fraction digits.
- int32_t numFractionDigits = precision();
- adjustedNum.roundFixedPoint(numFractionDigits);
- }
- if (fRoundingMode == kRoundUnnecessary && (adjustedNum.fContext.status & DEC_Inexact)) {
- status = U_FORMAT_INEXACT_ERROR;
- return appendTo;
- }
-
return subformat(appendTo, handler, adjustedNum, FALSE, status);
}
-
UnicodeString&
DecimalFormat::format( const Formattable& obj,
UnicodeString& appendTo,
@@ -1859,7 +1919,7 @@
ParsePosition& pos) const {
Formattable parseResult;
int32_t start = pos.getIndex();
- UChar curbuf[4];
+ UChar curbuf[4] = {};
parse(text, parseResult, pos, curbuf);
if (pos.getIndex() != start) {
UErrorCode ec = U_ZERO_ERROR;
@@ -1969,6 +2029,22 @@
digits->div(*fMultiplier, ec);
}
+ if (fScale != 0) {
+ DigitList ten;
+ ten.set(10);
+ if (fScale > 0) {
+ for (int32_t i = fScale; i > 0; i--) {
+ UErrorCode ec = U_ZERO_ERROR;
+ digits->div(ten,ec);
+ }
+ } else {
+ for (int32_t i = fScale; i < 0; i++) {
+ UErrorCode ec = U_ZERO_ERROR;
+ digits->mult(ten,ec);
+ }
+ }
+ }
+
// Negative zero special case:
// if parsing integerOnly, change to +0, which goes into an int32 in a Formattable.
// if not parsing integerOnly, leave as -0, which a double can represent.
@@ -2160,7 +2236,7 @@
#endif
UBool fastParseOk = false; /* TRUE iff fast parse is OK */
- UBool fastParseHadDecimal = FALSE; /* true if fast parse saw a decimal point. */
+ // UBool fastParseHadDecimal = FALSE; /* true if fast parse saw a decimal point. */
const DecimalFormatInternal &data = internalData(fReserved);
if((data.fFastParseStatus==kFastpathYES) &&
!currencyParsing &&
@@ -2223,7 +2299,7 @@
} else if(ch == decimalChar) {
parsedNum.append((char)('.'), err);
decimalChar=0; // no more decimals.
- fastParseHadDecimal=TRUE;
+ // fastParseHadDecimal=TRUE;
} else if(ch == lookForGroup) {
// ignore grouping char. No decimals, so it has to be an ignorable grouping sep
} else if(intOnly && (lookForGroup!=0) && !u_isdigit(ch)) {
@@ -5477,6 +5553,10 @@
}
break;
+ case UNUM_SCALE:
+ fScale = newValue;
+ break;
+
default:
status = U_UNSUPPORTED_ERROR;
break;
@@ -5552,6 +5632,9 @@
case UNUM_FORMAT_FAIL_IF_MORE_THAN_MAX_DIGITS:
return fBoolFlags.get(attr);
+ case UNUM_SCALE:
+ return fScale;
+
default:
status = U_UNSUPPORTED_ERROR;
break;
diff --git a/i18n/dtfmtsym.cpp b/i18n/dtfmtsym.cpp
index 49fc310..270cfe1 100644
--- a/i18n/dtfmtsym.cpp
+++ b/i18n/dtfmtsym.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 1997-2012, International Business Machines Corporation and *
+* Copyright (C) 1997-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*
@@ -47,17 +47,18 @@
* resource data.
*/
-#define PATTERN_CHARS_LEN 31
+#define PATTERN_CHARS_LEN 34
/**
* Unlocalized date-time pattern characters. For example: 'y', 'd', etc. All
* locales use the same these unlocalized pattern characters.
*/
static const UChar gPatternChars[] = {
- // GyMdkHmsSEDFwWahKzYeugAZvcLQqVU
+ // GyMdkHmsSEDFwWahKzYeugAZvcLQqVUOXx
0x47, 0x79, 0x4D, 0x64, 0x6B, 0x48, 0x6D, 0x73, 0x53, 0x45,
0x44, 0x46, 0x77, 0x57, 0x61, 0x68, 0x4B, 0x7A, 0x59, 0x65,
- 0x75, 0x67, 0x41, 0x5A, 0x76, 0x63, 0x4c, 0x51, 0x71, 0x56, 0x55, 0
+ 0x75, 0x67, 0x41, 0x5A, 0x76, 0x63, 0x4c, 0x51, 0x71, 0x56,
+ 0x55, 0x4F, 0x58, 0x78, 0
};
/* length of an array */
@@ -162,6 +163,7 @@
static const char gDayNamesTag[]="dayNames";
static const char gNamesWideTag[]="wide";
static const char gNamesAbbrTag[]="abbreviated";
+static const char gNamesShortTag[]="short";
static const char gNamesNarrowTag[]="narrow";
static const char gNamesAllTag[]="all";
static const char gNamesLeapTag[]="leap";
@@ -303,9 +305,11 @@
assignArray(fStandaloneNarrowMonths, fStandaloneNarrowMonthsCount, other.fStandaloneNarrowMonths, other.fStandaloneNarrowMonthsCount);
assignArray(fWeekdays, fWeekdaysCount, other.fWeekdays, other.fWeekdaysCount);
assignArray(fShortWeekdays, fShortWeekdaysCount, other.fShortWeekdays, other.fShortWeekdaysCount);
+ assignArray(fShorterWeekdays, fShorterWeekdaysCount, other.fShorterWeekdays, other.fShorterWeekdaysCount);
assignArray(fNarrowWeekdays, fNarrowWeekdaysCount, other.fNarrowWeekdays, other.fNarrowWeekdaysCount);
assignArray(fStandaloneWeekdays, fStandaloneWeekdaysCount, other.fStandaloneWeekdays, other.fStandaloneWeekdaysCount);
assignArray(fStandaloneShortWeekdays, fStandaloneShortWeekdaysCount, other.fStandaloneShortWeekdays, other.fStandaloneShortWeekdaysCount);
+ assignArray(fStandaloneShorterWeekdays, fStandaloneShorterWeekdaysCount, other.fStandaloneShorterWeekdays, other.fStandaloneShorterWeekdaysCount);
assignArray(fStandaloneNarrowWeekdays, fStandaloneNarrowWeekdaysCount, other.fStandaloneNarrowWeekdays, other.fStandaloneNarrowWeekdaysCount);
assignArray(fAmPms, fAmPmsCount, other.fAmPms, other.fAmPmsCount);
assignArray(fQuarters, fQuartersCount, other.fQuarters, other.fQuartersCount);
@@ -363,28 +367,30 @@
void DateFormatSymbols::dispose()
{
- if (fEras) delete[] fEras;
- if (fEraNames) delete[] fEraNames;
- if (fNarrowEras) delete[] fNarrowEras;
- if (fMonths) delete[] fMonths;
- if (fShortMonths) delete[] fShortMonths;
- if (fNarrowMonths) delete[] fNarrowMonths;
- if (fStandaloneMonths) delete[] fStandaloneMonths;
- if (fStandaloneShortMonths) delete[] fStandaloneShortMonths;
- if (fStandaloneNarrowMonths) delete[] fStandaloneNarrowMonths;
- if (fWeekdays) delete[] fWeekdays;
- if (fShortWeekdays) delete[] fShortWeekdays;
- if (fNarrowWeekdays) delete[] fNarrowWeekdays;
- if (fStandaloneWeekdays) delete[] fStandaloneWeekdays;
- if (fStandaloneShortWeekdays) delete[] fStandaloneShortWeekdays;
- if (fStandaloneNarrowWeekdays) delete[] fStandaloneNarrowWeekdays;
- if (fAmPms) delete[] fAmPms;
- if (fQuarters) delete[] fQuarters;
- if (fShortQuarters) delete[] fShortQuarters;
- if (fStandaloneQuarters) delete[] fStandaloneQuarters;
- if (fStandaloneShortQuarters) delete[] fStandaloneShortQuarters;
- if (fLeapMonthPatterns) delete[] fLeapMonthPatterns;
- if (fShortYearNames) delete[] fShortYearNames;
+ if (fEras) delete[] fEras;
+ if (fEraNames) delete[] fEraNames;
+ if (fNarrowEras) delete[] fNarrowEras;
+ if (fMonths) delete[] fMonths;
+ if (fShortMonths) delete[] fShortMonths;
+ if (fNarrowMonths) delete[] fNarrowMonths;
+ if (fStandaloneMonths) delete[] fStandaloneMonths;
+ if (fStandaloneShortMonths) delete[] fStandaloneShortMonths;
+ if (fStandaloneNarrowMonths) delete[] fStandaloneNarrowMonths;
+ if (fWeekdays) delete[] fWeekdays;
+ if (fShortWeekdays) delete[] fShortWeekdays;
+ if (fShorterWeekdays) delete[] fShorterWeekdays;
+ if (fNarrowWeekdays) delete[] fNarrowWeekdays;
+ if (fStandaloneWeekdays) delete[] fStandaloneWeekdays;
+ if (fStandaloneShortWeekdays) delete[] fStandaloneShortWeekdays;
+ if (fStandaloneShorterWeekdays) delete[] fStandaloneShorterWeekdays;
+ if (fStandaloneNarrowWeekdays) delete[] fStandaloneNarrowWeekdays;
+ if (fAmPms) delete[] fAmPms;
+ if (fQuarters) delete[] fQuarters;
+ if (fShortQuarters) delete[] fShortQuarters;
+ if (fStandaloneQuarters) delete[] fStandaloneQuarters;
+ if (fStandaloneShortQuarters) delete[] fStandaloneShortQuarters;
+ if (fLeapMonthPatterns) delete[] fLeapMonthPatterns;
+ if (fShortYearNames) delete[] fShortYearNames;
disposeZoneStrings();
}
@@ -442,9 +448,11 @@
fStandaloneNarrowMonthsCount == other.fStandaloneNarrowMonthsCount &&
fWeekdaysCount == other.fWeekdaysCount &&
fShortWeekdaysCount == other.fShortWeekdaysCount &&
+ fShorterWeekdaysCount == other.fShorterWeekdaysCount &&
fNarrowWeekdaysCount == other.fNarrowWeekdaysCount &&
fStandaloneWeekdaysCount == other.fStandaloneWeekdaysCount &&
fStandaloneShortWeekdaysCount == other.fStandaloneShortWeekdaysCount &&
+ fStandaloneShorterWeekdaysCount == other.fStandaloneShorterWeekdaysCount &&
fStandaloneNarrowWeekdaysCount == other.fStandaloneNarrowWeekdaysCount &&
fAmPmsCount == other.fAmPmsCount &&
fQuartersCount == other.fQuartersCount &&
@@ -467,9 +475,11 @@
arrayCompare(fStandaloneNarrowMonths, other.fStandaloneNarrowMonths, fStandaloneNarrowMonthsCount) &&
arrayCompare(fWeekdays, other.fWeekdays, fWeekdaysCount) &&
arrayCompare(fShortWeekdays, other.fShortWeekdays, fShortWeekdaysCount) &&
+ arrayCompare(fShorterWeekdays, other.fShorterWeekdays, fShorterWeekdaysCount) &&
arrayCompare(fNarrowWeekdays, other.fNarrowWeekdays, fNarrowWeekdaysCount) &&
arrayCompare(fStandaloneWeekdays, other.fStandaloneWeekdays, fStandaloneWeekdaysCount) &&
arrayCompare(fStandaloneShortWeekdays, other.fStandaloneShortWeekdays, fStandaloneShortWeekdaysCount) &&
+ arrayCompare(fStandaloneShorterWeekdays, other.fStandaloneShorterWeekdays, fStandaloneShorterWeekdaysCount) &&
arrayCompare(fStandaloneNarrowWeekdays, other.fStandaloneNarrowWeekdays, fStandaloneNarrowWeekdaysCount) &&
arrayCompare(fAmPms, other.fAmPms, fAmPmsCount) &&
arrayCompare(fQuarters, other.fQuarters, fQuartersCount) &&
@@ -550,6 +560,7 @@
returnValue = fMonths;
break;
case ABBREVIATED :
+ case SHORT : // no month data for this, defaults to ABBREVIATED
count = fShortMonthsCount;
returnValue = fShortMonths;
break;
@@ -568,6 +579,7 @@
returnValue = fStandaloneMonths;
break;
case ABBREVIATED :
+ case SHORT : // no month data for this, defaults to ABBREVIATED
count = fStandaloneShortMonthsCount;
returnValue = fStandaloneShortMonths;
break;
@@ -614,6 +626,10 @@
count = fShortWeekdaysCount;
returnValue = fShortWeekdays;
break;
+ case SHORT :
+ count = fShorterWeekdaysCount;
+ returnValue = fShorterWeekdays;
+ break;
case NARROW :
count = fNarrowWeekdaysCount;
returnValue = fNarrowWeekdays;
@@ -632,6 +648,10 @@
count = fStandaloneShortWeekdaysCount;
returnValue = fStandaloneShortWeekdays;
break;
+ case SHORT :
+ count = fStandaloneShorterWeekdaysCount;
+ returnValue = fStandaloneShorterWeekdays;
+ break;
case NARROW :
count = fStandaloneNarrowWeekdaysCount;
returnValue = fStandaloneNarrowWeekdays;
@@ -659,6 +679,7 @@
returnValue = fQuarters;
break;
case ABBREVIATED :
+ case SHORT : // no quarter data for this, defaults to ABBREVIATED
count = fShortQuartersCount;
returnValue = fShortQuarters;
break;
@@ -677,6 +698,7 @@
returnValue = fStandaloneQuarters;
break;
case ABBREVIATED :
+ case SHORT : // no quarter data for this, defaults to ABBREVIATED
count = fStandaloneShortQuartersCount;
returnValue = fStandaloneShortQuarters;
break;
@@ -811,7 +833,7 @@
uprv_arrayCopy( monthsArray,fNarrowMonths,count);
fNarrowMonthsCount = count;
break;
- case DT_WIDTH_COUNT :
+ default :
break;
}
break;
@@ -838,7 +860,7 @@
uprv_arrayCopy( monthsArray,fStandaloneNarrowMonths,count);
fStandaloneNarrowMonthsCount = count;
break;
- case DT_WIDTH_COUNT :
+ default :
break;
}
break;
@@ -898,6 +920,13 @@
uprv_arrayCopy(weekdaysArray, fShortWeekdays, count);
fShortWeekdaysCount = count;
break;
+ case SHORT :
+ if (fShorterWeekdays)
+ delete[] fShorterWeekdays;
+ fShorterWeekdays = newUnicodeStringArray(count);
+ uprv_arrayCopy(weekdaysArray, fShorterWeekdays, count);
+ fShorterWeekdaysCount = count;
+ break;
case NARROW :
if (fNarrowWeekdays)
delete[] fNarrowWeekdays;
@@ -925,6 +954,13 @@
uprv_arrayCopy(weekdaysArray, fStandaloneShortWeekdays, count);
fStandaloneShortWeekdaysCount = count;
break;
+ case SHORT :
+ if (fStandaloneShorterWeekdays)
+ delete[] fStandaloneShorterWeekdays;
+ fStandaloneShorterWeekdays = newUnicodeStringArray(count);
+ uprv_arrayCopy(weekdaysArray, fStandaloneShorterWeekdays, count);
+ fStandaloneShorterWeekdaysCount = count;
+ break;
case NARROW :
if (fStandaloneNarrowWeekdays)
delete[] fStandaloneNarrowWeekdays;
@@ -974,7 +1010,7 @@
fNarrowQuartersCount = count;
*/
break;
- case DT_WIDTH_COUNT :
+ default :
break;
}
break;
@@ -1003,7 +1039,7 @@
fStandaloneNarrowQuartersCount = count;
*/
break;
- case DT_WIDTH_COUNT :
+ default :
break;
}
break;
@@ -1317,12 +1353,16 @@
fWeekdaysCount=0;
fShortWeekdays = NULL;
fShortWeekdaysCount=0;
+ fShorterWeekdays = NULL;
+ fShorterWeekdaysCount=0;
fNarrowWeekdays = NULL;
fNarrowWeekdaysCount=0;
fStandaloneWeekdays = NULL;
fStandaloneWeekdaysCount=0;
fStandaloneShortWeekdays = NULL;
fStandaloneShortWeekdaysCount=0;
+ fStandaloneShorterWeekdays = NULL;
+ fStandaloneShorterWeekdaysCount=0;
fStandaloneNarrowWeekdays = NULL;
fStandaloneNarrowWeekdaysCount=0;
fAmPms = NULL;
@@ -1425,19 +1465,19 @@
while ( (contextTransformUsage = ures_getNextResource(contextTransforms, NULL, &tempStatus)) != NULL ) {
const int32_t * intVector = ures_getIntVector(contextTransformUsage, &len, &status);
if (U_SUCCESS(tempStatus) && intVector != NULL && len >= 2) {
- const char* usageType = ures_getKey(contextTransformUsage);
- if (usageType != NULL) {
- const ContextUsageTypeNameToEnumValue * typeMapPtr = contextUsageTypeMap;
- int32_t compResult = 0;
- // linear search; list is short and we cannot be sure that bsearch is available
- while ( typeMapPtr->usageTypeName != NULL && (compResult = uprv_strcmp(usageType, typeMapPtr->usageTypeName)) > 0 ) {
- ++typeMapPtr;
- }
- if (typeMapPtr->usageTypeName != NULL && compResult == 0) {
- fCapitalization[typeMapPtr->usageTypeEnumValue][0] = intVector[0];
- fCapitalization[typeMapPtr->usageTypeEnumValue][1] = intVector[1];
- }
- }
+ const char* usageType = ures_getKey(contextTransformUsage);
+ if (usageType != NULL) {
+ const ContextUsageTypeNameToEnumValue * typeMapPtr = contextUsageTypeMap;
+ int32_t compResult = 0;
+ // linear search; list is short and we cannot be sure that bsearch is available
+ while ( typeMapPtr->usageTypeName != NULL && (compResult = uprv_strcmp(usageType, typeMapPtr->usageTypeName)) > 0 ) {
+ ++typeMapPtr;
+ }
+ if (typeMapPtr->usageTypeName != NULL && compResult == 0) {
+ fCapitalization[typeMapPtr->usageTypeEnumValue][0] = intVector[0];
+ fCapitalization[typeMapPtr->usageTypeEnumValue][1] = intVector[1];
+ }
+ }
}
tempStatus = U_ZERO_ERROR;
ures_close(contextTransformUsage);
@@ -1447,11 +1487,13 @@
ures_close(localeBundle);
}
- UResourceBundle *lsweekdaysData = NULL; // Data closed by calData
UResourceBundle *weekdaysData = NULL; // Data closed by calData
+ UResourceBundle *abbrWeekdaysData = NULL; // Data closed by calData
+ UResourceBundle *shorterWeekdaysData = NULL; // Data closed by calData
UResourceBundle *narrowWeekdaysData = NULL; // Data closed by calData
UResourceBundle *standaloneWeekdaysData = NULL; // Data closed by calData
- UResourceBundle *standaloneShortWeekdaysData = NULL; // Data closed by calData
+ UResourceBundle *standaloneAbbrWeekdaysData = NULL; // Data closed by calData
+ UResourceBundle *standaloneShorterWeekdaysData = NULL; // Data closed by calData
UResourceBundle *standaloneNarrowWeekdaysData = NULL; // Data closed by calData
U_LOCALE_BASED(locBased, *this);
@@ -1477,9 +1519,11 @@
initField(&fStandaloneNarrowMonths, fStandaloneNarrowMonthsCount, (const UChar *)gLastResortMonthNames, kMonthNum, kMonthLen, status);
initField(&fWeekdays, fWeekdaysCount, (const UChar *)gLastResortDayNames, kDayNum, kDayLen, status);
initField(&fShortWeekdays, fShortWeekdaysCount, (const UChar *)gLastResortDayNames, kDayNum, kDayLen, status);
+ initField(&fShorterWeekdays, fShorterWeekdaysCount, (const UChar *)gLastResortDayNames, kDayNum, kDayLen, status);
initField(&fNarrowWeekdays, fNarrowWeekdaysCount, (const UChar *)gLastResortDayNames, kDayNum, kDayLen, status);
initField(&fStandaloneWeekdays, fStandaloneWeekdaysCount, (const UChar *)gLastResortDayNames, kDayNum, kDayLen, status);
initField(&fStandaloneShortWeekdays, fStandaloneShortWeekdaysCount, (const UChar *)gLastResortDayNames, kDayNum, kDayLen, status);
+ initField(&fStandaloneShorterWeekdays, fStandaloneShorterWeekdaysCount, (const UChar *)gLastResortDayNames, kDayNum, kDayLen, status);
initField(&fStandaloneNarrowWeekdays, fStandaloneNarrowWeekdaysCount, (const UChar *)gLastResortDayNames, kDayNum, kDayLen, status);
initField(&fAmPms, fAmPmsCount, (const UChar *)gLastResortAmPmMarkers, kAmPmNum, kAmPmLen, status);
initField(&fQuarters, fQuartersCount, (const UChar *)gLastResortQuarters, kQuarterNum, kQuarterLen, status);
@@ -1563,6 +1607,7 @@
*/
fLocalPatternChars.setTo(TRUE, gPatternChars, PATTERN_CHARS_LEN);
+ // Format wide weekdays -> fWeekdays
// {sfb} fixed to handle 1-based weekdays
weekdaysData = calData.getByKey2(gDayNamesTag, gNamesWideTag, status);
fWeekdaysCount = ures_getSize(weekdaysData);
@@ -1580,8 +1625,9 @@
}
fWeekdaysCount++;
- lsweekdaysData = calData.getByKey2(gDayNamesTag, gNamesAbbrTag, status);
- fShortWeekdaysCount = ures_getSize(lsweekdaysData);
+ // Format abbreviated weekdays -> fShortWeekdays
+ abbrWeekdaysData = calData.getByKey2(gDayNamesTag, gNamesAbbrTag, status);
+ fShortWeekdaysCount = ures_getSize(abbrWeekdaysData);
fShortWeekdays = new UnicodeString[fShortWeekdaysCount+1];
/* test for NULL */
if (fShortWeekdays == 0) {
@@ -1590,12 +1636,34 @@
}
// leave fShortWeekdays[0] empty
for(i = 0; i<fShortWeekdaysCount; i++) {
- resStr = ures_getStringByIndex(lsweekdaysData, i, &len, &status);
+ resStr = ures_getStringByIndex(abbrWeekdaysData, i, &len, &status);
// setTo() - see assignArray comments
fShortWeekdays[i+1].setTo(TRUE, resStr, len);
}
fShortWeekdaysCount++;
+ // Format short weekdays -> fShorterWeekdays (fall back to abbreviated)
+ shorterWeekdaysData = calData.getByKey2(gDayNamesTag, gNamesShortTag, status);
+ if ( status == U_MISSING_RESOURCE_ERROR ) {
+ status = U_ZERO_ERROR;
+ shorterWeekdaysData = calData.getByKey2(gDayNamesTag, gNamesAbbrTag, status);
+ }
+ fShorterWeekdaysCount = ures_getSize(shorterWeekdaysData);
+ fShorterWeekdays = new UnicodeString[fShorterWeekdaysCount+1];
+ /* test for NULL */
+ if (fShorterWeekdays == 0) {
+ status = U_MEMORY_ALLOCATION_ERROR;
+ goto cleanup;
+ }
+ // leave fShorterWeekdays[0] empty
+ for(i = 0; i<fShorterWeekdaysCount; i++) {
+ resStr = ures_getStringByIndex(shorterWeekdaysData, i, &len, &status);
+ // setTo() - see assignArray comments
+ fShorterWeekdays[i+1].setTo(TRUE, resStr, len);
+ }
+ fShorterWeekdaysCount++;
+
+ // Format narrow weekdays -> fNarrowWeekdays
narrowWeekdaysData = calData.getByKey2(gDayNamesTag, gNamesNarrowTag, status);
if(status == U_MISSING_RESOURCE_ERROR) {
status = U_ZERO_ERROR;
@@ -1620,6 +1688,7 @@
}
fNarrowWeekdaysCount++;
+ // Stand-alone wide weekdays -> fStandaloneWeekdays
standaloneWeekdaysData = calData.getByKey3(gDayNamesTag, gNamesStandaloneTag, gNamesWideTag, status);
if ( status == U_MISSING_RESOURCE_ERROR ) {
status = U_ZERO_ERROR;
@@ -1640,12 +1709,13 @@
}
fStandaloneWeekdaysCount++;
- standaloneShortWeekdaysData = calData.getByKey3(gDayNamesTag, gNamesStandaloneTag, gNamesAbbrTag, status);
+ // Stand-alone abbreviated weekdays -> fStandaloneShortWeekdays
+ standaloneAbbrWeekdaysData = calData.getByKey3(gDayNamesTag, gNamesStandaloneTag, gNamesAbbrTag, status);
if ( status == U_MISSING_RESOURCE_ERROR ) {
status = U_ZERO_ERROR;
- standaloneShortWeekdaysData = calData.getByKey2(gDayNamesTag, gNamesAbbrTag, status);
+ standaloneAbbrWeekdaysData = calData.getByKey2(gDayNamesTag, gNamesAbbrTag, status);
}
- fStandaloneShortWeekdaysCount = ures_getSize(standaloneShortWeekdaysData);
+ fStandaloneShortWeekdaysCount = ures_getSize(standaloneAbbrWeekdaysData);
fStandaloneShortWeekdays = new UnicodeString[fStandaloneShortWeekdaysCount+1];
/* test for NULL */
if (fStandaloneShortWeekdays == 0) {
@@ -1654,12 +1724,34 @@
}
// leave fStandaloneShortWeekdays[0] empty
for(i = 0; i<fStandaloneShortWeekdaysCount; i++) {
- resStr = ures_getStringByIndex(standaloneShortWeekdaysData, i, &len, &status);
+ resStr = ures_getStringByIndex(standaloneAbbrWeekdaysData, i, &len, &status);
// setTo() - see assignArray comments
fStandaloneShortWeekdays[i+1].setTo(TRUE, resStr, len);
}
fStandaloneShortWeekdaysCount++;
+ // Stand-alone short weekdays -> fStandaloneShorterWeekdays (fall back to format abbreviated)
+ standaloneShorterWeekdaysData = calData.getByKey3(gDayNamesTag, gNamesStandaloneTag, gNamesShortTag, status);
+ if ( status == U_MISSING_RESOURCE_ERROR ) {
+ status = U_ZERO_ERROR;
+ standaloneShorterWeekdaysData = calData.getByKey2(gDayNamesTag, gNamesAbbrTag, status);
+ }
+ fStandaloneShorterWeekdaysCount = ures_getSize(standaloneShorterWeekdaysData);
+ fStandaloneShorterWeekdays = new UnicodeString[fStandaloneShorterWeekdaysCount+1];
+ /* test for NULL */
+ if (fStandaloneShorterWeekdays == 0) {
+ status = U_MEMORY_ALLOCATION_ERROR;
+ goto cleanup;
+ }
+ // leave fStandaloneShorterWeekdays[0] empty
+ for(i = 0; i<fStandaloneShorterWeekdaysCount; i++) {
+ resStr = ures_getStringByIndex(standaloneShorterWeekdaysData, i, &len, &status);
+ // setTo() - see assignArray comments
+ fStandaloneShorterWeekdays[i+1].setTo(TRUE, resStr, len);
+ }
+ fStandaloneShorterWeekdaysCount++;
+
+ // Stand-alone narrow weekdays -> fStandaloneNarrowWeekdays
standaloneNarrowWeekdaysData = calData.getByKey3(gDayNamesTag, gNamesStandaloneTag, gNamesNarrowTag, status);
if ( status == U_MISSING_RESOURCE_ERROR ) {
status = U_ZERO_ERROR;
diff --git a/i18n/dtptngen.cpp b/i18n/dtptngen.cpp
index 3cbfb19..200237b 100644
--- a/i18n/dtptngen.cpp
+++ b/i18n/dtptngen.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2007-2012, International Business Machines Corporation and
+* Copyright (C) 2007-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
@@ -589,7 +589,7 @@
key=NULL;
err = U_ZERO_ERROR;
- fBundle = ures_getByKeyWithFallback(calTypeBundle, DT_DateTimeFieldsTag, NULL, &err);
+ fBundle = ures_getByKeyWithFallback(rb, DT_DateTimeFieldsTag, NULL, &err);
for (i=0; i<MAX_RESOURCE_FIELD; ++i) {
err = U_ZERO_ERROR;
patBundle = ures_getByKeyWithFallback(fBundle, Resource_Fields[i], NULL, &err);
@@ -610,6 +610,7 @@
UBool firstTimeThrough = TRUE;
err = U_ZERO_ERROR;
initHashtable(err);
+ UBool override = TRUE;
while (TRUE) {
// At the start of the loop:
// - rb is the open resource bundle for the current locale being processed,
@@ -640,7 +641,7 @@
setAvailableFormat(retKey, err);
// Add pattern with its associated skeleton. Override any duplicate derived from std patterns,
// but not a previous availableFormats entry:
- addPatternWithSkeleton(format, &retKey, TRUE, conflictingPattern, err);
+ addPatternWithSkeleton(format, &retKey, override, conflictingPattern, err);
}
}
#if defined(U_USE_ASCII_BUNDLE_ITERATOR)
@@ -690,6 +691,9 @@
curLocaleName = parentLocale;
err = U_ZERO_ERROR;
}
+ if (uprv_strcmp(curLocaleName,"root")==0 || uprv_strlen(curLocaleName)==0) {
+ override = FALSE;
+ }
// Open calBundle and calTypeBundle
calBundle = ures_getByKeyWithFallback(rb, DT_DateTimeCalendarTag, NULL, &err);
if (U_SUCCESS(err)) {
@@ -920,15 +924,26 @@
matcher.set(*skeletonToUse, fp, skeleton); // no longer trims skeleton fields to max len 3, per #7930
matcher.getBasePattern(basePattern); // or perhaps instead: basePattern = *skeletonToUse;
}
+ // We only care about base conflicts - and replacing the pattern associated with a base - if:
+ // 1. the conflicting previous base pattern did *not* have an explicit skeleton; in that case the previous
+ // base + pattern combination was derived from either (a) a canonical item, (b) a standard format, or
+ // (c) a pattern specified programmatically with a previous call to addPattern (which would only happen
+ // if we are getting here from a subsequent call to addPattern).
+ // 2. a skeleton is specified for the current pattern, but override=false; in that case we are checking
+ // availableFormats items from root, which should not override any previous entry with the same base.
UBool entryHadSpecifiedSkeleton;
const UnicodeString *duplicatePattern = patternMap->getPatternFromBasePattern(basePattern, entryHadSpecifiedSkeleton);
- if (duplicatePattern != NULL ) {
+ if (duplicatePattern != NULL && (!entryHadSpecifiedSkeleton || (skeletonToUse != NULL && !override))) {
conflictingStatus = UDATPG_BASE_CONFLICT;
conflictingPattern = *duplicatePattern;
- if (!override || (skeletonToUse != NULL && entryHadSpecifiedSkeleton)) {
+ if (!override) {
return conflictingStatus;
}
}
+ // The only time we get here with override=true and skeletonToUse!=null is when adding availableFormats
+ // items from CLDR data. In that case, we don't want an item from a parent locale to replace an item with
+ // same skeleton from the specified locale, so skip the current item if skeletonWasSpecified is true for
+ // the previously-specified conflicting item.
const PtnSkeleton* entrySpecifiedSkeleton = NULL;
duplicatePattern = patternMap->getPatternFromSkeleton(skeleton, &entrySpecifiedSkeleton);
if (duplicatePattern != NULL ) {
@@ -1394,6 +1409,9 @@
}
// Overwrite the value.
curElem->pattern = value;
+ // It was a bug that we were not doing the following previously,
+ // though that bug hid other problems by making things partly work.
+ curElem->skeletonWasSpecified = skeletonWasSpecified;
}
}
} // PatternMap::add
diff --git a/i18n/fpositer.cpp b/i18n/fpositer.cpp
index b10df59..e289bc7 100644
--- a/i18n/fpositer.cpp
+++ b/i18n/fpositer.cpp
@@ -1,6 +1,6 @@
/*
******************************************************************************
-* Copyright (C) 2009-2010, International Business Machines Corporation and
+* Copyright (C) 2009-2012, International Business Machines Corporation and
* others. All Rights Reserved.
******************************************************************************
* Date Name Description
@@ -18,8 +18,6 @@
U_NAMESPACE_BEGIN
-UOBJECT_DEFINE_NO_RTTI_IMPLEMENTATION(FieldPositionIterator)
-
FieldPositionIterator::~FieldPositionIterator() {
delete data;
data = NULL;
diff --git a/i18n/gender.cpp b/i18n/gender.cpp
index f269a22..4eac9e1 100644
--- a/i18n/gender.cpp
+++ b/i18n/gender.cpp
@@ -63,8 +63,6 @@
GenderInfo::~GenderInfo() {
}
-UOBJECT_DEFINE_NO_RTTI_IMPLEMENTATION(GenderInfo)
-
const GenderInfo* GenderInfo::getInstance(const Locale& locale, UErrorCode& status) {
if (U_FAILURE(status)) {
return NULL;
@@ -173,7 +171,7 @@
if (U_FAILURE(status)) {
return UGENDER_OTHER;
}
- if (length == 0 || _style == NEUTRAL) {
+ if (length == 0) {
return UGENDER_OTHER;
}
if (length == 1) {
@@ -182,6 +180,8 @@
UBool has_female = FALSE;
UBool has_male = FALSE;
switch (_style) {
+ case NEUTRAL:
+ return UGENDER_OTHER;
case MIXED_NEUTRAL:
for (int32_t i = 0; i < length; ++i) {
switch (genders[i]) {
diff --git a/i18n/i18n.vcxproj b/i18n/i18n.vcxproj
index c1d67cd..9e22d55 100644
--- a/i18n/i18n.vcxproj
+++ b/i18n/i18n.vcxproj
@@ -107,7 +107,7 @@
<AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin\icuin50.dll</OutputFile>
+ <OutputFile>..\..\bin\icuin51.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib\icuin.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -151,7 +151,7 @@
<AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin\icuin50d.dll</OutputFile>
+ <OutputFile>..\..\bin\icuin51d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib\icuind.pdb</ProgramDatabaseFile>
@@ -192,7 +192,7 @@
<AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin64\icuin50.dll</OutputFile>
+ <OutputFile>..\..\bin64\icuin51.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib64\icuin.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -234,7 +234,7 @@
<AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin64\icuin50d.dll</OutputFile>
+ <OutputFile>..\..\bin64\icuin51d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib64\icuind.pdb</ProgramDatabaseFile>
@@ -245,12 +245,10 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="alphaindex.cpp" />
- <ClCompile Include="bms.cpp" />
- <ClCompile Include="bmsearch.cpp" />
<ClCompile Include="bocsu.cpp" />
<ClCompile Include="coleitr.cpp" />
<ClCompile Include="coll.cpp" />
- <ClCompile Include="colldata.cpp" />
+ <ClCompile Include="region.cpp" />
<ClCompile Include="search.cpp" />
<ClCompile Include="sortkey.cpp" />
<ClCompile Include="stsearch.cpp" />
@@ -276,11 +274,13 @@
<ClCompile Include="cecal.cpp" />
<ClCompile Include="chnsecal.cpp" />
<ClCompile Include="choicfmt.cpp" />
+ <ClCompile Include="compactdecimalformat.cpp" />
<ClCompile Include="coptccal.cpp" />
<ClCompile Include="curramt.cpp" />
<ClCompile Include="currfmt.cpp" />
<ClCompile Include="currpinf.cpp" />
<ClCompile Include="currunit.cpp" />
+ <ClCompile Include="dangical.cpp" />
<ClCompile Include="datefmt.cpp" />
<ClCompile Include="dcfmtsym.cpp" />
<ClCompile Include="decContext.c" />
@@ -303,6 +303,7 @@
<ClCompile Include="gregocal.cpp" />
<ClCompile Include="gregoimp.cpp" />
<ClCompile Include="hebrwcal.cpp" />
+ <ClCompile Include="identifier_info.cpp" />
<ClCompile Include="indiancal.cpp" />
<ClCompile Include="islamcal.cpp" />
<ClCompile Include="japancal.cpp" />
@@ -324,6 +325,7 @@
<ClCompile Include="reldtfmt.cpp" />
<ClCompile Include="selfmt.cpp" />
<ClCompile Include="simpletz.cpp" />
+ <ClCompile Include="scriptset.cpp" />
<ClCompile Include="smpdtfmt.cpp" />
<ClCompile Include="smpdtfst.cpp" />
<ClCompile Include="taiwncal.cpp" />
@@ -438,34 +440,6 @@
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
</CustomBuild>
- <CustomBuild Include="unicode\bms.h">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\include\unicode
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" ..\..\include\unicode
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="unicode\bmsearch.h">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\include\unicode
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" ..\..\include\unicode
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
- </CustomBuild>
<ClInclude Include="bocsu.h" />
<CustomBuild Include="unicode\coleitr.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode
@@ -495,20 +469,6 @@
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
</CustomBuild>
- <CustomBuild Include="unicode\colldata.h">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\include\unicode
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" ..\..\include\unicode
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
- </CustomBuild>
<CustomBuild Include="unicode\search.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode
</Command>
@@ -581,6 +541,7 @@
</CustomBuild>
<ClInclude Include="dcfmtimp.h" />
<ClInclude Include="numsys_impl.h" />
+ <ClInclude Include="region_impl.h" />
<ClInclude Include="selfmtimpl.h" />
<ClInclude Include="tzgnames.h" />
<ClInclude Include="tznames_impl.h" />
@@ -638,6 +599,7 @@
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
</CustomBuild>
+ <ClInclude Include="unicode\region.h" />
<ClInclude Include="usrchimp.h" />
<ClInclude Include="astro.h" />
<CustomBuild Include="unicode\basictz.h">
@@ -685,6 +647,20 @@
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
</CustomBuild>
+ <CustomBuild Include="unicode\compactdecimalformat.h">
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\include\unicode
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" ..\..\include\unicode
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
+ </CustomBuild>
<ClInclude Include="coptccal.h" />
<CustomBuild Include="unicode\curramt.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode
@@ -729,6 +705,7 @@
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
</CustomBuild>
+ <ClInclude Include="dangical.h" />
<CustomBuild Include="unicode\datefmt.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode
</Command>
@@ -1573,6 +1550,8 @@
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
</CustomBuild>
+ <ClInclude Include="identifier_info.h" />
+ <ClInclude Include="scriptset.h" />
<ClInclude Include="uspoof_conf.h" />
<ClInclude Include="uspoof_impl.h" />
<ClInclude Include="uspoof_wsconf.h" />
@@ -1589,4 +1568,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/i18n/i18n.vcxproj.filters b/i18n/i18n.vcxproj.filters
index 5daaa98..6138b54 100644
--- a/i18n/i18n.vcxproj.filters
+++ b/i18n/i18n.vcxproj.filters
@@ -24,21 +24,12 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="bms.cpp">
- <Filter>collation</Filter>
- </ClCompile>
- <ClCompile Include="bmsearch.cpp">
- <Filter>collation</Filter>
- </ClCompile>
<ClCompile Include="coleitr.cpp">
<Filter>collation</Filter>
</ClCompile>
<ClCompile Include="coll.cpp">
<Filter>collation</Filter>
</ClCompile>
- <ClCompile Include="colldata.cpp">
- <Filter>collation</Filter>
- </ClCompile>
<ClCompile Include="search.cpp">
<Filter>collation</Filter>
</ClCompile>
@@ -117,6 +108,9 @@
<ClCompile Include="currunit.cpp">
<Filter>formatting</Filter>
</ClCompile>
+ <ClCompile Include="dangical.cpp">
+ <Filter>formatting</Filter>
+ </ClCompile>
<ClCompile Include="datefmt.cpp">
<Filter>formatting</Filter>
</ClCompile>
@@ -465,6 +459,12 @@
<ClCompile Include="ucsdet.cpp">
<Filter>charset detect</Filter>
</ClCompile>
+ <ClCompile Include="identifier_info.cpp">
+ <Filter>spoof</Filter>
+ </ClCompile>
+ <ClCompile Include="scriptset.cpp">
+ <Filter>spoof</Filter>
+ </ClCompile>
<ClCompile Include="uspoof.cpp">
<Filter>spoof</Filter>
</ClCompile>
@@ -495,7 +495,13 @@
<ClCompile Include="tznames_impl.cpp">
<Filter>formatting</Filter>
</ClCompile>
+ <ClCompile Include="compactdecimalformat.cpp">
+ <Filter>formatting</Filter>
+ </ClCompile>
<ClCompile Include="bocsu.cpp" />
+ <ClCompile Include="region.cpp">
+ <Filter>formatting</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="bocsu.h">
@@ -540,6 +546,9 @@
<ClInclude Include="currfmt.h">
<Filter>formatting</Filter>
</ClInclude>
+ <ClInclude Include="dangical.h">
+ <Filter>formatting</Filter>
+ </ClInclude>
<ClInclude Include="decContext.h">
<Filter>formatting</Filter>
</ClInclude>
@@ -762,6 +771,12 @@
<ClInclude Include="inputext.h">
<Filter>charset detect</Filter>
</ClInclude>
+ <ClInclude Include="identifier_info.h">
+ <Filter>spoof</Filter>
+ </ClInclude>
+ <ClInclude Include="scriptset.h">
+ <Filter>spoof</Filter>
+ </ClInclude>
<ClInclude Include="uspoof_conf.h">
<Filter>spoof</Filter>
</ClInclude>
@@ -786,6 +801,12 @@
<ClInclude Include="selfmtimpl.h">
<Filter>formatting</Filter>
</ClInclude>
+ <ClInclude Include="region_impl.h">
+ <Filter>formatting</Filter>
+ </ClInclude>
+ <ClInclude Include="unicode\region.h">
+ <Filter>formatting</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="i18n.rc">
@@ -793,21 +814,12 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="unicode\bms.h">
- <Filter>collation</Filter>
- </CustomBuild>
- <CustomBuild Include="unicode\bmsearch.h">
- <Filter>collation</Filter>
- </CustomBuild>
<CustomBuild Include="unicode\coleitr.h">
<Filter>collation</Filter>
</CustomBuild>
<CustomBuild Include="unicode\coll.h">
<Filter>collation</Filter>
</CustomBuild>
- <CustomBuild Include="unicode\colldata.h">
- <Filter>collation</Filter>
- </CustomBuild>
<CustomBuild Include="unicode\search.h">
<Filter>collation</Filter>
</CustomBuild>
@@ -1019,5 +1031,8 @@
<CustomBuild Include="unicode\tznames.h">
<Filter>formatting</Filter>
</CustomBuild>
+ <CustomBuild Include="unicode\compactdecimalformat.h">
+ <Filter>formatting</Filter>
+ </CustomBuild>
</ItemGroup>
</Project>
diff --git a/i18n/identifier_info.cpp b/i18n/identifier_info.cpp
new file mode 100644
index 0000000..369a067
--- /dev/null
+++ b/i18n/identifier_info.cpp
@@ -0,0 +1,318 @@
+/*
+**********************************************************************
+* Copyright (C) 2012-2013, International Business Machines
+* Corporation and others. All Rights Reserved.
+**********************************************************************
+*/
+
+#include "unicode/utypes.h"
+
+#include "unicode/uchar.h"
+#include "unicode/utf16.h"
+
+#include "identifier_info.h"
+#include "mutex.h"
+#include "scriptset.h"
+#include "ucln_in.h"
+#include "uvector.h"
+
+U_NAMESPACE_BEGIN
+
+#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
+
+static UMutex gInitMutex = U_MUTEX_INITIALIZER;
+static UBool gStaticsAreInitialized = FALSE;
+
+UnicodeSet *IdentifierInfo::ASCII;
+ScriptSet *IdentifierInfo::JAPANESE;
+ScriptSet *IdentifierInfo::CHINESE;
+ScriptSet *IdentifierInfo::KOREAN;
+ScriptSet *IdentifierInfo::CONFUSABLE_WITH_LATIN;
+
+UBool IdentifierInfo::cleanup() {
+ delete ASCII;
+ ASCII = NULL;
+ delete JAPANESE;
+ JAPANESE = NULL;
+ delete CHINESE;
+ CHINESE = NULL;
+ delete KOREAN;
+ KOREAN = NULL;
+ delete CONFUSABLE_WITH_LATIN;
+ CONFUSABLE_WITH_LATIN = NULL;
+ gStaticsAreInitialized = FALSE;
+ return TRUE;
+}
+
+U_CDECL_BEGIN
+static UBool U_CALLCONV
+IdentifierInfo_cleanup(void) {
+ return IdentifierInfo::cleanup();
+}
+U_CDECL_END
+
+
+IdentifierInfo::IdentifierInfo(UErrorCode &status):
+ fIdentifier(NULL), fRequiredScripts(NULL), fScriptSetSet(NULL),
+ fCommonAmongAlternates(NULL), fNumerics(NULL), fIdentifierProfile(NULL) {
+ if (U_FAILURE(status)) {
+ return;
+ }
+ {
+ Mutex lock(&gInitMutex);
+ if (!gStaticsAreInitialized) {
+ ASCII = new UnicodeSet(0, 0x7f);
+ JAPANESE = new ScriptSet();
+ CHINESE = new ScriptSet();
+ KOREAN = new ScriptSet();
+ CONFUSABLE_WITH_LATIN = new ScriptSet();
+ if (ASCII == NULL || JAPANESE == NULL || CHINESE == NULL || KOREAN == NULL
+ || CONFUSABLE_WITH_LATIN == NULL) {
+ status = U_MEMORY_ALLOCATION_ERROR;
+ return;
+ }
+ ASCII->freeze();
+ JAPANESE->set(USCRIPT_LATIN, status).set(USCRIPT_HAN, status).set(USCRIPT_HIRAGANA, status)
+ .set(USCRIPT_KATAKANA, status);
+ CHINESE->set(USCRIPT_LATIN, status).set(USCRIPT_HAN, status).set(USCRIPT_BOPOMOFO, status);
+ KOREAN->set(USCRIPT_LATIN, status).set(USCRIPT_HAN, status).set(USCRIPT_HANGUL, status);
+ CONFUSABLE_WITH_LATIN->set(USCRIPT_CYRILLIC, status).set(USCRIPT_GREEK, status)
+ .set(USCRIPT_CHEROKEE, status);
+ ucln_i18n_registerCleanup(UCLN_I18N_IDENTIFIER_INFO, IdentifierInfo_cleanup);
+ gStaticsAreInitialized = TRUE;
+ }
+ }
+ fIdentifier = new UnicodeString();
+ fRequiredScripts = new ScriptSet();
+ fScriptSetSet = uhash_open(uhash_hashScriptSet, uhash_compareScriptSet, NULL, &status);
+ uhash_setKeyDeleter(fScriptSetSet, uhash_deleteScriptSet);
+ fCommonAmongAlternates = new ScriptSet();
+ fNumerics = new UnicodeSet();
+ fIdentifierProfile = new UnicodeSet(0, 0x10FFFF);
+
+ if (U_SUCCESS(status) && (fIdentifier == NULL || fRequiredScripts == NULL || fScriptSetSet == NULL ||
+ fCommonAmongAlternates == NULL || fNumerics == NULL || fIdentifierProfile == NULL)) {
+ status = U_MEMORY_ALLOCATION_ERROR;
+ }
+}
+
+IdentifierInfo::~IdentifierInfo() {
+ delete fIdentifier;
+ delete fRequiredScripts;
+ uhash_close(fScriptSetSet);
+ delete fCommonAmongAlternates;
+ delete fNumerics;
+ delete fIdentifierProfile;
+}
+
+
+IdentifierInfo &IdentifierInfo::clear() {
+ fRequiredScripts->resetAll();
+ uhash_removeAll(fScriptSetSet);
+ fNumerics->clear();
+ fCommonAmongAlternates->resetAll();
+ return *this;
+}
+
+
+IdentifierInfo &IdentifierInfo::setIdentifierProfile(const UnicodeSet &identifierProfile) {
+ *fIdentifierProfile = identifierProfile;
+ return *this;
+}
+
+
+const UnicodeSet &IdentifierInfo::getIdentifierProfile() const {
+ return *fIdentifierProfile;
+}
+
+
+IdentifierInfo &IdentifierInfo::setIdentifier(const UnicodeString &identifier, UErrorCode &status) {
+ if (U_FAILURE(status)) {
+ return *this;
+ }
+ *fIdentifier = identifier;
+ clear();
+ ScriptSet scriptsForCP;
+ UChar32 cp;
+ for (int32_t i = 0; i < identifier.length(); i += U16_LENGTH(cp)) {
+ cp = identifier.char32At(i);
+ // Store a representative character for each kind of decimal digit
+ if (u_charType(cp) == U_DECIMAL_DIGIT_NUMBER) {
+ // Just store the zero character as a representative for comparison. Unicode guarantees it is cp - value
+ fNumerics->add(cp - (UChar32)u_getNumericValue(cp));
+ }
+ UScriptCode extensions[500];
+ int32_t extensionsCount = uscript_getScriptExtensions(cp, extensions, LENGTHOF(extensions), &status);
+ if (U_FAILURE(status)) {
+ return *this;
+ }
+ scriptsForCP.resetAll();
+ for (int32_t j=0; j<extensionsCount; j++) {
+ scriptsForCP.set(extensions[j], status);
+ }
+ scriptsForCP.reset(USCRIPT_COMMON, status);
+ scriptsForCP.reset(USCRIPT_INHERITED, status);
+ switch (scriptsForCP.countMembers()) {
+ case 0: break;
+ case 1:
+ // Single script, record it.
+ fRequiredScripts->Union(scriptsForCP);
+ break;
+ default:
+ if (!fRequiredScripts->intersects(scriptsForCP)
+ && !uhash_geti(fScriptSetSet, &scriptsForCP)) {
+ // If the set hasn't been added already, add it
+ // (Add a copy, fScriptSetSet takes ownership of the copy.)
+ uhash_puti(fScriptSetSet, new ScriptSet(scriptsForCP), 1, &status);
+ }
+ break;
+ }
+ }
+ // Now make a final pass through ScriptSetSet to remove alternates that came before singles.
+ // [Kana], [Kana Hira] => [Kana]
+ // This is relatively infrequent, so doesn't have to be optimized.
+ // We also compute any commonalities among the alternates.
+ if (uhash_count(fScriptSetSet) > 0) {
+ fCommonAmongAlternates->setAll();
+ for (int32_t it = -1;;) {
+ const UHashElement *nextHashEl = uhash_nextElement(fScriptSetSet, &it);
+ if (nextHashEl == NULL) {
+ break;
+ }
+ ScriptSet *next = static_cast<ScriptSet *>(nextHashEl->key.pointer);
+ // [Kana], [Kana Hira] => [Kana]
+ if (fRequiredScripts->intersects(*next)) {
+ uhash_removeElement(fScriptSetSet, nextHashEl);
+ } else {
+ fCommonAmongAlternates->intersect(*next);
+ // [[Arab Syrc Thaa]; [Arab Syrc]] => [[Arab Syrc]]
+ for (int32_t otherIt = -1;;) {
+ const UHashElement *otherHashEl = uhash_nextElement(fScriptSetSet, &otherIt);
+ if (otherHashEl == NULL) {
+ break;
+ }
+ ScriptSet *other = static_cast<ScriptSet *>(otherHashEl->key.pointer);
+ if (next != other && next->contains(*other)) {
+ uhash_removeElement(fScriptSetSet, nextHashEl);
+ break;
+ }
+ }
+ }
+ }
+ }
+ if (uhash_count(fScriptSetSet) == 0) {
+ fCommonAmongAlternates->resetAll();
+ }
+ return *this;
+}
+
+
+const UnicodeString *IdentifierInfo::getIdentifier() const {
+ return fIdentifier;
+}
+
+const ScriptSet *IdentifierInfo::getScripts() const {
+ return fRequiredScripts;
+}
+
+const UHashtable *IdentifierInfo::getAlternates() const {
+ return fScriptSetSet;
+}
+
+
+const UnicodeSet *IdentifierInfo::getNumerics() const {
+ return fNumerics;
+}
+
+const ScriptSet *IdentifierInfo::getCommonAmongAlternates() const {
+ return fCommonAmongAlternates;
+}
+
+#if !UCONFIG_NO_NORMALIZATION
+
+URestrictionLevel IdentifierInfo::getRestrictionLevel(UErrorCode &status) const {
+ if (!fIdentifierProfile->containsAll(*fIdentifier) || getNumerics()->size() > 1) {
+ return USPOOF_UNRESTRICTIVE;
+ }
+ if (ASCII->containsAll(*fIdentifier)) {
+ return USPOOF_ASCII;
+ }
+ // This is a bit tricky. We look at a number of factors.
+ // The number of scripts in the text.
+ // Plus 1 if there is some commonality among the alternates (eg [Arab Thaa]; [Arab Syrc])
+ // Plus number of alternates otherwise (this only works because we only test cardinality up to 2.)
+
+ // Note: the requiredScripts set omits COMMON and INHERITED; they are taken out at the
+ // time it is created, in setIdentifier().
+ int32_t cardinalityPlus = fRequiredScripts->countMembers() +
+ (fCommonAmongAlternates->countMembers() == 0 ? uhash_count(fScriptSetSet) : 1);
+ if (cardinalityPlus < 2) {
+ return USPOOF_HIGHLY_RESTRICTIVE;
+ }
+ if (containsWithAlternates(*JAPANESE, *fRequiredScripts) || containsWithAlternates(*CHINESE, *fRequiredScripts)
+ || containsWithAlternates(*KOREAN, *fRequiredScripts)) {
+ return USPOOF_HIGHLY_RESTRICTIVE;
+ }
+ if (cardinalityPlus == 2 &&
+ fRequiredScripts->test(USCRIPT_LATIN, status) &&
+ !fRequiredScripts->intersects(*CONFUSABLE_WITH_LATIN)) {
+ return USPOOF_MODERATELY_RESTRICTIVE;
+ }
+ return USPOOF_MINIMALLY_RESTRICTIVE;
+}
+
+#endif /* !UCONFIG_NO_NORMALIZATION */
+
+int32_t IdentifierInfo::getScriptCount() const {
+ // Note: Common and Inherited scripts were removed by setIdentifier(), and do not appear in fRequiredScripts.
+ int32_t count = fRequiredScripts->countMembers() +
+ (fCommonAmongAlternates->countMembers() == 0 ? uhash_count(fScriptSetSet) : 1);
+ return count;
+}
+
+
+
+UBool IdentifierInfo::containsWithAlternates(const ScriptSet &container, const ScriptSet &containee) const {
+ if (!container.contains(containee)) {
+ return FALSE;
+ }
+ for (int32_t iter = -1; ;) {
+ const UHashElement *hashEl = uhash_nextElement(fScriptSetSet, &iter);
+ if (hashEl == NULL) {
+ break;
+ }
+ ScriptSet *alternatives = static_cast<ScriptSet *>(hashEl->key.pointer);
+ if (!container.intersects(*alternatives)) {
+ return false;
+ }
+ }
+ return true;
+}
+
+UnicodeString &IdentifierInfo::displayAlternates(UnicodeString &dest, const UHashtable *alternates, UErrorCode &status) {
+ UVector sorted(status);
+ if (U_FAILURE(status)) {
+ return dest;
+ }
+ for (int32_t pos = -1; ;) {
+ const UHashElement *el = uhash_nextElement(alternates, &pos);
+ if (el == NULL) {
+ break;
+ }
+ ScriptSet *ss = static_cast<ScriptSet *>(el->key.pointer);
+ sorted.addElement(ss, status);
+ }
+ sorted.sort(uhash_compareScriptSet, status);
+ UnicodeString separator = UNICODE_STRING_SIMPLE("; ");
+ for (int32_t i=0; i<sorted.size(); i++) {
+ if (i>0) {
+ dest.append(separator);
+ }
+ ScriptSet *ss = static_cast<ScriptSet *>(sorted.elementAt(i));
+ ss->displayScripts(dest);
+ }
+ return dest;
+}
+
+U_NAMESPACE_END
+
diff --git a/i18n/identifier_info.h b/i18n/identifier_info.h
new file mode 100644
index 0000000..c7cab61
--- /dev/null
+++ b/i18n/identifier_info.h
@@ -0,0 +1,204 @@
+/*
+**********************************************************************
+* Copyright (C) 2013, International Business Machines
+* Corporation and others. All Rights Reserved.
+**********************************************************************
+*
+* indentifier_info.h
+*
+* created on: 2013 Jan 7
+* created by: Andy Heninger
+*/
+
+#ifndef __IDENTIFIER_INFO_H__
+#define __IDENTIFIER_INFO_H__
+
+#include "unicode/utypes.h"
+
+#include "unicode/uniset.h"
+#include "unicode/uspoof.h"
+#include "uhash.h"
+
+U_NAMESPACE_BEGIN
+
+class ScriptSet;
+
+// TODO(andy): review consistency of reference vs pointer arguments to the funcions.
+
+/**
+ * This class analyzes a possible identifier for script and identifier status. Use it by calling setIdentifierProfile
+ * then setIdentifier. Available methods include:
+ * <ol>
+ * <li>call getScripts for the specific scripts in the identifier. The identifier contains at least one character in
+ * each of these.
+ * <li>call getAlternates to get cases where a character is not limited to a single script. For example, it could be
+ * either Katakana or Hiragana.
+ * <li>call getCommonAmongAlternates to find out if any scripts are common to all the alternates.
+ * <li>call getNumerics to get a representative character (with value zero) for each of the decimal number systems in
+ * the identifier.
+ * <li>call getRestrictionLevel to see what the UTS36 restriction level is.
+ * </ol>
+ *
+ * This is a port from ICU4J of class com.ibm.icu.text.IdentifierInfo
+ */
+class U_I18N_API IdentifierInfo : public UMemory {
+
+ public:
+ /**
+ * Create an identifier info object. Subsequently, call setIdentifier(), etc.
+ * @internal
+ */
+ IdentifierInfo(UErrorCode &status);
+
+ /**
+ * Destructor
+ */
+ virtual ~IdentifierInfo();
+
+ private:
+ /* Disallow copying for now. Can be added if there's a need. */
+ IdentifierInfo(const IdentifierInfo &other);
+
+ public:
+
+ /**
+ * Set the identifier profile: the characters that are to be allowed in the identifier.
+ *
+ * @param identifierProfile the characters that are to be allowed in the identifier
+ * @return this
+ * @internal
+ */
+ IdentifierInfo &setIdentifierProfile(const UnicodeSet &identifierProfile);
+
+ /**
+ * Get the identifier profile: the characters that are to be allowed in the identifier.
+ *
+ * @return The characters that are to be allowed in the identifier.
+ * @internal
+ */
+ const UnicodeSet &getIdentifierProfile() const;
+
+
+ /**
+ * Set an identifier to analyze. Afterwards, call methods like getScripts()
+ *
+ * @param identifier the identifier to analyze
+ * @param status Errorcode, set if errors occur.
+ * @return this
+ * @internal
+ */
+ IdentifierInfo &setIdentifier(const UnicodeString &identifier, UErrorCode &status);
+
+
+ /**
+ * Get the identifier that was analyzed. The returned string is owned by the ICU library,
+ * and must not be deleted by the caller.
+ *
+ * @return the identifier that was analyzed.
+ * @internal
+ */
+ const UnicodeString *getIdentifier() const;
+
+
+ /**
+ * Get the scripts found in the identifiers.
+ *
+ * @return the set of explicit scripts.
+ * @internal
+ */
+ const ScriptSet *getScripts() const;
+
+ /**
+ * Get the set of alternate scripts found in the identifiers. That is, when a character can be in two scripts, then
+ * the set consisting of those scripts will be returned.
+ *
+ * @return a uhash, with each key being of type (ScriptSet *).
+ * This is a set, not a map, so the value stored in the uhash is not relevant.
+ * (It is, in fact, 1).
+ * Ownership of the uhash and its contents remains with the IndetifierInfo object,
+ * and remains valid until a new identifer is set or until the object is deleted.
+ * @internal
+ */
+ const UHashtable *getAlternates() const;
+
+ /**
+ * Get the representative characters (zeros) for the numerics found in the identifier.
+ *
+ * @return the set of explicit scripts.
+ * @internal
+ */
+ const UnicodeSet *getNumerics() const;
+
+ /**
+ * Find out which scripts are in common among the alternates.
+ *
+ * @return the set of scripts that are in common among the alternates.
+ * @internal
+ */
+ const ScriptSet *getCommonAmongAlternates() const;
+
+ /**
+ * Get the number of scripts appearing in the identifier.
+ * Note: Common and Inherited scripts are omitted from the count.
+ * Note: Result may be high when the identifier contains characters
+ * with alternate scripts. The distinction between
+ * 0, 1 and > 1 will remain valid, however.
+ * @return the number of scripts.
+ */
+ int32_t getScriptCount() const;
+
+#if !UCONFIG_NO_NORMALIZATION
+
+ /**
+ * Find the "tightest" restriction level that the identifier satisfies.
+ *
+ * @return the restriction level.
+ * @internal
+ */
+ URestrictionLevel getRestrictionLevel(UErrorCode &status) const;
+
+#endif /*!UCONFIG_NO_NORMALIZATION */
+
+ UnicodeString toString() const;
+
+ /**
+ * Produce a readable string of alternates.
+ *
+ * @param alternates a UHashtable of UScriptSets.
+ * Keys only, no meaningful values in the UHash.
+ * @return display form
+ * @internal
+ */
+ static UnicodeString &displayAlternates(UnicodeString &dest, const UHashtable *alternates, UErrorCode &status);
+
+ /**
+ * Static memory cleanup function.
+ * @internal
+ */
+ static UBool cleanup();
+ private:
+
+ IdentifierInfo & clear();
+ UBool containsWithAlternates(const ScriptSet &container, const ScriptSet &containee) const;
+
+ UnicodeString *fIdentifier;
+ ScriptSet *fRequiredScripts;
+ UHashtable *fScriptSetSet;
+ ScriptSet *fCommonAmongAlternates;
+ UnicodeSet *fNumerics;
+ UnicodeSet *fIdentifierProfile;
+
+ static UnicodeSet *ASCII;
+ static ScriptSet *JAPANESE;
+ static ScriptSet *CHINESE;
+ static ScriptSet *KOREAN;
+ static ScriptSet *CONFUSABLE_WITH_LATIN;
+
+
+
+};
+
+U_NAMESPACE_END
+
+#endif // __IDENTIFIER_INFO_H__
+
diff --git a/i18n/locdspnm.cpp b/i18n/locdspnm.cpp
index 1d1807a..9b63a3e 100644
--- a/i18n/locdspnm.cpp
+++ b/i18n/locdspnm.cpp
@@ -149,8 +149,6 @@
LocaleDisplayNames::~LocaleDisplayNames() {}
-UOBJECT_DEFINE_NO_RTTI_IMPLEMENTATION(LocaleDisplayNames)
-
////////////////////////////////////////////////////////////////////////////////////////////////////
#if 0 // currently unused
diff --git a/i18n/msgfmt.cpp b/i18n/msgfmt.cpp
index 3c74aa5..3c2c7c6 100644
--- a/i18n/msgfmt.cpp
+++ b/i18n/msgfmt.cpp
@@ -163,7 +163,6 @@
// -------------------------------------
UOBJECT_DEFINE_RTTI_IMPLEMENTATION(MessageFormat)
-UOBJECT_DEFINE_NO_RTTI_IMPLEMENTATION(MessageFormat::DummyFormat)
UOBJECT_DEFINE_RTTI_IMPLEMENTATION(FormatNameEnumeration)
//--------------------------------------------------------------------
diff --git a/i18n/numfmt.cpp b/i18n/numfmt.cpp
index b8caf3a..8c08c17 100644
--- a/i18n/numfmt.cpp
+++ b/i18n/numfmt.cpp
@@ -1140,8 +1140,15 @@
NumberFormat*
NumberFormat::makeInstance(const Locale& desiredLocale,
UNumberFormatStyle style,
- UErrorCode& status)
-{
+ UErrorCode& status) {
+ return makeInstance(desiredLocale, style, false, status);
+}
+
+NumberFormat*
+NumberFormat::makeInstance(const Locale& desiredLocale,
+ UNumberFormatStyle style,
+ UBool mustBeDecimalFormat,
+ UErrorCode& status) {
if (U_FAILURE(status)) return NULL;
if (style < 0 || style >= UNUM_FORMAT_STYLE_COUNT) {
@@ -1161,33 +1168,34 @@
}
#if U_PLATFORM_USES_ONLY_WIN32_API
- char buffer[8];
- int32_t count = desiredLocale.getKeywordValue("compat", buffer, sizeof(buffer), status);
+ if (!mustBeDecimalFormat) {
+ char buffer[8];
+ int32_t count = desiredLocale.getKeywordValue("compat", buffer, sizeof(buffer), status);
- // if the locale has "@compat=host", create a host-specific NumberFormat
- if (U_SUCCESS(status) && count > 0 && uprv_strcmp(buffer, "host") == 0) {
- Win32NumberFormat *f = NULL;
- UBool curr = TRUE;
+ // if the locale has "@compat=host", create a host-specific NumberFormat
+ if (U_SUCCESS(status) && count > 0 && uprv_strcmp(buffer, "host") == 0) {
+ Win32NumberFormat *f = NULL;
+ UBool curr = TRUE;
- switch (style) {
- case UNUM_DECIMAL:
- curr = FALSE;
- // fall-through
+ switch (style) {
+ case UNUM_DECIMAL:
+ curr = FALSE;
+ // fall-through
- case UNUM_CURRENCY:
- case UNUM_CURRENCY_ISO: // do not support plural formatting here
- case UNUM_CURRENCY_PLURAL:
- f = new Win32NumberFormat(desiredLocale, curr, status);
+ case UNUM_CURRENCY:
+ case UNUM_CURRENCY_ISO: // do not support plural formatting here
+ case UNUM_CURRENCY_PLURAL:
+ f = new Win32NumberFormat(desiredLocale, curr, status);
- if (U_SUCCESS(status)) {
- return f;
+ if (U_SUCCESS(status)) {
+ return f;
+ }
+
+ delete f;
+ break;
+ default:
+ break;
}
-
- delete f;
- break;
-
- default:
- break;
}
}
#endif
@@ -1245,6 +1253,11 @@
return NULL;
}
+ if (mustBeDecimalFormat && ns->isAlgorithmic()) {
+ status = U_UNSUPPORTED_ERROR;
+ return NULL;
+ }
+
LocalPointer<DecimalFormatSymbols> symbolsToAdopt;
UnicodeString pattern;
LocalUResourceBundlePointer ownedResource(ures_open(NULL, desiredLocale.getName(), &status));
diff --git a/i18n/olsontz.cpp b/i18n/olsontz.cpp
index 992cfe3..826eb1f 100644
--- a/i18n/olsontz.cpp
+++ b/i18n/olsontz.cpp
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (c) 2003-2012, International Business Machines
+* Copyright (c) 2003-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Author: Alan Liu
@@ -25,6 +25,7 @@
#include <float.h> // DBL_MAX
#include "uresimp.h" // struct UResourceBundle
#include "zonemeta.h"
+#include "umutex.h"
#ifdef U_DEBUG_TZ
# include <stdio.h>
@@ -399,7 +400,7 @@
void
OlsonTimeZone::getOffsetFromLocal(UDate date, int32_t nonExistingTimeOpt, int32_t duplicatedTimeOpt,
- int32_t& rawoff, int32_t& dstoff, UErrorCode& ec) /*const*/ {
+ int32_t& rawoff, int32_t& dstoff, UErrorCode& ec) const {
if (U_FAILURE(ec)) {
return;
}
@@ -571,7 +572,7 @@
// Return TRUE if DST is observed at any time during the current
// year.
for (int16_t i = 0; i < transitionCount(); ++i) {
- double transition = transitionTimeInSeconds(i);
+ double transition = (double)transitionTimeInSeconds(i);
if (transition >= limit) {
break;
}
@@ -680,6 +681,28 @@
clearTransitionRules();
}
+/*
+ * Lazy transition rules initializer
+ */
+static UMutex gLock = U_MUTEX_INITIALIZER;
+
+void
+OlsonTimeZone::checkTransitionRules(UErrorCode& status) const {
+ if (U_FAILURE(status)) {
+ return;
+ }
+ UBool initialized;
+ UMTX_CHECK(&gLock, transitionRulesInitialized, initialized);
+ if (!initialized) {
+ umtx_lock(&gLock);
+ if (!transitionRulesInitialized) {
+ OlsonTimeZone *ncThis = const_cast<OlsonTimeZone*>(this);
+ ncThis->initTransitionRules(status);
+ }
+ umtx_unlock(&gLock);
+ }
+}
+
void
OlsonTimeZone::initTransitionRules(UErrorCode& status) {
if(U_FAILURE(status)) {
@@ -860,9 +883,9 @@
}
UBool
-OlsonTimeZone::getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/ {
+OlsonTimeZone::getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const {
UErrorCode status = U_ZERO_ERROR;
- initTransitionRules(status);
+ checkTransitionRules(status);
if (U_FAILURE(status)) {
return FALSE;
}
@@ -925,9 +948,9 @@
}
UBool
-OlsonTimeZone::getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/ {
+OlsonTimeZone::getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const {
UErrorCode status = U_ZERO_ERROR;
- initTransitionRules(status);
+ checkTransitionRules(status);
if (U_FAILURE(status)) {
return FALSE;
}
@@ -986,11 +1009,11 @@
}
int32_t
-OlsonTimeZone::countTransitionRules(UErrorCode& status) /*const*/ {
+OlsonTimeZone::countTransitionRules(UErrorCode& status) const {
if (U_FAILURE(status)) {
return 0;
}
- initTransitionRules(status);
+ checkTransitionRules(status);
if (U_FAILURE(status)) {
return 0;
}
@@ -1019,11 +1042,11 @@
OlsonTimeZone::getTimeZoneRules(const InitialTimeZoneRule*& initial,
const TimeZoneRule* trsrules[],
int32_t& trscount,
- UErrorCode& status) /*const*/ {
+ UErrorCode& status) const {
if (U_FAILURE(status)) {
return;
}
- initTransitionRules(status);
+ checkTransitionRules(status);
if (U_FAILURE(status)) {
return;
}
diff --git a/i18n/olsontz.h b/i18n/olsontz.h
index 05e89b2..a263ec0 100644
--- a/i18n/olsontz.h
+++ b/i18n/olsontz.h
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (c) 2003-2011, International Business Machines
+* Copyright (c) 2003-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Author: Alan Liu
@@ -185,7 +185,7 @@
* BasicTimeZone API.
*/
virtual void getOffsetFromLocal(UDate date, int32_t nonExistingTimeOpt, int32_t duplicatedTimeOpt,
- int32_t& rawoff, int32_t& dstoff, UErrorCode& ec) /*const*/;
+ int32_t& rawoff, int32_t& dstoff, UErrorCode& ec) const;
/**
* TimeZone API. This method has no effect since objects of this
@@ -233,7 +233,7 @@
* @param result Receives the first transition after the base time.
* @return TRUE if the transition is found.
*/
- virtual UBool getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/;
+ virtual UBool getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const;
/**
* BasicTimeZone API.
@@ -243,7 +243,7 @@
* @param result Receives the most recent transition before the base time.
* @return TRUE if the transition is found.
*/
- virtual UBool getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/;
+ virtual UBool getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const;
/**
* BasicTimeZone API.
@@ -253,7 +253,7 @@
* @param status Receives error status code.
* @return The number of <code>TimeZoneRule</code>s representing time transitions.
*/
- virtual int32_t countTransitionRules(UErrorCode& status) /*const*/;
+ virtual int32_t countTransitionRules(UErrorCode& status) const;
/**
* Gets the <code>InitialTimeZoneRule</code> and the set of <code>TimeZoneRule</code>
@@ -271,7 +271,7 @@
* @param status Receives error status code.
*/
virtual void getTimeZoneRules(const InitialTimeZoneRule*& initial,
- const TimeZoneRule* trsrules[], int32_t& trscount, UErrorCode& status) /*const*/;
+ const TimeZoneRule* trsrules[], int32_t& trscount, UErrorCode& status) const;
/**
* Internal API returning the canonical ID of this zone.
@@ -382,6 +382,7 @@
/* BasicTimeZone support */
void clearTransitionRules(void);
void deleteTransitionRules(void);
+ void checkTransitionRules(UErrorCode& status) const;
void initTransitionRules(UErrorCode& status);
InitialTimeZoneRule *initialRule;
diff --git a/i18n/rbtz.cpp b/i18n/rbtz.cpp
index a9d8db5..6abc6d1 100644
--- a/i18n/rbtz.cpp
+++ b/i18n/rbtz.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2007-2012, International Business Machines Corporation and
+* Copyright (C) 2007-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
@@ -16,6 +16,7 @@
#include "uvector.h"
#include "gregoimp.h"
#include "cmemory.h"
+#include "umutex.h"
U_NAMESPACE_BEGIN
@@ -143,6 +144,25 @@
fUpToDate = FALSE;
}
+static UMutex gLock = U_MUTEX_INITIALIZER;
+
+void
+RuleBasedTimeZone::completeConst(UErrorCode& status) const {
+ if (U_FAILURE(status)) {
+ return;
+ }
+ UBool updated;
+ UMTX_CHECK(&gLock, fUpToDate, updated);
+ if (!updated) {
+ umtx_lock(&gLock);
+ if (!fUpToDate) {
+ RuleBasedTimeZone *ncThis = const_cast<RuleBasedTimeZone*>(this);
+ ncThis->complete(status);
+ }
+ umtx_unlock(&gLock);
+ }
+}
+
void
RuleBasedTimeZone::complete(UErrorCode& status) {
if (U_FAILURE(status)) {
@@ -387,7 +407,7 @@
void
RuleBasedTimeZone::getOffsetFromLocal(UDate date, int32_t nonExistingTimeOpt, int32_t duplicatedTimeOpt,
- int32_t& rawOffset, int32_t& dstOffset, UErrorCode& status) /*const*/ {
+ int32_t& rawOffset, int32_t& dstOffset, UErrorCode& status) const {
getOffsetInternal(date, TRUE, nonExistingTimeOpt, duplicatedTimeOpt, rawOffset, dstOffset, status);
}
@@ -525,9 +545,9 @@
}
UBool
-RuleBasedTimeZone::getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/ {
+RuleBasedTimeZone::getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const {
UErrorCode status = U_ZERO_ERROR;
- complete(status);
+ completeConst(status);
if (U_FAILURE(status)) {
return FALSE;
}
@@ -544,9 +564,9 @@
}
UBool
-RuleBasedTimeZone::getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/ {
+RuleBasedTimeZone::getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const {
UErrorCode status = U_ZERO_ERROR;
- complete(status);
+ completeConst(status);
if (U_FAILURE(status)) {
return FALSE;
}
@@ -563,7 +583,7 @@
}
int32_t
-RuleBasedTimeZone::countTransitionRules(UErrorCode& /*status*/) /*const*/ {
+RuleBasedTimeZone::countTransitionRules(UErrorCode& /*status*/) const {
int32_t count = 0;
if (fHistoricRules != NULL) {
count += fHistoricRules->size();
@@ -578,7 +598,7 @@
RuleBasedTimeZone::getTimeZoneRules(const InitialTimeZoneRule*& initial,
const TimeZoneRule* trsrules[],
int32_t& trscount,
- UErrorCode& status) /*const*/ {
+ UErrorCode& status) const {
if (U_FAILURE(status)) {
return;
}
diff --git a/i18n/region.cpp b/i18n/region.cpp
new file mode 100644
index 0000000..1485c07
--- /dev/null
+++ b/i18n/region.cpp
@@ -0,0 +1,690 @@
+/*
+*******************************************************************************
+* Copyright (C) 2013, International Business Machines Corporation and
+* others. All Rights Reserved.
+*******************************************************************************
+*
+*
+* File REGION.CPP
+*
+* Modification History:*
+* Date Name Description
+* 01/15/13 Emmons Original Port from ICU4J
+********************************************************************************
+*/
+
+/**
+ * \file
+ * \brief C++ API: Region classes (territory containment)
+ */
+
+#include "unicode/region.h"
+#include "unicode/utypes.h"
+#include "unicode/uobject.h"
+#include "unicode/unistr.h"
+#include "unicode/ures.h"
+#include "unicode/decimfmt.h"
+#include "ucln_in.h"
+#include "cstring.h"
+#include "uhash.h"
+#include "umutex.h"
+#include "uresimp.h"
+#include "region_impl.h"
+
+#if !UCONFIG_NO_FORMATTING
+
+
+U_CDECL_BEGIN
+
+static void U_CALLCONV
+deleteRegion(void *obj) {
+ delete (icu::Region *)obj;
+}
+
+/**
+ * Cleanup callback func
+ */
+static UBool U_CALLCONV region_cleanup(void)
+{
+ icu::Region::cleanupRegionData();
+
+ return TRUE;
+}
+
+U_CDECL_END
+
+U_NAMESPACE_BEGIN
+
+static UMutex gRegionDataLock = U_MUTEX_INITIALIZER;
+static UBool regionDataIsLoaded = false;
+static UVector* availableRegions[URGN_LIMIT];
+
+static UHashtable *regionAliases;
+static UHashtable *regionIDMap;
+static UHashtable *numericCodeMap;
+
+static const UChar UNKNOWN_REGION_ID [] = { 0x5A, 0x5A, 0 }; /* "ZZ" */
+static const UChar OUTLYING_OCEANIA_REGION_ID [] = { 0x51, 0x4F, 0 }; /* "QO" */
+static const UChar WORLD_ID [] = { 0x30, 0x30, 0x31, 0 }; /* "001" */
+
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(RegionNameEnumeration)
+
+/*
+ * Initializes the region data from the ICU resource bundles. The region data
+ * contains the basic relationships such as which regions are known, what the numeric
+ * codes are, any known aliases, and the territory containment data.
+ *
+ * If the region data has already loaded, then this method simply returns without doing
+ * anything meaningful.
+ */
+void Region::loadRegionData() {
+
+ if (regionDataIsLoaded) {
+ return;
+ }
+
+ umtx_lock(&gRegionDataLock);
+
+ if (regionDataIsLoaded) { // In case another thread gets to it before we do...
+ umtx_unlock(&gRegionDataLock);
+ return;
+ }
+
+
+ UErrorCode status = U_ZERO_ERROR;
+
+ UResourceBundle* regionCodes = NULL;
+ UResourceBundle* territoryAlias = NULL;
+ UResourceBundle* codeMappings = NULL;
+ UResourceBundle* worldContainment = NULL;
+ UResourceBundle* territoryContainment = NULL;
+ UResourceBundle* groupingContainment = NULL;
+
+ DecimalFormat *df = new DecimalFormat(status);
+ if (U_FAILURE(status)) {
+ umtx_unlock(&gRegionDataLock);
+ return;
+ }
+ df->setParseIntegerOnly(TRUE);
+
+ regionIDMap = uhash_open(uhash_hashUnicodeString,uhash_compareUnicodeString,NULL,&status);
+ uhash_setValueDeleter(regionIDMap, deleteRegion);
+
+ numericCodeMap = uhash_open(uhash_hashLong,uhash_compareLong,NULL,&status);
+
+ regionAliases = uhash_open(uhash_hashUnicodeString,uhash_compareUnicodeString,NULL,&status);
+ uhash_setKeyDeleter(regionAliases,uprv_deleteUObject);
+
+ UResourceBundle *rb = ures_openDirect(NULL,"metadata",&status);
+ regionCodes = ures_getByKey(rb,"regionCodes",NULL,&status);
+ territoryAlias = ures_getByKey(rb,"territoryAlias",NULL,&status);
+
+ UResourceBundle *rb2 = ures_openDirect(NULL,"supplementalData",&status);
+ codeMappings = ures_getByKey(rb2,"codeMappings",NULL,&status);
+
+ territoryContainment = ures_getByKey(rb2,"territoryContainment",NULL,&status);
+ worldContainment = ures_getByKey(territoryContainment,"001",NULL,&status);
+ groupingContainment = ures_getByKey(territoryContainment,"grouping",NULL,&status);
+
+ UVector *continents = new UVector(uprv_deleteUObject, uhash_compareUnicodeString, status);
+
+ while ( ures_hasNext(worldContainment) ) {
+ UnicodeString *continentName = new UnicodeString(ures_getNextUnicodeString(worldContainment,NULL,&status));
+ continents->addElement(continentName,status);
+ }
+
+ UVector *groupings = new UVector(uprv_deleteUObject, uhash_compareUnicodeString, status);
+ while ( ures_hasNext(groupingContainment) ) {
+ UnicodeString *groupingName = new UnicodeString(ures_getNextUnicodeString(groupingContainment,NULL,&status));
+ groupings->addElement(groupingName,status);
+ }
+
+ while ( ures_hasNext(regionCodes) ) {
+ UnicodeString regionID = ures_getNextUnicodeString(regionCodes,NULL,&status);
+ Region *r = new Region();
+ r->idStr = regionID;
+ r->idStr.extract(0,r->idStr.length(),r->id,sizeof(r->id),US_INV);
+ r->type = URGN_TERRITORY; // Only temporary - figure out the real type later once the aliases are known.
+
+ uhash_put(regionIDMap,(void *)&(r->idStr),(void *)r,&status);
+ Formattable result;
+ UErrorCode ps = U_ZERO_ERROR;
+ df->parse(r->idStr,result,ps);
+ if ( U_SUCCESS(ps) ) {
+ r->code = result.getLong(); // Convert string to number
+ uhash_iput(numericCodeMap,r->code,(void *)r,&status);
+ r->type = URGN_SUBCONTINENT;
+ } else {
+ r->code = -1;
+ }
+ }
+
+
+ // Process the territory aliases
+ while ( ures_hasNext(territoryAlias) ) {
+ UResourceBundle *res = ures_getNextResource(territoryAlias,NULL,&status);
+ const char *aliasFrom = ures_getKey(res);
+ UnicodeString* aliasFromStr = new UnicodeString(aliasFrom, -1, US_INV);
+ UnicodeString aliasTo = ures_getUnicodeString(res,&status);
+ ures_close(res);
+
+ Region *aliasToRegion = (Region *) uhash_get(regionIDMap,&aliasTo);
+ Region *aliasFromRegion = (Region *)uhash_get(regionIDMap,aliasFromStr);
+
+ if ( aliasToRegion != NULL && aliasFromRegion == NULL ) { // This is just an alias from some string to a region
+ uhash_put(regionAliases,(void *)aliasFromStr, (void *)aliasToRegion,&status);
+ } else {
+ if ( aliasFromRegion == NULL ) { // Deprecated region code not in the master codes list - so need to create a deprecated region for it.
+ aliasFromRegion = new Region();
+ aliasFromRegion->idStr.setTo(*aliasFromStr);
+ aliasFromRegion->idStr.extract(0,aliasFromRegion->idStr.length(),aliasFromRegion->id,sizeof(aliasFromRegion->id),US_INV);
+ uhash_put(regionIDMap,(void *)&(aliasFromRegion->idStr),(void *)aliasFromRegion,&status);
+ Formattable result;
+ UErrorCode ps = U_ZERO_ERROR;
+ df->parse(aliasFromRegion->idStr,result,ps);
+ if ( U_SUCCESS(ps) ) {
+ aliasFromRegion->code = result.getLong(); // Convert string to number
+ uhash_iput(numericCodeMap,aliasFromRegion->code,(void *)aliasFromRegion,&status);
+ } else {
+ aliasFromRegion->code = -1;
+ }
+ aliasFromRegion->type = URGN_DEPRECATED;
+ } else {
+ aliasFromRegion->type = URGN_DEPRECATED;
+ }
+ delete aliasFromStr;
+
+ aliasFromRegion->preferredValues = new UVector(uprv_deleteUObject, uhash_compareUnicodeString, status);
+ UnicodeString currentRegion;
+ currentRegion.remove();
+ for (int32_t i = 0 ; i < aliasTo.length() ; i++ ) {
+ if ( aliasTo.charAt(i) != 0x0020 ) {
+ currentRegion.append(aliasTo.charAt(i));
+ }
+ if ( aliasTo.charAt(i) == 0x0020 || i+1 == aliasTo.length() ) {
+ Region *target = (Region *)uhash_get(regionIDMap,(void *)¤tRegion);
+ if (target) {
+ UnicodeString *preferredValue = new UnicodeString(target->idStr);
+ aliasFromRegion->preferredValues->addElement((void *)preferredValue,status);
+ }
+ currentRegion.remove();
+ }
+ }
+ }
+ }
+
+ // Process the code mappings - This will allow us to assign numeric codes to most of the territories.
+ while ( ures_hasNext(codeMappings) ) {
+ UResourceBundle *mapping = ures_getNextResource(codeMappings,NULL,&status);
+ if ( ures_getType(mapping) == URES_ARRAY && ures_getSize(mapping) == 3) {
+ UnicodeString codeMappingID = ures_getUnicodeStringByIndex(mapping,0,&status);
+ UnicodeString codeMappingNumber = ures_getUnicodeStringByIndex(mapping,1,&status);
+ UnicodeString codeMapping3Letter = ures_getUnicodeStringByIndex(mapping,2,&status);
+
+ Region *r = (Region *)uhash_get(regionIDMap,(void *)&codeMappingID);
+ if ( r ) {
+ Formattable result;
+ UErrorCode ps = U_ZERO_ERROR;
+ df->parse(codeMappingNumber,result,ps);
+ if ( U_SUCCESS(ps) ) {
+ r->code = result.getLong(); // Convert string to number
+ uhash_iput(numericCodeMap,r->code,(void *)r,&status);
+ }
+ UnicodeString *code3 = new UnicodeString(codeMapping3Letter);
+ uhash_put(regionAliases,(void *)code3, (void *)r,&status);
+ }
+ }
+ ures_close(mapping);
+ }
+
+ // Now fill in the special cases for WORLD, UNKNOWN, CONTINENTS, and GROUPINGS
+ Region *r;
+ UnicodeString WORLD_ID_STRING(WORLD_ID);
+ r = (Region *) uhash_get(regionIDMap,(void *)&WORLD_ID_STRING);
+ if ( r ) {
+ r->type = URGN_WORLD;
+ }
+
+ UnicodeString UNKNOWN_REGION_ID_STRING(UNKNOWN_REGION_ID);
+ r = (Region *) uhash_get(regionIDMap,(void *)&UNKNOWN_REGION_ID_STRING);
+ if ( r ) {
+ r->type = URGN_UNKNOWN;
+ }
+
+ for ( int32_t i = 0 ; i < continents->size() ; i++ ) {
+ r = (Region *) uhash_get(regionIDMap,(void *)continents->elementAt(i));
+ if ( r ) {
+ r->type = URGN_CONTINENT;
+ }
+ }
+ delete continents;
+
+ for ( int32_t i = 0 ; i < groupings->size() ; i++ ) {
+ r = (Region *) uhash_get(regionIDMap,(void *)groupings->elementAt(i));
+ if ( r ) {
+ r->type = URGN_GROUPING;
+ }
+ }
+ delete groupings;
+
+ // Special case: The region code "QO" (Outlying Oceania) is a subcontinent code added by CLDR
+ // even though it looks like a territory code. Need to handle it here.
+
+ UnicodeString OUTLYING_OCEANIA_REGION_ID_STRING(OUTLYING_OCEANIA_REGION_ID);
+ r = (Region *) uhash_get(regionIDMap,(void *)&OUTLYING_OCEANIA_REGION_ID_STRING);
+ if ( r ) {
+ r->type = URGN_SUBCONTINENT;
+ }
+
+ // Load territory containment info from the supplemental data.
+ while ( ures_hasNext(territoryContainment) ) {
+ UResourceBundle *mapping = ures_getNextResource(territoryContainment,NULL,&status);
+ const char *parent = ures_getKey(mapping);
+ UnicodeString parentStr = UnicodeString(parent, -1 , US_INV);
+ Region *parentRegion = (Region *) uhash_get(regionIDMap,(void *)&parentStr);
+
+ for ( int j = 0 ; j < ures_getSize(mapping); j++ ) {
+ UnicodeString child = ures_getUnicodeStringByIndex(mapping,j,&status);
+ Region *childRegion = (Region *) uhash_get(regionIDMap,(void *)&child);
+ if ( parentRegion != NULL && childRegion != NULL ) {
+
+ // Add the child region to the set of regions contained by the parent
+ if (parentRegion->containedRegions == NULL) {
+ parentRegion->containedRegions = new UVector(uprv_deleteUObject, uhash_compareUnicodeString, status);
+ }
+
+ UnicodeString *childStr = new UnicodeString(status);
+ childStr->fastCopyFrom(childRegion->idStr);
+ parentRegion->containedRegions->addElement((void *)childStr,status);
+
+ // Set the parent region to be the containing region of the child.
+ // Regions of type GROUPING can't be set as the parent, since another region
+ // such as a SUBCONTINENT, CONTINENT, or WORLD must always be the parent.
+ if ( parentRegion->type != URGN_GROUPING) {
+ childRegion->containingRegion = parentRegion;
+ }
+ }
+ }
+ ures_close(mapping);
+ }
+
+ // Create the availableRegions lists
+ int32_t pos = -1;
+ while ( const UHashElement* element = uhash_nextElement(regionIDMap,&pos)) {
+ Region *ar = (Region *)element->value.pointer;
+ if ( availableRegions[ar->type] == NULL ) {
+ availableRegions[ar->type] = new UVector(uprv_deleteUObject, uhash_compareUnicodeString, status);
+ }
+ UnicodeString *arString = new UnicodeString(ar->idStr);
+ availableRegions[ar->type]->addElement((void *)arString,status);
+ }
+
+ ures_close(territoryContainment);
+ ures_close(worldContainment);
+ ures_close(groupingContainment);
+
+ ures_close(codeMappings);
+ ures_close(rb2);
+ ures_close(territoryAlias);
+ ures_close(regionCodes);
+ ures_close(rb);
+
+ delete df;
+
+ ucln_i18n_registerCleanup(UCLN_I18N_REGION, region_cleanup);
+
+ regionDataIsLoaded = true;
+ umtx_unlock(&gRegionDataLock);
+
+}
+
+void Region::cleanupRegionData() {
+
+ for (int32_t i = 0 ; i < URGN_LIMIT ; i++ ) {
+ if ( availableRegions[i] ) {
+ delete availableRegions[i];
+ }
+ }
+
+ if (regionAliases) {
+ uhash_close(regionAliases);
+ }
+
+ if (numericCodeMap) {
+ uhash_close(numericCodeMap);
+ }
+
+ if (regionIDMap) {
+ uhash_close(regionIDMap);
+ }
+}
+
+Region::Region ()
+ : code(-1),
+ type(URGN_UNKNOWN),
+ containingRegion(NULL),
+ containedRegions(NULL),
+ preferredValues(NULL) {
+ id[0] = 0;
+}
+
+Region::~Region () {
+ if (containedRegions) {
+ delete containedRegions;
+ }
+ if (preferredValues) {
+ delete preferredValues;
+ }
+}
+
+/**
+ * Returns true if the two regions are equal.
+ */
+UBool
+Region::operator==(const Region &that) const {
+ return (idStr == that.idStr);
+}
+
+/**
+ * Returns true if the two regions are NOT equal; that is, if operator ==() returns false.
+ */
+UBool
+Region::operator!=(const Region &that) const {
+ return (idStr != that.idStr);
+}
+
+/**
+ * Returns a pointer to a Region using the given region code. The region code can be either 2-letter ISO code,
+ * 3-letter ISO code, UNM.49 numeric code, or other valid Unicode Region Code as defined by the LDML specification.
+ * The identifier will be canonicalized internally using the supplemental metadata as defined in the CLDR.
+ * If the region code is NULL or not recognized, the appropriate error code will be set ( U_ILLEGAL_ARGUMENT_ERROR )
+ */
+const Region* U_EXPORT2
+Region::getInstance(const char *region_code, UErrorCode &status) {
+
+ if ( !region_code ) {
+ status = U_ILLEGAL_ARGUMENT_ERROR;
+ return NULL;
+ }
+
+ loadRegionData();
+
+ if (regionIDMap == NULL) {
+ status = U_ILLEGAL_ARGUMENT_ERROR;
+ return NULL;
+ }
+
+ UnicodeString regionCodeString = UnicodeString(region_code, -1, US_INV);
+ Region *r = (Region *)uhash_get(regionIDMap,(void *)®ionCodeString);
+
+ if ( !r ) {
+ r = (Region *)uhash_get(regionAliases,(void *)®ionCodeString);
+ }
+
+ if ( !r ) { // Unknown region code
+ status = U_ILLEGAL_ARGUMENT_ERROR;
+ return NULL;
+ }
+
+ if ( r->type == URGN_DEPRECATED && r->preferredValues->size() == 1) {
+ StringEnumeration *pv = r->getPreferredValues();
+ pv->reset(status);
+ const UnicodeString *ustr = pv->snext(status);
+ r = (Region *)uhash_get(regionIDMap,(void *)ustr);
+ delete pv;
+ }
+
+ return r;
+
+}
+
+/**
+ * Returns a pointer to a Region using the given numeric region code. If the numeric region code is not recognized,
+ * the appropriate error code will be set ( U_ILLEGAL_ARGUMENT_ERROR ).
+ */
+const Region* U_EXPORT2
+Region::getInstance (int32_t code, UErrorCode &status) {
+
+ loadRegionData();
+
+ if (numericCodeMap == NULL) {
+ status = U_ILLEGAL_ARGUMENT_ERROR;
+ return NULL;
+ }
+
+ Region *r = (Region *)uhash_iget(numericCodeMap,code);
+
+ if ( !r ) { // Just in case there's an alias that's numeric, try to find it.
+ UErrorCode fs = U_ZERO_ERROR;
+ UnicodeString pat = UNICODE_STRING_SIMPLE("00#");
+ DecimalFormat *df = new DecimalFormat(pat,fs);
+
+ UnicodeString id;
+ id.remove();
+ df->format(code,id);
+ delete df;
+ r = (Region *)uhash_get(regionAliases,&id);
+ }
+
+ if ( !r ) {
+ status = U_ILLEGAL_ARGUMENT_ERROR;
+ return NULL;
+ }
+
+ if ( r->type == URGN_DEPRECATED && r->preferredValues->size() == 1) {
+ StringEnumeration *pv = r->getPreferredValues();
+ pv->reset(status);
+ const UnicodeString *ustr = pv->snext(status);
+ r = (Region *)uhash_get(regionIDMap,(void *)ustr);
+ delete pv;
+ }
+
+ return r;
+}
+
+
+/**
+ * Returns an enumeration over the IDs of all known regions that match the given type.
+ */
+StringEnumeration* U_EXPORT2
+Region::getAvailable(URegionType type) {
+
+ loadRegionData();
+ UErrorCode status = U_ZERO_ERROR;
+ return new RegionNameEnumeration(availableRegions[type],status);
+
+ return NULL;
+}
+
+/**
+ * Returns a pointer to the region that contains this region. Returns NULL if this region is code "001" (World)
+ * or "ZZ" (Unknown region). For example, calling this method with region "IT" (Italy) returns the
+ * region "039" (Southern Europe).
+ */
+const Region*
+Region::getContainingRegion() const {
+ loadRegionData();
+ return containingRegion;
+}
+
+/**
+ * Return a pointer to the region that geographically contains this region and matches the given type,
+ * moving multiple steps up the containment chain if necessary. Returns NULL if no containing region can be found
+ * that matches the given type. Note: The URegionTypes = "URGN_GROUPING", "URGN_DEPRECATED", or "URGN_UNKNOWN"
+ * are not appropriate for use in this API. NULL will be returned in this case. For example, calling this method
+ * with region "IT" (Italy) for type "URGN_CONTINENT" returns the region "150" ( Europe ).
+ */
+const Region*
+Region::getContainingRegion(URegionType type) const {
+ loadRegionData();
+ if ( containingRegion == NULL ) {
+ return NULL;
+ }
+
+ if ( containingRegion->type == type ) {
+ return containingRegion;
+ } else {
+ return containingRegion->getContainingRegion(type);
+ }
+}
+
+/**
+ * Return an enumeration over the IDs of all the regions that are immediate children of this region in the
+ * region hierarchy. These returned regions could be either macro regions, territories, or a mixture of the two,
+ * depending on the containment data as defined in CLDR. This API may return NULL if this region doesn't have
+ * any sub-regions. For example, calling this method with region "150" (Europe) returns an enumeration containing
+ * the various sub regions of Europe - "039" (Southern Europe) - "151" (Eastern Europe) - "154" (Northern Europe)
+ * and "155" (Western Europe).
+ */
+StringEnumeration*
+Region::getContainedRegions() const {
+ loadRegionData();
+ UErrorCode status = U_ZERO_ERROR;
+ return new RegionNameEnumeration(containedRegions,status);
+}
+
+/**
+ * Returns an enumeration over the IDs of all the regions that are children of this region anywhere in the region
+ * hierarchy and match the given type. This API may return an empty enumeration if this region doesn't have any
+ * sub-regions that match the given type. For example, calling this method with region "150" (Europe) and type
+ * "URGN_TERRITORY" returns a set containing all the territories in Europe ( "FR" (France) - "IT" (Italy) - "DE" (Germany) etc. )
+ */
+StringEnumeration*
+Region::getContainedRegions( URegionType type ) const {
+ loadRegionData();
+
+ UErrorCode status = U_ZERO_ERROR;
+ UVector *result = new UVector(NULL, uhash_compareChars, status);
+
+ StringEnumeration *cr = getContainedRegions();
+
+ for ( int32_t i = 0 ; i < cr->count(status) ; i++ ) {
+ const char *id = cr->next(NULL,status);
+ const Region *r = Region::getInstance(id,status);
+ if ( r->getType() == type ) {
+ result->addElement((void *)&r->idStr,status);
+ } else {
+ StringEnumeration *children = r->getContainedRegions(type);
+ for ( int32_t j = 0 ; j < children->count(status) ; j++ ) {
+ const char *id2 = children->next(NULL,status);
+ const Region *r2 = Region::getInstance(id2,status);
+ result->addElement((void *)&r2->idStr,status);
+ }
+ delete children;
+ }
+ }
+ delete cr;
+ StringEnumeration* resultEnumeration = new RegionNameEnumeration(result,status);
+ delete result;
+ return resultEnumeration;
+}
+
+/**
+ * Returns true if this region contains the supplied other region anywhere in the region hierarchy.
+ */
+UBool
+Region::contains(const Region &other) const {
+ loadRegionData();
+
+ if (!containedRegions) {
+ return FALSE;
+ }
+ if (containedRegions->contains((void *)&other.idStr)) {
+ return TRUE;
+ } else {
+ for ( int32_t i = 0 ; i < containedRegions->size() ; i++ ) {
+ UnicodeString *crStr = (UnicodeString *)containedRegions->elementAt(i);
+ Region *cr = (Region *) uhash_get(regionIDMap,(void *)crStr);
+ if ( cr && cr->contains(other) ) {
+ return TRUE;
+ }
+ }
+ }
+
+ return FALSE;
+}
+
+/**
+ * For deprecated regions, return an enumeration over the IDs of the regions that are the preferred replacement
+ * regions for this region. Returns NULL for a non-deprecated region. For example, calling this method with region
+ * "SU" (Soviet Union) would return a list of the regions containing "RU" (Russia), "AM" (Armenia), "AZ" (Azerbaijan), etc...
+ */
+StringEnumeration*
+Region::getPreferredValues() const {
+ loadRegionData();
+ UErrorCode status = U_ZERO_ERROR;
+ if ( type == URGN_DEPRECATED ) {
+ return new RegionNameEnumeration(preferredValues,status);
+ } else {
+ return NULL;
+ }
+}
+
+
+/**
+ * Return this region's canonical region code.
+ */
+const char*
+Region::getRegionCode() const {
+ return id;
+}
+
+int32_t
+Region::getNumericCode() const {
+ return code;
+}
+
+/**
+ * Returns the region type of this region.
+ */
+URegionType
+Region::getType() const {
+ return type;
+}
+
+RegionNameEnumeration::RegionNameEnumeration(UVector *fNameList, UErrorCode& status) {
+ pos=0;
+ if (fNameList && U_SUCCESS(status)) {
+ fRegionNames = new UVector(uprv_deleteUObject, uhash_compareUnicodeString, fNameList->size(),status);
+ for ( int32_t i = 0 ; i < fNameList->size() ; i++ ) {
+ UnicodeString* this_region_name = (UnicodeString *)fNameList->elementAt(i);
+ UnicodeString* new_region_name = new UnicodeString(*this_region_name);
+ fRegionNames->addElement((void *)new_region_name,status);
+ }
+ }
+ else {
+ fRegionNames = NULL;
+ }
+}
+
+const UnicodeString*
+RegionNameEnumeration::snext(UErrorCode& status) {
+ if (U_FAILURE(status) || (fRegionNames==NULL)) {
+ return NULL;
+ }
+ const UnicodeString* nextStr = (const UnicodeString *)fRegionNames->elementAt(pos);
+ if (nextStr!=NULL) {
+ pos++;
+ }
+ return nextStr;
+}
+
+void
+RegionNameEnumeration::reset(UErrorCode& /*status*/) {
+ pos=0;
+}
+
+int32_t
+RegionNameEnumeration::count(UErrorCode& /*status*/) const {
+ return (fRegionNames==NULL) ? 0 : fRegionNames->size();
+}
+
+RegionNameEnumeration::~RegionNameEnumeration() {
+ delete fRegionNames;
+}
+
+U_NAMESPACE_END
+
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
+//eof
diff --git a/i18n/region_impl.h b/i18n/region_impl.h
new file mode 100644
index 0000000..402dbee
--- /dev/null
+++ b/i18n/region_impl.h
@@ -0,0 +1,43 @@
+/*
+*******************************************************************************
+* Copyright (C) 2013, International Business Machines Corporation and *
+* others. All Rights Reserved. *
+*******************************************************************************
+*
+* File REGION_IMPL.H
+*
+*******************************************************************************
+*/
+
+#ifndef __REGION_IMPL_H__
+#define __REGION_IMPL_H__
+
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
+#include "uvector.h"
+#include "unicode/strenum.h"
+
+U_NAMESPACE_BEGIN
+
+
+class RegionNameEnumeration : public StringEnumeration {
+public:
+ RegionNameEnumeration(UVector *fNameList, UErrorCode& status);
+ virtual ~RegionNameEnumeration();
+ static UClassID U_EXPORT2 getStaticClassID(void);
+ virtual UClassID getDynamicClassID(void) const;
+ virtual const UnicodeString* snext(UErrorCode& status);
+ virtual void reset(UErrorCode& status);
+ virtual int32_t count(UErrorCode& status) const;
+private:
+ int32_t pos;
+ UVector *fRegionNames;
+};
+
+U_NAMESPACE_END
+
+#endif
+
+#endif
diff --git a/i18n/reldtfmt.cpp b/i18n/reldtfmt.cpp
index 028476b..723b0c9 100644
--- a/i18n/reldtfmt.cpp
+++ b/i18n/reldtfmt.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2007-2012, International Business Machines Corporation and
+* Copyright (C) 2007-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
@@ -18,6 +18,7 @@
#include "gregoimp.h" // for CalendarData
#include "cmemory.h"
+#include "uresimp.h"
U_NAMESPACE_BEGIN
@@ -162,7 +163,7 @@
UnicodeString datePattern;
if (relativeDayString.length() > 0) {
// Need to quote the relativeDayString to make it a legal date pattern
- relativeDayString.findAndReplace(UNICODE_STRING("'", 1), UNICODE_STRING("''", 2) ); // double any existing APOSTROPHE
+ relativeDayString.findAndReplace(UNICODE_STRING("'", 1), UNICODE_STRING("''", 2)); // double any existing APOSTROPHE
relativeDayString.insert(0, APOSTROPHE); // add APOSTROPHE at beginning...
relativeDayString.append(APOSTROPHE); // and at end
datePattern.setTo(relativeDayString);
@@ -423,17 +424,22 @@
}
}
- UResourceBundle *strings = calData.getByKey3("fields", "day", "relative", status);
+ UResourceBundle *rb = ures_open(NULL, fLocale.getBaseName(), &status);
+ UResourceBundle *sb = ures_getByKeyWithFallback(rb, "fields", NULL, &status);
+ rb = ures_getByKeyWithFallback(sb, "day", rb, &status);
+ sb = ures_getByKeyWithFallback(rb, "relative", sb, &status);
+ ures_close(rb);
// set up min/max
fDayMin=-1;
fDayMax=1;
if(U_FAILURE(status)) {
fDatesLen=0;
+ ures_close(sb);
return;
}
- fDatesLen = ures_getSize(strings);
+ fDatesLen = ures_getSize(sb);
fDates = (URelativeString*) uprv_malloc(sizeof(fDates[0])*fDatesLen);
// Load in each item into the array...
@@ -441,8 +447,8 @@
UResourceBundle *subString = NULL;
- while(ures_hasNext(strings) && U_SUCCESS(status)) { // iterate over items
- subString = ures_getNextResource(strings, subString, &status);
+ while(ures_hasNext(sb) && U_SUCCESS(status)) { // iterate over items
+ subString = ures_getNextResource(sb, subString, &status);
if(U_FAILURE(status) || (subString==NULL)) break;
@@ -474,6 +480,7 @@
n++;
}
ures_close(subString);
+ ures_close(sb);
// the fDates[] array could be sorted here, for direct access.
}
diff --git a/i18n/scriptset.cpp b/i18n/scriptset.cpp
new file mode 100644
index 0000000..809e5f6
--- /dev/null
+++ b/i18n/scriptset.cpp
@@ -0,0 +1,276 @@
+/*
+**********************************************************************
+* Copyright (C) 2013, International Business Machines
+* Corporation and others. All Rights Reserved.
+**********************************************************************
+*
+* scriptset.cpp
+*
+* created on: 2013 Jan 7
+* created by: Andy Heninger
+*/
+
+#include "unicode/utypes.h"
+
+#include "unicode/uchar.h"
+#include "unicode/unistr.h"
+
+#include "scriptset.h"
+#include "uassert.h"
+
+U_NAMESPACE_BEGIN
+
+#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
+
+//----------------------------------------------------------------------------
+//
+// ScriptSet implementation
+//
+//----------------------------------------------------------------------------
+ScriptSet::ScriptSet() {
+ for (uint32_t i=0; i<LENGTHOF(bits); i++) {
+ bits[i] = 0;
+ }
+}
+
+ScriptSet::~ScriptSet() {
+}
+
+ScriptSet::ScriptSet(const ScriptSet &other) {
+ *this = other;
+}
+
+
+ScriptSet & ScriptSet::operator =(const ScriptSet &other) {
+ for (uint32_t i=0; i<LENGTHOF(bits); i++) {
+ bits[i] = other.bits[i];
+ }
+ return *this;
+}
+
+
+UBool ScriptSet::operator == (const ScriptSet &other) const {
+ for (uint32_t i=0; i<LENGTHOF(bits); i++) {
+ if (bits[i] != other.bits[i]) {
+ return FALSE;
+ }
+ }
+ return TRUE;
+}
+
+UBool ScriptSet::test(UScriptCode script, UErrorCode &status) const {
+ if (U_FAILURE(status)) {
+ return FALSE;
+ }
+ if (script < 0 || script >= (int32_t)sizeof(bits) * 8) {
+ status = U_ILLEGAL_ARGUMENT_ERROR;
+ return FALSE;
+ }
+ uint32_t index = script / 32;
+ uint32_t bit = 1 << (script & 31);
+ return ((bits[index] & bit) != 0);
+}
+
+
+ScriptSet &ScriptSet::set(UScriptCode script, UErrorCode &status) {
+ if (U_FAILURE(status)) {
+ return *this;
+ }
+ if (script < 0 || script >= (int32_t)sizeof(bits) * 8) {
+ status = U_ILLEGAL_ARGUMENT_ERROR;
+ return *this;
+ }
+ uint32_t index = script / 32;
+ uint32_t bit = 1 << (script & 31);
+ bits[index] |= bit;
+ return *this;
+}
+
+ScriptSet &ScriptSet::reset(UScriptCode script, UErrorCode &status) {
+ if (U_FAILURE(status)) {
+ return *this;
+ }
+ if (script < 0 || script >= (int32_t)sizeof(bits) * 8) {
+ status = U_ILLEGAL_ARGUMENT_ERROR;
+ return *this;
+ }
+ uint32_t index = script / 32;
+ uint32_t bit = 1 << (script & 31);
+ bits[index] &= ~bit;
+ return *this;
+}
+
+
+
+ScriptSet &ScriptSet::Union(const ScriptSet &other) {
+ for (uint32_t i=0; i<LENGTHOF(bits); i++) {
+ bits[i] |= other.bits[i];
+ }
+ return *this;
+}
+
+ScriptSet &ScriptSet::intersect(const ScriptSet &other) {
+ for (uint32_t i=0; i<LENGTHOF(bits); i++) {
+ bits[i] &= other.bits[i];
+ }
+ return *this;
+}
+
+ScriptSet &ScriptSet::intersect(UScriptCode script, UErrorCode &status) {
+ ScriptSet t;
+ t.set(script, status);
+ if (U_SUCCESS(status)) {
+ this->intersect(t);
+ }
+ return *this;
+}
+
+UBool ScriptSet::intersects(const ScriptSet &other) const {
+ for (uint32_t i=0; i<LENGTHOF(bits); i++) {
+ if ((bits[i] & other.bits[i]) != 0) {
+ return true;
+ }
+ }
+ return false;
+}
+
+UBool ScriptSet::contains(const ScriptSet &other) const {
+ ScriptSet t(*this);
+ t.intersect(other);
+ return (t == other);
+}
+
+
+ScriptSet &ScriptSet::setAll() {
+ for (uint32_t i=0; i<LENGTHOF(bits); i++) {
+ bits[i] = 0xffffffffu;
+ }
+ return *this;
+}
+
+
+ScriptSet &ScriptSet::resetAll() {
+ for (uint32_t i=0; i<LENGTHOF(bits); i++) {
+ bits[i] = 0;
+ }
+ return *this;
+}
+
+int32_t ScriptSet::countMembers() const {
+ // This bit counter is good for sparse numbers of '1's, which is
+ // very much the case that we will usually have.
+ int32_t count = 0;
+ for (uint32_t i=0; i<LENGTHOF(bits); i++) {
+ uint32_t x = bits[i];
+ while (x > 0) {
+ count++;
+ x &= (x - 1); // and off the least significant one bit.
+ }
+ }
+ return count;
+}
+
+int32_t ScriptSet::hashCode() const {
+ int32_t hash = 0;
+ for (int32_t i=0; i<LENGTHOF(bits); i++) {
+ hash ^= bits[i];
+ }
+ return hash;
+}
+
+int32_t ScriptSet::nextSetBit(int32_t fromIndex) const {
+ // TODO: Wants a better implementation.
+ if (fromIndex < 0) {
+ return -1;
+ }
+ UErrorCode status = U_ZERO_ERROR;
+ for (int32_t scriptIndex = fromIndex; scriptIndex < (int32_t)sizeof(bits)*8; scriptIndex++) {
+ if (test((UScriptCode)scriptIndex, status)) {
+ return scriptIndex;
+ }
+ }
+ return -1;
+}
+
+UnicodeString &ScriptSet::displayScripts(UnicodeString &dest) const {
+ UBool firstTime = TRUE;
+ for (int32_t i = nextSetBit(0); i >= 0; i = nextSetBit(i + 1)) {
+ if (!firstTime) {
+ dest.append(0x20);
+ }
+ firstTime = FALSE;
+ const char *scriptName = uscript_getShortName((UScriptCode(i)));
+ dest.append(UnicodeString(scriptName, -1, US_INV));
+ }
+ return dest;
+}
+
+ScriptSet &ScriptSet::parseScripts(const UnicodeString &scriptString, UErrorCode &status) {
+ resetAll();
+ if (U_FAILURE(status)) {
+ return *this;
+ }
+ UnicodeString oneScriptName;
+ for (int32_t i=0; i<scriptString.length();) {
+ UChar32 c = scriptString.char32At(i);
+ i = scriptString.moveIndex32(i, 1);
+ if (!u_isUWhiteSpace(c)) {
+ oneScriptName.append(c);
+ if (i < scriptString.length()) {
+ continue;
+ }
+ }
+ if (oneScriptName.length() > 0) {
+ char buf[40];
+ oneScriptName.extract(0, oneScriptName.length(), buf, sizeof(buf)-1, US_INV);
+ buf[sizeof(buf)-1] = 0;
+ int32_t sc = u_getPropertyValueEnum(UCHAR_SCRIPT, buf);
+ if (sc == UCHAR_INVALID_CODE) {
+ status = U_ILLEGAL_ARGUMENT_ERROR;
+ } else {
+ this->set((UScriptCode)sc, status);
+ }
+ if (U_FAILURE(status)) {
+ return *this;
+ }
+ oneScriptName.remove();
+ }
+ }
+ return *this;
+}
+
+U_NAMESPACE_END
+
+U_CAPI UBool U_EXPORT2
+uhash_equalsScriptSet(const UElement key1, const UElement key2) {
+ icu::ScriptSet *s1 = static_cast<icu::ScriptSet *>(key1.pointer);
+ icu::ScriptSet *s2 = static_cast<icu::ScriptSet *>(key2.pointer);
+ return (*s1 == *s2);
+}
+
+U_CAPI int8_t U_EXPORT2
+uhash_compareScriptSet(UElement key0, UElement key1) {
+ icu::ScriptSet *s0 = static_cast<icu::ScriptSet *>(key0.pointer);
+ icu::ScriptSet *s1 = static_cast<icu::ScriptSet *>(key1.pointer);
+ int32_t diff = s0->countMembers() - s1->countMembers();
+ if (diff != 0) return diff;
+ int32_t i0 = s0->nextSetBit(0);
+ int32_t i1 = s1->nextSetBit(0);
+ while ((diff = i0-i1) == 0 && i0 > 0) {
+ i0 = s0->nextSetBit(i0+1);
+ i1 = s1->nextSetBit(i1+1);
+ }
+ return (int8_t)diff;
+}
+
+U_CAPI int32_t U_EXPORT2
+uhash_hashScriptSet(const UElement key) {
+ icu::ScriptSet *s = static_cast<icu::ScriptSet *>(key.pointer);
+ return s->hashCode();
+}
+
+U_CAPI void U_EXPORT2
+uhash_deleteScriptSet(void *obj) {
+ icu::ScriptSet *s = static_cast<icu::ScriptSet *>(obj);
+ delete s;
+}
diff --git a/i18n/scriptset.h b/i18n/scriptset.h
new file mode 100644
index 0000000..62af5d5
--- /dev/null
+++ b/i18n/scriptset.h
@@ -0,0 +1,76 @@
+/*
+**********************************************************************
+* Copyright (C) 2013, International Business Machines
+* Corporation and others. All Rights Reserved.
+**********************************************************************
+*
+* scriptset.h
+*
+* created on: 2013 Jan 7
+* created by: Andy Heninger
+*/
+
+#ifndef __SCRIPTSET_H__
+#define __SCRIPTSET_H__
+
+#include "unicode/utypes.h"
+#include "unicode/uobject.h"
+#include "unicode/uscript.h"
+
+#include "uelement.h"
+
+U_NAMESPACE_BEGIN
+
+//-------------------------------------------------------------------------------
+//
+// ScriptSet - A bit set representing a set of scripts.
+//
+// This class was originally used exclusively with script sets appearing
+// as part of the spoof check whole script confusable binary data. Its
+// use has since become more general, but the continued use to wrap
+// prebuilt binary data does constrain the design.
+//
+//-------------------------------------------------------------------------------
+class U_I18N_API ScriptSet: public UMemory {
+ public:
+ ScriptSet();
+ ScriptSet(const ScriptSet &other);
+ ~ScriptSet();
+
+ UBool operator == (const ScriptSet &other) const;
+ ScriptSet & operator = (const ScriptSet &other);
+
+ UBool test(UScriptCode script, UErrorCode &status) const;
+ ScriptSet &Union(const ScriptSet &other);
+ ScriptSet &set(UScriptCode script, UErrorCode &status);
+ ScriptSet &reset(UScriptCode script, UErrorCode &status);
+ ScriptSet &intersect(const ScriptSet &other);
+ ScriptSet &intersect(UScriptCode script, UErrorCode &status);
+ UBool intersects(const ScriptSet &other) const; // Sets contain at least one script in commmon.
+ UBool contains(const ScriptSet &other) const; // All set bits in other are also set in this.
+
+ ScriptSet &setAll();
+ ScriptSet &resetAll();
+ int32_t countMembers() const;
+ int32_t hashCode() const;
+ int32_t nextSetBit(int32_t script) const;
+
+ UnicodeString &displayScripts(UnicodeString &dest) const; // append script names to dest string.
+ ScriptSet & parseScripts(const UnicodeString &scriptsString, UErrorCode &status); // Replaces ScriptSet contents.
+
+ private:
+ uint32_t bits[6];
+};
+
+U_NAMESPACE_END
+
+U_CAPI UBool U_EXPORT2
+uhash_compareScriptSet(const UElement key1, const UElement key2);
+
+U_CAPI int32_t U_EXPORT2
+uhash_hashScriptSet(const UElement key);
+
+U_CAPI void U_EXPORT2
+uhash_deleteScriptSet(void *obj);
+
+#endif // __SCRIPTSET_H__
diff --git a/i18n/simpletz.cpp b/i18n/simpletz.cpp
index 2f3b9cc..2faa558 100644
--- a/i18n/simpletz.cpp
+++ b/i18n/simpletz.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
- * Copyright (C) 1997-2012, International Business Machines Corporation and
+ * Copyright (C) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
@@ -32,6 +32,7 @@
#include "unicode/smpdtfmt.h"
#include "gregoimp.h"
+#include "umutex.h"
U_NAMESPACE_BEGIN
@@ -506,7 +507,7 @@
void
SimpleTimeZone::getOffsetFromLocal(UDate date, int32_t nonExistingTimeOpt, int32_t duplicatedTimeOpt,
- int32_t& rawOffsetGMT, int32_t& savingsDST, UErrorCode& status) /*const*/ {
+ int32_t& rawOffsetGMT, int32_t& savingsDST, UErrorCode& status) const {
if (U_FAILURE(status)) {
return;
}
@@ -967,13 +968,13 @@
}
UBool
-SimpleTimeZone::getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/ {
+SimpleTimeZone::getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const {
if (!useDaylight) {
return FALSE;
}
UErrorCode status = U_ZERO_ERROR;
- initTransitionRules(status);
+ checkTransitionRules(status);
if (U_FAILURE(status)) {
return FALSE;
}
@@ -1001,13 +1002,13 @@
}
UBool
-SimpleTimeZone::getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/ {
+SimpleTimeZone::getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const {
if (!useDaylight) {
return FALSE;
}
UErrorCode status = U_ZERO_ERROR;
- initTransitionRules(status);
+ checkTransitionRules(status);
if (U_FAILURE(status)) {
return FALSE;
}
@@ -1060,6 +1061,28 @@
clearTransitionRules();
}
+/*
+ * Lazy transition rules initializer
+ */
+static UMutex gLock = U_MUTEX_INITIALIZER;
+
+void
+SimpleTimeZone::checkTransitionRules(UErrorCode& status) const {
+ if (U_FAILURE(status)) {
+ return;
+ }
+ UBool initialized;
+ UMTX_CHECK(&gLock, transitionRulesInitialized, initialized);
+ if (!initialized) {
+ umtx_lock(&gLock);
+ if (!transitionRulesInitialized) {
+ SimpleTimeZone *ncThis = const_cast<SimpleTimeZone*>(this);
+ ncThis->initTransitionRules(status);
+ }
+ umtx_unlock(&gLock);
+ }
+}
+
void
SimpleTimeZone::initTransitionRules(UErrorCode& status) {
if (U_FAILURE(status)) {
@@ -1099,8 +1122,8 @@
}
// Check for Null pointer
if (dtRule == NULL) {
- status = U_MEMORY_ALLOCATION_ERROR;
- return;
+ status = U_MEMORY_ALLOCATION_ERROR;
+ return;
}
// For now, use ID + "(DST)" as the name
dstRule = new AnnualTimeZoneRule(tzid+UnicodeString(DST_STR), getRawOffset(), getDSTSavings(),
@@ -1108,9 +1131,9 @@
// Check for Null pointer
if (dstRule == NULL) {
- status = U_MEMORY_ALLOCATION_ERROR;
- deleteTransitionRules();
- return;
+ status = U_MEMORY_ALLOCATION_ERROR;
+ deleteTransitionRules();
+ return;
}
// Calculate the first DST start time
@@ -1136,9 +1159,9 @@
// Check for Null pointer
if (dtRule == NULL) {
- status = U_MEMORY_ALLOCATION_ERROR;
- deleteTransitionRules();
- return;
+ status = U_MEMORY_ALLOCATION_ERROR;
+ deleteTransitionRules();
+ return;
}
// For now, use ID + "(STD)" as the name
stdRule = new AnnualTimeZoneRule(tzid+UnicodeString(STD_STR), getRawOffset(), 0,
@@ -1146,9 +1169,9 @@
//Check for Null pointer
if (stdRule == NULL) {
- status = U_MEMORY_ALLOCATION_ERROR;
- deleteTransitionRules();
- return;
+ status = U_MEMORY_ALLOCATION_ERROR;
+ deleteTransitionRules();
+ return;
}
// Calculate the first STD start time
@@ -1164,9 +1187,9 @@
}
// Check for null pointers.
if (initialRule == NULL || firstTransition == NULL) {
- status = U_MEMORY_ALLOCATION_ERROR;
- deleteTransitionRules();
- return;
+ status = U_MEMORY_ALLOCATION_ERROR;
+ deleteTransitionRules();
+ return;
}
} else {
@@ -1174,17 +1197,17 @@
initialRule = new InitialTimeZoneRule(tzid, getRawOffset(), 0);
// Check for null pointer.
if (initialRule == NULL) {
- status = U_MEMORY_ALLOCATION_ERROR;
- deleteTransitionRules();
- return;
+ status = U_MEMORY_ALLOCATION_ERROR;
+ deleteTransitionRules();
+ return;
}
}
- transitionRulesInitialized = true;
+ transitionRulesInitialized = TRUE;
}
int32_t
-SimpleTimeZone::countTransitionRules(UErrorCode& /*status*/) /*const*/ {
+SimpleTimeZone::countTransitionRules(UErrorCode& /*status*/) const {
return (useDaylight) ? 2 : 0;
}
@@ -1192,11 +1215,11 @@
SimpleTimeZone::getTimeZoneRules(const InitialTimeZoneRule*& initial,
const TimeZoneRule* trsrules[],
int32_t& trscount,
- UErrorCode& status) /*const*/ {
+ UErrorCode& status) const {
if (U_FAILURE(status)) {
return;
}
- initTransitionRules(status);
+ checkTransitionRules(status);
if (U_FAILURE(status)) {
return;
}
diff --git a/i18n/smpdtfmt.cpp b/i18n/smpdtfmt.cpp
index 622a2f3..8ebd0d1 100644
--- a/i18n/smpdtfmt.cpp
+++ b/i18n/smpdtfmt.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 1997-2012, International Business Machines Corporation and *
+* Copyright (C) 1997-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*
@@ -137,8 +137,9 @@
UDAT_HOUR1_FIELD,
UDAT_HOUR0_FIELD,
UDAT_MILLISECONDS_IN_DAY_FIELD,
- UDAT_TIMEZONE_RFC_FIELD };
-static const int8_t kTimeFieldsCount = 9;
+ UDAT_TIMEZONE_RFC_FIELD,
+ UDAT_TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD };
+static const int8_t kTimeFieldsCount = 10;
// This is a pattern-of-last-resort used when we can't load a usable pattern out
@@ -203,6 +204,9 @@
-1, // 'q' - UDAT_STANDALONE_QUARTER_FIELD
-1 // 'V' - UDAT_TIMEZONE_SPECIAL_FIELD
-1, // 'U' - UDAT_YEAR_NAME_FIELD
+ -1, // 'O' - UDAT_TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD
+ -1, // 'X' - UDAT_TIMEZONE_ISO_FIELD
+ -1, // 'x' - UDAT_TIMEZONE_ISO_LOCAL_FIELD
};
// When calendar uses hebr numbering (i.e. he@calendar=hebrew),
@@ -936,13 +940,13 @@
const int32_t
SimpleDateFormat::fgPatternCharToLevel[] = {
// A B C D E F G H I J K L M N O
- -1, 40, -1, -1, 20, 30, 30, 0, 50, -1, -1, 50, 20, 20, -1, -1,
+ -1, 40, -1, -1, 20, 30, 30, 0, 50, -1, -1, 50, 20, 20, -1, 0,
// P Q R S T U V W X Y Z
- -1, 20, -1, 80, -1, 10, 0, 30, -1, 10, 0, -1, -1, -1, -1, -1,
+ -1, 20, -1, 80, -1, 10, 0, 30, 0, 10, 0, -1, -1, -1, -1, -1,
// a b c d e f g h i j k l m n o
-1, 40, -1, 30, 30, 30, -1, 0, 50, -1, -1, 50, -1, 60, -1, -1,
// p q r s t u v w x y z
- -1, 20, -1, 70, -1, 10, 0, 20, -1, 10, 0, -1, -1, -1, -1, -1
+ -1, 20, -1, 70, -1, 10, 0, 20, 0, 10, 0, -1, -1, -1, -1, -1
};
@@ -965,6 +969,8 @@
/*q*/ UCAL_MONTH,
/*V*/ UCAL_ZONE_OFFSET,
/*U*/ UCAL_YEAR,
+ /*O*/ UCAL_ZONE_OFFSET,
+ /*Xx*/ UCAL_ZONE_OFFSET, UCAL_ZONE_OFFSET,
};
// Map index into pattern character string to DateFormat field number
@@ -985,6 +991,8 @@
/*q*/ UDAT_STANDALONE_QUARTER_FIELD,
/*V*/ UDAT_TIMEZONE_SPECIAL_FIELD,
/*U*/ UDAT_YEAR_NAME_FIELD,
+ /*O*/ UDAT_TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD,
+ /*Xx*/ UDAT_TIMEZONE_ISO_FIELD, UDAT_TIMEZONE_ISO_LOCAL_FIELD,
};
//----------------------------------------------------------------------
@@ -1343,6 +1351,7 @@
break;
// for "ee" or "e", use local numeric day-of-the-week
+ // for "EEEEEE" or "eeeeee", write out the short day-of-the-week name
// for "EEEEE" or "eeeee", write out the narrow day-of-the-week name
// for "EEEE" or "eeee", write out the wide day-of-the-week name
// for "EEE" or "EE" or "E" or "eee", write out the abbreviated day-of-the-week name
@@ -1367,6 +1376,10 @@
_appendSymbol(appendTo, value, fSymbols->fWeekdays,
fSymbols->fWeekdaysCount);
capContextUsageType = DateFormatSymbols::kCapContextUsageDayFormat;
+ } else if (count == 6) {
+ _appendSymbol(appendTo, value, fSymbols->fShorterWeekdays,
+ fSymbols->fShorterWeekdaysCount);
+ capContextUsageType = DateFormatSymbols::kCapContextUsageDayFormat;
} else {
_appendSymbol(appendTo, value, fSymbols->fShortWeekdays,
fSymbols->fShortWeekdaysCount);
@@ -1377,6 +1390,7 @@
// for "ccc", write out the abbreviated day-of-the-week name
// for "cccc", write out the wide day-of-the-week name
// for "ccccc", use the narrow day-of-the-week name
+ // for "ccccc", use the short day-of-the-week name
case UDAT_STANDALONE_DAY_FIELD:
if ( count < 3 ) {
zeroPaddingNumber(currentNumberFormat,appendTo, value, 1, maxIntCount);
@@ -1396,6 +1410,10 @@
_appendSymbol(appendTo, value, fSymbols->fStandaloneWeekdays,
fSymbols->fStandaloneWeekdaysCount);
capContextUsageType = DateFormatSymbols::kCapContextUsageDayStandalone;
+ } else if (count == 6) {
+ _appendSymbol(appendTo, value, fSymbols->fStandaloneShorterWeekdays,
+ fSymbols->fStandaloneShorterWeekdaysCount);
+ capContextUsageType = DateFormatSymbols::kCapContextUsageDayStandalone;
} else { // count == 3
_appendSymbol(appendTo, value, fSymbols->fStandaloneShortWeekdays,
fSymbols->fStandaloneShortWeekdaysCount);
@@ -1418,43 +1436,42 @@
zeroPaddingNumber(currentNumberFormat,appendTo, value, count, maxIntCount);
break;
- // for the "z" symbols, we have to check our time zone data first. If we have a
- // localized name for the time zone, then "zzzz" / "zzz" indicate whether
- // daylight time is in effect (long/short) and "zz" / "z" do not (long/short).
- // If we don't have a localized time zone name,
- // then the time zone shows up as "GMT+hh:mm" or "GMT-hh:mm" (where "hh:mm" is the
- // offset from GMT) regardless of how many z's were in the pattern symbol
- case UDAT_TIMEZONE_FIELD:
- case UDAT_TIMEZONE_GENERIC_FIELD:
- case UDAT_TIMEZONE_SPECIAL_FIELD:
- case UDAT_TIMEZONE_RFC_FIELD: // 'Z' - TIMEZONE_RFC
+ case UDAT_TIMEZONE_FIELD: // 'z'
+ case UDAT_TIMEZONE_RFC_FIELD: // 'Z'
+ case UDAT_TIMEZONE_GENERIC_FIELD: // 'v'
+ case UDAT_TIMEZONE_SPECIAL_FIELD: // 'V'
+ case UDAT_TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD: // 'O'
+ case UDAT_TIMEZONE_ISO_FIELD: // 'X'
+ case UDAT_TIMEZONE_ISO_LOCAL_FIELD: // 'x'
{
UnicodeString zoneString;
const TimeZone& tz = cal.getTimeZone();
UDate date = cal.getTime(status);
if (U_SUCCESS(status)) {
- if (patternCharIndex == UDAT_TIMEZONE_RFC_FIELD) {
- if (count < 4) {
- // "Z"
- tzFormat()->format(UTZFMT_STYLE_RFC822, tz, date, zoneString);
- } else if (count == 5) {
- // "ZZZZZ"
- tzFormat()->format(UTZFMT_STYLE_ISO8601, tz, date, zoneString);
- } else {
- // "ZZ", "ZZZ", "ZZZZ"
- tzFormat()->format(UTZFMT_STYLE_LOCALIZED_GMT, tz, date, zoneString);
- }
- } else if (patternCharIndex == UDAT_TIMEZONE_FIELD) {
+ if (patternCharIndex == UDAT_TIMEZONE_FIELD) {
if (count < 4) {
// "z", "zz", "zzz"
tzFormat()->format(UTZFMT_STYLE_SPECIFIC_SHORT, tz, date, zoneString);
capContextUsageType = DateFormatSymbols::kCapContextUsageMetazoneShort;
} else {
- // "zzzz"
+ // "zzzz" or longer
tzFormat()->format(UTZFMT_STYLE_SPECIFIC_LONG, tz, date, zoneString);
capContextUsageType = DateFormatSymbols::kCapContextUsageMetazoneLong;
}
- } else if (patternCharIndex == UDAT_TIMEZONE_GENERIC_FIELD) {
+ }
+ else if (patternCharIndex == UDAT_TIMEZONE_RFC_FIELD) {
+ if (count < 4) {
+ // "Z"
+ tzFormat()->format(UTZFMT_STYLE_ISO_BASIC_LOCAL_FULL, tz, date, zoneString);
+ } else if (count == 5) {
+ // "ZZZZZ"
+ tzFormat()->format(UTZFMT_STYLE_ISO_EXTENDED_FULL, tz, date, zoneString);
+ } else {
+ // "ZZ", "ZZZ", "ZZZZ"
+ tzFormat()->format(UTZFMT_STYLE_LOCALIZED_GMT, tz, date, zoneString);
+ }
+ }
+ else if (patternCharIndex == UDAT_TIMEZONE_GENERIC_FIELD) {
if (count == 1) {
// "v"
tzFormat()->format(UTZFMT_STYLE_GENERIC_SHORT, tz, date, zoneString);
@@ -1464,17 +1481,71 @@
tzFormat()->format(UTZFMT_STYLE_GENERIC_LONG, tz, date, zoneString);
capContextUsageType = DateFormatSymbols::kCapContextUsageMetazoneLong;
}
- } else { // patternCharIndex == UDAT_TIMEZONE_SPECIAL_FIELD
+ }
+ else if (patternCharIndex == UDAT_TIMEZONE_SPECIAL_FIELD) {
if (count == 1) {
// "V"
- tzFormat()->format(UTZFMT_STYLE_SPECIFIC_SHORT, tz, date, zoneString);
- capContextUsageType = DateFormatSymbols::kCapContextUsageMetazoneShort;
+ tzFormat()->format(UTZFMT_STYLE_ZONE_ID_SHORT, tz, date, zoneString);
+ } else if (count == 2) {
+ // "VV"
+ tzFormat()->format(UTZFMT_STYLE_ZONE_ID, tz, date, zoneString);
+ } else if (count == 3) {
+ // "VVV"
+ tzFormat()->format(UTZFMT_STYLE_EXEMPLAR_LOCATION, tz, date, zoneString);
} else if (count == 4) {
// "VVVV"
tzFormat()->format(UTZFMT_STYLE_GENERIC_LOCATION, tz, date, zoneString);
capContextUsageType = DateFormatSymbols::kCapContextUsageZoneLong;
}
}
+ else if (patternCharIndex == UDAT_TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD) {
+ if (count == 1) {
+ // "O"
+ tzFormat()->format(UTZFMT_STYLE_LOCALIZED_GMT_SHORT, tz, date, zoneString);
+ } else if (count == 4) {
+ // "OOOO"
+ tzFormat()->format(UTZFMT_STYLE_LOCALIZED_GMT, tz, date, zoneString);
+ }
+ }
+ else if (patternCharIndex == UDAT_TIMEZONE_ISO_FIELD) {
+ if (count == 1) {
+ // "X"
+ tzFormat()->format(UTZFMT_STYLE_ISO_BASIC_SHORT, tz, date, zoneString);
+ } else if (count == 2) {
+ // "XX"
+ tzFormat()->format(UTZFMT_STYLE_ISO_BASIC_FIXED, tz, date, zoneString);
+ } else if (count == 3) {
+ // "XXX"
+ tzFormat()->format(UTZFMT_STYLE_ISO_EXTENDED_FIXED, tz, date, zoneString);
+ } else if (count == 4) {
+ // "XXXX"
+ tzFormat()->format(UTZFMT_STYLE_ISO_BASIC_FULL, tz, date, zoneString);
+ } else if (count == 5) {
+ // "XXXXX"
+ tzFormat()->format(UTZFMT_STYLE_ISO_EXTENDED_FULL, tz, date, zoneString);
+ }
+ }
+ else if (patternCharIndex == UDAT_TIMEZONE_ISO_LOCAL_FIELD) {
+ if (count == 1) {
+ // "x"
+ tzFormat()->format(UTZFMT_STYLE_ISO_BASIC_LOCAL_SHORT, tz, date, zoneString);
+ } else if (count == 2) {
+ // "xx"
+ tzFormat()->format(UTZFMT_STYLE_ISO_BASIC_LOCAL_FIXED, tz, date, zoneString);
+ } else if (count == 3) {
+ // "xxx"
+ tzFormat()->format(UTZFMT_STYLE_ISO_EXTENDED_LOCAL_FIXED, tz, date, zoneString);
+ } else if (count == 4) {
+ // "xxxx"
+ tzFormat()->format(UTZFMT_STYLE_ISO_BASIC_LOCAL_FULL, tz, date, zoneString);
+ } else if (count == 5) {
+ // "xxxxx"
+ tzFormat()->format(UTZFMT_STYLE_ISO_EXTENDED_LOCAL_FULL, tz, date, zoneString);
+ }
+ }
+ else {
+ U_ASSERT(FALSE);
+ }
}
appendTo += zoneString;
}
@@ -2541,19 +2612,22 @@
&& u_isdigit(text.charAt(start))
&& u_isdigit(text.charAt(start+1)))
{
- // Assume for example that the defaultCenturyStart is 6/18/1903.
- // This means that two-digit years will be forced into the range
- // 6/18/1903 to 6/17/2003. As a result, years 00, 01, and 02
- // correspond to 2000, 2001, and 2002. Years 04, 05, etc. correspond
- // to 1904, 1905, etc. If the year is 03, then it is 2003 if the
- // other fields specify a date before 6/18, or 1903 if they specify a
- // date afterwards. As a result, 03 is an ambiguous year. All other
- // two-digit years are unambiguous.
- if(fHaveDefaultCentury) { // check if this formatter even has a pivot year
- int32_t ambiguousTwoDigitYear = fDefaultCenturyStartYear % 100;
- ambiguousYear[0] = (value == ambiguousTwoDigitYear);
- value += (fDefaultCenturyStartYear/100)*100 +
- (value < ambiguousTwoDigitYear ? 100 : 0);
+ // only adjust year for patterns less than 3.
+ if(count < 3) {
+ // Assume for example that the defaultCenturyStart is 6/18/1903.
+ // This means that two-digit years will be forced into the range
+ // 6/18/1903 to 6/17/2003. As a result, years 00, 01, and 02
+ // correspond to 2000, 2001, and 2002. Years 04, 05, etc. correspond
+ // to 1904, 1905, etc. If the year is 03, then it is 2003 if the
+ // other fields specify a date before 6/18, or 1903 if they specify a
+ // date afterwards. As a result, 03 is an ambiguous year. All other
+ // two-digit years are unambiguous.
+ if(fHaveDefaultCentury) { // check if this formatter even has a pivot year
+ int32_t ambiguousTwoDigitYear = fDefaultCenturyStartYear % 100;
+ ambiguousYear[0] = (value == ambiguousTwoDigitYear);
+ value += (fDefaultCenturyStartYear/100)*100 +
+ (value < ambiguousTwoDigitYear ? 100 : 0);
+ }
}
}
cal.set(UCAL_YEAR, value);
@@ -2686,7 +2760,7 @@
a *= 10;
i--;
}
- value = (value + (a>>1)) / a;
+ value /= a;
}
cal.set(UCAL_MILLISECOND, value);
return pos.getIndex();
@@ -2703,16 +2777,20 @@
case UDAT_DAY_OF_WEEK_FIELD:
{
// Want to be able to parse both short and long forms.
- // Try count == 4 (EEEE) first:
+ // Try count == 4 (EEEE) wide first:
int32_t newStart = 0;
if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
fSymbols->fWeekdays, fSymbols->fWeekdaysCount, NULL, cal)) > 0)
return newStart;
- // EEEE failed, now try EEE
+ // EEEE wide failed, now try EEE abbreviated
else if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
fSymbols->fShortWeekdays, fSymbols->fShortWeekdaysCount, NULL, cal)) > 0)
return newStart;
- // EEE failed, now try EEEEE
+ // EEE abbreviated failed, now try EEEEEE short
+ else if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
+ fSymbols->fShorterWeekdays, fSymbols->fShorterWeekdaysCount, NULL, cal)) > 0)
+ return newStart;
+ // EEEEEE short failed, now try EEEEE narrow
else if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
fSymbols->fNarrowWeekdays, fSymbols->fNarrowWeekdaysCount, NULL, cal)) > 0)
return newStart;
@@ -2739,6 +2817,9 @@
else if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
fSymbols->fStandaloneShortWeekdays, fSymbols->fStandaloneShortWeekdaysCount, NULL, cal)) > 0)
return newStart;
+ else if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
+ fSymbols->fStandaloneShorterWeekdays, fSymbols->fStandaloneShorterWeekdaysCount, NULL, cal)) > 0)
+ return newStart;
else if (!lenient)
return newStart;
// else we allowing parsing as number, below
@@ -2811,7 +2892,7 @@
}
break;
- case UDAT_TIMEZONE_FIELD:
+ case UDAT_TIMEZONE_FIELD: // 'z'
{
UTimeZoneFormatTimeType tzTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
UTimeZoneFormatStyle style = (count < 4) ? UTZFMT_STYLE_SPECIFIC_SHORT : UTZFMT_STYLE_SPECIFIC_LONG;
@@ -2823,10 +2904,11 @@
}
}
break;
- case UDAT_TIMEZONE_RFC_FIELD:
+ case UDAT_TIMEZONE_RFC_FIELD: // 'Z'
{
UTimeZoneFormatTimeType tzTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
- UTimeZoneFormatStyle style = (count < 4) ? UTZFMT_STYLE_RFC822 : ((count == 5) ? UTZFMT_STYLE_ISO8601: UTZFMT_STYLE_LOCALIZED_GMT);
+ UTimeZoneFormatStyle style = (count < 4) ?
+ UTZFMT_STYLE_ISO_BASIC_LOCAL_FULL : ((count == 5) ? UTZFMT_STYLE_ISO_EXTENDED_FULL: UTZFMT_STYLE_LOCALIZED_GMT);
TimeZone *tz = tzFormat()->parse(style, text, pos, &tzTimeType);
if (tz != NULL) {
((SimpleDateFormat*)this)->tztype = tzTimeType;
@@ -2835,7 +2917,7 @@
}
return -start;
}
- case UDAT_TIMEZONE_GENERIC_FIELD:
+ case UDAT_TIMEZONE_GENERIC_FIELD: // 'v'
{
UTimeZoneFormatTimeType tzTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
UTimeZoneFormatStyle style = (count < 4) ? UTZFMT_STYLE_GENERIC_SHORT : UTZFMT_STYLE_GENERIC_LONG;
@@ -2847,10 +2929,94 @@
}
return -start;
}
- case UDAT_TIMEZONE_SPECIAL_FIELD:
+ case UDAT_TIMEZONE_SPECIAL_FIELD: // 'V'
{
UTimeZoneFormatTimeType tzTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
- UTimeZoneFormatStyle style = (count < 4) ? UTZFMT_STYLE_SPECIFIC_SHORT : UTZFMT_STYLE_GENERIC_LOCATION;
+ UTimeZoneFormatStyle style;
+ switch (count) {
+ case 1:
+ style = UTZFMT_STYLE_ZONE_ID_SHORT;
+ break;
+ case 2:
+ style = UTZFMT_STYLE_ZONE_ID;
+ break;
+ case 3:
+ style = UTZFMT_STYLE_EXEMPLAR_LOCATION;
+ break;
+ default:
+ style = UTZFMT_STYLE_GENERIC_LOCATION;
+ break;
+ }
+ TimeZone *tz = tzFormat()->parse(style, text, pos, &tzTimeType);
+ if (tz != NULL) {
+ ((SimpleDateFormat*)this)->tztype = tzTimeType;
+ cal.adoptTimeZone(tz);
+ return pos.getIndex();
+ }
+ return -start;
+ }
+ case UDAT_TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD: // 'O'
+ {
+ UTimeZoneFormatTimeType tzTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
+ UTimeZoneFormatStyle style = (count < 4) ? UTZFMT_STYLE_LOCALIZED_GMT_SHORT : UTZFMT_STYLE_LOCALIZED_GMT;
+ TimeZone *tz = tzFormat()->parse(style, text, pos, &tzTimeType);
+ if (tz != NULL) {
+ ((SimpleDateFormat*)this)->tztype = tzTimeType;
+ cal.adoptTimeZone(tz);
+ return pos.getIndex();
+ }
+ return -start;
+ }
+ case UDAT_TIMEZONE_ISO_FIELD: // 'X'
+ {
+ UTimeZoneFormatTimeType tzTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
+ UTimeZoneFormatStyle style;
+ switch (count) {
+ case 1:
+ style = UTZFMT_STYLE_ISO_BASIC_SHORT;
+ break;
+ case 2:
+ style = UTZFMT_STYLE_ISO_BASIC_FIXED;
+ break;
+ case 3:
+ style = UTZFMT_STYLE_ISO_EXTENDED_FIXED;
+ break;
+ case 4:
+ style = UTZFMT_STYLE_ISO_BASIC_FULL;
+ break;
+ default:
+ style = UTZFMT_STYLE_ISO_EXTENDED_FULL;
+ break;
+ }
+ TimeZone *tz = tzFormat()->parse(style, text, pos, &tzTimeType);
+ if (tz != NULL) {
+ ((SimpleDateFormat*)this)->tztype = tzTimeType;
+ cal.adoptTimeZone(tz);
+ return pos.getIndex();
+ }
+ return -start;
+ }
+ case UDAT_TIMEZONE_ISO_LOCAL_FIELD: // 'x'
+ {
+ UTimeZoneFormatTimeType tzTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
+ UTimeZoneFormatStyle style;
+ switch (count) {
+ case 1:
+ style = UTZFMT_STYLE_ISO_BASIC_LOCAL_SHORT;
+ break;
+ case 2:
+ style = UTZFMT_STYLE_ISO_BASIC_LOCAL_FIXED;
+ break;
+ case 3:
+ style = UTZFMT_STYLE_ISO_EXTENDED_LOCAL_FIXED;
+ break;
+ case 4:
+ style = UTZFMT_STYLE_ISO_BASIC_LOCAL_FULL;
+ break;
+ default:
+ style = UTZFMT_STYLE_ISO_EXTENDED_LOCAL_FULL;
+ break;
+ }
TimeZone *tz = tzFormat()->parse(style, text, pos, &tzTimeType);
if (tz != NULL) {
((SimpleDateFormat*)this)->tztype = tzTimeType;
diff --git a/i18n/timezone.cpp b/i18n/timezone.cpp
index ca98ef3..de324ae 100644
--- a/i18n/timezone.cpp
+++ b/i18n/timezone.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 1997-2012, International Business Machines Corporation and *
+* Copyright (C) 1997-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*
@@ -1252,7 +1252,11 @@
// appropriate for the requested daylight value.
if ((daylight && timeType == UTZFMT_TIME_TYPE_STANDARD) || (!daylight && timeType == UTZFMT_TIME_TYPE_DAYLIGHT)) {
offset = daylight ? getRawOffset() + getDSTSavings() : getRawOffset();
- tzfmt->formatOffsetLocalizedGMT(offset, result, status);
+ if (style == SHORT_GENERIC) {
+ tzfmt->formatOffsetShortLocalizedGMT(offset, result, status);
+ } else {
+ tzfmt->formatOffsetLocalizedGMT(offset, result, status);
+ }
}
} else if (style == LONG_GMT || style == SHORT_GMT) {
LocalPointer<TimeZoneFormat> tzfmt(TimeZoneFormat::createInstance(locale, status));
@@ -1266,7 +1270,7 @@
tzfmt->formatOffsetLocalizedGMT(offset, result, status);
break;
case SHORT_GMT:
- tzfmt->formatOffsetRFC822(offset, result, status);
+ tzfmt->formatOffsetISO8601Basic(offset, FALSE, FALSE, FALSE, result, status);
break;
default:
U_ASSERT(FALSE);
@@ -1297,7 +1301,11 @@
// Fallback to localized GMT
LocalPointer<TimeZoneFormat> tzfmt(TimeZoneFormat::createInstance(locale, status));
offset = daylight && useDaylightTime() ? getRawOffset() + getDSTSavings() : getRawOffset();
- tzfmt->formatOffsetLocalizedGMT(offset, result, status);
+ if (style == LONG) {
+ tzfmt->formatOffsetLocalizedGMT(offset, result, status);
+ } else {
+ tzfmt->formatOffsetShortLocalizedGMT(offset, result, status);
+ }
}
}
if (U_FAILURE(status)) {
diff --git a/i18n/tzfmt.cpp b/i18n/tzfmt.cpp
index a7c7f9a..95f0421 100644
--- a/i18n/tzfmt.cpp
+++ b/i18n/tzfmt.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2011-2012, International Business Machines Corporation and *
+* Copyright (C) 2011-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@@ -25,22 +25,56 @@
#include "ureslocs.h"
#include "uvector.h"
#include "zonemeta.h"
+#include "tznames_impl.h" // TextTrieMap
U_NAMESPACE_BEGIN
+// Bit flags used by the parse method.
+// The order must match UTimeZoneFormatStyle enum.
+#define ISO_Z_STYLE_FLAG 0x0080
+#define ISO_LOCAL_STYLE_FLAG 0x0100
+static const int16_t STYLE_PARSE_FLAGS[] = {
+ 0x0001, // UTZFMT_STYLE_GENERIC_LOCATION,
+ 0x0002, // UTZFMT_STYLE_GENERIC_LONG,
+ 0x0004, // UTZFMT_STYLE_GENERIC_SHORT,
+ 0x0008, // UTZFMT_STYLE_SPECIFIC_LONG,
+ 0x0010, // UTZFMT_STYLE_SPECIFIC_SHORT,
+ 0x0020, // UTZFMT_STYLE_LOCALIZED_GMT,
+ 0x0040, // UTZFMT_STYLE_LOCALIZED_GMT_SHORT,
+ ISO_Z_STYLE_FLAG, // UTZFMT_STYLE_ISO_BASIC_SHORT,
+ ISO_LOCAL_STYLE_FLAG, // UTZFMT_STYLE_ISO_BASIC_LOCAL_SHORT,
+ ISO_Z_STYLE_FLAG, // UTZFMT_STYLE_ISO_BASIC_FIXED,
+ ISO_LOCAL_STYLE_FLAG, // UTZFMT_STYLE_ISO_BASIC_LOCAL_FIXED,
+ ISO_Z_STYLE_FLAG, // UTZFMT_STYLE_ISO_BASIC_FULL,
+ ISO_LOCAL_STYLE_FLAG, // UTZFMT_STYLE_ISO_BASIC_LOCAL_FULL,
+ ISO_Z_STYLE_FLAG, // UTZFMT_STYLE_ISO_EXTENDED_FIXED,
+ ISO_LOCAL_STYLE_FLAG, // UTZFMT_STYLE_ISO_EXTENDED_LOCAL_FIXED,
+ ISO_Z_STYLE_FLAG, // UTZFMT_STYLE_ISO_EXTENDED_FULL,
+ ISO_LOCAL_STYLE_FLAG, // UTZFMT_STYLE_ISO_EXTENDED_LOCAL_FULL,
+ 0x0200, // UTZFMT_STYLE_ZONE_ID,
+ 0x0400, // UTZFMT_STYLE_ZONE_ID_SHORT,
+ 0x0800 // UTZFMT_STYLE_EXEMPLAR_LOCATION
+};
+
static const char gZoneStringsTag[] = "zoneStrings";
static const char gGmtFormatTag[]= "gmtFormat";
static const char gGmtZeroFormatTag[] = "gmtZeroFormat";
static const char gHourFormatTag[]= "hourFormat";
static const UChar TZID_GMT[] = {0x0045, 0x0074, 0x0063, 0x002F, 0x0047, 0x004D, 0x0054, 0}; // Etc/GMT
+static const UChar UNKNOWN_ZONE_ID[] = {
+ 0x0045, 0x0074, 0x0063, 0x002F, 0x0055, 0x006E, 0x006B, 0x006E, 0x006F, 0x0077, 0x006E, 0}; // Etc/Unknown
+static const UChar UNKNOWN_SHORT_ZONE_ID[] = {0x0075, 0x006E, 0x006B, 0}; // unk
+static const UChar UNKNOWN_LOCATION[] = {0x0055, 0x006E, 0x006B, 0x006E, 0x006F, 0x0077, 0x006E, 0}; // Unknown
static const UChar DEFAULT_GMT_PATTERN[] = {0x0047, 0x004D, 0x0054, 0x007B, 0x0030, 0x007D, 0}; // GMT{0}
//static const UChar DEFAULT_GMT_ZERO[] = {0x0047, 0x004D, 0x0054, 0}; // GMT
-static const UChar DEFAULT_GMT_POSITIVE_HM[] = {0x002B, 0x0048, 0x0048, 0x003A, 0x006D, 0x006D, 0}; // +HH:mm
-static const UChar DEFAULT_GMT_POSITIVE_HMS[] = {0x002B, 0x0048, 0x0048, 0x003A, 0x006D, 0x006D, 0x003A, 0x0073, 0x0073, 0}; // +HH:mm:ss
-static const UChar DEFAULT_GMT_NEGATIVE_HM[] = {0x002D, 0x0048, 0x0048, 0x003A, 0x006D, 0x006D, 0}; // -HH:mm
-static const UChar DEFAULT_GMT_NEGATIVE_HMS[] = {0x002D, 0x0048, 0x0048, 0x003A, 0x006D, 0x006D, 0x003A, 0x0073, 0x0073, 0}; // -HH:mm:ss
+static const UChar DEFAULT_GMT_POSITIVE_HM[] = {0x002B, 0x0048, 0x003A, 0x006D, 0x006D, 0}; // +H:mm
+static const UChar DEFAULT_GMT_POSITIVE_HMS[] = {0x002B, 0x0048, 0x003A, 0x006D, 0x006D, 0x003A, 0x0073, 0x0073, 0}; // +H:mm:ss
+static const UChar DEFAULT_GMT_NEGATIVE_HM[] = {0x002D, 0x0048, 0x003A, 0x006D, 0x006D, 0}; // -H:mm
+static const UChar DEFAULT_GMT_NEGATIVE_HMS[] = {0x002D, 0x0048, 0x003A, 0x006D, 0x006D, 0x003A, 0x0073, 0x0073, 0}; // -H:mm:ss
+static const UChar DEFAULT_GMT_POSITIVE_H[] = {0x002B, 0x0048, 0}; // +H
+static const UChar DEFAULT_GMT_NEGATIVE_H[] = {0x002D, 0x0048, 0}; // -H
static const UChar32 DEFAULT_GMT_DIGITS[] = {
0x0030, 0x0031, 0x0032, 0x0033, 0x0034,
@@ -50,7 +84,7 @@
static const UChar DEFAULT_GMT_OFFSET_SEP = 0x003A; // ':'
static const UChar ARG0[] = {0x007B, 0x0030, 0x007D}; // "{0}"
-static const int ARG0_LEN = 3;
+static const int32_t ARG0_LEN = 3;
static const UChar DEFAULT_GMT_OFFSET_MINUTE_PATTERN[] = {0x006D, 0x006D, 0}; // "mm"
static const UChar DEFAULT_GMT_OFFSET_SECOND_PATTERN[] = {0x0073, 0x0073, 0}; // "ss"
@@ -69,6 +103,8 @@
UTZFMT_PAT_NEGATIVE_HMS,
UTZFMT_PAT_POSITIVE_HM,
UTZFMT_PAT_NEGATIVE_HM,
+ UTZFMT_PAT_POSITIVE_H,
+ UTZFMT_PAT_NEGATIVE_H,
-1
};
@@ -92,13 +128,42 @@
static const int32_t UNKNOWN_OFFSET = 0x7FFFFFFF;
-static const int32_t ALL_SPECIFIC_NAME_TYPES = UTZNM_LONG_STANDARD | UTZNM_LONG_DAYLIGHT | UTZNM_SHORT_STANDARD | UTZNM_SHORT_DAYLIGHT;
+static const int32_t ALL_SIMPLE_NAME_TYPES = UTZNM_LONG_STANDARD | UTZNM_LONG_DAYLIGHT | UTZNM_SHORT_STANDARD | UTZNM_SHORT_DAYLIGHT | UTZNM_EXEMPLAR_LOCATION;
static const int32_t ALL_GENERIC_NAME_TYPES = UTZGNM_LOCATION | UTZGNM_LONG | UTZGNM_SHORT;
-#define STYLE_FLAG(c) (1 << (c))
#define DIGIT_VAL(c) (0x0030 <= (c) && (c) <= 0x0039 ? (c) - 0x0030 : -1)
#define MAX_OFFSET_DIGITS 6
+// Time Zone ID/Short ID trie
+static TextTrieMap *gZoneIdTrie = NULL;
+static UBool gZoneIdTrieInitialized = FALSE;
+
+static TextTrieMap *gShortZoneIdTrie = NULL;
+static UBool gShortZoneIdTrieInitialized = FALSE;
+
+static UMutex gLock = U_MUTEX_INITIALIZER;
+
+U_CDECL_BEGIN
+/**
+ * Cleanup callback func
+ */
+static UBool U_CALLCONV tzfmt_cleanup(void)
+{
+ if (gZoneIdTrie != NULL) {
+ delete gZoneIdTrie;
+ }
+ gZoneIdTrie = NULL;
+ gZoneIdTrieInitialized = FALSE;
+
+ if (gShortZoneIdTrie != NULL) {
+ delete gShortZoneIdTrie;
+ }
+ gShortZoneIdTrie = NULL;
+ gShortZoneIdTrieInitialized = FALSE;
+
+ return TRUE;
+}
+U_CDECL_END
// ------------------------------------------------------------------
// GMTOffsetField
@@ -245,7 +310,7 @@
TimeZoneFormat::TimeZoneFormat(const Locale& locale, UErrorCode& status)
: fLocale(locale), fTimeZoneNames(NULL), fTimeZoneGenericNames(NULL), fDefParseOptionFlags(0) {
- for (int32_t i = 0; i <= UTZFMT_PAT_NEGATIVE_HMS; i++) {
+ for (int32_t i = 0; i < UTZFMT_PAT_COUNT; i++) {
fGMTOffsetPatternItems[i] = NULL;
}
@@ -269,6 +334,9 @@
fTimeZoneNames = TimeZoneNames::createInstance(locale, status);
// fTimeZoneGenericNames is lazily instantiated
+ if (U_FAILURE(status)) {
+ return;
+ }
const UChar* gmtPattern = NULL;
const UChar* hourFormats = NULL;
@@ -299,20 +367,27 @@
}
initGMTPattern(UnicodeString(gmtPattern, -1), status);
- UBool useDefHourFmt = TRUE;
+ UBool useDefaultOffsetPatterns = TRUE;
if (hourFormats) {
UChar *sep = u_strchr(hourFormats, (UChar)0x003B /* ';' */);
if (sep != NULL) {
+ UErrorCode tmpStatus = U_ZERO_ERROR;
fGMTOffsetPatterns[UTZFMT_PAT_POSITIVE_HM].setTo(FALSE, hourFormats, (int32_t)(sep - hourFormats));
fGMTOffsetPatterns[UTZFMT_PAT_NEGATIVE_HM].setTo(TRUE, sep + 1, -1);
- expandOffsetPattern(fGMTOffsetPatterns[UTZFMT_PAT_POSITIVE_HM], fGMTOffsetPatterns[UTZFMT_PAT_POSITIVE_HMS]);
- expandOffsetPattern(fGMTOffsetPatterns[UTZFMT_PAT_NEGATIVE_HM], fGMTOffsetPatterns[UTZFMT_PAT_NEGATIVE_HMS]);
- useDefHourFmt = FALSE;
+ expandOffsetPattern(fGMTOffsetPatterns[UTZFMT_PAT_POSITIVE_HM], fGMTOffsetPatterns[UTZFMT_PAT_POSITIVE_HMS], tmpStatus);
+ expandOffsetPattern(fGMTOffsetPatterns[UTZFMT_PAT_NEGATIVE_HM], fGMTOffsetPatterns[UTZFMT_PAT_NEGATIVE_HMS], tmpStatus);
+ truncateOffsetPattern(fGMTOffsetPatterns[UTZFMT_PAT_POSITIVE_HM], fGMTOffsetPatterns[UTZFMT_PAT_POSITIVE_H], tmpStatus);
+ truncateOffsetPattern(fGMTOffsetPatterns[UTZFMT_PAT_NEGATIVE_HM], fGMTOffsetPatterns[UTZFMT_PAT_NEGATIVE_H], tmpStatus);
+ if (U_SUCCESS(tmpStatus)) {
+ useDefaultOffsetPatterns = FALSE;
+ }
}
}
- if (useDefHourFmt) {
+ if (useDefaultOffsetPatterns) {
+ fGMTOffsetPatterns[UTZFMT_PAT_POSITIVE_H].setTo(TRUE, DEFAULT_GMT_POSITIVE_H, -1);
fGMTOffsetPatterns[UTZFMT_PAT_POSITIVE_HM].setTo(TRUE, DEFAULT_GMT_POSITIVE_HM, -1);
fGMTOffsetPatterns[UTZFMT_PAT_POSITIVE_HMS].setTo(TRUE, DEFAULT_GMT_POSITIVE_HMS, -1);
+ fGMTOffsetPatterns[UTZFMT_PAT_NEGATIVE_H].setTo(TRUE, DEFAULT_GMT_NEGATIVE_H, -1);
fGMTOffsetPatterns[UTZFMT_PAT_NEGATIVE_HM].setTo(TRUE, DEFAULT_GMT_NEGATIVE_HM, -1);
fGMTOffsetPatterns[UTZFMT_PAT_NEGATIVE_HMS].setTo(TRUE, DEFAULT_GMT_NEGATIVE_HMS, -1);
}
@@ -333,7 +408,7 @@
TimeZoneFormat::TimeZoneFormat(const TimeZoneFormat& other)
: Format(other), fTimeZoneNames(NULL), fTimeZoneGenericNames(NULL) {
- for (int32_t i = 0; i <= UTZFMT_PAT_NEGATIVE_HMS; i++) {
+ for (int32_t i = 0; i < UTZFMT_PAT_COUNT; i++) {
fGMTOffsetPatternItems[i] = NULL;
}
*this = other;
@@ -343,7 +418,7 @@
TimeZoneFormat::~TimeZoneFormat() {
delete fTimeZoneNames;
delete fTimeZoneGenericNames;
- for (int32_t i = 0; i <= UTZFMT_PAT_NEGATIVE_HMS; i++) {
+ for (int32_t i = 0; i < UTZFMT_PAT_COUNT; i++) {
delete fGMTOffsetPatternItems[i];
}
}
@@ -371,7 +446,7 @@
fGMTPatternSuffix = other.fGMTPatternSuffix;
UErrorCode status = U_ZERO_ERROR;
- for (int32_t i = 0; i <= UTZFMT_PAT_NEGATIVE_HMS; i++) {
+ for (int32_t i = 0; i < UTZFMT_PAT_COUNT; i++) {
fGMTOffsetPatterns[i] = other.fGMTOffsetPatterns[i];
delete fGMTOffsetPatternItems[i];
}
@@ -398,7 +473,7 @@
&& fGMTZeroFormat == tzfmt->fGMTZeroFormat
&& *fTimeZoneNames == *tzfmt->fTimeZoneNames;
- for (int32_t i = 0; i <= UTZFMT_PAT_NEGATIVE_HMS && isEqual; i++) {
+ for (int32_t i = 0; i < UTZFMT_PAT_COUNT && isEqual; i++) {
isEqual = fGMTOffsetPatterns[i] == tzfmt->fGMTOffsetPatterns[i];
}
for (int32_t i = 0; i < 10 && isEqual; i++) {
@@ -486,7 +561,24 @@
return;
}
- OffsetFields required = (type == UTZFMT_PAT_POSITIVE_HMS || type == UTZFMT_PAT_NEGATIVE_HMS) ? FIELDS_HMS : FIELDS_HM;
+ OffsetFields required = FIELDS_HM;
+ switch (type) {
+ case UTZFMT_PAT_POSITIVE_H:
+ case UTZFMT_PAT_NEGATIVE_H:
+ required = FIELDS_H;
+ break;
+ case UTZFMT_PAT_POSITIVE_HM:
+ case UTZFMT_PAT_NEGATIVE_HM:
+ required = FIELDS_HM;
+ break;
+ case UTZFMT_PAT_POSITIVE_HMS:
+ case UTZFMT_PAT_NEGATIVE_HMS:
+ required = FIELDS_HMS;
+ break;
+ default:
+ U_ASSERT(FALSE);
+ break;
+ }
UVector* patternItems = parseOffsetPattern(pattern, required, status);
if (patternItems == NULL) {
@@ -496,6 +588,7 @@
fGMTOffsetPatterns[type].setTo(pattern);
delete fGMTOffsetPatternItems[type];
fGMTOffsetPatternItems[type] = patternItems;
+ checkAbuttingHoursAndMinutes();
}
UnicodeString&
@@ -561,9 +654,7 @@
case UTZFMT_STYLE_SPECIFIC_SHORT:
formatSpecific(tz, UTZNM_SHORT_STANDARD, UTZNM_SHORT_DAYLIGHT, date, name, timeType);
break;
- case UTZFMT_STYLE_RFC822:
- case UTZFMT_STYLE_ISO8601:
- case UTZFMT_STYLE_LOCALIZED_GMT:
+ default:
// will be handled below
break;
}
@@ -572,23 +663,84 @@
UErrorCode status = U_ZERO_ERROR;
int32_t rawOffset, dstOffset;
tz.getOffset(date, FALSE, rawOffset, dstOffset, status);
+ int32_t offset = rawOffset + dstOffset;
if (U_SUCCESS(status)) {
switch (style) {
- case UTZFMT_STYLE_RFC822:
- formatOffsetRFC822(rawOffset + dstOffset, name, status);
+ case UTZFMT_STYLE_GENERIC_LOCATION:
+ case UTZFMT_STYLE_GENERIC_LONG:
+ case UTZFMT_STYLE_SPECIFIC_LONG:
+ case UTZFMT_STYLE_LOCALIZED_GMT:
+ formatOffsetLocalizedGMT(offset, name, status);
break;
- case UTZFMT_STYLE_ISO8601:
- formatOffsetISO8601(rawOffset + dstOffset, name, status);
+
+ case UTZFMT_STYLE_GENERIC_SHORT:
+ case UTZFMT_STYLE_SPECIFIC_SHORT:
+ case UTZFMT_STYLE_LOCALIZED_GMT_SHORT:
+ formatOffsetShortLocalizedGMT(offset, name, status);
break;
- default:
- formatOffsetLocalizedGMT(rawOffset + dstOffset, name, status);
+
+ case UTZFMT_STYLE_ISO_BASIC_SHORT:
+ formatOffsetISO8601Basic(offset, TRUE, TRUE, TRUE, name, status);
+ break;
+
+ case UTZFMT_STYLE_ISO_BASIC_LOCAL_SHORT:
+ formatOffsetISO8601Basic(offset, FALSE, TRUE, TRUE, name, status);
+ break;
+
+ case UTZFMT_STYLE_ISO_BASIC_FIXED:
+ formatOffsetISO8601Basic(offset, TRUE, FALSE, TRUE, name, status);
+ break;
+
+ case UTZFMT_STYLE_ISO_BASIC_LOCAL_FIXED:
+ formatOffsetISO8601Basic(offset, FALSE, FALSE, TRUE, name, status);
+ break;
+
+ case UTZFMT_STYLE_ISO_EXTENDED_FIXED:
+ formatOffsetISO8601Extended(offset, TRUE, FALSE, TRUE, name, status);
+ break;
+
+ case UTZFMT_STYLE_ISO_EXTENDED_LOCAL_FIXED:
+ formatOffsetISO8601Extended(offset, FALSE, FALSE, TRUE, name, status);
+ break;
+
+ case UTZFMT_STYLE_ISO_BASIC_FULL:
+ formatOffsetISO8601Basic(offset, TRUE, FALSE, FALSE, name, status);
+ break;
+
+ case UTZFMT_STYLE_ISO_BASIC_LOCAL_FULL:
+ formatOffsetISO8601Basic(offset, FALSE, FALSE, FALSE, name, status);
+ break;
+
+ case UTZFMT_STYLE_ISO_EXTENDED_FULL:
+ formatOffsetISO8601Extended(offset, TRUE, FALSE, FALSE, name, status);
+ break;
+
+ case UTZFMT_STYLE_ISO_EXTENDED_LOCAL_FULL:
+ formatOffsetISO8601Extended(offset, FALSE, FALSE, FALSE, name, status);
+ break;
+
+ case UTZFMT_STYLE_ZONE_ID:
+ tz.getID(name);
+ break;
+
+ case UTZFMT_STYLE_ZONE_ID_SHORT:
+ {
+ const UChar* shortID = ZoneMeta::getShortID(tz);
+ if (shortID == NULL) {
+ shortID = UNKNOWN_SHORT_ZONE_ID;
+ }
+ name.setTo(shortID, -1);
+ }
+ break;
+
+ case UTZFMT_STYLE_EXEMPLAR_LOCATION:
+ formatExemplarLocation(tz, name);
break;
}
if (timeType) {
*timeType = (dstOffset != 0) ? UTZFMT_TIME_TYPE_DAYLIGHT : UTZFMT_TIME_TYPE_STANDARD;
}
}
- U_ASSERT(U_SUCCESS(status));
}
return name;
@@ -645,23 +797,22 @@
int32_t maxPos = text.length();
int32_t offset;
- UBool fallbackLocalizedGMT = FALSE;
- if (style == UTZFMT_STYLE_SPECIFIC_LONG || style == UTZFMT_STYLE_SPECIFIC_SHORT
- || style == UTZFMT_STYLE_GENERIC_LONG || style == UTZFMT_STYLE_GENERIC_SHORT || style == UTZFMT_STYLE_GENERIC_LOCATION) {
- // above styles may use localized gmt format as fallback
- fallbackLocalizedGMT = TRUE;
- }
+ // Styles using localized GMT format as fallback
+ UBool fallbackLocalizedGMT =
+ (style == UTZFMT_STYLE_SPECIFIC_LONG || style == UTZFMT_STYLE_GENERIC_LONG || style == UTZFMT_STYLE_GENERIC_LOCATION);
+ UBool fallbackShortLocalizedGMT =
+ (style == UTZFMT_STYLE_SPECIFIC_SHORT || style == UTZFMT_STYLE_GENERIC_SHORT);
- int32_t evaluated = 0;
+ int32_t evaluated = 0; // bit flags representing already evaluated styles
ParsePosition tmpPos(startIdx);
int32_t parsedOffset = UNKNOWN_OFFSET; // stores successfully parsed offset for later use
int32_t parsedPos = -1; // stores successfully parsed offset position for later use
// Try localized GMT format first if necessary
- if (fallbackLocalizedGMT) {
+ if (fallbackLocalizedGMT || fallbackShortLocalizedGMT) {
UBool hasDigitOffset = FALSE;
- offset = parseOffsetLocalizedGMT(text, tmpPos, &hasDigitOffset);
+ offset = parseOffsetLocalizedGMT(text, tmpPos, fallbackShortLocalizedGMT, &hasDigitOffset);
if (tmpPos.getErrorIndex() == -1) {
// Even when the input text was successfully parsed as a localized GMT format text,
// we may still need to evaluate the specified style if -
@@ -674,50 +825,88 @@
parsedOffset = offset;
parsedPos = tmpPos.getIndex();
}
- evaluated |= STYLE_FLAG(UTZFMT_STYLE_LOCALIZED_GMT);
-
- tmpPos.setIndex(startIdx);
- tmpPos.setErrorIndex(-1);
+ // Note: For now, no distinction between long/short localized GMT format in the parser.
+ // This might be changed in future.
+ // evaluated |= (fallbackLocalizedGMT ? STYLE_PARSE_FLAGS[UTZFMT_STYLE_LOCALIZED_GMT] : STYLE_PARSE_FLAGS[UTZFMT_STYLE_LOCALIZED_GMT_SHORT]);
+ evaluated |= STYLE_PARSE_FLAGS[UTZFMT_STYLE_LOCALIZED_GMT] | STYLE_PARSE_FLAGS[UTZFMT_STYLE_LOCALIZED_GMT_SHORT];
}
UErrorCode status = U_ZERO_ERROR;
UnicodeString tzID;
- UTimeZoneFormatTimeType parsedTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
// Try the specified style
switch (style) {
- case UTZFMT_STYLE_RFC822:
- {
- offset = parseOffsetRFC822(text, tmpPos);
- if (tmpPos.getErrorIndex() == -1) {
- pos.setIndex(tmpPos.getIndex());
- return createTimeZoneForOffset(offset);
- }
- }
- break;
-
case UTZFMT_STYLE_LOCALIZED_GMT:
{
+ tmpPos.setIndex(startIdx);
+ tmpPos.setErrorIndex(-1);
+
offset = parseOffsetLocalizedGMT(text, tmpPos);
if (tmpPos.getErrorIndex() == -1) {
pos.setIndex(tmpPos.getIndex());
return createTimeZoneForOffset(offset);
}
- }
- break;
- case UTZFMT_STYLE_ISO8601:
+ // Note: For now, no distinction between long/short localized GMT format in the parser.
+ // This might be changed in future.
+ evaluated |= STYLE_PARSE_FLAGS[UTZFMT_STYLE_LOCALIZED_GMT_SHORT];
+
+ break;
+ }
+ case UTZFMT_STYLE_LOCALIZED_GMT_SHORT:
{
+ tmpPos.setIndex(startIdx);
+ tmpPos.setErrorIndex(-1);
+
+ offset = parseOffsetShortLocalizedGMT(text, tmpPos);
+ if (tmpPos.getErrorIndex() == -1) {
+ pos.setIndex(tmpPos.getIndex());
+ return createTimeZoneForOffset(offset);
+ }
+
+ // Note: For now, no distinction between long/short localized GMT format in the parser.
+ // This might be changed in future.
+ evaluated |= STYLE_PARSE_FLAGS[UTZFMT_STYLE_LOCALIZED_GMT];
+
+ break;
+ }
+ case UTZFMT_STYLE_ISO_BASIC_SHORT:
+ case UTZFMT_STYLE_ISO_BASIC_FIXED:
+ case UTZFMT_STYLE_ISO_BASIC_FULL:
+ case UTZFMT_STYLE_ISO_EXTENDED_FIXED:
+ case UTZFMT_STYLE_ISO_EXTENDED_FULL:
+ {
+ tmpPos.setIndex(startIdx);
+ tmpPos.setErrorIndex(-1);
+
offset = parseOffsetISO8601(text, tmpPos);
if (tmpPos.getErrorIndex() == -1) {
pos.setIndex(tmpPos.getIndex());
return createTimeZoneForOffset(offset);
}
- // Note: ISO 8601 parser also support basic format (without ':'),
- // which is same with RFC 822 format.
- evaluated |= STYLE_FLAG(UTZFMT_STYLE_RFC822);
+
+ break;
}
- break;
+
+ case UTZFMT_STYLE_ISO_BASIC_LOCAL_SHORT:
+ case UTZFMT_STYLE_ISO_BASIC_LOCAL_FIXED:
+ case UTZFMT_STYLE_ISO_BASIC_LOCAL_FULL:
+ case UTZFMT_STYLE_ISO_EXTENDED_LOCAL_FIXED:
+ case UTZFMT_STYLE_ISO_EXTENDED_LOCAL_FULL:
+ {
+ tmpPos.setIndex(startIdx);
+ tmpPos.setErrorIndex(-1);
+
+ // Exclude the case of UTC Indicator "Z" here
+ UBool hasDigitOffset = FALSE;
+ offset = parseOffsetISO8601(text, tmpPos, FALSE, &hasDigitOffset);
+ if (tmpPos.getErrorIndex() == -1 && hasDigitOffset) {
+ pos.setIndex(tmpPos.getIndex());
+ return createTimeZoneForOffset(offset);
+ }
+
+ break;
+ }
case UTZFMT_STYLE_SPECIFIC_LONG:
case UTZFMT_STYLE_SPECIFIC_SHORT:
@@ -755,9 +944,8 @@
return TimeZone::createTimeZone(tzID);
}
}
+ break;
}
- break;
-
case UTZFMT_STYLE_GENERIC_LONG:
case UTZFMT_STYLE_GENERIC_SHORT:
case UTZFMT_STYLE_GENERIC_LOCATION:
@@ -781,9 +969,10 @@
}
int32_t len = 0;
+ UTimeZoneFormatTimeType tt = UTZFMT_TIME_TYPE_UNKNOWN;
const TimeZoneGenericNames *gnames = getTimeZoneGenericNames(status);
if (U_SUCCESS(status)) {
- len = gnames->findBestMatch(text, startIdx, genericNameTypes, tzID, parsedTimeType, status);
+ len = gnames->findBestMatch(text, startIdx, genericNameTypes, tzID, tt, status);
}
if (U_FAILURE(status)) {
pos.setErrorIndex(startIdx);
@@ -792,16 +981,53 @@
if (len > 0) {
// Found a match
if (timeType) {
- *timeType = parsedTimeType;
+ *timeType = tt;
}
pos.setIndex(startIdx + len);
U_ASSERT(!tzID.isEmpty());
return TimeZone::createTimeZone(tzID);
}
+
+ break;
}
- break;
+ case UTZFMT_STYLE_ZONE_ID:
+ {
+ tmpPos.setIndex(startIdx);
+ tmpPos.setErrorIndex(-1);
+
+ parseZoneID(text, tmpPos, tzID);
+ if (tmpPos.getErrorIndex() == -1) {
+ pos.setIndex(tmpPos.getIndex());
+ return TimeZone::createTimeZone(tzID);
+ }
+ break;
+ }
+ case UTZFMT_STYLE_ZONE_ID_SHORT:
+ {
+ tmpPos.setIndex(startIdx);
+ tmpPos.setErrorIndex(-1);
+
+ parseShortZoneID(text, tmpPos, tzID);
+ if (tmpPos.getErrorIndex() == -1) {
+ pos.setIndex(tmpPos.getIndex());
+ return TimeZone::createTimeZone(tzID);
+ }
+ break;
+ }
+ case UTZFMT_STYLE_EXEMPLAR_LOCATION:
+ {
+ tmpPos.setIndex(startIdx);
+ tmpPos.setErrorIndex(-1);
+
+ parseExemplarLocation(text, tmpPos, tzID);
+ if (tmpPos.getErrorIndex() == -1) {
+ pos.setIndex(tmpPos.getIndex());
+ return TimeZone::createTimeZone(tzID);
+ }
+ break;
+ }
}
- evaluated |= STYLE_FLAG(style);
+ evaluated |= STYLE_PARSE_FLAGS[style];
if (parsedPos > startIdx) {
@@ -818,13 +1044,18 @@
// Failed to parse the input text as the time zone format in the specified style.
// Check the longest match among other styles below.
+ UnicodeString parsedID;
+ UTimeZoneFormatTimeType parsedTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
+
U_ASSERT(parsedPos < 0);
U_ASSERT(parsedOffset == UNKNOWN_OFFSET);
- tmpPos.setIndex(startIdx);
- tmpPos.setErrorIndex(-1);
// ISO 8601
- if ((evaluated & STYLE_FLAG(UTZFMT_STYLE_ISO8601)) == 0) {
+ if (parsedPos < maxPos &&
+ ((evaluated & ISO_Z_STYLE_FLAG) == 0 || (evaluated & ISO_LOCAL_STYLE_FLAG) == 0)) {
+ tmpPos.setIndex(startIdx);
+ tmpPos.setErrorIndex(-1);
+
UBool hasDigitOffset = FALSE;
offset = parseOffsetISO8601(text, tmpPos, FALSE, &hasDigitOffset);
if (tmpPos.getErrorIndex() == -1) {
@@ -833,49 +1064,64 @@
return createTimeZoneForOffset(offset);
}
// Note: When ISO 8601 format contains offset digits, it should not
- // collide with other formats (except RFC 822, which is compatible with
- // ISO 8601 basic format). However, ISO 8601 UTC format "Z" (single letter)
- // may collide with other names. In this case, we need to evaluate other
- // names.
- parsedOffset = offset;
- parsedPos = tmpPos.getIndex();
- U_ASSERT(parsedPos == startIdx + 1); // only when "Z" is used
+ // collide with other formats. However, ISO 8601 UTC format "Z" (single letter)
+ // may collide with other names. In this case, we need to evaluate other names.
+ if (parsedPos < tmpPos.getIndex()) {
+ parsedOffset = offset;
+ parsedID.setToBogus();
+ parsedTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
+ parsedPos = tmpPos.getIndex();
+ U_ASSERT(parsedPos == startIdx + 1); // only when "Z" is used
+ }
}
- tmpPos.setIndex(startIdx);
- tmpPos.setErrorIndex(-1);
}
- // RFC 822
- // Note: ISO 8601 parser supports RFC 822 format. So we do not need to parse
- // it as RFC 822 here. This might be changed in future when we support
- // strict format option for ISO 8601 or RFC 822.
-
- //if ((evaluated & STYLE_FLAG(UTZFMT_STYLE_RFC822)) == 0) {
- // offset = parseOffsetRFC822(text, tmpPos);
- // if (tmpPos.getErrorIndex() == -1) {
- // pos.setIndex(tmpPos.getIndex());
- // return createTimeZoneForOffset(offset);
- // }
- // tmpPos.setIndex(startIdx);
- // tmpPos.setErrorIndex(-1);
- //}
-
// Localized GMT format
- if ((evaluated & STYLE_FLAG(UTZFMT_STYLE_LOCALIZED_GMT)) == 0) {
+ if (parsedPos < maxPos &&
+ (evaluated & STYLE_PARSE_FLAGS[UTZFMT_STYLE_LOCALIZED_GMT]) == 0) {
+ tmpPos.setIndex(startIdx);
+ tmpPos.setErrorIndex(-1);
+
UBool hasDigitOffset = FALSE;
- offset = parseOffsetLocalizedGMT(text, tmpPos, &hasDigitOffset);
+ offset = parseOffsetLocalizedGMT(text, tmpPos, FALSE, &hasDigitOffset);
if (tmpPos.getErrorIndex() == -1) {
if (tmpPos.getIndex() == maxPos || hasDigitOffset) {
pos.setIndex(tmpPos.getIndex());
return createTimeZoneForOffset(offset);
}
// Evaluate other names - see the comment earlier in this method.
- parsedOffset = offset;
- parsedPos = tmpPos.getIndex();
+ if (parsedPos < tmpPos.getIndex()) {
+ parsedOffset = offset;
+ parsedID.setToBogus();
+ parsedTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
+ parsedPos = tmpPos.getIndex();
+ }
}
}
- // When ParseOption.ALL_STYLES is available, we also try to look all possible display names.
+ if (parsedPos < maxPos &&
+ (evaluated & STYLE_PARSE_FLAGS[UTZFMT_STYLE_LOCALIZED_GMT_SHORT]) == 0) {
+ tmpPos.setIndex(startIdx);
+ tmpPos.setErrorIndex(-1);
+
+ UBool hasDigitOffset = FALSE;
+ offset = parseOffsetLocalizedGMT(text, tmpPos, TRUE, &hasDigitOffset);
+ if (tmpPos.getErrorIndex() == -1) {
+ if (tmpPos.getIndex() == maxPos || hasDigitOffset) {
+ pos.setIndex(tmpPos.getIndex());
+ return createTimeZoneForOffset(offset);
+ }
+ // Evaluate other names - see the comment earlier in this method.
+ if (parsedPos < tmpPos.getIndex()) {
+ parsedOffset = offset;
+ parsedID.setToBogus();
+ parsedTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
+ parsedPos = tmpPos.getIndex();
+ }
+ }
+ }
+
+ // When ParseOption.ALL_STYLES is available, we also try to look all possible display names and IDs.
// For example, when style is GENERIC_LONG, "EST" (SPECIFIC_SHORT) is never
// used for America/New_York. With parseAllStyles true, this code parses "EST"
// as America/New_York.
@@ -883,62 +1129,97 @@
// Note: Adding all possible names into the trie used by the implementation is quite heavy operation,
// which we want to avoid normally (note that we cache the trie, so this is applicable to the
// first time only as long as the cache does not expire).
+
if (parseOptions & UTZFMT_PARSE_OPTION_ALL_STYLES) {
- // Try all specific names first
- LocalPointer<TimeZoneNames::MatchInfoCollection> spAllMatches(fTimeZoneNames->find(text, startIdx, ALL_SPECIFIC_NAME_TYPES, status));
- if (U_FAILURE(status)) {
- pos.setErrorIndex(startIdx);
- return NULL;
- }
- int32_t spMatchIdx = -1;
- if (!spAllMatches.isNull()) {
+ // Try all specific names and exemplar location names
+ if (parsedPos < maxPos) {
+ LocalPointer<TimeZoneNames::MatchInfoCollection> specificMatches(fTimeZoneNames->find(text, startIdx, ALL_SIMPLE_NAME_TYPES, status));
+ if (U_FAILURE(status)) {
+ pos.setErrorIndex(startIdx);
+ return NULL;
+ }
+ int32_t specificMatchIdx = -1;
int32_t matchPos = -1;
- for (int32_t i = 0; i < spAllMatches->size(); i++) {
- matchPos = startIdx + spAllMatches->getMatchLengthAt(i);
- if (matchPos > parsedPos) {
- spMatchIdx = i;
- parsedPos = matchPos;
+ if (!specificMatches.isNull()) {
+ for (int32_t i = 0; i < specificMatches->size(); i++) {
+ if (startIdx + specificMatches->getMatchLengthAt(i) > matchPos) {
+ specificMatchIdx = i;
+ matchPos = startIdx + specificMatches->getMatchLengthAt(i);
+ }
}
}
+ if (parsedPos < matchPos) {
+ U_ASSERT(specificMatchIdx >= 0);
+ parsedPos = matchPos;
+ getTimeZoneID(specificMatches.getAlias(), specificMatchIdx, parsedID);
+ parsedTimeType = getTimeType(specificMatches->getNameTypeAt(specificMatchIdx));
+ parsedOffset = UNKNOWN_OFFSET;
+ }
}
- int32_t genMatchLen = -1;
+ // Try generic names
if (parsedPos < maxPos) {
+ int32_t genMatchLen = -1;
+ UTimeZoneFormatTimeType tt = UTZFMT_TIME_TYPE_UNKNOWN;
+
const TimeZoneGenericNames *gnames = getTimeZoneGenericNames(status);
if (U_SUCCESS(status)) {
- genMatchLen = gnames->findBestMatch(text, startIdx, ALL_GENERIC_NAME_TYPES, tzID, parsedTimeType, status);
+ genMatchLen = gnames->findBestMatch(text, startIdx, ALL_GENERIC_NAME_TYPES, tzID, tt, status);
}
if (U_FAILURE(status)) {
pos.setErrorIndex(startIdx);
return NULL;
}
+
+ if (parsedPos < startIdx + genMatchLen) {
+ parsedPos = startIdx + genMatchLen;
+ parsedID.setTo(tzID);
+ parsedTimeType = tt;
+ parsedOffset = UNKNOWN_OFFSET;
+ }
}
- // Pick up better match
- if (startIdx + genMatchLen > parsedPos) {
- // use generic name match
- parsedPos = startIdx + genMatchLen;
- if (timeType) {
- *timeType = parsedTimeType;
+
+ // Try time zone ID
+ if (parsedPos < maxPos && (evaluated & STYLE_PARSE_FLAGS[UTZFMT_STYLE_ZONE_ID]) == 0) {
+ tmpPos.setIndex(startIdx);
+ tmpPos.setErrorIndex(-1);
+
+ parseZoneID(text, tmpPos, tzID);
+ if (tmpPos.getErrorIndex() == -1 && parsedPos < tmpPos.getIndex()) {
+ parsedPos = tmpPos.getIndex();
+ parsedID.setTo(tzID);
+ parsedTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
+ parsedOffset = UNKNOWN_OFFSET;
}
- pos.setIndex(parsedPos);
- U_ASSERT(!tzID.isEmpty());
- return TimeZone::createTimeZone(tzID);
- } else if (spMatchIdx >= 0) {
- // use specific name match
- if (timeType) {
- *timeType = getTimeType(spAllMatches->getNameTypeAt(spMatchIdx));
+ }
+ // Try short time zone ID
+ if (parsedPos < maxPos && (evaluated & STYLE_PARSE_FLAGS[UTZFMT_STYLE_ZONE_ID]) == 0) {
+ tmpPos.setIndex(startIdx);
+ tmpPos.setErrorIndex(-1);
+
+ parseShortZoneID(text, tmpPos, tzID);
+ if (tmpPos.getErrorIndex() == -1 && parsedPos < tmpPos.getIndex()) {
+ parsedPos = tmpPos.getIndex();
+ parsedID.setTo(tzID);
+ parsedTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
+ parsedOffset = UNKNOWN_OFFSET;
}
- pos.setIndex(parsedPos);
- getTimeZoneID(spAllMatches.getAlias(), spMatchIdx, tzID);
- U_ASSERT(!tzID.isEmpty());
- return TimeZone::createTimeZone(tzID);
}
}
if (parsedPos > startIdx) {
- // Parsed successfully as one of 'offset' format
- U_ASSERT(parsedOffset != UNKNOWN_OFFSET);
+ // Parsed successfully
+ TimeZone* parsedTZ;
+ if (parsedID.length() > 0) {
+ parsedTZ = TimeZone::createTimeZone(parsedID);
+ } else {
+ U_ASSERT(parsedOffset != UNKNOWN_OFFSET);
+ parsedTZ = createTimeZoneForOffset(parsedOffset);
+ }
+ if (timeType) {
+ *timeType = parsedTimeType;
+ }
pos.setIndex(parsedPos);
- return createTimeZoneForOffset(parsedOffset);
+ return parsedTZ;
}
pos.setErrorIndex(startIdx);
@@ -1004,8 +1285,6 @@
return name;
}
-static UMutex gLock = U_MUTEX_INITIALIZER;
-
const TimeZoneGenericNames*
TimeZoneFormat::getTimeZoneGenericNames(UErrorCode& status) const {
if (U_FAILURE(status)) {
@@ -1028,47 +1307,143 @@
return fTimeZoneGenericNames;
}
+UnicodeString&
+TimeZoneFormat::formatExemplarLocation(const TimeZone& tz, UnicodeString& name) const {
+ UnicodeString location;
+ const UChar* canonicalID = ZoneMeta::getCanonicalCLDRID(tz);
+
+ if (canonicalID) {
+ fTimeZoneNames->getExemplarLocationName(UnicodeString(canonicalID), location);
+ }
+ if (location.length() > 0) {
+ name.setTo(location);
+ } else {
+ // Use "unknown" location
+ fTimeZoneNames->getExemplarLocationName(UnicodeString(UNKNOWN_ZONE_ID), location);
+ if (location.length() > 0) {
+ name.setTo(location);
+ } else {
+ // last resort
+ name.setTo(UNKNOWN_LOCATION, -1);
+ }
+ }
+ return name;
+}
+
+
// ------------------------------------------------------------------
// Zone offset format and parse
UnicodeString&
-TimeZoneFormat::formatOffsetRFC822(int32_t offset, UnicodeString& result, UErrorCode& status) const {
- if (U_FAILURE(status)) {
- result.setToBogus();
- return result;
- }
- if (offset <= -MAX_OFFSET || offset >= MAX_OFFSET) {
- result.setToBogus();
- status = U_ILLEGAL_ARGUMENT_ERROR;
- return result;
- }
-
- // Note: FIELDS_HMS as maxFields is an ICU extension. RFC822 specification
- // defines exactly 4 digits for the offset field in HHss format.
- return formatOffsetWithAsciiDigits(offset, 0, FIELDS_HM, FIELDS_HMS, result);
+TimeZoneFormat::formatOffsetISO8601Basic(int32_t offset, UBool useUtcIndicator, UBool isShort, UBool ignoreSeconds,
+ UnicodeString& result, UErrorCode& status) const {
+ return formatOffsetISO8601(offset, TRUE, useUtcIndicator, isShort, ignoreSeconds, result, status);
}
UnicodeString&
-TimeZoneFormat::formatOffsetISO8601(int32_t offset, UnicodeString& result, UErrorCode& status) const {
- if (U_FAILURE(status)) {
- result.setToBogus();
- return result;
- }
- if (offset <= -MAX_OFFSET || offset >= MAX_OFFSET) {
- result.setToBogus();
- status = U_ILLEGAL_ARGUMENT_ERROR;
- return result;
- }
-
- if (offset == 0) {
- result.setTo(ISO8601_UTC);
- return result;
- }
- return formatOffsetWithAsciiDigits(offset, ISO8601_SEP, FIELDS_HM, FIELDS_HMS, result);
+TimeZoneFormat::formatOffsetISO8601Extended(int32_t offset, UBool useUtcIndicator, UBool isShort, UBool ignoreSeconds,
+ UnicodeString& result, UErrorCode& status) const {
+ return formatOffsetISO8601(offset, FALSE, useUtcIndicator, isShort, ignoreSeconds, result, status);
}
UnicodeString&
TimeZoneFormat::formatOffsetLocalizedGMT(int32_t offset, UnicodeString& result, UErrorCode& status) const {
+ return formatOffsetLocalizedGMT(offset, FALSE, result, status);
+}
+
+UnicodeString&
+TimeZoneFormat::formatOffsetShortLocalizedGMT(int32_t offset, UnicodeString& result, UErrorCode& status) const {
+ return formatOffsetLocalizedGMT(offset, TRUE, result, status);
+}
+
+int32_t
+TimeZoneFormat::parseOffsetISO8601(const UnicodeString& text, ParsePosition& pos) const {
+ return parseOffsetISO8601(text, pos, FALSE);
+}
+
+int32_t
+TimeZoneFormat::parseOffsetLocalizedGMT(const UnicodeString& text, ParsePosition& pos) const {
+ return parseOffsetLocalizedGMT(text, pos, FALSE, NULL);
+}
+
+int32_t
+TimeZoneFormat::parseOffsetShortLocalizedGMT(const UnicodeString& text, ParsePosition& pos) const {
+ return parseOffsetLocalizedGMT(text, pos, TRUE, NULL);
+}
+
+// ------------------------------------------------------------------
+// Private zone offset format/parse implementation
+
+UnicodeString&
+TimeZoneFormat::formatOffsetISO8601(int32_t offset, UBool isBasic, UBool useUtcIndicator,
+ UBool isShort, UBool ignoreSeconds, UnicodeString& result, UErrorCode& status) const {
+ if (U_FAILURE(status)) {
+ result.setToBogus();
+ return result;
+ }
+ int32_t absOffset = offset < 0 ? -offset : offset;
+ if (useUtcIndicator && (absOffset < MILLIS_PER_SECOND || (ignoreSeconds && absOffset < MILLIS_PER_MINUTE))) {
+ result.setTo(ISO8601_UTC);
+ return result;
+ }
+
+ OffsetFields minFields = isShort ? FIELDS_H : FIELDS_HM;
+ OffsetFields maxFields = ignoreSeconds ? FIELDS_HM : FIELDS_HMS;
+ UChar sep = isBasic ? 0 : ISO8601_SEP;
+
+ // Note: FIELDS_HMS as maxFields is a CLDR/ICU extension. ISO 8601 specification does
+ // not support seconds field.
+
+ if (absOffset >= MAX_OFFSET) {
+ result.setToBogus();
+ status = U_ILLEGAL_ARGUMENT_ERROR;
+ return result;
+ }
+
+ int fields[3];
+ fields[0] = absOffset / MILLIS_PER_HOUR;
+ absOffset = absOffset % MILLIS_PER_HOUR;
+ fields[1] = absOffset / MILLIS_PER_MINUTE;
+ absOffset = absOffset % MILLIS_PER_MINUTE;
+ fields[2] = absOffset / MILLIS_PER_SECOND;
+
+ U_ASSERT(fields[0] >= 0 && fields[0] <= MAX_OFFSET_HOUR);
+ U_ASSERT(fields[1] >= 0 && fields[1] <= MAX_OFFSET_MINUTE);
+ U_ASSERT(fields[2] >= 0 && fields[2] <= MAX_OFFSET_SECOND);
+
+ int32_t lastIdx = maxFields;
+ while (lastIdx > minFields) {
+ if (fields[lastIdx] != 0) {
+ break;
+ }
+ lastIdx--;
+ }
+
+ UChar sign = PLUS;
+ if (offset < 0) {
+ // if all output fields are 0s, do not use negative sign
+ for (int32_t idx = 0; idx <= lastIdx; idx++) {
+ if (fields[idx] != 0) {
+ sign = MINUS;
+ break;
+ }
+ }
+ }
+ result.setTo(sign);
+
+ for (int32_t idx = 0; idx <= lastIdx; idx++) {
+ if (sep && idx != 0) {
+ result.append(sep);
+ }
+ result.append((UChar)(0x0030 + fields[idx]/10));
+ result.append((UChar)(0x0030 + fields[idx]%10));
+ }
+
+ return result;
+}
+
+UnicodeString&
+TimeZoneFormat::formatOffsetLocalizedGMT(int32_t offset, UBool isShort, UnicodeString& result, UErrorCode& status) const {
if (U_FAILURE(status)) {
result.setToBogus();
return result;
@@ -1100,13 +1475,21 @@
const UVector* offsetPatternItems = NULL;
if (positive) {
- offsetPatternItems = (offsetS == 0) ?
- fGMTOffsetPatternItems[UTZFMT_PAT_POSITIVE_HM] :
- fGMTOffsetPatternItems[UTZFMT_PAT_POSITIVE_HMS];
+ if (offsetS != 0) {
+ offsetPatternItems = fGMTOffsetPatternItems[UTZFMT_PAT_POSITIVE_HMS];
+ } else if (offsetM != 0 || !isShort) {
+ offsetPatternItems = fGMTOffsetPatternItems[UTZFMT_PAT_POSITIVE_HM];
+ } else {
+ offsetPatternItems = fGMTOffsetPatternItems[UTZFMT_PAT_POSITIVE_H];
+ }
} else {
- offsetPatternItems = (offsetS == 0) ?
- fGMTOffsetPatternItems[UTZFMT_PAT_NEGATIVE_HM] :
- fGMTOffsetPatternItems[UTZFMT_PAT_NEGATIVE_HMS];
+ if (offsetS != 0) {
+ offsetPatternItems = fGMTOffsetPatternItems[UTZFMT_PAT_NEGATIVE_HMS];
+ } else if (offsetM != 0 || !isShort) {
+ offsetPatternItems = fGMTOffsetPatternItems[UTZFMT_PAT_NEGATIVE_HM];
+ } else {
+ offsetPatternItems = fGMTOffsetPatternItems[UTZFMT_PAT_NEGATIVE_H];
+ }
}
U_ASSERT(offsetPatternItems != NULL);
@@ -1124,15 +1507,15 @@
break;
case GMTOffsetField::HOUR:
- appendOffsetDigits(result, offsetH, item->getWidth());
+ appendOffsetDigits(result, offsetH, (isShort ? 1 : 2));
break;
case GMTOffsetField::MINUTE:
- appendOffsetDigits(result, offsetM, item->getWidth());
+ appendOffsetDigits(result, offsetM, 2);
break;
case GMTOffsetField::SECOND:
- appendOffsetDigits(result, offsetS, item->getWidth());
+ appendOffsetDigits(result, offsetS, 2);
break;
}
}
@@ -1142,54 +1525,6 @@
}
int32_t
-TimeZoneFormat::parseOffsetRFC822(const UnicodeString& text, ParsePosition& pos) const {
- int32_t start = pos.getIndex();
- if (start >= text.length()) {
- pos.setErrorIndex(start);
- return 0;
- }
-
- int32_t sign = 1;
- UChar signChar = text.charAt(start);
- if (signChar == PLUS) {
- sign = 1;
- } else if (signChar == MINUS) {
- sign = -1;
- } else {
- // Not an RFC822 offset string
- pos.setErrorIndex(start);
- return 0;
- }
-
- // Parse digits
- pos.setIndex(start + 1);
- int32_t offset = parseAbuttingAsciiOffsetFields(text, pos, FIELDS_H, FIELDS_HMS, false);
-
- if (pos.getErrorIndex() != -1) {
- pos.setIndex(start); // reset
- pos.setErrorIndex(start);
- return 0;
- }
-
- return sign * offset;
-}
-
-int32_t
-TimeZoneFormat::parseOffsetISO8601(const UnicodeString& text, ParsePosition& pos) const {
- return parseOffsetISO8601(text, pos, FALSE);
-}
-
-int32_t
-TimeZoneFormat::parseOffsetLocalizedGMT(const UnicodeString& text, ParsePosition& pos) const {
- return parseOffsetLocalizedGMT(text, pos, NULL);
-}
-
-
-
-// ------------------------------------------------------------------
-// Private zone offset format/parse implementation
-
-int32_t
TimeZoneFormat::parseOffsetISO8601(const UnicodeString& text, ParsePosition& pos, UBool extendedOnly, UBool* hasDigitOffset /* = NULL */) const {
if (hasDigitOffset) {
*hasDigitOffset = FALSE;
@@ -1218,7 +1553,7 @@
return 0;
}
ParsePosition posOffset(start + 1);
- int32_t offset = parseAsciiOffsetFields(text, posOffset, ISO8601_SEP, FIELDS_H, FIELDS_HMS, FALSE);
+ int32_t offset = parseAsciiOffsetFields(text, posOffset, ISO8601_SEP, FIELDS_H, FIELDS_HMS);
if (posOffset.getErrorIndex() == -1 && !extendedOnly && (posOffset.getIndex() - start <= 3)) {
// If the text is successfully parsed as extended format with the options above, it can be also parsed
// as basic format. For example, "0230" can be parsed as offset 2:00 (only first digits are valid for
@@ -1244,54 +1579,36 @@
}
int32_t
-TimeZoneFormat::parseOffsetLocalizedGMT(const UnicodeString& text, ParsePosition& pos, UBool* hasDigitOffset) const {
+TimeZoneFormat::parseOffsetLocalizedGMT(const UnicodeString& text, ParsePosition& pos, UBool isShort, UBool* hasDigitOffset) const {
int32_t start = pos.getIndex();
- int32_t idx = start;
- UBool parsed = FALSE;
int32_t offset = 0;
+ int32_t parsedLength = 0;
if (hasDigitOffset) {
*hasDigitOffset = FALSE;
}
- do {
- // Prefix part
- int32_t len = fGMTPatternPrefix.length();
- if (len > 0 && text.caseCompare(idx, len, fGMTPatternPrefix, 0) != 0) {
- // prefix match failed
- break;
- }
- idx += len;
+ offset = parseOffsetLocalizedGMTPattern(text, start, isShort, parsedLength);
- // Offset part
- offset = parseOffsetFields(text, idx, FALSE, len);
- if (len == 0) {
- // offset field match failed
- break;
- }
- idx += len;
+ // For now, parseOffsetLocalizedGMTPattern handles both long and short
+ // formats, no matter isShort is true or false. This might be changed in future
+ // when strict parsing is necessary, or different set of patterns are used for
+ // short/long formats.
+#if 0
+ if (parsedLength == 0) {
+ offset = parseOffsetLocalizedGMTPattern(text, start, !isShort, parsedLength);
+ }
+#endif
- // Suffix part
- len = fGMTPatternSuffix.length();
- if (len > 0 && text.caseCompare(idx, len, fGMTPatternSuffix, 0) != 0) {
- // no suffix match
- break;
- }
- idx += len;
- parsed = TRUE;
-
- } while (false);
-
- if (parsed) {
+ if (parsedLength > 0) {
if (hasDigitOffset) {
*hasDigitOffset = TRUE;
}
- pos.setIndex(idx);
+ pos.setIndex(start + parsedLength);
return offset;
}
// Try the default patterns
- int32_t parsedLength = 0;
offset = parseOffsetDefaultLocalizedGMT(text, start, parsedLength);
if (parsedLength > 0) {
if (hasDigitOffset) {
@@ -1323,86 +1640,156 @@
}
int32_t
-TimeZoneFormat::parseOffsetFields(const UnicodeString& text, int32_t start, UBool minimumHourWidth, int32_t& parsedLen) const {
+TimeZoneFormat::parseOffsetLocalizedGMTPattern(const UnicodeString& text, int32_t start, UBool /*isShort*/, int32_t& parsedLen) const {
+ int32_t idx = start;
int32_t offset = 0;
- UBool sawVarHourAndAbuttingField = FALSE;
+ UBool parsed = FALSE;
+
+ do {
+ // Prefix part
+ int32_t len = fGMTPatternPrefix.length();
+ if (len > 0 && text.caseCompare(idx, len, fGMTPatternPrefix, 0) != 0) {
+ // prefix match failed
+ break;
+ }
+ idx += len;
+
+ // Offset part
+ offset = parseOffsetFields(text, idx, FALSE, len);
+ if (len == 0) {
+ // offset field match failed
+ break;
+ }
+ idx += len;
+
+ len = fGMTPatternSuffix.length();
+ if (len > 0 && text.caseCompare(idx, len, fGMTPatternSuffix, 0) != 0) {
+ // no suffix match
+ break;
+ }
+ idx += len;
+ parsed = TRUE;
+ } while (FALSE);
+
+ parsedLen = parsed ? idx - start : 0;
+ return offset;
+}
+
+int32_t
+TimeZoneFormat::parseOffsetFields(const UnicodeString& text, int32_t start, UBool /*isShort*/, int32_t& parsedLen) const {
+ int32_t outLen = 0;
+ int32_t offset = 0;
+ int32_t sign = 1;
parsedLen = 0;
+ int32_t offsetH, offsetM, offsetS;
+ offsetH = offsetM = offsetS = 0;
+
for (int32_t patidx = 0; PARSE_GMT_OFFSET_TYPES[patidx] >= 0; patidx++) {
int32_t gmtPatType = PARSE_GMT_OFFSET_TYPES[patidx];
- int32_t offsetH = 0, offsetM = 0, offsetS = 0;
- int32_t idx = start;
UVector* items = fGMTOffsetPatternItems[gmtPatType];
U_ASSERT(items != NULL);
-
- UBool failed = FALSE;
- for (int32_t i = 0; i < items->size(); i++) {
- int32_t tmpParsedLen = 0;
- const GMTOffsetField* field = (const GMTOffsetField*)items->elementAt(i);
- GMTOffsetField::FieldType fieldType = field->getType();
- if (fieldType == GMTOffsetField::TEXT) {
- const UChar* patStr = field->getPatternText();
- tmpParsedLen = u_strlen(patStr);
- if (text.caseCompare(idx, tmpParsedLen, patStr, 0) != 0) {
- failed = TRUE;
- break;
- }
- idx += tmpParsedLen;
- } else {
- if (fieldType == GMTOffsetField::HOUR) {
- uint8_t minDigits = 1;
- uint8_t maxDigits = minimumHourWidth ? 1 : 2;
- if (!minimumHourWidth && !sawVarHourAndAbuttingField) {
- if (i + 1 < items->size()) {
- const GMTOffsetField* nextField = (const GMTOffsetField*)items->elementAt(i + 1);
- if (nextField->getType() != GMTOffsetField::TEXT) {
- sawVarHourAndAbuttingField = true;
- }
- }
- }
- offsetH = parseOffsetFieldWithLocalizedDigits(text, idx, minDigits, maxDigits, 0, MAX_OFFSET_HOUR, tmpParsedLen);
- } else if (fieldType == GMTOffsetField::MINUTE) {
- offsetM = parseOffsetFieldWithLocalizedDigits(text, idx, 2, 2, 0, MAX_OFFSET_MINUTE, tmpParsedLen);
- } else if (fieldType == GMTOffsetField::SECOND) {
- offsetS = parseOffsetFieldWithLocalizedDigits(text, idx, 2, 2, 0, MAX_OFFSET_SECOND, tmpParsedLen);
- }
- if (tmpParsedLen == 0) {
- failed = TRUE;
- break;
- }
- idx += tmpParsedLen;
- }
- }
- if (!failed) {
- int32_t sign = (gmtPatType == UTZFMT_PAT_POSITIVE_HM || gmtPatType == UTZFMT_PAT_POSITIVE_HMS) ? 1 : -1;
- offset = ((((offsetH * 60) + offsetM) * 60) + offsetS) * 1000 * sign;
- parsedLen = idx - start;
+ outLen = parseOffsetFieldsWithPattern(text, start, items, FALSE, offsetH, offsetM, offsetS);
+ if (outLen > 0) {
+ sign = (gmtPatType == UTZFMT_PAT_POSITIVE_H || gmtPatType == UTZFMT_PAT_POSITIVE_HM || gmtPatType == UTZFMT_PAT_POSITIVE_HMS) ?
+ 1 : -1;
break;
}
}
- if (parsedLen == 0 && sawVarHourAndAbuttingField && !minimumHourWidth) {
- // When hour field is variable width and another non-literal pattern
- // field follows, the parse loop above might eat up the digit from
- // the abutting field. For example, with pattern "-Hmm" and input "-100",
- // the hour is parsed as -10 and fails to parse minute field.
- //
- // If this is the case, try parsing the text one more time with the arg
- // minimumHourWidth = true
- //
- // Note: This fallback is not applicable when quitAtHourField is true, because
- // the option is designed for supporting the case like "GMT+5". In this case,
- // we should get better result for parsing hour digits as much as possible.
+ if (outLen > 0 && fAbuttingOffsetHoursAndMinutes) {
+ // When hours field is sabutting minutes field,
+ // the parse result above may not be appropriate.
+ // For example, "01020" is parsed as 01:02: above,
+ // but it should be parsed as 00:10:20.
+ int32_t tmpLen = 0;
+ int32_t tmpSign = 1;
+ int32_t tmpH, tmpM, tmpS;
- return parseOffsetFields(text, start, true, parsedLen);
+ for (int32_t patidx = 0; PARSE_GMT_OFFSET_TYPES[patidx] >= 0; patidx++) {
+ int32_t gmtPatType = PARSE_GMT_OFFSET_TYPES[patidx];
+ UVector* items = fGMTOffsetPatternItems[gmtPatType];
+ U_ASSERT(items != NULL);
+
+ // forcing parse to use single hour digit
+ tmpLen = parseOffsetFieldsWithPattern(text, start, items, TRUE, tmpH, tmpM, tmpS);
+ if (tmpLen > 0) {
+ tmpSign = (gmtPatType == UTZFMT_PAT_POSITIVE_H || gmtPatType == UTZFMT_PAT_POSITIVE_HM || gmtPatType == UTZFMT_PAT_POSITIVE_HMS) ?
+ 1 : -1;
+ break;
+ }
+ }
+ if (tmpLen > outLen) {
+ // Better parse result with single hour digit
+ outLen = tmpLen;
+ sign = tmpSign;
+ offsetH = tmpH;
+ offsetM = tmpM;
+ offsetS = tmpS;
+ }
+ }
+
+ if (outLen > 0) {
+ offset = ((((offsetH * 60) + offsetM) * 60) + offsetS) * 1000 * sign;
+ parsedLen = outLen;
}
return offset;
}
int32_t
+TimeZoneFormat::parseOffsetFieldsWithPattern(const UnicodeString& text, int32_t start,
+ UVector* patternItems, UBool forceSingleHourDigit, int32_t& hour, int32_t& min, int32_t& sec) const {
+ UBool failed = FALSE;
+ int32_t offsetH, offsetM, offsetS;
+ offsetH = offsetM = offsetS = 0;
+ int32_t idx = start;
+
+ for (int32_t i = 0; i < patternItems->size(); i++) {
+ int32_t len = 0;
+ const GMTOffsetField* field = (const GMTOffsetField*)patternItems->elementAt(i);
+ GMTOffsetField::FieldType fieldType = field->getType();
+ if (fieldType == GMTOffsetField::TEXT) {
+ const UChar* patStr = field->getPatternText();
+ len = u_strlen(patStr);
+ if (text.caseCompare(idx, len, patStr, 0) != 0) {
+ failed = TRUE;
+ break;
+ }
+ idx += len;
+ } else {
+ if (fieldType == GMTOffsetField::HOUR) {
+ uint8_t maxDigits = forceSingleHourDigit ? 1 : 2;
+ offsetH = parseOffsetFieldWithLocalizedDigits(text, idx, 1, maxDigits, 0, MAX_OFFSET_HOUR, len);
+ } else if (fieldType == GMTOffsetField::MINUTE) {
+ offsetM = parseOffsetFieldWithLocalizedDigits(text, idx, 2, 2, 0, MAX_OFFSET_MINUTE, len);
+ } else if (fieldType == GMTOffsetField::SECOND) {
+ offsetS = parseOffsetFieldWithLocalizedDigits(text, idx, 2, 2, 0, MAX_OFFSET_SECOND, len);
+ }
+
+ if (len == 0) {
+ failed = TRUE;
+ break;
+ }
+ idx += len;
+ }
+ }
+
+ if (failed) {
+ hour = min = sec = 0;
+ return 0;
+ }
+
+ hour = offsetH;
+ min = offsetM;
+ sec = offsetS;
+
+ return idx - start;
+}
+
+int32_t
TimeZoneFormat::parseAbuttingOffsetFields(const UnicodeString& text, int32_t start, int32_t& parsedLen) const {
int32_t digits[MAX_OFFSET_DIGITS];
int32_t parsed[MAX_OFFSET_DIGITS]; // accumulative offsets
@@ -1766,25 +2153,30 @@
}
int32_t
-TimeZoneFormat::parseAsciiOffsetFields(const UnicodeString& text, ParsePosition& pos, UChar sep, OffsetFields minFields, OffsetFields maxFields, UBool fixedHourWidth) {
+TimeZoneFormat::parseAsciiOffsetFields(const UnicodeString& text, ParsePosition& pos, UChar sep, OffsetFields minFields, OffsetFields maxFields) {
int32_t start = pos.getIndex();
int32_t fieldVal[] = {0, 0, 0};
int32_t fieldLen[] = {0, -1, -1};
for (int32_t idx = start, fieldIdx = 0; idx < text.length() && fieldIdx <= maxFields; idx++) {
UChar c = text.charAt(idx);
if (c == sep) {
- if (fieldLen[fieldIdx] < 0) {
- // next field - expected
- fieldLen[fieldIdx] = 0;
- } else if (fieldIdx == 0 && !fixedHourWidth) {
+ if (fieldIdx == 0) {
+ if (fieldLen[0] == 0) {
+ // no hours field
+ break;
+ }
// 1 digit hour, move to next field
- fieldIdx++;
- fieldLen[fieldIdx] = 0;
} else {
- // otherwise, premature field
- break;
+ if (fieldLen[fieldIdx] != -1) {
+ // premature minute or seconds field
+ break;
+ }
+ fieldLen[fieldIdx] = 0;
}
continue;
+ } else if (fieldLen[fieldIdx] == -1) {
+ // no separator after 2 digit field
+ break;
}
int32_t digit = DIGIT_VAL(c);
if (digit < 0) {
@@ -1804,13 +2196,10 @@
int32_t parsedFields = -1;
do {
// hour
- if (fieldLen[0] == 0 || (fieldLen[0] == 1 && fixedHourWidth)) {
+ if (fieldLen[0] == 0) {
break;
}
if (fieldVal[0] > MAX_OFFSET_HOUR) {
- if (fixedHourWidth) {
- break;
- }
offset = (fieldVal[0] / 10) * MILLIS_PER_HOUR;
parsedFields = FIELDS_H;
parsedLen = 1;
@@ -2044,15 +2433,17 @@
}
UnicodeString&
-TimeZoneFormat::expandOffsetPattern(const UnicodeString& offsetHM, UnicodeString& result) {
+TimeZoneFormat::expandOffsetPattern(const UnicodeString& offsetHM, UnicodeString& result, UErrorCode& status) {
+ result.setToBogus();
+ if (U_FAILURE(status)) {
+ return result;
+ }
U_ASSERT(u_strlen(DEFAULT_GMT_OFFSET_MINUTE_PATTERN) == 2);
int32_t idx_mm = offsetHM.indexOf(DEFAULT_GMT_OFFSET_MINUTE_PATTERN, 2, 0);
if (idx_mm < 0) {
- // we cannot do anything with this...
- result.setTo(offsetHM);
- result.append(DEFAULT_GMT_OFFSET_SEP);
- result.append(DEFAULT_GMT_OFFSET_SECOND_PATTERN, -1);
+ // Bad time zone hour pattern data
+ status = U_ILLEGAL_ARGUMENT_ERROR;
return result;
}
@@ -2068,10 +2459,42 @@
return result;
}
+UnicodeString&
+TimeZoneFormat::truncateOffsetPattern(const UnicodeString& offsetHM, UnicodeString& result, UErrorCode& status) {
+ result.setToBogus();
+ if (U_FAILURE(status)) {
+ return result;
+ }
+ U_ASSERT(u_strlen(DEFAULT_GMT_OFFSET_MINUTE_PATTERN) == 2);
+
+ int32_t idx_mm = offsetHM.indexOf(DEFAULT_GMT_OFFSET_MINUTE_PATTERN, 2, 0);
+ if (idx_mm < 0) {
+ // Bad time zone hour pattern data
+ status = U_ILLEGAL_ARGUMENT_ERROR;
+ return result;
+ }
+ UChar HH[] = {0x0048, 0x0048};
+ int32_t idx_HH = offsetHM.tempSubString(0, idx_mm).lastIndexOf(HH, 2, 0);
+ if (idx_HH >= 0) {
+ return result.setTo(offsetHM.tempSubString(0, idx_HH + 2));
+ }
+ int32_t idx_H = offsetHM.tempSubString(0, idx_mm).lastIndexOf((UChar)0x0048, 0);
+ if (idx_H >= 0) {
+ return result.setTo(offsetHM.tempSubString(0, idx_H + 1));
+ }
+ // Bad time zone hour pattern data
+ status = U_ILLEGAL_ARGUMENT_ERROR;
+ return result;
+}
+
void
TimeZoneFormat::initGMTOffsetPatterns(UErrorCode& status) {
- for (int32_t type = 0; type <= UTZFMT_PAT_NEGATIVE_HMS; type++) {
+ for (int32_t type = 0; type < UTZFMT_PAT_COUNT; type++) {
switch (type) {
+ case UTZFMT_PAT_POSITIVE_H:
+ case UTZFMT_PAT_NEGATIVE_H:
+ fGMTOffsetPatternItems[type] = parseOffsetPattern(fGMTOffsetPatterns[type], FIELDS_H, status);
+ break;
case UTZFMT_PAT_POSITIVE_HM:
case UTZFMT_PAT_NEGATIVE_HM:
fGMTOffsetPatternItems[type] = parseOffsetPattern(fGMTOffsetPatterns[type], FIELDS_HM, status);
@@ -2082,6 +2505,33 @@
break;
}
}
+ checkAbuttingHoursAndMinutes();
+}
+
+void
+TimeZoneFormat::checkAbuttingHoursAndMinutes() {
+ fAbuttingOffsetHoursAndMinutes= FALSE;
+ for (int32_t type = 0; type < UTZFMT_PAT_COUNT; type++) {
+ UBool afterH = FALSE;
+ UVector *items = fGMTOffsetPatternItems[type];
+ for (int32_t i = 0; i < items->size(); i++) {
+ const GMTOffsetField* item = (GMTOffsetField*)items->elementAt(i);
+ GMTOffsetField::FieldType type = item->getType();
+ if (type != GMTOffsetField::TEXT) {
+ if (afterH) {
+ fAbuttingOffsetHoursAndMinutes = TRUE;
+ break;
+ } else if (type == GMTOffsetField::HOUR) {
+ afterH = TRUE;
+ }
+ } else if (afterH) {
+ break;
+ }
+ }
+ if (fAbuttingOffsetHoursAndMinutes) {
+ break;
+ }
+ }
}
UBool
@@ -2136,6 +2586,201 @@
return tzID;
}
+
+class ZoneIdMatchHandler : public TextTrieMapSearchResultHandler {
+public:
+ ZoneIdMatchHandler();
+ virtual ~ZoneIdMatchHandler();
+
+ UBool handleMatch(int32_t matchLength, const CharacterNode *node, UErrorCode &status);
+ const UChar* getID();
+ int32_t getMatchLen();
+private:
+ int32_t fLen;
+ const UChar* fID;
+};
+
+ZoneIdMatchHandler::ZoneIdMatchHandler()
+: fLen(0), fID(NULL) {
+}
+
+ZoneIdMatchHandler::~ZoneIdMatchHandler() {
+}
+
+UBool
+ZoneIdMatchHandler::handleMatch(int32_t matchLength, const CharacterNode *node, UErrorCode &status) {
+ if (U_FAILURE(status)) {
+ return FALSE;
+ }
+ if (node->hasValues()) {
+ const UChar* id = (const UChar*)node->getValue(0);
+ if (id != NULL) {
+ if (fLen < matchLength) {
+ fID = id;
+ fLen = matchLength;
+ }
+ }
+ }
+ return TRUE;
+}
+
+const UChar*
+ZoneIdMatchHandler::getID() {
+ return fID;
+}
+
+int32_t
+ZoneIdMatchHandler::getMatchLen() {
+ return fLen;
+}
+
+UnicodeString&
+TimeZoneFormat::parseZoneID(const UnicodeString& text, ParsePosition& pos, UnicodeString& tzID) const {
+ UErrorCode status = U_ZERO_ERROR;
+ UBool initialized;
+ UMTX_CHECK(&gLock, gZoneIdTrieInitialized, initialized);
+ if (!initialized) {
+ umtx_lock(&gLock);
+ {
+ if (!gZoneIdTrieInitialized) {
+ StringEnumeration *tzenum = TimeZone::createEnumeration();
+ TextTrieMap* trie = new TextTrieMap(TRUE, NULL); // No deleter, because values are pooled by ZoneMeta
+ if (trie) {
+ const UnicodeString *id;
+ while ((id = tzenum->snext(status))) {
+ const UChar* uid = ZoneMeta::findTimeZoneID(*id);
+ if (uid) {
+ trie->put(uid, const_cast<UChar *>(uid), status);
+ }
+ }
+ if (U_SUCCESS(status)) {
+ gZoneIdTrie = trie;
+ gZoneIdTrieInitialized = initialized = TRUE;
+ ucln_i18n_registerCleanup(UCLN_I18N_TIMEZONEFORMAT, tzfmt_cleanup);
+ } else {
+ delete trie;
+ }
+ }
+ delete tzenum;
+ }
+ }
+ umtx_unlock(&gLock);
+ }
+
+ int32_t start = pos.getIndex();
+ int32_t len = 0;
+ tzID.setToBogus();
+
+ if (initialized) {
+ LocalPointer<ZoneIdMatchHandler> handler(new ZoneIdMatchHandler());
+ gZoneIdTrie->search(text, start, handler.getAlias(), status);
+ len = handler->getMatchLen();
+ if (len > 0) {
+ tzID.setTo(handler->getID(), -1);
+ }
+ }
+
+ if (len > 0) {
+ pos.setIndex(start + len);
+ } else {
+ pos.setErrorIndex(start);
+ }
+
+ return tzID;
+}
+
+UnicodeString&
+TimeZoneFormat::parseShortZoneID(const UnicodeString& text, ParsePosition& pos, UnicodeString& tzID) const {
+ UErrorCode status = U_ZERO_ERROR;
+ UBool initialized;
+ UMTX_CHECK(&gLock, gShortZoneIdTrieInitialized, initialized);
+ if (!initialized) {
+ umtx_lock(&gLock);
+ {
+ if (!gShortZoneIdTrieInitialized) {
+ StringEnumeration *tzenum = TimeZone::createTimeZoneIDEnumeration(UCAL_ZONE_TYPE_CANONICAL, NULL, NULL, status);
+ if (U_SUCCESS(status)) {
+ TextTrieMap* trie = new TextTrieMap(TRUE, NULL); // No deleter, because values are pooled by ZoneMeta
+ if (trie) {
+ const UnicodeString *id;
+ while ((id = tzenum->snext(status))) {
+ const UChar* uID = ZoneMeta::findTimeZoneID(*id);
+ const UChar* shortID = ZoneMeta::getShortID(*id);
+ if (shortID && uID) {
+ trie->put(shortID, const_cast<UChar *>(uID), status);
+ }
+ }
+ if (U_SUCCESS(status)) {
+ gShortZoneIdTrie = trie;
+ gShortZoneIdTrieInitialized = initialized = TRUE;
+ ucln_i18n_registerCleanup(UCLN_I18N_TIMEZONEFORMAT, tzfmt_cleanup);
+ } else {
+ delete trie;
+ }
+ }
+ }
+ delete tzenum;
+ }
+ }
+ umtx_unlock(&gLock);
+ }
+
+ int32_t start = pos.getIndex();
+ int32_t len = 0;
+ tzID.setToBogus();
+
+ if (initialized) {
+ LocalPointer<ZoneIdMatchHandler> handler(new ZoneIdMatchHandler());
+ gShortZoneIdTrie->search(text, start, handler.getAlias(), status);
+ len = handler->getMatchLen();
+ if (len > 0) {
+ tzID.setTo(handler->getID(), -1);
+ }
+ }
+
+ if (len > 0) {
+ pos.setIndex(start + len);
+ } else {
+ pos.setErrorIndex(start);
+ }
+
+ return tzID;
+}
+
+
+UnicodeString&
+TimeZoneFormat::parseExemplarLocation(const UnicodeString& text, ParsePosition& pos, UnicodeString& tzID) const {
+ int32_t startIdx = pos.getIndex();
+ int32_t parsedPos = -1;
+ tzID.setToBogus();
+
+ UErrorCode status = U_ZERO_ERROR;
+ LocalPointer<TimeZoneNames::MatchInfoCollection> exemplarMatches(fTimeZoneNames->find(text, startIdx, UTZNM_EXEMPLAR_LOCATION, status));
+ if (U_FAILURE(status)) {
+ pos.setErrorIndex(startIdx);
+ return tzID;
+ }
+ int32_t matchIdx = -1;
+ if (!exemplarMatches.isNull()) {
+ for (int32_t i = 0; i < exemplarMatches->size(); i++) {
+ if (startIdx + exemplarMatches->getMatchLengthAt(i) > parsedPos) {
+ matchIdx = i;
+ parsedPos = startIdx + exemplarMatches->getMatchLengthAt(i);
+ }
+ }
+ if (parsedPos > 0) {
+ pos.setIndex(parsedPos);
+ getTimeZoneID(exemplarMatches.getAlias(), matchIdx, tzID);
+ }
+ }
+
+ if (tzID.length() == 0) {
+ pos.setErrorIndex(startIdx);
+ }
+
+ return tzID;
+}
+
U_NAMESPACE_END
#endif
diff --git a/i18n/tzgnames.cpp b/i18n/tzgnames.cpp
index 15fbf95..f266c29 100644
--- a/i18n/tzgnames.cpp
+++ b/i18n/tzgnames.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2011-2012, International Business Machines Corporation and
+* Copyright (C) 2011-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
@@ -546,35 +546,32 @@
// Construct location name
UnicodeString name;
- UBool isSingleCountry = FALSE;
UnicodeString usCountryCode;
- ZoneMeta::getSingleCountry(tzCanonicalID, usCountryCode);
- if (!usCountryCode.isEmpty()) {
- isSingleCountry = TRUE;
- } else {
- ZoneMeta::getCanonicalCountry(tzCanonicalID, usCountryCode);
- }
+ UBool isPrimary = FALSE;
+
+ ZoneMeta::getCanonicalCountry(tzCanonicalID, usCountryCode, &isPrimary);
if (!usCountryCode.isEmpty()) {
- char countryCode[ULOC_COUNTRY_CAPACITY];
- U_ASSERT(usCountryCode.length() < ULOC_COUNTRY_CAPACITY);
- int32_t ccLen = usCountryCode.extract(0, usCountryCode.length(), countryCode, sizeof(countryCode), US_INV);
- countryCode[ccLen] = 0;
-
- UnicodeString country;
- fLocaleDisplayNames->regionDisplayName(countryCode, country);
-
- // Format
FieldPosition fpos;
- if (isSingleCountry) {
- // If this is only the single zone in the country, use the country name
+
+ if (isPrimary) {
+ // If this is the primary zone in the country, use the country name.
+ char countryCode[ULOC_COUNTRY_CAPACITY];
+ U_ASSERT(usCountryCode.length() < ULOC_COUNTRY_CAPACITY);
+ int32_t ccLen = usCountryCode.extract(0, usCountryCode.length(), countryCode, sizeof(countryCode), US_INV);
+ countryCode[ccLen] = 0;
+
+ UnicodeString country;
+ fLocaleDisplayNames->regionDisplayName(countryCode, country);
+
Formattable param[] = {
Formattable(country)
};
+
fRegionFormat->format(param, 1, name, fpos, status);
} else {
- // If there are multiple zones including this in the country,
- // use the exemplar city name
+ // If this is not the primary zone in the country,
+ // use the exemplar city name.
// getExemplarLocationName should retur non-empty string
// if the time zone is associated with a region
@@ -585,6 +582,7 @@
Formattable param[] = {
Formattable(city),
};
+
fRegionFormat->format(param, 1, name, fpos, status);
}
if (U_FAILURE(status)) {
diff --git a/i18n/tznames.cpp b/i18n/tznames.cpp
index b7fc35c..c887997 100644
--- a/i18n/tznames.cpp
+++ b/i18n/tznames.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2011-2012, International Business Machines Corporation and *
+* Copyright (C) 2011-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@@ -25,13 +25,6 @@
U_NAMESPACE_BEGIN
-static const UChar gEtcPrefix[] = { 0x45, 0x74, 0x63, 0x2F }; // "Etc/"
-static const int32_t gEtcPrefixLen = 4;
-static const UChar gSystemVPrefix[] = { 0x53, 0x79, 0x73, 0x74, 0x65, 0x6D, 0x56, 0x2F }; // "SystemV/
-static const int32_t gSystemVPrefixLen = 8;
-static const UChar gRiyadh8[] = { 0x52, 0x69, 0x79, 0x61, 0x64, 0x68, 0x38 }; // "Riyadh8"
-static const int32_t gRiyadh8Len = 7;
-
// TimeZoneNames object cache handling
static UMutex gTimeZoneNamesLock = U_MUTEX_INITIALIZER;
static UHashtable *gTimeZoneNamesCache = NULL;
@@ -303,8 +296,6 @@
// ---------------------------------------------------
// TimeZoneNames base class
// ---------------------------------------------------
-UOBJECT_DEFINE_NO_RTTI_IMPLEMENTATION(TimeZoneNames)
-
TimeZoneNames::~TimeZoneNames() {
}
@@ -315,21 +306,7 @@
UnicodeString&
TimeZoneNames::getExemplarLocationName(const UnicodeString& tzID, UnicodeString& name) const {
- if (tzID.isEmpty() || tzID.startsWith(gEtcPrefix, gEtcPrefixLen)
- || tzID.startsWith(gSystemVPrefix, gSystemVPrefixLen) || tzID.indexOf(gRiyadh8, gRiyadh8Len, 0) > 0) {
- name.setToBogus();
- return name;
- }
-
- int32_t sep = tzID.lastIndexOf((UChar)0x2F /* '/' */);
- if (sep > 0 && sep + 1 < tzID.length()) {
- name.setTo(tzID, sep + 1);
- name.findAndReplace(UnicodeString((UChar)0x5f /* _ */),
- UnicodeString((UChar)0x20 /* space */));
- } else {
- name.setToBogus();
- }
- return name;
+ return TimeZoneNamesImpl::getDefaultExemplarLocationName(tzID, name);
}
UnicodeString&
diff --git a/i18n/tznames_impl.cpp b/i18n/tznames_impl.cpp
index 876411b..e3b0c3c 100644
--- a/i18n/tznames_impl.cpp
+++ b/i18n/tznames_impl.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2011-2012, International Business Machines Corporation and
+* Copyright (C) 2011-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
@@ -46,6 +46,7 @@
static const UTimeZoneNameType ALL_NAME_TYPES[] = {
UTZNM_LONG_GENERIC, UTZNM_LONG_STANDARD, UTZNM_LONG_DAYLIGHT,
UTZNM_SHORT_GENERIC, UTZNM_SHORT_STANDARD, UTZNM_SHORT_DAYLIGHT,
+ UTZNM_EXEMPLAR_LOCATION,
UTZNM_UNKNOWN // unknown as the last one
};
@@ -489,7 +490,7 @@
virtual ~ZNames();
static ZNames* createInstance(UResourceBundle* rb, const char* key);
- const UChar* getName(UTimeZoneNameType type);
+ virtual const UChar* getName(UTimeZoneNameType type);
protected:
ZNames(const UChar** names);
@@ -544,6 +545,7 @@
case UTZNM_SHORT_DAYLIGHT:
name = fNames[5];
break;
+ case UTZNM_EXEMPLAR_LOCATION: // implemeted by subclass
default:
name = NULL;
}
@@ -594,48 +596,80 @@
public:
virtual ~TZNames();
- static TZNames* createInstance(UResourceBundle* rb, const char* key);
- const UChar* getLocationName(void);
+ static TZNames* createInstance(UResourceBundle* rb, const char* key, const UnicodeString& tzID);
+ virtual const UChar* getName(UTimeZoneNameType type);
private:
- TZNames(const UChar** names, const UChar* locationName);
+ TZNames(const UChar** names);
const UChar* fLocationName;
+ UChar* fLocationNameOwned;
};
-TZNames::TZNames(const UChar** names, const UChar* locationName)
-: ZNames(names), fLocationName(locationName) {
+TZNames::TZNames(const UChar** names)
+: ZNames(names), fLocationName(NULL), fLocationNameOwned(NULL) {
}
TZNames::~TZNames() {
+ if (fLocationNameOwned) {
+ uprv_free(fLocationNameOwned);
+ }
}
const UChar*
-TZNames::getLocationName() {
- return fLocationName;
+TZNames::getName(UTimeZoneNameType type) {
+ if (type == UTZNM_EXEMPLAR_LOCATION) {
+ return fLocationName;
+ }
+ return ZNames::getName(type);
}
TZNames*
-TZNames::createInstance(UResourceBundle* rb, const char* key) {
+TZNames::createInstance(UResourceBundle* rb, const char* key, const UnicodeString& tzID) {
if (rb == NULL || key == NULL || *key == 0) {
return NULL;
}
- TZNames* tznames = NULL;
+
+ const UChar** names = loadData(rb, key);
+ const UChar* locationName = NULL;
+ UChar* locationNameOwned = NULL;
+
UErrorCode status = U_ZERO_ERROR;
- UResourceBundle* rbTable = ures_getByKeyWithFallback(rb, key, NULL, &status);
- if (U_SUCCESS(status)) {
- int32_t len = 0;
- const UChar* locationName = ures_getStringByKeyWithFallback(rbTable, gEcTag, &len, &status);
- if (U_FAILURE(status) || len == 0) {
- locationName = NULL;
- }
+ int32_t len = 0;
- const UChar** names = loadData(rb, key);
+ UResourceBundle* table = ures_getByKeyWithFallback(rb, key, NULL, &status);
+ locationName = ures_getStringByKeyWithFallback(table, gEcTag, &len, &status);
+ // ignore missing resource here
+ status = U_ZERO_ERROR;
- if (locationName != NULL || names != NULL) {
- tznames = new TZNames(names, locationName);
+ ures_close(table);
+
+ if (locationName == NULL) {
+ UnicodeString tmpName;
+ int32_t tmpNameLen = 0;
+ TimeZoneNamesImpl::getDefaultExemplarLocationName(tzID, tmpName);
+ tmpNameLen = tmpName.length();
+
+ if (tmpNameLen > 0) {
+ locationNameOwned = (UChar*) uprv_malloc(sizeof(UChar) * (tmpNameLen + 1));
+ if (locationNameOwned) {
+ tmpName.extract(locationNameOwned, tmpNameLen + 1, status);
+ locationName = locationNameOwned;
+ }
}
}
- ures_close(rbTable);
+
+ TZNames* tznames = NULL;
+ if (locationName != NULL || names != NULL) {
+ tznames = new TZNames(names);
+ if (tznames == NULL) {
+ if (locationNameOwned) {
+ uprv_free(locationNameOwned);
+ }
+ }
+ tznames->fLocationName = locationName;
+ tznames->fLocationNameOwned = locationNameOwned;
+ }
+
return tznames;
}
@@ -1057,6 +1091,7 @@
UnicodeString&
TimeZoneNamesImpl::getExemplarLocationName(const UnicodeString& tzID, UnicodeString& name) const {
+ name.setToBogus(); // cleanup result.
const UChar* locName = NULL;
TZNames *tznames = NULL;
TimeZoneNamesImpl *nonConstThis = const_cast<TimeZoneNamesImpl *>(this);
@@ -1068,14 +1103,13 @@
umtx_unlock(&gLock);
if (tznames != NULL) {
- locName = tznames->getLocationName();
+ locName = tznames->getName(UTZNM_EXEMPLAR_LOCATION);
}
if (locName != NULL) {
name.setTo(TRUE, locName, -1);
- return name;
}
- return TimeZoneNames::getExemplarLocationName(tzID, name);
+ return name;
}
@@ -1193,7 +1227,7 @@
}
}
uKey.extract(0, uKey.length(), key, sizeof(key), US_INV);
- tznames = TZNames::createInstance(fZoneStrings, key);
+ tznames = TZNames::createInstance(fZoneStrings, key, tzID);
if (tznames == NULL) {
cacheVal = (void *)EMPTY;
@@ -1306,6 +1340,32 @@
return handler.getMatches(maxLen);
}
+static const UChar gEtcPrefix[] = { 0x45, 0x74, 0x63, 0x2F }; // "Etc/"
+static const int32_t gEtcPrefixLen = 4;
+static const UChar gSystemVPrefix[] = { 0x53, 0x79, 0x73, 0x74, 0x65, 0x6D, 0x56, 0x2F }; // "SystemV/
+static const int32_t gSystemVPrefixLen = 8;
+static const UChar gRiyadh8[] = { 0x52, 0x69, 0x79, 0x61, 0x64, 0x68, 0x38 }; // "Riyadh8"
+static const int32_t gRiyadh8Len = 7;
+
+UnicodeString& U_EXPORT2
+TimeZoneNamesImpl::getDefaultExemplarLocationName(const UnicodeString& tzID, UnicodeString& name) {
+ if (tzID.isEmpty() || tzID.startsWith(gEtcPrefix, gEtcPrefixLen)
+ || tzID.startsWith(gSystemVPrefix, gSystemVPrefixLen) || tzID.indexOf(gRiyadh8, gRiyadh8Len, 0) > 0) {
+ name.setToBogus();
+ return name;
+ }
+
+ int32_t sep = tzID.lastIndexOf((UChar)0x2F /* '/' */);
+ if (sep > 0 && sep + 1 < tzID.length()) {
+ name.setTo(tzID, sep + 1);
+ name.findAndReplace(UnicodeString((UChar)0x5f /* _ */),
+ UnicodeString((UChar)0x20 /* space */));
+ } else {
+ name.setToBogus();
+ }
+ return name;
+}
+
U_NAMESPACE_END
diff --git a/i18n/tznames_impl.h b/i18n/tznames_impl.h
index c03eb8e..c677a8b 100644
--- a/i18n/tznames_impl.h
+++ b/i18n/tznames_impl.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
- * Copyright (C) 2011-2012, International Business Machines Corporation and *
+ * Copyright (C) 2011-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@@ -184,6 +184,8 @@
TimeZoneNames::MatchInfoCollection* find(const UnicodeString& text, int32_t start, uint32_t types, UErrorCode& status) const;
+ static UnicodeString& getDefaultExemplarLocationName(const UnicodeString& tzID, UnicodeString& name);
+
private:
Locale fLocale;
diff --git a/i18n/ucal.cpp b/i18n/ucal.cpp
index 0015bae..ff231ee 100644
--- a/i18n/ucal.cpp
+++ b/i18n/ucal.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 1996-2012, International Business Machines
+* Copyright (C) 1996-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*/
@@ -201,6 +201,21 @@
}
U_CAPI int32_t U_EXPORT2
+ucal_getTimeZoneID(const UCalendar *cal,
+ UChar *result,
+ int32_t resultLength,
+ UErrorCode *status)
+{
+ if (U_FAILURE(*status)) {
+ return 0;
+ }
+ const TimeZone& tz = ((Calendar*)cal)->getTimeZone();
+ UnicodeString id;
+ tz.getID(id);
+ return id.extract(result, resultLength, *status);
+}
+
+U_CAPI int32_t U_EXPORT2
ucal_getTimeZoneDisplayName(const UCalendar* cal,
UCalendarDisplayNameType type,
const char *locale,
@@ -740,11 +755,10 @@
const BasicTimeZone * btz = dynamic_cast<const BasicTimeZone *>(&tz);
if (btz != NULL && U_SUCCESS(*status)) {
TimeZoneTransition tzt;
- LocalPointer<BasicTimeZone> btzClone(static_cast<BasicTimeZone *>(btz->clone())); // getNext/PreviousTransition are non-const
UBool inclusive = (type == UCAL_TZ_TRANSITION_NEXT_INCLUSIVE || type == UCAL_TZ_TRANSITION_PREVIOUS_INCLUSIVE);
UBool result = (type == UCAL_TZ_TRANSITION_NEXT || type == UCAL_TZ_TRANSITION_NEXT_INCLUSIVE)?
- btzClone->getNextTransition(base, inclusive, tzt):
- btzClone->getPreviousTransition(base, inclusive, tzt);
+ btz->getNextTransition(base, inclusive, tzt):
+ btz->getPreviousTransition(base, inclusive, tzt);
if (result) {
*transition = tzt.getTime();
return TRUE;
diff --git a/i18n/ucln_in.h b/i18n/ucln_in.h
index a8daca5..c27bfa8 100644
--- a/i18n/ucln_in.h
+++ b/i18n/ucln_in.h
@@ -1,7 +1,7 @@
/*
******************************************************************************
* *
-* Copyright (C) 2001-2012, International Business Machines *
+* Copyright (C) 2001-2013, International Business Machines *
* Corporation and others. All Rights Reserved. *
* *
******************************************************************************
@@ -26,13 +26,17 @@
It's usually best to have child dependencies called first. */
typedef enum ECleanupI18NType {
UCLN_I18N_START = -1,
+ UCLN_I18N_IDENTIFIER_INFO,
+ UCLN_I18N_SPOOF,
UCLN_I18N_TRANSLITERATOR,
UCLN_I18N_REGEX,
UCLN_I18N_ISLAMIC_CALENDAR,
UCLN_I18N_CHINESE_CALENDAR,
UCLN_I18N_HEBREW_CALENDAR,
UCLN_I18N_ASTRO_CALENDAR,
+ UCLN_I18N_DANGI_CALENDAR,
UCLN_I18N_CALENDAR,
+ UCLN_I18N_TIMEZONEFORMAT,
UCLN_I18N_TIMEZONEGENERICNAMES,
UCLN_I18N_TIMEZONENAMES,
UCLN_I18N_ZONEMETA,
@@ -48,9 +52,9 @@
UCLN_I18N_UCOL_RES,
UCLN_I18N_UCOL_BLD,
UCLN_I18N_CSDET,
- UCLN_I18N_COLL_DATA,
- UCLN_I18N_INDEX_CHARACTERS,
UCLN_I18N_GENDERINFO,
+ UCLN_I18N_CDFINFO,
+ UCLN_I18N_REGION,
UCLN_I18N_COUNT /* This must be last */
} ECleanupI18NType;
diff --git a/i18n/ucol.cpp b/i18n/ucol.cpp
index a499d00..0912e4b 100644
--- a/i18n/ucol.cpp
+++ b/i18n/ucol.cpp
@@ -4188,43 +4188,13 @@
/* */
/****************************************************************************/
-/**
- * Merge two sort keys.
- * This is useful, for example, to combine sort keys from first and last names
- * to sort such pairs.
- * Merged sort keys consider on each collation level the first part first entirely,
- * then the second one.
- * It is possible to merge multiple sort keys by consecutively merging
- * another one with the intermediate result.
- *
- * The length of the merge result is the sum of the lengths of the input sort keys
- * minus 1.
- *
- * @param src1 the first sort key
- * @param src1Length the length of the first sort key, including the zero byte at the end;
- * can be -1 if the function is to find the length
- * @param src2 the second sort key
- * @param src2Length the length of the second sort key, including the zero byte at the end;
- * can be -1 if the function is to find the length
- * @param dest the buffer where the merged sort key is written,
- * can be NULL if destCapacity==0
- * @param destCapacity the number of bytes in the dest buffer
- * @return the length of the merged sort key, src1Length+src2Length-1;
- * can be larger than destCapacity, or 0 if an error occurs (only for illegal arguments),
- * in which cases the contents of dest is undefined
- *
- * @draft
- */
U_CAPI int32_t U_EXPORT2
ucol_mergeSortkeys(const uint8_t *src1, int32_t src1Length,
const uint8_t *src2, int32_t src2Length,
uint8_t *dest, int32_t destCapacity) {
- int32_t destLength;
- uint8_t b;
-
/* check arguments */
- if( src1==NULL || src1Length<-2 || src1Length==0 || (src1Length>0 && src1[src1Length-1]!=0) ||
- src2==NULL || src2Length<-2 || src2Length==0 || (src2Length>0 && src2[src2Length-1]!=0) ||
+ if( src1==NULL || src1Length<-1 || src1Length==0 || (src1Length>0 && src1[src1Length-1]!=0) ||
+ src2==NULL || src2Length<-1 || src2Length==0 || (src2Length>0 && src2[src2Length-1]!=0) ||
destCapacity<0 || (destCapacity>0 && dest==NULL)
) {
/* error, attempt to write a zero byte and return 0 */
@@ -4242,34 +4212,38 @@
src2Length=(int32_t)uprv_strlen((const char *)src2)+1;
}
- destLength=src1Length+src2Length-1;
+ int32_t destLength=src1Length+src2Length;
if(destLength>destCapacity) {
/* the merged sort key does not fit into the destination */
return destLength;
}
/* merge the sort keys with the same number of levels */
- while(*src1!=0 && *src2!=0) { /* while both have another level */
+ uint8_t *p=dest;
+ for(;;) {
/* copy level from src1 not including 00 or 01 */
+ uint8_t b;
while((b=*src1)>=2) {
++src1;
- *dest++=b;
+ *p++=b;
}
/* add a 02 merge separator */
- *dest++=2;
+ *p++=2;
/* copy level from src2 not including 00 or 01 */
while((b=*src2)>=2) {
++src2;
- *dest++=b;
+ *p++=b;
}
/* if both sort keys have another level, then add a 01 level separator and continue */
if(*src1==1 && *src2==1) {
++src1;
++src2;
- *dest++=1;
+ *p++=1;
+ } else {
+ break;
}
}
@@ -4283,10 +4257,10 @@
src2=src1;
}
/* append src2, "the other, unfinished sort key" */
- uprv_strcpy((char *)dest, (const char *)src2);
+ while((*p++=*src2++)!=0) {}
- /* trust that neither sort key contained illegally embedded zero bytes */
- return destLength;
+ /* the actual length might be less than destLength if either sort key contained illegally embedded zero bytes */
+ return (int32_t)(p-dest);
}
U_NAMESPACE_BEGIN
@@ -8064,163 +8038,9 @@
}
/*
- Slightly modified version of U8_NEXT macro defined in utf8.h. U8_NEXT requires
- the length of UTF-8 string. This version assumes that the UTF-8 string is null
- terminated and does not require the length as input.
-
Note: ucol_strcollUTF8 supports null terminated input. Calculating length of
null terminated input string takes extra amount of CPU cycles.
*/
-static const UChar32
-utf8_minLegal[4]={ 0, 0x80, 0x800, 0x10000 };
-
-#define UTF8_ERROR_VALUE_1 0x15
-#define UTF8_ERROR_VALUE_2 0x9f
-#define UTF_ERROR_VALUE 0xffff
-
-static const UChar32
-utf8_errorValue[6]={
- UTF8_ERROR_VALUE_1, UTF8_ERROR_VALUE_2, UTF_ERROR_VALUE, 0x10ffff,
- 0x3ffffff, 0x7fffffff
-};
-
-static
-UChar32 utf8_nextCharSafeBodyNullTerm(const uint8_t *s, int32_t *pi, UChar32 c, UBool strict) {
- int32_t i=*pi;
- uint8_t count=U8_COUNT_TRAIL_BYTES(c);
- U_ASSERT(count <= 5); /* U8_COUNT_TRAIL_BYTES returns value 0...5 */
-
- if (c) {
- uint8_t trail, illegal=0;
-
- U8_MASK_LEAD_BYTE((c), count);
- /* count==0 for illegally leading trail bytes and the illegal bytes 0xfe and 0xff */
- switch(count) {
- /* each branch falls through to the next one */
- case 5:
- case 4:
- /* count>=4 is always illegal: no more than 3 trail bytes in Unicode's UTF-8 */
- illegal=1;
- break;
- case 3:
- trail=s[(i)];
- if (trail==0) {
- illegal=1;
- break;
- }
- (c)=((c)<<6)|(trail&0x3f);
- if(c<0x110) {
- illegal|=(trail&0xc0)^0x80;
- } else {
- /* code point>0x10ffff, outside Unicode */
- illegal=1;
- break;
- }
- ++(i);
- case 2:
- trail=s[(i)];
- if (trail==0) {
- illegal=1;
- break;
- }
- (c)=((c)<<6)|(trail&0x3f);
- illegal|=(trail&0xc0)^0x80;
- ++(i);
- case 1:
- trail=s[(i)];
- if (trail==0) {
- illegal=1;
- break;
- }
- (c)=((c)<<6)|(trail&0x3f);
- illegal|=(trail&0xc0)^0x80;
- ++(i);
- break;
- case 0:
- if(strict>=0) {
- return UTF8_ERROR_VALUE_1;
- } else {
- return U_SENTINEL;
- }
- /* no default branch to optimize switch() - all values are covered */
- }
-
- /*
- * All the error handling should return a value
- * that needs count bytes so that UTF8_GET_CHAR_SAFE() works right.
- *
- * Starting with Unicode 3.0.1, non-shortest forms are illegal.
- * Starting with Unicode 3.2, surrogate code points must not be
- * encoded in UTF-8, and there are no irregular sequences any more.
- *
- * U8_ macros (new in ICU 2.4) return negative values for error conditions.
- */
-
- /* correct sequence - all trail bytes have (b7..b6)==(10)? */
- /* illegal is also set if count>=4 */
- if(illegal || (c)<utf8_minLegal[count] || (U_IS_SURROGATE(c) && strict!=-2)) {
- /* error handling */
- uint8_t errorCount=count;
- /* don't go beyond this sequence */
- i=*pi;
- while(count>0 && U8_IS_TRAIL(s[i])) {
- ++(i);
- --count;
- }
- if(strict>=0) {
- c=utf8_errorValue[errorCount-count];
- } else {
- c=U_SENTINEL;
- }
- } else if((strict)>0 && U_IS_UNICODE_NONCHAR(c)) {
- /* strict: forbid non-characters like U+fffe */
- c=utf8_errorValue[count];
- }
- }
- *pi=i;
- return c;
-}
-
-#define U8_NEXT_NULLTERM(s, i, c) { \
- (c)=(uint8_t)(s)[(i)]; \
- if((c)>=0x80) { \
- uint8_t __t1, __t2; \
- if( /* handle U+1000..U+CFFF inline */ \
- (0xe0<(c) && (c)<=0xec) && \
- (__t1=(uint8_t)((s)[(i)+1]-0x80))<=0x3f && __t1 != 0 && \
- (__t2=(uint8_t)((s)[(i)+2]-0x80))<= 0x3f && __t2 != 0 \
- ) { \
- /* no need for (c&0xf) because the upper bits are truncated after <<12 in the cast to (UChar) */ \
- (c)=(UChar)(((c)<<12)|(__t1<<6)|__t2); \
- (i)+=3; \
- } else if( /* handle U+0080..U+07FF inline */ \
- ((c)<0xe0 && (c)>=0xc2) && \
- (__t1=(uint8_t)((s)[(i)+1]-0x80))<=0x3f && __t1 != 0 \
- ) { \
- (c)=(UChar)((((c)&0x1f)<<6)|__t1); \
- (i)+=2; \
- } else if(U8_IS_LEAD(c)) { \
- /* function call for "complicated" and error cases */ \
- ++(i); \
- (c)=utf8_nextCharSafeBodyNullTerm((const uint8_t *)s, &(i), c, -1); \
- } else { \
- (c)=U_SENTINEL; \
- ++(i); \
- } \
- } else { \
- if ((c)) { \
- ++(i); \
- } \
- } \
-}
-
-#define U8_GET_NULLTERM(s, start, i, c) { \
- int32_t _u8_get_index=(int32_t)(i); \
- U8_SET_CP_START(s, start, _u8_get_index); \
- U8_NEXT_NULLTERM(s, _u8_get_index, c); \
-}
-
-
static UCollationResult
ucol_strcollRegularUTF8(
const UCollator *coll,
@@ -8279,19 +8099,12 @@
UChar32 schar = 0, tchar = 0;
for(;;) {
- if (len == -1) {
- U8_GET_NULLTERM((const uint8_t*)s, 0, *index, schar);
- if (schar == 0) {
- return(coll->latinOneCEs[strength*coll->latinOneTableLen+latinOneOffset]);
- }
- } else {
- if (*index == len) {
- return(coll->latinOneCEs[strength*coll->latinOneTableLen+latinOneOffset]);
- }
- U8_GET((const uint8_t*)s, 0, *index, len, schar);
+ if (*index == len) {
+ return(coll->latinOneCEs[strength*coll->latinOneTableLen+latinOneOffset]);
}
- if (schar == -1) {
- schar = 0xfffd;
+ U8_GET_OR_FFFD((const uint8_t*)s, 0, *index, len, schar);
+ if (len < 0 && schar == 0) {
+ return(coll->latinOneCEs[strength*coll->latinOneTableLen+latinOneOffset]);
}
while(schar > (tchar = *(UCharOffset+offset))) { /* since the contraction codepoints should be ordered, we skip all that are smaller */
@@ -8346,22 +8159,15 @@
for(;;) {
while(sOrder==0) { // this loop skips primary ignorables
// sOrder=getNextlatinOneCE(source);
- if (sLen==-1) {
- U8_NEXT_NULLTERM(source, sIndex, sChar);
- if (sChar == 0) {
- endOfSource = TRUE;
- sLen = sIndex;
- break;
- }
- } else {
- if (sIndex == sLen) {
- endOfSource = TRUE;
- break;
- }
- U8_NEXT(source, sIndex, sLen ,sChar);
+ if (sIndex == sLen) {
+ endOfSource = TRUE;
+ break;
}
- if (sChar == -1) {
- sChar = 0xfffd; // fallback for the bad code
+ U8_NEXT_OR_FFFD(source, sIndex, sLen ,sChar);
+ if (sLen < 0 && sChar == 0) {
+ endOfSource = TRUE;
+ sLen = sIndex;
+ break;
}
if(sChar&0xFFFFFF00) { // if we encounter non-latin-1, we bail out (sChar > 0xFF, but this is faster on win32)
//fprintf(stderr, "R");
@@ -8386,28 +8192,21 @@
while(tOrder==0) { // this loop skips primary ignorables
// tOrder=getNextlatinOneCE(target);
- if (tLen == -1) {
- U8_NEXT_NULLTERM(target, tIndex, tChar);
- if (tChar == 0) {
- if(endOfSource) {
- tLen = tIndex;
- goto endOfPrimLoopU8;
- } else {
- return UCOL_GREATER;
- }
+ if (tIndex == tLen) {
+ if(endOfSource) {
+ goto endOfPrimLoopU8;
+ } else {
+ return UCOL_GREATER;
}
- } else {
- if (tIndex == tLen) {
- if(endOfSource) {
- goto endOfPrimLoopU8;
- } else {
- return UCOL_GREATER;
- }
- }
- U8_NEXT(target, tIndex, tLen, tChar);
}
- if (tChar == -1) {
- tChar = 0xfffd;
+ U8_NEXT_OR_FFFD(target, tIndex, tLen, tChar);
+ if (tLen < 0 && tChar == 0) {
+ if(endOfSource) {
+ tLen = tIndex;
+ goto endOfPrimLoopU8;
+ } else {
+ return UCOL_GREATER;
+ }
}
if(tChar&0xFFFFFF00) { // if we encounter non-latin-1, we bail out (sChar > 0xFF, but this is faster on win32)
//fprintf(stderr, "R");
@@ -8474,7 +8273,7 @@
break;
}
U_ASSERT(sLen >= 0);
- U8_NEXT(source, sIndex, sLen, sChar);
+ U8_NEXT_OR_FFFD(source, sIndex, sLen, sChar);
U_ASSERT(sChar >= 0 && sChar <= 0xFF);
sOrder = elements[sChar];
if(sOrder > UCOL_NOT_FOUND) {
@@ -8491,7 +8290,7 @@
}
}
U_ASSERT(tLen >= 0);
- U8_NEXT(target, tIndex, tLen, tChar);
+ U8_NEXT_OR_FFFD(target, tIndex, tLen, tChar);
U_ASSERT(tChar >= 0 && tChar <= 0xFF);
tOrder = elements[tChar];
if(tOrder > UCOL_NOT_FOUND) {
@@ -8531,7 +8330,7 @@
endOfSource = TRUE;
break;
}
- U8_PREV(source, 0, sIndex, sChar);
+ U8_PREV_OR_FFFD(source, 0, sIndex, sChar);
U_ASSERT(sChar >= 0 && sChar <= 0xFF);
sOrder = elements[sChar];
// don't even look for contractions
@@ -8545,7 +8344,7 @@
return UCOL_GREATER;
}
}
- U8_PREV(target, 0, tIndex, tChar);
+ U8_PREV_OR_FFFD(target, 0, tIndex, tChar);
U_ASSERT(tChar >= 0 && tChar <= 0xFF);
tOrder = elements[tChar];
// don't even look for contractions
@@ -8586,7 +8385,7 @@
break;
}
U_ASSERT(sLen >= 0);
- U8_NEXT(source, sIndex, sLen, sChar);
+ U8_NEXT_OR_FFFD(source, sIndex, sLen, sChar);
U_ASSERT(sChar >= 0 && sChar <= 0xFF);
sOrder = elements[sChar];
if(sOrder > UCOL_NOT_FOUND) {
@@ -8602,7 +8401,7 @@
}
}
U_ASSERT(tLen >= 0);
- U8_NEXT(target, tIndex, tLen, tChar);
+ U8_NEXT_OR_FFFD(target, tIndex, tLen, tChar);
U_ASSERT(tChar >= 0 && tChar <= 0xFF);
tOrder = elements[tChar];
if(tOrder > UCOL_NOT_FOUND) {
@@ -8989,36 +8788,18 @@
UChar32 uc32 = -1;
if (!bSrcLimit) {
- if (sourceLength >= 0) {
- U8_GET((uint8_t*)source, 0, equalLength, sourceLength, uc32);
- } else {
- U8_GET_NULLTERM((uint8_t*)source, 0, equalLength, uc32);
+ U8_GET_OR_FFFD((const uint8_t*)source, 0, equalLength, sourceLength, uc32);
+ if (uc32 >= 0x10000 || ucol_unsafeCP((UChar)uc32, coll)) {
+ bUnsafeCP = TRUE;
}
- if (uc32 == -1) {
- uc32 = 0xfffd;
- bSawNonLatin1 |= TRUE;
- } else {
- if (uc32 >= 0x10000 || ucol_unsafeCP((UChar)uc32, coll)) {
- bUnsafeCP = TRUE;
- }
- bSawNonLatin1 |= (uc32 > 0xff);
- }
+ bSawNonLatin1 |= (uc32 > 0xff);
}
if (!bTargLimit) {
- if (targetLength >= 0) {
- U8_GET((uint8_t*)target, 0, equalLength, targetLength, uc32);
- } else {
- U8_GET_NULLTERM((uint8_t*)target, 0, equalLength, uc32);
+ U8_GET_OR_FFFD((const uint8_t*)target, 0, equalLength, targetLength, uc32);
+ if (uc32 >= 0x10000 || ucol_unsafeCP((UChar)uc32, coll)) {
+ bUnsafeCP = TRUE;
}
- if (uc32 == -1) {
- uc32 = 0xfffd;
- bSawNonLatin1 |= TRUE;
- } else {
- if (uc32 >= 0x10000 || ucol_unsafeCP((UChar)uc32, coll)) {
- bUnsafeCP = TRUE;
- }
- bSawNonLatin1 |= (uc32 > 0xff);
- }
+ bSawNonLatin1 |= (uc32 > 0xff);
}
if (bUnsafeCP) {
@@ -9026,7 +8807,7 @@
// We are stopped in the middle of a contraction.
// Scan backwards through the == part of the string looking for the start of the contraction.
// It doesn't matter which string we scan, since they are the same in this region.
- U8_PREV((uint8_t*)source, 0, equalLength, uc32);
+ U8_PREV_OR_FFFD((uint8_t*)source, 0, equalLength, uc32);
bSawNonLatin1 |= (uc32 > 0xff);
if (uc32 < 0x10000 && !ucol_unsafeCP((UChar)uc32, coll)) {
break;
diff --git a/i18n/ucurr.cpp b/i18n/ucurr.cpp
index 1357f0c..2bd0802 100644
--- a/i18n/ucurr.cpp
+++ b/i18n/ucurr.cpp
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (c) 2002-2012, International Business Machines
+* Copyright (c) 2002-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@@ -1712,6 +1712,7 @@
{"SOS", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"SRD", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"SRG", UCURR_COMMON|UCURR_DEPRECATED},
+ {"SSP", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"STD", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"SUR", UCURR_COMMON|UCURR_DEPRECATED},
{"SVC", UCURR_COMMON|UCURR_NON_DEPRECATED},
@@ -1764,7 +1765,9 @@
{"XPF", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"XPT", UCURR_UNCOMMON|UCURR_NON_DEPRECATED},
{"XRE", UCURR_UNCOMMON|UCURR_NON_DEPRECATED},
+ {"XSU", UCURR_UNCOMMON|UCURR_NON_DEPRECATED},
{"XTS", UCURR_UNCOMMON|UCURR_NON_DEPRECATED},
+ {"XUA", UCURR_UNCOMMON|UCURR_NON_DEPRECATED},
{"XXX", UCURR_UNCOMMON|UCURR_NON_DEPRECATED},
{"YDD", UCURR_COMMON|UCURR_DEPRECATED},
{"YER", UCURR_COMMON|UCURR_NON_DEPRECATED},
@@ -1774,10 +1777,11 @@
{"YUR", UCURR_COMMON|UCURR_DEPRECATED},
{"ZAL", UCURR_UNCOMMON|UCURR_NON_DEPRECATED},
{"ZAR", UCURR_COMMON|UCURR_NON_DEPRECATED},
- {"ZMK", UCURR_COMMON|UCURR_NON_DEPRECATED},
+ {"ZMK", UCURR_COMMON|UCURR_DEPRECATED},
+ {"ZMW", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"ZRN", UCURR_COMMON|UCURR_DEPRECATED},
{"ZRZ", UCURR_COMMON|UCURR_DEPRECATED},
- {"ZWL", UCURR_COMMON|UCURR_NON_DEPRECATED},
+ {"ZWL", UCURR_COMMON|UCURR_DEPRECATED},
{"ZWR", UCURR_COMMON|UCURR_DEPRECATED},
{"ZWD", UCURR_COMMON|UCURR_DEPRECATED},
{ NULL, 0 } // Leave here to denote the end of the list.
diff --git a/i18n/udat.cpp b/i18n/udat.cpp
index 9046835..1af1450 100644
--- a/i18n/udat.cpp
+++ b/i18n/udat.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 1996-2012, International Business Machines
+* Copyright (C) 1996-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*/
@@ -432,9 +432,9 @@
const SimpleDateFormat* sdtfmt;
const RelativeDateFormat* rdtfmt;
if ((sdtfmt = dynamic_cast<const SimpleDateFormat*>(reinterpret_cast<const DateFormat*>(fmt))) != NULL) {
- syms = sdtfmt->getDateFormatSymbols();
+ syms = sdtfmt->getDateFormatSymbols();
} else if ((rdtfmt = dynamic_cast<const RelativeDateFormat*>(reinterpret_cast<const DateFormat*>(fmt))) != NULL) {
- syms = rdtfmt->getDateFormatSymbols();
+ syms = rdtfmt->getDateFormatSymbols();
} else {
return -1;
}
@@ -486,6 +486,10 @@
res = syms->getMonths(count, DateFormatSymbols::FORMAT, DateFormatSymbols::NARROW);
break;
+ case UDAT_SHORTER_WEEKDAYS:
+ res = syms->getWeekdays(count, DateFormatSymbols::FORMAT, DateFormatSymbols::SHORT);
+ break;
+
case UDAT_NARROW_WEEKDAYS:
res = syms->getWeekdays(count, DateFormatSymbols::FORMAT, DateFormatSymbols::NARROW);
break;
@@ -510,6 +514,10 @@
res = syms->getWeekdays(count, DateFormatSymbols::STANDALONE, DateFormatSymbols::ABBREVIATED);
break;
+ case UDAT_STANDALONE_SHORTER_WEEKDAYS:
+ res = syms->getWeekdays(count, DateFormatSymbols::STANDALONE, DateFormatSymbols::SHORT);
+ break;
+
case UDAT_STANDALONE_NARROW_WEEKDAYS:
res = syms->getWeekdays(count, DateFormatSymbols::STANDALONE, DateFormatSymbols::NARROW);
break;
@@ -547,9 +555,9 @@
const SimpleDateFormat* sdtfmt;
const RelativeDateFormat* rdtfmt;
if ((sdtfmt = dynamic_cast<const SimpleDateFormat*>(reinterpret_cast<const DateFormat*>(fmt))) != NULL) {
- syms = sdtfmt->getDateFormatSymbols();
+ syms = sdtfmt->getDateFormatSymbols();
} else if ((rdtfmt = dynamic_cast<const RelativeDateFormat*>(reinterpret_cast<const DateFormat*>(fmt))) != NULL) {
- syms = rdtfmt->getDateFormatSymbols();
+ syms = rdtfmt->getDateFormatSymbols();
} else {
return 0;
}
@@ -592,6 +600,10 @@
syms->getMonths(count, DateFormatSymbols::FORMAT, DateFormatSymbols::NARROW);
break;
+ case UDAT_SHORTER_WEEKDAYS:
+ syms->getWeekdays(count, DateFormatSymbols::FORMAT, DateFormatSymbols::SHORT);
+ break;
+
case UDAT_NARROW_WEEKDAYS:
syms->getWeekdays(count, DateFormatSymbols::FORMAT, DateFormatSymbols::NARROW);
break;
@@ -616,6 +628,10 @@
syms->getWeekdays(count, DateFormatSymbols::STANDALONE, DateFormatSymbols::ABBREVIATED);
break;
+ case UDAT_STANDALONE_SHORTER_WEEKDAYS:
+ syms->getWeekdays(count, DateFormatSymbols::STANDALONE, DateFormatSymbols::SHORT);
+ break;
+
case UDAT_STANDALONE_NARROW_WEEKDAYS:
syms->getWeekdays(count, DateFormatSymbols::STANDALONE, DateFormatSymbols::NARROW);
break;
@@ -755,6 +771,13 @@
}
static void
+ setShorterWeekday(DateFormatSymbols *syms, int32_t index,
+ const UChar *value, int32_t valueLength, UErrorCode &errorCode)
+ {
+ setSymbol(syms->fShorterWeekdays, syms->fShorterWeekdaysCount, index, value, valueLength, errorCode);
+ }
+
+ static void
setNarrowWeekday(DateFormatSymbols *syms, int32_t index,
const UChar *value, int32_t valueLength, UErrorCode &errorCode)
{
@@ -776,6 +799,13 @@
}
static void
+ setStandaloneShorterWeekday(DateFormatSymbols *syms, int32_t index,
+ const UChar *value, int32_t valueLength, UErrorCode &errorCode)
+ {
+ setSymbol(syms->fStandaloneShorterWeekdays, syms->fStandaloneShorterWeekdaysCount, index, value, valueLength, errorCode);
+ }
+
+ static void
setStandaloneNarrowWeekday(DateFormatSymbols *syms, int32_t index,
const UChar *value, int32_t valueLength, UErrorCode &errorCode)
{
@@ -881,6 +911,10 @@
DateFormatSymbolsSingleSetter::setShortWeekday(syms, index, value, valueLength, *status);
break;
+ case UDAT_SHORTER_WEEKDAYS:
+ DateFormatSymbolsSingleSetter::setShorterWeekday(syms, index, value, valueLength, *status);
+ break;
+
case UDAT_NARROW_WEEKDAYS:
DateFormatSymbolsSingleSetter::setNarrowWeekday(syms, index, value, valueLength, *status);
break;
@@ -893,6 +927,10 @@
DateFormatSymbolsSingleSetter::setStandaloneShortWeekday(syms, index, value, valueLength, *status);
break;
+ case UDAT_STANDALONE_SHORTER_WEEKDAYS:
+ DateFormatSymbolsSingleSetter::setStandaloneShorterWeekday(syms, index, value, valueLength, *status);
+ break;
+
case UDAT_STANDALONE_NARROW_WEEKDAYS:
DateFormatSymbolsSingleSetter::setStandaloneNarrowWeekday(syms, index, value, valueLength, *status);
break;
diff --git a/i18n/ulocdata.c b/i18n/ulocdata.c
index 19f3bf4..5034bb7 100644
--- a/i18n/ulocdata.c
+++ b/i18n/ulocdata.c
@@ -1,7 +1,7 @@
/*
******************************************************************************
* *
-* Copyright (C) 2003-2012, International Business Machines *
+* Copyright (C) 2003-2013, International Business Machines *
* Corporation and others. All Rights Reserved. *
* *
******************************************************************************
@@ -102,7 +102,8 @@
static const char* const exemplarSetTypes[] = { "ExemplarCharacters",
"AuxExemplarCharacters",
- "ExemplarCharactersIndex"};
+ "ExemplarCharactersIndex",
+ "ExemplarCharactersPunctuation"};
const UChar *exemplarChars = NULL;
int32_t len = 0;
UErrorCode localStatus = U_ZERO_ERROR;
diff --git a/i18n/unicode/basictz.h b/i18n/unicode/basictz.h
index 60494a4..f1e477f 100644
--- a/i18n/unicode/basictz.h
+++ b/i18n/unicode/basictz.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2007-2011, International Business Machines Corporation and
+* Copyright (C) 2007-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
@@ -47,7 +47,7 @@
* @return TRUE if the transition is found.
* @stable ICU 3.8
*/
- virtual UBool getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/ = 0;
+ virtual UBool getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const = 0;
/**
* Gets the most recent time zone transition before the base time.
@@ -57,7 +57,7 @@
* @return TRUE if the transition is found.
* @stable ICU 3.8
*/
- virtual UBool getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/ = 0;
+ virtual UBool getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const = 0;
/**
* Checks if the time zone has equivalent transitions in the time range.
@@ -79,8 +79,8 @@
* time range.
* @stable ICU 3.8
*/
- virtual UBool hasEquivalentTransitions(/*const*/ BasicTimeZone& tz, UDate start, UDate end,
- UBool ignoreDstAmount, UErrorCode& ec) /*const*/;
+ virtual UBool hasEquivalentTransitions(const BasicTimeZone& tz, UDate start, UDate end,
+ UBool ignoreDstAmount, UErrorCode& ec) const;
/**
* Returns the number of <code>TimeZoneRule</code>s which represents time transitions,
@@ -90,7 +90,7 @@
* @return The number of <code>TimeZoneRule</code>s representing time transitions.
* @stable ICU 3.8
*/
- virtual int32_t countTransitionRules(UErrorCode& status) /*const*/ = 0;
+ virtual int32_t countTransitionRules(UErrorCode& status) const = 0;
/**
* Gets the <code>InitialTimeZoneRule</code> and the set of <code>TimeZoneRule</code>
@@ -109,7 +109,7 @@
* @stable ICU 3.8
*/
virtual void getTimeZoneRules(const InitialTimeZoneRule*& initial,
- const TimeZoneRule* trsrules[], int32_t& trscount, UErrorCode& status) /*const*/ = 0;
+ const TimeZoneRule* trsrules[], int32_t& trscount, UErrorCode& status) const = 0;
/**
* Gets the set of time zone rules valid at the specified time. Some known external time zone
@@ -138,7 +138,7 @@
* @stable ICU 3.8
*/
virtual void getSimpleRulesNear(UDate date, InitialTimeZoneRule*& initial,
- AnnualTimeZoneRule*& std, AnnualTimeZoneRule*& dst, UErrorCode& status) /*const*/;
+ AnnualTimeZoneRule*& std, AnnualTimeZoneRule*& dst, UErrorCode& status) const;
#ifndef U_HIDE_INTERNAL_API
@@ -159,7 +159,7 @@
* @internal
*/
virtual void getOffsetFromLocal(UDate date, int32_t nonExistingTimeOpt, int32_t duplicatedTimeOpt,
- int32_t& rawOffset, int32_t& dstOffset, UErrorCode& status) /*const*/;
+ int32_t& rawOffset, int32_t& dstOffset, UErrorCode& status) const;
protected:
@@ -202,7 +202,7 @@
* @param status Receives error status code
*/
void getTimeZoneRulesAfter(UDate start, InitialTimeZoneRule*& initial, UVector*& transitionRules,
- UErrorCode& status) /*const*/;
+ UErrorCode& status) const;
};
U_NAMESPACE_END
diff --git a/i18n/unicode/bms.h b/i18n/unicode/bms.h
deleted file mode 100644
index 3310248..0000000
--- a/i18n/unicode/bms.h
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright (C) 1996-2012, International Business Machines Corporation and Others.
- * All rights reserved.
- */
-
-/**
- * \file
- * \brief C API: Boyer-Moore StringSearch prototype.
- * \internal
- */
-
-#ifndef _BMS_H
-#define _BMS_H
-
-#include "unicode/utypes.h"
-
-#if !UCONFIG_NO_COLLATION && !UCONFIG_NO_BREAK_ITERATION
-
-#include "unicode/ucol.h"
-
-#ifndef U_HIDE_INTERNAL_API
-
-/**
- * A <code>UCD</code> object holds the Collator-specific data needed to
- * compute the length of the shortest string that can
- * generate a partcular list of CEs.
- *
- * <code>UCD</code> objects are quite expensive to compute. Because
- * of this, they are cached. When you call <code>ucd_open</code> it
- * returns a reference counted cached object. When you call <code>ucd_close</code>
- * the reference count on the object is decremented but the object is not deleted.
- *
- * If you do not need to reuse any unreferenced objects in the cache, you can call
- * <code>ucd_flushCCache</code>. If you no longer need any <code>UCD</code>
- * objects, you can call <code>ucd_freeCache</code>
- *
- * @internal ICU 4.0.1 technology preview
- */
-typedef void UCD;
-
-/**
- * Open a <code>UCD</code> object.
- *
- * @param coll - the collator
- * @param status - will be set if any errors occur.
- *
- * @return the <code>UCD</code> object. You must call
- * <code>ucd_close</code> when you are done using the object.
- *
- * Note: if on return status is set to an error, the only safe
- * thing to do with the returned object is to call <code>ucd_close</code>.
- *
- * @internal ICU 4.0.1 technology preview
- */
-U_INTERNAL UCD * U_EXPORT2
-ucd_open(UCollator *coll, UErrorCode *status);
-
-/**
- * Release a <code>UCD</code> object.
- *
- * @param ucd - the object
- *
- * @internal ICU 4.0.1 technology preview
- */
-U_INTERNAL void U_EXPORT2
-ucd_close(UCD *ucd);
-
-/**
- * Get the <code>UCollator</code> object used to create a <code>UCD</code> object.
- * The <code>UCollator</code> object returned may not be the exact
- * object that was used to create this object, but it will have the
- * same behavior.
- *
- * @param ucd - the <code>UCD</code> object
- *
- * @return the <code>UCollator</code> used to create the given
- * <code>UCD</code> object.
- *
- * @internal ICU 4.0.1 technology preview
- */
-U_INTERNAL UCollator * U_EXPORT2
-ucd_getCollator(UCD *ucd);
-
-/**
- * <code>UCD</code> objects are expensive to compute, and so
- * may be cached. This routine will free the cached objects and delete
- * the cache.
- *
- * WARNING: Don't call this until you are have called <code>close</code>
- * for each <code>UCD</code> object that you have used. also,
- * DO NOT call this if another thread may be calling <code>ucd_flushCache</code>
- * at the same time.
- *
- * @internal ICU 4.0.1 technology preview
- */
-U_INTERNAL void U_EXPORT2
-ucd_freeCache();
-
-/**
- * <code>UCD</code> objects are expensive to compute, and so
- * may be cached. This routine will remove any unused <code>UCD</code>
- * objects from the cache.
- *
- * @internal 4.0.1 technology preview
- */
-U_INTERNAL void U_EXPORT2
-ucd_flushCache();
-
-/**
- * BMS
- *
- * This object holds the information needed to do a Collation sensitive Boyer-Moore search. It encapulates
- * the pattern, the "bad character" and "good suffix" tables, the Collator-based data needed to compute them,
- * and a reference to the text being searched.
- *
- * To do a search, you first need to get a <code>UCD</code> object by calling <code>ucd_open</code>.
- * Then you construct a <code>BMS</code> object from the <code>UCD</code> object, the pattern
- * string and the target string. Then you call the <code>search</code> method. Here's a code sample:
- *
- * <pre>
- * void boyerMooreExample(UCollator *collator, UChar *pattern, int32_t patternLen, UChar *target, int32_t targetLength)
- * {
- * UErrorCode status = U_ZERO_ERROR;
- * int32_t offset = 0, start = -1, end = -1;
- * UCD *ucd = NULL);
- * BMS *bms = NULL;
- *
- * ucd = ucd_open(collator, &status);
- * if (U_FAILURE(status)) {
- * // could not create a UCD object
- * return;
- * }
- *
- * BMS *bms = bms_open(ucd, pattern, patternLength, target, targetlength, &status);
- * if (U_FAILURE(status)) {
- * // could not create a BMS object
- * ucd_close(ucd);
- * return;
- * }
- *
- *
- * // Find all matches
- * while (bms_search(bms, offset, &start, &end)) {
- * // process the match between start and end
- * ...
- *
- * // advance past the match
- * offset = end;
- * }
- *
- * // at this point, if offset == 0, there were no matches
- * if (offset == 0) {
- * // handle the case of no matches
- * }
- *
- * bms_close(bms);
- * ucd_close(ucd);
- *
- * // UCD objects are cached, so the call to
- * // ucd_close doesn't delete the object.
- * // Call this if you don't need the object any more.
- * ucd_flushCache();
- * }
- * </pre>
- *
- * NOTE: This is a technology preview. The final version of this API may not bear any resenblence to this API.
- *
- * Knows linitations:
- * 1) Backwards searching has not been implemented.
- *
- * 2) For Han and Hangul characters, this code ignores any Collation tailorings. In general,
- * this isn't a problem, but in Korean locals, at strength 1, Hangul characters are tailored
- * to be equal to Han characters with the same pronounciation. Because this code ignroes
- * tailorings, searching for a Hangul character will not find a Han character and visa-versa.
- *
- * 3) In some cases, searching for a pattern that needs to be normalized and ends
- * in a discontiguous contraction may fail. The only known cases of this are with
- * the Tibetan script. For example searching for the pattern
- * "\u0F7F\u0F80\u0F81\u0F82\u0F83\u0F84\u0F85" will fail. (This case is artificial. We've
- * been unable to find a pratical, real-world example of this failure.)
- *
- * NOTE: This is a technology preview. The final version of this API may not bear any resenblence to this API.
- *
- * @internal ICU 4.0.1 technology preview
- */
-struct BMS;
-typedef struct BMS BMS; /**< @see BMS */
-
-/**
- * Construct a <code>MBS</code> object.
- *
- * @param ucd - A <code>UCD</code> object holding the Collator-sensitive data
- * @param pattern - the string for which to search
- * @param patternLength - the length of the string for which to search
- * @param target - the string in which to search
- * @param targetLength - the length of the string in which to search
- * @param status - will be set if any errors occur.
- *
- * @return the <code>BMS</code> object.
- *
- * Note: if on return status is set to an error, the only safe
- * thing to do with the returned object is to call
- * <code>bms_close</code>.
- *
- * @internal ICU 4.0.1 technology preview
- */
-U_INTERNAL BMS * U_EXPORT2
-bms_open(UCD *ucd,
- const UChar *pattern, int32_t patternLength,
- const UChar *target, int32_t targetLength,
- UErrorCode *status);
-
-/**
- * Close a <code>BMS</code> object and release all the
- * storage associated with it.
- *
- * @param bms - the <code>BMS</code> object to close.
- * @internal ICU 4.0.1 technology preview
- */
-U_INTERNAL void U_EXPORT2
-bms_close(BMS *bms);
-
-/**
- * Test the pattern to see if it generates any CEs.
- *
- * @param bms - the <code>BMS</code> object
- * @return <code>TRUE</code> if the pattern string did not generate any CEs
- *
- * @internal ICU 4.0.1 technology preview
- */
-U_INTERNAL UBool U_EXPORT2
-bms_empty(BMS *bms);
-
-/**
- * Get the <code>UCD</code> object used to create
- * a given <code>BMS</code> object.
- *
- * @param bms - the <code>BMS</code> object
- *
- * @return - the <code>UCD</code> object used to create
- * the given <code>BMS</code> object.
- *
- * @internal ICU 4.0.1 technology preview
- */
-U_INTERNAL UCD * U_EXPORT2
-bms_getData(BMS *bms);
-
-/**
- * Search for the pattern string in the target string.
- *
- * @param bms - the <code>BMS</code> object
- * @param offset - the offset in the target string at which to begin the search
- * @param start - will be set to the starting offset of the match, or -1 if there's no match
- * @param end - will be set to the ending offset of the match, or -1 if there's no match
- *
- * @return <code>TRUE</code> if the match succeeds, <code>FALSE</code> otherwise.
- *
- * @internal ICU 4.0.1 technology preview
- */
-U_INTERNAL UBool U_EXPORT2
-bms_search(BMS *bms, int32_t offset, int32_t *start, int32_t *end);
-
-/**
- * Set the target string for the match.
- *
- * @param bms - the <code>BMS</code> object
- * @param target - the new target string
- * @param targetLength - the length of the new target string
- * @param status - will be set if any errors occur.
- *
- * @internal ICU 4.0.1 technology preview
- */
-U_INTERNAL void U_EXPORT2
-bms_setTargetString(BMS *bms, const UChar *target, int32_t targetLength, UErrorCode *status);
-
-#endif /* U_HIDE_INTERNAL_API */
-
-#endif
-
-#endif /* _BMS_H */
diff --git a/i18n/unicode/bmsearch.h b/i18n/unicode/bmsearch.h
deleted file mode 100644
index 81e1edd..0000000
--- a/i18n/unicode/bmsearch.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- ******************************************************************************
- * Copyright (C) 1996-2011, International Business Machines *
- * Corporation and others. All Rights Reserved. *
- ******************************************************************************
- */
-
-/**
- * \file
- * \brief C++ API: Boyer-Moore StringSearch technology preview
- * \internal ICU 4.0.1 technology preview
- */
-
-#ifndef B_M_SEARCH_H
-#define B_M_SEARCH_H
-
-#include "unicode/utypes.h"
-
-#if !UCONFIG_NO_COLLATION && !UCONFIG_NO_BREAK_ITERATION
-
-#include "unicode/uobject.h"
-#include "unicode/ucol.h"
-
-#include "unicode/colldata.h"
-
-U_NAMESPACE_BEGIN
-
-class BadCharacterTable;
-class GoodSuffixTable;
-class Target;
-
-#ifndef U_HIDE_INTERNAL_API
-/**
- * BoyerMooreSearch
- *
- * This object holds the information needed to do a Collation sensitive Boyer-Moore search. It encapulates
- * the pattern, the "bad character" and "good suffix" tables, the Collator-based data needed to compute them,
- * and a reference to the text being searched.
- *
- * To do a search, you fist need to get a <code>CollData</code> object by calling <code>CollData::open</code>.
- * Then you construct a <code>BoyerMooreSearch</code> object from the <code>CollData</code> object, the pattern
- * string and the target string. Then you call the <code>search</code> method. Here's a code sample:
- *
- * <pre>
- * void boyerMooreExample(UCollator *collator, UnicodeString *pattern, UnicodeString *target)
- * {
- * UErrorCode status = U_ZERO_ERROR;
- * CollData *collData = CollData::open(collator, status);
- *
- * if (U_FAILURE(status)) {
- * // could not create a CollData object
- * return;
- * }
- *
- * BoyerMooreSearch *search = new BoyerMooreSearch(collData, *patternString, target, status);
- *
- * if (U_FAILURE(status)) {
- * // could not create a BoyerMooreSearch object
- * CollData::close(collData);
- * return;
- * }
- *
- * int32_t offset = 0, start = -1, end = -1;
- *
- * // Find all matches
- * while (search->search(offset, start, end)) {
- * // process the match between start and end
- * ...
- * // advance past the match
- * offset = end;
- * }
- *
- * // at this point, if offset == 0, there were no matches
- * if (offset == 0) {
- * // handle the case of no matches
- * }
- *
- * delete search;
- * CollData::close(collData);
- *
- * // CollData objects are cached, so the call to
- * // CollData::close doesn't delete the object.
- * // Call this if you don't need the object any more.
- * CollData::flushCollDataCache();
- * }
- * </pre>
- *
- * NOTE: This is a technology preview. The final version of this API may not bear any resenblence to this API.
- *
- * Knows linitations:
- * 1) Backwards searching has not been implemented.
- *
- * 2) For Han and Hangul characters, this code ignores any Collation tailorings. In general,
- * this isn't a problem, but in Korean locals, at strength 1, Hangul characters are tailored
- * to be equal to Han characters with the same pronounciation. Because this code ignroes
- * tailorings, searching for a Hangul character will not find a Han character and visa-versa.
- *
- * 3) In some cases, searching for a pattern that needs to be normalized and ends
- * in a discontiguous contraction may fail. The only known cases of this are with
- * the Tibetan script. For example searching for the pattern
- * "\u0F7F\u0F80\u0F81\u0F82\u0F83\u0F84\u0F85" will fail. (This case is artificial. We've
- * been unable to find a pratical, real-world example of this failure.)
- *
- * @internal ICU 4.0.1 technology preview
- *
- * @see CollData
- */
-class U_I18N_API BoyerMooreSearch : public UObject
-{
-public:
- /**
- * Construct a <code>BoyerMooreSearch</code> object.
- *
- * @param theData - A <code>CollData</code> object holding the Collator-sensitive data
- * @param patternString - the string for which to search
- * @param targetString - the string in which to search or <code>NULL</code> if youu will
- * set it later by calling <code>setTargetString</code>.
- * @param status - will be set if any errors occur.
- *
- * Note: if on return, status is set to an error code,
- * the only safe thing to do with this object is to call
- * the destructor.
- *
- * @internal ICU 4.0.1 technology preview
- */
- BoyerMooreSearch(CollData *theData, const UnicodeString &patternString, const UnicodeString *targetString, UErrorCode &status);
-
- /**
- * The desstructor
- *
- * @internal ICU 4.0.1 technology preview
- */
- ~BoyerMooreSearch();
-
- /**
- * Test the pattern to see if it generates any CEs.
- *
- * @return <code>TRUE</code> if the pattern string did not generate any CEs
- *
- * @internal ICU 4.0.1 technology preview
- */
- UBool empty();
-
- /**
- * Search for the pattern string in the target string.
- *
- * @param offset - the offset in the target string at which to begin the search
- * @param start - will be set to the starting offset of the match, or -1 if there's no match
- * @param end - will be set to the ending offset of the match, or -1 if there's no match
- *
- * @return <code>TRUE</code> if the match succeeds, <code>FALSE</code> otherwise.
- *
- * @internal ICU 4.0.1 technology preview
- */
- UBool search(int32_t offset, int32_t &start, int32_t &end);
-
- /**
- * Set the target string for the match.
- *
- * @param targetString - the new target string
- * @param status - will be set if any errors occur.
- *
- * @internal ICU 4.0.1 technology preview
- */
- void setTargetString(const UnicodeString *targetString, UErrorCode &status);
-
- // **** no longer need these? ****
- /**
- * Return the <code>CollData</code> object used for searching
- *
- * @return the <code>CollData</code> object used for searching
- *
- * @internal ICU 4.0.1 technology preview
- */
- CollData *getData();
-
- /**
- * Return the CEs generated by the pattern string.
- *
- * @return a <code>CEList</code> object holding the CEs generated by the pattern string.
- *
- * @internal ICU 4.0.1 technology preview
- */
- CEList *getPatternCEs();
-
- /**
- * Return the <code>BadCharacterTable</code> object computed for the pattern string.
- *
- * @return the <code>BadCharacterTable</code> object.
- *
- * @internal ICU 4.0.1 technology preview
- */
- BadCharacterTable *getBadCharacterTable();
-
- /**
- * Return the <code>GoodSuffixTable</code> object computed for the pattern string.
- *
- * @return the <code>GoodSuffixTable</code> object computed for the pattern string.
- *
- * @internal ICU 4.0.1 technology preview
- */
- GoodSuffixTable *getGoodSuffixTable();
-
- /**
- * UObject glue...
- * @internal ICU 4.0.1 technology preview
- */
- virtual UClassID getDynamicClassID() const;
- /**
- * UObject glue...
- * @internal ICU 4.0.1 technology preview
- */
- static UClassID getStaticClassID();
-
-private:
- CollData *data;
- CEList *patCEs;
- BadCharacterTable *badCharacterTable;
- GoodSuffixTable *goodSuffixTable;
- UnicodeString pattern;
- Target *target;
-};
-#endif /* U_HIDE_INTERNAL_API */
-
-U_NAMESPACE_END
-
-#endif // #if !UCONFIG_NO_COLLATION
-#endif // #ifndef B_M_SEARCH_H
diff --git a/i18n/unicode/calendar.h b/i18n/unicode/calendar.h
index 6852d6c..af34856 100644
--- a/i18n/unicode/calendar.h
+++ b/i18n/unicode/calendar.h
@@ -1,6 +1,6 @@
/*
********************************************************************************
-* Copyright (C) 1997-2012, International Business Machines
+* Copyright (C) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@@ -898,7 +898,6 @@
*/
UBool isLenient(void) const;
-#ifndef U_HIDE_DRAFT_API
/**
* Sets the behavior for handling wall time repeating multiple times
* at negative time zone offset transitions. For example, 1:30 AM on
@@ -917,7 +916,7 @@
* @param option the behavior for handling repeating wall time, either
* <code>UCAL_WALLTIME_FIRST</code> or <code>UCAL_WALLTIME_LAST</code>.
* @see #getRepeatedWallTimeOption
- * @draft ICU 49
+ * @stable ICU 49
*/
void setRepeatedWallTimeOption(UCalendarWallTimeOption option);
@@ -928,7 +927,7 @@
* @return the behavior for handling repeating wall time, either
* <code>UCAL_WALLTIME_FIRST</code> or <code>UCAL_WALLTIME_LAST</code>.
* @see #setRepeatedWallTimeOption
- * @draft ICU 49
+ * @stable ICU 49
*/
UCalendarWallTimeOption getRepeatedWallTimeOption(void) const;
@@ -951,7 +950,7 @@
* <code>UCAL_WALLTIME_NEXT_VALID</code>.
* @see #getSkippedWallTimeOption
*
- * @draft ICU 49
+ * @stable ICU 49
*/
void setSkippedWallTimeOption(UCalendarWallTimeOption option);
@@ -963,10 +962,9 @@
* <code>UCAL_WALLTIME_FIRST</code>, <code>UCAL_WALLTIME_LAST</code>
* and <code>UCAL_WALLTIME_NEXT_VALID</code>.
* @see #setSkippedWallTimeOption
- * @draft ICU 49
+ * @stable ICU 49
*/
UCalendarWallTimeOption getSkippedWallTimeOption(void) const;
-#endif /* U_HIDE_DRAFT_API */
#ifndef U_HIDE_DEPRECATED_API
/**
@@ -1371,7 +1369,7 @@
* \endcode
*
* @return legacy calendar type name string
- * @draft ICU 49
+ * @stable ICU 49
*/
virtual const char * getType() const = 0;
@@ -1607,11 +1605,13 @@
* @internal
*/
enum ELimitType {
+#ifndef U_HIDE_INTERNAL_API
UCAL_LIMIT_MINIMUM = 0,
UCAL_LIMIT_GREATEST_MINIMUM,
UCAL_LIMIT_LEAST_MAXIMUM,
UCAL_LIMIT_MAXIMUM,
UCAL_LIMIT_COUNT
+#endif /* U_HIDE_INTERNAL_API */
};
/**
diff --git a/i18n/unicode/compactdecimalformat.h b/i18n/unicode/compactdecimalformat.h
new file mode 100644
index 0000000..91cf751
--- /dev/null
+++ b/i18n/unicode/compactdecimalformat.h
@@ -0,0 +1,333 @@
+/*
+********************************************************************************
+* Copyright (C) 2012-2013, International Business Machines
+* Corporation and others. All Rights Reserved.
+********************************************************************************
+*
+* File COMPACTDECIMALFORMAT.H
+********************************************************************************
+*/
+
+#ifndef __COMPACT_DECIMAL_FORMAT_H__
+#define __COMPACT_DECIMAL_FORMAT_H__
+
+#include "unicode/utypes.h"
+/**
+ * \file
+ * \brief C++ API: Formats decimal numbers in compact form.
+ */
+
+#if !UCONFIG_NO_FORMATTING
+#ifndef U_HIDE_DRAFT_API
+
+#include "unicode/decimfmt.h"
+
+struct UHashtable;
+
+U_NAMESPACE_BEGIN
+
+class PluralRules;
+
+/**
+ * The CompactDecimalFormat produces abbreviated numbers, suitable for display in
+ * environments will limited real estate. For example, 'Hits: 1.2B' instead of
+ * 'Hits: 1,200,000,000'. The format will be appropriate for the given language,
+ * such as "1,2 Mrd." for German.
+ * <p>
+ * For numbers under 1000 trillion (under 10^15, such as 123,456,789,012,345),
+ * the result will be short for supported languages. However, the result may
+ * sometimes exceed 7 characters, such as when there are combining marks or thin
+ * characters. In such cases, the visual width in fonts should still be short.
+ * <p>
+ * By default, there are 3 significant digits. After creation, if more than
+ * three significant digits are set (with setMaximumSignificantDigits), or if a
+ * fixed number of digits are set (with setMaximumIntegerDigits or
+ * setMaximumFractionDigits), then result may be wider.
+ * <p>
+ * At this time, parsing is not supported, and will produce a U_UNSUPPORTED_ERROR.
+ * Resetting the pattern prefixes or suffixes is not supported; the method calls
+ * are ignored.
+ * <p>
+ * @draft ICU 51
+ */
+class U_I18N_API CompactDecimalFormat : public DecimalFormat {
+public:
+
+ /**
+ * Returns a compact decimal instance for specified locale.
+ * @param inLocale the given locale.
+ * @param style whether to use short or long style.
+ * @param status error code returned here.
+ * @draft ICU 51
+ */
+ static CompactDecimalFormat* U_EXPORT2 createInstance(
+ const Locale& inLocale, UNumberCompactStyle style, UErrorCode& status);
+
+ /**
+ * Copy constructor.
+ *
+ * @param source the DecimalFormat object to be copied from.
+ * @draft ICU 51
+ */
+ CompactDecimalFormat(const CompactDecimalFormat& source);
+
+ /**
+ * Destructor.
+ * @draft ICU 51
+ */
+ virtual ~CompactDecimalFormat();
+
+ /**
+ * Assignment operator.
+ *
+ * @param rhs the DecimalFormat object to be copied.
+ * @draft ICU 51
+ */
+ CompactDecimalFormat& operator=(const CompactDecimalFormat& rhs);
+
+ /**
+ * Clone this Format object polymorphically. The caller owns the
+ * result and should delete it when done.
+ *
+ * @return a polymorphic copy of this CompactDecimalFormat.
+ * @draft ICU 51
+ */
+ virtual Format* clone() const;
+
+ /**
+ * Return TRUE if the given Format objects are semantically equal.
+ * Objects of different subclasses are considered unequal.
+ *
+ * @param other the object to be compared with.
+ * @return TRUE if the given Format objects are semantically equal.
+ * @draft ICU 51
+ */
+ virtual UBool operator==(const Format& other) const;
+
+
+ using DecimalFormat::format;
+
+ /**
+ * Format a double or long number using base-10 representation.
+ *
+ * @param number The value to be formatted.
+ * @param appendTo Output parameter to receive result.
+ * Result is appended to existing contents.
+ * @param pos On input: an alignment field, if desired.
+ * On output: the offsets of the alignment field.
+ * @return Reference to 'appendTo' parameter.
+ * @draft ICU 51
+ */
+ virtual UnicodeString& format(double number,
+ UnicodeString& appendTo,
+ FieldPosition& pos) const;
+
+ /**
+ * Format a double or long number using base-10 representation.
+ * Currently sets status to U_UNSUPPORTED_ERROR.
+ *
+ * @param number The value to be formatted.
+ * @param appendTo Output parameter to receive result.
+ * Result is appended to existing contents.
+ * @param posIter On return, can be used to iterate over positions
+ * of fields generated by this format call.
+ * Can be NULL.
+ * @param status Output param filled with success/failure status.
+ * @return Reference to 'appendTo' parameter.
+ * @internal
+ */
+ virtual UnicodeString& format(double number,
+ UnicodeString& appendTo,
+ FieldPositionIterator* posIter,
+ UErrorCode& status) const;
+
+ /**
+ * Format an int64 number using base-10 representation.
+ *
+ * @param number The value to be formatted.
+ * @param appendTo Output parameter to receive result.
+ * Result is appended to existing contents.
+ * @param pos On input: an alignment field, if desired.
+ * On output: the offsets of the alignment field.
+ * @return Reference to 'appendTo' parameter.
+ * @draft ICU 51
+ */
+ virtual UnicodeString& format(int64_t number,
+ UnicodeString& appendTo,
+ FieldPosition& pos) const;
+
+ /**
+ * Format an int64 number using base-10 representation.
+ * Currently sets status to U_UNSUPPORTED_ERROR
+ *
+ * @param number The value to be formatted.
+ * @param appendTo Output parameter to receive result.
+ * Result is appended to existing contents.
+ * @param posIter On return, can be used to iterate over positions
+ * of fields generated by this format call.
+ * Can be NULL.
+ * @param status Output param filled with success/failure status.
+ * @return Reference to 'appendTo' parameter.
+ * @internal
+ */
+ virtual UnicodeString& format(int64_t number,
+ UnicodeString& appendTo,
+ FieldPositionIterator* posIter,
+ UErrorCode& status) const;
+
+ /**
+ * Format a decimal number. Currently sets status to U_UNSUPPORTED_ERROR
+ * The syntax of the unformatted number is a "numeric string"
+ * as defined in the Decimal Arithmetic Specification, available at
+ * http://speleotrove.com/decimal
+ *
+ * @param number The unformatted number, as a string.
+ * @param appendTo Output parameter to receive result.
+ * Result is appended to existing contents.
+ * @param posIter On return, can be used to iterate over positions
+ * of fields generated by this format call.
+ * Can be NULL.
+ * @param status Output param filled with success/failure status.
+ * @return Reference to 'appendTo' parameter.
+ * @internal
+ */
+ virtual UnicodeString& format(const StringPiece &number,
+ UnicodeString& appendTo,
+ FieldPositionIterator* posIter,
+ UErrorCode& status) const;
+
+ /**
+ * Format a decimal number. Currently sets status to U_UNSUPPORTED_ERROR
+ * The number is a DigitList wrapper onto a floating point decimal number.
+ * The default implementation in NumberFormat converts the decimal number
+ * to a double and formats that.
+ *
+ * @param number The number, a DigitList format Decimal Floating Point.
+ * @param appendTo Output parameter to receive result.
+ * Result is appended to existing contents.
+ * @param posIter On return, can be used to iterate over positions
+ * of fields generated by this format call.
+ * @param status Output param filled with success/failure status.
+ * @return Reference to 'appendTo' parameter.
+ * @internal
+ */
+ virtual UnicodeString& format(const DigitList &number,
+ UnicodeString& appendTo,
+ FieldPositionIterator* posIter,
+ UErrorCode& status) const;
+
+ /**
+ * Format a decimal number. Currently sets status to U_UNSUPPORTED_ERROR.
+ * The number is a DigitList wrapper onto a floating point decimal number.
+ * The default implementation in NumberFormat converts the decimal number
+ * to a double and formats that.
+ *
+ * @param number The number, a DigitList format Decimal Floating Point.
+ * @param appendTo Output parameter to receive result.
+ * Result is appended to existing contents.
+ * @param pos On input: an alignment field, if desired.
+ * On output: the offsets of the alignment field.
+ * @param status Output param filled with success/failure status.
+ * @return Reference to 'appendTo' parameter.
+ * @internal
+ */
+ virtual UnicodeString& format(const DigitList &number,
+ UnicodeString& appendTo,
+ FieldPosition& pos,
+ UErrorCode& status) const;
+
+ /**
+ * CompactDecimalFormat does not support parsing. This implementation
+ * does nothing.
+ * @param text Unused.
+ * @param result Does not change.
+ * @param parsePosition Does not change.
+ * @see Formattable
+ * @draft ICU 51
+ */
+ virtual void parse(const UnicodeString& text,
+ Formattable& result,
+ ParsePosition& parsePosition) const;
+
+ /**
+ * CompactDecimalFormat does not support parsing. This implementation
+ * sets status to U_UNSUPPORTED_ERROR
+ *
+ * @param text Unused.
+ * @param result Does not change.
+ * @param status Always set to U_UNSUPPORTED_ERROR.
+ * @draft ICU 51
+ */
+ virtual void parse(const UnicodeString& text,
+ Formattable& result,
+ UErrorCode& status) const;
+
+/* Cannot use #ifndef U_HIDE_INTERNAL_API for the following draft method since it is virtual */
+ /**
+ * Parses text from the given string as a currency amount. Unlike
+ * the parse() method, this method will attempt to parse a generic
+ * currency name, searching for a match of this object's locale's
+ * currency display names, or for a 3-letter ISO currency code.
+ * This method will fail if this format is not a currency format,
+ * that is, if it does not contain the currency pattern symbol
+ * (U+00A4) in its prefix or suffix. This implementation always returns
+ * NULL.
+ *
+ * @param text the string to parse
+ * @param pos input-output position; on input, the position within text
+ * to match; must have 0 <= pos.getIndex() < text.length();
+ * on output, the position after the last matched character.
+ * If the parse fails, the position in unchanged upon output.
+ * @return if parse succeeds, a pointer to a newly-created CurrencyAmount
+ * object (owned by the caller) containing information about
+ * the parsed currency; if parse fails, this is NULL.
+ * @internal
+ */
+ virtual CurrencyAmount* parseCurrency(const UnicodeString& text,
+ ParsePosition& pos) const;
+
+ /**
+ * Return the class ID for this class. This is useful only for
+ * comparing to a return value from getDynamicClassID(). For example:
+ * <pre>
+ * . Base* polymorphic_pointer = createPolymorphicObject();
+ * . if (polymorphic_pointer->getDynamicClassID() ==
+ * . Derived::getStaticClassID()) ...
+ * </pre>
+ * @return The class ID for all objects of this class.
+ * @draft ICU 51
+ */
+ static UClassID U_EXPORT2 getStaticClassID();
+
+ /**
+ * Returns a unique class ID POLYMORPHICALLY. Pure virtual override.
+ * This method is to implement a simple version of RTTI, since not all
+ * C++ compilers support genuine RTTI. Polymorphic operator==() and
+ * clone() methods call this method.
+ *
+ * @return The class ID for this object. All objects of a
+ * given class have the same class ID. Objects of
+ * other classes have different class IDs.
+ * @draft ICU 51
+ */
+ virtual UClassID getDynamicClassID() const;
+
+private:
+
+ const UHashtable* _unitsByVariant;
+ const double* _divisors;
+ PluralRules* _pluralRules;
+
+ // Default constructor not implemented.
+ CompactDecimalFormat(const DecimalFormat &, const UHashtable* unitsByVariant, const double* divisors, PluralRules* pluralRules);
+
+ UBool eqHelper(const CompactDecimalFormat& that) const;
+};
+
+U_NAMESPACE_END
+
+#endif /* U_HIDE_DRAFT_API */
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
+#endif // __COMPACT_DECIMAL_FORMAT_H__
+//eof
diff --git a/i18n/unicode/dcfmtsym.h b/i18n/unicode/dcfmtsym.h
index 9243957..0faa2e4 100644
--- a/i18n/unicode/dcfmtsym.h
+++ b/i18n/unicode/dcfmtsym.h
@@ -1,6 +1,6 @@
/*
********************************************************************************
-* Copyright (C) 1997-2012, International Business Machines
+* Copyright (C) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@@ -408,7 +408,6 @@
return *strPtr;
}
-#ifndef U_HIDE_INTERNAL_API
inline const UnicodeString &
DecimalFormatSymbols::getConstSymbol(ENumberFormatSymbol symbol) const {
const UnicodeString *strPtr;
@@ -419,7 +418,6 @@
}
return *strPtr;
}
-#endif
// -------------------------------------
@@ -450,12 +448,10 @@
return locale;
}
-#ifndef U_HIDE_INTERNAL_API
inline const UChar*
DecimalFormatSymbols::getCurrencyPattern() const {
return currPattern;
}
-#endif
U_NAMESPACE_END
diff --git a/i18n/unicode/decimfmt.h b/i18n/unicode/decimfmt.h
index 5811f9b..d5a6852 100644
--- a/i18n/unicode/decimfmt.h
+++ b/i18n/unicode/decimfmt.h
@@ -1,6 +1,6 @@
/*
********************************************************************************
-* Copyright (C) 1997-2012, International Business Machines
+* Copyright (C) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@@ -17,7 +17,8 @@
* 07/10/97 helena Made ParsePosition a class and get rid of the function
* hiding problems.
* 09/09/97 aliu Ported over support for exponential formats.
-* 07/20/98 stephen Changed documentation
+* 07/20/98 stephen Changed documentation
+* 01/30/13 emmons Added Scaling methods
********************************************************************************
*/
@@ -40,6 +41,7 @@
#include "unicode/curramt.h"
#include "unicode/enumset.h"
+#ifndef U_HIDE_INTERNAL_API
/**
* \def UNUM_DECIMALFORMAT_INTERNAL_SIZE
* @internal
@@ -47,6 +49,7 @@
#if UCONFIG_FORMAT_FASTPATHS_49
#define UNUM_DECIMALFORMAT_INTERNAL_SIZE 16
#endif
+#endif /* U_HIDE_INTERNAL_API */
U_NAMESPACE_BEGIN
@@ -757,13 +760,22 @@
* @param style style of decimal format
* @param status Output param set to success/failure code. If the
* pattern is invalid this will be set to a failure code.
- * @internal ICU 4.2
+ * @internal
*/
DecimalFormat( const UnicodeString& pattern,
DecimalFormatSymbols* symbolsToAdopt,
UNumberFormatStyle style,
UErrorCode& status);
+#if UCONFIG_HAVE_PARSEALLINPUT
+ /**
+ * @internal
+ */
+ void setParseAllInput(UNumberFormatAttributeValue value);
+#endif
+
+#endif /* U_HIDE_INTERNAL_API */
+
/**
* Set an integer attribute on this DecimalFormat.
@@ -772,8 +784,8 @@
* @param attr the attribute to set
* @param newvalue new value
* @param status the error type
- * @return *this - for chaining
- * @internal ICU 50
+ * @return *this - for chaining (example: format.setAttribute(...).setAttribute(...) )
+ * @draft ICU 51
*/
virtual DecimalFormat& setAttribute( UNumberFormatAttribute attr,
int32_t newvalue,
@@ -786,19 +798,12 @@
* @param attr the attribute to set
* @param status the error type
* @return the attribute value. Undefined if there is an error.
- * @internal ICU 50
+ * @draft ICU 51
*/
virtual int32_t getAttribute( UNumberFormatAttribute attr,
UErrorCode &status) const;
-#if UCONFIG_HAVE_PARSEALLINPUT
- /**
- * @internal
- */
- void setParseAllInput(UNumberFormatAttributeValue value);
-#endif
-#endif /* U_HIDE_INTERNAL_API */
/**
* Create a DecimalFormat from the given pattern and symbols.
@@ -1208,7 +1213,6 @@
Formattable& result,
UErrorCode& status) const;
-/* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */
/**
* Parses text from the given string as a currency amount. Unlike
* the parse() method, this method will attempt to parse a generic
@@ -1226,7 +1230,7 @@
* @return if parse succeeds, a pointer to a newly-created CurrencyAmount
* object (owned by the caller) containing information about
* the parsed currency; if parse fails, this is NULL.
- * @draft ICU 49
+ * @stable ICU 49
*/
virtual CurrencyAmount* parseCurrency(const UnicodeString& text,
ParsePosition& pos) const;
@@ -2234,6 +2238,7 @@
ChoiceFormat* fCurrencyChoice;
DigitList * fMultiplier; // NULL for multiplier of one
+ int32_t fScale;
int32_t fGroupingSize;
int32_t fGroupingSize2;
UBool fDecimalSeparatorAlwaysShown;
@@ -2377,6 +2382,14 @@
protected:
+#ifndef U_HIDE_INTERNAL_API
+ /**
+ * Rounds a value according to the rules of this object.
+ * @internal
+ */
+ DigitList& _round(const DigitList& number, DigitList& adjustedNum, UBool& isNegative, UErrorCode& status) const;
+#endif /* U_HIDE_INTERNAL_API */
+
/**
* Returns the currency in effect for this formatter. Subclasses
* should override this method as needed. Unlike getCurrency(),
@@ -2447,14 +2460,11 @@
return format((int64_t)number, appendTo, pos);
}
-#ifndef U_HIDE_INTERNAL_API
inline const UnicodeString &
DecimalFormat::getConstSymbol(DecimalFormatSymbols::ENumberFormatSymbol symbol) const {
return fSymbols->getConstSymbol(symbol);
}
-#endif
-
U_NAMESPACE_END
#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/i18n/unicode/dtfmtsym.h b/i18n/unicode/dtfmtsym.h
index f6ba1de..e246bdf 100644
--- a/i18n/unicode/dtfmtsym.h
+++ b/i18n/unicode/dtfmtsym.h
@@ -1,6 +1,6 @@
/*
********************************************************************************
-* Copyright (C) 1997-2012, International Business Machines
+* Copyright (C) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@@ -283,7 +283,16 @@
ABBREVIATED,
WIDE,
NARROW,
- DT_WIDTH_COUNT
+#ifndef U_HIDE_DRAFT_API
+ /**
+ * Short width is currently only supported for weekday names.
+ * @draft ICU 51
+ */
+ SHORT,
+#endif /* U_HIDE_DRAFT_API */
+ /**
+ */
+ DT_WIDTH_COUNT = 4
};
/**
@@ -308,7 +317,7 @@
void setMonths(const UnicodeString* months, int32_t count, DtContextType context, DtWidthType width);
/**
- * Gets weekday strings. For example: "Sunday", "Monday", etc.
+ * Gets wide weekday strings. For example: "Sunday", "Monday", etc.
* @param count Filled in with length of the array.
* @return the weekday strings. (DateFormatSymbols retains ownership.)
* @stable ICU 2.0
@@ -317,7 +326,7 @@
/**
- * Sets weekday strings. For example: "Sunday", "Monday", etc.
+ * Sets wide weekday strings. For example: "Sunday", "Monday", etc.
* @param weekdays the new weekday strings. (not adopted; caller retains ownership)
* @param count Filled in with length of the array.
* @stable ICU 2.0
@@ -325,26 +334,28 @@
void setWeekdays(const UnicodeString* weekdays, int32_t count);
/**
- * Gets short weekday strings. For example: "Sun", "Mon", etc.
+ * Gets abbreviated weekday strings. For example: "Sun", "Mon", etc. (Note: The method name is
+ * misleading; it does not get the CLDR-style "short" weekday strings, e.g. "Su", "Mo", etc.)
* @param count Filled in with length of the array.
- * @return the short weekday strings. (DateFormatSymbols retains ownership.)
+ * @return the abbreviated weekday strings. (DateFormatSymbols retains ownership.)
* @stable ICU 2.0
*/
const UnicodeString* getShortWeekdays(int32_t& count) const;
/**
- * Sets short weekday strings. For example: "Sun", "Mon", etc.
- * @param shortWeekdays the new short weekday strings. (not adopted; caller retains ownership)
- * @param count Filled in with length of the array.
+ * Sets abbreviated weekday strings. For example: "Sun", "Mon", etc. (Note: The method name is
+ * misleading; it does not set the CLDR-style "short" weekday strings, e.g. "Su", "Mo", etc.)
+ * @param abbrevWeekdays the new abbreviated weekday strings. (not adopted; caller retains ownership)
+ * @param count Filled in with length of the array.
* @stable ICU 2.0
*/
- void setShortWeekdays(const UnicodeString* shortWeekdays, int32_t count);
+ void setShortWeekdays(const UnicodeString* abbrevWeekdays, int32_t count);
/**
* Gets weekday strings by width and context. For example: "Sunday", "Monday", etc.
* @param count Filled in with length of the array.
* @param context The formatting context, either FORMAT or STANDALONE
- * @param width The width of returned strings, either WIDE, ABBREVIATED, or NARROW
+ * @param width The width of returned strings, either WIDE, ABBREVIATED, SHORT, or NARROW
* @return the month strings. (DateFormatSymbols retains ownership.)
* @stable ICU 3.4
*/
@@ -355,7 +366,7 @@
* @param weekdays The new weekday strings. (not adopted; caller retains ownership)
* @param count Filled in with length of the array.
* @param context The formatting context, either FORMAT or STANDALONE
- * @param width The width of returned strings, either WIDE, ABBREVIATED, or NARROW
+ * @param width The width of returned strings, either WIDE, ABBREVIATED, SHORT, or NARROW
* @stable ICU 3.6
*/
void setWeekdays(const UnicodeString* weekdays, int32_t count, DtContextType context, DtWidthType width);
@@ -593,36 +604,48 @@
int32_t fStandaloneNarrowMonthsCount;
/**
- * Weekday strings. For example: "Sunday", "Monday", etc.
+ * CLDR-style format wide weekday strings. For example: "Sunday", "Monday", etc.
*/
UnicodeString* fWeekdays;
int32_t fWeekdaysCount;
/**
- * Short weekday strings. For example: "Sun", "Mon", etc.
+ * CLDR-style format abbreviated (not short) weekday strings. For example: "Sun", "Mon", etc.
*/
UnicodeString* fShortWeekdays;
int32_t fShortWeekdaysCount;
/**
- * Narrow weekday strings. For example: "Sun", "Mon", etc.
+ * CLDR-style format short weekday strings. For example: "Su", "Mo", etc.
+ */
+ UnicodeString* fShorterWeekdays;
+ int32_t fShorterWeekdaysCount;
+
+ /**
+ * CLDR-style format narrow weekday strings. For example: "S", "M", etc.
*/
UnicodeString* fNarrowWeekdays;
int32_t fNarrowWeekdaysCount;
/**
- * Standalone Weekday strings. For example: "Sunday", "Monday", etc.
+ * CLDR-style standalone wide weekday strings. For example: "Sunday", "Monday", etc.
*/
UnicodeString* fStandaloneWeekdays;
int32_t fStandaloneWeekdaysCount;
/**
- * Standalone Short weekday strings. For example: "Sun", "Mon", etc.
+ * CLDR-style standalone abbreviated (not short) weekday strings. For example: "Sun", "Mon", etc.
*/
UnicodeString* fStandaloneShortWeekdays;
int32_t fStandaloneShortWeekdaysCount;
/**
+ * CLDR-style standalone short weekday strings. For example: "Su", "Mo", etc.
+ */
+ UnicodeString* fStandaloneShorterWeekdays;
+ int32_t fStandaloneShorterWeekdaysCount;
+
+ /**
* Standalone Narrow weekday strings. For example: "Sun", "Mon", etc.
*/
UnicodeString* fStandaloneNarrowWeekdays;
@@ -719,15 +742,12 @@
*/
UnicodeString fLocalPatternChars;
-#ifndef U_HIDE_INTERNAL_API
/**
* Capitalization transforms. For each usage type, the first array element indicates
* whether to titlecase for uiListOrMenu context, the second indicates whether to
* titlecase for stand-alone context.
*/
UBool fCapitalization[kCapContextUsageTypeCount][2];
-#endif
-
private:
/** valid/actual locale information
diff --git a/i18n/unicode/fmtable.h b/i18n/unicode/fmtable.h
index 91cc85f..7959d38 100644
--- a/i18n/unicode/fmtable.h
+++ b/i18n/unicode/fmtable.h
@@ -1,6 +1,6 @@
/*
********************************************************************************
-* Copyright (C) 1997-2012, International Business Machines
+* Copyright (C) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@@ -31,6 +31,7 @@
class CharString;
class DigitList;
+#ifndef U_HIDE_INTERNAL_API
/**
* \def UNUM_INTERNAL_STACKARRAY_SIZE
* @internal
@@ -40,6 +41,7 @@
#else
#define UNUM_INTERNAL_STACKARRAY_SIZE 128
#endif
+#endif /* U_HIDE_INTERNAL_API */
/**
* Formattable objects can be passed to the Format class or
@@ -683,11 +685,9 @@
return *fValue.fString;
}
-#ifndef U_HIDE_DEPRECATED_API
inline int32_t Formattable::getLong(UErrorCode* status) const {
return getLong(*status);
}
-#endif
U_NAMESPACE_END
diff --git a/i18n/unicode/fpositer.h b/i18n/unicode/fpositer.h
index 09ce92f..704386d 100644
--- a/i18n/unicode/fpositer.h
+++ b/i18n/unicode/fpositer.h
@@ -1,6 +1,6 @@
/*
********************************************************************************
-* Copyright (C) 2010, International Business Machines
+* Copyright (C) 2010-2012, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@@ -119,9 +119,6 @@
UVector32 *data;
int32_t pos;
-
- // No ICU "poor man's RTTI" for this class nor its subclasses.
- virtual UClassID getDynamicClassID() const;
};
U_NAMESPACE_END
diff --git a/i18n/unicode/gender.h b/i18n/unicode/gender.h
index 3b2ad00..4b52ffd 100644
--- a/i18n/unicode/gender.h
+++ b/i18n/unicode/gender.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2008-2012, International Business Machines Corporation and
+* Copyright (C) 2008-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
@@ -19,6 +19,7 @@
#include "unicode/utypes.h"
#if !UCONFIG_NO_FORMATTING
+#ifndef U_HIDE_DRAFT_API
#include "unicode/locid.h"
#include "unicode/ugender.h"
@@ -69,19 +70,12 @@
* Destructor.
*
* @draft ICU 50
- * @internal
*/
virtual ~GenderInfo();
private:
int32_t _style;
-
- /**
- * No "poor man's RTTI"
- */
- virtual UClassID getDynamicClassID() const;
-
/**
* Copy constructor. One object per locale invariant. Clients
* must never copy GenderInfo objects.
@@ -107,6 +101,7 @@
U_NAMESPACE_END
+#endif /* U_HIDE_DRAFT_API */
#endif /* #if !UCONFIG_NO_FORMATTING */
#endif // _GENDER
diff --git a/i18n/unicode/gregocal.h b/i18n/unicode/gregocal.h
index 3a61839..f50cc82 100644
--- a/i18n/unicode/gregocal.h
+++ b/i18n/unicode/gregocal.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 1997-2012, International Business Machines Corporation and others.
+* Copyright (C) 1997-2013, International Business Machines Corporation and others.
* All Rights Reserved.
********************************************************************************
*
@@ -468,7 +468,6 @@
*/
static UClassID U_EXPORT2 getStaticClassID(void);
-/* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */
/**
* Returns the calendar type name string for this Calendar object.
* The returned string is the legacy ICU calendar attribute value,
@@ -477,7 +476,7 @@
* For more details see the Calendar::getType() documentation.
*
* @return legacy calendar type name string
- * @draft ICU 49
+ * @stable ICU 49
*/
virtual const char * getType() const;
diff --git a/i18n/unicode/locdspnm.h b/i18n/unicode/locdspnm.h
index cdd2bb8..114b0c7 100644
--- a/i18n/unicode/locdspnm.h
+++ b/i18n/unicode/locdspnm.h
@@ -61,7 +61,7 @@
static LocaleDisplayNames* U_EXPORT2 createInstance(const Locale& locale,
UDialectHandling dialectHandling);
-#ifndef U_HIDE_INTERNAL_API
+#ifndef U_HIDE_DRAFT_API
/**
* Returns an instance of LocaleDisplayNames that returns names formatted
* for the provided locale, using the provided UDisplayContext settings.
@@ -71,11 +71,11 @@
* handling, capitalization, etc.
* @param length Number of items in the contexts list
* @return a LocaleDisplayNames instance
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
static LocaleDisplayNames* U_EXPORT2 createInstance(const Locale& locale,
UDisplayContext *contexts, int32_t length);
-#endif /* U_HIDE_INTERNAL_API */
+#endif /* U_HIDE_DRAFT_API */
// getters for state
/**
@@ -97,7 +97,7 @@
* Returns the UDisplayContext value for the specified UDisplayContextType.
* @param type the UDisplayContextType whose value to return
* @return the UDisplayContext for the specified type.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
virtual UDisplayContext getContext(UDisplayContextType type) const = 0;
@@ -193,10 +193,6 @@
*/
virtual UnicodeString& keyValueDisplayName(const char* key, const char* value,
UnicodeString& result) const = 0;
-
-private:
- // No ICU "poor man's RTTI" for this class nor its subclasses.
- virtual UClassID getDynamicClassID() const;
};
inline LocaleDisplayNames* LocaleDisplayNames::createInstance(const Locale& locale) {
diff --git a/i18n/unicode/msgfmt.h b/i18n/unicode/msgfmt.h
index 60ba153..7090dd5 100644
--- a/i18n/unicode/msgfmt.h
+++ b/i18n/unicode/msgfmt.h
@@ -1071,6 +1071,7 @@
*/
class U_I18N_API DummyFormat : public Format {
public:
+ using Format::format;
virtual UBool operator==(const Format&) const;
virtual Format* clone() const;
virtual UnicodeString& format(const Formattable& obj,
@@ -1087,7 +1088,6 @@
virtual void parseObject(const UnicodeString&,
Formattable&,
ParsePosition&) const;
- virtual UClassID getDynamicClassID() const;
};
friend class MessageFormatAdapter; // getFormatTypeList() access
diff --git a/i18n/unicode/numfmt.h b/i18n/unicode/numfmt.h
index 235128e..86d2b5b 100644
--- a/i18n/unicode/numfmt.h
+++ b/i18n/unicode/numfmt.h
@@ -1,6 +1,6 @@
/*
********************************************************************************
-* Copyright (C) 1997-2012, International Business Machines Corporation and others.
+* Copyright (C) 1997-2013, International Business Machines Corporation and others.
* All Rights Reserved.
********************************************************************************
*
@@ -71,6 +71,9 @@
* cout << " Example 1: " << myString << endl;
* \endcode
* </pre>
+ * Note that there are additional factory methods within subclasses of
+ * NumberFormat.
+ * <P>
* If you are formatting multiple numbers, it is more efficient to get
* the format and use it multiple times so that the system doesn't
* have to fetch the information about the local language and country
@@ -620,7 +623,6 @@
Formattable& result,
UErrorCode& status) const;
-/* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */
/**
* Parses text from the given string as a currency amount. Unlike
* the parse() method, this method will attempt to parse a generic
@@ -638,7 +640,7 @@
* @return if parse succeeds, a pointer to a newly-created CurrencyAmount
* object (owned by the caller) containing information about
* the parsed currency; if parse fails, this is NULL.
- * @draft ICU 49
+ * @stable ICU 49
*/
virtual CurrencyAmount* parseCurrency(const UnicodeString& text,
ParsePosition& pos) const;
@@ -983,6 +985,19 @@
*/
virtual void getEffectiveCurrency(UChar* result, UErrorCode& ec) const;
+#ifndef U_HIDE_INTERNAL_API
+ /**
+ * Creates the specified number format style of the desired locale.
+ * If mustBeDecimalFormat is TRUE, then the returned pointer is
+ * either a DecimalFormat or it is NULL.
+ * @internal
+ */
+ static NumberFormat* makeInstance(const Locale& desiredLocale,
+ UNumberFormatStyle style,
+ UBool mustBeDecimalFormat,
+ UErrorCode& errorCode);
+#endif /* U_HIDE_INTERNAL_API */
+
private:
static UBool isStyleSupported(UNumberFormatStyle style);
diff --git a/i18n/unicode/numsys.h b/i18n/unicode/numsys.h
index cb855a8..e986eac 100644
--- a/i18n/unicode/numsys.h
+++ b/i18n/unicode/numsys.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2010-2011, International Business Machines Corporation and
+* Copyright (C) 2010-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
@@ -16,14 +16,17 @@
#ifndef NUMSYS
#define NUMSYS
+#include "unicode/utypes.h"
+
+#ifndef U_HIDE_INTERNAL_API
/**
* \def NUMSYS_NAME_CAPACITY
* Size of a numbering system name.
* @internal
*/
#define NUMSYS_NAME_CAPACITY 8
+#endif /* U_HIDE_INTERNAL_API */
-#include "unicode/utypes.h"
/**
* \file
@@ -122,14 +125,12 @@
*/
int32_t getRadix();
-#ifndef U_HIDE_DRAFT_API
/**
* Returns the name of this numbering system if it was created using one of the predefined names
* known to ICU. Otherwise, returns NULL.
- * @draft ICU 4.6
+ * @stable ICU 4.6
*/
const char * getName();
-#endif /* U_HIDE_DRAFT_API */
/**
* Returns the description string of this numbering system, which is either
diff --git a/i18n/unicode/plurfmt.h b/i18n/unicode/plurfmt.h
index afe3a93..0e45b0b 100644
--- a/i18n/unicode/plurfmt.h
+++ b/i18n/unicode/plurfmt.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2007-2012, International Business Machines Corporation and
+* Copyright (C) 2007-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
@@ -192,6 +192,7 @@
*/
PluralFormat(const Locale& locale, const PluralRules& rules, UErrorCode& status);
+#ifndef U_HIDE_DRAFT_API
/**
* Creates a new <code>PluralFormat</code> for the plural type.
* The standard number formatting will be done using the given locale.
@@ -203,6 +204,7 @@
* @draft ICU 50
*/
PluralFormat(const Locale& locale, UPluralType type, UErrorCode& status);
+#endif /* U_HIDE_DRAFT_API */
/**
* Creates a new cardinal-number <code>PluralFormat</code> for a given pattern string.
@@ -266,6 +268,7 @@
const UnicodeString& pattern,
UErrorCode& status);
+#ifndef U_HIDE_DRAFT_API
/**
* Creates a new <code>PluralFormat</code> for a plural type, a
* pattern and a locale.
@@ -283,6 +286,7 @@
UPluralType type,
const UnicodeString& pattern,
UErrorCode& status);
+#endif /* U_HIDE_DRAFT_API */
/**
* copy constructor.
@@ -383,6 +387,7 @@
FieldPosition& pos,
UErrorCode& status) const;
+#ifndef U_HIDE_DEPRECATED_API
/**
* Sets the locale used by this <code>PluraFormat</code> object.
* Note: Calling this method resets this <code>PluraFormat</code> object,
@@ -399,6 +404,7 @@
* use one of the constructors to create a new instance instead.
*/
void setLocale(const Locale& locale, UErrorCode& status);
+#endif /* U_HIDE_DEPRECATED_API */
/**
* Sets the number format used by this formatter. You only need to
diff --git a/i18n/unicode/plurrule.h b/i18n/unicode/plurrule.h
index 5a227a2..cc29754 100644
--- a/i18n/unicode/plurrule.h
+++ b/i18n/unicode/plurrule.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2008-2012, International Business Machines Corporation and
+* Copyright (C) 2008-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
@@ -201,6 +201,7 @@
*/
static PluralRules* U_EXPORT2 forLocale(const Locale& locale, UErrorCode& status);
+#ifndef U_HIDE_DRAFT_API
/**
* Provides access to the predefined <code>PluralRules</code> for a given
* locale and the plural type.
@@ -218,6 +219,7 @@
* @draft ICU 50
*/
static PluralRules* U_EXPORT2 forLocale(const Locale& locale, UPluralType type, UErrorCode& status);
+#endif /* U_HIDE_DRAFT_API */
/**
* Given a number, returns the keyword of the first rule that applies to
diff --git a/i18n/unicode/rbnf.h b/i18n/unicode/rbnf.h
index b235582..473af3c 100644
--- a/i18n/unicode/rbnf.h
+++ b/i18n/unicode/rbnf.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 1997-2012, International Business Machines Corporation and others.
+* Copyright (C) 1997-2013, International Business Machines Corporation and others.
* All Rights Reserved.
*******************************************************************************
*/
@@ -970,7 +970,7 @@
* symbolsToAdopt; the client must not delete it.
*
* @param symbolsToAdopt DecimalFormatSymbols to be adopted.
- * @draft ICU 49
+ * @stable ICU 49
*/
virtual void adoptDecimalFormatSymbols(DecimalFormatSymbols* symbolsToAdopt);
@@ -981,7 +981,7 @@
* deleting it.
*
* @param symbols DecimalFormatSymbols.
- * @draft ICU 49
+ * @stable ICU 49
*/
virtual void setDecimalFormatSymbols(const DecimalFormatSymbols& symbols);
diff --git a/i18n/unicode/rbtz.h b/i18n/unicode/rbtz.h
index 2be2967..f20fc81 100644
--- a/i18n/unicode/rbtz.h
+++ b/i18n/unicode/rbtz.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2007-2008, International Business Machines Corporation and *
+* Copyright (C) 2007-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@@ -255,7 +255,7 @@
* @return TRUE if the transition is found.
* @stable ICU 3.8
*/
- virtual UBool getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/;
+ virtual UBool getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const;
/**
* Gets the most recent time zone transition before the base time.
@@ -265,7 +265,7 @@
* @return TRUE if the transition is found.
* @stable ICU 3.8
*/
- virtual UBool getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/;
+ virtual UBool getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const;
/**
* Returns the number of <code>TimeZoneRule</code>s which represents time transitions,
@@ -275,7 +275,7 @@
* @return The number of <code>TimeZoneRule</code>s representing time transitions.
* @stable ICU 3.8
*/
- virtual int32_t countTransitionRules(UErrorCode& status) /*const*/;
+ virtual int32_t countTransitionRules(UErrorCode& status) const;
/**
* Gets the <code>InitialTimeZoneRule</code> and the set of <code>TimeZoneRule</code>
@@ -294,14 +294,14 @@
* @stable ICU 3.8
*/
virtual void getTimeZoneRules(const InitialTimeZoneRule*& initial,
- const TimeZoneRule* trsrules[], int32_t& trscount, UErrorCode& status) /*const*/;
+ const TimeZoneRule* trsrules[], int32_t& trscount, UErrorCode& status) const;
/**
* Get time zone offsets from local wall time.
* @internal
*/
virtual void getOffsetFromLocal(UDate date, int32_t nonExistingTimeOpt, int32_t duplicatedTimeOpt,
- int32_t& rawOffset, int32_t& dstOffset, UErrorCode& status) /*const*/;
+ int32_t& rawOffset, int32_t& dstOffset, UErrorCode& status) const;
private:
void deleteRules(void);
@@ -317,6 +317,7 @@
int32_t NonExistingTimeOpt, int32_t DuplicatedTimeOpt) const;
void getOffsetInternal(UDate date, UBool local, int32_t NonExistingTimeOpt, int32_t DuplicatedTimeOpt,
int32_t& rawOffset, int32_t& dstOffset, UErrorCode& ec) const;
+ void completeConst(UErrorCode &status) const;
InitialTimeZoneRule *fInitialRule;
UVector *fHistoricRules;
diff --git a/i18n/unicode/regex.h b/i18n/unicode/regex.h
index 6c11b87..e9f6490 100644
--- a/i18n/unicode/regex.h
+++ b/i18n/unicode/regex.h
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (C) 2002-2012, International Business Machines
+* Copyright (C) 2002-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* file name: regex.h
@@ -68,6 +68,7 @@
class UVector32;
class UVector64;
+#ifndef U_HIDE_INTERNAL_API
/**
* RBBIPatternDump Debug function, displays the compiled form of a pattern.
* @internal
@@ -79,6 +80,7 @@
#undef RegexPatternDump
#define RegexPatternDump(pat)
#endif
+#endif /* U_HIDE_INTERNAL_API */
diff --git a/i18n/unicode/region.h b/i18n/unicode/region.h
new file mode 100644
index 0000000..6eaaa8c
--- /dev/null
+++ b/i18n/unicode/region.h
@@ -0,0 +1,289 @@
+/*
+ *******************************************************************************
+ * Copyright (C) 2013, International Business Machines Corporation
+ * All Rights Reserved.
+ *******************************************************************************
+ */
+
+#ifndef REGION_H
+#define REGION_H
+
+/**
+ * \file
+ * \brief C++ API: Region classes (territory containment)
+ */
+
+#include "unicode/utypes.h"
+
+#ifndef U_HIDE_DRAFT_API
+/**
+ * URegionType is an enumeration defining the different types of regions. Current possible
+ * values are URGN_WORLD, URGN_CONTINENT, URGN_SUBCONTINENT, URGN_TERRITORY, URGN_GROUPING,
+ * URGN_DEPRECATED, and URGN_UNKNOWN.
+ *
+ * @draft ICU 51
+ */
+
+typedef enum URegionType {
+ /**
+ * Type representing the unknown region.
+ * @draft ICU 51
+ */
+ URGN_UNKNOWN,
+
+ /**
+ * Type representing a territory.
+ * @draft ICU 51
+ */
+ URGN_TERRITORY,
+
+ /**
+ * Type representing the whole world.
+ * @draft ICU 51
+ */
+ URGN_WORLD,
+
+ /**
+ * Type representing a continent.
+ * @draft ICU 51
+ */
+ URGN_CONTINENT,
+
+ /**
+ * Type representing a sub-continent.
+ * @draft ICU 51
+ */
+ URGN_SUBCONTINENT,
+
+ /**
+ * Type representing a grouping of territories that is not to be used in
+ * the normal WORLD/CONTINENT/SUBCONTINENT/TERRITORY containment tree.
+ * @draft ICU 51
+ */
+ URGN_GROUPING,
+
+ /**
+ * Type representing a region whose code has been deprecated, usually
+ * due to a country splitting into multiple territories or changing its name.
+ * @draft ICU 51
+ */
+ URGN_DEPRECATED,
+
+ /**
+ * Maximum value for this unumeration.
+ * @draft ICU 51
+ */
+ URGN_LIMIT
+} URegionType;
+
+
+
+#if !UCONFIG_NO_FORMATTING
+
+#include "unicode/uobject.h"
+#include "unicode/uniset.h"
+#include "unicode/unistr.h"
+#include "unicode/strenum.h"
+
+U_NAMESPACE_BEGIN
+
+/**
+ * <code>Region</code> is the class representing a Unicode Region Code, also known as a
+ * Unicode Region Subtag, which is defined based upon the BCP 47 standard. We often think of
+ * "regions" as "countries" when defining the characteristics of a locale. Region codes There are different
+ * types of region codes that are important to distinguish.
+ * <p>
+ * Macroregion - A code for a "macro geographical (continental) region, geographical sub-region, or
+ * selected economic and other grouping" as defined in
+ * UN M.49 (http://unstats.un.org/unsd/methods/m49/m49regin.htm).
+ * These are typically 3-digit codes, but contain some 2-letter codes, such as the LDML code QO
+ * added for Outlying Oceania. Not all UNM.49 codes are defined in LDML, but most of them are.
+ * Macroregions are represented in ICU by one of three region types: WORLD ( region code 001 ),
+ * CONTINENTS ( regions contained directly by WORLD ), and SUBCONTINENTS ( things contained directly
+ * by a continent ).
+ * <p>
+ * TERRITORY - A Region that is not a Macroregion. These are typically codes for countries, but also
+ * include areas that are not separate countries, such as the code "AQ" for Antarctica or the code
+ * "HK" for Hong Kong (SAR China). Overseas dependencies of countries may or may not have separate
+ * codes. The codes are typically 2-letter codes aligned with the ISO 3166 standard, but BCP47 allows
+ * for the use of 3-digit codes in the future.
+ * <p>
+ * UNKNOWN - The code ZZ is defined by Unicode LDML for use to indicate that the Region is unknown,
+ * or that the value supplied as a region was invalid.
+ * <p>
+ * DEPRECATED - Region codes that have been defined in the past but are no longer in modern usage,
+ * usually due to a country splitting into multiple territories or changing its name.
+ * <p>
+ * GROUPING - A widely understood grouping of territories that has a well defined membership such
+ * that a region code has been assigned for it. Some of these are UNM.49 codes that do't fall into
+ * the world/continent/sub-continent hierarchy, while others are just well known groupings that have
+ * their own region code. Region "EU" (European Union) is one such region code that is a grouping.
+ * Groupings will never be returned by the getContainingRegion() API, since a different type of region
+ * ( WORLD, CONTINENT, or SUBCONTINENT ) will always be the containing region instead.
+ *
+ * The Region class is not intended for public subclassing.
+ *
+ * @author John Emmons
+ * @draft ICU 51
+ */
+
+class U_I18N_API Region : public UObject {
+public:
+ /**
+ * Destructor.
+ * @draft ICU 51
+ */
+ virtual ~Region();
+
+ /**
+ * Returns true if the two regions are equal.
+ * @draft ICU 51
+ */
+ UBool operator==(const Region &that) const;
+
+ /**
+ * Returns true if the two regions are NOT equal; that is, if operator ==() returns false.
+ * @draft ICU 51
+ */
+ UBool operator!=(const Region &that) const;
+
+ /**
+ * Returns a pointer to a Region using the given region code. The region code can be either 2-letter ISO code,
+ * 3-letter ISO code, UNM.49 numeric code, or other valid Unicode Region Code as defined by the LDML specification.
+ * The identifier will be canonicalized internally using the supplemental metadata as defined in the CLDR.
+ * If the region code is NULL or not recognized, the appropriate error code will be set ( U_ILLEGAL_ARGUMENT_ERROR )
+ * @draft ICU 51
+ */
+ static const Region* U_EXPORT2 getInstance(const char *region_code, UErrorCode &status);
+
+ /**
+ * Returns a pointer to a Region using the given numeric region code. If the numeric region code is not recognized,
+ * the appropriate error code will be set ( U_ILLEGAL_ARGUMENT_ERROR ).
+ * @draft ICU 51
+ */
+ static const Region* U_EXPORT2 getInstance (int32_t code, UErrorCode &status);
+
+ /**
+ * Returns an enumeration over the IDs of all known regions that match the given type.
+ * @draft ICU 51
+ */
+ static StringEnumeration* U_EXPORT2 getAvailable(URegionType type);
+
+ /**
+ * Returns a pointer to the region that contains this region. Returns NULL if this region is code "001" (World)
+ * or "ZZ" (Unknown region). For example, calling this method with region "IT" (Italy) returns the
+ * region "039" (Southern Europe).
+ * @draft ICU 51
+ */
+ const Region* getContainingRegion() const;
+
+ /**
+ * Return a pointer to the region that geographically contains this region and matches the given type,
+ * moving multiple steps up the containment chain if necessary. Returns NULL if no containing region can be found
+ * that matches the given type. Note: The URegionTypes = "URGN_GROUPING", "URGN_DEPRECATED", or "URGN_UNKNOWN"
+ * are not appropriate for use in this API. NULL will be returned in this case. For example, calling this method
+ * with region "IT" (Italy) for type "URGN_CONTINENT" returns the region "150" ( Europe ).
+ * @draft ICU 51
+ */
+ const Region* getContainingRegion(URegionType type) const;
+
+ /**
+ * Return an enumeration over the IDs of all the regions that are immediate children of this region in the
+ * region hierarchy. These returned regions could be either macro regions, territories, or a mixture of the two,
+ * depending on the containment data as defined in CLDR. This API may return NULL if this region doesn't have
+ * any sub-regions. For example, calling this method with region "150" (Europe) returns an enumeration containing
+ * the various sub regions of Europe - "039" (Southern Europe) - "151" (Eastern Europe) - "154" (Northern Europe)
+ * and "155" (Western Europe).
+ * @draft ICU 51
+ */
+ StringEnumeration* getContainedRegions() const;
+
+ /**
+ * Returns an enumeration over the IDs of all the regions that are children of this region anywhere in the region
+ * hierarchy and match the given type. This API may return an empty enumeration if this region doesn't have any
+ * sub-regions that match the given type. For example, calling this method with region "150" (Europe) and type
+ * "URGN_TERRITORY" returns a set containing all the territories in Europe ( "FR" (France) - "IT" (Italy) - "DE" (Germany) etc. )
+ * @draft ICU 51
+ */
+ StringEnumeration* getContainedRegions( URegionType type ) const;
+
+ /**
+ * Returns true if this region contains the supplied other region anywhere in the region hierarchy.
+ * @draft ICU 51
+ */
+ UBool contains(const Region &other) const;
+
+ /**
+ * For deprecated regions, return an enumeration over the IDs of the regions that are the preferred replacement
+ * regions for this region. Returns null for a non-deprecated region. For example, calling this method with region
+ * "SU" (Soviet Union) would return a list of the regions containing "RU" (Russia), "AM" (Armenia), "AZ" (Azerbaijan), etc...
+ * @draft ICU 51
+ */
+ StringEnumeration* getPreferredValues() const;
+
+
+ /**
+ * Return this region's canonical region code.
+ * @draft ICU 51
+ */
+ const char* getRegionCode() const;
+
+ /**
+ * Return this region's numeric code.
+ * Returns a negative value if the given region does not have a numeric code assigned to it.
+ * @draft ICU 51
+ */
+ int32_t getNumericCode() const;
+
+ /**
+ * Returns the region type of this region.
+ * @draft ICU 51
+ */
+ URegionType getType() const;
+
+#ifndef U_HIDE_INTERNAL_API
+ /**
+ * Cleans up statically allocated memory.
+ * @internal
+ */
+ static void cleanupRegionData();
+#endif /* U_HIDE_INTERNAL_API */
+
+private:
+ char id[4];
+ UnicodeString idStr;
+ int32_t code;
+ URegionType type;
+ Region *containingRegion;
+ UVector *containedRegions;
+ UVector *preferredValues;
+
+ /**
+ * Default Constructor. Internal - use factory methods only.
+ *
+ * @internal
+ */
+ Region();
+
+
+ /*
+ * Initializes the region data from the ICU resource bundles. The region data
+ * contains the basic relationships such as which regions are known, what the numeric
+ * codes are, any known aliases, and the territory containment data.
+ *
+ * If the region data has already loaded, then this method simply returns without doing
+ * anything meaningful.
+ * @internal
+ */
+
+ static void loadRegionData();
+
+};
+
+U_NAMESPACE_END
+
+#endif /* #if !UCONFIG_NO_FORMATTING */
+#endif /* U_HIDE_DRAFT_API */
+#endif // REGION_H
+
+//eof
diff --git a/i18n/unicode/simpletz.h b/i18n/unicode/simpletz.h
index 9e74fc5..4762f63 100644
--- a/i18n/unicode/simpletz.h
+++ b/i18n/unicode/simpletz.h
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (C) 1997-2011, International Business Machines *
+ * Copyright (C) 1997-2013, International Business Machines *
* Corporation and others. All Rights Reserved. *
********************************************************************************
*
@@ -621,7 +621,7 @@
* @internal
*/
virtual void getOffsetFromLocal(UDate date, int32_t nonExistingTimeOpt, int32_t duplicatedTimeOpt,
- int32_t& rawOffset, int32_t& dstOffset, UErrorCode& status) /*const*/;
+ int32_t& rawOffset, int32_t& dstOffset, UErrorCode& status) const;
/**
* Returns the TimeZone's raw GMT offset (i.e., the number of milliseconds to add
@@ -709,7 +709,7 @@
* @return TRUE if the transition is found.
* @stable ICU 3.8
*/
- virtual UBool getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/;
+ virtual UBool getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const;
/**
* Gets the most recent time zone transition before the base time.
@@ -719,7 +719,7 @@
* @return TRUE if the transition is found.
* @stable ICU 3.8
*/
- virtual UBool getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/;
+ virtual UBool getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const;
/**
* Returns the number of <code>TimeZoneRule</code>s which represents time transitions,
@@ -729,7 +729,7 @@
* @return The number of <code>TimeZoneRule</code>s representing time transitions.
* @stable ICU 3.8
*/
- virtual int32_t countTransitionRules(UErrorCode& status) /*const*/;
+ virtual int32_t countTransitionRules(UErrorCode& status) const;
/**
* Gets the <code>InitialTimeZoneRule</code> and the set of <code>TimeZoneRule</code>
@@ -748,7 +748,7 @@
* @stable ICU 3.8
*/
virtual void getTimeZoneRules(const InitialTimeZoneRule*& initial,
- const TimeZoneRule* trsrules[], int32_t& trscount, UErrorCode& status) /*const*/;
+ const TimeZoneRule* trsrules[], int32_t& trscount, UErrorCode& status) const;
public:
@@ -870,6 +870,7 @@
int32_t dstSavings;
/* Private for BasicTimeZone implementation */
+ void checkTransitionRules(UErrorCode& status) const;
void initTransitionRules(UErrorCode& status);
void clearTransitionRules(void);
void deleteTransitionRules(void);
diff --git a/i18n/unicode/smpdtfmt.h b/i18n/unicode/smpdtfmt.h
index 8bd05cc..6d1c357 100644
--- a/i18n/unicode/smpdtfmt.h
+++ b/i18n/unicode/smpdtfmt.h
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 1997-2012, International Business Machines Corporation and
+* Copyright (C) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
@@ -59,73 +59,549 @@
* the default patterns in the locales, he can construct a SimpleDateFormat directly
* and give it an appropriate pattern (or use one of the factory methods on DateFormat
* and modify the pattern after the fact with toPattern() and applyPattern().
- * <P>
- * Date/Time format syntax:
- * <P>
- * The date/time format is specified by means of a string time pattern. In this
- * pattern, all ASCII letters are reserved as pattern letters, which are defined
- * as the following:
- * <pre>
- * \code
- * Symbol Meaning Presentation Example
- * ------ ------- ------------ -------
- * G era designator (Text) AD
- * y year (Number) 1996
- * Y year (week of year) (Number) 1997
- * u extended year (Number) 4601
- * U cyclic year name (Text,NumFallback) ren-chen (29)
- * Q Quarter (Text & Number) Q2 & 02
- * M month in year (Text & Number) July & 07
- * d day in month (Number) 10
- * h hour in am/pm (1~12) (Number) 12
- * H hour in day (0~23) (Number) 0
- * m minute in hour (Number) 30
- * s second in minute (Number) 55
- * S fractional second (Number) 978
- * (maximum resolution of SSS; truncated if shorter, zero-padded if longer)
- * E day of week (Text) Tuesday
- * e day of week (local 1~7) (Text & Number) Tues & 2
- * D day in year (Number) 189
- * F day of week in month (Number) 2 (2nd Wed in July)
- * w week in year (Number) 27
- * W week in month (Number) 2
- * a am/pm marker (Text) PM
- * k hour in day (1~24) (Number) 24
- * K hour in am/pm (0~11) (Number) 0
- * z time zone (Text) PST
- * zzzz time zone (Text) Pacific Standard Time
- * Z time zone (RFC 822) (Number) -0800
- * ZZZZ time zone (RFC 822) (Text & Number) GMT-08:00
- * ZZZZZ time zone (ISO 8601) (Text & Number) -08:00 & Z
- * v time zone (generic) (Text) PT
- * vvvv time zone (generic) (Text) Pacific Time
- * V time zone (abreviation) (Text) PST
- * VVVV time zone (location) (Text) United States Time (Los Angeles)
- * g Julian day (Number) 2451334
- * A milliseconds in day (Number) 69540000
- * q stand alone quarter (Text & Number) Q2 & 02
- * L stand alone month (Text & Number) July & 07
- * c stand alone day of week (Text & Number) Tuesday & 2
- * ' escape for text (Delimiter) 'Date='
- * '' single quote (Literal) 'o''clock'
- * \endcode
- * </pre>
- * The count of pattern letters determine the format.
- * <P>
- * (Text): 4 or more, use full form, <4, use short or abbreviated form if it
- * exists. (e.g., "EEEE" produces "Monday", "EEE" produces "Mon")
- * <P>
- * (Number): the minimum number of digits. Shorter numbers are zero-padded to
- * this amount (e.g. if "m" produces "6", "mm" produces "06"). Year is handled
- * specially; that is, if the count of 'y' is 2, the Year will be truncated to 2 digits.
- * (e.g., if "yyyy" produces "1997", "yy" produces "97".)
- * Unlike other fields, fractional seconds are padded on the right with zero.
- * <P>
- * (Text & Number): 3 or over, use text, otherwise use number. (e.g., "M" produces "1",
- * "MM" produces "01", "MMM" produces "Jan", and "MMMM" produces "January".)
- * <P>
- * (Text,NumFallback): Behaves like Text if there is supporting data, like
- * Number otherwise.
+ *
+ * <p><strong>Date and Time Patterns:</strong></p>
+ *
+ * <p>Date and time formats are specified by <em>date and time pattern</em> strings.
+ * Within date and time pattern strings, all unquoted ASCII letters [A-Za-z] are reserved
+ * as pattern letters representing calendar fields. <code>SimpleDateFormat</code> supports
+ * the date and time formatting algorithm and pattern letters defined by <a href="http://www.unicode.org/reports/tr35/">UTS#35
+ * Unicode Locale Data Markup Language (LDML)</a>. The following pattern letters are
+ * currently available:</p>
+ *
+ * <table border="1">
+ * <tr>
+ * <th>Field</th>
+ * <th style="text-align: center">Sym.</th>
+ * <th style="text-align: center">No.</th>
+ * <th>Example</th>
+ * <th>Description</th>
+ * </tr>
+ * <tr>
+ * <th rowspan="3">era</th>
+ * <td style="text-align: center" rowspan="3">G</td>
+ * <td style="text-align: center">1..3</td>
+ * <td>AD</td>
+ * <td rowspan="3">Era - Replaced with the Era string for the current date. One to three letters for the
+ * abbreviated form, four letters for the long form, five for the narrow form.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">4</td>
+ * <td>Anno Domini</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">5</td>
+ * <td>A</td>
+ * </tr>
+ * <tr>
+ * <th rowspan="6">year</th>
+ * <td style="text-align: center">y</td>
+ * <td style="text-align: center">1..n</td>
+ * <td>1996</td>
+ * <td>Year. Normally the length specifies the padding, but for two letters it also specifies the maximum
+ * length. Example:<div align="center">
+ * <center>
+ * <table border="1" cellpadding="2" cellspacing="0">
+ * <tr>
+ * <th>Year</th>
+ * <th style="text-align: right">y</th>
+ * <th style="text-align: right">yy</th>
+ * <th style="text-align: right">yyy</th>
+ * <th style="text-align: right">yyyy</th>
+ * <th style="text-align: right">yyyyy</th>
+ * </tr>
+ * <tr>
+ * <td>AD 1</td>
+ * <td style="text-align: right">1</td>
+ * <td style="text-align: right">01</td>
+ * <td style="text-align: right">001</td>
+ * <td style="text-align: right">0001</td>
+ * <td style="text-align: right">00001</td>
+ * </tr>
+ * <tr>
+ * <td>AD 12</td>
+ * <td style="text-align: right">12</td>
+ * <td style="text-align: right">12</td>
+ * <td style="text-align: right">012</td>
+ * <td style="text-align: right">0012</td>
+ * <td style="text-align: right">00012</td>
+ * </tr>
+ * <tr>
+ * <td>AD 123</td>
+ * <td style="text-align: right">123</td>
+ * <td style="text-align: right">23</td>
+ * <td style="text-align: right">123</td>
+ * <td style="text-align: right">0123</td>
+ * <td style="text-align: right">00123</td>
+ * </tr>
+ * <tr>
+ * <td>AD 1234</td>
+ * <td style="text-align: right">1234</td>
+ * <td style="text-align: right">34</td>
+ * <td style="text-align: right">1234</td>
+ * <td style="text-align: right">1234</td>
+ * <td style="text-align: right">01234</td>
+ * </tr>
+ * <tr>
+ * <td>AD 12345</td>
+ * <td style="text-align: right">12345</td>
+ * <td style="text-align: right">45</td>
+ * <td style="text-align: right">12345</td>
+ * <td style="text-align: right">12345</td>
+ * <td style="text-align: right">12345</td>
+ * </tr>
+ * </table>
+ * </center></div>
+ * </td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">Y</td>
+ * <td style="text-align: center">1..n</td>
+ * <td>1997</td>
+ * <td>Year (in "Week of Year" based calendars). Normally the length specifies the padding,
+ * but for two letters it also specifies the maximum length. This year designation is used in ISO
+ * year-week calendar as defined by ISO 8601, but can be used in non-Gregorian based calendar systems
+ * where week date processing is desired. May not always be the same value as calendar year.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">u</td>
+ * <td style="text-align: center">1..n</td>
+ * <td>4601</td>
+ * <td>Extended year. This is a single number designating the year of this calendar system, encompassing
+ * all supra-year fields. For example, for the Julian calendar system, year numbers are positive, with an
+ * era of BCE or CE. An extended year value for the Julian calendar system assigns positive values to CE
+ * years and negative values to BCE years, with 1 BCE being year 0.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center" rowspan="3">U</td>
+ * <td style="text-align: center">1..3</td>
+ * <td>甲子</td>
+ * <td rowspan="3">Cyclic year name. Calendars such as the Chinese lunar calendar (and related calendars)
+ * and the Hindu calendars use 60-year cycles of year names. Use one through three letters for the abbreviated
+ * name, four for the full name, or five for the narrow name (currently the data only provides abbreviated names,
+ * which will be used for all requested name widths). If the calendar does not provide cyclic year name data,
+ * or if the year value to be formatted is out of the range of years for which cyclic name data is provided,
+ * then numeric formatting is used (behaves like 'y').</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">4</td>
+ * <td>(currently also 甲子)</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">5</td>
+ * <td>(currently also 甲子)</td>
+ * </tr>
+ * <tr>
+ * <th rowspan="6">quarter</th>
+ * <td rowspan="3" style="text-align: center">Q</td>
+ * <td style="text-align: center">1..2</td>
+ * <td>02</td>
+ * <td rowspan="3">Quarter - Use one or two for the numerical quarter, three for the abbreviation, or four
+ * for the full name.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">3</td>
+ * <td>Q2</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">4</td>
+ * <td>2nd quarter</td>
+ * </tr>
+ * <tr>
+ * <td rowspan="3" style="text-align: center">q</td>
+ * <td style="text-align: center">1..2</td>
+ * <td>02</td>
+ * <td rowspan="3"><b>Stand-Alone</b> Quarter - Use one or two for the numerical quarter, three for the abbreviation,
+ * or four for the full name.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">3</td>
+ * <td>Q2</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">4</td>
+ * <td>2nd quarter</td>
+ * </tr>
+ * <tr>
+ * <th rowspan="8">month</th>
+ * <td rowspan="4" style="text-align: center">M</td>
+ * <td style="text-align: center">1..2</td>
+ * <td>09</td>
+ * <td rowspan="4">Month - Use one or two for the numerical month, three for the abbreviation, four for
+ * the full name, or five for the narrow name.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">3</td>
+ * <td>Sept</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">4</td>
+ * <td>September</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">5</td>
+ * <td>S</td>
+ * </tr>
+ * <tr>
+ * <td rowspan="4" style="text-align: center">L</td>
+ * <td style="text-align: center">1..2</td>
+ * <td>09</td>
+ * <td rowspan="4"><b>Stand-Alone</b> Month - Use one or two for the numerical month, three for the abbreviation,
+ * or four for the full name, or 5 for the narrow name.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">3</td>
+ * <td>Sept</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">4</td>
+ * <td>September</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">5</td>
+ * <td>S</td>
+ * </tr>
+ * <tr>
+ * <th rowspan="2">week</th>
+ * <td style="text-align: center">w</td>
+ * <td style="text-align: center">1..2</td>
+ * <td>27</td>
+ * <td>Week of Year.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">W</td>
+ * <td style="text-align: center">1</td>
+ * <td>3</td>
+ * <td>Week of Month</td>
+ * </tr>
+ * <tr>
+ * <th rowspan="4">day</th>
+ * <td style="text-align: center">d</td>
+ * <td style="text-align: center">1..2</td>
+ * <td>1</td>
+ * <td>Date - Day of the month</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">D</td>
+ * <td style="text-align: center">1..3</td>
+ * <td>345</td>
+ * <td>Day of year</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">F</td>
+ * <td style="text-align: center">1</td>
+ * <td>2</td>
+ * <td>Day of Week in Month. The example is for the 2nd Wed in July</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">g</td>
+ * <td style="text-align: center">1..n</td>
+ * <td>2451334</td>
+ * <td>Modified Julian day. This is different from the conventional Julian day number in two regards.
+ * First, it demarcates days at local zone midnight, rather than noon GMT. Second, it is a local number;
+ * that is, it depends on the local time zone. It can be thought of as a single number that encompasses
+ * all the date-related fields.</td>
+ * </tr>
+ * <tr>
+ * <th rowspan="14">week<br>
+ * day</th>
+ * <td rowspan="4" style="text-align: center">E</td>
+ * <td style="text-align: center">1..3</td>
+ * <td>Tues</td>
+ * <td rowspan="4">Day of week - Use one through three letters for the short day, or four for the full name,
+ * five for the narrow name, or six for the short name.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">4</td>
+ * <td>Tuesday</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">5</td>
+ * <td>T</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">6</td>
+ * <td>Tu</td>
+ * </tr>
+ * <tr>
+ * <td rowspan="5" style="text-align: center">e</td>
+ * <td style="text-align: center">1..2</td>
+ * <td>2</td>
+ * <td rowspan="5">Local day of week. Same as E except adds a numeric value that will depend on the local
+ * starting day of the week, using one or two letters. For this example, Monday is the first day of the week.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">3</td>
+ * <td>Tues</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">4</td>
+ * <td>Tuesday</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">5</td>
+ * <td>T</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">6</td>
+ * <td>Tu</td>
+ * </tr>
+ * <tr>
+ * <td rowspan="5" style="text-align: center">c</td>
+ * <td style="text-align: center">1</td>
+ * <td>2</td>
+ * <td rowspan="5"><b>Stand-Alone</b> local day of week - Use one letter for the local numeric value (same
+ * as 'e'), three for the short day, four for the full name, five for the narrow name, or six for
+ * the short name.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">3</td>
+ * <td>Tues</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">4</td>
+ * <td>Tuesday</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">5</td>
+ * <td>T</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">6</td>
+ * <td>Tu</td>
+ * </tr>
+ * <tr>
+ * <th>period</th>
+ * <td style="text-align: center">a</td>
+ * <td style="text-align: center">1</td>
+ * <td>AM</td>
+ * <td>AM or PM</td>
+ * </tr>
+ * <tr>
+ * <th rowspan="4">hour</th>
+ * <td style="text-align: center">h</td>
+ * <td style="text-align: center">1..2</td>
+ * <td>11</td>
+ * <td>Hour [1-12]. When used in skeleton data or in a skeleton passed in an API for flexible data pattern
+ * generation, it should match the 12-hour-cycle format preferred by the locale (h or K); it should not match
+ * a 24-hour-cycle format (H or k). Use hh for zero padding.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">H</td>
+ * <td style="text-align: center">1..2</td>
+ * <td>13</td>
+ * <td>Hour [0-23]. When used in skeleton data or in a skeleton passed in an API for flexible data pattern
+ * generation, it should match the 24-hour-cycle format preferred by the locale (H or k); it should not match a
+ * 12-hour-cycle format (h or K). Use HH for zero padding.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">K</td>
+ * <td style="text-align: center">1..2</td>
+ * <td>0</td>
+ * <td>Hour [0-11]. When used in a skeleton, only matches K or h, see above. Use KK for zero padding.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">k</td>
+ * <td style="text-align: center">1..2</td>
+ * <td>24</td>
+ * <td>Hour [1-24]. When used in a skeleton, only matches k or H, see above. Use kk for zero padding.</td>
+ * </tr>
+ * <tr>
+ * <th>minute</th>
+ * <td style="text-align: center">m</td>
+ * <td style="text-align: center">1..2</td>
+ * <td>59</td>
+ * <td>Minute. Use one or two for zero padding.</td>
+ * </tr>
+ * <tr>
+ * <th rowspan="3">second</th>
+ * <td style="text-align: center">s</td>
+ * <td style="text-align: center">1..2</td>
+ * <td>12</td>
+ * <td>Second. Use one or two for zero padding.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">S</td>
+ * <td style="text-align: center">1..n</td>
+ * <td>3456</td>
+ * <td>Fractional Second - truncates (like other time fields) to the count of letters.
+ * (example shows display using pattern SSSS for seconds value 12.34567)</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">A</td>
+ * <td style="text-align: center">1..n</td>
+ * <td>69540000</td>
+ * <td>Milliseconds in day. This field behaves <i>exactly</i> like a composite of all time-related fields,
+ * not including the zone fields. As such, it also reflects discontinuities of those fields on DST transition
+ * days. On a day of DST onset, it will jump forward. On a day of DST cessation, it will jump backward. This
+ * reflects the fact that is must be combined with the offset field to obtain a unique local time value.</td>
+ * </tr>
+ * <tr>
+ * <th rowspan="23">zone</th>
+ * <td rowspan="2" style="text-align: center">z</td>
+ * <td style="text-align: center">1..3</td>
+ * <td>PDT</td>
+ * <td>The <i>short specific non-location format</i>.
+ * Where that is unavailable, falls back to the <i>short localized GMT format</i> ("O").</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">4</td>
+ * <td>Pacific Daylight Time</td>
+ * <td>The <i>long specific non-location format</i>.
+ * Where that is unavailable, falls back to the <i>long localized GMT format</i> ("OOOO").</td>
+ * </tr>
+ * <tr>
+ * <td rowspan="3" style="text-align: center">Z</td>
+ * <td style="text-align: center">1..3</td>
+ * <td>-0800</td>
+ * <td>The <i>ISO8601 basic format</i> with hours, minutes and optional seconds fields.
+ * The format is equivalent to RFC 822 zone format (when optional seconds field is absent).
+ * This is equivalent to the "xxxx" specifier.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">4</td>
+ * <td>GMT-8:00</td>
+ * <td>The <i>long localized GMT format</i>.
+ * This is equivalent to the "OOOO" specifier.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">5</td>
+ * <td>-08:00<br>
+ * -07:52:58</td>
+ * <td>The <i>ISO8601 extended format</i> with hours, minutes and optional seconds fields.
+ * The ISO8601 UTC indicator "Z" is used when local time offset is 0.
+ * This is equivalent to the "XXXXX" specifier.</td>
+ * </tr>
+ * <tr>
+ * <td rowspan="2" style="text-align: center">O</td>
+ * <td style="text-align: center">1</td>
+ * <td>GMT-8</td>
+ * <td>The <i>short localized GMT format</i>.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">4</td>
+ * <td>GMT-08:00</td>
+ * <td>The <i>long localized GMT format</i>.</td>
+ * </tr>
+ * <tr>
+ * <td rowspan="2" style="text-align: center">v</td>
+ * <td style="text-align: center">1</td>
+ * <td>PT</td>
+ * <td>The <i>short generic non-location format</i>.
+ * Where that is unavailable, falls back to the <i>generic location format</i> ("VVVV"),
+ * then the <i>short localized GMT format</i> as the final fallback.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">4</td>
+ * <td>Pacific Time</td>
+ * <td>The <i>long generic non-location format</i>.
+ * Where that is unavailable, falls back to <i>generic location format</i> ("VVVV").
+ * </tr>
+ * <tr>
+ * <td rowspan="4" style="text-align: center">V</td>
+ * <td style="text-align: center">1</td>
+ * <td>uslax</td>
+ * <td>The short time zone ID.
+ * Where that is unavailable, the special short time zone ID <i>unk</i> (Unknown Zone) is used.<br>
+ * <i><b>Note</b>: This specifier was originally used for a variant of the short specific non-location format,
+ * but it was deprecated in the later version of the LDML specification. In CLDR 23/ICU 51, the definition of
+ * the specifier was changed to designate a short time zone ID.</i></td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">2</td>
+ * <td>America/Los_Angeles</td>
+ * <td>The long time zone ID.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">3</td>
+ * <td>Los Angeles</td>
+ * <td>The exemplar city (location) for the time zone.
+ * Where that is unavailable, the localized exemplar city name for the special zone <i>Etc/Unknown</i> is used
+ * as the fallback (for example, "Unknown City"). </td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">4</td>
+ * <td>Los Angeles Time</td>
+ * <td>The <i>generic location format</i>.
+ * Where that is unavailable, falls back to the <i>long localized GMT format</i> ("OOOO";
+ * Note: Fallback is only necessary with a GMT-style Time Zone ID, like Etc/GMT-830.)<br>
+ * This is especially useful when presenting possible timezone choices for user selection,
+ * since the naming is more uniform than the "v" format.</td>
+ * </tr>
+ * <tr>
+ * <td rowspan="5" style="text-align: center">X</td>
+ * <td style="text-align: center">1</td>
+ * <td>-08<br>
+ * +0530<br>
+ * Z</td>
+ * <td>The <i>ISO8601 basic format</i> with hours field and optional minutes field.
+ * The ISO8601 UTC indicator "Z" is used when local time offset is 0.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">2</td>
+ * <td>-0800<br>
+ * Z</td>
+ * <td>The <i>ISO8601 basic format</i> with hours and minutes fields.
+ * The ISO8601 UTC indicator "Z" is used when local time offset is 0.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">3</td>
+ * <td>-08:00<br>
+ * Z</td>
+ * <td>The <i>ISO8601 extended format</i> with hours and minutes fields.
+ * The ISO8601 UTC indicator "Z" is used when local time offset is 0.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">4</td>
+ * <td>-0800<br>
+ * -075258<br>
+ * Z</td>
+ * <td>The <i>ISO8601 basic format</i> with hours, minutes and optional seconds fields.
+ * (Note: The seconds field is not supported by the ISO8601 specification.)
+ * The ISO8601 UTC indicator "Z" is used when local time offset is 0.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">5</td>
+ * <td>-08:00<br>
+ * -07:52:58<br>
+ * Z</td>
+ * <td>The <i>ISO8601 extended format</i> with hours, minutes and optional seconds fields.
+ * (Note: The seconds field is not supported by the ISO8601 specification.)
+ * The ISO8601 UTC indicator "Z" is used when local time offset is 0.</td>
+ * </tr>
+ * <tr>
+ * <td rowspan="5" style="text-align: center">x</td>
+ * <td style="text-align: center">1</td>
+ * <td>-08<br>
+ * +0530</td>
+ * <td>The <i>ISO8601 basic format</i> with hours field and optional minutes field.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">2</td>
+ * <td>-0800</td>
+ * <td>The <i>ISO8601 basic format</i> with hours and minutes fields.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">3</td>
+ * <td>-08:00</td>
+ * <td>The <i>ISO8601 extended format</i> with hours and minutes fields.</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">4</td>
+ * <td>-0800<br>
+ * -075258</td>
+ * <td>The <i>ISO8601 basic format</i> with hours, minutes and optional seconds fields.
+ * (Note: The seconds field is not supported by the ISO8601 specification.)</td>
+ * </tr>
+ * <tr>
+ * <td style="text-align: center">5</td>
+ * <td>-08:00<br>
+ * -07:52:58</td>
+ * <td>The <i>ISO8601 extended format</i> with hours, minutes and optional seconds fields.
+ * (Note: The seconds field is not supported by the ISO8601 specification.)</td>
+ * </tr>
+ * </table>
+ *
* <P>
* Any characters in the pattern that are not in the ranges of ['a'..'z'] and
* ['A'..'Z'] will be treated as quoted text. For instance, characters
@@ -775,7 +1251,7 @@
*/
virtual void adoptCalendar(Calendar* calendarToAdopt);
- /* Cannot use #ifndef U_HIDE_INTERNAL_API for the following draft method since it is virtual */
+ /* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */
/**
* Set a particular UDisplayContext value in the formatter, such as
* UDISPCTX_CAPITALIZATION_FOR_STANDALONE.
@@ -783,11 +1259,11 @@
* @param status Input/output status. If at entry this indicates a failure
* status, the function will do nothing; otherwise this will be
* updated with any new status from the function.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
virtual void setContext(UDisplayContext value, UErrorCode& status);
- /* Cannot use #ifndef U_HIDE_INTERNAL_API for the following draft method since it is virtual */
+ /* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */
/**
* Get the formatter's UDisplayContext value for the specified UDisplayContextType,
* such as UDISPCTX_TYPE_CAPITALIZATION.
@@ -796,7 +1272,7 @@
* status, the function will do nothing; otherwise this will be
* updated with any new status from the function.
* @return The UDisplayContextValue for the specified type.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
virtual UDisplayContext getContext(UDisplayContextType type, UErrorCode& status) const;
diff --git a/i18n/unicode/sortkey.h b/i18n/unicode/sortkey.h
index eeca335..94b459a 100644
--- a/i18n/unicode/sortkey.h
+++ b/i18n/unicode/sortkey.h
@@ -1,6 +1,6 @@
/*
*****************************************************************************
- * Copyright (C) 1996-2012, International Business Machines Corporation and others.
+ * Copyright (C) 1996-2013, International Business Machines Corporation and others.
* All Rights Reserved.
*****************************************************************************
*
@@ -29,7 +29,6 @@
*/
#if !UCONFIG_NO_COLLATION
-#ifndef U_HIDE_DEPRECATED_API
#include "unicode/uobject.h"
#include "unicode/unistr.h"
@@ -182,6 +181,7 @@
uint8_t* toByteArray(int32_t& count) const;
#endif
+#ifndef U_HIDE_DEPRECATED_API
/**
* Convenience method which does a string(bit-wise) comparison of the
* two collation keys.
@@ -192,6 +192,7 @@
* @deprecated ICU 2.6 use the overload with error code
*/
Collator::EComparisonResult compareTo(const CollationKey& target) const;
+#endif /* U_HIDE_DEPRECATED_API */
/**
* Convenience method which does a string(bit-wise) comparison of the
@@ -331,7 +332,6 @@
U_NAMESPACE_END
-#endif /* U_HIDE_DEPRECATED_API */
#endif /* #if !UCONFIG_NO_COLLATION */
#endif
diff --git a/i18n/unicode/tblcoll.h b/i18n/unicode/tblcoll.h
index 235a3b2..04fd248 100644
--- a/i18n/unicode/tblcoll.h
+++ b/i18n/unicode/tblcoll.h
@@ -1,6 +1,6 @@
/*
******************************************************************************
-* Copyright (C) 1996-2012, International Business Machines Corporation and
+* Copyright (C) 1996-2013, International Business Machines Corporation and
* others. All Rights Reserved.
******************************************************************************
*/
@@ -394,17 +394,25 @@
*/
virtual void getVersion(UVersionInfo info) const;
+#ifndef U_HIDE_DEPRECATED_API
/**
- * Return the maximum length of any expansion sequences that end with the
+ * Returns the maximum length of any expansion sequences that end with the
* specified comparison order.
- * @param order a collation order returned by previous or next.
+ *
+ * This is specific to the kind of collation element values and sequences
+ * returned by the CollationElementIterator.
+ * Call CollationElementIterator::getMaxExpansion() instead.
+ *
+ * @param order a collation order returned by CollationElementIterator::previous
+ * or CollationElementIterator::next.
* @return maximum size of the expansion sequences ending with the collation
- * element or 1 if collation element does not occur at the end of
+ * element, or 1 if the collation element does not occur at the end of
* any expansion sequence
* @see CollationElementIterator#getMaxExpansion
- * @stable ICU 2.0
+ * @deprecated ICU 51 Use CollationElementIterator::getMaxExpansion() instead.
*/
int32_t getMaxExpansion(int32_t order) const;
+#endif /* U_HIDE_DEPRECATED_API */
/**
* Returns a unique class ID POLYMORPHICALLY. Pure virtual override. This
@@ -835,12 +843,10 @@
setRuleStringFromCollator();
}
-#ifndef U_HIDE_INTERNAL_API
inline const UCollator * RuleBasedCollator::getUCollator()
{
return ucollator;
}
-#endif
U_NAMESPACE_END
diff --git a/i18n/unicode/timezone.h b/i18n/unicode/timezone.h
index 6af1bed..d966cd8 100644
--- a/i18n/unicode/timezone.h
+++ b/i18n/unicode/timezone.h
@@ -1,5 +1,5 @@
/*************************************************************************
-* Copyright (c) 1997-2012, International Business Machines Corporation
+* Copyright (c) 1997-2013, International Business Machines Corporation
* and others. All Rights Reserved.
**************************************************************************
*
@@ -133,7 +133,6 @@
*/
virtual ~TimeZone();
-#ifndef U_HIDE_DRAFT_API
/**
* Returns the "unknown" time zone.
* It behaves like the GMT/UTC time zone but has the
@@ -144,10 +143,9 @@
* @see UCAL_UNKNOWN_ZONE_ID
* @see createTimeZone
* @see getGMT
- * @draft ICU 49
+ * @stable ICU 49
*/
static const TimeZone& U_EXPORT2 getUnknown();
-#endif /* U_HIDE_DRAFT_API */
/**
* The GMT (=UTC) time zone has a raw offset of zero and does not use daylight
diff --git a/i18n/unicode/translit.h b/i18n/unicode/translit.h
index eec3246..57f4f05 100644
--- a/i18n/unicode/translit.h
+++ b/i18n/unicode/translit.h
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (C) 1999-2012, International Business Machines
+* Copyright (C) 1999-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Date Name Description
@@ -1308,7 +1308,6 @@
ID.truncate(ID.length()-1);
}
-#ifndef U_HIDE_INTERNAL_API
inline Transliterator::Token Transliterator::integerToken(int32_t i) {
Token t;
t.integer = i;
@@ -1320,7 +1319,6 @@
t.pointer = p;
return t;
}
-#endif
U_NAMESPACE_END
diff --git a/i18n/unicode/tzfmt.h b/i18n/unicode/tzfmt.h
index 90b43b0..9f39426 100644
--- a/i18n/unicode/tzfmt.h
+++ b/i18n/unicode/tzfmt.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2011-2012, International Business Machines Corporation and *
+* Copyright (C) 2011-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@@ -15,7 +15,7 @@
#include "unicode/utypes.h"
#if !UCONFIG_NO_FORMATTING
-#ifndef U_HIDE_INTERNAL_API
+#ifndef U_HIDE_DRAFT_API
#include "unicode/format.h"
#include "unicode/timezone.h"
@@ -54,20 +54,103 @@
*/
UTZFMT_STYLE_SPECIFIC_SHORT,
/**
- * RFC822 format, such as "-0500"
- * @draft ICU 50
- */
- UTZFMT_STYLE_RFC822,
- /**
* Localized GMT offset format, such as "GMT-05:00", "UTC+0100"
* @draft ICU 50
*/
UTZFMT_STYLE_LOCALIZED_GMT,
+#ifndef U_HIDE_DRAFT_API
/**
- * ISO 8601 format (extended), such as "-05:00", "Z"(UTC)
- * @draft ICU 50
+ * Short localized GMT offset format, such as "GMT-5", "UTC+1:30"
+ * This style is equivalent to the LDML date format pattern "O".
+ * @draft ICU 51
*/
- UTZFMT_STYLE_ISO8601
+ UTZFMT_STYLE_LOCALIZED_GMT_SHORT,
+ /**
+ * Short ISO 8601 local time difference (basic format) or the UTC indicator.
+ * For example, "-05", "+0530", and "Z"(UTC).
+ * This style is equivalent to the LDML date format pattern "X".
+ * @draft ICU 51
+ */
+ UTZFMT_STYLE_ISO_BASIC_SHORT,
+ /**
+ * Short ISO 8601 locale time difference (basic format).
+ * For example, "-05" and "+0530".
+ * This style is equivalent to the LDML date format pattern "x".
+ * @draft ICU 51
+ */
+ UTZFMT_STYLE_ISO_BASIC_LOCAL_SHORT,
+ /**
+ * Fixed width ISO 8601 local time difference (basic format) or the UTC indicator.
+ * For example, "-0500", "+0530", and "Z"(UTC).
+ * This style is equivalent to the LDML date format pattern "XX".
+ * @draft ICU 51
+ */
+ UTZFMT_STYLE_ISO_BASIC_FIXED,
+ /**
+ * Fixed width ISO 8601 local time difference (basic format).
+ * For example, "-0500" and "+0530".
+ * This style is equivalent to the LDML date format pattern "xx".
+ * @draft ICU 51
+ */
+ UTZFMT_STYLE_ISO_BASIC_LOCAL_FIXED,
+ /**
+ * ISO 8601 local time difference (basic format) with optional seconds field, or the UTC indicator.
+ * For example, "-0500", "+052538", and "Z"(UTC).
+ * This style is equivalent to the LDML date format pattern "XXXX".
+ * @draft ICU 51
+ */
+ UTZFMT_STYLE_ISO_BASIC_FULL,
+ /**
+ * ISO 8601 local time difference (basic format) with optional seconds field.
+ * For example, "-0500" and "+052538".
+ * This style is equivalent to the LDML date format pattern "xxxx".
+ * @draft ICU 51
+ */
+ UTZFMT_STYLE_ISO_BASIC_LOCAL_FULL,
+ /**
+ * Fixed width ISO 8601 local time difference (extended format) or the UTC indicator.
+ * For example, "-05:00", "+05:30", and "Z"(UTC).
+ * This style is equivalent to the LDML date format pattern "XXX".
+ * @draft ICU 51
+ */
+ UTZFMT_STYLE_ISO_EXTENDED_FIXED,
+ /**
+ * Fixed width ISO 8601 local time difference (extended format).
+ * For example, "-05:00" and "+05:30".
+ * This style is equivalent to the LDML date format pattern "xxx" and "ZZZZZ".
+ * @draft ICU 51
+ */
+ UTZFMT_STYLE_ISO_EXTENDED_LOCAL_FIXED,
+ /**
+ * ISO 8601 local time difference (extended format) with optional seconds field, or the UTC indicator.
+ * For example, "-05:00", "+05:25:38", and "Z"(UTC).
+ * This style is equivalent to the LDML date format pattern "XXXXX".
+ * @draft ICU 51
+ */
+ UTZFMT_STYLE_ISO_EXTENDED_FULL,
+ /**
+ * ISO 8601 local time difference (extended format) with optional seconds field.
+ * For example, "-05:00" and "+05:25:38".
+ * This style is equivalent to the LDML date format pattern "xxxxx".
+ * @draft ICU 51
+ */
+ UTZFMT_STYLE_ISO_EXTENDED_LOCAL_FULL,
+ /**
+ * Time Zone ID, such as "America/Los_Angeles".
+ * @draft ICU 51
+ */
+ UTZFMT_STYLE_ZONE_ID,
+ /**
+ * Short Time Zone ID (BCP 47 Unicode location extension, time zone type value), such as "uslax".
+ * @draft ICU 51
+ */
+ UTZFMT_STYLE_ZONE_ID_SHORT,
+ /**
+ * Exemplar location, such as "Los Angeles" and "Paris".
+ * @draft ICU 51
+ */
+ UTZFMT_STYLE_EXEMPLAR_LOCATION
+#endif /* U_HIDE_DRAFT_API */
} UTimeZoneFormatStyle;
/**
@@ -76,25 +159,45 @@
*/
typedef enum UTimeZoneFormatGMTOffsetPatternType {
/**
- * Positive offset with hour and minute fields
+ * Positive offset with hours and minutes fields
* @draft ICU 50
*/
UTZFMT_PAT_POSITIVE_HM,
/**
- * Positive offset with hour, minute and second fields
+ * Positive offset with hours, minutes and seconds fields
* @draft ICU 50
*/
UTZFMT_PAT_POSITIVE_HMS,
/**
- * Negative offset with hour and minute fields
+ * Negative offset with hours and minutes fields
* @draft ICU 50
*/
UTZFMT_PAT_NEGATIVE_HM,
/**
- * Negative offset with hour, minute and second fields
+ * Negative offset with hours, minutes and seconds fields
* @draft ICU 50
*/
- UTZFMT_PAT_NEGATIVE_HMS
+ UTZFMT_PAT_NEGATIVE_HMS,
+#ifndef U_HIDE_DRAFT_API
+ /**
+ * Positive offset with hours field
+ * @draft ICU 51
+ */
+ UTZFMT_PAT_POSITIVE_H,
+ /**
+ * Negative offset with hours field
+ * @draft ICU 51
+ */
+ UTZFMT_PAT_NEGATIVE_H,
+#endif /* U_HIDE_DRAFT_API */
+
+#ifndef U_HIDE_INTERNAL_API
+ /**
+ * Number of UTimeZoneFormatGMTOffsetPatternType types.
+ * @internal
+ */
+ UTZFMT_PAT_COUNT
+#endif /* U_HIDE_INTERNAL_API */
} UTimeZoneFormatGMTOffsetPatternType;
/**
@@ -333,29 +436,43 @@
*/
void setDefaultParseOptions(uint32_t flags);
+#ifndef U_HIDE_DRAFT_API
/**
- * Returns the RFC822 style time zone string for the given offset.
- * For example, "-0800".
- * @param offset The offset from GMT(UTC) in milliseconds.
- * @param result Recevies the RFC822 style GMT(UTC) offset format.
- * @return A reference to the result.
+ * Returns the ISO 8601 basic time zone string for the given offset.
+ * For example, "-08", "-0830" and "Z"
+ *
+ * @param offset the offset from GMT(UTC) in milliseconds.
+ * @param useUtcIndicator true if ISO 8601 UTC indicator "Z" is used when the offset is 0.
+ * @param isShort true if shortest form is used.
+ * @param ignoreSeconds true if non-zero offset seconds is appended.
+ * @param result Receives the ISO format string.
* @param status Receives the status
- * @see #parseOffsetRFC822
- * @draft ICU 50
+ * @return the ISO 8601 basic format.
+ * @see #formatOffsetISO8601Extended
+ * @see #parseOffsetISO8601
+ * @draft ICU 51
*/
- UnicodeString& formatOffsetRFC822(int32_t offset, UnicodeString& result, UErrorCode& status) const;
+ UnicodeString& formatOffsetISO8601Basic(int32_t offset, UBool useUtcIndicator, UBool isShort, UBool ignoreSeconds,
+ UnicodeString& result, UErrorCode& status) const;
/**
- * Returns the ISO 8601 style time zone string for the given offset.
- * For example, "-08:00" and "Z".
- * @param offset The offset from GMT(UTC) in milliseconds.
- * @param result Receives the ISO 8601 style GMT(UTC) offset format.
+ * Returns the ISO 8601 extended time zone string for the given offset.
+ * For example, "-08:00", "-08:30" and "Z"
+ *
+ * @param offset the offset from GMT(UTC) in milliseconds.
+ * @param useUtcIndicator true if ISO 8601 UTC indicator "Z" is used when the offset is 0.
+ * @param isShort true if shortest form is used.
+ * @param ignoreSeconds true if non-zero offset seconds is appended.
+ * @param result Receives the ISO format string.
* @param status Receives the status
- * @return A reference to the result.
+ * @return the ISO 8601 basic format.
+ * @see #formatOffsetISO8601Extended
* @see #parseOffsetISO8601
- * @draft ICU 50
+ * @draft ICU 51
*/
- UnicodeString& formatOffsetISO8601(int32_t offset, UnicodeString& result, UErrorCode& status) const;
+ UnicodeString& formatOffsetISO8601Extended(int32_t offset, UBool useUtcIndicator, UBool isShort, UBool ignoreSeconds,
+ UnicodeString& result, UErrorCode& status) const;
+#endif /* U_HIDE_DRAFT_API */
/**
* Returns the localized GMT(UTC) offset format for the given offset.
@@ -366,6 +483,9 @@
* <li>Offset digits (e.g. "0123456789" - see {@link #getGMTOffsetDigits})
* <li>GMT zero format (e.g. "GMT" - see {@link #getGMTZeroFormat})
* </ul>
+ * This format always uses 2 digit hours and minutes. When the given offset has non-zero
+ * seconds, 2 digit seconds field will be appended. For example,
+ * GMT+05:00 and GMT+05:28:06.
* @param offset the offset from GMT(UTC) in milliseconds.
* @param status Receives the status
* @param result Receives the localized GMT format string.
@@ -375,6 +495,29 @@
*/
UnicodeString& formatOffsetLocalizedGMT(int32_t offset, UnicodeString& result, UErrorCode& status) const;
+#ifndef U_HIDE_DRAFT_API
+ /**
+ * Returns the short localized GMT(UTC) offset format for the given offset.
+ * The short localized GMT offset is defined by;
+ * <ul>
+ * <li>GMT format pattern (e.g. "GMT {0}" - see {@link #getGMTPattern})
+ * <li>Offset time pattern (e.g. "+HH:mm" - see {@link #getGMTOffsetPattern})
+ * <li>Offset digits (e.g. "0123456789" - see {@link #getGMTOffsetDigits})
+ * <li>GMT zero format (e.g. "GMT" - see {@link #getGMTZeroFormat})
+ * </ul>
+ * This format uses the shortest representation of offset. The hours field does not
+ * have leading zero and lower fields with zero will be truncated. For example,
+ * GMT+5 and GMT+530.
+ * @param offset the offset from GMT(UTC) in milliseconds.
+ * @param status Receives the status
+ * @param result Receives the short localized GMT format string.
+ * @return A reference to the result.
+ * @see #parseOffsetShortLocalizedGMT
+ * @draft ICU 51
+ */
+ UnicodeString& formatOffsetShortLocalizedGMT(int32_t offset, UnicodeString& result, UErrorCode& status) const;
+#endif /* U_HIDE_DRAFT_API */
+
using Format::format;
/**
@@ -394,21 +537,6 @@
UnicodeString& name, UTimeZoneFormatTimeType* timeType = NULL) const;
/**
- * Returns offset from GMT(UTC) in milliseconds for the given RFC822
- * style time zone string. When the given string is not an RFC822 time zone
- * string, this method sets the current position as the error index
- * to <code>ParsePosition pos</code> and returns 0.
- * @param text The text contains RFC822 style time zone string (e.g. "-0800")
- * at the position.
- * @param pos The ParsePosition object.
- * @return The offset from GMT(UTC) in milliseconds for the given RFC822 style
- * time zone string.
- * @see #formatOffsetRFC822
- * @draft ICU 50
- */
- int32_t parseOffsetRFC822(const UnicodeString& text, ParsePosition& pos) const;
-
- /**
* Returns offset from GMT(UTC) in milliseconds for the given ISO 8601
* style time zone string. When the given string is not an ISO 8601 time zone
* string, this method sets the current position as the error index
@@ -418,7 +546,8 @@
* @param pos The ParsePosition object.
* @return The offset from GMT(UTC) in milliseconds for the given ISO 8601 style
* time zone string.
- * @see #formatOffsetISO8601
+ * @see #formatOffsetISO8601Basic
+ * @see #formatOffsetISO8601Extended
* @draft ICU 50
*/
int32_t parseOffsetISO8601(const UnicodeString& text, ParsePosition& pos) const;
@@ -437,6 +566,22 @@
*/
int32_t parseOffsetLocalizedGMT(const UnicodeString& text, ParsePosition& pos) const;
+#ifndef U_HIDE_DRAFT_API
+ /**
+ * Returns offset from GMT(UTC) in milliseconds for the given short localized GMT
+ * offset format string. When the given string cannot be parsed, this method
+ * sets the current position as the error index to <code>ParsePosition pos</code>
+ * and returns 0.
+ * @param text The text contains a short localized GMT offset string at the position.
+ * @param pos The ParsePosition object.
+ * @return The offset from GMT(UTC) in milliseconds for the given short localized GMT
+ * offset format string.
+ * @see #formatOffsetShortLocalizedGMT
+ * @draft ICU 51
+ */
+ int32_t parseOffsetShortLocalizedGMT(const UnicodeString& text, ParsePosition& pos) const;
+#endif /* U_HIDE_DRAFT_API */
+
/**
* Returns a <code>TimeZone</code> by parsing the time zone string according to
* the given parse position, the specified format style and parse options.
@@ -544,7 +689,7 @@
UnicodeString fGMTPattern;
/* Array of offset patterns used by Localized GMT format - e.g. "+HH:mm" */
- UnicodeString fGMTOffsetPatterns[UTZFMT_PAT_NEGATIVE_HMS + 1];
+ UnicodeString fGMTOffsetPatterns[UTZFMT_PAT_COUNT];
/* Localized decimal digits used by Localized GMT format */
UChar32 fGMTOffsetDigits[10];
@@ -560,7 +705,9 @@
UnicodeString fGMTPatternSuffix; /* Substring after {0} */
/* Compiled offset patterns generated from fGMTOffsetPatterns[] */
- UVector* fGMTOffsetPatternItems[UTZFMT_PAT_NEGATIVE_HMS + 1];
+ UVector* fGMTOffsetPatternItems[UTZFMT_PAT_COUNT];
+
+ UBool fAbuttingOffsetHoursAndMinutes;
/**
* Returns the time zone's specific format string.
@@ -593,6 +740,15 @@
const TimeZoneGenericNames* getTimeZoneGenericNames(UErrorCode& status) const;
/**
+ * Private method returning the time zone's exemplar location string.
+ * This method will never return empty.
+ * @param tz the time zone
+ * @param name receives the time zone's exemplar location name
+ * @return a reference to name.
+ */
+ UnicodeString& formatExemplarLocation(const TimeZone& tz, UnicodeString& name) const;
+
+ /**
* Private enum specifying a combination of offset fields
*/
enum OffsetFields {
@@ -621,13 +777,24 @@
static UVector* parseOffsetPattern(const UnicodeString& pattern, OffsetFields required, UErrorCode& status);
/**
- * Appends second field to the offset pattern with hour/minute
+ * Appends seconds field to the offset pattern with hour/minute
* Note: This code will be obsoleted once we add hour-minute-second pattern data in CLDR.
- * @param offsetHM the offset pattern including hour and minute fields
- * @param result the output offset pattern including hour, minute and second fields
+ * @param offsetHM the offset pattern including hours and minutes fields
+ * @param result the output offset pattern including hour, minute and seconds fields
+ * @param status receives the status
* @return a reference to result
*/
- static UnicodeString& expandOffsetPattern(const UnicodeString& offsetHM, UnicodeString& result);
+ static UnicodeString& expandOffsetPattern(const UnicodeString& offsetHM, UnicodeString& result, UErrorCode& status);
+
+ /**
+ * Truncates minutes field to the offset pattern with hour/minute
+ * Note: This code will be obsoleted once we add hour pattern data in CLDR.
+ * @param offsetHM the offset pattern including hours and minutes fields
+ * @param result the output offset pattern including only hours field
+ * @param status receives the status
+ * @return a reference to result
+ */
+ static UnicodeString& truncateOffsetPattern(const UnicodeString& offsetHM, UnicodeString& result, UErrorCode& status);
/**
* Break input string into UChar32[]. Each array element represents
@@ -642,6 +809,28 @@
static UBool toCodePoints(const UnicodeString& str, UChar32* codeArray, int32_t capacity);
/**
+ * Private method supprting all of ISO8601 formats
+ * @param offset the offset from GMT(UTC) in milliseconds.
+ * @param useUtcIndicator true if ISO 8601 UTC indicator "Z" is used when the offset is 0.
+ * @param isShort true if shortest form is used.
+ * @param ignoreSeconds true if non-zero offset seconds is appended.
+ * @param result Receives the result
+ * @param status Receives the status
+ * @return the ISO 8601 basic format.
+ */
+ UnicodeString& formatOffsetISO8601(int32_t offset, UBool isBasic, UBool useUtcIndicator,
+ UBool isShort, UBool ignoreSeconds, UnicodeString& result, UErrorCode& status) const;
+
+ /**
+ * Private method used for localized GMT formatting.
+ * @param offset the zone's UTC offset
+ * @param isShort true if the short localized GMT format is desired.
+ * @param result receives the localized GMT format string
+ * @param status receives the status
+ */
+ UnicodeString& formatOffsetLocalizedGMT(int32_t offset, UBool isShort, UnicodeString& result, UErrorCode& status) const;
+
+ /**
* Returns offset from GMT(UTC) in milliseconds for the given ISO 8601 style
* (extended format) time zone string. When the given string is not an ISO 8601 time
* zone string, this method sets the current position as the error index
@@ -674,23 +863,49 @@
* and returns 0.
* @param text the text contains a localized GMT offset string at the position.
* @param pos the position, non-negative error index will be set on failure.
+ * @param isShort true if this parser to try the short format first
* @param hasDigitOffset receiving if the parsed zone string contains offset digits.
* @return the offset from GMT(UTC) in milliseconds for the given localized GMT
* offset format string.
*/
int32_t parseOffsetLocalizedGMT(const UnicodeString& text, ParsePosition& pos,
- UBool* hasDigitOffset) const;
+ UBool isShort, UBool* hasDigitOffset) const;
+
+ /**
+ * Parse localized GMT format generated by the patter used by this formatter, except
+ * GMT Zero format.
+ * @param text the input text
+ * @param start the start index
+ * @param isShort true if the short localized format is parsed.
+ * @param parsedLen receives the parsed length
+ * @return the parsed offset in milliseconds
+ */
+ int32_t parseOffsetLocalizedGMTPattern(const UnicodeString& text, int32_t start,
+ UBool isShort, int32_t& parsedLen) const;
/**
* Parses localized GMT offset fields into offset.
* @param text the input text
* @param start the start index
- * @param minimumHourWidth true if the parser allows hour field width to be 1
+ * @param isShort true if this is a short format - currently not used
* @param parsedLen the parsed length, or 0 on failure.
* @return the parsed offset in milliseconds.
*/
- int32_t parseOffsetFields(const UnicodeString& text, int32_t start, UBool minimumHourWidth,
- int32_t& parsedLen) const;
+ int32_t parseOffsetFields(const UnicodeString& text, int32_t start, UBool isShort, int32_t& parsedLen) const;
+
+ /**
+ * Parse localized GMT offset fields with the given pattern.
+ * @param text the input text
+ * @param start the start index
+ * @param pattenItems the pattern (already itemized)
+ * @param forceSingleHourDigit true if hours field is parsed as a single digit
+ * @param hour receives the hour offset field
+ * @param min receives the minute offset field
+ * @param sec receives the second offset field
+ * @return the parsed length
+ */
+ int32_t parseOffsetFieldsWithPattern(const UnicodeString& text, int32_t start,
+ UVector* patternItems, UBool forceSingleHourDigit, int32_t& hour, int32_t& min, int32_t& sec) const;
/**
* Parses abutting localized GMT offset fields (such as 0800) into offset.
@@ -770,7 +985,7 @@
* @param pos The parse position
* @param minFields The minimum Fields to be parsed
* @param maxFields The maximum Fields to be parsed
- * @param fixedHourWidth true if hour field must be width of 2
+ * @param fixedHourWidth true if hours field must be width of 2
* @return Parsed offset, 0 or positive number.
*/
static int32_t parseAbuttingAsciiOffsetFields(const UnicodeString& text, ParsePosition& pos,
@@ -786,11 +1001,10 @@
* @param sep The separator character
* @param minFields The minimum Fields to be parsed
* @param maxFields The maximum Fields to be parsed
- * @param fixedHourWidth true if hour field must be width of 2
* @return Parsed offset, 0 or positive number.
*/
static int32_t parseAsciiOffsetFields(const UnicodeString& text, ParsePosition& pos, UChar sep,
- OffsetFields minFields, OffsetFields maxFields, UBool fixedHourWidth);
+ OffsetFields minFields, OffsetFields maxFields);
/**
* Unquotes the message format style pattern.
@@ -808,6 +1022,14 @@
void initGMTOffsetPatterns(UErrorCode& status);
/**
+ * Check if there are any GMT format offset patterns without
+ * any separators between hours field and minutes field and update
+ * fAbuttingOffsetHoursAndMinutes field. This method must be called
+ * after all patterns are parsed into pattern items.
+ */
+ void checkAbuttingHoursAndMinutes();
+
+ /**
* Creates an instance of TimeZone for the given offset
* @param offset the offset
* @return A TimeZone with the given offset
@@ -821,7 +1043,7 @@
*/
static UTimeZoneFormatTimeType getTimeType(UTimeZoneNameType nameType);
- /*
+ /**
* Returns the time zone ID of a match at the specified index within
* the MatchInfoCollection.
* @param matches the collection of matches
@@ -830,11 +1052,39 @@
* @return a reference to tzID.
*/
UnicodeString& getTimeZoneID(const TimeZoneNames::MatchInfoCollection* matches, int32_t idx, UnicodeString& tzID) const;
+
+
+ /**
+ * Parse a zone ID.
+ * @param text the text contains a time zone ID string at the position.
+ * @param pos the position
+ * @param tzID receives the zone ID
+ * @return a reference to tzID
+ */
+ UnicodeString& parseZoneID(const UnicodeString& text, ParsePosition& pos, UnicodeString& tzID) const;
+
+ /**
+ * Parse a short zone ID.
+ * @param text the text contains a short time zone ID string at the position.
+ * @param pos the position
+ * @param tzID receives the short zone ID
+ * @return a reference to tzID
+ */
+ UnicodeString& parseShortZoneID(const UnicodeString& text, ParsePosition& pos, UnicodeString& tzID) const;
+
+ /**
+ * Parse an exemplar location string.
+ * @param text the text contains an exemplar location string at the position.
+ * @param pos the position.
+ * @param tzID receives the time zone ID
+ * @return a reference to tzID
+ */
+ UnicodeString& parseExemplarLocation(const UnicodeString& text, ParsePosition& pos, UnicodeString& tzID) const;
};
U_NAMESPACE_END
-#endif /* U_HIDE_INTERNAL_API */
-#endif
+#endif /* ndef U_HIDE_DRAFT_API */
+#endif /* !UCONFIG_NO_FORMATTING */
#endif
diff --git a/i18n/unicode/tznames.h b/i18n/unicode/tznames.h
index 2de296d..4e1f011 100644
--- a/i18n/unicode/tznames.h
+++ b/i18n/unicode/tznames.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2011-2012, International Business Machines Corporation and *
+* Copyright (C) 2011-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@@ -14,7 +14,7 @@
#include "unicode/utypes.h"
#if !UCONFIG_NO_FORMATTING
-#ifndef U_HIDE_INTERNAL_API
+#ifndef U_HIDE_DRAFT_API
#include "unicode/uloc.h"
#include "unicode/unistr.h"
@@ -60,7 +60,14 @@
* Short display name for daylight saving time, such as "EDT".
* @draft ICU 50
*/
- UTZNM_SHORT_DAYLIGHT = 0x20
+ UTZNM_SHORT_DAYLIGHT = 0x20,
+#ifndef U_HIDE_DRAFT_API
+ /**
+ * Exemplar location name, such as "Los Angeles".
+ * @draft ICU 51
+ */
+ UTZNM_EXEMPLAR_LOCATION = 0x40
+#endif /* U_HIDE_DRAFT_API */
} UTimeZoneNameType;
U_CDECL_END
@@ -111,6 +118,13 @@
* may provide time zone names only through {@link #getTimeZoneDisplayName}, or only through {@link #getMetaZoneDisplayName},
* or both.
*
+ * <p>
+ * The default <code>TimeZoneNames</code> implementation returned by {@link #createInstance}
+ * uses the locale data imported from CLDR. In CLDR, set of meta zone IDs and mappings between zone IDs and meta zone
+ * IDs are shared by all locales. Therefore, the behavior of {@link #getAvailableMetaZoneIDs},
+ * {@link #getMetaZoneID}, and {@link #getReferenceZoneID} won't be changed no matter
+ * what locale is used for getting an instance of <code>TimeZoneNames</code>.
+ *
* @draft ICU 50
*/
class U_I18N_API TimeZoneNames : public UObject {
@@ -187,6 +201,12 @@
/**
* Returns the reference zone ID for the given meta zone ID for the region.
+ *
+ * Note: Each meta zone must have a reference zone associated with a special region "001" (world).
+ * Some meta zones may have region specific reference zone IDs other than the special region
+ * "001". When a meta zone does not have any region specific reference zone IDs, this method
+ * return the reference zone ID for the special region "001" (world).
+ *
* @param mzID The meta zone ID.
* @param region The region.
* @param tzID Receives the reference zone ID ("golden zone" in the LDML specification) for the given time zone ID for the
@@ -277,6 +297,7 @@
*/
virtual ~MatchInfoCollection();
+#ifndef U_HIDE_INTERNAL_API
/**
* Adds a zone match.
* @param nameType The name type.
@@ -342,6 +363,7 @@
* @internal
*/
UBool getMetaZoneIDAt(int32_t idx, UnicodeString& mzID) const;
+#endif /* U_HIDE_INTERNAL_API */
private:
UVector* fMatches; // vector of MatchEntry
@@ -363,14 +385,10 @@
* @internal
*/
virtual MatchInfoCollection* find(const UnicodeString& text, int32_t start, uint32_t types, UErrorCode& status) const = 0;
-
-private:
- // No ICU "poor man's RTTI" for this class nor its subclasses.
- virtual UClassID getDynamicClassID() const;
};
U_NAMESPACE_END
-#endif /* U_HIDE_INTERNAL_API */
+#endif /* U_HIDE_DRAFT_API */
#endif
#endif
diff --git a/i18n/unicode/ucal.h b/i18n/unicode/ucal.h
index fab9bb7..50b625a 100644
--- a/i18n/unicode/ucal.h
+++ b/i18n/unicode/ucal.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
- * Copyright (C) 1996-2012, International Business Machines Corporation and
+ * Copyright (C) 1996-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
@@ -745,6 +745,24 @@
int32_t len,
UErrorCode* status);
+#ifndef U_HIDE_DRAFT_API
+/**
+ * Get the ID of the UCalendar's time zone.
+ *
+ * @param cal The UCalendar to query.
+ * @param result Receives the UCalendar's time zone ID.
+ * @param resultLength The maximum size of result.
+ * @param status Receives the status.
+ * @return The total buffer size needed; if greater than resultLength, the output was truncated.
+ * @draft ICU 51
+ */
+U_DRAFT int32_t U_EXPORT2
+ucal_getTimeZoneID(const UCalendar *cal,
+ UChar *result,
+ int32_t resultLength,
+ UErrorCode *status);
+#endif /* U_HIDE_DRAFT_API */
+
/**
* Possible formats for a UCalendar's display name
* @stable ICU 2.0
@@ -861,22 +879,19 @@
* Minimum number of days in first week
* @stable ICU 2.0
*/
- UCAL_MINIMAL_DAYS_IN_FIRST_WEEK
-#ifndef U_HIDE_DRAFT_API
- ,
+ UCAL_MINIMAL_DAYS_IN_FIRST_WEEK,
/**
* The behavior for handling wall time repeating multiple times
* at negative time zone offset transitions
- * @draft ICU 49
+ * @stable ICU 49
*/
UCAL_REPEATED_WALL_TIME,
/**
* The behavior for handling skipped wall time at positive time
* zone offset transitions.
- * @draft ICU 49
+ * @stable ICU 49
*/
UCAL_SKIPPED_WALL_TIME
-#endif /* U_HIDE_DRAFT_API */
};
/** @stable ICU 2.0 */
@@ -885,34 +900,31 @@
/**
* Options for handling ambiguous wall time at time zone
* offset transitions.
- * @draft ICU 49
+ * @stable ICU 49
*/
enum UCalendarWallTimeOption {
/**
* An ambiguous wall time to be interpreted as the latest.
* This option is valid for UCAL_REPEATED_WALL_TIME and
* UCAL_SKIPPED_WALL_TIME.
- * @draft ICU 49
+ * @stable ICU 49
*/
- UCAL_WALLTIME_LAST
-#ifndef U_HIDE_DRAFT_API
- ,
+ UCAL_WALLTIME_LAST,
/**
* An ambiguous wall time to be interpreted as the earliest.
* This option is valid for UCAL_REPEATED_WALL_TIME and
* UCAL_SKIPPED_WALL_TIME.
- * @draft ICU 49
+ * @stable ICU 49
*/
UCAL_WALLTIME_FIRST,
/**
* An ambiguous wall time to be interpreted as the next valid
* wall time. This option is valid for UCAL_SKIPPED_WALL_TIME.
- * @draft ICU 49
+ * @stable ICU 49
*/
UCAL_WALLTIME_NEXT_VALID
-#endif /* U_HIDE_DRAFT_API */
};
-/** @draft ICU 49 */
+/** @stable ICU 49 */
typedef enum UCalendarWallTimeOption UCalendarWallTimeOption;
/**
diff --git a/i18n/unicode/ucol.h b/i18n/unicode/ucol.h
index cc97a9a..dbc4d05 100644
--- a/i18n/unicode/ucol.h
+++ b/i18n/unicode/ucol.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (c) 1996-2012, International Business Machines Corporation and others.
+* Copyright (c) 1996-2013, International Business Machines Corporation and others.
* All Rights Reserved.
*******************************************************************************
*/
@@ -533,6 +533,7 @@
const UChar *target,
int32_t targetLength);
+#ifndef U_HIDE_DRAFT_API
/**
* Compare two strings in UTF-8.
* The strings will be compared using the options already specified.
@@ -559,6 +560,7 @@
const char *target,
int32_t targetLength,
UErrorCode *status);
+#endif /* U_HIDE_DRAFT_API */
/**
* Determine if one string is greater than another.
@@ -1087,26 +1089,40 @@
U_STABLE void U_EXPORT2
ucol_getUCAVersion(const UCollator* coll, UVersionInfo info);
-/**
- * Merge two sort keys. The levels are merged with their corresponding counterparts
+/**
+ * Merges two sort keys. The levels are merged with their corresponding counterparts
* (primaries with primaries, secondaries with secondaries etc.). Between the values
* from the same level a separator is inserted.
- * example (uncompressed):
- * 191B1D 01 050505 01 910505 00 and 1F2123 01 050505 01 910505 00
+ *
+ * This is useful, for example, for combining sort keys from first and last names
+ * to sort such pairs.
+ * It is possible to merge multiple sort keys by consecutively merging
+ * another one with the intermediate result.
+ *
+ * The length of the merge result is the sum of the lengths of the input sort keys.
+ *
+ * Example (uncompressed):
+ * <pre>191B1D 01 050505 01 910505 00
+ * 1F2123 01 050505 01 910505 00</pre>
* will be merged as
- * 191B1D 02 1F212301 050505 02 050505 01 910505 02 910505 00
- * This allows for concatenating of first and last names for sorting, among other things.
- * If the destination buffer is not big enough, the results are undefined.
- * If any of source lengths are zero or any of source pointers are NULL/undefined,
- * result is of size zero.
- * @param src1 pointer to the first sortkey
- * @param src1Length length of the first sortkey
- * @param src2 pointer to the second sortkey
- * @param src2Length length of the second sortkey
- * @param dest buffer to hold the result
- * @param destCapacity size of the buffer for the result
- * @return size of the result. If the buffer is big enough size is always
- * src1Length+src2Length-1
+ * <pre>191B1D 02 1F2123 01 050505 02 050505 01 910505 02 910505 00</pre>
+ *
+ * If the destination buffer is not big enough, then its contents are undefined.
+ * If any of source lengths are zero or any of the source pointers are NULL/undefined,
+ * the result is of size zero.
+ *
+ * @param src1 the first sort key
+ * @param src1Length the length of the first sort key, including the zero byte at the end;
+ * can be -1 if the function is to find the length
+ * @param src2 the second sort key
+ * @param src2Length the length of the second sort key, including the zero byte at the end;
+ * can be -1 if the function is to find the length
+ * @param dest the buffer where the merged sort key is written,
+ * can be NULL if destCapacity==0
+ * @param destCapacity the number of bytes in the dest buffer
+ * @return the length of the merged sort key, src1Length+src2Length;
+ * can be larger than destCapacity, or 0 if an error occurs (only for illegal arguments),
+ * in which cases the contents of dest is undefined
* @stable ICU 2.0
*/
U_STABLE int32_t U_EXPORT2
diff --git a/i18n/unicode/ucurr.h b/i18n/unicode/ucurr.h
index a20d7f0..2769813 100644
--- a/i18n/unicode/ucurr.h
+++ b/i18n/unicode/ucurr.h
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (c) 2002-2012, International Business Machines
+* Copyright (c) 2002-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@@ -343,7 +343,6 @@
UBool commonlyUsed,
UErrorCode* status);
-#ifndef U_HIDE_DRAFT_API
/**
* Returns the ISO 4217 numeric code for the currency.
* <p>Note: If the ISO 4217 numeric code is not assigned for the currency or
@@ -351,11 +350,10 @@
*
* @param currency null-terminated 3-letter ISO 4217 code
* @return The ISO 4217 numeric code of the currency
- * @draft ICU 49
+ * @stable ICU 49
*/
-U_DRAFT int32_t U_EXPORT2
+U_STABLE int32_t U_EXPORT2
ucurr_getNumericCode(const UChar* currency);
-#endif /* U_HIDE_DRAFT_API */
#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/i18n/unicode/udat.h b/i18n/unicode/udat.h
index ede0b1e..910ac0f 100644
--- a/i18n/unicode/udat.h
+++ b/i18n/unicode/udat.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
- * Copyright (C) 1996-2012, International Business Machines
+ * Copyright (C) 1996-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*/
@@ -169,6 +169,7 @@
/** No style */
UDAT_NONE = -1,
+#ifndef U_HIDE_DRAFT_API
/**
* Use the pattern given in the parameter to udat_open
* @see udat_open
@@ -178,6 +179,7 @@
/** @internal alias to UDAT_PATTERN */
UDAT_IGNORE = UDAT_PATTERN
+#endif /* U_HIDE_DRAFT_API */
} UDateFormatStyle;
// Skeletons for dates.
@@ -187,16 +189,18 @@
* @stable ICU 4.0
*/
#define UDAT_YEAR "y"
+#ifndef U_HIDE_DRAFT_API
/**
* Constant for date skeleton with quarter.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
#define UDAT_QUARTER "QQQQ"
/**
* Constant for date skeleton with abbreviated quarter.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
#define UDAT_ABBR_QUARTER "QQQ"
+#endif /* U_HIDE_DRAFT_API */
/**
* Constant for date skeleton with year and quarter.
* @stable ICU 4.0
@@ -260,16 +264,18 @@
* @stable ICU 4.0
*/
#define UDAT_YEAR_NUM_MONTH_DAY "yMd"
+#ifndef U_HIDE_DRAFT_API
/**
* Constant for date skeleton with weekday.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
#define UDAT_WEEKDAY "EEEE"
/**
* Constant for date skeleton with abbreviated weekday.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
#define UDAT_ABBR_WEEKDAY "E"
+#endif /* U_HIDE_DRAFT_API */
/**
* Constant for date skeleton with year, month, weekday, and day.
* Used in combinations date + time, date + time + zone, or time + zone.
@@ -332,16 +338,18 @@
* @stable ICU 4.0
*/
#define UDAT_HOUR "j"
+#ifndef U_HIDE_DRAFT_API
/**
* Constant for date skeleton with hour in 24-hour presentation.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
#define UDAT_HOUR24 "H"
/**
* Constant for date skeleton with minute.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
#define UDAT_MINUTE "m"
+#endif /* U_HIDE_DRAFT_API */
/**
* Constant for date skeleton with hour and minute, with the locale's preferred hour format (12 or 24).
* Used in combinations date + time, date + time + zone, or time + zone.
@@ -354,11 +362,13 @@
* @stable ICU 4.0
*/
#define UDAT_HOUR24_MINUTE "Hm"
+#ifndef U_HIDE_DRAFT_API
/**
* Constant for date skeleton with second.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
#define UDAT_SECOND "s"
+#endif /* U_HIDE_DRAFT_API */
/**
* Constant for date skeleton with hour, minute, and second,
* with the locale's preferred hour format (12 or 24).
@@ -382,12 +392,13 @@
// Skeletons for time zones.
+#ifndef U_HIDE_DRAFT_API
/**
* Constant for <i>generic location format</i>, such as Los Angeles Time;
* used in combinations date + time + zone, or time + zone.
* @see <a href="http://unicode.org/reports/tr35/#Date_Format_Patterns">LDML Date Format Patterns</a>
* @see <a href="http://unicode.org/reports/tr35/#Time_Zone_Fallback">LDML Time Zone Fallback</a>
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
#define UDAT_LOCATION_TZ "VVVV"
/**
@@ -395,7 +406,7 @@
* used in combinations date + time + zone, or time + zone.
* @see <a href="http://unicode.org/reports/tr35/#Date_Format_Patterns">LDML Date Format Patterns</a>
* @see <a href="http://unicode.org/reports/tr35/#Time_Zone_Fallback">LDML Time Zone Fallback</a>
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
#define UDAT_GENERIC_TZ "vvvv"
/**
@@ -403,7 +414,7 @@
* used in combinations date + time + zone, or time + zone.
* @see <a href="http://unicode.org/reports/tr35/#Date_Format_Patterns">LDML Date Format Patterns</a>
* @see <a href="http://unicode.org/reports/tr35/#Time_Zone_Fallback">LDML Time Zone Fallback</a>
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
#define UDAT_ABBR_GENERIC_TZ "v"
/**
@@ -411,7 +422,7 @@
* used in combinations date + time + zone, or time + zone.
* @see <a href="http://unicode.org/reports/tr35/#Date_Format_Patterns">LDML Date Format Patterns</a>
* @see <a href="http://unicode.org/reports/tr35/#Time_Zone_Fallback">LDML Time Zone Fallback</a>
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
#define UDAT_SPECIFIC_TZ "zzzz"
/**
@@ -419,7 +430,7 @@
* used in combinations date + time + zone, or time + zone.
* @see <a href="http://unicode.org/reports/tr35/#Date_Format_Patterns">LDML Date Format Patterns</a>
* @see <a href="http://unicode.org/reports/tr35/#Time_Zone_Fallback">LDML Time Zone Fallback</a>
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
#define UDAT_ABBR_SPECIFIC_TZ "z"
/**
@@ -427,12 +438,14 @@
* used in combinations date + time + zone, or time + zone.
* @see <a href="http://unicode.org/reports/tr35/#Date_Format_Patterns">LDML Date Format Patterns</a>
* @see <a href="http://unicode.org/reports/tr35/#Time_Zone_Fallback">LDML Time Zone Fallback</a>
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
#define UDAT_ABBR_UTC_TZ "ZZZZ"
+#endif /* U_HIDE_DRAFT_API */
// deprecated skeleton constants
+#ifndef U_HIDE_DEPRECATED_API
/**
* Constant for date skeleton with standalone month.
* @deprecated ICU 50 Use UDAT_MONTH instead.
@@ -464,6 +477,7 @@
* @deprecated ICU 50 Use instead UDAT_HOUR UDAT_ABBR_SPECIFIC_TZ or some other timezone presentation.
*/
#define UDAT_HOUR_TZ "jz"
+#endif /* U_HIDE_DEPRECATED_API */
/**
* FieldPosition and UFieldPosition selectors for format fields
@@ -709,11 +723,37 @@
* corresponding to cyclic year names. This is implemented
* using the {@link #UCAL_YEAR} field. This displays
* the cyclic year name, if available.
- * @draft ICU 49
+ * @stable ICU 49
*/
UDAT_YEAR_NAME_FIELD = 30,
- /**
+#ifndef U_HIDE_DRAFT_API
+ /**
+ * FieldPosition selector for 'O' field alignment,
+ * corresponding to the UCAL_ZONE_OFFSET and UCAL_DST_OFFSETfields.
+ * This displays the localized GMT format.
+ * @draft ICU 51
+ */
+ UDAT_TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD = 31,
+
+ /**
+ * FieldPosition selector for 'X' field alignment,
+ * corresponding to the UCAL_ZONE_OFFSET and UCAL_DST_OFFSETfields.
+ * This displays the ISO 8601 local time offset format or UTC indicator ("Z").
+ * @draft ICU 51
+ */
+ UDAT_TIMEZONE_ISO_FIELD = 32,
+
+ /**
+ * FieldPosition selector for 'x' field alignment,
+ * corresponding to the UCAL_ZONE_OFFSET and UCAL_DST_OFFSETfields.
+ * This displays the ISO 8601 local time offset format.
+ * @draft ICU 51
+ */
+ UDAT_TIMEZONE_ISO_LOCAL_FIELD = 33,
+#endif /* U_HIDE_DRAFT_API */
+
+ /**
* Number of FieldPosition and UFieldPosition selectors for
* DateFormat and UDateFormat.
* Valid selectors range from 0 to UDAT_FIELD_COUNT-1.
@@ -721,7 +761,7 @@
* in the future.
* @stable ICU 3.0
*/
- UDAT_FIELD_COUNT = 31
+ UDAT_FIELD_COUNT = 34
} UDateFormatField;
@@ -1077,9 +1117,12 @@
UDAT_MONTHS,
/** The short month names, for example Feb. */
UDAT_SHORT_MONTHS,
- /** The weekday names, for example Monday */
+ /** The CLDR-style format "wide" weekday names, for example Monday */
UDAT_WEEKDAYS,
- /** The short weekday names, for example Mon. */
+ /**
+ * The CLDR-style format "abbreviated" (not "short") weekday names, for example "Mon."
+ * For the CLDR-style format "short" weekday names, use UDAT_SHORTER_WEEKDAYS.
+ */
UDAT_SHORT_WEEKDAYS,
/** The AM/PM names, for example AM */
UDAT_AM_PMS,
@@ -1089,15 +1132,20 @@
UDAT_ERA_NAMES,
/** The narrow month names, for example F */
UDAT_NARROW_MONTHS,
- /** The narrow weekday names, for example N */
+ /** The CLDR-style format "narrow" weekday names, for example "M" */
UDAT_NARROW_WEEKDAYS,
/** Standalone context versions of months */
UDAT_STANDALONE_MONTHS,
UDAT_STANDALONE_SHORT_MONTHS,
UDAT_STANDALONE_NARROW_MONTHS,
- /** Standalone context versions of weekdays */
+ /** The CLDR-style stand-alone "wide" weekday names */
UDAT_STANDALONE_WEEKDAYS,
+ /**
+ * The CLDR-style stand-alone "abbreviated" (not "short") weekday names.
+ * For the CLDR-style stand-alone "short" weekday names, use UDAT_STANDALONE_SHORTER_WEEKDAYS.
+ */
UDAT_STANDALONE_SHORT_WEEKDAYS,
+ /** The CLDR-style stand-alone "narrow" weekday names */
UDAT_STANDALONE_NARROW_WEEKDAYS,
/** The quarters, for example 1st Quarter */
UDAT_QUARTERS,
@@ -1105,8 +1153,22 @@
UDAT_SHORT_QUARTERS,
/** Standalone context versions of quarters */
UDAT_STANDALONE_QUARTERS,
- UDAT_STANDALONE_SHORT_QUARTERS
-
+ UDAT_STANDALONE_SHORT_QUARTERS,
+#ifndef U_HIDE_DRAFT_API
+ /**
+ * The CLDR-style short weekday names, e.g. "Su", Mo", etc.
+ * These are named "SHORTER" to contrast with the constants using _SHORT_
+ * above, which actually get the CLDR-style *abbreviated* versions of the
+ * corresponding names.
+ * @draft ICU 51
+ */
+ UDAT_SHORTER_WEEKDAYS,
+ /**
+ * Standalone version of UDAT_SHORTER_WEEKDAYS.
+ * @draft ICU 51
+ */
+ UDAT_STANDALONE_SHORTER_WEEKDAYS
+#endif /* U_HIDE_DRAFT_API */
} UDateFormatSymbolType;
struct UDateFormatSymbols;
@@ -1193,16 +1255,16 @@
ULocDataLocaleType type,
UErrorCode* status);
-#ifndef U_HIDE_INTERNAL_API
+#ifndef U_HIDE_DRAFT_API
/**
* Set a particular UDisplayContext value in the formatter, such as
* UDISPCTX_CAPITALIZATION_FOR_STANDALONE.
* @param fmt The formatter for which to set a UDisplayContext value.
* @param value The UDisplayContext value to set.
* @param status A pointer to an UErrorCode to receive any errors
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
-U_INTERNAL void U_EXPORT2
+U_DRAFT void U_EXPORT2
udat_setContext(UDateFormat* fmt, UDisplayContext value, UErrorCode* status);
/**
@@ -1212,12 +1274,12 @@
* @param type The UDisplayContextType whose value to return
* @param status A pointer to an UErrorCode to receive any errors
* @return The UDisplayContextValue for the specified type.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
-U_INTERNAL UDisplayContext U_EXPORT2
+U_DRAFT UDisplayContext U_EXPORT2
udat_getContext(UDateFormat* fmt, UDisplayContextType type, UErrorCode* status);
-#endif /* U_HIDE_INTERNAL_API */
+#endif /* U_HIDE_DRAFT_API */
#ifndef U_HIDE_INTERNAL_API
/**
@@ -1273,7 +1335,6 @@
const UChar *timePattern,
int32_t timePatternLength,
UErrorCode *status);
-#endif /* U_HIDE_INTERNAL_API */
/**
* @internal
@@ -1301,6 +1362,7 @@
*/
U_INTERNAL UDateFormatOpener U_EXPORT2
udat_unregisterOpener(UDateFormatOpener opener, UErrorCode *status);
+#endif /* U_HIDE_INTERNAL_API */
#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/i18n/unicode/udisplaycontext.h b/i18n/unicode/udisplaycontext.h
index f41cd63..b3ff0af 100644
--- a/i18n/unicode/udisplaycontext.h
+++ b/i18n/unicode/udisplaycontext.h
@@ -1,6 +1,6 @@
/*
*****************************************************************************************
-* Copyright (C) 2012, International Business Machines
+* Copyright (C) 2013, International Business Machines
* Corporation and others. All Rights Reserved.
*****************************************************************************************
*/
@@ -12,39 +12,42 @@
#if !UCONFIG_NO_FORMATTING
-/* Dont hide with #ifndef U_HIDE_INTERNAL_API, needed by virtual methods */
+/* Dont hide with #ifndef U_HIDE_DRAFT_API, needed by virtual methods */
/**
* Display context types, for getting values of a particular setting.
* Note, the specific numeric values are internal and may change.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
enum UDisplayContextType {
+#ifndef U_HIDE_DRAFT_API
/**
* Type to retrieve the dialect handling setting, e.g.
* UDISPCTX_STANDARD_NAMES or UDISPCTX_DIALECT_NAMES.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
UDISPCTX_TYPE_DIALECT_HANDLING = 0,
/**
* Type to retrieve the capitalization context setting, e.g.
* UDISPCTX_CAPITALIZATION_NONE, UDISPCTX_CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE,
* UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, etc.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
UDISPCTX_TYPE_CAPITALIZATION = 1
+#endif /* U_HIDE_DRAFT_API */
};
/**
-* @internal ICU 50 technology preview
+* @draft ICU 51
*/
typedef enum UDisplayContextType UDisplayContextType;
-/* Dont hide with #ifndef U_HIDE_INTERNAL_API, needed by virtual methods */
+/* Dont hide with #ifndef U_HIDE_DRAFT_API, needed by virtual methods */
/**
* Display context settings.
* Note, the specific numeric values are internal and may change.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
enum UDisplayContext {
+#ifndef U_HIDE_DRAFT_API
/**
* ================================
* DIALECT_HANDLING can be set to one of UDISPCTX_STANDARD_NAMES or
@@ -55,14 +58,14 @@
* A possible setting for DIALECT_HANDLING:
* use standard names when generating a locale name,
* e.g. en_GB displays as 'English (United Kingdom)'.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
UDISPCTX_STANDARD_NAMES = (UDISPCTX_TYPE_DIALECT_HANDLING<<8) + 0,
/**
* A possible setting for DIALECT_HANDLING:
* use dialect names, when generating a locale name,
* e.g. en_GB displays as 'British English'.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
UDISPCTX_DIALECT_NAMES = (UDISPCTX_TYPE_DIALECT_HANDLING<<8) + 1,
/**
@@ -76,37 +79,38 @@
*/
/**
* The capitalization context to be used is unknown (this is the default value).
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
UDISPCTX_CAPITALIZATION_NONE = (UDISPCTX_TYPE_CAPITALIZATION<<8) + 0,
/**
* The capitalization context if a date, date symbol or display name is to be
* formatted with capitalization appropriate for the middle of a sentence.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
UDISPCTX_CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE = (UDISPCTX_TYPE_CAPITALIZATION<<8) + 1,
/**
* The capitalization context if a date, date symbol or display name is to be
* formatted with capitalization appropriate for the beginning of a sentence.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE = (UDISPCTX_TYPE_CAPITALIZATION<<8) + 2,
/**
* The capitalization context if a date, date symbol or display name is to be
* formatted with capitalization appropriate for a user-interface list or menu item.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU = (UDISPCTX_TYPE_CAPITALIZATION<<8) + 3,
/**
* The capitalization context if a date, date symbol or display name is to be
* formatted with capitalization appropriate for stand-alone usage such as an
* isolated name on a calendar page.
- * @internal ICU 50 technology preview
+ * @draft ICU 51
*/
UDISPCTX_CAPITALIZATION_FOR_STANDALONE = (UDISPCTX_TYPE_CAPITALIZATION<<8) + 4
+#endif /* U_HIDE_DRAFT_API */
};
/**
-* @internal ICU 50 technology preview
+* @draft ICU 51
*/
typedef enum UDisplayContext UDisplayContext;
diff --git a/i18n/unicode/ugender.h b/i18n/unicode/ugender.h
index 38a40ec..6d6cf3a 100644
--- a/i18n/unicode/ugender.h
+++ b/i18n/unicode/ugender.h
@@ -1,6 +1,6 @@
/*
*****************************************************************************************
-* Copyright (C) 2010-2012, International Business Machines
+* Copyright (C) 2010-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*****************************************************************************************
*/
@@ -11,6 +11,7 @@
#include "unicode/utypes.h"
#if !UCONFIG_NO_FORMATTING
+#ifndef U_HIDE_DRAFT_API
#include "unicode/localpointer.h"
@@ -60,7 +61,7 @@
* @return A UGenderInfo for the specified locale, or NULL if an error occurred.
* @draft ICU 50
*/
-U_STABLE const UGenderInfo* U_EXPORT2
+U_DRAFT const UGenderInfo* U_EXPORT2
ugender_getInstance(const char *locale, UErrorCode *status);
@@ -76,6 +77,7 @@
U_DRAFT UGender U_EXPORT2
ugender_getListGender(const UGenderInfo* genderinfo, const UGender *genders, int32_t size, UErrorCode *status);
+#endif /* U_HIDE_DRAFT_API */
#endif /* #if !UCONFIG_NO_FORMATTING */
#endif
diff --git a/i18n/unicode/uldnames.h b/i18n/unicode/uldnames.h
index 36e74f7..6b2b905 100644
--- a/i18n/unicode/uldnames.h
+++ b/i18n/unicode/uldnames.h
@@ -266,7 +266,7 @@
int32_t maxResultSize,
UErrorCode *pErrorCode);
-#ifndef U_HIDE_INTERNAL_API
+#ifndef U_HIDE_DRAFT_API
/**
* Returns an instance of LocaleDisplayNames that returns names formatted
* for the provided locale, using the provided UDisplayContext settings.
@@ -279,9 +279,9 @@
* a failure status, the function will do nothing; otherwise this will be
* updated with any new status from the function.
* @return a ULocaleDisplayNames instance
-* @internal ICU 50 technology preview
+* @draft ICU 51
*/
-U_INTERNAL ULocaleDisplayNames * U_EXPORT2
+U_DRAFT ULocaleDisplayNames * U_EXPORT2
uldn_openForContext(const char * locale, UDisplayContext *contexts,
int32_t length, UErrorCode *pErrorCode);
@@ -293,13 +293,13 @@
* a failure status, the function will do nothing; otherwise this will be
* updated with any new status from the function.
* @return the UDisplayContextValue for the specified type.
-* @internal ICU 50 technology preview
+* @draft ICU 51
*/
-U_INTERNAL UDisplayContext U_EXPORT2
+U_DRAFT UDisplayContext U_EXPORT2
uldn_getContext(const ULocaleDisplayNames *ldn, UDisplayContextType type,
UErrorCode *pErrorCode);
-#endif /* U_HIDE_INTERNAL_API */
+#endif /* U_HIDE_DRAFT_API */
#endif /* !UCONFIG_NO_FORMATTING */
#endif /* __ULDNAMES_H__ */
diff --git a/i18n/unicode/ulocdata.h b/i18n/unicode/ulocdata.h
index d9dd79e..536b70c 100644
--- a/i18n/unicode/ulocdata.h
+++ b/i18n/unicode/ulocdata.h
@@ -1,7 +1,7 @@
/*
******************************************************************************
* *
-* Copyright (C) 2003-2012, International Business Machines *
+* Copyright (C) 2003-2013, International Business Machines *
* Corporation and others. All Rights Reserved. *
* *
******************************************************************************
@@ -45,8 +45,12 @@
ULOCDATA_ES_AUXILIARY=1,
/** Index Character set @stable ICU 4.8 */
ULOCDATA_ES_INDEX=2,
+#ifndef U_HIDE_DRAFT_API
+ /** Punctuation set @draft ICU 51 */
+ ULOCDATA_ES_PUNCTUATION=3,
+#endif /* U_HIDE_DRAFT_API */
/** One higher than the last valid type @stable ICU 3.4 */
- ULOCDATA_ES_COUNT=3
+ ULOCDATA_ES_COUNT=4
} ULocaleDataExemplarSetType;
/** The possible types of delimiters.
diff --git a/i18n/unicode/unum.h b/i18n/unicode/unum.h
index d8c092e..688b84e 100644
--- a/i18n/unicode/unum.h
+++ b/i18n/unicode/unum.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 1997-2012, International Business Machines Corporation and others.
+* Copyright (C) 1997-2013, International Business Machines Corporation and others.
* All Rights Reserved.
* Modification History:
*
@@ -250,6 +250,20 @@
UNUM_PAD_AFTER_SUFFIX
} UNumberFormatPadPosition;
+#ifndef U_HIDE_DRAFT_API
+/**
+ * Constants for specifying short or long format.
+ * @draft ICU 51
+ */
+typedef enum UNumberCompactStyle {
+ /** @draft ICU 51 */
+ UNUM_SHORT,
+ /** @draft ICU 51 */
+ UNUM_LONG
+ /** @draft ICU 51 */
+} UNumberCompactStyle;
+#endif /* U_HIDE_DRAFT_API */
+
/**
* Constants for specifying currency spacing
* @stable ICU 4.8
@@ -783,7 +797,19 @@
*/
UNUM_PARSE_ALL_INPUT,
#endif
-
+#ifndef U_HIDE_DRAFT_API
+ /**
+ * Scale, which adjusts the position of the
+ * decimal point when formatting. Amounts will be multiplied by 10 ^ (scale)
+ * before they are formatted. The default value for the scale is 0 ( no adjustment ).
+ *
+ * <p>Example: setting the scale to 3, 123 formats as "123,000"
+ * <p>Example: setting the scale to -4, 123 formats as "0.0123"
+ *
+ * @draft ICU 51 */
+ UNUM_SCALE = UNUM_LENIENT_PARSE + 2,
+#endif /* U_HIDE_DRAFT_API */
+#ifndef U_HIDE_INTERNAL_API
/** Count of "regular" numeric attributes.
* @internal */
UNUM_NUMERIC_ATTRIBUTE_COUNT,
@@ -792,13 +818,15 @@
* All items after this one are stored in boolean form.
* @internal */
UNUM_MAX_NONBOOLEAN_ATTRIBUTE = 0x0FFF,
+#endif /* U_HIDE_INTERNAL_API */
+#ifndef U_HIDE_DRAFT_API
/** If 1, specifies that if setting the "max integer digits" attribute would truncate a value, set an error status rather than silently truncating.
* For example, formatting the value 1234 with 4 max int digits would succeed, but formatting 12345 would fail. There is no effect on parsing.
* Default: 0 (not set)
* @draft ICU 50
*/
- UNUM_FORMAT_FAIL_IF_MORE_THAN_MAX_DIGITS,
+ UNUM_FORMAT_FAIL_IF_MORE_THAN_MAX_DIGITS = 0x1000,
/**
* if this attribute is set to 1, specifies that, if the pattern doesn't contain an exponent, the exponent will not be parsed. If the pattern does contain an exponent, this attribute has no effect.
* Has no effect on formatting.
@@ -806,10 +834,13 @@
* @draft ICU 50
*/
UNUM_PARSE_NO_EXPONENT,
+#endif /* U_HIDE_DRAFT_API */
+#ifndef U_HIDE_INTERNAL_API
/** Limit of boolean attributes.
* @internal */
UNUM_LIMIT_BOOLEAN_ATTRIBUTE
+#endif /* U_HIDE_INTERNAL_API */
} UNumberFormatAttribute;
/**
@@ -819,7 +850,8 @@
* @param attr The attribute to query; one of UNUM_PARSE_INT_ONLY, UNUM_GROUPING_USED,
* UNUM_DECIMAL_ALWAYS_SHOWN, UNUM_MAX_INTEGER_DIGITS, UNUM_MIN_INTEGER_DIGITS, UNUM_INTEGER_DIGITS,
* UNUM_MAX_FRACTION_DIGITS, UNUM_MIN_FRACTION_DIGITS, UNUM_FRACTION_DIGITS, UNUM_MULTIPLIER,
-* UNUM_GROUPING_SIZE, UNUM_ROUNDING_MODE, UNUM_FORMAT_WIDTH, UNUM_PADDING_POSITION, UNUM_SECONDARY_GROUPING_SIZE.
+* UNUM_GROUPING_SIZE, UNUM_ROUNDING_MODE, UNUM_FORMAT_WIDTH, UNUM_PADDING_POSITION, UNUM_SECONDARY_GROUPING_SIZE,
+* UNUM_SCALE.
* @return The value of attr.
* @see unum_setAttribute
* @see unum_getDoubleAttribute
@@ -842,7 +874,7 @@
* UNUM_DECIMAL_ALWAYS_SHOWN, UNUM_MAX_INTEGER_DIGITS, UNUM_MIN_INTEGER_DIGITS, UNUM_INTEGER_DIGITS,
* UNUM_MAX_FRACTION_DIGITS, UNUM_MIN_FRACTION_DIGITS, UNUM_FRACTION_DIGITS, UNUM_MULTIPLIER,
* UNUM_GROUPING_SIZE, UNUM_ROUNDING_MODE, UNUM_FORMAT_WIDTH, UNUM_PADDING_POSITION, UNUM_SECONDARY_GROUPING_SIZE,
-* or UNUM_LENIENT_PARSE.
+* UNUM_LENIENT_PARSE, or UNUM_SCALE.
* @param newValue The new value of attr.
* @see unum_getAttribute
* @see unum_getDoubleAttribute
diff --git a/i18n/unicode/upluralrules.h b/i18n/unicode/upluralrules.h
index 4b81321..7409c6c 100644
--- a/i18n/unicode/upluralrules.h
+++ b/i18n/unicode/upluralrules.h
@@ -1,6 +1,6 @@
/*
*****************************************************************************************
-* Copyright (C) 2010-2012, International Business Machines
+* Copyright (C) 2010-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*****************************************************************************************
*/
@@ -37,6 +37,7 @@
* http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
*/
+#ifndef U_HIDE_DRAFT_API
/**
* Type of plurals and PluralRules.
* @draft ICU 50
@@ -62,6 +63,7 @@
* @draft ICU 50
*/
typedef enum UPluralType UPluralType;
+#endif /* U_HIDE_DRAFT_API */
/**
* Opaque UPluralRules object for use in C programs.
@@ -82,6 +84,7 @@
U_STABLE UPluralRules* U_EXPORT2
uplrules_open(const char *locale, UErrorCode *status);
+#ifndef U_HIDE_DRAFT_API
/**
* Opens a new UPluralRules object using the predefined plural rules for a
* given locale and the plural type.
@@ -93,6 +96,7 @@
*/
U_DRAFT UPluralRules* U_EXPORT2
uplrules_openForType(const char *locale, UPluralType type, UErrorCode *status);
+#endif /* U_HIDE_DRAFT_API */
/**
* Closes a UPluralRules object. Once closed it may no longer be used.
diff --git a/i18n/unicode/uregex.h b/i18n/unicode/uregex.h
index acea159..e0007fe 100644
--- a/i18n/unicode/uregex.h
+++ b/i18n/unicode/uregex.h
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (C) 2004-2012, International Business Machines
+* Copyright (C) 2004-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* file name: uregex.h
@@ -51,7 +51,7 @@
Not implemented yet, just a placeholder, hence draft.
@draft ICU 2.4 */
UREGEX_CANON_EQ = 128,
-#endif
+#endif /* U_HIDE_DRAFT_API */
/** Enable case insensitive matching. @stable ICU 2.4 */
UREGEX_CASE_INSENSITIVE = 2,
diff --git a/i18n/unicode/uspoof.h b/i18n/unicode/uspoof.h
index 0a0c2ff..a8aaaf5 100644
--- a/i18n/unicode/uspoof.h
+++ b/i18n/unicode/uspoof.h
@@ -1,6 +1,6 @@
/*
***************************************************************************
-* Copyright (C) 2008-2012, International Business Machines Corporation
+* Copyright (C) 2008-2013, International Business Machines Corporation
* and others. All Rights Reserved.
***************************************************************************
* file name: uspoof.h
@@ -188,12 +188,30 @@
Any Case Confusable. */
USPOOF_ANY_CASE = 8,
+ /**
+ * Check that an identifier is no looser than the specified RestrictionLevel.
+ * The default if uspoof_setRestrctionLevel() is not called is HIGHLY_RESTRICTIVE.
+ *
+ * If USPOOF_AUX_INFO is enabled the actual restriction level of the
+ * identifier being tested will also be returned by uspoof_check().
+ *
+ * @see URestrictionLevel
+ * @see uspoof_setRestrictionLevel
+ * @see USPOOF_AUX_INFO
+ *
+ * @stable ICU 51
+ */
+ USPOOF_RESTRICTION_LEVEL = 16,
+
+#ifndef U_HIDE_DEPRECATED_API
/** Check that an identifier contains only characters from a
* single script (plus chars from the common and inherited scripts.)
* Applies to checks of a single identifier check only.
+ * @deprecated ICU 51 Use RESTRICTION_LEVEL instead.
*/
- USPOOF_SINGLE_SCRIPT = 16,
-
+ USPOOF_SINGLE_SCRIPT = USPOOF_RESTRICTION_LEVEL,
+#endif /* U_HIDE_DEPRECATED_API */
+
/** Check an identifier for the presence of invisible characters,
* such as zero-width spaces, or character sequences that are
* likely not to display, such as multiple occurrences of the same
@@ -208,10 +226,84 @@
*/
USPOOF_CHAR_LIMIT = 64,
- USPOOF_ALL_CHECKS = 0x7f
+#ifndef U_HIDE_DRAFT_API
+ /**
+ * Check that an identifier does not include decimal digits from
+ * more than one numbering system.
+ *
+ * @draft ICU 51
+ */
+ USPOOF_MIXED_NUMBERS = 128,
+#endif /* U_HIDE_DRAFT_API */
+
+ /**
+ * Enable all spoof checks.
+ *
+ * @stable ICU 4.6
+ */
+ USPOOF_ALL_CHECKS = 0xFFFF,
+
+#ifndef U_HIDE_DRAFT_API
+ /**
+ * Enable the return of auxillary (non-error) information in the
+ * upper bits of the check results value.
+ *
+ * If this "check" is not enabled, the results of uspoof_check() will be zero when an
+ * identifier passes all of the enabled checks.
+ *
+ * If this "check" is enabled, (uspoof_check() & USPOOF_ALL_CHECKS) will be zero
+ * when an identifier passes all checks.
+ *
+ * @draft ICU 51
+ */
+ USPOOF_AUX_INFO = 0x40000000
+#endif /* U_HIDE_DRAFT_API */
+
} USpoofChecks;
+#ifndef U_HIDE_DRAFT_API
+ /**
+ * Constants from UAX #39 for use in setRestrictionLevel(), and
+ * for returned identifier restriction levels in check results.
+ * @draft ICU 51
+ */
+ typedef enum URestrictionLevel {
+ /**
+ * Only ASCII characters: U+0000..U+007F
+ *
+ * @draft ICU 51
+ */
+ USPOOF_ASCII = 0x10000000,
+ /**
+ * All characters in each identifier must be from a single script, or from the combinations: Latin + Han +
+ * Hiragana + Katakana; Latin + Han + Bopomofo; or Latin + Han + Hangul. Note that this level will satisfy the
+ * vast majority of Latin-script users; also that TR36 has ASCII instead of Latin.
+ *
+ * @draft ICU 51
+ */
+ USPOOF_HIGHLY_RESTRICTIVE = 0x20000000,
+ /**
+ * Allow Latin with other scripts except Cyrillic, Greek, Cherokee Otherwise, the same as Highly Restrictive
+ *
+ * @draft ICU 51
+ */
+ USPOOF_MODERATELY_RESTRICTIVE = 0x30000000,
+ /**
+ * Allow arbitrary mixtures of scripts. Otherwise, the same as Moderately Restrictive.
+ *
+ * @draft ICU 51
+ */
+ USPOOF_MINIMALLY_RESTRICTIVE = 0x40000000,
+ /**
+ * Any valid identifiers, including characters outside of the Identifier Profile.
+ *
+ * @draft ICU 51
+ */
+ USPOOF_UNRESTRICTIVE = 0x50000000
+ } URestrictionLevel;
+#endif /* U_HIDE_DRAFT_API */
+
/**
* Create a Unicode Spoof Checker, configured to perform all
* checks except for USPOOF_LOCALE_LIMIT and USPOOF_CHAR_LIMIT.
@@ -255,7 +347,7 @@
* Open a Spoof Checker from the source form of the spoof data.
* The Three inputs correspond to the Unicode data files confusables.txt
* confusablesWholeScript.txt and xidmdifications.txt as described in
- * Unicode UAX 39. The syntax of the source data is as described in UAX 39 for
+ * Unicode UAX #39. The syntax of the source data is as described in UAX #39 for
* these files, and the content of these files is acceptable input.
*
* The character encoding of the (char *) input text is UTF-8.
@@ -357,6 +449,30 @@
U_STABLE int32_t U_EXPORT2
uspoof_getChecks(const USpoofChecker *sc, UErrorCode *status);
+#ifndef U_HIDE_DRAFT_API
+/**
+ * Set the loosest restriction level allowed. The default if this function
+ * is not called is HIGHLY_RESTRICTIVE.
+ * Calling this function also enables the RESTRICTION_LEVEL check.
+ * @param restrictionLevel The loosest restriction level allowed.
+ * @see URestrictionLevel
+ * @draft ICU 51
+ */
+U_DRAFT void U_EXPORT2
+uspoof_setRestrictionLevel(USpoofChecker *sc, URestrictionLevel restrictionLevel);
+
+
+/**
+ * Get the Restriction Level that will be tested if the checks include RESTRICTION_LEVEL.
+ *
+ * @return The restriction level
+ * @see URestrictionLevel
+ * @draft ICU 51
+ */
+U_DRAFT URestrictionLevel U_EXPORT2
+uspoof_getRestrictionLevel(const USpoofChecker *sc);
+#endif /* U_HIDE_DRAFT_API */
+
/**
* Limit characters that are acceptable in identifiers being checked to those
* normally used with the languages associated with the specified locales.
@@ -488,7 +604,7 @@
* characters that are permitted. Ownership of the set
* remains with the caller. The incoming set is cloned by
* this function, so there are no restrictions on modifying
- * or deleting the USet after calling this function.
+ * or deleting the UnicodeSet after calling this function.
* @param status The error code, set if this function encounters a problem.
* @stable ICU 4.2
*/
@@ -527,31 +643,29 @@
* The set of checks to be performed is specified with uspoof_setChecks().
*
* @param sc The USpoofChecker
- * @param text The string to be checked for possible security issues,
+ * @param id The identifier to be checked for possible security issues,
* in UTF-16 format.
* @param length the length of the string to be checked, expressed in
* 16 bit UTF-16 code units, or -1 if the string is
* zero terminated.
- * @param position An out parameter that receives the index of the
- * first string position that fails the allowed character
- * limitation checks.
- * This parameter may be null if the position information
- * is not needed.
- * If the string passes the requested checks the
- * parameter value will not be set.
+ * @param position An out parameter.
+ * Originally, the index of the first string position that failed a check.
+ * Now, always returns zero.
+ * This parameter may be null.
* @param status The error code, set if an error occurred while attempting to
* perform the check.
* Spoofing or security issues detected with the input string are
* not reported here, but through the function's return value.
* @return An integer value with bits set for any potential security
* or spoofing issues detected. The bits are defined by
- * enum USpoofChecks. Zero is returned if no issues
- * are found with the input string.
+ * enum USpoofChecks. (returned_value & USPOOF_ALL_CHECKS)
+ * will be zero if the input string passes all of the
+ * enabled checks.
* @stable ICU 4.2
*/
U_STABLE int32_t U_EXPORT2
uspoof_check(const USpoofChecker *sc,
- const UChar *text, int32_t length,
+ const UChar *id, int32_t length,
int32_t *position,
UErrorCode *status);
@@ -562,16 +676,14 @@
* The set of checks to be performed is specified with uspoof_setChecks().
*
* @param sc The USpoofChecker
- * @param text A UTF-8 string to be checked for possible security issues.
+ * @param id A identifier to be checked for possible security issues, in UTF8 format.
* @param length the length of the string to be checked, or -1 if the string is
* zero terminated.
- * @param position An out parameter that receives the index of the
- * first string position that fails the allowed character
- * limitation checks.
- * This parameter may be null if the position information
- * is not needed.
- * If the string passes the requested checks the
- * parameter value will not be set.
+ * @param position An out parameter.
+ * Originally, the index of the first string position that failed a check.
+ * Now, always returns zero.
+ * This parameter may be null.
+ * @deprecated ICU 51
* @param status The error code, set if an error occurred while attempting to
* perform the check.
* Spoofing or security issues detected with the input string are
@@ -580,13 +692,14 @@
* a status of U_INVALID_CHAR_FOUND will be returned.
* @return An integer value with bits set for any potential security
* or spoofing issues detected. The bits are defined by
- * enum USpoofChecks. Zero is returned if no issues
- * are found with the input string.
+ * enum USpoofChecks. (returned_value & USPOOF_ALL_CHECKS)
+ * will be zero if the input string passes all of the
+ * enabled checks.
* @stable ICU 4.2
*/
U_STABLE int32_t U_EXPORT2
uspoof_checkUTF8(const USpoofChecker *sc,
- const char *text, int32_t length,
+ const char *id, int32_t length,
int32_t *position,
UErrorCode *status);
@@ -598,28 +711,26 @@
* The set of checks to be performed is specified with uspoof_setChecks().
*
* @param sc The USpoofChecker
- * @param text A UnicodeString to be checked for possible security issues.
- * @param position An out parameter that receives the index of the
- * first string position that fails the allowed character
- * limitation checks.
- * This parameter may be null if the position information
- * is not needed.
- * If the string passes the requested checks the
- * parameter value will not be set.
+ * @param id A identifier to be checked for possible security issues.
+ * @param position An out parameter.
+ * Originally, the index of the first string position that failed a check.
+ * Now, always returns zero.
+ * This parameter may be null.
+ * @deprecated ICU 51
* @param status The error code, set if an error occurred while attempting to
* perform the check.
* Spoofing or security issues detected with the input string are
* not reported here, but through the function's return value.
-
* @return An integer value with bits set for any potential security
* or spoofing issues detected. The bits are defined by
- * enum USpoofChecks. Zero is returned if no issues
- * are found with the input string.
+ * enum USpoofChecks. (returned_value & USPOOF_ALL_CHECKS)
+ * will be zero if the input string passes all of the
+ * enabled checks.
* @stable ICU 4.2
*/
U_STABLE int32_t U_EXPORT2
uspoof_checkUnicodeString(const USpoofChecker *sc,
- const icu::UnicodeString &text,
+ const icu::UnicodeString &id,
int32_t *position,
UErrorCode *status);
@@ -645,30 +756,30 @@
*
*
* @param sc The USpoofChecker
- * @param s1 The first of the two strings to be compared for
+ * @param id1 The first of the two identifiers to be compared for
* confusability. The strings are in UTF-16 format.
- * @param length1 the length of the first string, expressed in
+ * @param length1 the length of the first identifer, expressed in
* 16 bit UTF-16 code units, or -1 if the string is
- * zero terminated.
- * @param s2 The second of the two strings to be compared for
- * confusability. The strings are in UTF-16 format.
- * @param length2 The length of the second string, expressed in
+ * nul terminated.
+ * @param id2 The second of the two identifiers to be compared for
+ * confusability. The identifiers are in UTF-16 format.
+ * @param length2 The length of the second identifiers, expressed in
* 16 bit UTF-16 code units, or -1 if the string is
- * zero terminated.
+ * nul terminated.
* @param status The error code, set if an error occurred while attempting to
* perform the check.
- * Confusability of the strings is not reported here,
+ * Confusability of the identifiers is not reported here,
* but through this function's return value.
* @return An integer value with bit(s) set corresponding to
* the type of confusability found, as defined by
- * enum USpoofChecks. Zero is returned if the strings
+ * enum USpoofChecks. Zero is returned if the identifiers
* are not confusable.
* @stable ICU 4.2
*/
U_STABLE int32_t U_EXPORT2
uspoof_areConfusable(const USpoofChecker *sc,
- const UChar *s1, int32_t length1,
- const UChar *s2, int32_t length2,
+ const UChar *id1, int32_t length1,
+ const UChar *id2, int32_t length2,
UErrorCode *status);
@@ -680,14 +791,14 @@
* USpoofChecker.
*
* @param sc The USpoofChecker
- * @param s1 The first of the two strings to be compared for
+ * @param id1 The first of the two identifiers to be compared for
* confusability. The strings are in UTF-8 format.
- * @param length1 the length of the first string, in bytes, or -1
- * if the string is zero terminated.
- * @param s2 The second of the two strings to be compared for
- * confusability. The strings are in UTF-18 format.
+ * @param length1 the length of the first identifiers, in bytes, or -1
+ * if the string is nul terminated.
+ * @param id2 The second of the two identifiers to be compared for
+ * confusability. The strings are in UTF-8 format.
* @param length2 The length of the second string in bytes, or -1
- * if the string is zero terminated.
+ * if the string is nul terminated.
* @param status The error code, set if an error occurred while attempting to
* perform the check.
* Confusability of the strings is not reported here,
@@ -700,8 +811,8 @@
*/
U_STABLE int32_t U_EXPORT2
uspoof_areConfusableUTF8(const USpoofChecker *sc,
- const char *s1, int32_t length1,
- const char *s2, int32_t length2,
+ const char *id1, int32_t length1,
+ const char *id2, int32_t length2,
UErrorCode *status);
@@ -715,17 +826,17 @@
* USpoofChecker.
*
* @param sc The USpoofChecker
- * @param s1 The first of the two strings to be compared for
+ * @param id1 The first of the two identifiers to be compared for
* confusability. The strings are in UTF-8 format.
- * @param s2 The second of the two strings to be compared for
- * confusability. The strings are in UTF-18 format.
+ * @param id2 The second of the two identifiers to be compared for
+ * confusability. The strings are in UTF-8 format.
* @param status The error code, set if an error occurred while attempting to
* perform the check.
- * Confusability of the strings is not reported here,
+ * Confusability of the identifiers is not reported here,
* but through this function's return value.
* @return An integer value with bit(s) set corresponding to
* the type of confusability found, as defined by
- * enum USpoofChecks. Zero is returned if the strings
+ * enum USpoofChecks. Zero is returned if the identifiers
* are not confusable.
* @stable ICU 4.2
*/
@@ -738,10 +849,10 @@
/**
- * Get the "skeleton" for an identifier string.
- * Skeletons are a transformation of the input string;
- * Two strings are confusable if their skeletons are identical.
- * See Unicode UAX 39 for additional information.
+ * Get the "skeleton" for an identifier.
+ * Skeletons are a transformation of the input identifier;
+ * Two identifiers are confusable if their skeletons are identical.
+ * See Unicode UAX #39 for additional information.
*
* Using skeletons directly makes it possible to quickly check
* whether an identifier is confusable with any of some large
@@ -754,8 +865,8 @@
* The default is Mixed-Script, Lowercase.
* Allowed options are USPOOF_SINGLE_SCRIPT_CONFUSABLE and
* USPOOF_ANY_CASE_CONFUSABLE. The two flags may be ORed.
- * @param s The input string whose skeleton will be computed.
- * @param length The length of the input string, expressed in 16 bit
+ * @param id The input identifier whose skeleton will be computed.
+ * @param length The length of the input identifier, expressed in 16 bit
* UTF-16 code units, or -1 if the string is zero terminated.
* @param dest The output buffer, to receive the skeleton string.
* @param destCapacity The length of the output buffer, in 16 bit units.
@@ -772,15 +883,15 @@
U_STABLE int32_t U_EXPORT2
uspoof_getSkeleton(const USpoofChecker *sc,
uint32_t type,
- const UChar *s, int32_t length,
+ const UChar *id, int32_t length,
UChar *dest, int32_t destCapacity,
UErrorCode *status);
/**
- * Get the "skeleton" for an identifier string.
- * Skeletons are a transformation of the input string;
- * Two strings are confusable if their skeletons are identical.
- * See Unicode UAX 39 for additional information.
+ * Get the "skeleton" for an identifier.
+ * Skeletons are a transformation of the input identifier;
+ * Two identifiers are confusable if their skeletons are identical.
+ * See Unicode UAX #39 for additional information.
*
* Using skeletons directly makes it possible to quickly check
* whether an identifier is confusable with any of some large
@@ -793,7 +904,7 @@
* The default is Mixed-Script, Lowercase.
* Allowed options are USPOOF_SINGLE_SCRIPT_CONFUSABLE and
* USPOOF_ANY_CASE. The two flags may be ORed.
- * @param s The UTF-8 format input string whose skeleton will be computed.
+ * @param id The UTF-8 format identifier whose skeleton will be computed.
* @param length The length of the input string, in bytes,
* or -1 if the string is zero terminated.
* @param dest The output buffer, to receive the skeleton string.
@@ -814,16 +925,16 @@
U_STABLE int32_t U_EXPORT2
uspoof_getSkeletonUTF8(const USpoofChecker *sc,
uint32_t type,
- const char *s, int32_t length,
+ const char *id, int32_t length,
char *dest, int32_t destCapacity,
UErrorCode *status);
#if U_SHOW_CPLUSPLUS_API
/**
- * Get the "skeleton" for an identifier string.
- * Skeletons are a transformation of the input string;
- * Two strings are confusable if their skeletons are identical.
- * See Unicode UAX 39 for additional information.
+ * Get the "skeleton" for an identifier.
+ * Skeletons are a transformation of the input identifier;
+ * Two identifiers are confusable if their skeletons are identical.
+ * See Unicode UAX #39 for additional information.
*
* Using skeletons directly makes it possible to quickly check
* whether an identifier is confusable with any of some large
@@ -836,8 +947,8 @@
* The default is Mixed-Script, Lowercase.
* Allowed options are USPOOF_SINGLE_SCRIPT_CONFUSABLE and
* USPOOF_ANY_CASE_CONFUSABLE. The two flags may be ORed.
- * @param s The input string whose skeleton will be computed.
- * @param dest The output string, to receive the skeleton string.
+ * @param id The input identifier whose skeleton will be computed.
+ * @param dest The output identifier, to receive the skeleton string.
* @param status The error code, set if an error occurred while attempting to
* perform the check.
* @return A reference to the destination (skeleton) string.
@@ -847,17 +958,83 @@
U_I18N_API icu::UnicodeString & U_EXPORT2
uspoof_getSkeletonUnicodeString(const USpoofChecker *sc,
uint32_t type,
- const icu::UnicodeString &s,
+ const icu::UnicodeString &id,
icu::UnicodeString &dest,
UErrorCode *status);
#endif /* U_SHOW_CPLUSPLUS_API */
+#ifndef U_HIDE_DRAFT_API
+/**
+ * Get the set of Candidate Characters for Inclusion in Identifiers, as defined
+ * in Unicode UAX #31, http://www.unicode.org/reports/tr31/#Table_Candidate_Characters_for_Inclusion_in_Identifiers
+ *
+ * The returned set is frozen. Ownership of the set remains with the ICU library; it must not
+ * be deleted by the caller.
+ *
+ * @param status The error code, set if a problem occurs while creating the set.
+ *
+ * @draft ICU 51
+ */
+U_DRAFT const USet * U_EXPORT2
+uspoof_getInclusionSet(UErrorCode *status);
+
+/**
+ * Get the set of characters from Recommended Scripts for Inclusion in Identifiers, as defined
+ * in Unicode UAX #31, http://www.unicode.org/reports/tr31/#Table_Recommended_Scripts
+ *
+ * The returned set is frozen. Ownership of the set remains with the ICU library; it must not
+ * be deleted by the caller.
+ *
+ * @param status The error code, set if a problem occurs while creating the set.
+ *
+ * @draft ICU 51
+ */
+U_DRAFT const USet * U_EXPORT2
+uspoof_getRecommendedSet(UErrorCode *status);
+
+#if U_SHOW_CPLUSPLUS_API
+
+/**
+ * Get the set of Candidate Characters for Inclusion in Identifiers, as defined
+ * in Unicode UAX #31, http://www.unicode.org/reports/tr31/#Table_Candidate_Characters_for_Inclusion_in_Identifiers
+ *
+ * The returned set is frozen. Ownership of the set remains with the ICU library; it must not
+ * be deleted by the caller.
+ *
+ * @param status The error code, set if a problem occurs while creating the set.
+ *
+ * @draft ICU 51
+ */
+U_DRAFT const icu::UnicodeSet * U_EXPORT2
+uspoof_getInclusionUnicodeSet(UErrorCode *status);
+
+/**
+ * Get the set of characters from Recommended Scripts for Inclusion in Identifiers, as defined
+ * in Unicode UAX #31, http://www.unicode.org/reports/tr31/#Table_Recommended_Scripts
+ *
+ * The returned set is frozen. Ownership of the set remains with the ICU library; it must not
+ * be deleted by the caller.
+ *
+ * @param status The error code, set if a problem occurs while creating the set.
+ *
+ * @draft ICU 51
+ */
+U_DRAFT const icu::UnicodeSet * U_EXPORT2
+uspoof_getRecommendedUnicodeSet(UErrorCode *status);
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+#endif /* U_HIDE_DRAFT_API */
+
/**
* Serialize the data for a spoof detector into a chunk of memory.
* The flattened spoof detection tables can later be used to efficiently
* instantiate a new Spoof Detector.
*
+ * The serialized spoof checker includes only the data compiled from the
+ * Unicode data tables by uspoof_openFromSource(); it does not include
+ * include any other state or configuration that may have been set.
+ *
* @param sc the Spoof Detector whose data is to be serialized.
* @param data a pointer to 32-bit-aligned memory to be filled with the data,
* can be NULL if capacity==0
diff --git a/i18n/unicode/vtzone.h b/i18n/unicode/vtzone.h
index 9b0a1f0..92817ba 100644
--- a/i18n/unicode/vtzone.h
+++ b/i18n/unicode/vtzone.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2007-2012, International Business Machines Corporation and
+* Copyright (C) 2007-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
@@ -160,7 +160,7 @@
* @param status Output param to filled in with a success or an error.
* @stable ICU 3.8
*/
- void write(UDate start, UnicodeString& result, UErrorCode& status) /*const*/;
+ void write(UDate start, UnicodeString& result, UErrorCode& status) const;
/**
* Writes RFC2445 VTIMEZONE data applicalbe for the specified date.
@@ -175,7 +175,7 @@
* @param status Output param to filled in with a success or an error.
* @stable ICU 3.8
*/
- void writeSimple(UDate time, UnicodeString& result, UErrorCode& status) /*const*/;
+ void writeSimple(UDate time, UnicodeString& result, UErrorCode& status) const;
/**
* Clones TimeZone objects polymorphically. Clients are responsible for deleting
@@ -319,7 +319,7 @@
* @return TRUE if the transition is found.
* @stable ICU 3.8
*/
- virtual UBool getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/;
+ virtual UBool getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const;
/**
* Gets the most recent time zone transition before the base time.
@@ -329,7 +329,7 @@
* @return TRUE if the transition is found.
* @stable ICU 3.8
*/
- virtual UBool getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/;
+ virtual UBool getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const;
/**
* Returns the number of <code>TimeZoneRule</code>s which represents time transitions,
@@ -339,7 +339,7 @@
* @return The number of <code>TimeZoneRule</code>s representing time transitions.
* @stable ICU 3.8
*/
- virtual int32_t countTransitionRules(UErrorCode& status) /*const*/;
+ virtual int32_t countTransitionRules(UErrorCode& status) const;
/**
* Gets the <code>InitialTimeZoneRule</code> and the set of <code>TimeZoneRule</code>
@@ -358,7 +358,7 @@
* @stable ICU 3.8
*/
virtual void getTimeZoneRules(const InitialTimeZoneRule*& initial,
- const TimeZoneRule* trsrules[], int32_t& trscount, UErrorCode& status) /*const*/;
+ const TimeZoneRule* trsrules[], int32_t& trscount, UErrorCode& status) const;
private:
enum { DEFAULT_VTIMEZONE_LINES = 100 };
@@ -369,8 +369,8 @@
VTimeZone();
static VTimeZone* createVTimeZone(VTZReader* reader);
void write(VTZWriter& writer, UErrorCode& status) const;
- void write(UDate start, VTZWriter& writer, UErrorCode& status) /*const*/;
- void writeSimple(UDate time, VTZWriter& writer, UErrorCode& status) /*const*/;
+ void write(UDate start, VTZWriter& writer, UErrorCode& status) const;
+ void writeSimple(UDate time, VTZWriter& writer, UErrorCode& status) const;
void load(VTZReader& reader, UErrorCode& status);
void parse(UErrorCode& status);
diff --git a/i18n/uspoof.cpp b/i18n/uspoof.cpp
index a898432..f147cf1 100644
--- a/i18n/uspoof.cpp
+++ b/i18n/uspoof.cpp
@@ -1,6 +1,6 @@
/*
***************************************************************************
-* Copyright (C) 2008-2012, International Business Machines Corporation
+* Copyright (C) 2008-2013, International Business Machines Corporation
* and others. All Rights Reserved.
***************************************************************************
* file name: uspoof.cpp
@@ -14,13 +14,19 @@
* Unicode Spoof Detection
*/
#include "unicode/utypes.h"
+#include "unicode/normalizer2.h"
#include "unicode/uspoof.h"
-#include "unicode/unorm.h"
#include "unicode/ustring.h"
#include "unicode/utf16.h"
#include "cmemory.h"
-#include "uspoof_impl.h"
+#include "cstring.h"
+#include "identifier_info.h"
+#include "mutex.h"
+#include "scriptset.h"
#include "uassert.h"
+#include "ucln_in.h"
+#include "uspoof_impl.h"
+#include "umutex.h"
#if !UCONFIG_NO_NORMALIZATION
@@ -28,17 +34,74 @@
U_NAMESPACE_USE
+//
+// Static Objects used by the spoof impl, their thread safe initialization and their cleanup.
+//
+static UnicodeSet *gInclusionSet = NULL;
+static UnicodeSet *gRecommendedSet = NULL;
+static const Normalizer2 *gNfdNormalizer = NULL;
+static UMutex gInitMutex = U_MUTEX_INITIALIZER;
+
+static UBool U_CALLCONV
+uspoof_cleanup(void) {
+ delete gInclusionSet;
+ gInclusionSet = NULL;
+ delete gRecommendedSet;
+ gRecommendedSet = NULL;
+ gNfdNormalizer = NULL;
+ return TRUE;
+}
+
+static void initializeStatics() {
+ Mutex m(&gInitMutex);
+ UErrorCode status = U_ZERO_ERROR;
+ if (gInclusionSet == NULL) {
+ gInclusionSet = new UnicodeSet(UNICODE_STRING_SIMPLE("[\
+ \\-.\\u00B7\\u05F3\\u05F4\\u0F0B\\u200C\\u200D\\u2019]"), status);
+ gRecommendedSet = new UnicodeSet(UNICODE_STRING_SIMPLE("[\
+ [0-z\\u00C0-\\u017E\\u01A0\\u01A1\\u01AF\\u01B0\\u01CD-\
+ \\u01DC\\u01DE-\\u01E3\\u01E6-\\u01F5\\u01F8-\\u021B\\u021E\
+ \\u021F\\u0226-\\u0233\\u02BB\\u02BC\\u02EC\\u0300-\\u0304\
+ \\u0306-\\u030C\\u030F-\\u0311\\u0313\\u0314\\u031B\\u0323-\
+ \\u0328\\u032D\\u032E\\u0330\\u0331\\u0335\\u0338\\u0339\
+ \\u0342-\\u0345\\u037B-\\u03CE\\u03FC-\\u045F\\u048A-\\u0525\
+ \\u0531-\\u0586\\u05D0-\\u05F2\\u0621-\\u063F\\u0641-\\u0655\
+ \\u0660-\\u0669\\u0670-\\u068D\\u068F-\\u06D5\\u06E5\\u06E6\
+ \\u06EE-\\u06FF\\u0750-\\u07B1\\u0901-\\u0939\\u093C-\\u094D\
+ \\u0950\\u0960-\\u0972\\u0979-\\u0A4D\\u0A5C-\\u0A74\\u0A81-\
+ \\u0B43\\u0B47-\\u0B61\\u0B66-\\u0C56\\u0C60\\u0C61\\u0C66-\
+ \\u0CD6\\u0CE0-\\u0CEF\\u0D02-\\u0D28\\u0D2A-\\u0D39\\u0D3D-\
+ \\u0D43\\u0D46-\\u0D4D\\u0D57-\\u0D61\\u0D66-\\u0D8E\\u0D91-\
+ \\u0DA5\\u0DA7-\\u0DDE\\u0DF2\\u0E01-\\u0ED9\\u0F00\\u0F20-\
+ \\u0F8B\\u0F90-\\u109D\\u10D0-\\u10F0\\u10F7-\\u10FA\\u1200-\
+ \\u135A\\u135F\\u1380-\\u138F\\u1401-\\u167F\\u1780-\\u17A2\
+ \\u17A5-\\u17A7\\u17A9-\\u17B3\\u17B6-\\u17CA\\u17D2\\u17D7-\
+ \\u17DC\\u17E0-\\u17E9\\u1810-\\u18A8\\u18AA-\\u18F5\\u1E00-\
+ \\u1E99\\u1F00-\\u1FFC\\u2D30-\\u2D65\\u2D80-\\u2DDE\\u3005-\
+ \\u3007\\u3041-\\u31B7\\u3400-\\u9FCB\\uA000-\\uA48C\\uA67F\
+ \\uA717-\\uA71F\\uA788\\uAA60-\\uAA7B\\uAC00-\\uD7A3\\uFA0E-\
+ \\uFA29\\U00020000-\
+ \\U0002B734]-[[:Cn:][:nfkcqc=n:][:XIDC=n:]]]"), status);
+ gNfdNormalizer = Normalizer2::getNFDInstance(status);
+ }
+ ucln_i18n_registerCleanup(UCLN_I18N_SPOOF, uspoof_cleanup);
+
+ return;
+}
+
+
U_CAPI USpoofChecker * U_EXPORT2
uspoof_open(UErrorCode *status) {
if (U_FAILURE(*status)) {
return NULL;
}
+ initializeStatics();
SpoofImpl *si = new SpoofImpl(SpoofData::getDefault(*status), *status);
if (U_FAILURE(*status)) {
delete si;
si = NULL;
}
- return (USpoofChecker *)si;
+ return reinterpret_cast<USpoofChecker *>(si);
}
@@ -48,6 +111,7 @@
if (U_FAILURE(*status)) {
return NULL;
}
+ initializeStatics();
SpoofData *sd = new SpoofData(data, length, *status);
SpoofImpl *si = new SpoofImpl(sd, *status);
if (U_FAILURE(*status)) {
@@ -80,7 +144,7 @@
delete result;
result = NULL;
}
- return (USpoofChecker *)result;
+ return reinterpret_cast<USpoofChecker *>(result);
}
@@ -120,6 +184,25 @@
}
U_CAPI void U_EXPORT2
+uspoof_setRestrictionLevel(USpoofChecker *sc, URestrictionLevel restrictionLevel) {
+ UErrorCode status = U_ZERO_ERROR;
+ SpoofImpl *This = SpoofImpl::validateThis(sc, status);
+ if (This != NULL) {
+ This->fRestrictionLevel = restrictionLevel;
+ }
+}
+
+U_CAPI URestrictionLevel U_EXPORT2
+uspoof_getRestrictionLevel(const USpoofChecker *sc) {
+ UErrorCode status = U_ZERO_ERROR;
+ const SpoofImpl *This = SpoofImpl::validateThis(sc, status);
+ if (This == NULL) {
+ return USPOOF_UNRESTRICTIVE;
+ }
+ return This->fRestrictionLevel;
+}
+
+U_CAPI void U_EXPORT2
uspoof_setAllowedLocales(USpoofChecker *sc, const char *localesList, UErrorCode *status) {
SpoofImpl *This = SpoofImpl::validateThis(sc, *status);
if (This == NULL) {
@@ -141,7 +224,7 @@
U_CAPI const USet * U_EXPORT2
uspoof_getAllowedChars(const USpoofChecker *sc, UErrorCode *status) {
const UnicodeSet *result = uspoof_getAllowedUnicodeSet(sc, status);
- return reinterpret_cast<const USet *>(result);
+ return result->toUSet();
}
U_CAPI const UnicodeSet * U_EXPORT2
@@ -156,7 +239,7 @@
U_CAPI void U_EXPORT2
uspoof_setAllowedChars(USpoofChecker *sc, const USet *chars, UErrorCode *status) {
- const UnicodeSet *set = reinterpret_cast<const UnicodeSet *>(chars);
+ const UnicodeSet *set = UnicodeSet::fromUSet(chars);
uspoof_setAllowedUnicodeSet(sc, set, status);
}
@@ -185,7 +268,7 @@
U_CAPI int32_t U_EXPORT2
uspoof_check(const USpoofChecker *sc,
- const UChar *text, int32_t length,
+ const UChar *id, int32_t length,
int32_t *position,
UErrorCode *status) {
@@ -197,40 +280,209 @@
*status = U_ILLEGAL_ARGUMENT_ERROR;
return 0;
}
- if (length == -1) {
- // It's not worth the bother to handle nul terminated strings everywhere.
- // Just get the length and be done with it.
- length = u_strlen(text);
+ UnicodeString idStr((length == -1), id, length); // Aliasing constructor.
+ int32_t result = uspoof_checkUnicodeString(sc, idStr, position, status);
+ return result;
+}
+
+
+U_CAPI int32_t U_EXPORT2
+uspoof_checkUTF8(const USpoofChecker *sc,
+ const char *id, int32_t length,
+ int32_t *position,
+ UErrorCode *status) {
+
+ if (U_FAILURE(*status)) {
+ return 0;
}
+ UnicodeString idStr = UnicodeString::fromUTF8(StringPiece(id, length>=0 ? length : uprv_strlen(id)));
+ int32_t result = uspoof_checkUnicodeString(sc, idStr, position, status);
+ return result;
+}
- int32_t result = 0;
- int32_t failPos = 0x7fffffff; // TODO: do we have a #define for max int32?
- // A count of the number of non-Common or inherited scripts.
- // Needed for both the SINGLE_SCRIPT and the WHOLE/MIXED_SCIRPT_CONFUSABLE tests.
- // Share the computation when possible. scriptCount == -1 means that we haven't
- // done it yet.
- int32_t scriptCount = -1;
+U_CAPI int32_t U_EXPORT2
+uspoof_areConfusable(const USpoofChecker *sc,
+ const UChar *id1, int32_t length1,
+ const UChar *id2, int32_t length2,
+ UErrorCode *status) {
+ SpoofImpl::validateThis(sc, *status);
+ if (U_FAILURE(*status)) {
+ return 0;
+ }
+ if (length1 < -1 || length2 < -1) {
+ *status = U_ILLEGAL_ARGUMENT_ERROR;
+ return 0;
+ }
+
+ UnicodeString id1Str((length1==-1), id1, length1); // Aliasing constructor
+ UnicodeString id2Str((length2==-1), id2, length2); // Aliasing constructor
+ return uspoof_areConfusableUnicodeString(sc, id1Str, id2Str, status);
+}
- if ((This->fChecks) & USPOOF_SINGLE_SCRIPT) {
- scriptCount = This->scriptScan(text, length, failPos, *status);
- // printf("scriptCount (clipped to 2) = %d\n", scriptCount);
- if ( scriptCount >= 2) {
- // Note: scriptCount == 2 covers all cases of the number of scripts >= 2
- result |= USPOOF_SINGLE_SCRIPT;
+
+U_CAPI int32_t U_EXPORT2
+uspoof_areConfusableUTF8(const USpoofChecker *sc,
+ const char *id1, int32_t length1,
+ const char *id2, int32_t length2,
+ UErrorCode *status) {
+ SpoofImpl::validateThis(sc, *status);
+ if (U_FAILURE(*status)) {
+ return 0;
+ }
+ if (length1 < -1 || length2 < -1) {
+ *status = U_ILLEGAL_ARGUMENT_ERROR;
+ return 0;
+ }
+ UnicodeString id1Str = UnicodeString::fromUTF8(StringPiece(id1, length1>=0? length1 : uprv_strlen(id1)));
+ UnicodeString id2Str = UnicodeString::fromUTF8(StringPiece(id2, length2>=0? length2 : uprv_strlen(id2)));
+ int32_t results = uspoof_areConfusableUnicodeString(sc, id1Str, id2Str, status);
+ return results;
+}
+
+
+U_CAPI int32_t U_EXPORT2
+uspoof_areConfusableUnicodeString(const USpoofChecker *sc,
+ const icu::UnicodeString &id1,
+ const icu::UnicodeString &id2,
+ UErrorCode *status) {
+ const SpoofImpl *This = SpoofImpl::validateThis(sc, *status);
+ if (U_FAILURE(*status)) {
+ return 0;
+ }
+ //
+ // See section 4 of UAX 39 for the algorithm for checking whether two strings are confusable,
+ // and for definitions of the types (single, whole, mixed-script) of confusables.
+
+ // We only care about a few of the check flags. Ignore the others.
+ // If no tests relavant to this function have been specified, return an error.
+ // TODO: is this really the right thing to do? It's probably an error on the caller's part,
+ // but logically we would just return 0 (no error).
+ if ((This->fChecks & (USPOOF_SINGLE_SCRIPT_CONFUSABLE | USPOOF_MIXED_SCRIPT_CONFUSABLE |
+ USPOOF_WHOLE_SCRIPT_CONFUSABLE)) == 0) {
+ *status = U_INVALID_STATE_ERROR;
+ return 0;
+ }
+ int32_t flagsForSkeleton = This->fChecks & USPOOF_ANY_CASE;
+
+ int32_t result = 0;
+ IdentifierInfo *identifierInfo = This->getIdentifierInfo(*status);
+ if (U_FAILURE(*status)) {
+ return 0;
+ }
+ identifierInfo->setIdentifier(id1, *status);
+ int32_t id1ScriptCount = identifierInfo->getScriptCount();
+ identifierInfo->setIdentifier(id2, *status);
+ int32_t id2ScriptCount = identifierInfo->getScriptCount();
+ This->releaseIdentifierInfo(identifierInfo);
+ identifierInfo = NULL;
+
+ if (This->fChecks & USPOOF_SINGLE_SCRIPT_CONFUSABLE) {
+ UnicodeString id1Skeleton;
+ UnicodeString id2Skeleton;
+ if (id1ScriptCount <= 1 && id2ScriptCount <= 1) {
+ flagsForSkeleton |= USPOOF_SINGLE_SCRIPT_CONFUSABLE;
+ uspoof_getSkeletonUnicodeString(sc, flagsForSkeleton, id1, id1Skeleton, status);
+ uspoof_getSkeletonUnicodeString(sc, flagsForSkeleton, id2, id2Skeleton, status);
+ if (id1Skeleton == id2Skeleton) {
+ result |= USPOOF_SINGLE_SCRIPT_CONFUSABLE;
+ }
}
}
- if (This->fChecks & USPOOF_CHAR_LIMIT) {
+ if (result & USPOOF_SINGLE_SCRIPT_CONFUSABLE) {
+ // If the two inputs are single script confusable they cannot also be
+ // mixed or whole script confusable, according to the UAX39 definitions.
+ // So we can skip those tests.
+ return result;
+ }
+
+ // Two identifiers are whole script confusable if each is of a single script
+ // and they are mixed script confusable.
+ UBool possiblyWholeScriptConfusables =
+ id1ScriptCount <= 1 && id2ScriptCount <= 1 && (This->fChecks & USPOOF_WHOLE_SCRIPT_CONFUSABLE);
+
+ //
+ // Mixed Script Check
+ //
+ if ((This->fChecks & USPOOF_MIXED_SCRIPT_CONFUSABLE) || possiblyWholeScriptConfusables ) {
+ // For getSkeleton(), resetting the USPOOF_SINGLE_SCRIPT_CONFUSABLE flag will get us
+ // the mixed script table skeleton, which is what we want.
+ // The Any Case / Lower Case bit in the skelton flags was set at the top of the function.
+ UnicodeString id1Skeleton;
+ UnicodeString id2Skeleton;
+ flagsForSkeleton &= ~USPOOF_SINGLE_SCRIPT_CONFUSABLE;
+ uspoof_getSkeletonUnicodeString(sc, flagsForSkeleton, id1, id1Skeleton, status);
+ uspoof_getSkeletonUnicodeString(sc, flagsForSkeleton, id2, id2Skeleton, status);
+ if (id1Skeleton == id2Skeleton) {
+ result |= USPOOF_MIXED_SCRIPT_CONFUSABLE;
+ if (possiblyWholeScriptConfusables) {
+ result |= USPOOF_WHOLE_SCRIPT_CONFUSABLE;
+ }
+ }
+ }
+
+ return result;
+}
+
+
+
+
+U_CAPI int32_t U_EXPORT2
+uspoof_checkUnicodeString(const USpoofChecker *sc,
+ const icu::UnicodeString &id,
+ int32_t *position,
+ UErrorCode *status) {
+ const SpoofImpl *This = SpoofImpl::validateThis(sc, *status);
+ if (This == NULL) {
+ return 0;
+ }
+ int32_t result = 0;
+
+ IdentifierInfo *identifierInfo = NULL;
+ if ((This->fChecks) & (USPOOF_RESTRICTION_LEVEL | USPOOF_MIXED_NUMBERS)) {
+ identifierInfo = This->getIdentifierInfo(*status);
+ if (U_FAILURE(*status)) {
+ goto cleanupAndReturn;
+ }
+ identifierInfo->setIdentifier(id, *status);
+ identifierInfo->setIdentifierProfile(*This->fAllowedCharsSet);
+ }
+
+
+ if ((This->fChecks) & USPOOF_RESTRICTION_LEVEL) {
+ URestrictionLevel idRestrictionLevel = identifierInfo->getRestrictionLevel(*status);
+ if (idRestrictionLevel > This->fRestrictionLevel) {
+ result |= USPOOF_RESTRICTION_LEVEL;
+ }
+ if (This->fChecks & USPOOF_AUX_INFO) {
+ result |= idRestrictionLevel;
+ }
+ }
+
+ if ((This->fChecks) & USPOOF_MIXED_NUMBERS) {
+ const UnicodeSet *numerics = identifierInfo->getNumerics();
+ if (numerics->size() > 1) {
+ result |= USPOOF_MIXED_NUMBERS;
+ }
+
+ // TODO: ICU4J returns the UnicodeSet of the numerics found in the identifier.
+ // We have no easy way to do the same in C.
+ // if (checkResult != null) {
+ // checkResult.numerics = numerics;
+ // }
+ }
+
+
+ if (This->fChecks & (USPOOF_CHAR_LIMIT)) {
int32_t i;
UChar32 c;
+ int32_t length = id.length();
for (i=0; i<length ;) {
- U16_NEXT(text, i, length, c);
+ c = id.char32At(i);
+ i += U16_LENGTH(c);
if (!This->fAllowedCharsSet->contains(c)) {
result |= USPOOF_CHAR_LIMIT;
- if (i < failPos) {
- failPos = i;
- }
break;
}
}
@@ -239,9 +491,9 @@
if (This->fChecks &
(USPOOF_WHOLE_SCRIPT_CONFUSABLE | USPOOF_MIXED_SCRIPT_CONFUSABLE | USPOOF_INVISIBLE)) {
// These are the checks that need to be done on NFD input
- NFDBuffer normalizedInput(text, length, *status);
- const UChar *nfdText = normalizedInput.getBuffer();
- int32_t nfdLength = normalizedInput.getLength();
+ UnicodeString nfdText;
+ gNfdNormalizer->normalize(id, nfdText, *status);
+ int32_t nfdLength = nfdText.length();
if (This->fChecks & USPOOF_INVISIBLE) {
@@ -254,7 +506,8 @@
UnicodeSet marksSeenSoFar; // Set of combining marks in a single combining sequence.
for (i=0; i<nfdLength ;) {
- U16_NEXT(nfdText, i, nfdLength, c);
+ c = nfdText.char32At(i);
+ i += U16_LENGTH(c);
if (u_charType(c) != U_NON_SPACING_MARK) {
firstNonspacingMark = 0;
if (haveMultipleMarks) {
@@ -275,12 +528,6 @@
// report the error, and stop scanning.
// No need to find more than the first failure.
result |= USPOOF_INVISIBLE;
- failPos = i;
- // TODO: Bug 8655: failPos is the position in the NFD buffer, but what we want
- // to give back to our caller is a position in the original input string.
- if (failPos > length) {
- failPos = length;
- }
break;
}
marksSeenSoFar.add(c);
@@ -292,22 +539,29 @@
// The basic test is the same for both whole and mixed script confusables.
// Compute the set of scripts that every input character has a confusable in.
// For this computation an input character is always considered to be
- // confusable with itself in its own script.
+ // confusable with itself in its own script.
+ //
// If the number of such scripts is two or more, and the input consisted of
- // characters all from a single script, we have a whole script confusable.
- // (The two scripts will be the original script and the one that is confusable)
+ // characters all from a single script, we have a whole script confusable.
+ // (The two scripts will be the original script and the one that is confusable)
+ //
// If the number of such scripts >= one, and the original input contained characters from
- // more than one script, we have a mixed script confusable. (We can transform
- // some of the characters, and end up with a visually similar string all in
- // one script.)
+ // more than one script, we have a mixed script confusable. (We can transform
+ // some of the characters, and end up with a visually similar string all in
+ // one script.)
- if (scriptCount == -1) {
- int32_t t;
- scriptCount = This->scriptScan(text, length, t, *status);
+ if (identifierInfo == NULL) {
+ identifierInfo = This->getIdentifierInfo(*status);
+ if (U_FAILURE(*status)) {
+ goto cleanupAndReturn;
+ }
+ identifierInfo->setIdentifier(id, *status);
}
+
+ int32_t scriptCount = identifierInfo->getScriptCount();
ScriptSet scripts;
- This->wholeScriptCheck(nfdText, nfdLength, &scripts, *status);
+ This->wholeScriptCheck(nfdText, &scripts, *status);
int32_t confusableScriptCount = scripts.countMembers();
//printf("confusableScriptCount = %d\n", confusableScriptCount);
@@ -324,297 +578,52 @@
}
}
}
- if (position != NULL && failPos != 0x7fffffff) {
- *position = failPos;
+
+cleanupAndReturn:
+ This->releaseIdentifierInfo(identifierInfo);
+ if (position != NULL) {
+ *position = 0;
}
return result;
}
U_CAPI int32_t U_EXPORT2
-uspoof_checkUTF8(const USpoofChecker *sc,
- const char *text, int32_t length,
- int32_t *position,
- UErrorCode *status) {
-
- if (U_FAILURE(*status)) {
- return 0;
- }
- UChar stackBuf[USPOOF_STACK_BUFFER_SIZE];
- UChar* text16 = stackBuf;
- int32_t len16;
-
- u_strFromUTF8(text16, USPOOF_STACK_BUFFER_SIZE, &len16, text, length, status);
- if (U_FAILURE(*status) && *status != U_BUFFER_OVERFLOW_ERROR) {
- return 0;
- }
- if (*status == U_BUFFER_OVERFLOW_ERROR) {
- text16 = static_cast<UChar *>(uprv_malloc(len16 * sizeof(UChar) + 2));
- if (text16 == NULL) {
- *status = U_MEMORY_ALLOCATION_ERROR;
- return 0;
- }
- *status = U_ZERO_ERROR;
- u_strFromUTF8(text16, len16+1, NULL, text, length, status);
- }
-
- int32_t position16 = -1;
- int32_t result = uspoof_check(sc, text16, len16, &position16, status);
- if (U_FAILURE(*status)) {
- return 0;
- }
-
- if (position16 > 0) {
- // Translate a UTF-16 based error position back to a UTF-8 offset.
- // u_strToUTF8() in preflight mode is an easy way to do it.
- U_ASSERT(position16 <= len16);
- u_strToUTF8(NULL, 0, position, text16, position16, status);
- if (position > 0) {
- // position is the required buffer length from u_strToUTF8, which includes
- // space for a terminating NULL, which we don't want, hence the -1.
- *position -= 1;
- }
- *status = U_ZERO_ERROR; // u_strToUTF8, above sets BUFFER_OVERFLOW_ERROR.
- }
-
- if (text16 != stackBuf) {
- uprv_free(text16);
- }
- return result;
-
-}
-
-/* A convenience wrapper around the public uspoof_getSkeleton that handles
- * allocating a larger buffer than provided if the original is too small.
- */
-static UChar *getSkeleton(const USpoofChecker *sc, uint32_t type, const UChar *s, int32_t inputLength,
- UChar *dest, int32_t destCapacity, int32_t *outputLength, UErrorCode *status) {
- int32_t requiredCapacity = 0;
- UChar *buf = dest;
-
- if (U_FAILURE(*status)) {
- return NULL;
- }
- requiredCapacity = uspoof_getSkeleton(sc, type, s, inputLength, dest, destCapacity, status);
- if (*status == U_BUFFER_OVERFLOW_ERROR) {
- buf = static_cast<UChar *>(uprv_malloc(requiredCapacity * sizeof(UChar)));
- if (buf == NULL) {
- *status = U_MEMORY_ALLOCATION_ERROR;
- return NULL;
- }
- *status = U_ZERO_ERROR;
- uspoof_getSkeleton(sc, type, s, inputLength, buf, requiredCapacity, status);
- }
- *outputLength = requiredCapacity;
- return buf;
-}
-
-
-U_CAPI int32_t U_EXPORT2
-uspoof_areConfusable(const USpoofChecker *sc,
- const UChar *s1, int32_t length1,
- const UChar *s2, int32_t length2,
- UErrorCode *status) {
- const SpoofImpl *This = SpoofImpl::validateThis(sc, *status);
- if (U_FAILURE(*status)) {
- return 0;
- }
- //
- // See section 4 of UAX 39 for the algorithm for checking whether two strings are confusable,
- // and for definitions of the types (single, whole, mixed-script) of confusables.
-
- // We only care about a few of the check flags. Ignore the others.
- // If no tests relavant to this function have been specified, return an error.
- // TODO: is this really the right thing to do? It's probably an error on the caller's part,
- // but logically we would just return 0 (no error).
- if ((This->fChecks & (USPOOF_SINGLE_SCRIPT_CONFUSABLE | USPOOF_MIXED_SCRIPT_CONFUSABLE |
- USPOOF_WHOLE_SCRIPT_CONFUSABLE)) == 0) {
- *status = U_INVALID_STATE_ERROR;
- return 0;
- }
- int32_t flagsForSkeleton = This->fChecks & USPOOF_ANY_CASE;
- UChar s1SkeletonBuf[USPOOF_STACK_BUFFER_SIZE];
- UChar *s1Skeleton;
- int32_t s1SkeletonLength = 0;
-
- UChar s2SkeletonBuf[USPOOF_STACK_BUFFER_SIZE];
- UChar *s2Skeleton;
- int32_t s2SkeletonLength = 0;
-
- int32_t result = 0;
- int32_t t;
- int32_t s1ScriptCount = This->scriptScan(s1, length1, t, *status);
- int32_t s2ScriptCount = This->scriptScan(s2, length2, t, *status);
-
- if (This->fChecks & USPOOF_SINGLE_SCRIPT_CONFUSABLE) {
- // Do the Single Script compare.
- if (s1ScriptCount <= 1 && s2ScriptCount <= 1) {
- flagsForSkeleton |= USPOOF_SINGLE_SCRIPT_CONFUSABLE;
- s1Skeleton = getSkeleton(sc, flagsForSkeleton, s1, length1, s1SkeletonBuf,
- sizeof(s1SkeletonBuf)/sizeof(UChar), &s1SkeletonLength, status);
- s2Skeleton = getSkeleton(sc, flagsForSkeleton, s2, length2, s2SkeletonBuf,
- sizeof(s2SkeletonBuf)/sizeof(UChar), &s2SkeletonLength, status);
- if (s1SkeletonLength == s2SkeletonLength && u_strncmp(s1Skeleton, s2Skeleton, s1SkeletonLength) == 0) {
- result |= USPOOF_SINGLE_SCRIPT_CONFUSABLE;
- }
- if (s1Skeleton != s1SkeletonBuf) {
- uprv_free(s1Skeleton);
- }
- if (s2Skeleton != s2SkeletonBuf) {
- uprv_free(s2Skeleton);
- }
- }
- }
-
- if (result & USPOOF_SINGLE_SCRIPT_CONFUSABLE) {
- // If the two inputs are single script confusable they cannot also be
- // mixed or whole script confusable, according to the UAX39 definitions.
- // So we can skip those tests.
- return result;
- }
-
- // Optimization for whole script confusables test: two identifiers are whole script confusable if
- // each is of a single script and they are mixed script confusable.
- UBool possiblyWholeScriptConfusables =
- s1ScriptCount <= 1 && s2ScriptCount <= 1 && (This->fChecks & USPOOF_WHOLE_SCRIPT_CONFUSABLE);
-
- //
- // Mixed Script Check
- //
- if ((This->fChecks & USPOOF_MIXED_SCRIPT_CONFUSABLE) || possiblyWholeScriptConfusables ) {
- // For getSkeleton(), resetting the USPOOF_SINGLE_SCRIPT_CONFUSABLE flag will get us
- // the mixed script table skeleton, which is what we want.
- // The Any Case / Lower Case bit in the skelton flags was set at the top of the function.
- flagsForSkeleton &= ~USPOOF_SINGLE_SCRIPT_CONFUSABLE;
- s1Skeleton = getSkeleton(sc, flagsForSkeleton, s1, length1, s1SkeletonBuf,
- sizeof(s1SkeletonBuf)/sizeof(UChar), &s1SkeletonLength, status);
- s2Skeleton = getSkeleton(sc, flagsForSkeleton, s2, length2, s2SkeletonBuf,
- sizeof(s2SkeletonBuf)/sizeof(UChar), &s2SkeletonLength, status);
- if (s1SkeletonLength == s2SkeletonLength && u_strncmp(s1Skeleton, s2Skeleton, s1SkeletonLength) == 0) {
- result |= USPOOF_MIXED_SCRIPT_CONFUSABLE;
- if (possiblyWholeScriptConfusables) {
- result |= USPOOF_WHOLE_SCRIPT_CONFUSABLE;
- }
- }
- if (s1Skeleton != s1SkeletonBuf) {
- uprv_free(s1Skeleton);
- }
- if (s2Skeleton != s2SkeletonBuf) {
- uprv_free(s2Skeleton);
- }
- }
-
- return result;
-}
-
-
-// Convenience function for converting a UTF-8 input to a UChar * string, including
-// reallocating a buffer when required. Parameters and their interpretation mostly
-// match u_strFromUTF8.
-
-static UChar * convertFromUTF8(UChar *outBuf, int32_t outBufCapacity, int32_t *outputLength,
- const char *in, int32_t inLength, UErrorCode *status) {
- if (U_FAILURE(*status)) {
- return NULL;
- }
- UChar *dest = outBuf;
- u_strFromUTF8(dest, outBufCapacity, outputLength, in, inLength, status);
- if (*status == U_BUFFER_OVERFLOW_ERROR) {
- dest = static_cast<UChar *>(uprv_malloc(*outputLength * sizeof(UChar)));
- if (dest == NULL) {
- *status = U_MEMORY_ALLOCATION_ERROR;
- return NULL;
- }
- *status = U_ZERO_ERROR;
- u_strFromUTF8(dest, *outputLength, NULL, in, inLength, status);
- }
- return dest;
-}
-
-
-
-U_CAPI int32_t U_EXPORT2
-uspoof_areConfusableUTF8(const USpoofChecker *sc,
- const char *s1, int32_t length1,
- const char *s2, int32_t length2,
- UErrorCode *status) {
-
- SpoofImpl::validateThis(sc, *status);
- if (U_FAILURE(*status)) {
- return 0;
- }
-
- UChar s1Buf[USPOOF_STACK_BUFFER_SIZE];
- int32_t lengthS1U;
- UChar *s1U = convertFromUTF8(s1Buf, USPOOF_STACK_BUFFER_SIZE, &lengthS1U, s1, length1, status);
-
- UChar s2Buf[USPOOF_STACK_BUFFER_SIZE];
- int32_t lengthS2U;
- UChar *s2U = convertFromUTF8(s2Buf, USPOOF_STACK_BUFFER_SIZE, &lengthS2U, s2, length2, status);
-
- int32_t results = uspoof_areConfusable(sc, s1U, lengthS1U, s2U, lengthS2U, status);
-
- if (s1U != s1Buf) {
- uprv_free(s1U);
- }
- if (s2U != s2Buf) {
- uprv_free(s2U);
- }
- return results;
-}
-
-
-U_CAPI int32_t U_EXPORT2
-uspoof_areConfusableUnicodeString(const USpoofChecker *sc,
- const icu::UnicodeString &s1,
- const icu::UnicodeString &s2,
- UErrorCode *status) {
-
- const UChar *u1 = s1.getBuffer();
- int32_t length1 = s1.length();
- const UChar *u2 = s2.getBuffer();
- int32_t length2 = s2.length();
-
- int32_t results = uspoof_areConfusable(sc, u1, length1, u2, length2, status);
- return results;
-}
-
-
-
-
-U_CAPI int32_t U_EXPORT2
-uspoof_checkUnicodeString(const USpoofChecker *sc,
- const icu::UnicodeString &text,
- int32_t *position,
- UErrorCode *status) {
- int32_t result = uspoof_check(sc, text.getBuffer(), text.length(), position, status);
- return result;
-}
-
-
-U_CAPI int32_t U_EXPORT2
uspoof_getSkeleton(const USpoofChecker *sc,
uint32_t type,
- const UChar *s, int32_t length,
+ const UChar *id, int32_t length,
UChar *dest, int32_t destCapacity,
UErrorCode *status) {
- // TODO: this function could be sped up a bit
- // Skip the input normalization when not needed, work from callers data.
- // Put the initial skeleton straight into the caller's destination buffer.
- // It probably won't need normalization.
- // But these would make the structure more complicated.
-
- const SpoofImpl *This = SpoofImpl::validateThis(sc, *status);
+ SpoofImpl::validateThis(sc, *status);
if (U_FAILURE(*status)) {
return 0;
}
- if (length<-1 || destCapacity<0 || (destCapacity==0 && dest!=NULL) ||
- (type & ~(USPOOF_SINGLE_SCRIPT_CONFUSABLE | USPOOF_ANY_CASE)) != 0) {
+ if (length<-1 || destCapacity<0 || (destCapacity==0 && dest!=NULL)) {
*status = U_ILLEGAL_ARGUMENT_ERROR;
return 0;
}
+ UnicodeString idStr((length==-1), id, length); // Aliasing constructor
+ UnicodeString destStr;
+ uspoof_getSkeletonUnicodeString(sc, type, idStr, destStr, status);
+ destStr.extract(dest, destCapacity, *status);
+ return destStr.length();
+}
+
+
+
+U_I18N_API UnicodeString & U_EXPORT2
+uspoof_getSkeletonUnicodeString(const USpoofChecker *sc,
+ uint32_t type,
+ const UnicodeString &id,
+ UnicodeString &dest,
+ UErrorCode *status) {
+ const SpoofImpl *This = SpoofImpl::validateThis(sc, *status);
+ if (U_FAILURE(*status)) {
+ return dest;
+ }
+
int32_t tableMask = 0;
switch (type) {
case 0:
@@ -631,120 +640,24 @@
break;
default:
*status = U_ILLEGAL_ARGUMENT_ERROR;
- return 0;
+ return dest;
}
- // NFD transform of the user supplied input
-
- UChar nfdStackBuf[USPOOF_STACK_BUFFER_SIZE];
- UChar *nfdInput = nfdStackBuf;
- int32_t normalizedLen = unorm_normalize(
- s, length, UNORM_NFD, 0, nfdInput, USPOOF_STACK_BUFFER_SIZE, status);
- if (*status == U_BUFFER_OVERFLOW_ERROR) {
- nfdInput = (UChar *)uprv_malloc((normalizedLen+1)*sizeof(UChar));
- if (nfdInput == NULL) {
- *status = U_MEMORY_ALLOCATION_ERROR;
- return 0;
- }
- *status = U_ZERO_ERROR;
- normalizedLen = unorm_normalize(s, length, UNORM_NFD, 0,
- nfdInput, normalizedLen+1, status);
- }
- if (U_FAILURE(*status)) {
- if (nfdInput != nfdStackBuf) {
- uprv_free(nfdInput);
- }
- return 0;
- }
-
- // buffer to hold the Unicode defined skeleton mappings for a single code point
- UChar buf[USPOOF_MAX_SKELETON_EXPANSION];
+ UnicodeString nfdId;
+ gNfdNormalizer->normalize(id, nfdId, *status);
// Apply the skeleton mapping to the NFD normalized input string
// Accumulate the skeleton, possibly unnormalized, in a UnicodeString.
int32_t inputIndex = 0;
UnicodeString skelStr;
- while (inputIndex < normalizedLen) {
- UChar32 c;
- U16_NEXT(nfdInput, inputIndex, normalizedLen, c);
- int32_t replaceLen = This->confusableLookup(c, tableMask, buf);
- skelStr.append(buf, replaceLen);
+ int32_t normalizedLen = nfdId.length();
+ for (inputIndex=0; inputIndex < normalizedLen; ) {
+ UChar32 c = nfdId.char32At(inputIndex);
+ inputIndex += U16_LENGTH(c);
+ This->confusableLookup(c, tableMask, skelStr);
}
- if (nfdInput != nfdStackBuf) {
- uprv_free(nfdInput);
- }
-
- const UChar *result = skelStr.getBuffer();
- int32_t resultLen = skelStr.length();
- UChar *normedResult = NULL;
-
- // Check the skeleton for NFD, normalize it if needed.
- // Unnormalized results should be very rare.
- if (!unorm_isNormalized(result, resultLen, UNORM_NFD, status)) {
- normalizedLen = unorm_normalize(result, resultLen, UNORM_NFD, 0, NULL, 0, status);
- normedResult = static_cast<UChar *>(uprv_malloc((normalizedLen+1)*sizeof(UChar)));
- if (normedResult == NULL) {
- *status = U_MEMORY_ALLOCATION_ERROR;
- return 0;
- }
- *status = U_ZERO_ERROR;
- unorm_normalize(result, resultLen, UNORM_NFD, 0, normedResult, normalizedLen+1, status);
- result = normedResult;
- resultLen = normalizedLen;
- }
-
- // Copy the skeleton to the caller's buffer
- if (U_SUCCESS(*status)) {
- if (destCapacity == 0 || resultLen > destCapacity) {
- *status = resultLen>destCapacity ? U_BUFFER_OVERFLOW_ERROR : U_STRING_NOT_TERMINATED_WARNING;
- } else {
- u_memcpy(dest, result, resultLen);
- if (destCapacity > resultLen) {
- dest[resultLen] = 0;
- } else {
- *status = U_STRING_NOT_TERMINATED_WARNING;
- }
- }
- }
- uprv_free(normedResult);
- return resultLen;
-}
-
-
-
-U_I18N_API UnicodeString & U_EXPORT2
-uspoof_getSkeletonUnicodeString(const USpoofChecker *sc,
- uint32_t type,
- const UnicodeString &s,
- UnicodeString &dest,
- UErrorCode *status) {
- if (U_FAILURE(*status)) {
- return dest;
- }
- dest.remove();
-
- const UChar *str = s.getBuffer();
- int32_t strLen = s.length();
- UChar smallBuf[USPOOF_STACK_BUFFER_SIZE];
- UChar *buf = smallBuf;
- int32_t outputSize = uspoof_getSkeleton(sc, type, str, strLen, smallBuf, USPOOF_STACK_BUFFER_SIZE, status);
- if (*status == U_BUFFER_OVERFLOW_ERROR) {
- buf = static_cast<UChar *>(uprv_malloc((outputSize+1)*sizeof(UChar)));
- if (buf == NULL) {
- *status = U_MEMORY_ALLOCATION_ERROR;
- return dest;
- }
- *status = U_ZERO_ERROR;
- uspoof_getSkeleton(sc, type, str, strLen, buf, outputSize+1, status);
- }
- if (U_SUCCESS(*status)) {
- dest.setTo(buf, outputSize);
- }
-
- if (buf != smallBuf) {
- uprv_free(buf);
- }
+ gNfdNormalizer->normalize(skelStr, dest, *status);
return dest;
}
@@ -752,62 +665,29 @@
U_CAPI int32_t U_EXPORT2
uspoof_getSkeletonUTF8(const USpoofChecker *sc,
uint32_t type,
- const char *s, int32_t length,
+ const char *id, int32_t length,
char *dest, int32_t destCapacity,
UErrorCode *status) {
- // Lacking a UTF-8 normalization API, just converting the input to
- // UTF-16 seems as good an approach as any. In typical use, input will
- // be an identifier, which is to say not too long for stack buffers.
+ SpoofImpl::validateThis(sc, *status);
if (U_FAILURE(*status)) {
return 0;
}
- // Buffers for the UChar form of the input and skeleton strings.
- UChar smallInBuf[USPOOF_STACK_BUFFER_SIZE];
- UChar *inBuf = smallInBuf;
- UChar smallOutBuf[USPOOF_STACK_BUFFER_SIZE];
- UChar *outBuf = smallOutBuf;
-
- int32_t lengthInUChars = 0;
- int32_t skelLengthInUChars = 0;
- int32_t skelLengthInUTF8 = 0;
-
- u_strFromUTF8(inBuf, USPOOF_STACK_BUFFER_SIZE, &lengthInUChars,
- s, length, status);
- if (*status == U_BUFFER_OVERFLOW_ERROR) {
- inBuf = static_cast<UChar *>(uprv_malloc((lengthInUChars+1)*sizeof(UChar)));
- if (inBuf == NULL) {
- *status = U_MEMORY_ALLOCATION_ERROR;
- goto cleanup;
- }
- *status = U_ZERO_ERROR;
- u_strFromUTF8(inBuf, lengthInUChars+1, &lengthInUChars,
- s, length, status);
- }
-
- skelLengthInUChars = uspoof_getSkeleton(sc, type, inBuf, lengthInUChars,
- outBuf, USPOOF_STACK_BUFFER_SIZE, status);
- if (*status == U_BUFFER_OVERFLOW_ERROR) {
- outBuf = static_cast<UChar *>(uprv_malloc((skelLengthInUChars+1)*sizeof(UChar)));
- if (outBuf == NULL) {
- *status = U_MEMORY_ALLOCATION_ERROR;
- goto cleanup;
- }
- *status = U_ZERO_ERROR;
- skelLengthInUChars = uspoof_getSkeleton(sc, type, inBuf, lengthInUChars,
- outBuf, skelLengthInUChars+1, status);
+ if (length<-1 || destCapacity<0 || (destCapacity==0 && dest!=NULL)) {
+ *status = U_ILLEGAL_ARGUMENT_ERROR;
+ return 0;
}
- u_strToUTF8(dest, destCapacity, &skelLengthInUTF8,
- outBuf, skelLengthInUChars, status);
+ UnicodeString srcStr = UnicodeString::fromUTF8(StringPiece(id, length>=0 ? length : uprv_strlen(id)));
+ UnicodeString destStr;
+ uspoof_getSkeletonUnicodeString(sc, type, srcStr, destStr, status);
+ if (U_FAILURE(*status)) {
+ return 0;
+ }
- cleanup:
- if (inBuf != smallInBuf) {
- uprv_free(inBuf);
- }
- if (outBuf != smallOutBuf) {
- uprv_free(outBuf);
- }
- return skelLengthInUTF8;
+ int32_t lengthInUTF8 = 0;
+ u_strToUTF8(dest, destCapacity, &lengthInUTF8,
+ destStr.getBuffer(), destStr.length(), status);
+ return lengthInUTF8;
}
@@ -827,4 +707,30 @@
return dataSize;
}
-#endif
+U_CAPI const USet * U_EXPORT2
+uspoof_getInclusionSet(UErrorCode *) {
+ initializeStatics();
+ return gInclusionSet->toUSet();
+}
+
+U_CAPI const USet * U_EXPORT2
+uspoof_getRecommendedSet(UErrorCode *) {
+ initializeStatics();
+ return gRecommendedSet->toUSet();
+}
+
+U_I18N_API const UnicodeSet * U_EXPORT2
+uspoof_getInclusionUnicodeSet(UErrorCode *) {
+ initializeStatics();
+ return gInclusionSet;
+}
+
+U_I18N_API const UnicodeSet * U_EXPORT2
+uspoof_getRecommendedUnicodeSet(UErrorCode *) {
+ initializeStatics();
+ return gRecommendedSet;
+}
+
+
+
+#endif // !UCONFIG_NO_NORMALIZATION
diff --git a/i18n/uspoof_conf.cpp b/i18n/uspoof_conf.cpp
index c7a8c62..2b2db9f 100644
--- a/i18n/uspoof_conf.cpp
+++ b/i18n/uspoof_conf.cpp
@@ -1,7 +1,7 @@
/*
******************************************************************************
*
-* Copyright (C) 2008-2011, International Business Machines
+* Copyright (C) 2008-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@@ -415,6 +415,7 @@
int32_t previousKey = 0;
for (i=0; i<numKeys; i++) {
int32_t key = fKeyVec->elementAti(i);
+ (void)previousKey; // Suppress unused variable warning on gcc.
U_ASSERT((key & 0x00ffffff) >= (previousKey & 0x00ffffff));
U_ASSERT((key & 0xff000000) != 0);
keys[i] = key;
@@ -479,6 +480,7 @@
uint32_t length = static_cast<uint32_t>(fStringLengthsTable->elementAti(i+1));
U_ASSERT(offset < stringsLength);
U_ASSERT(length < 40);
+ (void)previousLength; // Suppress unused variable warning on gcc.
U_ASSERT(length > previousLength);
stringLengths[destIndex++] = static_cast<uint16_t>(offset);
stringLengths[destIndex++] = static_cast<uint16_t>(length);
diff --git a/i18n/uspoof_impl.cpp b/i18n/uspoof_impl.cpp
index 891b3e7..47dca16 100644
--- a/i18n/uspoof_impl.cpp
+++ b/i18n/uspoof_impl.cpp
@@ -1,19 +1,20 @@
/*
**********************************************************************
-* Copyright (C) 2008-2011, International Business Machines
+* Copyright (C) 2008-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
#include "unicode/utypes.h"
#include "unicode/uspoof.h"
-#include "unicode/unorm.h"
#include "unicode/uchar.h"
#include "unicode/uniset.h"
#include "unicode/utf16.h"
#include "utrie2.h"
#include "cmemory.h"
#include "cstring.h"
+#include "identifier_info.h"
+#include "scriptset.h"
#include "udatamem.h"
#include "umutex.h"
#include "udataswp.h"
@@ -28,37 +29,41 @@
UOBJECT_DEFINE_RTTI_IMPLEMENTATION(SpoofImpl)
SpoofImpl::SpoofImpl(SpoofData *data, UErrorCode &status) :
- fMagic(0), fSpoofData(NULL), fAllowedCharsSet(NULL) , fAllowedLocales(uprv_strdup("")) {
+ fMagic(0), fChecks(USPOOF_ALL_CHECKS), fSpoofData(NULL), fAllowedCharsSet(NULL) ,
+ fAllowedLocales(NULL), fCachedIdentifierInfo(NULL) {
if (U_FAILURE(status)) {
return;
}
- fMagic = USPOOF_MAGIC;
fSpoofData = data;
- fChecks = USPOOF_ALL_CHECKS;
- UnicodeSet *allowedCharsSet = new UnicodeSet(0, 0x10ffff);
- if (allowedCharsSet == NULL || fAllowedLocales == NULL) {
- status = U_MEMORY_ALLOCATION_ERROR;
- return;
- }
- allowedCharsSet->freeze();
- fAllowedCharsSet = allowedCharsSet;
-}
+ fRestrictionLevel = USPOOF_HIGHLY_RESTRICTIVE;
-
-SpoofImpl::SpoofImpl() {
- fMagic = USPOOF_MAGIC;
- fSpoofData = NULL;
- fChecks = USPOOF_ALL_CHECKS;
UnicodeSet *allowedCharsSet = new UnicodeSet(0, 0x10ffff);
allowedCharsSet->freeze();
fAllowedCharsSet = allowedCharsSet;
fAllowedLocales = uprv_strdup("");
+ if (fAllowedCharsSet == NULL || fAllowedLocales == NULL) {
+ status = U_MEMORY_ALLOCATION_ERROR;
+ return;
+ }
+ fMagic = USPOOF_MAGIC;
+}
+
+
+SpoofImpl::SpoofImpl() :
+ fMagic(USPOOF_MAGIC), fChecks(USPOOF_ALL_CHECKS), fSpoofData(NULL), fAllowedCharsSet(NULL) ,
+ fAllowedLocales(NULL), fCachedIdentifierInfo(NULL) {
+ UnicodeSet *allowedCharsSet = new UnicodeSet(0, 0x10ffff);
+ allowedCharsSet->freeze();
+ fAllowedCharsSet = allowedCharsSet;
+ fAllowedLocales = uprv_strdup("");
+ fRestrictionLevel = USPOOF_HIGHLY_RESTRICTIVE;
}
// Copy Constructor, used by the user level clone() function.
SpoofImpl::SpoofImpl(const SpoofImpl &src, UErrorCode &status) :
- fMagic(0), fSpoofData(NULL), fAllowedCharsSet(NULL) {
+ fMagic(0), fChecks(USPOOF_ALL_CHECKS), fSpoofData(NULL), fAllowedCharsSet(NULL) ,
+ fAllowedLocales(NULL), fCachedIdentifierInfo(NULL) {
if (U_FAILURE(status)) {
return;
}
@@ -72,6 +77,7 @@
status = U_MEMORY_ALLOCATION_ERROR;
}
fAllowedLocales = uprv_strdup(src.fAllowedLocales);
+ fRestrictionLevel = src.fRestrictionLevel;
}
SpoofImpl::~SpoofImpl() {
@@ -82,6 +88,7 @@
}
delete fAllowedCharsSet;
uprv_free((void *)fAllowedLocales);
+ delete fCachedIdentifierInfo;
}
//
@@ -95,7 +102,7 @@
if (sc == NULL) {
status = U_ILLEGAL_ARGUMENT_ERROR;
return NULL;
- };
+ }
SpoofImpl *This = (SpoofImpl *)sc;
if (This->fMagic != USPOOF_MAGIC ||
This->fSpoofData == NULL) {
@@ -121,10 +128,10 @@
// implementation.
//
// Given a source character, produce the corresponding
-// replacement character(s)
+// replacement character(s), appending them to the dest string.
//
//---------------------------------------------------------------------------------------
-int32_t SpoofImpl::confusableLookup(UChar32 inChar, int32_t tableMask, UChar *destBuf) const {
+int32_t SpoofImpl::confusableLookup(UChar32 inChar, int32_t tableMask, UnicodeString &dest) const {
// Binary search the spoof data key table for the inChar
int32_t *low = fSpoofData->fCFUKeys;
@@ -148,7 +155,7 @@
if (inChar != midc) {
// Char not found. It maps to itself.
int i = 0;
- U16_APPEND_UNSAFE(destBuf, i, inChar)
+ dest.append(inChar);
return i;
}
foundChar:
@@ -176,7 +183,7 @@
// No key entry for this char & table.
// The input char maps to itself.
int i = 0;
- U16_APPEND_UNSAFE(destBuf, i, inChar)
+ dest.append(inChar);
return i;
}
@@ -188,7 +195,7 @@
// an index into the string table (for longer strings)
uint16_t value = fSpoofData->fCFUValues[keyTableIndex];
if (stringLen == 1) {
- destBuf[0] = value;
+ dest.append((UChar)value);
return 1;
}
@@ -212,9 +219,7 @@
U_ASSERT(value + stringLen <= fSpoofData->fRawData->fCFUStringTableLen);
UChar *src = &fSpoofData->fCFUStrings[value];
- for (ix=0; ix<stringLen; ix++) {
- destBuf[ix] = src[ix];
- }
+ dest.append(src, stringLen);
return stringLen;
}
@@ -231,16 +236,15 @@
//
//---------------------------------------------------------------------------------------
void SpoofImpl::wholeScriptCheck(
- const UChar *text, int32_t length, ScriptSet *result, UErrorCode &status) const {
-
- int32_t inputIdx = 0;
- UChar32 c;
+ const UnicodeString &text, ScriptSet *result, UErrorCode &status) const {
UTrie2 *table =
(fChecks & USPOOF_ANY_CASE) ? fSpoofData->fAnyCaseTrie : fSpoofData->fLowerCaseTrie;
result->setAll();
- while (inputIdx < length) {
- U16_NEXT(text, inputIdx, length, c);
+ int32_t length = text.length();
+ for (int32_t inputIdx=0; inputIdx < length;) {
+ UChar32 c = text.char32At(inputIdx);
+ inputIdx += U16_LENGTH(c);
uint32_t index = utrie2_get32(table, c);
if (index == 0) {
// No confusables in another script for this char.
@@ -249,7 +253,7 @@
// Until then, grab the script from the char and intersect it with the set.
UScriptCode cpScript = uscript_getScript(c, &status);
U_ASSERT(cpScript > USCRIPT_INHERITED);
- result->intersect(cpScript);
+ result->intersect(cpScript, status);
} else if (index == 1) {
// Script == Common or Inherited. Nothing to do.
} else {
@@ -371,47 +375,6 @@
}
-int32_t SpoofImpl::scriptScan
- (const UChar *text, int32_t length, int32_t &pos, UErrorCode &status) const {
- if (U_FAILURE(status)) {
- return 0;
- }
- int32_t inputIdx = 0;
- UChar32 c;
- int32_t scriptCount = 0;
- UScriptCode lastScript = USCRIPT_INVALID_CODE;
- UScriptCode sc = USCRIPT_INVALID_CODE;
- while ((inputIdx < length || length == -1) && scriptCount < 2) {
- U16_NEXT(text, inputIdx, length, c);
- if (c == 0 && length == -1) {
- break;
- }
- sc = uscript_getScript(c, &status);
- if (sc == USCRIPT_COMMON || sc == USCRIPT_INHERITED || sc == USCRIPT_UNKNOWN) {
- continue;
- }
-
- // Temporary fix: fold Japanese Hiragana and Katakana into Han.
- // Names are allowed to mix these scripts.
- // A more general solution will follow later for characters that are
- // used with multiple scripts.
-
- if (sc == USCRIPT_HIRAGANA || sc == USCRIPT_KATAKANA || sc == USCRIPT_HANGUL) {
- sc = USCRIPT_HAN;
- }
-
- if (sc != lastScript) {
- scriptCount++;
- lastScript = sc;
- }
- }
- if (scriptCount == 2) {
- pos = inputIdx;
- }
- return scriptCount;
-}
-
-
// Convert a text format hex number. Utility function used by builder code. Static.
// Input: UChar *string text. Output: a UChar32
// Input has been pre-checked, and will have no non-hex chars.
@@ -443,6 +406,54 @@
return (UChar32)val;
}
+// IdentifierInfo Cache. IdentifierInfo objects are somewhat expensive to create.
+// Maintain a one-element cache, which is sufficient to avoid repeatedly
+// creating new ones unless we get multi-thread concurrency in spoof
+// check operations, which should be statistically uncommon.
+
+// These functions are used in place of new & delete of an IdentifierInfo.
+// They will recycle the IdentifierInfo when possible.
+// They are logically const, and used within const functions that must be thread safe.
+IdentifierInfo *SpoofImpl::getIdentifierInfo(UErrorCode &status) const {
+ IdentifierInfo *returnIdInfo = NULL;
+ if (U_FAILURE(status)) {
+ return returnIdInfo;
+ }
+ SpoofImpl *nonConstThis = const_cast<SpoofImpl *>(this);
+ {
+ Mutex m;
+ returnIdInfo = nonConstThis->fCachedIdentifierInfo;
+ nonConstThis->fCachedIdentifierInfo = NULL;
+ }
+ if (returnIdInfo == NULL) {
+ returnIdInfo = new IdentifierInfo(status);
+ if (U_SUCCESS(status) && returnIdInfo == NULL) {
+ status = U_MEMORY_ALLOCATION_ERROR;
+ }
+ if (U_FAILURE(status) && returnIdInfo != NULL) {
+ delete returnIdInfo;
+ returnIdInfo = NULL;
+ }
+ }
+ return returnIdInfo;
+}
+
+
+void SpoofImpl::releaseIdentifierInfo(IdentifierInfo *idInfo) const {
+ if (idInfo != NULL) {
+ SpoofImpl *nonConstThis = const_cast<SpoofImpl *>(this);
+ {
+ Mutex m;
+ if (nonConstThis->fCachedIdentifierInfo == NULL) {
+ nonConstThis->fCachedIdentifierInfo = idInfo;
+ idInfo = NULL;
+ }
+ }
+ delete idInfo;
+ }
+}
+
+
//----------------------------------------------------------------------------------------------
@@ -673,149 +684,6 @@
}
-//----------------------------------------------------------------------------
-//
-// ScriptSet implementation
-//
-//----------------------------------------------------------------------------
-ScriptSet::ScriptSet() {
- for (uint32_t i=0; i<sizeof(bits)/sizeof(uint32_t); i++) {
- bits[i] = 0;
- }
-}
-
-ScriptSet::~ScriptSet() {
-}
-
-UBool ScriptSet::operator == (const ScriptSet &other) {
- for (uint32_t i=0; i<sizeof(bits)/sizeof(uint32_t); i++) {
- if (bits[i] != other.bits[i]) {
- return FALSE;
- }
- }
- return TRUE;
-}
-
-void ScriptSet::Union(UScriptCode script) {
- uint32_t index = script / 32;
- uint32_t bit = 1 << (script & 31);
- U_ASSERT(index < sizeof(bits)*4);
- bits[index] |= bit;
-}
-
-
-void ScriptSet::Union(const ScriptSet &other) {
- for (uint32_t i=0; i<sizeof(bits)/sizeof(uint32_t); i++) {
- bits[i] |= other.bits[i];
- }
-}
-
-void ScriptSet::intersect(const ScriptSet &other) {
- for (uint32_t i=0; i<sizeof(bits)/sizeof(uint32_t); i++) {
- bits[i] &= other.bits[i];
- }
-}
-
-void ScriptSet::intersect(UScriptCode script) {
- uint32_t index = script / 32;
- uint32_t bit = 1 << (script & 31);
- U_ASSERT(index < sizeof(bits)*4);
- uint32_t i;
- for (i=0; i<index; i++) {
- bits[i] = 0;
- }
- bits[index] &= bit;
- for (i=index+1; i<sizeof(bits)/sizeof(uint32_t); i++) {
- bits[i] = 0;
- }
-}
-
-
-ScriptSet & ScriptSet::operator =(const ScriptSet &other) {
- for (uint32_t i=0; i<sizeof(bits)/sizeof(uint32_t); i++) {
- bits[i] = other.bits[i];
- }
- return *this;
-}
-
-
-void ScriptSet::setAll() {
- for (uint32_t i=0; i<sizeof(bits)/sizeof(uint32_t); i++) {
- bits[i] = 0xffffffffu;
- }
-}
-
-
-void ScriptSet::resetAll() {
- for (uint32_t i=0; i<sizeof(bits)/sizeof(uint32_t); i++) {
- bits[i] = 0;
- }
-}
-
-int32_t ScriptSet::countMembers() {
- // This bit counter is good for sparse numbers of '1's, which is
- // very much the case that we will usually have.
- int32_t count = 0;
- for (uint32_t i=0; i<sizeof(bits)/sizeof(uint32_t); i++) {
- uint32_t x = bits[i];
- while (x > 0) {
- count++;
- x &= (x - 1); // and off the least significant one bit.
- }
- }
- return count;
-}
-
-
-
-//-----------------------------------------------------------------------------
-//
-// NFDBuffer Implementation.
-//
-//-----------------------------------------------------------------------------
-
-NFDBuffer::NFDBuffer(const UChar *text, int32_t length, UErrorCode &status) {
- fNormalizedText = NULL;
- fNormalizedTextLength = 0;
- fOriginalText = text;
- if (U_FAILURE(status)) {
- return;
- }
- fNormalizedText = fSmallBuf;
- fNormalizedTextLength = unorm_normalize(
- text, length, UNORM_NFD, 0, fNormalizedText, USPOOF_STACK_BUFFER_SIZE, &status);
- if (status == U_BUFFER_OVERFLOW_ERROR) {
- status = U_ZERO_ERROR;
- fNormalizedText = (UChar *)uprv_malloc((fNormalizedTextLength+1)*sizeof(UChar));
- if (fNormalizedText == NULL) {
- status = U_MEMORY_ALLOCATION_ERROR;
- } else {
- fNormalizedTextLength = unorm_normalize(text, length, UNORM_NFD, 0,
- fNormalizedText, fNormalizedTextLength+1, &status);
- }
- }
-}
-
-
-NFDBuffer::~NFDBuffer() {
- if (fNormalizedText != fSmallBuf) {
- uprv_free(fNormalizedText);
- }
- fNormalizedText = 0;
-}
-
-const UChar *NFDBuffer::getBuffer() {
- return fNormalizedText;
-}
-
-int32_t NFDBuffer::getLength() {
- return fNormalizedTextLength;
-}
-
-
-
-
-
U_NAMESPACE_END
U_NAMESPACE_USE
diff --git a/i18n/uspoof_impl.h b/i18n/uspoof_impl.h
index f89af08..dc9dda9 100644
--- a/i18n/uspoof_impl.h
+++ b/i18n/uspoof_impl.h
@@ -1,6 +1,6 @@
/*
***************************************************************************
-* Copyright (C) 2008-2011, International Business Machines Corporation
+* Copyright (C) 2008-2013, International Business Machines Corporation
* and others. All Rights Reserved.
***************************************************************************
*
@@ -15,10 +15,10 @@
#include "unicode/utypes.h"
#include "unicode/uspoof.h"
-#include "utrie2.h"
#include "unicode/uscript.h"
#include "unicode/udata.h"
+#include "utrie2.h"
#if !UCONFIG_NO_NORMALIZATION
@@ -37,10 +37,11 @@
// Magic number for sanity checking spoof data.
#define USPOOF_MAGIC 0x3845fdef
+class IdentifierInfo;
+class ScriptSet;
class SpoofData;
struct SpoofDataHeader;
struct SpoofStringLengthsElement;
-class ScriptSet;
/**
* Class SpoofImpl corresponds directly to the plain C API opaque type
@@ -65,7 +66,7 @@
* One of USPOOF_SL_TABLE_FLAG, USPOOF_MA_TABLE_FLAG, etc.
* @return The length in UTF-16 code units of the substition string.
*/
- int32_t confusableLookup(UChar32 inChar, int32_t tableMask, UChar *destBuf) const;
+ int32_t confusableLookup(UChar32 inChar, int32_t tableMask, UnicodeString &destBuf) const;
/** Set and Get AllowedLocales, implementations of the corresponding API */
void setAllowedLocales(const char *localesList, UErrorCode &status);
@@ -83,23 +84,18 @@
// Return the test bit flag to be ORed into the eventual user return value
// if a Spoof opportunity is detected.
void wholeScriptCheck(
- const UChar *text, int32_t length, ScriptSet *result, UErrorCode &status) const;
+ const UnicodeString &text, ScriptSet *result, UErrorCode &status) const;
- /** Scan a string to determine how many scripts it includes.
- * Ignore characters with script=Common and scirpt=Inherited.
- * @param text The UChar text to be scanned
- * @param length The length of the input text, -1 for nul termintated.
- * @param pos An out parameter, set to the first input postion at which
- * a second script was encountered, ignoring Common and Inherited.
- * @param status For errors.
- * @return the number of (non-common,inherited) scripts encountered,
- * clipped to a max of two.
- */
- int32_t scriptScan(const UChar *text, int32_t length, int32_t &pos, UErrorCode &status) const;
-
static UClassID U_EXPORT2 getStaticClassID(void);
virtual UClassID getDynamicClassID(void) const;
+ // IdentifierInfo Cache. IdentifierInfo objects are somewhat expensive to create.
+ // Maintain a one-element cache, which is sufficient to avoid repeatedly
+ // creating new ones unless we get multi-thread concurrency in spoof
+ // check operations, which should be statistically uncommon.
+ IdentifierInfo *getIdentifierInfo(UErrorCode &status) const;
+ void releaseIdentifierInfo(IdentifierInfo *idInfo) const;
+
//
// Data Members
//
@@ -113,6 +109,9 @@
// for this Spoof Checker. Defaults to all chars.
const char *fAllowedLocales; // The list of allowed locales.
+ URestrictionLevel fRestrictionLevel; // The maximum restriction level for an acceptable identifier.
+
+ IdentifierInfo *fCachedIdentifierInfo; // Do not use directly. See getIdentifierInfo().:w
};
@@ -179,67 +178,6 @@
};
-//-------------------------------------------------------------------------------
-//
-// ScriptSet - Wrapper class for the Script code bit sets that are part of the
-// whole script confusable data.
-//
-// This class is used both at data build and at run time.
-// The constructor is only used at build time.
-// At run time, just point at the prebuilt data and go.
-//
-//-------------------------------------------------------------------------------
-class ScriptSet: public UMemory {
- public:
- ScriptSet();
- ~ScriptSet();
-
- UBool operator == (const ScriptSet &other);
- ScriptSet & operator = (const ScriptSet &other);
-
- void Union(const ScriptSet &other);
- void Union(UScriptCode script);
- void intersect(const ScriptSet &other);
- void intersect(UScriptCode script);
- void setAll();
- void resetAll();
- int32_t countMembers();
-
- private:
- uint32_t bits[6];
-};
-
-
-
-
-//-------------------------------------------------------------------------------
-//
-// NFDBuffer A little class to handle the NFD normalization that is
-// needed on incoming identifiers to be checked.
-// Takes care of buffer handling and normalization
-//
-// Instances of this class are intended to be stack-allocated.
-//
-// TODO: how to map position offsets back to user values?
-//
-//--------------------------------------------------------------------------------
-class NFDBuffer: public UMemory {
-public:
- NFDBuffer(const UChar *text, int32_t length, UErrorCode &status);
- ~NFDBuffer();
- const UChar *getBuffer();
- int32_t getLength();
-
- private:
- const UChar *fOriginalText;
- UChar *fNormalizedText;
- int32_t fNormalizedTextLength;
- UChar fSmallBuf[USPOOF_STACK_BUFFER_SIZE];
-};
-
-
-
-
//-------------------------------------------------------------------------------------
//
diff --git a/i18n/uspoof_wsconf.cpp b/i18n/uspoof_wsconf.cpp
index 6ddc9c3..ca23283 100644
--- a/i18n/uspoof_wsconf.cpp
+++ b/i18n/uspoof_wsconf.cpp
@@ -1,7 +1,7 @@
/*
******************************************************************************
*
-* Copyright (C) 2008-2012, International Business Machines
+* Copyright (C) 2008-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@@ -29,6 +29,7 @@
#include "unicode/uregex.h"
#include "unicode/ustring.h"
#include "cmemory.h"
+#include "scriptset.h"
#include "uspoof_impl.h"
#include "uhash.h"
#include "uvector.h"
@@ -244,8 +245,8 @@
scriptSets->addElement(bsset, status);
utrie2_set32(table, cp, setIndex, &status);
}
- bsset->sset->Union(targScript);
- bsset->sset->Union(srcScript);
+ bsset->sset->set(targScript, status);
+ bsset->sset->set(srcScript, status);
if (U_FAILURE(status)) {
goto cleanup;
diff --git a/i18n/vtzone.cpp b/i18n/vtzone.cpp
index b000b22..dba7a29 100644
--- a/i18n/vtzone.cpp
+++ b/i18n/vtzone.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2007-2012, International Business Machines Corporation and
+* Copyright (C) 2007-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
@@ -1161,14 +1161,14 @@
}
void
-VTimeZone::write(UDate start, UnicodeString& result, UErrorCode& status) /*const*/ {
+VTimeZone::write(UDate start, UnicodeString& result, UErrorCode& status) const {
result.remove();
VTZWriter writer(result);
write(start, writer, status);
}
void
-VTimeZone::writeSimple(UDate time, UnicodeString& result, UErrorCode& status) /*const*/ {
+VTimeZone::writeSimple(UDate time, UnicodeString& result, UErrorCode& status) const {
result.remove();
VTZWriter writer(result);
writeSimple(time, writer, status);
@@ -1224,24 +1224,24 @@
}
UBool
-VTimeZone::getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/ {
+VTimeZone::getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const {
return tz->getNextTransition(base, inclusive, result);
}
UBool
-VTimeZone::getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/ {
+VTimeZone::getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const {
return tz->getPreviousTransition(base, inclusive, result);
}
int32_t
-VTimeZone::countTransitionRules(UErrorCode& status) /*const*/ {
+VTimeZone::countTransitionRules(UErrorCode& status) const {
return tz->countTransitionRules(status);
}
void
VTimeZone::getTimeZoneRules(const InitialTimeZoneRule*& initial,
const TimeZoneRule* trsrules[], int32_t& trscount,
- UErrorCode& status) /*const*/ {
+ UErrorCode& status) const {
tz->getTimeZoneRules(initial, trsrules, trscount, status);
}
@@ -1768,7 +1768,7 @@
}
void
-VTimeZone::write(UDate start, VTZWriter& writer, UErrorCode& status) /*const*/ {
+VTimeZone::write(UDate start, VTZWriter& writer, UErrorCode& status) const {
if (U_FAILURE(status)) {
return;
}
@@ -1833,7 +1833,7 @@
}
void
-VTimeZone::writeSimple(UDate time, VTZWriter& writer, UErrorCode& status) /*const*/ {
+VTimeZone::writeSimple(UDate time, VTZWriter& writer, UErrorCode& status) const {
if (U_FAILURE(status)) {
return;
}
diff --git a/i18n/zonemeta.cpp b/i18n/zonemeta.cpp
index c689b81..522c3f0 100644
--- a/i18n/zonemeta.cpp
+++ b/i18n/zonemeta.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2007-2012, International Business Machines Corporation and *
+* Copyright (C) 2007-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@@ -117,11 +117,13 @@
static const char gMetazoneInfo[] = "metazoneInfo";
static const char gMapTimezonesTag[] = "mapTimezones";
-static const char gTimeZoneTypes[] = "timezoneTypes";
+static const char gKeyTypeData[] = "keyTypeData";
static const char gTypeAliasTag[] = "typeAlias";
static const char gTypeMapTag[] = "typeMap";
static const char gTimezoneTag[] = "timezone";
+static const char gPrimaryZonesTag[] = "primaryZones";
+
static const char gWorldTag[] = "001";
static const UChar gWorld[] = {0x30, 0x30, 0x31, 0x00}; // "001"
@@ -280,7 +282,7 @@
}
}
- UResourceBundle *top = ures_openDirect(NULL, gTimeZoneTypes, &tmpStatus);
+ UResourceBundle *top = ures_openDirect(NULL, gKeyTypeData, &tmpStatus);
UResourceBundle *rb = ures_getByKey(top, gTypeMapTag, NULL, &tmpStatus);
ures_getByKey(rb, gTimezoneTag, rb, &tmpStatus);
ures_getByKey(rb, id, rb, &tmpStatus);
@@ -391,121 +393,136 @@
return getCanonicalCLDRID(tz.getID(tzID), status);
}
-
-
UnicodeString& U_EXPORT2
-ZoneMeta::getCanonicalCountry(const UnicodeString &tzid, UnicodeString &canonicalCountry) {
+ZoneMeta::getCanonicalCountry(const UnicodeString &tzid, UnicodeString &country, UBool *isPrimary /* = NULL */) {
+ if (isPrimary != NULL) {
+ *isPrimary = FALSE;
+ }
+
const UChar *region = TimeZone::getRegion(tzid);
if (region != NULL && u_strcmp(gWorld, region) != 0) {
- canonicalCountry.setTo(region, -1);
+ country.setTo(region, -1);
} else {
- canonicalCountry.setToBogus();
- }
- return canonicalCountry;
-}
-
-UnicodeString& U_EXPORT2
-ZoneMeta::getSingleCountry(const UnicodeString &tzid, UnicodeString &country) {
- // Get canonical country for the zone
- const UChar *region = TimeZone::getRegion(tzid);
- if (region == NULL || u_strcmp(gWorld, region) == 0) {
- // special case - unknown or "001"
country.setToBogus();
return country;
}
- // Checking the cached results
- UErrorCode status = U_ZERO_ERROR;
- UBool initialized;
- UMTX_CHECK(&gZoneMetaLock, gCountryInfoVectorsInitialized, initialized);
- if (!initialized) {
- // Create empty vectors
+ if (isPrimary != NULL) {
+ char regionBuf[] = {0, 0, 0};
+
+ // Checking the cached results
+ UErrorCode status = U_ZERO_ERROR;
+ UBool initialized;
+ UMTX_CHECK(&gZoneMetaLock, gCountryInfoVectorsInitialized, initialized);
+ if (!initialized) {
+ // Create empty vectors
+ umtx_lock(&gZoneMetaLock);
+ {
+ if (!gCountryInfoVectorsInitialized) {
+ // No deleters for these UVectors, it's a reference to a resource bundle string.
+ gSingleZoneCountries = new UVector(NULL, uhash_compareUChars, status);
+ if (gSingleZoneCountries == NULL) {
+ status = U_MEMORY_ALLOCATION_ERROR;
+ }
+ gMultiZonesCountries = new UVector(NULL, uhash_compareUChars, status);
+ if (gMultiZonesCountries == NULL) {
+ status = U_MEMORY_ALLOCATION_ERROR;
+ }
+
+ if (U_SUCCESS(status)) {
+ gCountryInfoVectorsInitialized = TRUE;
+ ucln_i18n_registerCleanup(UCLN_I18N_ZONEMETA, zoneMeta_cleanup);
+ } else {
+ delete gSingleZoneCountries;
+ delete gMultiZonesCountries;
+ }
+ }
+ }
+ umtx_unlock(&gZoneMetaLock);
+
+ if (U_FAILURE(status)) {
+ return country;
+ }
+ U_ASSERT(gSingleZoneCountries != NULL);
+ U_ASSERT(gMultiZonesCountries != NULL);
+ }
+
+ // Check if it was already cached
+ UBool cached = FALSE;
+ UBool singleZone = FALSE;
umtx_lock(&gZoneMetaLock);
{
- if (!gCountryInfoVectorsInitialized) {
- // No deleters for these UVectors, it's a reference to a resource bundle string.
- gSingleZoneCountries = new UVector(NULL, uhash_compareUChars, status);
- if (gSingleZoneCountries == NULL) {
- status = U_MEMORY_ALLOCATION_ERROR;
- }
- gMultiZonesCountries = new UVector(NULL, uhash_compareUChars, status);
- if (gMultiZonesCountries == NULL) {
- status = U_MEMORY_ALLOCATION_ERROR;
- }
+ singleZone = cached = gSingleZoneCountries->contains((void*)region);
+ if (!cached) {
+ cached = gMultiZonesCountries->contains((void*)region);
+ }
+ }
+ umtx_unlock(&gZoneMetaLock);
- if (U_SUCCESS(status)) {
- gCountryInfoVectorsInitialized = TRUE;
+ if (!cached) {
+ // We need to go through all zones associated with the region.
+ // This is relatively heavy operation.
+
+ U_ASSERT(u_strlen(region) == 2);
+
+ u_UCharsToChars(region, regionBuf, 2);
+
+ StringEnumeration *ids = TimeZone::createTimeZoneIDEnumeration(UCAL_ZONE_TYPE_CANONICAL_LOCATION, regionBuf, NULL, status);
+ int32_t idsLen = ids->count(status);
+ if (U_SUCCESS(status) && idsLen == 1) {
+ // only the single zone is available for the region
+ singleZone = TRUE;
+ }
+ delete ids;
+
+ // Cache the result
+ umtx_lock(&gZoneMetaLock);
+ {
+ UErrorCode ec = U_ZERO_ERROR;
+ if (singleZone) {
+ if (!gSingleZoneCountries->contains((void*)region)) {
+ gSingleZoneCountries->addElement((void*)region, ec);
+ }
} else {
- delete gSingleZoneCountries;
- delete gMultiZonesCountries;
+ if (!gMultiZonesCountries->contains((void*)region)) {
+ gMultiZonesCountries->addElement((void*)region, ec);
+ }
}
}
+ umtx_unlock(&gZoneMetaLock);
}
- umtx_unlock(&gZoneMetaLock);
- if (U_FAILURE(status)) {
- country.setToBogus();
- return country;
- }
- U_ASSERT(gSingleZoneCountries != NULL);
- U_ASSERT(gMultiZonesCountries != NULL);
- }
+ if (singleZone) {
+ *isPrimary = TRUE;
+ } else {
+ // Note: We may cache the primary zone map in future.
- // Check if it was already cached
- UBool cached = FALSE;
- UBool multiZones = FALSE;
- umtx_lock(&gZoneMetaLock);
- {
- multiZones = cached = gMultiZonesCountries->contains((void*)region);
- if (!multiZones) {
- cached = gSingleZoneCountries->contains((void*)region);
- }
- }
- umtx_unlock(&gZoneMetaLock);
+ // Even a country has multiple zones, one of them might be
+ // dominant and treated as a primary zone
+ int32_t idLen = 0;
+ if (regionBuf[0] == 0) {
+ u_UCharsToChars(region, regionBuf, 2);
+ }
- if (!cached) {
- // We need to go through all zones associated with the region.
- // This is relatively heavy operation.
-
- U_ASSERT(u_strlen(region) == 2);
-
- char buf[] = {0, 0, 0};
- u_UCharsToChars(region, buf, 2);
-
- StringEnumeration *ids = TimeZone::createTimeZoneIDEnumeration(UCAL_ZONE_TYPE_CANONICAL_LOCATION, buf, NULL, status);
- int32_t idsLen = ids->count(status);
- if (U_SUCCESS(status) && idsLen > 1) {
- // multiple canonical zones are available for the region
- multiZones = TRUE;
- }
- if (U_FAILURE(status)) {
- // no single country by default for any error cases
- multiZones = TRUE;
- }
- delete ids;
-
- // Cache the result
- umtx_lock(&gZoneMetaLock);
- {
- UErrorCode ec = U_ZERO_ERROR;
- if (multiZones) {
- if (!gMultiZonesCountries->contains((void*)region)) {
- gMultiZonesCountries->addElement((void*)region, ec);
- }
- } else {
- if (!gSingleZoneCountries->contains((void*)region)) {
- gSingleZoneCountries->addElement((void*)region, ec);
+ UResourceBundle *rb = ures_openDirect(NULL, gMetaZones, &status);
+ ures_getByKey(rb, gPrimaryZonesTag, rb, &status);
+ const UChar *primaryZone = ures_getStringByKey(rb, regionBuf, &idLen, &status);
+ if (U_SUCCESS(status)) {
+ if (tzid.compare(primaryZone, idLen) == 0) {
+ *isPrimary = TRUE;
+ } else {
+ // The given ID might not be a canonical ID
+ UnicodeString canonicalID;
+ TimeZone::getCanonicalID(tzid, canonicalID, status);
+ if (U_SUCCESS(status) && canonicalID.compare(primaryZone, idLen) == 0) {
+ *isPrimary = TRUE;
+ }
}
}
+ ures_close(rb);
}
- umtx_unlock(&gZoneMetaLock);
}
- if (multiZones) {
- country.setToBogus();
- } else {
- country.setTo(region, -1);
- }
return country;
}
@@ -812,6 +829,7 @@
gMetaZoneIDs = metaZoneIDs;
gMetaZoneIDTable = metaZoneIDTable;
gMetaZoneIDsInitialized = TRUE;
+ ucln_i18n_registerCleanup(UCLN_I18N_ZONEMETA, zoneMeta_cleanup);
} else {
uhash_close(metaZoneIDTable);
delete metaZoneIDs;
@@ -890,6 +908,56 @@
return id;
}
+const UChar*
+ZoneMeta::getShortID(const TimeZone& tz) {
+ const UChar* canonicalID = NULL;
+ if (dynamic_cast<const OlsonTimeZone *>(&tz) != NULL) {
+ // short cut for OlsonTimeZone
+ const OlsonTimeZone *otz = (const OlsonTimeZone*)&tz;
+ canonicalID = otz->getCanonicalID();
+ }
+ if (canonicalID == NULL) {
+ return NULL;
+ }
+ return getShortIDFromCanonical(canonicalID);
+}
+
+const UChar*
+ZoneMeta::getShortID(const UnicodeString& id) {
+ UErrorCode status = U_ZERO_ERROR;
+ const UChar* canonicalID = ZoneMeta::getCanonicalCLDRID(id, status);
+ if (U_FAILURE(status) || canonicalID == NULL) {
+ return NULL;
+ }
+ return ZoneMeta::getShortIDFromCanonical(canonicalID);
+}
+
+const UChar*
+ZoneMeta::getShortIDFromCanonical(const UChar* canonicalID) {
+ const UChar* shortID = NULL;
+ int32_t len = u_strlen(canonicalID);
+ char tzidKey[ZID_KEY_MAX + 1];
+
+ u_UCharsToChars(canonicalID, tzidKey, len);
+ tzidKey[len] = (char) 0; // Make sure it is null terminated.
+
+ // replace '/' with ':'
+ char *p = tzidKey;
+ while (*p++) {
+ if (*p == '/') {
+ *p = ':';
+ }
+ }
+
+ UErrorCode status = U_ZERO_ERROR;
+ UResourceBundle *rb = ures_openDirect(NULL, gKeyTypeData, &status);
+ ures_getByKey(rb, gTypeMapTag, rb, &status);
+ ures_getByKey(rb, gTimezoneTag, rb, &status);
+ shortID = ures_getStringByKey(rb, tzidKey, NULL, &status);
+ ures_close(rb);
+
+ return shortID;
+}
U_NAMESPACE_END
diff --git a/i18n/zonemeta.h b/i18n/zonemeta.h
index 433957d..3c42182 100644
--- a/i18n/zonemeta.h
+++ b/i18n/zonemeta.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2007-2012, International Business Machines Corporation and *
+* Copyright (C) 2007-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@@ -50,17 +50,13 @@
/**
* Return the canonical country code for this tzid. If we have none, or if the time zone
- * is not associated with a country, return null.
+ * is not associated with a country, return bogus string.
+ * @param tzid Zone ID
+ * @param country [output] Country code
+ * @param isPrimary [output] TRUE if the zone is the primary zone for the country
+ * @return A reference to the result country
*/
- static UnicodeString& U_EXPORT2 getCanonicalCountry(const UnicodeString &tzid, UnicodeString &canonicalCountry);
-
- /**
- * Return the country code if this is a 'single' time zone that can fallback to just
- * the country, otherwise return empty string. (Note, one must also check the locale data
- * to see that there is a localization for the country in order to implement
- * tr#35 appendix J step 5.)
- */
- static UnicodeString& U_EXPORT2 getSingleCountry(const UnicodeString &tzid, UnicodeString &country);
+ static UnicodeString& U_EXPORT2 getCanonicalCountry(const UnicodeString &tzid, UnicodeString &country, UBool *isPrimary = NULL);
/**
* Returns a CLDR metazone ID for the given Olson tzid and time.
@@ -94,11 +90,28 @@
*/
static TimeZone* createCustomTimeZone(int32_t offset);
+ /**
+ * Returns the time zone's short ID (null terminated) for the zone.
+ * For example, "uslax" for zone "America/Los_Angeles".
+ * @param tz the time zone
+ * @return the short ID of the time zone, or null if the short ID is not available.
+ */
+ static const UChar* U_EXPORT2 getShortID(const TimeZone& tz);
+
+ /**
+ * Returns the time zone's short ID (null terminated) for the zone ID.
+ * For example, "uslax" for zone ID "America/Los_Angeles".
+ * @param tz the time zone ID
+ * @return the short ID of the time zone ID, or null if the short ID is not available.
+ */
+ static const UChar* U_EXPORT2 getShortID(const UnicodeString& id);
+
private:
ZoneMeta(); // Prevent construction.
static UVector* createMetazoneMappings(const UnicodeString &tzid);
static void initAvailableMetaZoneIDs();
static UnicodeString& formatCustomID(uint8_t hour, uint8_t min, uint8_t sec, UBool negative, UnicodeString& id);
+ static const UChar* getShortIDFromCanonical(const UChar* canonicalID);
};
U_NAMESPACE_END
diff --git a/icudefs.mk.in b/icudefs.mk.in
index 54a6293..6528702 100644
--- a/icudefs.mk.in
+++ b/icudefs.mk.in
@@ -2,7 +2,7 @@
#
# Yves Arrouye.
#
-# Copyright (C) 2000-2012, International Business Machines Corporation and others.
+# Copyright (C) 2000-2013, International Business Machines Corporation and others.
# All Rights Reserved.
#
@@ -279,6 +279,11 @@
PKGDATA_INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/stubdata:$(top_builddir)/tools/ctestfw:$(LIBRARY_PATH_PREFIX)$(LIBDIR):$$$(LDLIBRARYPATH_ENVVAR) $(LEAK_CHECKER)
INSTALLED_INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(libdir):$$$(LDLIBRARYPATH_ENVVAR)
+# Current full path directory for cross compilation
+ifneq ($(strip $(cross_buildroot)),)
+include $(cross_buildroot)/config/icucross.inc
+endif
+
# Platform-specific setup
include @platform_make_fragment@
diff --git a/io/io.vcxproj b/io/io.vcxproj
index a6f93d4..0b80e88 100644
--- a/io/io.vcxproj
+++ b/io/io.vcxproj
@@ -107,7 +107,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin\icuio50.dll</OutputFile>
+ <OutputFile>..\..\bin\icuio51.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib\icuio.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -151,7 +151,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin\icuio50d.dll</OutputFile>
+ <OutputFile>..\..\bin\icuio51d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib\icuiod.pdb</ProgramDatabaseFile>
@@ -192,7 +192,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin64\icuio50.dll</OutputFile>
+ <OutputFile>..\..\bin64\icuio51.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib64\icuio.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -234,7 +234,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin64\icuio50d.dll</OutputFile>
+ <OutputFile>..\..\bin64\icuio51d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib64\icuiod.pdb</ProgramDatabaseFile>
diff --git a/io/ufile.c b/io/ufile.c
index 2aca838..820071f 100644
--- a/io/ufile.c
+++ b/io/ufile.c
@@ -1,7 +1,7 @@
/*
******************************************************************************
*
-* Copyright (C) 1998-2012, International Business Machines
+* Copyright (C) 1998-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@@ -18,6 +18,13 @@
******************************************************************************
*/
+/*
+ * fileno is not declared when building with GCC in strict mode.
+ */
+#if defined(__GNUC__) && defined(__STRICT_ANSI__)
+#undef __STRICT_ANSI__
+#endif
+
#include "locmap.h"
#include "unicode/ustdio.h"
#include "ufile.h"
@@ -298,4 +305,10 @@
{
return file->fConverter;
}
+#if !UCONFIG_NO_FORMATTING
+U_CAPI const UNumberFormat* U_EXPORT2 u_fgetNumberFormat(UFILE *file)
+{
+ return u_locbund_getNumberFormat(&file->str.fBundle, UNUM_DECIMAL);
+}
+#endif
diff --git a/io/unicode/ustdio.h b/io/unicode/ustdio.h
index 5732a7e..e29ad22 100644
--- a/io/unicode/ustdio.h
+++ b/io/unicode/ustdio.h
@@ -1,7 +1,7 @@
/*
******************************************************************************
*
-* Copyright (C) 1998-2012, International Business Machines
+* Copyright (C) 1998-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@@ -29,6 +29,7 @@
#include "unicode/ucnv.h"
#include "unicode/utrans.h"
#include "unicode/localpointer.h"
+#include "unicode/unum.h"
/*
TODO
@@ -364,7 +365,7 @@
/**
* Get the FILE* associated with a UFILE.
* @param f The UFILE
- * @return A FILE*, owned by the UFILE. The FILE <EM>must not</EM> be closed.
+ * @return A FILE*, owned by the UFILE. (The FILE <EM>must not</EM> be modified or closed)
* @stable ICU 3.0
*/
U_STABLE FILE* U_EXPORT2
@@ -432,12 +433,21 @@
/**
* Returns an alias to the converter being used for this file.
* @param f The UFILE to get the value from
- * @return alias to the converter
+ * @return alias to the converter (The converter <EM>must not</EM> be modified or closed)
* @stable ICU 3.0
*/
U_STABLE UConverter* U_EXPORT2 u_fgetConverter(UFILE *f);
#if !UCONFIG_NO_FORMATTING
+#ifndef U_HIDE_DRAFT_API
+/**
+ * Returns an alias to the number formatter being used for this file.
+ * @param f The UFILE to get the value from
+ * @return alias to the number formatter (The formatter <EM>must not</EM> be modified or closed)
+ * @draft ICU 51
+*/
+ U_DRAFT const UNumberFormat* U_EXPORT2 u_fgetNumberFormat(UFILE *f);
+#endif /* U_HIDE_DRAFT_API */
/* Output functions */
@@ -446,9 +456,9 @@
* @param patternSpecification A pattern specifying how <TT>u_printf</TT> will
* interpret the variable arguments received and format the data.
* @return The number of Unicode characters written to <TT>stdout</TT>
- * @draft ICU 49
+ * @stable ICU 49
*/
-U_DRAFT int32_t U_EXPORT2
+U_STABLE int32_t U_EXPORT2
u_printf(const char *patternSpecification,
... );
@@ -487,18 +497,18 @@
* @param patternSpecification A pattern specifying how <TT>u_printf_u</TT> will
* interpret the variable arguments received and format the data.
* @return The number of Unicode characters written to <TT>stdout</TT>
- * @draft ICU 49
+ * @stable ICU 49
*/
-U_DRAFT int32_t U_EXPORT2
+U_STABLE int32_t U_EXPORT2
u_printf_u(const UChar *patternSpecification,
... );
/**
* Get a UFILE for <TT>stdout</TT>.
* @return UFILE that writes to <TT>stdout</TT>
- * @draft ICU 49
+ * @stable ICU 49
*/
-U_DRAFT UFILE * U_EXPORT2
+U_STABLE UFILE * U_EXPORT2
u_get_stdout(void);
/**
diff --git a/layout/ContextualGlyphInsertion.h b/layout/ContextualGlyphInsertion.h
index ead8842..5262732 100644
--- a/layout/ContextualGlyphInsertion.h
+++ b/layout/ContextualGlyphInsertion.h
@@ -1,6 +1,6 @@
-/*
+/**
*
- * (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved
+ * (C) Copyright IBM Corp. and Others 1998-2013 - All Rights Reserved
*
*/
@@ -24,6 +24,11 @@
{
};
+struct ContextualGlyphInsertionHeader2 : MorphStateTableHeader2
+{
+ le_uint32 insertionTableOffset;
+};
+
enum ContextualGlyphInsertionFlags
{
cgiSetMark = 0x8000,
@@ -36,11 +41,17 @@
cgiMarkedInsertCountMask = 0x001F
};
-struct LigatureSubstitutionStateEntry : StateEntry
+struct ContextualGlyphInsertionStateEntry : StateEntry
{
ByteOffset currentInsertionListOffset;
ByteOffset markedInsertionListOffset;
};
+struct ContextualGlyphInsertionStateEntry2 : StateEntry2
+{
+ le_uint16 currentInsertionListIndex;
+ le_uint16 markedInsertionListIndex;
+};
+
U_NAMESPACE_END
#endif
diff --git a/layout/ContextualGlyphInsertionProc2.cpp b/layout/ContextualGlyphInsertionProc2.cpp
new file mode 100644
index 0000000..ee912ae
--- /dev/null
+++ b/layout/ContextualGlyphInsertionProc2.cpp
@@ -0,0 +1,143 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "StateTables.h"
+#include "MorphStateTables.h"
+#include "SubtableProcessor2.h"
+#include "StateTableProcessor2.h"
+#include "ContextualGlyphInsertionProc2.h"
+#include "LEGlyphStorage.h"
+#include "LESwaps.h"
+
+U_NAMESPACE_BEGIN
+
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(ContextualGlyphInsertionProcessor2)
+
+ContextualGlyphInsertionProcessor2::ContextualGlyphInsertionProcessor2(const MorphSubtableHeader2 *morphSubtableHeader)
+ : StateTableProcessor2(morphSubtableHeader)
+{
+ contextualGlyphHeader = (const ContextualGlyphInsertionHeader2 *) morphSubtableHeader;
+ le_uint32 insertionTableOffset = SWAPL(contextualGlyphHeader->insertionTableOffset);
+ insertionTable = ((le_uint16 *) ((char *)&stateTableHeader->stHeader + insertionTableOffset));
+ entryTable = (const ContextualGlyphInsertionStateEntry2 *) ((char *) &stateTableHeader->stHeader + entryTableOffset);
+}
+
+ContextualGlyphInsertionProcessor2::~ContextualGlyphInsertionProcessor2()
+{
+}
+
+void ContextualGlyphInsertionProcessor2::beginStateTable()
+{
+ markGlyph = 0;
+}
+
+le_uint16 ContextualGlyphInsertionProcessor2::processStateEntry(LEGlyphStorage &glyphStorage, le_int32 &currGlyph, EntryTableIndex2 index)
+{
+ const ContextualGlyphInsertionStateEntry2 *entry = &entryTable[index];
+ le_uint16 newState = SWAPW(entry->newStateIndex);
+ le_uint16 flags = SWAPW(entry->flags);
+ le_int16 currIndex = SWAPW(entry->currentInsertionListIndex);
+ le_int16 markIndex = SWAPW(entry->markedInsertionListIndex);
+ int i = 0;
+
+ if (markIndex > 0) {
+ le_int16 count = (flags & cgiMarkedInsertCountMask) >> 5;
+ if (!(flags & cgiMarkedIsKashidaLike)) {
+ // extra glyph(s) will be added directly before/after the specified marked glyph
+ if (!(flags & cgiMarkInsertBefore)) {
+ LEGlyphID *insertGlyphs = glyphStorage.insertGlyphs(markGlyph, count + 1);
+ for (i = 0; i < count; i++, markIndex++) {
+ insertGlyphs[i] = insertionTable[markIndex];
+ }
+ insertGlyphs[i] = glyphStorage[markGlyph];
+ glyphStorage.applyInsertions();
+ } else {
+ LEGlyphID *insertGlyphs = glyphStorage.insertGlyphs(markGlyph, count + 1);
+ insertGlyphs[0] = glyphStorage[markGlyph];
+ for (i = 1; i < count + 1; i++, markIndex++) {
+ insertGlyphs[i] = insertionTable[markIndex];
+ }
+ glyphStorage.applyInsertions();
+ }
+ } else {
+ // inserted as a split-vowel-like insertion
+ // extra glyph(s) will be inserted some distance away from the marked glyph
+ if (!(flags & cgiMarkInsertBefore)) {
+ LEGlyphID *insertGlyphs = glyphStorage.insertGlyphs(markGlyph, count + 1);
+ for (i = 0; i < count; i++, markIndex++) {
+ insertGlyphs[i] = insertionTable[markIndex];
+ }
+ insertGlyphs[i] = glyphStorage[markGlyph];
+ glyphStorage.applyInsertions();
+ } else {
+ LEGlyphID *insertGlyphs = glyphStorage.insertGlyphs(markGlyph, count + 1);
+ insertGlyphs[0] = glyphStorage[markGlyph];
+ for (i = 1; i < count + 1; i++, markIndex++) {
+ insertGlyphs[i] = insertionTable[markIndex];
+ }
+ glyphStorage.applyInsertions();
+ }
+ }
+ }
+
+ if (currIndex > 0) {
+ le_int16 count = flags & cgiCurrentInsertCountMask;
+ if (!(flags & cgiCurrentIsKashidaLike)) {
+ // extra glyph(s) will be added directly before/after the specified current glyph
+ if (!(flags & cgiCurrentInsertBefore)) {
+ LEGlyphID *insertGlyphs = glyphStorage.insertGlyphs(currGlyph, count + 1);
+ for (i = 0; i < count; i++, currIndex++) {
+ insertGlyphs[i] = insertionTable[currIndex];
+ }
+ insertGlyphs[i] = glyphStorage[currGlyph];
+ glyphStorage.applyInsertions();
+ } else {
+ LEGlyphID *insertGlyphs = glyphStorage.insertGlyphs(currGlyph, count + 1);
+ insertGlyphs[0] = glyphStorage[currGlyph];
+ for (i = 1; i < count + 1; i++, currIndex++) {
+ insertGlyphs[i] = insertionTable[currIndex];
+ }
+ glyphStorage.applyInsertions();
+ }
+ } else {
+ // inserted as a split-vowel-like insertion
+ // extra glyph(s) will be inserted some distance away from the current glyph
+ if (!(flags & cgiCurrentInsertBefore)) {
+ LEGlyphID *insertGlyphs = glyphStorage.insertGlyphs(currGlyph, count + 1);
+ for (i = 0; i < count; i++, currIndex++) {
+ insertGlyphs[i] = insertionTable[currIndex];
+ }
+ insertGlyphs[i] = glyphStorage[currGlyph];
+ glyphStorage.applyInsertions();
+ } else {
+ LEGlyphID *insertGlyphs = glyphStorage.insertGlyphs(currGlyph, count + 1);
+ insertGlyphs[0] = glyphStorage[currGlyph];
+ for (i = 1; i < count + 1; i++, currIndex++) {
+ insertGlyphs[i] = insertionTable[currIndex];
+ }
+ glyphStorage.applyInsertions();
+ }
+ }
+ }
+
+ if (flags & cgiSetMark) {
+ markGlyph = currGlyph;
+ }
+
+ if (!(flags & cgiDontAdvance)) {
+ currGlyph += dir;
+ }
+
+ return newState;
+}
+
+void ContextualGlyphInsertionProcessor2::endStateTable()
+{
+}
+
+U_NAMESPACE_END
diff --git a/layout/ContextualGlyphInsertionProc2.h b/layout/ContextualGlyphInsertionProc2.h
new file mode 100644
index 0000000..f0096d3
--- /dev/null
+++ b/layout/ContextualGlyphInsertionProc2.h
@@ -0,0 +1,64 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 2013 - All Rights Reserved
+ *
+ */
+
+#ifndef __CONTEXTUALGLYPHINSERTIONPROCESSOR2_H
+#define __CONTEXTUALGLYPHINSERTIONPROCESSOR2_H
+
+/**
+ * \file
+ * \internal
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "SubtableProcessor2.h"
+#include "StateTableProcessor2.h"
+#include "ContextualGlyphInsertionProc2.h"
+#include "ContextualGlyphInsertion.h"
+
+U_NAMESPACE_BEGIN
+
+class LEGlyphStorage;
+
+class ContextualGlyphInsertionProcessor2 : public StateTableProcessor2
+{
+public:
+ virtual void beginStateTable();
+
+ virtual le_uint16 processStateEntry(LEGlyphStorage &glyphStorage, le_int32 &currGlyph, EntryTableIndex2 index);
+
+ virtual void endStateTable();
+
+ ContextualGlyphInsertionProcessor2(const MorphSubtableHeader2 *morphSubtableHeader);
+ virtual ~ContextualGlyphInsertionProcessor2();
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for the actual class.
+ *
+ * @stable ICU 2.8
+ */
+ virtual UClassID getDynamicClassID() const;
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for this class.
+ *
+ * @stable ICU 2.8
+ */
+ static UClassID getStaticClassID();
+
+private:
+ ContextualGlyphInsertionProcessor2();
+
+protected:
+ le_int32 markGlyph;
+ const le_uint16* insertionTable;
+ const ContextualGlyphInsertionStateEntry2 *entryTable;
+ const ContextualGlyphInsertionHeader2 *contextualGlyphHeader;
+
+};
+
+U_NAMESPACE_END
+#endif
diff --git a/layout/ContextualGlyphSubstProc2.cpp b/layout/ContextualGlyphSubstProc2.cpp
new file mode 100644
index 0000000..b57030b
--- /dev/null
+++ b/layout/ContextualGlyphSubstProc2.cpp
@@ -0,0 +1,135 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "StateTables.h"
+#include "MorphStateTables.h"
+#include "SubtableProcessor2.h"
+#include "StateTableProcessor2.h"
+#include "ContextualGlyphSubstProc2.h"
+#include "LEGlyphStorage.h"
+#include "LESwaps.h"
+#include <stdio.h>
+
+U_NAMESPACE_BEGIN
+
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(ContextualGlyphSubstitutionProcessor2)
+
+ContextualGlyphSubstitutionProcessor2::ContextualGlyphSubstitutionProcessor2(const MorphSubtableHeader2 *morphSubtableHeader)
+ : StateTableProcessor2(morphSubtableHeader)
+{
+ contextualGlyphHeader = (const ContextualGlyphHeader2 *) morphSubtableHeader;
+ le_uint32 perGlyphTableOffset = SWAPL(contextualGlyphHeader->perGlyphTableOffset);
+ perGlyphTable = ((le_uint32 *) ((char *)&stateTableHeader->stHeader + perGlyphTableOffset));
+ entryTable = (const ContextualGlyphStateEntry2 *) ((char *) &stateTableHeader->stHeader + entryTableOffset);
+}
+
+ContextualGlyphSubstitutionProcessor2::~ContextualGlyphSubstitutionProcessor2()
+{
+}
+
+void ContextualGlyphSubstitutionProcessor2::beginStateTable()
+{
+ markGlyph = 0;
+}
+
+le_uint16 ContextualGlyphSubstitutionProcessor2::processStateEntry(LEGlyphStorage &glyphStorage, le_int32 &currGlyph, EntryTableIndex2 index)
+{
+ const ContextualGlyphStateEntry2 *entry = &entryTable[index];
+ le_uint16 newState = SWAPW(entry->newStateIndex);
+ le_uint16 flags = SWAPW(entry->flags);
+ le_int16 markIndex = SWAPW(entry->markIndex);
+ le_int16 currIndex = SWAPW(entry->currIndex);
+
+ if (markIndex != -1) {
+ le_uint32 offset = SWAPL(perGlyphTable[markIndex]);
+ LEGlyphID mGlyph = glyphStorage[markGlyph];
+ TTGlyphID newGlyph = lookup(offset, mGlyph);
+ glyphStorage[markGlyph] = LE_SET_GLYPH(mGlyph, newGlyph);
+ }
+
+ if (currIndex != -1) {
+ le_uint32 offset = SWAPL(perGlyphTable[currIndex]);
+ LEGlyphID thisGlyph = glyphStorage[currGlyph];
+ TTGlyphID newGlyph = lookup(offset, thisGlyph);
+ glyphStorage[currGlyph] = LE_SET_GLYPH(thisGlyph, newGlyph);
+ }
+
+ if (flags & cgsSetMark) {
+ markGlyph = currGlyph;
+ }
+
+ if (!(flags & cgsDontAdvance)) {
+ currGlyph += dir;
+ }
+
+ return newState;
+}
+
+TTGlyphID ContextualGlyphSubstitutionProcessor2::lookup(le_uint32 offset, LEGlyphID gid)
+{
+ LookupTable *lookupTable = ((LookupTable *) ((char *)perGlyphTable + offset));
+ le_int16 format = SWAPW(lookupTable->format);
+ TTGlyphID newGlyph = 0xFFFF;
+
+ switch (format) {
+ case ltfSimpleArray: {
+#ifdef TEST_FORMAT
+ // Disabled pending for design review
+ SimpleArrayLookupTable *lookupTable0 = (SimpleArrayLookupTable *) lookupTable;
+ TTGlyphID glyphCode = (TTGlyphID) LE_GET_GLYPH(gid);
+ newGlyph = SWAPW(lookupTable0->valueArray[glyphCode]);
+#endif
+ break;
+ }
+ case ltfSegmentSingle: {
+#ifdef TEST_FORMAT
+ // Disabled pending for design review
+ SegmentSingleLookupTable *lookupTable2 = (SegmentSingleLookupTable *) lookupTable;
+ const LookupSegment *segment = lookupTable2->lookupSegment(lookupTable2->segments, gid);
+ if (segment != NULL) {
+ newGlyph = SWAPW(segment->value);
+ }
+#endif
+ break;
+ }
+ case ltfSegmentArray: {
+ printf("Context Lookup Table Format4: specific interpretation needed!\n");
+ break;
+ }
+ case ltfSingleTable:
+ {
+#ifdef TEST_FORMAT
+ // Disabled pending for design review
+ SingleTableLookupTable *lookupTable6 = (SingleTableLookupTable *) lookupTable;
+ const LookupSingle *segment = lookupTable6->lookupSingle(lookupTable6->entries, gid);
+ if (segment != NULL) {
+ newGlyph = SWAPW(segment->value);
+ }
+#endif
+ break;
+ }
+ case ltfTrimmedArray: {
+ TrimmedArrayLookupTable *lookupTable8 = (TrimmedArrayLookupTable *) lookupTable;
+ TTGlyphID firstGlyph = SWAPW(lookupTable8->firstGlyph);
+ TTGlyphID lastGlyph = firstGlyph + SWAPW(lookupTable8->glyphCount);
+ TTGlyphID glyphCode = (TTGlyphID) LE_GET_GLYPH(gid);
+ if ((glyphCode >= firstGlyph) && (glyphCode < lastGlyph)) {
+ newGlyph = SWAPW(lookupTable8->valueArray[glyphCode - firstGlyph]);
+ }
+ }
+ default:
+ break;
+ }
+ return newGlyph;
+}
+
+void ContextualGlyphSubstitutionProcessor2::endStateTable()
+{
+}
+
+U_NAMESPACE_END
diff --git a/layout/ContextualGlyphSubstProc2.h b/layout/ContextualGlyphSubstProc2.h
new file mode 100644
index 0000000..aaf986f
--- /dev/null
+++ b/layout/ContextualGlyphSubstProc2.h
@@ -0,0 +1,67 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#ifndef __CONTEXTUALGLYPHSUBSTITUTIONPROCESSOR2_H
+#define __CONTEXTUALGLYPHSUBSTITUTIONPROCESSOR2_H
+
+/**
+ * \file
+ * \internal
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "SubtableProcessor2.h"
+#include "StateTableProcessor2.h"
+#include "ContextualGlyphSubstitution.h"
+
+U_NAMESPACE_BEGIN
+
+class LEGlyphStorage;
+
+class ContextualGlyphSubstitutionProcessor2 : public StateTableProcessor2
+{
+public:
+ virtual void beginStateTable();
+
+ virtual le_uint16 processStateEntry(LEGlyphStorage &glyphStorage, le_int32 &currGlyph, EntryTableIndex2 index);
+
+ virtual void endStateTable();
+
+ ContextualGlyphSubstitutionProcessor2(const MorphSubtableHeader2 *morphSubtableHeader);
+ virtual ~ContextualGlyphSubstitutionProcessor2();
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for the actual class.
+ *
+ * @stable ICU 2.8
+ */
+ virtual UClassID getDynamicClassID() const;
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for this class.
+ *
+ * @stable ICU 2.8
+ */
+ static UClassID getStaticClassID();
+
+private:
+ ContextualGlyphSubstitutionProcessor2();
+ TTGlyphID lookup(le_uint32 offset, LEGlyphID gid);
+
+protected:
+ const le_uint32* perGlyphTable;
+ const ContextualGlyphStateEntry2 *entryTable;
+
+ le_int16 perGlyphTableFormat;
+ le_int32 markGlyph;
+
+ const ContextualGlyphHeader2 *contextualGlyphHeader;
+
+};
+
+U_NAMESPACE_END
+#endif
diff --git a/layout/ContextualGlyphSubstitution.h b/layout/ContextualGlyphSubstitution.h
index 72c2355..4ecc8ad 100644
--- a/layout/ContextualGlyphSubstitution.h
+++ b/layout/ContextualGlyphSubstitution.h
@@ -1,6 +1,6 @@
/*
*
- * (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
*
*/
@@ -24,6 +24,11 @@
ByteOffset substitutionTableOffset;
};
+struct ContextualGlyphHeader2 : MorphStateTableHeader2
+{
+ le_uint32 perGlyphTableOffset; // no more substitution tables
+};
+
enum ContextualGlyphSubstitutionFlags
{
cgsSetMark = 0x8000,
@@ -37,5 +42,11 @@
WordOffset currOffset;
};
+struct ContextualGlyphStateEntry2 : StateEntry2
+{
+ le_uint16 markIndex;
+ le_uint16 currIndex;
+};
+
U_NAMESPACE_END
#endif
diff --git a/layout/GXLayoutEngine2.cpp b/layout/GXLayoutEngine2.cpp
new file mode 100644
index 0000000..1356fc4
--- /dev/null
+++ b/layout/GXLayoutEngine2.cpp
@@ -0,0 +1,66 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#include "LETypes.h"
+#include "LayoutEngine.h"
+#include "GXLayoutEngine2.h"
+#include "LEGlyphStorage.h"
+#include "MorphTables.h"
+
+U_NAMESPACE_BEGIN
+
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(GXLayoutEngine2)
+
+GXLayoutEngine2::GXLayoutEngine2(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode, const MorphTableHeader2 *morphTable, le_int32 typoFlags, LEErrorCode &success)
+ : LayoutEngine(fontInstance, scriptCode, languageCode, typoFlags, success), fMorphTable(morphTable)
+{
+ // nothing else to do?
+}
+
+GXLayoutEngine2::~GXLayoutEngine2()
+{
+ reset();
+}
+
+// apply 'morx' table
+le_int32 GXLayoutEngine2::computeGlyphs(const LEUnicode chars[], le_int32 offset, le_int32 count, le_int32 max, le_bool rightToLeft, LEGlyphStorage &glyphStorage, LEErrorCode &success)
+{
+ if (LE_FAILURE(success)) {
+ return 0;
+ }
+
+ if (chars == NULL || offset < 0 || count < 0 || max < 0 || offset >= max || offset + count > max) {
+ success = LE_ILLEGAL_ARGUMENT_ERROR;
+ return 0;
+ }
+
+ mapCharsToGlyphs(chars, offset, count, rightToLeft, rightToLeft, glyphStorage, success);
+
+ if (LE_FAILURE(success)) {
+ return 0;
+ }
+
+ fMorphTable->process(glyphStorage, fTypoFlags);
+ return count;
+}
+
+// apply positional tables
+void GXLayoutEngine2::adjustGlyphPositions(const LEUnicode chars[], le_int32 offset, le_int32 count, le_bool /*reverse*/,
+ LEGlyphStorage &/*glyphStorage*/, LEErrorCode &success)
+{
+ if (LE_FAILURE(success)) {
+ return;
+ }
+
+ if (chars == NULL || offset < 0 || count < 0) {
+ success = LE_ILLEGAL_ARGUMENT_ERROR;
+ return;
+ }
+
+ // FIXME: no positional processing yet...
+}
+
+U_NAMESPACE_END
diff --git a/layout/GXLayoutEngine2.h b/layout/GXLayoutEngine2.h
new file mode 100644
index 0000000..14104b7
--- /dev/null
+++ b/layout/GXLayoutEngine2.h
@@ -0,0 +1,125 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#ifndef __GXLAYOUTENGINE2_H
+#define __GXLAYOUTENGINE2_H
+
+#include "LETypes.h"
+#include "LayoutEngine.h"
+
+#include "MorphTables.h"
+
+U_NAMESPACE_BEGIN
+
+class LEFontInstance;
+class LEGlyphStorage;
+
+/**
+ * This class implements layout for QuickDraw GX or Apple Advanced Typograyph (AAT)
+ * fonts. A font is a GX or AAT font if it contains a 'mort' table. See Apple's
+ * TrueType Reference Manual (http://fonts.apple.com/TTRefMan/index.html) for details.
+ * Information about 'mort' tables is in the chapter titled "Font Files."
+ *
+ * @internal
+ */
+class GXLayoutEngine2 : public LayoutEngine
+{
+public:
+ /**
+ * This is the main constructor. It constructs an instance of GXLayoutEngine for
+ * a particular font, script and language. It takes the 'mort' table as a parameter since
+ * LayoutEngine::layoutEngineFactory has to read the 'mort' table to know that it has a
+ * GX font.
+ *
+ * Note: GX and AAT fonts don't contain any script and language specific tables, so
+ * the script and language are ignored.
+ *
+ * @param fontInstance - the font
+ * @param scriptCode - the script
+ * @param langaugeCode - the language
+ * @param morphTable - the 'mort' table
+ * @param success - set to an error code if the operation fails
+ *
+ * @see LayoutEngine::layoutEngineFactory
+ * @see ScriptAndLangaugeTags.h for script and language codes
+ *
+ * @internal
+ */
+ GXLayoutEngine2(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode, const MorphTableHeader2 *morphTable, le_int32 typoFlags, LEErrorCode &success);
+
+ /**
+ * The destructor, virtual for correct polymorphic invocation.
+ *
+ * @internal
+ */
+ virtual ~GXLayoutEngine2();
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for the actual class.
+ *
+ * @stable ICU 2.8
+ */
+ virtual UClassID getDynamicClassID() const;
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for this class.
+ *
+ * @stable ICU 2.8
+ */
+ static UClassID getStaticClassID();
+
+protected:
+
+ /**
+ * The address of the 'mort' table
+ *
+ * @internal
+ */
+ const MorphTableHeader2 *fMorphTable;
+
+ /**
+ * This method does GX layout using the font's 'mort' table. It converts the
+ * input character codes to glyph indices using mapCharsToGlyphs, and then
+ * applies the 'mort' table.
+ *
+ * Input parameters:
+ * @param chars - the input character context
+ * @param offset - the index of the first character to process
+ * @param count - the number of characters to process
+ * @param max - the number of characters in the input context
+ * @param rightToLeft - <code>TRUE</code> if the text is in a right to left directional run
+ * @param glyphStorage - the glyph storage object. The glyph and char index arrays will be set.
+ *
+ * Output parameters:
+ * @param success - set to an error code if the operation fails
+ *
+ * @return the number of glyphs in the glyph index array
+ *
+ * @internal
+ */
+ virtual le_int32 computeGlyphs(const LEUnicode chars[], le_int32 offset, le_int32 count, le_int32 max, le_bool rightToLeft,
+ LEGlyphStorage &glyphStorage, LEErrorCode &success);
+
+ /**
+ * This method adjusts the glyph positions using the font's
+ * 'kern', 'trak', 'bsln', 'opbd' and 'just' tables.
+ *
+ * Input parameters:
+ * @param glyphStorage - the object holding the glyph storage. The positions will be updated as needed.
+ *
+ * Output parameters:
+ * @param success - set to an error code if the operation fails
+ *
+ * @internal
+ */
+ virtual void adjustGlyphPositions(const LEUnicode chars[], le_int32 offset, le_int32 count, le_bool reverse,
+ LEGlyphStorage &glyphStorage, LEErrorCode &success);
+
+};
+
+U_NAMESPACE_END
+#endif
+
diff --git a/layout/IndicRearrangement.h b/layout/IndicRearrangement.h
index 48b1d08..3af3692 100644
--- a/layout/IndicRearrangement.h
+++ b/layout/IndicRearrangement.h
@@ -1,6 +1,6 @@
/*
*
- * (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved
+ * (C) Copyright IBM Corp. and Others 1998-2013 - All Rights Reserved
*
*/
@@ -24,6 +24,10 @@
{
};
+struct IndicRearrangementSubtableHeader2 : MorphStateTableHeader2
+{
+};
+
enum IndicRearrangementFlags
{
irfMarkFirst = 0x8000,
@@ -60,6 +64,10 @@
{
};
+struct IndicRearrangementStateEntry2 : StateEntry2
+{
+};
+
U_NAMESPACE_END
#endif
diff --git a/layout/IndicRearrangementProcessor2.cpp b/layout/IndicRearrangementProcessor2.cpp
new file mode 100644
index 0000000..b7849e3
--- /dev/null
+++ b/layout/IndicRearrangementProcessor2.cpp
@@ -0,0 +1,398 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "StateTables.h"
+#include "MorphStateTables.h"
+#include "SubtableProcessor2.h"
+#include "StateTableProcessor2.h"
+#include "IndicRearrangementProcessor2.h"
+#include "LEGlyphStorage.h"
+#include "LESwaps.h"
+
+U_NAMESPACE_BEGIN
+
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(IndicRearrangementProcessor2)
+
+IndicRearrangementProcessor2::IndicRearrangementProcessor2(const MorphSubtableHeader2 *morphSubtableHeader)
+ : StateTableProcessor2(morphSubtableHeader)
+{
+ indicRearrangementSubtableHeader = (const IndicRearrangementSubtableHeader2 *) morphSubtableHeader;
+ entryTable = (const IndicRearrangementStateEntry2 *) ((char *) &stateTableHeader->stHeader + entryTableOffset);
+}
+
+IndicRearrangementProcessor2::~IndicRearrangementProcessor2()
+{
+}
+
+void IndicRearrangementProcessor2::beginStateTable()
+{
+ firstGlyph = 0;
+ lastGlyph = 0;
+}
+
+le_uint16 IndicRearrangementProcessor2::processStateEntry(LEGlyphStorage &glyphStorage, le_int32 &currGlyph, EntryTableIndex2 index)
+{
+ const IndicRearrangementStateEntry2 *entry = &entryTable[index];
+ le_uint16 newState = SWAPW(entry->newStateIndex); // index to the new state
+ IndicRearrangementFlags flags = (IndicRearrangementFlags) SWAPW(entry->flags);
+
+ if (flags & irfMarkFirst) {
+ firstGlyph = currGlyph;
+ }
+
+ if (flags & irfMarkLast) {
+ lastGlyph = currGlyph;
+ }
+
+ doRearrangementAction(glyphStorage, (IndicRearrangementVerb) (flags & irfVerbMask));
+
+ if (!(flags & irfDontAdvance)) {
+ currGlyph += dir;
+ }
+
+ return newState; // index to new state
+}
+
+void IndicRearrangementProcessor2::endStateTable()
+{
+}
+
+void IndicRearrangementProcessor2::doRearrangementAction(LEGlyphStorage &glyphStorage, IndicRearrangementVerb verb) const
+{
+ LEGlyphID a, b, c, d;
+ le_int32 ia, ib, ic, id, ix, x;
+ LEErrorCode success = LE_NO_ERROR;
+
+ switch(verb)
+ {
+ case irvNoAction:
+ break;
+
+ case irvxA:
+ a = glyphStorage[firstGlyph];
+ ia = glyphStorage.getCharIndex(firstGlyph, success);
+ x = firstGlyph + 1;
+
+ while (x <= lastGlyph) {
+ glyphStorage[x - 1] = glyphStorage[x];
+ ix = glyphStorage.getCharIndex(x, success);
+ glyphStorage.setCharIndex(x - 1, ix, success);
+ x += 1;
+ }
+
+ glyphStorage[lastGlyph] = a;
+ glyphStorage.setCharIndex(lastGlyph, ia, success);
+ break;
+
+ case irvDx:
+ d = glyphStorage[lastGlyph];
+ id = glyphStorage.getCharIndex(lastGlyph, success);
+ x = lastGlyph - 1;
+
+ while (x >= firstGlyph) {
+ glyphStorage[x + 1] = glyphStorage[x];
+ ix = glyphStorage.getCharIndex(x, success);
+ glyphStorage.setCharIndex(x + 1, ix, success);
+ x -= 1;
+ }
+
+ glyphStorage[firstGlyph] = d;
+ glyphStorage.setCharIndex(firstGlyph, id, success);
+ break;
+
+ case irvDxA:
+ a = glyphStorage[firstGlyph];
+ ia = glyphStorage.getCharIndex(firstGlyph, success);
+ id = glyphStorage.getCharIndex(lastGlyph, success);
+
+ glyphStorage[firstGlyph] = glyphStorage[lastGlyph];
+ glyphStorage[lastGlyph] = a;
+
+ glyphStorage.setCharIndex(firstGlyph, id, success);
+ glyphStorage.setCharIndex(lastGlyph, ia, success);
+ break;
+
+ case irvxAB:
+ a = glyphStorage[firstGlyph];
+ b = glyphStorage[firstGlyph + 1];
+ ia = glyphStorage.getCharIndex(firstGlyph, success);
+ ib = glyphStorage.getCharIndex(firstGlyph + 1, success);
+ x = firstGlyph + 2;
+
+ while (x <= lastGlyph) {
+ glyphStorage[x - 2] = glyphStorage[x];
+ ix = glyphStorage.getCharIndex(x, success);
+ glyphStorage.setCharIndex(x - 2, ix, success);
+ x += 1;
+ }
+
+ glyphStorage[lastGlyph - 1] = a;
+ glyphStorage[lastGlyph] = b;
+
+ glyphStorage.setCharIndex(lastGlyph - 1, ia, success);
+ glyphStorage.setCharIndex(lastGlyph, ib, success);
+ break;
+
+ case irvxBA:
+ a = glyphStorage[firstGlyph];
+ b = glyphStorage[firstGlyph + 1];
+ ia = glyphStorage.getCharIndex(firstGlyph, success);
+ ib = glyphStorage.getCharIndex(firstGlyph + 1, success);
+ x = firstGlyph + 2;
+
+ while (x <= lastGlyph) {
+ glyphStorage[x - 2] = glyphStorage[x];
+ ix = glyphStorage.getCharIndex(x, success);
+ glyphStorage.setCharIndex(x - 2, ix, success);
+ x += 1;
+ }
+
+ glyphStorage[lastGlyph - 1] = b;
+ glyphStorage[lastGlyph] = a;
+
+ glyphStorage.setCharIndex(lastGlyph - 1, ib, success);
+ glyphStorage.setCharIndex(lastGlyph, ia, success);
+ break;
+
+ case irvCDx:
+ c = glyphStorage[lastGlyph - 1];
+ d = glyphStorage[lastGlyph];
+ ic = glyphStorage.getCharIndex(lastGlyph - 1, success);
+ id = glyphStorage.getCharIndex(lastGlyph, success);
+ x = lastGlyph - 2;
+
+ while (x >= firstGlyph) {
+ glyphStorage[x + 2] = glyphStorage[x];
+ ix = glyphStorage.getCharIndex(x, success);
+ glyphStorage.setCharIndex(x + 2, ix, success);
+ x -= 1;
+ }
+
+ glyphStorage[firstGlyph] = c;
+ glyphStorage[firstGlyph + 1] = d;
+
+ glyphStorage.setCharIndex(firstGlyph, ic, success);
+ glyphStorage.setCharIndex(firstGlyph + 1, id, success);
+ break;
+
+ case irvDCx:
+ c = glyphStorage[lastGlyph - 1];
+ d = glyphStorage[lastGlyph];
+ ic = glyphStorage.getCharIndex(lastGlyph - 1, success);
+ id = glyphStorage.getCharIndex(lastGlyph, success);
+ x = lastGlyph - 2;
+
+ while (x >= firstGlyph) {
+ glyphStorage[x + 2] = glyphStorage[x];
+ ix = glyphStorage.getCharIndex(x, success);
+ glyphStorage.setCharIndex(x + 2, ix, success);
+ x -= 1;
+ }
+
+ glyphStorage[firstGlyph] = d;
+ glyphStorage[firstGlyph + 1] = c;
+
+ glyphStorage.setCharIndex(firstGlyph, id, success);
+ glyphStorage.setCharIndex(firstGlyph + 1, ic, success);
+ break;
+
+ case irvCDxA:
+ a = glyphStorage[firstGlyph];
+ c = glyphStorage[lastGlyph - 1];
+ d = glyphStorage[lastGlyph];
+ ia = glyphStorage.getCharIndex(firstGlyph, success);
+ ic = glyphStorage.getCharIndex(lastGlyph - 1, success);
+ id = glyphStorage.getCharIndex(lastGlyph, success);
+ x = lastGlyph - 2;
+
+ while (x > firstGlyph) {
+ glyphStorage[x + 1] = glyphStorage[x];
+ ix = glyphStorage.getCharIndex(x, success);
+ glyphStorage.setCharIndex(x + 1, ix, success);
+ x -= 1;
+ }
+
+ glyphStorage[firstGlyph] = c;
+ glyphStorage[firstGlyph + 1] = d;
+ glyphStorage[lastGlyph] = a;
+
+ glyphStorage.setCharIndex(firstGlyph, ic, success);
+ glyphStorage.setCharIndex(firstGlyph + 1, id, success);
+ glyphStorage.setCharIndex(lastGlyph, ia, success);
+ break;
+
+ case irvDCxA:
+ a = glyphStorage[firstGlyph];
+ c = glyphStorage[lastGlyph - 1];
+ d = glyphStorage[lastGlyph];
+ ia = glyphStorage.getCharIndex(firstGlyph, success);
+ ic = glyphStorage.getCharIndex(lastGlyph - 1, success);
+ id = glyphStorage.getCharIndex(lastGlyph, success);
+ x = lastGlyph - 2;
+
+ while (x > firstGlyph) {
+ glyphStorage[x + 1] = glyphStorage[x];
+ ix = glyphStorage.getCharIndex(x, success);
+ glyphStorage.setCharIndex(x + 1, ix, success);
+ x -= 1;
+ }
+
+ glyphStorage[firstGlyph] = d;
+ glyphStorage[firstGlyph + 1] = c;
+ glyphStorage[lastGlyph] = a;
+
+ glyphStorage.setCharIndex(firstGlyph, id, success);
+ glyphStorage.setCharIndex(firstGlyph + 1, ic, success);
+ glyphStorage.setCharIndex(lastGlyph, ia, success);
+ break;
+
+ case irvDxAB:
+ a = glyphStorage[firstGlyph];
+ b = glyphStorage[firstGlyph + 1];
+ d = glyphStorage[lastGlyph];
+ ia = glyphStorage.getCharIndex(firstGlyph, success);
+ ib = glyphStorage.getCharIndex(firstGlyph + 1, success);
+ id = glyphStorage.getCharIndex(lastGlyph, success);
+ x = firstGlyph + 2;
+
+ while (x < lastGlyph) {
+ glyphStorage[x - 2] = glyphStorage[x];
+ ix = glyphStorage.getCharIndex(x, success);
+ glyphStorage.setCharIndex(x - 2, ix, success);
+ x += 1;
+ }
+
+ glyphStorage[firstGlyph] = d;
+ glyphStorage[lastGlyph - 1] = a;
+ glyphStorage[lastGlyph] = b;
+
+ glyphStorage.setCharIndex(firstGlyph, id, success);
+ glyphStorage.setCharIndex(lastGlyph - 1, ia, success);
+ glyphStorage.setCharIndex(lastGlyph, ib, success);
+ break;
+
+ case irvDxBA:
+ a = glyphStorage[firstGlyph];
+ b = glyphStorage[firstGlyph + 1];
+ d = glyphStorage[lastGlyph];
+ ia = glyphStorage.getCharIndex(firstGlyph, success);
+ ib = glyphStorage.getCharIndex(firstGlyph + 1, success);
+ id = glyphStorage.getCharIndex(lastGlyph, success);
+ x = firstGlyph + 2;
+
+ while (x < lastGlyph) {
+ glyphStorage[x - 2] = glyphStorage[x];
+ ix = glyphStorage.getCharIndex(x, success);
+ glyphStorage.setCharIndex(x - 2, ix, success);
+ x += 1;
+ }
+
+ glyphStorage[firstGlyph] = d;
+ glyphStorage[lastGlyph - 1] = b;
+ glyphStorage[lastGlyph] = a;
+
+ glyphStorage.setCharIndex(firstGlyph, id, success);
+ glyphStorage.setCharIndex(lastGlyph - 1, ib, success);
+ glyphStorage.setCharIndex(lastGlyph, ia, success);
+ break;
+
+ case irvCDxAB:
+ a = glyphStorage[firstGlyph];
+ b = glyphStorage[firstGlyph + 1];
+
+ glyphStorage[firstGlyph] = glyphStorage[lastGlyph - 1];
+ glyphStorage[firstGlyph + 1] = glyphStorage[lastGlyph];
+
+ glyphStorage[lastGlyph - 1] = a;
+ glyphStorage[lastGlyph] = b;
+
+ ia = glyphStorage.getCharIndex(firstGlyph, success);
+ ib = glyphStorage.getCharIndex(firstGlyph + 1, success);
+ ic = glyphStorage.getCharIndex(lastGlyph - 1, success);
+ id = glyphStorage.getCharIndex(lastGlyph, success);
+
+ glyphStorage.setCharIndex(firstGlyph, ic, success);
+ glyphStorage.setCharIndex(firstGlyph + 1, id, success);
+
+ glyphStorage.setCharIndex(lastGlyph - 1, ia, success);
+ glyphStorage.setCharIndex(lastGlyph, ib, success);
+ break;
+
+ case irvCDxBA:
+ a = glyphStorage[firstGlyph];
+ b = glyphStorage[firstGlyph + 1];
+
+ glyphStorage[firstGlyph] = glyphStorage[lastGlyph - 1];
+ glyphStorage[firstGlyph + 1] = glyphStorage[lastGlyph];
+
+ glyphStorage[lastGlyph - 1] = b;
+ glyphStorage[lastGlyph] = a;
+
+ ia = glyphStorage.getCharIndex(firstGlyph, success);
+ ib = glyphStorage.getCharIndex(firstGlyph + 1, success);
+ ic = glyphStorage.getCharIndex(lastGlyph - 1, success);
+ id = glyphStorage.getCharIndex(lastGlyph, success);
+
+ glyphStorage.setCharIndex(firstGlyph, ic, success);
+ glyphStorage.setCharIndex(firstGlyph + 1, id, success);
+
+ glyphStorage.setCharIndex(lastGlyph - 1, ib, success);
+ glyphStorage.setCharIndex(lastGlyph, ia, success);
+ break;
+
+ case irvDCxAB:
+ a = glyphStorage[firstGlyph];
+ b = glyphStorage[firstGlyph + 1];
+
+ glyphStorage[firstGlyph] = glyphStorage[lastGlyph];
+ glyphStorage[firstGlyph + 1] = glyphStorage[lastGlyph - 1];
+
+ glyphStorage[lastGlyph - 1] = a;
+ glyphStorage[lastGlyph] = b;
+
+ ia = glyphStorage.getCharIndex(firstGlyph, success);
+ ib = glyphStorage.getCharIndex(firstGlyph + 1, success);
+ ic = glyphStorage.getCharIndex(lastGlyph - 1, success);
+ id = glyphStorage.getCharIndex(lastGlyph, success);
+
+ glyphStorage.setCharIndex(firstGlyph, id, success);
+ glyphStorage.setCharIndex(firstGlyph + 1, ic, success);
+
+ glyphStorage.setCharIndex(lastGlyph - 1, ia, success);
+ glyphStorage.setCharIndex(lastGlyph, ib, success);
+ break;
+
+ case irvDCxBA:
+ a = glyphStorage[firstGlyph];
+ b = glyphStorage[firstGlyph + 1];
+
+ glyphStorage[firstGlyph] = glyphStorage[lastGlyph];
+ glyphStorage[firstGlyph + 1] = glyphStorage[lastGlyph - 1];
+
+ glyphStorage[lastGlyph - 1] = b;
+ glyphStorage[lastGlyph] = a;
+
+ ia = glyphStorage.getCharIndex(firstGlyph, success);
+ ib = glyphStorage.getCharIndex(firstGlyph + 1, success);
+ ic = glyphStorage.getCharIndex(lastGlyph - 1, success);
+ id = glyphStorage.getCharIndex(lastGlyph, success);
+
+ glyphStorage.setCharIndex(firstGlyph, id, success);
+ glyphStorage.setCharIndex(firstGlyph + 1, ic, success);
+
+ glyphStorage.setCharIndex(lastGlyph - 1, ib, success);
+ glyphStorage.setCharIndex(lastGlyph, ia, success);
+ break;
+
+ default:
+ break;
+ }
+
+}
+
+U_NAMESPACE_END
diff --git a/layout/IndicRearrangementProcessor2.h b/layout/IndicRearrangementProcessor2.h
new file mode 100644
index 0000000..45d4f92
--- /dev/null
+++ b/layout/IndicRearrangementProcessor2.h
@@ -0,0 +1,63 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#ifndef __INDICREARRANGEMENTPROCESSOR2_H
+#define __INDICREARRANGEMENTPROCESSOR2_H
+
+/**
+ * \file
+ * \internal
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "SubtableProcessor.h"
+#include "StateTableProcessor2.h"
+#include "IndicRearrangement.h"
+
+U_NAMESPACE_BEGIN
+
+class LEGlyphStorage;
+
+class IndicRearrangementProcessor2 : public StateTableProcessor2
+{
+public:
+ virtual void beginStateTable();
+
+ virtual le_uint16 processStateEntry(LEGlyphStorage &glyphStorage, le_int32 &currGlyph, EntryTableIndex2 index);
+
+ virtual void endStateTable();
+
+ void doRearrangementAction(LEGlyphStorage &glyphStorage, IndicRearrangementVerb verb) const;
+
+ IndicRearrangementProcessor2(const MorphSubtableHeader2 *morphSubtableHeader);
+ virtual ~IndicRearrangementProcessor2();
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for the actual class.
+ *
+ * @stable ICU 2.8
+ */
+ virtual UClassID getDynamicClassID() const;
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for this class.
+ *
+ * @stable ICU 2.8
+ */
+ static UClassID getStaticClassID();
+
+protected:
+ le_int32 firstGlyph;
+ le_int32 lastGlyph;
+
+ const IndicRearrangementStateEntry2 *entryTable;
+ const IndicRearrangementSubtableHeader2 *indicRearrangementSubtableHeader;
+
+};
+
+U_NAMESPACE_END
+#endif
diff --git a/layout/LEFontInstance.h b/layout/LEFontInstance.h
index d84a652..16f68f9 100644
--- a/layout/LEFontInstance.h
+++ b/layout/LEFontInstance.h
@@ -165,6 +165,7 @@
*/
virtual const void *getFontTable(LETag tableTag) const = 0;
+#if 0 /* Google Patch: withdraw this function. https://b.corp.google.com/issue?id=8593098 */
/**
* This method reads a table from the font. Note that in general,
* it only makes sense to call this method on an <code>LEFontInstance</code>
@@ -183,6 +184,7 @@
* @internal
*/
virtual const void* getFontTable(LETag tableTag, size_t &length) const { length=-1; return getFontTable(tableTag); } /* -1 = unknown length */
+#endif /* End Google Patch */
/**
* This method is used to determine if the font can
diff --git a/layout/LETypes.h b/layout/LETypes.h
index 56c8d21..a5d9a75 100644
--- a/layout/LETypes.h
+++ b/layout/LETypes.h
@@ -1,6 +1,6 @@
/*
*
- * (C) Copyright IBM Corp. 1998-2012 - All Rights Reserved
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
*
*/
@@ -454,7 +454,7 @@
LE_CALT_FEATURE_TAG = 0x63616C74UL, /**< 'calt' */
LE_CASE_FEATURE_TAG = 0x63617365UL, /**< 'case' */
LE_CCMP_FEATURE_TAG = 0x63636D70UL, /**< 'ccmp' */
- LE_CJCT_FEATURE_TAG = 0x636A6374UL, /**< 'cjct' */
+ LE_CJCT_FEATURE_TAG = 0x636A6374UL, /**< 'cjct' */
LE_CLIG_FEATURE_TAG = 0x636C6967UL, /**< 'clig' */
LE_CPSP_FEATURE_TAG = 0x63707370UL, /**< 'cpsp' */
LE_CSWH_FEATURE_TAG = 0x63737768UL, /**< 'cswh' */
@@ -518,7 +518,7 @@
LE_RAND_FEATURE_TAG = 0x72616E64UL, /**< 'rand' */
LE_RLIG_FEATURE_TAG = 0x726C6967UL, /**< 'rlig' */
LE_RPHF_FEATURE_TAG = 0x72706866UL, /**< 'rphf' */
- LE_RKRF_FEATURE_TAG = 0x726B7266UL, /**< 'rkrf' */
+ LE_RKRF_FEATURE_TAG = 0x726B7266UL, /**< 'rkrf' */
LE_RTBD_FEATURE_TAG = 0x72746264UL, /**< 'rtbd' */
LE_RTLA_FEATURE_TAG = 0x72746C61UL, /**< 'rtla' */
LE_RUBY_FEATURE_TAG = 0x72756279UL, /**< 'ruby' */
@@ -570,6 +570,73 @@
};
/**
+ * @internal
+ */
+enum LEFeatureENUMs {
+ LE_Kerning_FEATURE_ENUM = 0, /**< Requests Kerning. Formerly LayoutEngine::kTypoFlagKern */
+ LE_Ligatures_FEATURE_ENUM = 1, /**< Requests Ligatures. Formerly LayoutEngine::kTypoFlagLiga */
+ LE_CLIG_FEATURE_ENUM, /**< Feature specific enum */
+ LE_DLIG_FEATURE_ENUM, /**< Feature specific enum */
+ LE_HLIG_FEATURE_ENUM, /**< Feature specific enum */
+ LE_LIGA_FEATURE_ENUM, /**< Feature specific enum */
+ LE_RLIG_FEATURE_ENUM, /**< Feature specific enum */
+ LE_SMCP_FEATURE_ENUM, /**< Feature specific enum */
+ LE_FRAC_FEATURE_ENUM, /**< Feature specific enum */
+ LE_AFRC_FEATURE_ENUM, /**< Feature specific enum */
+ LE_ZERO_FEATURE_ENUM, /**< Feature specific enum */
+ LE_SWSH_FEATURE_ENUM, /**< Feature specific enum */
+ LE_CSWH_FEATURE_ENUM, /**< Feature specific enum */
+ LE_SALT_FEATURE_ENUM, /**< Feature specific enum */
+ LE_NALT_FEATURE_ENUM, /**< Feature specific enum */
+ LE_RUBY_FEATURE_ENUM, /**< Feature specific enum */
+ LE_SS01_FEATURE_ENUM, /**< Feature specific enum */
+ LE_SS02_FEATURE_ENUM, /**< Feature specific enum */
+ LE_SS03_FEATURE_ENUM, /**< Feature specific enum */
+ LE_SS04_FEATURE_ENUM, /**< Feature specific enum */
+ LE_SS05_FEATURE_ENUM, /**< Feature specific enum */
+ LE_SS06_FEATURE_ENUM, /**< Feature specific enum */
+ LE_SS07_FEATURE_ENUM, /**< Feature specific enum */
+
+ LE_CHAR_FILTER_FEATURE_ENUM = 31, /**< Apply CharSubstitutionFilter */
+ LE_FEATURE_ENUM_MAX = LE_CHAR_FILTER_FEATURE_ENUM
+};
+
+
+/**
+ * Flags for typographic features.
+ * @internal
+ * @{
+ */
+#define LE_Kerning_FEATURE_FLAG (1 << LE_Kerning_FEATURE_ENUM)
+#define LE_Ligatures_FEATURE_FLAG (1 << LE_Ligatures_FEATURE_ENUM)
+#define LE_CLIG_FEATURE_FLAG (1 << LE_CLIG_FEATURE_ENUM)
+#define LE_DLIG_FEATURE_FLAG (1 << LE_DLIG_FEATURE_ENUM)
+#define LE_HLIG_FEATURE_FLAG (1 << LE_HLIG_FEATURE_ENUM)
+#define LE_LIGA_FEATURE_FLAG (1 << LE_LIGA_FEATURE_ENUM)
+#define LE_RLIG_FEATURE_FLAG (1 << LE_RLIG_FEATURE_ENUM)
+#define LE_SMCP_FEATURE_FLAG (1 << LE_SMCP_FEATURE_ENUM)
+#define LE_FRAC_FEATURE_FLAG (1 << LE_FRAC_FEATURE_ENUM)
+#define LE_AFRC_FEATURE_FLAG (1 << LE_AFRC_FEATURE_ENUM)
+#define LE_ZERO_FEATURE_FLAG (1 << LE_ZERO_FEATURE_ENUM)
+#define LE_SWSH_FEATURE_FLAG (1 << LE_SWSH_FEATURE_ENUM)
+#define LE_CSWH_FEATURE_FLAG (1 << LE_CSWH_FEATURE_ENUM)
+#define LE_SALT_FEATURE_FLAG (1 << LE_SALT_FEATURE_ENUM)
+#define LE_NALT_FEATURE_FLAG (1 << LE_NALT_FEATURE_ENUM)
+#define LE_RUBY_FEATURE_FLAG (1 << LE_RUBY_FEATURE_ENUM)
+#define LE_SS01_FEATURE_FLAG (1 << LE_SS01_FEATURE_ENUM)
+#define LE_SS02_FEATURE_FLAG (1 << LE_SS02_FEATURE_ENUM)
+#define LE_SS03_FEATURE_FLAG (1 << LE_SS03_FEATURE_ENUM)
+#define LE_SS04_FEATURE_FLAG (1 << LE_SS04_FEATURE_ENUM)
+#define LE_SS05_FEATURE_FLAG (1 << LE_SS05_FEATURE_ENUM)
+#define LE_SS06_FEATURE_FLAG (1 << LE_SS06_FEATURE_ENUM)
+#define LE_SS07_FEATURE_FLAG (1 << LE_SS07_FEATURE_ENUM)
+
+#define LE_CHAR_FILTER_FEATURE_FLAG (1 << LE_CHAR_FILTER_FEATURE_ENUM)
+/**
+ * @}
+ */
+
+/**
* Error codes returned by the LayoutEngine.
*
* @stable ICU 2.4
diff --git a/layout/LayoutEngine.cpp b/layout/LayoutEngine.cpp
index c815c83..ef67b4e 100644
--- a/layout/LayoutEngine.cpp
+++ b/layout/LayoutEngine.cpp
@@ -1,10 +1,11 @@
/*
- * (C) Copyright IBM Corp. 1998-2011 - All Rights Reserved
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
*/
#include "LETypes.h"
#include "LEScripts.h"
#include "LELanguages.h"
+#include "LESwaps.h"
#include "LayoutEngine.h"
#include "ArabicLayoutEngine.h"
@@ -16,6 +17,8 @@
#include "ThaiLayoutEngine.h"
#include "TibetanLayoutEngine.h"
#include "GXLayoutEngine.h"
+#include "GXLayoutEngine2.h"
+
#include "ScriptAndLanguageTags.h"
#include "CharSubstitutionFilter.h"
@@ -35,8 +38,9 @@
/* Leave this copyright notice here! It needs to go somewhere in this library. */
static const char copyright[] = U_COPYRIGHT_STRING;
-const le_int32 LayoutEngine::kTypoFlagKern = 0x1;
-const le_int32 LayoutEngine::kTypoFlagLiga = 0x2;
+/* TODO: remove these? */
+const le_int32 LayoutEngine::kTypoFlagKern = LE_Kerning_FEATURE_FLAG;
+const le_int32 LayoutEngine::kTypoFlagLiga = LE_Ligatures_FEATURE_FLAG;
const LEUnicode32 DefaultCharMapper::controlChars[] = {
0x0009, 0x000A, 0x000D,
@@ -134,9 +138,9 @@
static const le_int32 canonFeatureMapCount = LE_ARRAY_SIZE(canonFeatureMap);
-LayoutEngine::LayoutEngine(const LEFontInstance *fontInstance,
- le_int32 scriptCode,
- le_int32 languageCode,
+LayoutEngine::LayoutEngine(const LEFontInstance *fontInstance,
+ le_int32 scriptCode,
+ le_int32 languageCode,
le_int32 typoFlags,
LEErrorCode &success)
: fGlyphStorage(NULL), fFontInstance(fontInstance), fScriptCode(scriptCode), fLanguageCode(languageCode),
@@ -144,7 +148,7 @@
{
if (LE_FAILURE(success)) {
return;
- }
+ }
fGlyphStorage = new LEGlyphStorage();
if (fGlyphStorage == NULL) {
@@ -208,7 +212,7 @@
if (canonGSUBTable->coversScript(scriptTag)) {
CharSubstitutionFilter *substitutionFilter = new CharSubstitutionFilter(fFontInstance);
- if (substitutionFilter == NULL) {
+ if (substitutionFilter == NULL) {
success = LE_MEMORY_ALLOCATION_ERROR;
return 0;
}
@@ -398,7 +402,7 @@
for (p = 0; p < glyphCount; p += 1) {
float next, xAdvance;
-
+
glyphStorage.getGlyphPosition(p + 1, next, ignore, success);
xAdvance = next - prev;
@@ -440,7 +444,7 @@
for (p = 0; p < charCount; p += 1, c += direction) {
float next, xAdvance;
-
+
glyphStorage.getGlyphPosition(p + 1, next, ignore, success);
xAdvance = next - prev;
@@ -495,7 +499,7 @@
if (fGlyphStorage->getGlyphCount() > 0) {
fGlyphStorage->reset();
}
-
+
glyphCount = computeGlyphs(chars, offset, count, max, rightToLeft, *fGlyphStorage, success);
positionGlyphs(*fGlyphStorage, x, y, success);
adjustGlyphPositions(chars, offset, count, rightToLeft, *fGlyphStorage, success);
@@ -507,17 +511,18 @@
{
fGlyphStorage->reset();
}
-
+
LayoutEngine *LayoutEngine::layoutEngineFactory(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode, LEErrorCode &success)
{
// 3 -> kerning and ligatures
return LayoutEngine::layoutEngineFactory(fontInstance, scriptCode, languageCode, 3, success);
}
-
+
LayoutEngine *LayoutEngine::layoutEngineFactory(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode, le_int32 typoFlags, LEErrorCode &success)
{
static const le_uint32 gsubTableTag = LE_GSUB_TABLE_TAG;
static const le_uint32 mortTableTag = LE_MORT_TABLE_TAG;
+ static const le_uint32 morxTableTag = LE_MORX_TABLE_TAG;
if (LE_FAILURE(success)) {
return NULL;
@@ -597,46 +602,50 @@
break;
}
} else {
- const MorphTableHeader *morphTable = (MorphTableHeader *) fontInstance->getFontTable(mortTableTag);
-
- if (morphTable != NULL) {
- result = new GXLayoutEngine(fontInstance, scriptCode, languageCode, morphTable, success);
+ MorphTableHeader2 *morxTable = (MorphTableHeader2 *)fontInstance->getFontTable(morxTableTag);
+ if (morxTable != NULL) {
+ result = new GXLayoutEngine2(fontInstance, scriptCode, languageCode, morxTable, typoFlags, success);
} else {
- switch (scriptCode) {
- case bengScriptCode:
- case devaScriptCode:
- case gujrScriptCode:
- case kndaScriptCode:
- case mlymScriptCode:
- case oryaScriptCode:
- case guruScriptCode:
- case tamlScriptCode:
- case teluScriptCode:
- case sinhScriptCode:
- {
- result = new IndicOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, typoFlags, success);
- break;
- }
+ const MorphTableHeader *mortTable = (MorphTableHeader *) fontInstance->getFontTable(mortTableTag);
+ if (mortTable != NULL) { // mort
+ result = new GXLayoutEngine(fontInstance, scriptCode, languageCode, mortTable, success);
+ } else {
+ switch (scriptCode) {
+ case bengScriptCode:
+ case devaScriptCode:
+ case gujrScriptCode:
+ case kndaScriptCode:
+ case mlymScriptCode:
+ case oryaScriptCode:
+ case guruScriptCode:
+ case tamlScriptCode:
+ case teluScriptCode:
+ case sinhScriptCode:
+ {
+ result = new IndicOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, typoFlags, success);
+ break;
+ }
- case arabScriptCode:
- //case hebrScriptCode:
- result = new UnicodeArabicOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, typoFlags, success);
- break;
+ case arabScriptCode:
+ //case hebrScriptCode:
+ result = new UnicodeArabicOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, typoFlags, success);
+ break;
- //case hebrScriptCode:
- // return new HebrewOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, typoFlags);
+ //case hebrScriptCode:
+ // return new HebrewOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, typoFlags);
- case thaiScriptCode:
- result = new ThaiLayoutEngine(fontInstance, scriptCode, languageCode, typoFlags, success);
- break;
+ case thaiScriptCode:
+ result = new ThaiLayoutEngine(fontInstance, scriptCode, languageCode, typoFlags, success);
+ break;
- case hangScriptCode:
- result = new HangulOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, typoFlags, success);
- break;
+ case hangScriptCode:
+ result = new HangulOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, typoFlags, success);
+ break;
- default:
- result = new LayoutEngine(fontInstance, scriptCode, languageCode, typoFlags, success);
- break;
+ default:
+ result = new LayoutEngine(fontInstance, scriptCode, languageCode, typoFlags, success);
+ break;
+ }
}
}
}
diff --git a/layout/LayoutEngine.h b/layout/LayoutEngine.h
index b76f574..b9734cd 100644
--- a/layout/LayoutEngine.h
+++ b/layout/LayoutEngine.h
@@ -1,5 +1,5 @@
/*
- * (C) Copyright IBM Corp. 1998-2011 - All Rights Reserved
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
*/
#ifndef __LAYOUTENGINE_H
@@ -64,10 +64,10 @@
class U_LAYOUT_API LayoutEngine : public UObject {
public:
#ifndef U_HIDE_INTERNAL_API
- /** @internal Flag to request kerning. */
+ /** @internal Flag to request kerning. Use LE_Kerning_FEATURE_FLAG instead. */
static const le_int32 kTypoFlagKern;
- /** @internal Flag to request ligatures. */
- static const le_int32 kTypoFlagLiga;
+ /** @internal Flag to request ligatures. Use LE_Ligatures_FEATURE_FLAG instead. */
+ static const le_int32 kTypoFlagLiga;
#endif /* U_HIDE_INTERNAL_API */
protected:
diff --git a/layout/LigatureSubstProc2.cpp b/layout/LigatureSubstProc2.cpp
new file mode 100644
index 0000000..78ea3fd
--- /dev/null
+++ b/layout/LigatureSubstProc2.cpp
@@ -0,0 +1,116 @@
+/*
+ *
+ * (C) Copyright IBM Corp and Others. 1998-2013 - All Rights Reserved
+ *
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "StateTables.h"
+#include "MorphStateTables.h"
+#include "SubtableProcessor2.h"
+#include "StateTableProcessor2.h"
+#include "LigatureSubstProc2.h"
+#include "LEGlyphStorage.h"
+#include "LESwaps.h"
+
+U_NAMESPACE_BEGIN
+
+#define ExtendedComplement(m) ((le_int32) (~((le_uint32) (m))))
+#define SignBit(m) ((ExtendedComplement(m) >> 1) & (le_int32)(m))
+#define SignExtend(v,m) (((v) & SignBit(m))? ((v) | ExtendedComplement(m)): (v))
+
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(LigatureSubstitutionProcessor2)
+
+LigatureSubstitutionProcessor2::LigatureSubstitutionProcessor2(const MorphSubtableHeader2 *morphSubtableHeader)
+ : StateTableProcessor2(morphSubtableHeader)
+{
+ ligatureSubstitutionHeader = (const LigatureSubstitutionHeader2 *) morphSubtableHeader;
+ ligActionOffset = SWAPL(ligatureSubstitutionHeader->ligActionOffset);
+ componentOffset = SWAPL(ligatureSubstitutionHeader->componentOffset);
+ ligatureOffset = SWAPL(ligatureSubstitutionHeader->ligatureOffset);
+
+ entryTable = (const LigatureSubstitutionStateEntry2 *) ((char *) &stateTableHeader->stHeader + entryTableOffset);
+}
+
+LigatureSubstitutionProcessor2::~LigatureSubstitutionProcessor2()
+{
+}
+
+void LigatureSubstitutionProcessor2::beginStateTable()
+{
+ m = -1;
+}
+
+le_uint16 LigatureSubstitutionProcessor2::processStateEntry(LEGlyphStorage &glyphStorage, le_int32 &currGlyph, EntryTableIndex2 index)
+{
+ const LigatureSubstitutionStateEntry2 *entry = &entryTable[index];
+ le_uint16 nextStateIndex = SWAPW(entry->nextStateIndex);
+ le_uint16 flags = SWAPW(entry->entryFlags);
+ le_uint16 ligActionIndex = SWAPW(entry->ligActionIndex);
+
+ if (flags & lsfSetComponent) {
+ if (++m >= nComponents) {
+ m = 0;
+ }
+ componentStack[m] = currGlyph;
+ }
+
+ ByteOffset actionOffset = flags & lsfPerformAction;
+
+ if (actionOffset != 0) {
+ const LigatureActionEntry *ap = (const LigatureActionEntry *) ((char *) &ligatureSubstitutionHeader->stHeader + ligActionOffset) + ligActionIndex;
+ const TTGlyphID *ligatureTable = (const TTGlyphID *) ((char *) &ligatureSubstitutionHeader->stHeader + ligatureOffset);
+ LigatureActionEntry action;
+ le_int32 offset, i = 0;
+ le_int32 stack[nComponents];
+ le_int16 mm = -1;
+
+ const le_uint16 *componentTable = (const le_uint16 *)((char *) &ligatureSubstitutionHeader->stHeader + componentOffset);
+
+ do {
+ le_uint32 componentGlyph = componentStack[m--]; // pop off
+
+ action = SWAPL(*ap++);
+
+ if (m < 0) {
+ m = nComponents - 1;
+ }
+
+ offset = action & lafComponentOffsetMask;
+ if (offset != 0) {
+
+ i += SWAPW(componentTable[LE_GET_GLYPH(glyphStorage[componentGlyph]) + (SignExtend(offset, lafComponentOffsetMask))]);
+
+ if (action & (lafLast | lafStore)) {
+ TTGlyphID ligatureGlyph = SWAPW(ligatureTable[i]);
+ glyphStorage[componentGlyph] = LE_SET_GLYPH(glyphStorage[componentGlyph], ligatureGlyph);
+ stack[++mm] = componentGlyph;
+ i = 0;
+ } else {
+ glyphStorage[componentGlyph] = LE_SET_GLYPH(glyphStorage[componentGlyph], 0xFFFF);
+ }
+ }
+ } while (!(action & lafLast));
+
+ while (mm >= 0) {
+ if (++m >= nComponents) {
+ m = 0;
+ }
+
+ componentStack[m] = stack[mm--];
+ }
+ }
+
+ if (!(flags & lsfDontAdvance)) {
+ currGlyph += dir;
+ }
+
+ return nextStateIndex;
+}
+
+void LigatureSubstitutionProcessor2::endStateTable()
+{
+}
+
+U_NAMESPACE_END
diff --git a/layout/LigatureSubstProc2.h b/layout/LigatureSubstProc2.h
new file mode 100644
index 0000000..8ef5f6f
--- /dev/null
+++ b/layout/LigatureSubstProc2.h
@@ -0,0 +1,71 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#ifndef __LIGATURESUBSTITUTIONPROCESSOR2_H
+#define __LIGATURESUBSTITUTIONPROCESSOR2_H
+
+/**
+ * \file
+ * \internal
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "SubtableProcessor2.h"
+#include "StateTableProcessor2.h"
+#include "LigatureSubstitution.h"
+
+U_NAMESPACE_BEGIN
+
+class LEGlyphStorage;
+
+#define nComponents 16
+
+class LigatureSubstitutionProcessor2 : public StateTableProcessor2
+{
+public:
+ virtual void beginStateTable();
+
+ virtual le_uint16 processStateEntry(LEGlyphStorage &glyphStorage, le_int32 &currGlyph, EntryTableIndex2 index);
+
+ virtual void endStateTable();
+
+ LigatureSubstitutionProcessor2(const MorphSubtableHeader2 *morphSubtableHeader);
+ virtual ~LigatureSubstitutionProcessor2();
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for the actual class.
+ *
+ * @stable ICU 2.8
+ */
+ virtual UClassID getDynamicClassID() const;
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for this class.
+ *
+ * @stable ICU 2.8
+ */
+ static UClassID getStaticClassID();
+
+private:
+ LigatureSubstitutionProcessor2();
+
+protected:
+ le_uint32 ligActionOffset;
+ le_uint32 componentOffset;
+ le_uint32 ligatureOffset;
+
+ const LigatureSubstitutionStateEntry2 *entryTable;
+
+ le_int32 componentStack[nComponents];
+ le_int16 m;
+
+ const LigatureSubstitutionHeader2 *ligatureSubstitutionHeader;
+
+};
+
+U_NAMESPACE_END
+#endif
diff --git a/layout/LigatureSubstitution.h b/layout/LigatureSubstitution.h
index 2963b7c..fed2c21 100644
--- a/layout/LigatureSubstitution.h
+++ b/layout/LigatureSubstitution.h
@@ -1,6 +1,6 @@
/*
*
- * (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved
+ * (C) Copyright IBM Corp. and Others 1998-2013 - All Rights Reserved
*
*/
@@ -27,17 +27,32 @@
ByteOffset ligatureTableOffset;
};
+struct LigatureSubstitutionHeader2 : MorphStateTableHeader2
+{
+ le_uint32 ligActionOffset;
+ le_uint32 componentOffset;
+ le_uint32 ligatureOffset;
+};
+
enum LigatureSubstitutionFlags
{
lsfSetComponent = 0x8000,
lsfDontAdvance = 0x4000,
- lsfActionOffsetMask = 0x3FFF
+ lsfActionOffsetMask = 0x3FFF, // N/A in morx
+ lsfPerformAction = 0x2000
};
struct LigatureSubstitutionStateEntry : StateEntry
{
};
+struct LigatureSubstitutionStateEntry2
+{
+ le_uint16 nextStateIndex;
+ le_uint16 entryFlags;
+ le_uint16 ligActionIndex;
+};
+
typedef le_uint32 LigatureActionEntry;
enum LigatureActionFlags
diff --git a/layout/LookupProcessor.cpp b/layout/LookupProcessor.cpp
index 4f9d97c..03986ba 100644
--- a/layout/LookupProcessor.cpp
+++ b/layout/LookupProcessor.cpp
@@ -1,6 +1,6 @@
/*
*
- * (C) Copyright IBM Corp. 1998-2012 - All Rights Reserved
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
*
*/
@@ -99,6 +99,10 @@
}
const LookupTable *lookupTable = lookupListTable->getLookupTable(lookupTableIndex);
+ if (lookupTable == NULL) {
+ success = LE_INTERNAL_ERROR;
+ return 0;
+ }
le_uint16 lookupFlags = SWAPW(lookupTable->lookupFlags);
GlyphIterator tempIterator(*glyphIterator, lookupFlags);
le_uint32 delta = applyLookupTable(lookupTable, &tempIterator, fontInstance, success);
diff --git a/layout/Makefile.in b/layout/Makefile.in
index d63a244..77be2be 100644
--- a/layout/Makefile.in
+++ b/layout/Makefile.in
@@ -1,6 +1,6 @@
#******************************************************************************
#
-# Copyright (C) 1999-2011, International Business Machines
+# Copyright (C) 1999-2013, International Business Machines
# Corporation and others. All Rights Reserved.
#
#******************************************************************************
@@ -130,7 +130,21 @@
TibetanReordering.o \
HangulLayoutEngine.o \
KernTable.o \
-loengine.o
+loengine.o \
+ContextualGlyphInsertionProc2.o \
+ContextualGlyphSubstProc2.o \
+GXLayoutEngine2.o \
+IndicRearrangementProcessor2.o \
+LigatureSubstProc2.o \
+MorphTables2.o \
+NonContextualGlyphSubstProc2.o \
+SegmentArrayProcessor2.o \
+SegmentSingleProcessor2.o \
+SimpleArrayProcessor2.o \
+SingleTableProcessor2.o \
+StateTableProcessor2.o \
+SubtableProcessor2.o \
+TrimmedArrayProcessor2.o
## Header files to install
HEADERS= $(srcdir)/LayoutEngine.h $(srcdir)/LE*.h $(srcdir)/loengine.h
@@ -237,4 +251,3 @@
-include $(DEPS)
endif
endif
-
diff --git a/layout/MorphStateTables.h b/layout/MorphStateTables.h
index a2e0b00..f51e039 100644
--- a/layout/MorphStateTables.h
+++ b/layout/MorphStateTables.h
@@ -1,6 +1,6 @@
/*
*
- * (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
*
*/
@@ -24,5 +24,10 @@
StateTableHeader stHeader;
};
+struct MorphStateTableHeader2 : MorphSubtableHeader2
+{
+ StateTableHeader2 stHeader;
+};
+
U_NAMESPACE_END
#endif
diff --git a/layout/MorphTables.h b/layout/MorphTables.h
index 8d198cf..550bd98 100644
--- a/layout/MorphTables.h
+++ b/layout/MorphTables.h
@@ -1,6 +1,6 @@
/*
*
- * (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
*
*/
@@ -51,6 +51,7 @@
};
typedef le_int16 SubtableCoverage;
+typedef le_uint32 SubtableCoverage2;
enum SubtableCoverageFlags
{
@@ -80,6 +81,302 @@
void process(LEGlyphStorage &glyphStorage) const;
};
+enum SubtableCoverageFlags2
+{
+ scfVertical2 = 0x80000000,
+ scfReverse2 = 0x40000000,
+ scfIgnoreVt2 = 0x20000000,
+ scfReserved2 = 0x1FFFFF00,
+ scfTypeMask2 = 0x000000FF
+};
+
+struct MorphSubtableHeader2
+{
+ le_uint32 length;
+ SubtableCoverage2 coverage;
+ FeatureFlags subtableFeatures;
+
+ void process(LEGlyphStorage &glyphStorage) const;
+};
+
+struct ChainHeader2
+{
+ FeatureFlags defaultFlags;
+ le_uint32 chainLength;
+ le_uint32 nFeatureEntries;
+ le_uint32 nSubtables;
+ FeatureTableEntry featureTable[ANY_NUMBER];
+};
+
+struct MorphTableHeader2
+{
+ le_int32 version;
+ le_uint32 nChains;
+ ChainHeader2 chains[ANY_NUMBER];
+
+ void process(LEGlyphStorage &glyphStorage, le_int32 typoFlags) const;
+};
+
+/*
+ * AAT Font Features
+ * source: https://developer.apple.com/fonts/registry/
+ * (plus addition from ATS/SFNTLayoutTypes.h)
+ */
+
+enum {
+
+ allTypographicFeaturesType = 0,
+
+ allTypeFeaturesOnSelector = 0,
+ allTypeFeaturesOffSelector = 1,
+
+ ligaturesType = 1,
+
+ requiredLigaturesOnSelector = 0,
+ requiredLigaturesOffSelector = 1,
+ commonLigaturesOnSelector = 2,
+ commonLigaturesOffSelector = 3,
+ rareLigaturesOnSelector = 4,
+ rareLigaturesOffSelector = 5,
+ logosOnSelector = 6,
+ logosOffSelector = 7,
+ rebusPicturesOnSelector = 8,
+ rebusPicturesOffSelector = 9,
+ diphthongLigaturesOnSelector = 10,
+ diphthongLigaturesOffSelector = 11,
+ squaredLigaturesOnSelector = 12,
+ squaredLigaturesOffSelector = 13,
+ abbrevSquaredLigaturesOnSelector = 14,
+ abbrevSquaredLigaturesOffSelector = 15,
+ symbolLigaturesOnSelector = 16,
+ symbolLigaturesOffSelector = 17,
+ contextualLigaturesOnSelector = 18,
+ contextualLigaturesOffSelector = 19,
+ historicalLigaturesOnSelector = 20,
+ historicalLigaturesOffSelector = 21,
+
+ cursiveConnectionType = 2,
+
+ unconnectedSelector = 0,
+ partiallyConnectedSelector = 1,
+ cursiveSelector = 2,
+
+ letterCaseType = 3,
+
+ upperAndLowerCaseSelector = 0,
+ allCapsSelector = 1,
+ allLowerCaseSelector = 2,
+ smallCapsSelector = 3,
+ initialCapsSelector = 4,
+ initialCapsAndSmallCapsSelector = 5,
+
+ verticalSubstitutionType = 4,
+
+ substituteVerticalFormsOnSelector = 0,
+ substituteVerticalFormsOffSelector = 1,
+
+ linguisticRearrangementType = 5,
+
+ linguisticRearrangementOnSelector = 0,
+ linguisticRearrangementOffSelector = 1,
+
+ numberSpacingType = 6,
+
+ monospacedNumbersSelector = 0,
+ proportionalNumbersSelector = 1,
+
+ /*
+ appleReserved1Type = 7,
+ */
+
+ smartSwashType = 8,
+
+ wordInitialSwashesOnSelector = 0,
+ wordInitialSwashesOffSelector = 1,
+ wordFinalSwashesOnSelector = 2,
+ wordFinalSwashesOffSelector = 3,
+ lineInitialSwashesOnSelector = 4,
+ lineInitialSwashesOffSelector = 5,
+ lineFinalSwashesOnSelector = 6,
+ lineFinalSwashesOffSelector = 7,
+ nonFinalSwashesOnSelector = 8,
+ nonFinalSwashesOffSelector = 9,
+
+ diacriticsType = 9,
+
+ showDiacriticsSelector = 0,
+ hideDiacriticsSelector = 1,
+ decomposeDiacriticsSelector = 2,
+
+ verticalPositionType = 10,
+
+ normalPositionSelector = 0,
+ superiorsSelector = 1,
+ inferiorsSelector = 2,
+ ordinalsSelector = 3,
+
+ fractionsType = 11,
+
+ noFractionsSelector = 0,
+ verticalFractionsSelector = 1,
+ diagonalFractionsSelector = 2,
+
+ /*
+ appleReserved2Type = 12,
+ */
+
+ overlappingCharactersType = 13,
+
+ preventOverlapOnSelector = 0,
+ preventOverlapOffSelector = 1,
+
+ typographicExtrasType = 14,
+
+ hyphensToEmDashOnSelector = 0,
+ hyphensToEmDashOffSelector = 1,
+ hyphenToEnDashOnSelector = 2,
+ hyphenToEnDashOffSelector = 3,
+ unslashedZeroOnSelector = 4,
+ slashedZeroOffSelector = 4,
+ unslashedZeroOffSelector = 5,
+ slashedZeroOnSelector = 5,
+ formInterrobangOnSelector = 6,
+ formInterrobangOffSelector = 7,
+ smartQuotesOnSelector = 8,
+ smartQuotesOffSelector = 9,
+ periodsToEllipsisOnSelector = 10,
+ periodsToEllipsisOffSelector = 11,
+
+ mathematicalExtrasType = 15,
+
+ hyphenToMinusOnSelector = 0,
+ hyphenToMinusOffSelector = 1,
+ asteriskToMultiplyOnSelector = 2,
+ asteriskToMultiplyOffSelector = 3,
+ slashToDivideOnSelector = 4,
+ slashToDivideOffSelector = 5,
+ inequalityLigaturesOnSelector = 6,
+ inequalityLigaturesOffSelector = 7,
+ exponentsOnSelector = 8,
+ exponentsOffSelector = 9,
+
+ ornamentSetsType = 16,
+
+ noOrnamentsSelector = 0,
+ dingbatsSelector = 1,
+ piCharactersSelector = 2,
+ fleuronsSelector = 3,
+ decorativeBordersSelector = 4,
+ internationalSymbolsSelector = 5,
+ mathSymbolsSelector = 6,
+
+ characterAlternativesType = 17,
+
+ noAlternatesSelector = 0,
+
+ designComplexityType = 18,
+
+ designLevel1Selector = 0,
+ designLevel2Selector = 1,
+ designLevel3Selector = 2,
+ designLevel4Selector = 3,
+ designLevel5Selector = 4,
+ designLevel6Selector = 5,
+ designLevel7Selector = 6,
+
+ styleOptionsType = 19,
+
+ noStyleOptionsSelector = 0,
+ displayTextSelector = 1,
+ engravedTextSelector = 2,
+ illuminatedCapsSelector = 3,
+ titlingCapsSelector = 4,
+ tallCapsSelector = 5,
+
+ characterShapeType = 20,
+
+ traditionalCharactersSelector = 0,
+ simplifiedCharactersSelector = 1,
+ jis1978CharactersSelector = 2,
+ jis1983CharactersSelector = 3,
+ jis1990CharactersSelector = 4,
+ traditionalAltOneSelector = 5,
+ traditionalAltTwoSelector = 6,
+ traditionalAltThreeSelector = 7,
+ traditionalAltFourSelector = 8,
+ traditionalAltFiveSelector = 9,
+ expertCharactersSelector = 10,
+
+ numberCaseType = 21,
+
+ lowerCaseNumbersSelector = 0,
+ upperCaseNumbersSelector = 1,
+
+ textSpacingType = 22,
+
+ proportionalTextSelector = 0,
+ monospacedTextSelector = 1,
+ halfWidthTextSelector = 2,
+ normallySpacedTextSelector = 3,
+
+ transliterationType = 23,
+
+ noTransliterationSelector = 0,
+ hanjaToHangulSelector = 1,
+ hiraganaToKatakanaSelector = 2,
+ katakanaToHiraganaSelector = 3,
+ kanaToRomanizationSelector = 4,
+ romanizationToHiraganaSelector = 5,
+ romanizationToKatakanaSelector = 6,
+ hanjaToHangulAltOneSelector = 7,
+ hanjaToHangulAltTwoSelector = 8,
+ hanjaToHangulAltThreeSelector = 9,
+
+ annotationType = 24,
+
+ noAnnotationSelector = 0,
+ boxAnnotationSelector = 1,
+ roundedBoxAnnotationSelector = 2,
+ circleAnnotationSelector = 3,
+ invertedCircleAnnotationSelector = 4,
+ parenthesisAnnotationSelector = 5,
+ periodAnnotationSelector = 6,
+ romanNumeralAnnotationSelector = 7,
+ diamondAnnotationSelector = 8,
+
+ kanaSpacingType = 25,
+
+ fullWidthKanaSelector = 0,
+ proportionalKanaSelector = 1,
+
+ ideographicSpacingType = 26,
+
+ fullWidthIdeographsSelector = 0,
+ proportionalIdeographsSelector = 1,
+
+ cjkRomanSpacingType = 103,
+
+ halfWidthCJKRomanSelector = 0,
+ proportionalCJKRomanSelector = 1,
+ defaultCJKRomanSelector = 2,
+ fullWidthCJKRomanSelector = 3,
+
+ rubyKanaType = 28,
+
+ rubyKanaOnSelector = 2,
+ rubyKanaOffSelector = 3,
+
+/* The following types are provided for compatibility; note that
+ their use is deprecated. */
+
+ adobeCharacterSpacingType = 100, /* prefer 22 */
+ adobeKanaSpacingType = 101, /* prefer 25 */
+ adobeKanjiSpacingType = 102, /* prefer 26 */
+ adobeSquareLigatures = 104, /* prefer 1 */
+
+ lastFeatureType = -1
+};
+
U_NAMESPACE_END
#endif
diff --git a/layout/MorphTables2.cpp b/layout/MorphTables2.cpp
new file mode 100644
index 0000000..0764195
--- /dev/null
+++ b/layout/MorphTables2.cpp
@@ -0,0 +1,204 @@
+/*
+ * (C) Copyright IBM Corp. and others 1998 - 2013 - All Rights Reserved
+ *
+ */
+
+#include "LETypes.h"
+#include "LayoutTables.h"
+#include "MorphTables.h"
+#include "SubtableProcessor2.h"
+#include "IndicRearrangementProcessor2.h"
+#include "ContextualGlyphSubstProc2.h"
+#include "LigatureSubstProc2.h"
+#include "NonContextualGlyphSubstProc2.h"
+#include "ContextualGlyphInsertionProc2.h"
+#include "LEGlyphStorage.h"
+#include "LESwaps.h"
+
+U_NAMESPACE_BEGIN
+
+void MorphTableHeader2::process(LEGlyphStorage &glyphStorage, le_int32 typoFlags) const
+{
+ const ChainHeader2 *chainHeader = chains;
+ le_uint32 chainCount = SWAPL(this->nChains);
+ le_uint32 chain;
+
+ for (chain = 0; chain < chainCount; chain++) {
+ FeatureFlags flag = SWAPL(chainHeader->defaultFlags);
+ le_uint32 chainLength = SWAPL(chainHeader->chainLength);
+ le_uint32 nFeatureEntries = SWAPL(chainHeader->nFeatureEntries);
+ le_uint32 nSubtables = SWAPL(chainHeader->nSubtables);
+ const MorphSubtableHeader2 *subtableHeader =
+ (const MorphSubtableHeader2 *)&chainHeader->featureTable[nFeatureEntries];
+ le_uint32 subtable;
+
+ if (typoFlags != 0) {
+ le_uint32 featureEntry;
+
+ // Feature subtables
+ for (featureEntry = 0; featureEntry < nFeatureEntries; featureEntry++) {
+ FeatureTableEntry featureTableEntry = chains->featureTable[featureEntry];
+ le_int16 featureType = SWAPW(featureTableEntry.featureType);
+ le_int16 featureSetting = SWAPW(featureTableEntry.featureSetting);
+ le_uint32 enableFlags = SWAPL(featureTableEntry.enableFlags);
+ le_uint32 disableFlags = SWAPL(featureTableEntry.disableFlags);
+ switch (featureType) {
+ case ligaturesType:
+ if ((typoFlags & LE_Ligatures_FEATURE_ENUM ) && (featureSetting ^ 0x1)){
+ flag &= disableFlags;
+ flag |= enableFlags;
+ } else {
+ if (((typoFlags & LE_RLIG_FEATURE_FLAG) && featureSetting == requiredLigaturesOnSelector) ||
+ ((typoFlags & LE_CLIG_FEATURE_FLAG) && featureSetting == contextualLigaturesOnSelector) ||
+ ((typoFlags & LE_HLIG_FEATURE_FLAG) && featureSetting == historicalLigaturesOnSelector) ||
+ ((typoFlags & LE_LIGA_FEATURE_FLAG) && featureSetting == commonLigaturesOnSelector)) {
+ flag &= disableFlags;
+ flag |= enableFlags;
+ }
+ }
+ break;
+ case letterCaseType:
+ if ((typoFlags & LE_SMCP_FEATURE_FLAG) && featureSetting == smallCapsSelector) {
+ flag &= disableFlags;
+ flag |= enableFlags;
+ }
+ break;
+ case verticalSubstitutionType:
+ break;
+ case linguisticRearrangementType:
+ break;
+ case numberSpacingType:
+ break;
+ case smartSwashType:
+ if ((typoFlags & LE_SWSH_FEATURE_FLAG) && (featureSetting ^ 0x1)){
+ flag &= disableFlags;
+ flag |= enableFlags;
+ }
+ break;
+ case diacriticsType:
+ break;
+ case verticalPositionType:
+ break;
+ case fractionsType:
+ if (((typoFlags & LE_FRAC_FEATURE_FLAG) && featureSetting == diagonalFractionsSelector) ||
+ ((typoFlags & LE_AFRC_FEATURE_FLAG) && featureSetting == verticalFractionsSelector)) {
+ flag &= disableFlags;
+ flag |= enableFlags;
+ } else {
+ flag &= disableFlags;
+ }
+ break;
+ case typographicExtrasType:
+ if ((typoFlags & LE_ZERO_FEATURE_FLAG) && featureSetting == slashedZeroOnSelector) {
+ flag &= disableFlags;
+ flag |= enableFlags;
+ }
+ break;
+ case mathematicalExtrasType:
+ break;
+ case ornamentSetsType:
+ break;
+ case characterAlternativesType:
+ break;
+ case designComplexityType:
+ if (((typoFlags & LE_SS01_FEATURE_FLAG) && featureSetting == designLevel1Selector) ||
+ ((typoFlags & LE_SS02_FEATURE_FLAG) && featureSetting == designLevel2Selector) ||
+ ((typoFlags & LE_SS03_FEATURE_FLAG) && featureSetting == designLevel3Selector) ||
+ ((typoFlags & LE_SS04_FEATURE_FLAG) && featureSetting == designLevel4Selector) ||
+ ((typoFlags & LE_SS05_FEATURE_FLAG) && featureSetting == designLevel5Selector) ||
+ ((typoFlags & LE_SS06_FEATURE_FLAG) && featureSetting == designLevel6Selector) ||
+ ((typoFlags & LE_SS07_FEATURE_FLAG) && featureSetting == designLevel7Selector)) {
+
+ flag &= disableFlags;
+ flag |= enableFlags;
+ }
+ break;
+ case styleOptionsType:
+ break;
+ case characterShapeType:
+ break;
+ case numberCaseType:
+ break;
+ case textSpacingType:
+ break;
+ case transliterationType:
+ break;
+ case annotationType:
+ if ((typoFlags & LE_NALT_FEATURE_FLAG) && featureSetting == circleAnnotationSelector) {
+ flag &= disableFlags;
+ flag |= enableFlags;
+ }
+ break;
+ case kanaSpacingType:
+ break;
+ case ideographicSpacingType:
+ break;
+ case rubyKanaType:
+ if ((typoFlags & LE_RUBY_FEATURE_FLAG) && featureSetting == rubyKanaOnSelector) {
+ flag &= disableFlags;
+ flag |= enableFlags;
+ }
+ break;
+ case cjkRomanSpacingType:
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ for (subtable = 0; subtable < nSubtables; subtable++) {
+ le_uint32 length = SWAPL(subtableHeader->length);
+ le_uint32 coverage = SWAPL(subtableHeader->coverage);
+ FeatureFlags subtableFeatures = SWAPL(subtableHeader->subtableFeatures);
+ // should check coverage more carefully...
+ if (((coverage & scfIgnoreVt2) || !(coverage & scfVertical2)) && (subtableFeatures & flag) != 0) {
+ subtableHeader->process(glyphStorage);
+ }
+ subtableHeader = (const MorphSubtableHeader2 *) ((char *)subtableHeader + length);
+ }
+ chainHeader = (const ChainHeader2 *)((char *)chainHeader + chainLength);
+ }
+}
+
+void MorphSubtableHeader2::process(LEGlyphStorage &glyphStorage) const
+{
+ SubtableProcessor2 *processor = NULL;
+
+ switch (SWAPL(coverage) & scfTypeMask2)
+ {
+ case mstIndicRearrangement:
+ processor = new IndicRearrangementProcessor2(this);
+ break;
+
+ case mstContextualGlyphSubstitution:
+ processor = new ContextualGlyphSubstitutionProcessor2(this);
+ break;
+
+ case mstLigatureSubstitution:
+ processor = new LigatureSubstitutionProcessor2(this);
+ break;
+
+ case mstReservedUnused:
+ break;
+
+ case mstNonContextualGlyphSubstitution:
+ processor = NonContextualGlyphSubstitutionProcessor2::createInstance(this);
+ break;
+
+
+ case mstContextualGlyphInsertion:
+ processor = new ContextualGlyphInsertionProcessor2(this);
+ break;
+
+ default:
+ break;
+ }
+
+ if (processor != NULL) {
+ processor->process(glyphStorage);
+ delete processor;
+ }
+}
+
+U_NAMESPACE_END
diff --git a/layout/NonContextualGlyphSubst.h b/layout/NonContextualGlyphSubst.h
index ef2543a..2a82850 100644
--- a/layout/NonContextualGlyphSubst.h
+++ b/layout/NonContextualGlyphSubst.h
@@ -1,7 +1,5 @@
/*
- * %W% %E%
- *
- * (C) Copyright IBM Corp. 1998-2003 - All Rights Reserved
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
*
*/
@@ -25,6 +23,11 @@
LookupTable table;
};
+struct NonContextualGlyphSubstitutionHeader2 : MorphSubtableHeader2
+{
+ LookupTable table;
+};
+
U_NAMESPACE_END
#endif
diff --git a/layout/NonContextualGlyphSubstProc2.cpp b/layout/NonContextualGlyphSubstProc2.cpp
new file mode 100644
index 0000000..44aca0e
--- /dev/null
+++ b/layout/NonContextualGlyphSubstProc2.cpp
@@ -0,0 +1,60 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "SubtableProcessor2.h"
+#include "NonContextualGlyphSubst.h"
+#include "NonContextualGlyphSubstProc2.h"
+#include "SimpleArrayProcessor2.h"
+#include "SegmentSingleProcessor2.h"
+#include "SegmentArrayProcessor2.h"
+#include "SingleTableProcessor2.h"
+#include "TrimmedArrayProcessor2.h"
+#include "LESwaps.h"
+
+U_NAMESPACE_BEGIN
+
+NonContextualGlyphSubstitutionProcessor2::NonContextualGlyphSubstitutionProcessor2()
+{
+}
+
+NonContextualGlyphSubstitutionProcessor2::NonContextualGlyphSubstitutionProcessor2(const MorphSubtableHeader2 *morphSubtableHeader)
+ : SubtableProcessor2(morphSubtableHeader)
+{
+}
+
+NonContextualGlyphSubstitutionProcessor2::~NonContextualGlyphSubstitutionProcessor2()
+{
+}
+
+SubtableProcessor2 *NonContextualGlyphSubstitutionProcessor2::createInstance(const MorphSubtableHeader2 *morphSubtableHeader)
+{
+ const NonContextualGlyphSubstitutionHeader2 *header = (const NonContextualGlyphSubstitutionHeader2 *) morphSubtableHeader;
+
+ switch (SWAPW(header->table.format))
+ {
+ case ltfSimpleArray:
+ return new SimpleArrayProcessor2(morphSubtableHeader);
+
+ case ltfSegmentSingle:
+ return new SegmentSingleProcessor2(morphSubtableHeader);
+
+ case ltfSegmentArray:
+ return new SegmentArrayProcessor2(morphSubtableHeader);
+
+ case ltfSingleTable:
+ return new SingleTableProcessor2(morphSubtableHeader);
+
+ case ltfTrimmedArray:
+ return new TrimmedArrayProcessor2(morphSubtableHeader);
+
+ default:
+ return NULL;
+ }
+}
+
+U_NAMESPACE_END
diff --git a/layout/NonContextualGlyphSubstProc2.h b/layout/NonContextualGlyphSubstProc2.h
new file mode 100644
index 0000000..8c102b0
--- /dev/null
+++ b/layout/NonContextualGlyphSubstProc2.h
@@ -0,0 +1,43 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#ifndef __NONCONTEXTUALGLYPHSUBSTITUTIONPROCESSOR2_H
+#define __NONCONTEXTUALGLYPHSUBSTITUTIONPROCESSOR2_H
+
+/**
+ * \file
+ * \internal
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "SubtableProcessor2.h"
+#include "NonContextualGlyphSubst.h"
+
+U_NAMESPACE_BEGIN
+
+class LEGlyphStorage;
+
+class NonContextualGlyphSubstitutionProcessor2 : public SubtableProcessor2
+{
+public:
+ virtual void process(LEGlyphStorage &glyphStorage) = 0;
+
+ static SubtableProcessor2 *createInstance(const MorphSubtableHeader2 *morphSubtableHeader);
+
+protected:
+ NonContextualGlyphSubstitutionProcessor2();
+ NonContextualGlyphSubstitutionProcessor2(const MorphSubtableHeader2 *morphSubtableHeader);
+
+ virtual ~NonContextualGlyphSubstitutionProcessor2();
+
+private:
+ NonContextualGlyphSubstitutionProcessor2(const NonContextualGlyphSubstitutionProcessor2 &other); // forbid copying of this class
+ NonContextualGlyphSubstitutionProcessor2 &operator=(const NonContextualGlyphSubstitutionProcessor2 &other); // forbid copying of this class
+};
+
+U_NAMESPACE_END
+#endif
diff --git a/layout/OpenTypeLayoutEngine.cpp b/layout/OpenTypeLayoutEngine.cpp
index 9b0c94a..9b71131 100644
--- a/layout/OpenTypeLayoutEngine.cpp
+++ b/layout/OpenTypeLayoutEngine.cpp
@@ -1,7 +1,7 @@
/*
*
- * (C) Copyright IBM Corp. 1998-2012 - All Rights Reserved
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
*
*/
@@ -39,11 +39,27 @@
#define loclFeatureTag LE_LOCL_FEATURE_TAG
#define caltFeatureTag LE_CALT_FEATURE_TAG
-// 'dlig' not used at the moment
-#define dligFeatureTag 0x646C6967
+#define dligFeatureTag LE_DLIG_FEATURE_TAG
+#define rligFeatureTag LE_RLIG_FEATURE_TAG
+#define paltFeatureTag LE_PALT_FEATURE_TAG
-// 'palt'
-#define paltFeatureTag 0x70616C74
+#define hligFeatureTag LE_HLIG_FEATURE_TAG
+#define smcpFeatureTag LE_SMCP_FEATURE_TAG
+#define fracFeatureTag LE_FRAC_FEATURE_TAG
+#define afrcFeatureTag LE_AFRC_FEATURE_TAG
+#define zeroFeatureTag LE_ZERO_FEATURE_TAG
+#define swshFeatureTag LE_SWSH_FEATURE_TAG
+#define cswhFeatureTag LE_CSWH_FEATURE_TAG
+#define saltFeatureTag LE_SALT_FEATURE_TAG
+#define naltFeatureTag LE_NALT_FEATURE_TAG
+#define rubyFeatureTag LE_RUBY_FEATURE_TAG
+#define ss01FeatureTag LE_SS01_FEATURE_TAG
+#define ss02FeatureTag LE_SS02_FEATURE_TAG
+#define ss03FeatureTag LE_SS03_FEATURE_TAG
+#define ss04FeatureTag LE_SS04_FEATURE_TAG
+#define ss05FeatureTag LE_SS05_FEATURE_TAG
+#define ss06FeatureTag LE_SS06_FEATURE_TAG
+#define ss07FeatureTag LE_SS07_FEATURE_TAG
#define ccmpFeatureMask 0x80000000UL
#define ligaFeatureMask 0x40000000UL
@@ -55,10 +71,27 @@
#define loclFeatureMask 0x01000000UL
#define caltFeatureMask 0x00800000UL
+#define dligFeatureMask 0x00400000UL
+#define rligFeatureMask 0x00200000UL
+#define hligFeatureMask 0x00100000UL
+#define smcpFeatureMask 0x00080000UL
+#define fracFeatureMask 0x00040000UL
+#define afrcFeatureMask 0x00020000UL
+#define zeroFeatureMask 0x00010000UL
+#define swshFeatureMask 0x00008000UL
+#define cswhFeatureMask 0x00004000UL
+#define saltFeatureMask 0x00002000UL
+#define naltFeatureMask 0x00001000UL
+#define rubyFeatureMask 0x00000800UL
+#define ss01FeatureMask 0x00000400UL
+#define ss02FeatureMask 0x00000200UL
+#define ss03FeatureMask 0x00000100UL
+#define ss04FeatureMask 0x00000080UL
+#define ss05FeatureMask 0x00000040UL
+#define ss06FeatureMask 0x00000020UL
+#define ss07FeatureMask 0x00000010UL
+
#define minimalFeatures (ccmpFeatureMask | markFeatureMask | mkmkFeatureMask | loclFeatureMask | caltFeatureMask)
-#define ligaFeatures (ligaFeatureMask | cligFeatureMask | minimalFeatures)
-#define kernFeatures (kernFeatureMask | paltFeatureMask | minimalFeatures)
-#define kernAndLigaFeatures (ligaFeatures | kernFeatures)
static const FeatureMap featureMap[] =
{
@@ -70,7 +103,24 @@
{markFeatureTag, markFeatureMask},
{mkmkFeatureTag, mkmkFeatureMask},
{loclFeatureTag, loclFeatureMask},
- {caltFeatureTag, caltFeatureMask}
+ {caltFeatureTag, caltFeatureMask},
+ {hligFeatureTag, hligFeatureMask},
+ {smcpFeatureTag, smcpFeatureMask},
+ {fracFeatureTag, fracFeatureMask},
+ {afrcFeatureTag, afrcFeatureMask},
+ {zeroFeatureTag, zeroFeatureMask},
+ {swshFeatureTag, swshFeatureMask},
+ {cswhFeatureTag, cswhFeatureMask},
+ {saltFeatureTag, saltFeatureMask},
+ {naltFeatureTag, naltFeatureMask},
+ {rubyFeatureTag, rubyFeatureMask},
+ {ss01FeatureTag, ss01FeatureMask},
+ {ss02FeatureTag, ss02FeatureMask},
+ {ss03FeatureTag, ss03FeatureMask},
+ {ss04FeatureTag, ss04FeatureMask},
+ {ss05FeatureTag, ss05FeatureMask},
+ {ss06FeatureTag, ss06FeatureMask},
+ {ss07FeatureTag, ss07FeatureMask}
};
static const le_int32 featureMapCount = LE_ARRAY_SIZE(featureMap);
@@ -85,17 +135,65 @@
static const le_uint32 gposTableTag = LE_GPOS_TABLE_TAG;
const GlyphPositioningTableHeader *gposTable = (const GlyphPositioningTableHeader *) getFontTable(gposTableTag);
- // todo: switch to more flags and bitfield rather than list of feature tags?
- switch (typoFlags & ~0x80000000L) {
- case 0: break; // default
- case 1: fFeatureMask = kernFeatures; break;
- case 2: fFeatureMask = ligaFeatures; break;
- case 3: fFeatureMask = kernAndLigaFeatures; break;
- default: break;
+ switch (typoFlags & (LE_SS01_FEATURE_FLAG
+ | LE_SS02_FEATURE_FLAG
+ | LE_SS03_FEATURE_FLAG
+ | LE_SS04_FEATURE_FLAG
+ | LE_SS05_FEATURE_FLAG
+ | LE_SS06_FEATURE_FLAG
+ | LE_SS07_FEATURE_FLAG)) {
+ case LE_SS01_FEATURE_FLAG:
+ fFeatureMask |= ss01FeatureMask;
+ break;
+ case LE_SS02_FEATURE_FLAG:
+ fFeatureMask |= ss02FeatureMask;
+ break;
+ case LE_SS03_FEATURE_FLAG:
+ fFeatureMask |= ss03FeatureMask;
+ break;
+ case LE_SS04_FEATURE_FLAG:
+ fFeatureMask |= ss04FeatureMask;
+ break;
+ case LE_SS05_FEATURE_FLAG:
+ fFeatureMask |= ss05FeatureMask;
+ break;
+ case LE_SS06_FEATURE_FLAG:
+ fFeatureMask |= ss06FeatureMask;
+ break;
+ case LE_SS07_FEATURE_FLAG:
+ fFeatureMask |= ss07FeatureMask;
+ break;
}
- if (typoFlags & 0x80000000L) {
- fSubstitutionFilter = new CharSubstitutionFilter(fontInstance);
+ if (typoFlags & LE_Kerning_FEATURE_FLAG) {
+ fFeatureMask |= (kernFeatureMask | paltFeatureMask);
+ // Convenience.
+ }
+ if (typoFlags & LE_Ligatures_FEATURE_FLAG) {
+ fFeatureMask |= (ligaFeatureMask | cligFeatureMask);
+ // Convenience TODO: should add: .. dligFeatureMask | rligFeatureMask ?
+ }
+ if (typoFlags & LE_CLIG_FEATURE_FLAG) fFeatureMask |= cligFeatureMask;
+ if (typoFlags & LE_DLIG_FEATURE_FLAG) fFeatureMask |= dligFeatureMask;
+ if (typoFlags & LE_HLIG_FEATURE_FLAG) fFeatureMask |= hligFeatureMask;
+ if (typoFlags & LE_LIGA_FEATURE_FLAG) fFeatureMask |= ligaFeatureMask;
+ if (typoFlags & LE_RLIG_FEATURE_FLAG) fFeatureMask |= rligFeatureMask;
+ if (typoFlags & LE_SMCP_FEATURE_FLAG) fFeatureMask |= smcpFeatureMask;
+ if (typoFlags & LE_FRAC_FEATURE_FLAG) fFeatureMask |= fracFeatureMask;
+ if (typoFlags & LE_AFRC_FEATURE_FLAG) fFeatureMask |= afrcFeatureMask;
+ if (typoFlags & LE_ZERO_FEATURE_FLAG) fFeatureMask |= zeroFeatureMask;
+ if (typoFlags & LE_SWSH_FEATURE_FLAG) fFeatureMask |= swshFeatureMask;
+ if (typoFlags & LE_CSWH_FEATURE_FLAG) fFeatureMask |= cswhFeatureMask;
+ if (typoFlags & LE_SALT_FEATURE_FLAG) fFeatureMask |= saltFeatureMask;
+ if (typoFlags & LE_RUBY_FEATURE_FLAG) fFeatureMask |= rubyFeatureMask;
+ if (typoFlags & LE_NALT_FEATURE_FLAG) {
+ // Mutually exclusive with ALL other features. http://www.microsoft.com/typography/otspec/features_ko.htm
+ fFeatureMask = naltFeatureMask;
+ }
+
+ if (typoFlags & LE_CHAR_FILTER_FEATURE_FLAG) {
+ // This isn't a font feature, but requests a Char Substitution Filter
+ fSubstitutionFilter = new CharSubstitutionFilter(fontInstance);
}
setScriptAndLanguageTags();
@@ -427,7 +525,11 @@
delete adjustments;
} else {
// if there was no GPOS table, maybe there's non-OpenType kerning we can use
- LayoutEngine::adjustGlyphPositions(chars, offset, count, reverse, glyphStorage, success);
+ // Google Patch: disable this. Causes problems with Tamil.
+ // Umesh says layout is poor both with and without the change, but
+ // worse with the change. See ocean/imageprocessing/layout_test_unittest.cc
+ // Public ICU ticket for this problem is #7742
+ // LayoutEngine::adjustGlyphPositions(chars, offset, count, reverse, glyphStorage, success);
}
LEGlyphID zwnj = fFontInstance->mapCharToGlyph(0x200C);
diff --git a/layout/SegmentArrayProcessor2.cpp b/layout/SegmentArrayProcessor2.cpp
new file mode 100644
index 0000000..04bfe9b
--- /dev/null
+++ b/layout/SegmentArrayProcessor2.cpp
@@ -0,0 +1,60 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "SubtableProcessor2.h"
+#include "NonContextualGlyphSubst.h"
+#include "NonContextualGlyphSubstProc2.h"
+#include "SegmentArrayProcessor2.h"
+#include "LEGlyphStorage.h"
+#include "LESwaps.h"
+
+U_NAMESPACE_BEGIN
+
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(SegmentArrayProcessor2)
+
+SegmentArrayProcessor2::SegmentArrayProcessor2()
+{
+}
+
+SegmentArrayProcessor2::SegmentArrayProcessor2(const MorphSubtableHeader2 *morphSubtableHeader)
+ : NonContextualGlyphSubstitutionProcessor2(morphSubtableHeader)
+{
+ const NonContextualGlyphSubstitutionHeader2 *header = (const NonContextualGlyphSubstitutionHeader2 *) morphSubtableHeader;
+
+ segmentArrayLookupTable = (const SegmentArrayLookupTable *) &header->table;
+}
+
+SegmentArrayProcessor2::~SegmentArrayProcessor2()
+{
+}
+
+void SegmentArrayProcessor2::process(LEGlyphStorage &glyphStorage)
+{
+ const LookupSegment *segments = segmentArrayLookupTable->segments;
+ le_int32 glyphCount = glyphStorage.getGlyphCount();
+ le_int32 glyph;
+
+ for (glyph = 0; glyph < glyphCount; glyph += 1) {
+ LEGlyphID thisGlyph = glyphStorage[glyph];
+ const LookupSegment *lookupSegment = segmentArrayLookupTable->lookupSegment(segments, thisGlyph);
+
+ if (lookupSegment != NULL) {
+ TTGlyphID firstGlyph = SWAPW(lookupSegment->firstGlyph);
+ le_int16 offset = SWAPW(lookupSegment->value);
+
+ if (offset != 0) {
+ TTGlyphID *glyphArray = (TTGlyphID *) ((char *) subtableHeader + offset);
+ TTGlyphID newGlyph = SWAPW(glyphArray[LE_GET_GLYPH(thisGlyph) - firstGlyph]);
+
+ glyphStorage[glyph] = LE_SET_GLYPH(thisGlyph, newGlyph);
+ }
+ }
+ }
+}
+
+U_NAMESPACE_END
diff --git a/layout/SegmentArrayProcessor2.h b/layout/SegmentArrayProcessor2.h
new file mode 100644
index 0000000..6f34fa4
--- /dev/null
+++ b/layout/SegmentArrayProcessor2.h
@@ -0,0 +1,58 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#ifndef __SEGMENTARRAYPROCESSOR_H
+#define __SEGMENTARRAYPROCESSOR_H
+
+/**
+ * \file
+ * \internal
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "SubtableProcessor2.h"
+#include "NonContextualGlyphSubst.h"
+#include "NonContextualGlyphSubstProc2.h"
+
+U_NAMESPACE_BEGIN
+
+class LEGlyphStorage;
+
+class SegmentArrayProcessor2 : public NonContextualGlyphSubstitutionProcessor2
+{
+public:
+ virtual void process(LEGlyphStorage &glyphStorage);
+
+ SegmentArrayProcessor2(const MorphSubtableHeader2 *morphSubtableHeader);
+
+ virtual ~SegmentArrayProcessor2();
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for the actual class.
+ *
+ * @stable ICU 2.8
+ */
+ virtual UClassID getDynamicClassID() const;
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for this class.
+ *
+ * @stable ICU 2.8
+ */
+ static UClassID getStaticClassID();
+
+private:
+ SegmentArrayProcessor2();
+
+protected:
+ const SegmentArrayLookupTable *segmentArrayLookupTable;
+
+};
+
+U_NAMESPACE_END
+#endif
+
diff --git a/layout/SegmentSingleProcessor2.cpp b/layout/SegmentSingleProcessor2.cpp
new file mode 100644
index 0000000..1484c6b
--- /dev/null
+++ b/layout/SegmentSingleProcessor2.cpp
@@ -0,0 +1,54 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "SubtableProcessor2.h"
+#include "NonContextualGlyphSubst.h"
+#include "NonContextualGlyphSubstProc2.h"
+#include "SegmentSingleProcessor2.h"
+#include "LEGlyphStorage.h"
+#include "LESwaps.h"
+
+U_NAMESPACE_BEGIN
+
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(SegmentSingleProcessor2)
+
+SegmentSingleProcessor2::SegmentSingleProcessor2()
+{
+}
+
+SegmentSingleProcessor2::SegmentSingleProcessor2(const MorphSubtableHeader2 *morphSubtableHeader)
+ : NonContextualGlyphSubstitutionProcessor2(morphSubtableHeader)
+{
+ const NonContextualGlyphSubstitutionHeader2 *header = (const NonContextualGlyphSubstitutionHeader2 *) morphSubtableHeader;
+
+ segmentSingleLookupTable = (const SegmentSingleLookupTable *) &header->table;
+}
+
+SegmentSingleProcessor2::~SegmentSingleProcessor2()
+{
+}
+
+void SegmentSingleProcessor2::process(LEGlyphStorage &glyphStorage)
+{
+ const LookupSegment *segments = segmentSingleLookupTable->segments;
+ le_int32 glyphCount = glyphStorage.getGlyphCount();
+ le_int32 glyph;
+
+ for (glyph = 0; glyph < glyphCount; glyph += 1) {
+ LEGlyphID thisGlyph = glyphStorage[glyph];
+ const LookupSegment *lookupSegment = segmentSingleLookupTable->lookupSegment(segments, thisGlyph);
+
+ if (lookupSegment != NULL) {
+ TTGlyphID newGlyph = (TTGlyphID) LE_GET_GLYPH(thisGlyph) + SWAPW(lookupSegment->value);
+
+ glyphStorage[glyph] = LE_SET_GLYPH(thisGlyph, newGlyph);
+ }
+ }
+}
+
+U_NAMESPACE_END
diff --git a/layout/SegmentSingleProcessor2.h b/layout/SegmentSingleProcessor2.h
new file mode 100644
index 0000000..cbced18
--- /dev/null
+++ b/layout/SegmentSingleProcessor2.h
@@ -0,0 +1,58 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#ifndef __SEGMENTSINGLEPROCESSOR_H
+#define __SEGMENTSINGLEPROCESSOR_H
+
+/**
+ * \file
+ * \internal
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "SubtableProcessor2.h"
+#include "NonContextualGlyphSubst.h"
+#include "NonContextualGlyphSubstProc2.h"
+
+U_NAMESPACE_BEGIN
+
+class LEGlyphStorage;
+
+class SegmentSingleProcessor2 : public NonContextualGlyphSubstitutionProcessor2
+{
+public:
+ virtual void process(LEGlyphStorage &glyphStorage);
+
+ SegmentSingleProcessor2(const MorphSubtableHeader2 *morphSubtableHeader);
+
+ virtual ~SegmentSingleProcessor2();
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for the actual class.
+ *
+ * @stable ICU 2.8
+ */
+ virtual UClassID getDynamicClassID() const;
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for this class.
+ *
+ * @stable ICU 2.8
+ */
+ static UClassID getStaticClassID();
+
+private:
+ SegmentSingleProcessor2();
+
+protected:
+ const SegmentSingleLookupTable *segmentSingleLookupTable;
+
+};
+
+U_NAMESPACE_END
+#endif
+
diff --git a/layout/SimpleArrayProcessor2.cpp b/layout/SimpleArrayProcessor2.cpp
new file mode 100644
index 0000000..c136ed6
--- /dev/null
+++ b/layout/SimpleArrayProcessor2.cpp
@@ -0,0 +1,51 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "SubtableProcessor2.h"
+#include "NonContextualGlyphSubst.h"
+#include "NonContextualGlyphSubstProc2.h"
+#include "SimpleArrayProcessor2.h"
+#include "LEGlyphStorage.h"
+#include "LESwaps.h"
+
+U_NAMESPACE_BEGIN
+
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(SimpleArrayProcessor2)
+
+SimpleArrayProcessor2::SimpleArrayProcessor2()
+{
+}
+
+SimpleArrayProcessor2::SimpleArrayProcessor2(const MorphSubtableHeader2 *morphSubtableHeader)
+ : NonContextualGlyphSubstitutionProcessor2(morphSubtableHeader)
+{
+ const NonContextualGlyphSubstitutionHeader2 *header = (const NonContextualGlyphSubstitutionHeader2 *) morphSubtableHeader;
+
+ simpleArrayLookupTable = (const SimpleArrayLookupTable *) &header->table;
+}
+
+SimpleArrayProcessor2::~SimpleArrayProcessor2()
+{
+}
+
+void SimpleArrayProcessor2::process(LEGlyphStorage &glyphStorage)
+{
+ le_int32 glyphCount = glyphStorage.getGlyphCount();
+ le_int32 glyph;
+
+ for (glyph = 0; glyph < glyphCount; glyph += 1) {
+ LEGlyphID thisGlyph = glyphStorage[glyph];
+ if (LE_GET_GLYPH(thisGlyph) < 0xFFFF) {
+ TTGlyphID newGlyph = SWAPW(simpleArrayLookupTable->valueArray[LE_GET_GLYPH(thisGlyph)]);
+
+ glyphStorage[glyph] = LE_SET_GLYPH(thisGlyph, newGlyph);
+ }
+ }
+}
+
+U_NAMESPACE_END
diff --git a/layout/SimpleArrayProcessor2.h b/layout/SimpleArrayProcessor2.h
new file mode 100644
index 0000000..0578097
--- /dev/null
+++ b/layout/SimpleArrayProcessor2.h
@@ -0,0 +1,58 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#ifndef __SIMPLEARRAYPROCESSOR2_H
+#define __SIMPLEARRAYPROCESSOR2_H
+
+/**
+ * \file
+ * \internal
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "SubtableProcessor2.h"
+#include "NonContextualGlyphSubst.h"
+#include "NonContextualGlyphSubstProc2.h"
+
+U_NAMESPACE_BEGIN
+
+class LEGlyphStorage;
+
+class SimpleArrayProcessor2 : public NonContextualGlyphSubstitutionProcessor2
+{
+public:
+ virtual void process(LEGlyphStorage &glyphStorage);
+
+ SimpleArrayProcessor2(const MorphSubtableHeader2 *morphSubtableHeader);
+
+ virtual ~SimpleArrayProcessor2();
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for the actual class.
+ *
+ * @stable ICU 2.8
+ */
+ virtual UClassID getDynamicClassID() const;
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for this class.
+ *
+ * @stable ICU 2.8
+ */
+ static UClassID getStaticClassID();
+
+private:
+ SimpleArrayProcessor2();
+
+protected:
+ const SimpleArrayLookupTable *simpleArrayLookupTable;
+
+};
+
+U_NAMESPACE_END
+#endif
+
diff --git a/layout/SingleTableProcessor2.cpp b/layout/SingleTableProcessor2.cpp
new file mode 100644
index 0000000..81e4b6c
--- /dev/null
+++ b/layout/SingleTableProcessor2.cpp
@@ -0,0 +1,51 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "SubtableProcessor2.h"
+#include "NonContextualGlyphSubst.h"
+#include "NonContextualGlyphSubstProc2.h"
+#include "SingleTableProcessor2.h"
+#include "LEGlyphStorage.h"
+#include "LESwaps.h"
+
+U_NAMESPACE_BEGIN
+
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(SingleTableProcessor2)
+
+SingleTableProcessor2::SingleTableProcessor2()
+{
+}
+
+SingleTableProcessor2::SingleTableProcessor2(const MorphSubtableHeader2 *moprhSubtableHeader)
+ : NonContextualGlyphSubstitutionProcessor2(moprhSubtableHeader)
+{
+ const NonContextualGlyphSubstitutionHeader2 *header = (const NonContextualGlyphSubstitutionHeader2 *) moprhSubtableHeader;
+
+ singleTableLookupTable = (const SingleTableLookupTable *) &header->table;
+}
+
+SingleTableProcessor2::~SingleTableProcessor2()
+{
+}
+
+void SingleTableProcessor2::process(LEGlyphStorage &glyphStorage)
+{
+ const LookupSingle *entries = singleTableLookupTable->entries;
+ le_int32 glyph;
+ le_int32 glyphCount = glyphStorage.getGlyphCount();
+
+ for (glyph = 0; glyph < glyphCount; glyph += 1) {
+ const LookupSingle *lookupSingle = singleTableLookupTable->lookupSingle(entries, glyphStorage[glyph]);
+
+ if (lookupSingle != NULL) {
+ glyphStorage[glyph] = SWAPW(lookupSingle->value);
+ }
+ }
+}
+
+U_NAMESPACE_END
diff --git a/layout/SingleTableProcessor2.h b/layout/SingleTableProcessor2.h
new file mode 100644
index 0000000..11b1db9
--- /dev/null
+++ b/layout/SingleTableProcessor2.h
@@ -0,0 +1,57 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#ifndef __SINGLETABLEPROCESSOR2_H
+#define __SINGLETABLEPROCESSOR2_H
+
+/**
+ * \file
+ * \internal
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "SubtableProcessor2.h"
+#include "NonContextualGlyphSubst.h"
+#include "NonContextualGlyphSubstProc2.h"
+
+U_NAMESPACE_BEGIN
+
+class LEGlyphStorage;
+
+class SingleTableProcessor2 : public NonContextualGlyphSubstitutionProcessor2
+{
+public:
+ virtual void process(LEGlyphStorage &glyphStorage);
+
+ SingleTableProcessor2(const MorphSubtableHeader2 *morphSubtableHeader);
+
+ virtual ~SingleTableProcessor2();
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for the actual class.
+ *
+ * @stable ICU 2.8
+ */
+ virtual UClassID getDynamicClassID() const;
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for this class.
+ *
+ * @stable ICU 2.8
+ */
+ static UClassID getStaticClassID();
+
+private:
+ SingleTableProcessor2();
+
+protected:
+ const SingleTableLookupTable *singleTableLookupTable;
+
+};
+
+U_NAMESPACE_END
+#endif
diff --git a/layout/StateTableProcessor2.cpp b/layout/StateTableProcessor2.cpp
new file mode 100644
index 0000000..5741ab7
--- /dev/null
+++ b/layout/StateTableProcessor2.cpp
@@ -0,0 +1,168 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "StateTables.h"
+#include "MorphStateTables.h"
+#include "SubtableProcessor2.h"
+#include "StateTableProcessor2.h"
+#include "LEGlyphStorage.h"
+#include "LESwaps.h"
+#include "LookupTables.h"
+#include <stdio.h>
+
+U_NAMESPACE_BEGIN
+
+StateTableProcessor2::StateTableProcessor2()
+{
+}
+
+StateTableProcessor2::StateTableProcessor2(const MorphSubtableHeader2 *morphSubtableHeader)
+ : SubtableProcessor2(morphSubtableHeader)
+{
+ stateTableHeader = (const MorphStateTableHeader2 *) morphSubtableHeader;
+ nClasses = SWAPL(stateTableHeader->stHeader.nClasses);
+ classTableOffset = SWAPL(stateTableHeader->stHeader.classTableOffset);
+ stateArrayOffset = SWAPL(stateTableHeader->stHeader.stateArrayOffset);
+ entryTableOffset = SWAPL(stateTableHeader->stHeader.entryTableOffset);
+
+ classTable = (LookupTable *) ((char *) &stateTableHeader->stHeader + classTableOffset);
+ format = SWAPW(classTable->format);
+
+ stateArray = (const EntryTableIndex2 *) ((char *) &stateTableHeader->stHeader + stateArrayOffset);
+}
+
+StateTableProcessor2::~StateTableProcessor2()
+{
+}
+
+void StateTableProcessor2::process(LEGlyphStorage &glyphStorage)
+{
+ // Start at state 0
+ // XXX: How do we know when to start at state 1?
+ le_uint16 currentState = 0;
+ le_int32 glyphCount = glyphStorage.getGlyphCount();
+
+ le_int32 currGlyph = 0;
+ if ((coverage & scfReverse2) != 0) { // process glyphs in descending order
+ currGlyph = glyphCount - 1;
+ dir = -1;
+ } else {
+ dir = 1;
+ }
+
+ beginStateTable();
+ switch (format) {
+ case ltfSimpleArray: {
+#ifdef TEST_FORMAT
+ SimpleArrayLookupTable *lookupTable0 = (SimpleArrayLookupTable *) classTable;
+ while ((dir == 1 && currGlyph <= glyphCount) || (dir == -1 && currGlyph >= -1)) {
+ LookupValue classCode = classCodeOOB;
+ if (currGlyph == glyphCount || currGlyph == -1) {
+ // XXX: How do we handle EOT vs. EOL?
+ classCode = classCodeEOT;
+ } else {
+ LEGlyphID gid = glyphStorage[currGlyph];
+ TTGlyphID glyphCode = (TTGlyphID) LE_GET_GLYPH(gid);
+
+ if (glyphCode == 0xFFFF) {
+ classCode = classCodeDEL;
+ } else {
+ classCode = SWAPW(lookupTable0->valueArray[gid]);
+ }
+ }
+ EntryTableIndex2 entryTableIndex = SWAPW(stateArray[classCode + currentState * nClasses]);
+ currentState = processStateEntry(glyphStorage, currGlyph, entryTableIndex); // return a zero-based index instead of a byte offset
+ }
+#endif
+ break;
+ }
+ case ltfSegmentSingle: {
+ SegmentSingleLookupTable *lookupTable2 = (SegmentSingleLookupTable *) classTable;
+ while ((dir == 1 && currGlyph <= glyphCount) || (dir == -1 && currGlyph >= -1)) {
+ LookupValue classCode = classCodeOOB;
+ if (currGlyph == glyphCount || currGlyph == -1) {
+ // XXX: How do we handle EOT vs. EOL?
+ classCode = classCodeEOT;
+ } else {
+ LEGlyphID gid = glyphStorage[currGlyph];
+ TTGlyphID glyphCode = (TTGlyphID) LE_GET_GLYPH(gid);
+
+ if (glyphCode == 0xFFFF) {
+ classCode = classCodeDEL;
+ } else {
+ const LookupSegment *segment = lookupTable2->lookupSegment(lookupTable2->segments, gid);
+ if (segment != NULL) {
+ classCode = SWAPW(segment->value);
+ }
+ }
+ }
+ EntryTableIndex2 entryTableIndex = SWAPW(stateArray[classCode + currentState * nClasses]);
+ currentState = processStateEntry(glyphStorage, currGlyph, entryTableIndex);
+ }
+ break;
+ }
+ case ltfSegmentArray: {
+ printf("Lookup Table Format4: specific interpretation needed!\n");
+ break;
+ }
+ case ltfSingleTable: {
+ SingleTableLookupTable *lookupTable6 = (SingleTableLookupTable *) classTable;
+ while ((dir == 1 && currGlyph <= glyphCount) || (dir == -1 && currGlyph >= -1)) {
+ LookupValue classCode = classCodeOOB;
+ if (currGlyph == glyphCount || currGlyph == -1) {
+ // XXX: How do we handle EOT vs. EOL?
+ classCode = classCodeEOT;
+ } else {
+ LEGlyphID gid = glyphStorage[currGlyph];
+ TTGlyphID glyphCode = (TTGlyphID) LE_GET_GLYPH(gid);
+
+ if (glyphCode == 0xFFFF) {
+ classCode = classCodeDEL;
+ } else {
+ const LookupSingle *segment = lookupTable6->lookupSingle(lookupTable6->entries, gid);
+ if (segment != NULL) {
+ classCode = SWAPW(segment->value);
+ }
+ }
+ }
+ EntryTableIndex2 entryTableIndex = SWAPW(stateArray[classCode + currentState * nClasses]);
+ currentState = processStateEntry(glyphStorage, currGlyph, entryTableIndex);
+ }
+ break;
+ }
+ case ltfTrimmedArray: {
+ TrimmedArrayLookupTable *lookupTable8 = (TrimmedArrayLookupTable *) classTable;
+ TTGlyphID firstGlyph = SWAPW(lookupTable8->firstGlyph);
+ TTGlyphID lastGlyph = firstGlyph + SWAPW(lookupTable8->glyphCount);
+
+ while ((dir == 1 && currGlyph <= glyphCount) || (dir == -1 && currGlyph >= -1)) {
+ LookupValue classCode = classCodeOOB;
+ if (currGlyph == glyphCount || currGlyph == -1) {
+ // XXX: How do we handle EOT vs. EOL?
+ classCode = classCodeEOT;
+ } else {
+ TTGlyphID glyphCode = (TTGlyphID) LE_GET_GLYPH(glyphStorage[currGlyph]);
+ if (glyphCode == 0xFFFF) {
+ classCode = classCodeDEL;
+ } else if ((glyphCode >= firstGlyph) && (glyphCode < lastGlyph)) {
+ classCode = SWAPW(lookupTable8->valueArray[glyphCode - firstGlyph]);
+ }
+ }
+ EntryTableIndex2 entryTableIndex = SWAPW(stateArray[classCode + currentState * nClasses]);
+ currentState = processStateEntry(glyphStorage, currGlyph, entryTableIndex);
+ }
+ break;
+ }
+ default:
+ break;
+ }
+
+ endStateTable();
+}
+
+U_NAMESPACE_END
diff --git a/layout/StateTableProcessor2.h b/layout/StateTableProcessor2.h
new file mode 100644
index 0000000..69c5d7a
--- /dev/null
+++ b/layout/StateTableProcessor2.h
@@ -0,0 +1,59 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#ifndef __STATETABLEPROCESSOR2_H
+#define __STATETABLEPROCESSOR2_H
+
+/**
+ * \file
+ * \internal
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "MorphStateTables.h"
+#include "SubtableProcessor2.h"
+#include "LookupTables.h"
+
+U_NAMESPACE_BEGIN
+
+class LEGlyphStorage;
+
+class StateTableProcessor2 : public SubtableProcessor2
+{
+public:
+ void process(LEGlyphStorage &glyphStorage);
+
+ virtual void beginStateTable() = 0;
+
+ virtual le_uint16 processStateEntry(LEGlyphStorage &glyphStorage, le_int32 &currGlyph, EntryTableIndex2 index) = 0;
+
+ virtual void endStateTable() = 0;
+
+protected:
+ StateTableProcessor2(const MorphSubtableHeader2 *morphSubtableHeader);
+ virtual ~StateTableProcessor2();
+
+ StateTableProcessor2();
+
+ le_int32 dir;
+ le_uint16 format;
+ le_uint32 nClasses;
+ le_uint32 classTableOffset;
+ le_uint32 stateArrayOffset;
+ le_uint32 entryTableOffset;
+
+ const LookupTable *classTable;
+ const EntryTableIndex2 *stateArray;
+ const MorphStateTableHeader2 *stateTableHeader;
+
+private:
+ StateTableProcessor2(const StateTableProcessor2 &other); // forbid copying of this class
+ StateTableProcessor2 &operator=(const StateTableProcessor2 &other); // forbid copying of this class
+};
+
+U_NAMESPACE_END
+#endif
diff --git a/layout/StateTables.h b/layout/StateTables.h
index 8b5f867..325ce92 100644
--- a/layout/StateTables.h
+++ b/layout/StateTables.h
@@ -1,6 +1,6 @@
/*
*
- * (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
*
*/
@@ -25,6 +25,14 @@
ByteOffset entryTableOffset;
};
+struct StateTableHeader2
+{
+ le_uint32 nClasses;
+ le_uint32 classTableOffset;
+ le_uint32 stateArrayOffset;
+ le_uint32 entryTableOffset;
+};
+
enum ClassCodes
{
classCodeEOT = 0,
@@ -60,6 +68,14 @@
le_int16 flags;
};
+typedef le_uint16 EntryTableIndex2;
+
+struct StateEntry2 // same struct different interpretation
+{
+ le_uint16 newStateIndex;
+ le_uint16 flags;
+};
+
U_NAMESPACE_END
#endif
diff --git a/layout/SubtableProcessor2.cpp b/layout/SubtableProcessor2.cpp
new file mode 100644
index 0000000..2c0e97b
--- /dev/null
+++ b/layout/SubtableProcessor2.cpp
@@ -0,0 +1,31 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "SubtableProcessor2.h"
+#include "LESwaps.h"
+
+U_NAMESPACE_BEGIN
+
+SubtableProcessor2::SubtableProcessor2()
+{
+}
+
+SubtableProcessor2::SubtableProcessor2(const MorphSubtableHeader2 *morphSubtableHeader)
+{
+ subtableHeader = morphSubtableHeader;
+
+ length = SWAPL(subtableHeader->length);
+ coverage = SWAPL(subtableHeader->coverage);
+ subtableFeatures = SWAPL(subtableHeader->subtableFeatures);
+}
+
+SubtableProcessor2::~SubtableProcessor2()
+{
+}
+
+U_NAMESPACE_END
diff --git a/layout/SubtableProcessor2.h b/layout/SubtableProcessor2.h
new file mode 100644
index 0000000..637e845
--- /dev/null
+++ b/layout/SubtableProcessor2.h
@@ -0,0 +1,46 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#ifndef __SUBTABLEPROCESSOR2_H
+#define __SUBTABLEPROCESSOR2_H
+
+/**
+ * \file
+ * \internal
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+
+U_NAMESPACE_BEGIN
+
+class LEGlyphStorage;
+
+class SubtableProcessor2 : public UMemory {
+public:
+ virtual void process(LEGlyphStorage &glyphStorage) = 0;
+ virtual ~SubtableProcessor2();
+
+protected:
+ SubtableProcessor2(const MorphSubtableHeader2 *morphSubtableHeader);
+
+ SubtableProcessor2();
+
+ le_uint32 length;
+ SubtableCoverage2 coverage;
+ FeatureFlags subtableFeatures;
+
+ const MorphSubtableHeader2 *subtableHeader;
+
+private:
+
+ SubtableProcessor2(const SubtableProcessor2 &other); // forbid copying of this class
+ SubtableProcessor2 &operator=(const SubtableProcessor2 &other); // forbid copying of this class
+};
+
+U_NAMESPACE_END
+#endif
+
diff --git a/layout/TrimmedArrayProcessor2.cpp b/layout/TrimmedArrayProcessor2.cpp
new file mode 100644
index 0000000..c9a9b53
--- /dev/null
+++ b/layout/TrimmedArrayProcessor2.cpp
@@ -0,0 +1,55 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "SubtableProcessor2.h"
+#include "NonContextualGlyphSubst.h"
+#include "NonContextualGlyphSubstProc2.h"
+#include "TrimmedArrayProcessor2.h"
+#include "LEGlyphStorage.h"
+#include "LESwaps.h"
+
+U_NAMESPACE_BEGIN
+
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(TrimmedArrayProcessor2)
+
+TrimmedArrayProcessor2::TrimmedArrayProcessor2()
+{
+}
+
+TrimmedArrayProcessor2::TrimmedArrayProcessor2(const MorphSubtableHeader2 *morphSubtableHeader)
+ : NonContextualGlyphSubstitutionProcessor2(morphSubtableHeader)
+{
+ const NonContextualGlyphSubstitutionHeader2 *header = (const NonContextualGlyphSubstitutionHeader2 *) morphSubtableHeader;
+
+ trimmedArrayLookupTable = (const TrimmedArrayLookupTable *) &header->table;
+ firstGlyph = SWAPW(trimmedArrayLookupTable->firstGlyph);
+ lastGlyph = firstGlyph + SWAPW(trimmedArrayLookupTable->glyphCount);
+}
+
+TrimmedArrayProcessor2::~TrimmedArrayProcessor2()
+{
+}
+
+void TrimmedArrayProcessor2::process(LEGlyphStorage &glyphStorage)
+{
+ le_int32 glyphCount = glyphStorage.getGlyphCount();
+ le_int32 glyph;
+
+ for (glyph = 0; glyph < glyphCount; glyph += 1) {
+ LEGlyphID thisGlyph = glyphStorage[glyph];
+ TTGlyphID ttGlyph = (TTGlyphID) LE_GET_GLYPH(thisGlyph);
+
+ if ((ttGlyph > firstGlyph) && (ttGlyph < lastGlyph)) {
+ TTGlyphID newGlyph = SWAPW(trimmedArrayLookupTable->valueArray[ttGlyph - firstGlyph]);
+
+ glyphStorage[glyph] = LE_SET_GLYPH(thisGlyph, newGlyph);
+ }
+ }
+}
+
+U_NAMESPACE_END
diff --git a/layout/TrimmedArrayProcessor2.h b/layout/TrimmedArrayProcessor2.h
new file mode 100644
index 0000000..1577931
--- /dev/null
+++ b/layout/TrimmedArrayProcessor2.h
@@ -0,0 +1,60 @@
+/*
+ *
+ * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved
+ *
+ */
+
+#ifndef __TRIMMEDARRAYPROCESSOR2_H
+#define __TRIMMEDARRAYPROCESSOR2_H
+
+/**
+ * \file
+ * \internal
+ */
+
+#include "LETypes.h"
+#include "MorphTables.h"
+#include "SubtableProcessor2.h"
+#include "NonContextualGlyphSubst.h"
+#include "NonContextualGlyphSubstProc2.h"
+
+U_NAMESPACE_BEGIN
+
+class LEGlyphStorage;
+
+class TrimmedArrayProcessor2 : public NonContextualGlyphSubstitutionProcessor2
+{
+public:
+ virtual void process(LEGlyphStorage &glyphStorage);
+
+ TrimmedArrayProcessor2(const MorphSubtableHeader2 *morphSubtableHeader);
+
+ virtual ~TrimmedArrayProcessor2();
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for the actual class.
+ *
+ * @stable ICU 2.8
+ */
+ virtual UClassID getDynamicClassID() const;
+
+ /**
+ * ICU "poor man's RTTI", returns a UClassID for this class.
+ *
+ * @stable ICU 2.8
+ */
+ static UClassID getStaticClassID();
+
+private:
+ TrimmedArrayProcessor2();
+
+protected:
+ TTGlyphID firstGlyph;
+ TTGlyphID lastGlyph;
+ const TrimmedArrayLookupTable *trimmedArrayLookupTable;
+
+};
+
+U_NAMESPACE_END
+#endif
+
diff --git a/layout/layout.vcxproj b/layout/layout.vcxproj
index 643ce08..45d8680 100644
--- a/layout/layout.vcxproj
+++ b/layout/layout.vcxproj
@@ -110,7 +110,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin\icule50d.dll</OutputFile>
+ <OutputFile>..\..\bin\icule51d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib\iculed.pdb</ProgramDatabaseFile>
@@ -151,7 +151,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin\icule50.dll</OutputFile>
+ <OutputFile>..\..\bin\icule51.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib\icule.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -195,7 +195,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin64\icule50d.dll</OutputFile>
+ <OutputFile>..\..\bin64\icule51d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib64\iculed.pdb</ProgramDatabaseFile>
@@ -234,7 +234,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin64\icule50.dll</OutputFile>
+ <OutputFile>..\..\bin64\icule51.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib64\icule.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -251,7 +251,9 @@
<ClCompile Include="CanonData.cpp" />
<ClCompile Include="CanonShaping.cpp" />
<ClCompile Include="ClassDefinitionTables.cpp" />
+ <ClCompile Include="ContextualGlyphInsertionProc2.cpp" />
<ClCompile Include="ContextualGlyphSubstProc.cpp" />
+ <ClCompile Include="ContextualGlyphSubstProc2.cpp" />
<ClCompile Include="ContextualSubstSubtables.cpp" />
<ClCompile Include="CoverageTables.cpp" />
<ClCompile Include="CursiveAttachmentSubtables.cpp" />
@@ -268,11 +270,13 @@
<ClCompile Include="GlyphSubstitutionTables.cpp" />
<ClCompile Include="GlyphSubstLookupProc.cpp" />
<ClCompile Include="GXLayoutEngine.cpp" />
+ <ClCompile Include="GXLayoutEngine2.cpp" />
<ClCompile Include="HangulLayoutEngine.cpp" />
<ClCompile Include="HanLayoutEngine.cpp" />
<ClCompile Include="IndicClassTables.cpp" />
<ClCompile Include="IndicLayoutEngine.cpp" />
<ClCompile Include="IndicRearrangementProcessor.cpp" />
+ <ClCompile Include="IndicRearrangementProcessor2.cpp" />
<ClCompile Include="IndicReordering.cpp" />
<ClCompile Include="KernTable.cpp" />
<ClCompile Include="KhmerLayoutEngine.cpp" />
@@ -282,6 +286,7 @@
<ClCompile Include="LEGlyphStorage.cpp" />
<ClCompile Include="LEInsertionList.cpp" />
<ClCompile Include="LigatureSubstProc.cpp" />
+ <ClCompile Include="LigatureSubstProc2.cpp" />
<ClCompile Include="LigatureSubstSubtables.cpp" />
<ClCompile Include="loengine.cpp" />
<ClCompile Include="LookupProcessor.cpp" />
@@ -293,30 +298,39 @@
<ClCompile Include="MarkToMarkPosnSubtables.cpp" />
<ClCompile Include="MirroredCharData.cpp" />
<ClCompile Include="MorphTables.cpp" />
+ <ClCompile Include="MorphTables2.cpp" />
<ClCompile Include="MPreFixups.cpp" />
<ClCompile Include="MultipleSubstSubtables.cpp" />
<ClCompile Include="NonContextualGlyphSubstProc.cpp" />
+ <ClCompile Include="NonContextualGlyphSubstProc2.cpp" />
<ClCompile Include="OpenTypeLayoutEngine.cpp" />
<ClCompile Include="OpenTypeUtilities.cpp" />
<ClCompile Include="PairPositioningSubtables.cpp" />
<ClCompile Include="ScriptAndLanguage.cpp" />
<ClCompile Include="ScriptAndLanguageTags.cpp" />
<ClCompile Include="SegmentArrayProcessor.cpp" />
+ <ClCompile Include="SegmentArrayProcessor2.cpp" />
<ClCompile Include="SegmentSingleProcessor.cpp" />
+ <ClCompile Include="SegmentSingleProcessor2.cpp" />
<ClCompile Include="ShapingTypeData.cpp" />
<ClCompile Include="SimpleArrayProcessor.cpp" />
+ <ClCompile Include="SimpleArrayProcessor2.cpp" />
<ClCompile Include="SinglePositioningSubtables.cpp" />
<ClCompile Include="SingleSubstitutionSubtables.cpp" />
<ClCompile Include="SingleTableProcessor.cpp" />
+ <ClCompile Include="SingleTableProcessor2.cpp" />
<ClCompile Include="StateTableProcessor.cpp" />
+ <ClCompile Include="StateTableProcessor2.cpp" />
<ClCompile Include="SubstitutionLookups.cpp" />
<ClCompile Include="SubtableProcessor.cpp" />
+ <ClCompile Include="SubtableProcessor2.cpp" />
<ClCompile Include="ThaiLayoutEngine.cpp" />
<ClCompile Include="ThaiShaping.cpp" />
<ClCompile Include="ThaiStateTables.cpp" />
<ClCompile Include="TibetanLayoutEngine.cpp" />
<ClCompile Include="TibetanReordering.cpp" />
<ClCompile Include="TrimmedArrayProcessor.cpp" />
+ <ClCompile Include="TrimmedArrayProcessor2.cpp" />
<ClCompile Include="ValueRecords.cpp" />
</ItemGroup>
<ItemGroup>
@@ -329,8 +343,10 @@
<ClInclude Include="CharSubstitutionFilter.h" />
<ClInclude Include="ClassDefinitionTables.h" />
<ClInclude Include="ContextualGlyphInsertion.h" />
+ <ClInclude Include="ContextualGlyphInsertionProc2.h" />
<ClInclude Include="ContextualGlyphSubstitution.h" />
<ClInclude Include="ContextualGlyphSubstProc.h" />
+ <ClInclude Include="ContextualGlyphSubstProc2.h" />
<ClInclude Include="ContextualSubstSubtables.h" />
<ClInclude Include="CoverageTables.h" />
<ClInclude Include="CursiveAttachmentSubtables.h" />
@@ -347,12 +363,14 @@
<ClInclude Include="GlyphSubstitutionTables.h" />
<ClInclude Include="GlyphSubstLookupProc.h" />
<ClInclude Include="GXLayoutEngine.h" />
+ <ClInclude Include="GXLayoutEngine2.h" />
<ClInclude Include="HangulLayoutEngine.h" />
<ClInclude Include="HanLayoutEngine.h" />
<ClInclude Include="ICUFeatures.h" />
<ClInclude Include="IndicLayoutEngine.h" />
<ClInclude Include="IndicRearrangement.h" />
<ClInclude Include="IndicRearrangementProcessor.h" />
+ <ClInclude Include="IndicRearrangementProcessor2.h" />
<ClInclude Include="IndicReordering.h" />
<ClInclude Include="KernTable.h" />
<ClInclude Include="KhmerLayoutEngine.h" />
@@ -486,6 +504,7 @@
</CustomBuild>
<ClInclude Include="LigatureSubstitution.h" />
<ClInclude Include="LigatureSubstProc.h" />
+ <ClInclude Include="LigatureSubstProc2.h" />
<ClInclude Include="LigatureSubstSubtables.h" />
<CustomBuild Include="loengine.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\layout
@@ -514,6 +533,7 @@
<ClInclude Include="MultipleSubstSubtables.h" />
<ClInclude Include="NonContextualGlyphSubst.h" />
<ClInclude Include="NonContextualGlyphSubstProc.h" />
+ <ClInclude Include="NonContextualGlyphSubstProc2.h" />
<ClInclude Include="OpenTypeLayoutEngine.h" />
<ClInclude Include="OpenTypeTables.h" />
<ClInclude Include="OpenTypeUtilities.h" />
@@ -521,20 +541,27 @@
<ClInclude Include="ScriptAndLanguage.h" />
<ClInclude Include="ScriptAndLanguageTags.h" />
<ClInclude Include="SegmentArrayProcessor.h" />
+ <ClInclude Include="SegmentArrayProcessor2.h" />
<ClInclude Include="SegmentSingleProcessor.h" />
+ <ClInclude Include="SegmentSingleProcessor2.h" />
<ClInclude Include="SimpleArrayProcessor.h" />
+ <ClInclude Include="SimpleArrayProcessor2.h" />
<ClInclude Include="SinglePositioningSubtables.h" />
<ClInclude Include="SingleSubstitutionSubtables.h" />
<ClInclude Include="SingleTableProcessor.h" />
+ <ClInclude Include="SingleTableProcessor2.h" />
<ClInclude Include="StateTableProcessor.h" />
+ <ClInclude Include="StateTableProcessor2.h" />
<ClInclude Include="StateTables.h" />
<ClInclude Include="SubstitutionLookups.h" />
<ClInclude Include="SubtableProcessor.h" />
+ <ClInclude Include="SubtableProcessor2.h" />
<ClInclude Include="ThaiLayoutEngine.h" />
<ClInclude Include="ThaiShaping.h" />
<ClInclude Include="TibetanLayoutEngine.h" />
<ClInclude Include="TibetanReordering.h" />
<ClInclude Include="TrimmedArrayProcessor.h" />
+ <ClInclude Include="TrimmedArrayProcessor2.h" />
<ClInclude Include="ValueRecords.h" />
</ItemGroup>
<ItemGroup>
@@ -549,4 +576,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/layout/layout.vcxproj.filters b/layout/layout.vcxproj.filters
index 65c30ab..1c5d835 100644
--- a/layout/layout.vcxproj.filters
+++ b/layout/layout.vcxproj.filters
@@ -36,9 +36,15 @@
<ClCompile Include="ClassDefinitionTables.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="ContextualGlyphInsertionProc2.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="ContextualGlyphSubstProc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="ContextualGlyphSubstProc2.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="ContextualSubstSubtables.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -87,6 +93,9 @@
<ClCompile Include="GXLayoutEngine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="GXLayoutEngine2.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="HangulLayoutEngine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -102,6 +111,9 @@
<ClCompile Include="IndicRearrangementProcessor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="IndicRearrangementProcessor2.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="IndicReordering.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -129,6 +141,9 @@
<ClCompile Include="LigatureSubstProc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="LigatureSubstProc2.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="LigatureSubstSubtables.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -162,6 +177,9 @@
<ClCompile Include="MorphTables.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="MorphTables2.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="MPreFixups.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -171,6 +189,9 @@
<ClCompile Include="NonContextualGlyphSubstProc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="NonContextualGlyphSubstProc2.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="OpenTypeLayoutEngine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -189,15 +210,24 @@
<ClCompile Include="SegmentArrayProcessor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="SegmentArrayProcessor2.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="SegmentSingleProcessor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="SegmentSingleProcessor2.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="ShapingTypeData.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="SimpleArrayProcessor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="SimpleArrayProcessor2.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="SinglePositioningSubtables.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -207,15 +237,24 @@
<ClCompile Include="SingleTableProcessor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="SingleTableProcessor2.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="StateTableProcessor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="StateTableProcessor2.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="SubstitutionLookups.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="SubtableProcessor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="SubtableProcessor2.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="ThaiLayoutEngine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -234,6 +273,9 @@
<ClCompile Include="TrimmedArrayProcessor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="TrimmedArrayProcessor2.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="ValueRecords.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -266,12 +308,18 @@
<ClInclude Include="ContextualGlyphInsertion.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="ContextualGlyphInsertionProc2.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="ContextualGlyphSubstitution.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ContextualGlyphSubstProc.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="ContextualGlyphSubstProc2.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="ContextualSubstSubtables.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -320,6 +368,9 @@
<ClInclude Include="GXLayoutEngine.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="GXLayoutEngine2.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="HangulLayoutEngine.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -338,6 +389,9 @@
<ClInclude Include="IndicRearrangementProcessor.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="IndicRearrangementProcessor2.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="IndicReordering.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -359,6 +413,9 @@
<ClInclude Include="LigatureSubstProc.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="LigatureSubstProc2.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="LigatureSubstSubtables.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -401,6 +458,9 @@
<ClInclude Include="NonContextualGlyphSubstProc.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="NonContextualGlyphSubstProc2.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="OpenTypeLayoutEngine.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -422,12 +482,21 @@
<ClInclude Include="SegmentArrayProcessor.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="SegmentArrayProcessor2.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="SegmentSingleProcessor.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="SegmentSingleProcessor2.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="SimpleArrayProcessor.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="SimpleArrayProcessor2.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="SinglePositioningSubtables.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -437,9 +506,15 @@
<ClInclude Include="SingleTableProcessor.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="SingleTableProcessor2.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="StateTableProcessor.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="StateTableProcessor2.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="StateTables.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -449,6 +524,9 @@
<ClInclude Include="SubtableProcessor.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="SubtableProcessor2.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="ThaiLayoutEngine.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -464,6 +542,9 @@
<ClInclude Include="TrimmedArrayProcessor.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="TrimmedArrayProcessor2.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="ValueRecords.h">
<Filter>Header Files</Filter>
</ClInclude>
diff --git a/layoutex/layoutex.vcxproj b/layoutex/layoutex.vcxproj
index 5745ad6..e745ddf 100644
--- a/layoutex/layoutex.vcxproj
+++ b/layoutex/layoutex.vcxproj
@@ -107,7 +107,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin\iculx50.dll</OutputFile>
+ <OutputFile>..\..\bin\iculx51.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib\iculx.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -150,7 +150,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin\iculx50d.dll</OutputFile>
+ <OutputFile>..\..\bin\iculx51d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib\iculxd.pdb</ProgramDatabaseFile>
@@ -190,7 +190,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin64\iculx50.dll</OutputFile>
+ <OutputFile>..\..\bin64\iculx51.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib64\iculx.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -231,7 +231,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin64\iculx50d.dll</OutputFile>
+ <OutputFile>..\..\bin64\iculx51d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib64\iculxd.pdb</ProgramDatabaseFile>
@@ -327,4 +327,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
diff --git a/runConfigureICU b/runConfigureICU
index fa745cb..6783b38 100755
--- a/runConfigureICU
+++ b/runConfigureICU
@@ -27,6 +27,11 @@
--enable-debug Enable support for debugging
--disable-release Disable presetting optimization flags
+If you want to add custom CFLAGS or CXXFLAGS or similar, provide them _before_
+the runConfigureICU command:
+
+ CXXFLAGS=xyz path/to/runConfigureICU --enable-debug ...
+
The following names can be supplied as the argument for platform:
AIX Use the IBM Visual Age xlc_r/xlC_r compilers on AIX
@@ -38,7 +43,8 @@
FreeBSD Use the GNU gcc/g++ compilers on Free BSD
HP-UX/ACC Use the HP ANSI C/Advanced C++ compilers on HP-UX 11
IBMi Use the iCC compilers on IBM i, i5/OS, OS/400
- Linux Use the GNU gcc/g++ compilers on Linux
+ Linux Use the clang/clang++ or GNU gcc/g++ compilers on Linux
+ Linux/gcc Use the GNU gcc/g++ compilers on Linux
Linux/ECC Use the Intel ECC compiler on Linux
Linux/ICC Use the Intel ICC compiler on Linux
Linux/VA Use the IBM Visual Age compiler on Power PC Linux
@@ -142,7 +148,7 @@
CC=gcc; export CC
CXX=g++; export CXX
DEBUG_CFLAGS='-g -O0'
- DEBUG_CXFLAGS='-g -O0'
+ DEBUG_CXXFLAGS='-g -O0'
;;
Solaris)
THE_OS=SOLARIS
@@ -224,11 +230,23 @@
RELEASE_CFLAGS="-O2 -qmaxmem=-1"
RELEASE_CXXFLAGS="-O2 -qmaxmem=-1"
;;
- Linux*)
+ Linux/gcc)
THE_OS="Linux"
THE_COMP="the GNU C++"
- DEBUG_CFLAGS='-g -O0'
- DEBUG_CXFLAGS='-g -O0'
+ CC=gcc; export CC
+ CXX=g++; export CXX
+ RELEASE_CFLAGS='-O3'
+ RELEASE_CXXFLAGS='-O3'
+ DEBUG_CFLAGS='-g'
+ DEBUG_CXXFLAGS='-g'
+ ;;
+ Linux*)
+ THE_OS="Linux"
+ THE_COMP="the clang or else GNU C++"
+ RELEASE_CFLAGS='-O3'
+ RELEASE_CXXFLAGS='-O3'
+ DEBUG_CFLAGS='-g'
+ DEBUG_CXXFLAGS='-g'
;;
Cygwin)
THE_OS="Cygwin"
@@ -290,7 +308,7 @@
CC=gcc; export CC
CXX=g++; export CXX
DEBUG_CFLAGS='-g -O0'
- DEBUG_CXFLAGS='-g -O0'
+ DEBUG_CXXFLAGS='-g -O0'
;;
TRU64V5.1/CXX)
THE_OS="OSF1"
diff --git a/samples/udata/Makefile b/samples/udata/Makefile
new file mode 100644
index 0000000..450e7de
--- /dev/null
+++ b/samples/udata/Makefile
@@ -0,0 +1,69 @@
+# Copyright (c) 2000-2012 IBM, Inc. and others
+# udata sample code
+# Usage:
+# - configure, build, install ICU
+# - ensure that 'icu-config' is in the PATH (PREFIX/bin/icu-config)
+# - if ICU is not built relative to this directory,
+# set the variable ICU_PATH to the 'icu' directory
+# (i.e. /foo/icu )
+# - do 'make' in this directory
+
+
+# Include ICU standard definitions
+include ../defs.mk
+
+# look for the ICU_PATH variable, guess if not there
+ICU_DEFAULT_PATH=../../..
+
+ifeq ($(strip $(ICU_PATH)),)
+ ICU_PATH=$(ICU_DEFAULT_PATH)
+endif
+
+# Name of your target
+TARGET1=reader
+TARGET2=writer
+
+# All object files (C or C++)
+OBJECTS1=reader.o
+OBJECTS2=writer.o
+OBJECTS=$(OBJECTS1) $(OBJECTS2)
+
+CLEANFILES=*~ $(TARGET).out $(TARGET1).out $(TARGET2).out
+
+all: $(TARGET1) $(TARGET2)
+
+# The following lines are to make sure ICU_PATH is set properly.
+writer.o: $(ICU_PATH)/source/tools/toolutil/uoptions.h
+
+$(ICU_PATH)/source/tools/toolutil/uoptions.h:
+ @echo
+ @echo "*** Please read the directions at the top of this file (Makefile)"
+ @echo "*** Can't open $@ - check ICU_PATH"
+ @echo
+ @false
+
+# Only the writer needs these, actually.
+CPPFLAGS += -I$(ICU_PATH)/source/tools/toolutil
+LDFLAGS += -L$(ICU_PATH)/source/tools/toolutil $(shell icu-config --ldflags-toolutil)
+
+
+.PHONY: all clean distclean check report
+
+distclean clean:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+ -$(RMV) $(OBJECTS) $(TARGET1) $(TARGET2)
+
+# Can change this to LINK.c if it is a C only program
+# Can add more libraries here.
+$(TARGET1): $(OBJECTS1)
+ $(CXX) -o $@ $(LDFLAGS)
+
+$(TARGET2): $(OBJECTS2)
+ $(CXX) -o $@ $(LDFLAGS) -licui18n -licuuc
+
+# Make check: simply runs the sample, logged to a file
+check: $(TARGET1) $(TARGET2)
+ $(INVOKE) ./$(TARGET2) | tee $(TARGET2).out
+ $(INVOKE) ./$(TARGET1) | tee $(TARGET1).out
+
+
diff --git a/stubdata/cnv/docomo-shift_jis-2012.cnv b/stubdata/cnv/docomo-shift_jis-2012.cnv
new file mode 100644
index 0000000..a39bd8c
--- /dev/null
+++ b/stubdata/cnv/docomo-shift_jis-2012.cnv
Binary files differ
diff --git a/stubdata/cnv/kddi-shift_jis-2012.cnv b/stubdata/cnv/kddi-shift_jis-2012.cnv
new file mode 100644
index 0000000..382595a
--- /dev/null
+++ b/stubdata/cnv/kddi-shift_jis-2012.cnv
Binary files differ
diff --git a/stubdata/cnv/softbank-shift_jis-2012.cnv b/stubdata/cnv/softbank-shift_jis-2012.cnv
new file mode 100644
index 0000000..14f489a
--- /dev/null
+++ b/stubdata/cnv/softbank-shift_jis-2012.cnv
Binary files differ
diff --git a/stubdata/icu-data-default.txt b/stubdata/icu-data-default.txt
index 8f6efcc..32ba378 100644
--- a/stubdata/icu-data-default.txt
+++ b/stubdata/icu-data-default.txt
@@ -8,6 +8,7 @@
brkitr/en_US_POSIX.res
brkitr/fi.res
brkitr/ja.res
+brkitr/khmerdict.dict
brkitr/line.brk
brkitr/line_fi.brk
brkitr/line_ja.brk
@@ -26,21 +27,31 @@
coll/af_NA.res
coll/af_ZA.res
coll/ar.res
+coll/ar_001.res
coll/ar_AE.res
coll/ar_BH.res
+coll/ar_DJ.res
coll/ar_DZ.res
coll/ar_EG.res
+coll/ar_EH.res
+coll/ar_ER.res
+coll/ar_IL.res
coll/ar_IQ.res
coll/ar_JO.res
+coll/ar_KM.res
coll/ar_KW.res
coll/ar_LB.res
coll/ar_LY.res
coll/ar_MA.res
+coll/ar_MR.res
coll/ar_OM.res
+coll/ar_PS.res
coll/ar_QA.res
coll/ar_SA.res
coll/ar_SD.res
+coll/ar_SO.res
coll/ar_SY.res
+coll/ar_TD.res
coll/ar_TN.res
coll/ar_YE.res
coll/be.res
@@ -51,6 +62,7 @@
coll/bn_BD.res
coll/bn_IN.res
coll/ca.res
+coll/ca_AD.res
coll/ca_ES.res
coll/cs.res
coll/cs_CZ.res
@@ -66,6 +78,7 @@
coll/de_LU.res
coll/de__PHONEBOOK.res
coll/el.res
+coll/el_CY.res
coll/el_GR.res
coll/en.res
coll/en_150.res
@@ -148,14 +161,18 @@
coll/es_CR.res
coll/es_CU.res
coll/es_DO.res
+coll/es_EA.res
coll/es_EC.res
coll/es_ES.res
+coll/es_GQ.res
coll/es_GT.res
coll/es_HN.res
+coll/es_IC.res
coll/es_MX.res
coll/es_NI.res
coll/es_PA.res
coll/es_PE.res
+coll/es_PH.res
coll/es_PR.res
coll/es_PY.res
coll/es_SV.res
@@ -174,16 +191,53 @@
coll/fil_PH.res
coll/fr.res
coll/fr_BE.res
+coll/fr_BF.res
+coll/fr_BI.res
+coll/fr_BJ.res
+coll/fr_BL.res
coll/fr_CA.res
+coll/fr_CD.res
+coll/fr_CF.res
+coll/fr_CG.res
+coll/fr_CI.res
coll/fr_CH.res
+coll/fr_CM.res
+coll/fr_DJ.res
+coll/fr_DZ.res
coll/fr_FR.res
+coll/fr_GA.res
+coll/fr_GN.res
+coll/fr_GP.res
+coll/fr_GQ.res
+coll/fr_HT.res
+coll/fr_KM.res
coll/fr_LU.res
+coll/fr_MA.res
coll/fr_MC.res
+coll/fr_MF.res
+coll/fr_MG.res
+coll/fr_ML.res
+coll/fr_MQ.res
+coll/fr_MR.res
+coll/fr_MU.res
+coll/fr_NC.res
+coll/fr_NE.res
+coll/fr_PF.res
+coll/fr_RE.res
+coll/fr_RW.res
+coll/fr_SC.res
+coll/fr_SN.res
+coll/fr_SY.res
+coll/fr_TD.res
+coll/fr_TG.res
+coll/fr_TN.res
+coll/fr_VU.res
coll/he.res
coll/he_IL.res
coll/hi.res
coll/hi_IN.res
coll/hr.res
+coll/hr_BA.res
coll/hr_HR.res
coll/hu.res
coll/hu_HU.res
@@ -196,6 +250,7 @@
coll/it.res
coll/it_CH.res
coll/it_IT.res
+coll/it_SM.res
coll/iw.res
coll/iw_IL.res
coll/ja.res
@@ -210,15 +265,22 @@
coll/mr.res
coll/mr_IN.res
coll/ms.res
-coll/ms_BN.res
-coll/ms_MY.res
+coll/ms_Latn.res
+coll/ms_Latn_BN.res
+coll/ms_Latn_MY.res
+coll/ms_Latn_SG.res
coll/nb.res
coll/nb_NO.res
coll/nl.res
+coll/nl_AW.res
+coll/nl_CW.res
coll/nl_BE.res
coll/nl_NL.res
+coll/nl_SR.res
+coll/nl_SX.res
coll/pl.res
coll/pl_PL.res
+# coll/ps.res is needed for fa_AF.
coll/ps.res
coll/pt.res
coll/pt_AO.res
@@ -231,8 +293,13 @@
coll/pt_ST.res
coll/pt_TL.res
coll/ro.res
+coll/ro_MD.res
coll/ro_RO.res
coll/ru.res
+coll/ru_BY.res
+coll/ru_KG.res
+coll/ru_KZ.res
+coll/ru_MD.res
coll/ru_RU.res
coll/ru_UA.res
coll/sk.res
@@ -252,11 +319,13 @@
coll/sr_ME.res
coll/sr_RS.res
coll/sv.res
+coll/sv_AX.res
coll/sv_FI.res
coll/sv_SE.res
coll/sw.res
coll/sw_KE.res
coll/sw_TZ.res
+coll/sw_UG.res
coll/ta.res
coll/ta_IN.res
coll/ta_LK.res
@@ -265,13 +334,13 @@
coll/th.res
coll/th_TH.res
coll/tr.res
+coll/tr_CY.res
coll/tr_TR.res
coll/uk.res
coll/uk_UA.res
coll/vi.res
coll/vi_VN.res
coll/zh.res
-coll/zh_.res
coll/zh_CN.res
coll/zh_HK.res
coll/zh_Hans.res
@@ -284,19 +353,19 @@
coll/zh_MO.res
coll/zh_SG.res
coll/zh_TW.res
-coll/zh_TW_STROKE.res
-coll/zh__PINYIN.res
coll/zu.res
coll/zu_ZA.res
-curr/res_index.res
-curr/pool.res
-curr/supplementalData.res
-curr/root.res
curr/af.res
curr/af_NA.res
curr/am.res
curr/ar.res
+curr/ar_DJ.res
+curr/ar_DJ.res
+curr/ar_ER.res
+curr/ar_ER.res
+curr/ar_SO.res
+curr/ar_SO.res
curr/be.res
curr/bg.res
curr/bn.res
@@ -305,29 +374,66 @@
curr/cs.res
curr/da.res
curr/de.res
+curr/de_CH.res
curr/de_LU.res
curr/el.res
curr/en.res
+curr/en_AG.res
curr/en_AU.res
curr/en_BB.res
+curr/en_BE.res
curr/en_BM.res
+curr/en_BS.res
curr/en_BW.res
curr/en_BZ.res
curr/en_CA.res
+curr/en_CM.res
+curr/en_DM.res
+curr/en_FJ.res
curr/en_GB.res
+curr/en_GD.res
+curr/en_GH.res
+curr/en_GI.res
+curr/en_GM.res
+curr/en_GY.res
curr/en_HK.res
+curr/en_IN.res
curr/en_JM.res
+curr/en_KE.res
+curr/en_KI.res
+curr/en_KN.res
+curr/en_KY.res
+curr/en_LC.res
+curr/en_LR.res
+curr/en_LS.res
+curr/en_MG.res
curr/en_MT.res
+curr/en_MU.res
+curr/en_MW.res
curr/en_NA.res
+curr/en_NG.res
curr/en_NH.res
curr/en_NZ.res
+curr/en_PG.res
curr/en_PH.res
curr/en_PK.res
curr/en_RH.res
+curr/en_SB.res
+curr/en_SC.res
curr/en_SG.res
+curr/en_SL.res
+curr/en_SS.res
+curr/en_SZ.res
+curr/en_TO.res
curr/en_TT.res
+curr/en_TZ.res
+curr/en_UG.res
+curr/en_US.res
+curr/en_VC.res
curr/en_VU.res
+curr/en_WS.res
curr/en_ZA.res
+curr/en_ZM.res
curr/en_ZW.res
curr/es.res
curr/es_AR.res
@@ -335,6 +441,7 @@
curr/es_CL.res
curr/es_CO.res
curr/es_CR.res
+curr/es_CU.res
curr/es_DO.res
curr/es_EC.res
curr/es_GT.res
@@ -343,6 +450,7 @@
curr/es_NI.res
curr/es_PA.res
curr/es_PE.res
+curr/es_PH.res
curr/es_PR.res
curr/es_PY.res
curr/es_US.res
@@ -355,21 +463,38 @@
curr/fil.res
curr/fil_PH.res
curr/fr.res
+curr/fr_BI.res
curr/fr_CA.res
+curr/fr_CD.res
+curr/fr_CH.res
+curr/fr_DJ.res
+curr/fr_DZ.res
+curr/fr_GN.res
+curr/fr_HT.res
curr/fr_LU.res
+curr/fr_KM.res
+curr/fr_MG.res
+curr/fr_MR.res
+curr/fr_MU.res
+curr/fr_RW.res
+curr/fr_SC.res
+curr/fr_SY.res
+curr/fr_TN.res
curr/he.res
curr/he_IL.res
curr/hi.res
curr/hr.res
+curr/hr_BA.res
curr/hu.res
curr/id.res
curr/id_ID.res
curr/in.res
curr/in_ID.res
-curr/iw.res
-curr/iw_IL.res
curr/is.res
curr/it.res
+curr/it_CH.res
+curr/iw.res
+curr/iw_IL.res
curr/ja.res
curr/ja_JP.res
curr/ko.res
@@ -378,18 +503,37 @@
curr/mr.res
curr/ms.res
curr/ms_BN.res
+curr/ms_Latn.res
+curr/ms_Latn_BN.res
+curr/ms_Latn_MY.res
+curr/ms_Latn_SG.res
+curr/ms_MY.res
+curr/ms_SG.res
curr/nb.res
curr/nb_NO.res
curr/nl.res
+curr/nl_AW.res
+curr/nl_CW.res
+curr/nl_SR.res
+curr/nl_SX.res
curr/pl.res
+curr/pool.res
curr/pt.res
curr/pt_AO.res
+curr/pt_CV.res
+curr/pt_MO.res
curr/pt_MZ.res
curr/pt_PT.res
curr/pt_ST.res
+curr/res_index.res
curr/rm.res
curr/ro.res
+curr/ro_MD.res
+curr/root.res
curr/ru.res
+curr/ru_BY.res
+curr/ru_KG.res
+curr/ru_KZ.res
curr/sk.res
curr/sl.res
curr/sr.res
@@ -409,8 +553,10 @@
curr/sr_ME.res
curr/sr_RS.res
curr/sr_YU.res
+curr/supplementalData.res
curr/sv.res
curr/sw.res
+curr/sw_UG.res
curr/ta.res
curr/ta_LK.res
curr/ta_MY.res
@@ -491,6 +637,13 @@
lang/lv.res
lang/mr.res
lang/ms.res
+lang/ms_BN.res
+lang/ms_Latn.res
+lang/ms_Latn_BN.res
+lang/ms_Latn_MY.res
+lang/ms_Latn_SG.res
+lang/ms_MY.res
+lang/ms_SG.res
lang/nb.res
lang/nb_NO.res
lang/nl.res
@@ -500,6 +653,7 @@
lang/pt_PT.res
lang/rm.res
lang/ro.res
+lang/ro_MD.res
lang/ru.res
lang/ru_UA.res
lang/sk.res
@@ -600,6 +754,13 @@
region/lv.res
region/mr.res
region/ms.res
+region/ms_BN.res
+region/ms_Latn.res
+region/ms_Latn_BN.res
+region/ms_Latn_MY.res
+region/ms_Latn_SG.res
+region/ms_MY.res
+region/ms_SG.res
region/nb.res
region/nb_NO.res
region/nl.res
@@ -609,6 +770,7 @@
region/pt_PT.res
region/rm.res
region/ro.res
+region/ro_MD.res
region/ru.res
region/sk.res
region/sl.res
@@ -765,6 +927,13 @@
zone/lv.res
zone/mr.res
zone/ms.res
+zone/ms_BN.res
+zone/ms_Latn.res
+zone/ms_Latn_BN.res
+zone/ms_Latn_MY.res
+zone/ms_Latn_SG.res
+zone/ms_MY.res
+zone/ms_SG.res
zone/nb.res
zone/nb_NO.res
zone/nl.res
@@ -780,6 +949,7 @@
zone/pt_TL.res
zone/rm.res
zone/ro.res
+zone/ro_MD.res
zone/ru.res
zone/sk.res
zone/sl.res
@@ -838,21 +1008,31 @@
am.res
am_ET.res
ar.res
+ar_001.res
ar_AE.res
ar_BH.res
+ar_DJ.res
ar_DZ.res
ar_EG.res
+ar_EH.res
+ar_ER.res
+ar_IL.res
ar_IQ.res
ar_JO.res
+ar_KM.res
ar_KW.res
ar_LB.res
ar_LY.res
ar_MA.res
+ar_MR.res
ar_OM.res
+ar_PS.res
ar_QA.res
ar_SA.res
ar_SD.res
+ar_SO.res
ar_SY.res
+ar_TD.res
ar_TN.res
ar_YE.res
be.res
@@ -863,6 +1043,7 @@
bn_BD.res
bn_IN.res
ca.res
+ca_AD.res
ca_ES.res
cs.res
cs_CZ.res
@@ -876,6 +1057,7 @@
de_LI.res
de_LU.res
el.res
+el_CY.res
el_GR.res
en.res
en_150.res
@@ -963,14 +1145,18 @@
es_CR.res
es_CU.res
es_DO.res
+es_EA.res
es_EC.res
es_ES.res
+es_GQ.res
es_GT.res
es_HN.res
+es_IC.res
es_MX.res
es_NI.res
es_PA.res
es_PE.res
+es_PH.res
es_PR.res
es_PY.res
es_SV.res
@@ -988,16 +1174,55 @@
fil_PH.res
fr.res
fr_BE.res
+fr_BF.res
+fr_BI.res
+fr_BJ.res
+fr_BL.res
fr_CA.res
+fr_CD.res
+fr_CF.res
+fr_CG.res
fr_CH.res
+fr_CI.res
+fr_CM.res
+fr_DJ.res
+fr_DZ.res
fr_FR.res
+fr_GA.res
+fr_GF.res
+fr_GN.res
+fr_GP.res
+fr_GQ.res
+fr_HT.res
+fr_KM.res
fr_LU.res
+fr_MA.res
fr_MC.res
+fr_MF.res
+fr_MG.res
+fr_ML.res
+fr_MQ.res
+fr_MR.res
+fr_MU.res
+fr_NC.res
+fr_NE.res
+fr_PF.res
+fr_RE.res
+fr_RW.res
+fr_SC.res
+fr_SN.res
+fr_SY.res
+fr_TD.res
+fr_TG.res
+fr_TN.res
+fr_VU.res
+fr_YT.res
he.res
he_IL.res
hi.res
hi_IN.res
hr.res
+hr_BA.res
hr_HR.res
hu.res
hu_HU.res
@@ -1010,6 +1235,7 @@
it.res
it_CH.res
it_IT.res
+it_SM.res
iw.res
iw_IL.res
ja.res
@@ -1025,12 +1251,21 @@
mr_IN.res
ms.res
ms_BN.res
+ms_Latn.res
+ms_Latn_BN.res
+ms_Latn_MY.res
+ms_Latn_SG.res
ms_MY.res
+ms_SG.res
nb.res
nb_NO.res
nl.res
+nl_AW.res
nl_BE.res
+nl_CW.res
nl_NL.res
+nl_SR.res
+nl_SX.res
pl.res
pl_PL.res
pt.res
@@ -1046,8 +1281,13 @@
rm.res
rm_CH.res
ro.res
+ro_MD.res
ro_RO.res
ru.res
+ru_BY.res
+ru_KG.res
+ru_KZ.res
+ru_MD.res
ru_RU.res
ru_UA.res
sk.res
@@ -1073,11 +1313,13 @@
sr_RS.res
sr_YU.res
sv.res
+sv_AX.res
sv_FI.res
sv_SE.res
sw.res
sw_KE.res
sw_TZ.res
+sw_UG.res
ta.res
ta_IN.res
ta_LK.res
@@ -1088,6 +1330,7 @@
tl.res
tl_PH.res
tr.res
+tr_CY.res
tr_TR.res
uk.res
uk_UA.res
@@ -1110,9 +1353,10 @@
zu.res
zu_ZA.res
-gsm-03.38-2000.cnv
ibm-1089_P100-1995.cnv
-ibm-1383_P110-1999.cnv
+ibm-1363_P11B-1998.cnv
+ibm-1373_P100-2002.cnv
+ibm-1386_P100-2001.cnv
ibm-5012_P100-1999.cnv
ibm-5346_P100-1998.cnv
ibm-5347_P100-1998.cnv
@@ -1121,6 +1365,7 @@
ibm-5350_P100-1998.cnv
ibm-5354_P100-1998.cnv
ibm-864_X110-1999.cnv
+ibm-874_P100-1995.cnv
ibm-878_P100-1996.cnv
ibm-9005_X110-2007.cnv
ibm-912_P100-1995.cnv
@@ -1134,7 +1379,6 @@
ibm-9447_P100-2002.cnv
ibm-9448_X100-2005.cnv
ibm-9449_P100-2002.cnv
-ibm-954_P101-2007.cnv
iso-8859_10-1998.cnv
iso-8859_11-2001.cnv
iso-8859_14-1998.cnv
@@ -1145,17 +1389,21 @@
windows-936-2000.cnv
windows-949-2000.cnv
windows-950-2000.cnv
-docomo-shift_jis-2007.cnv
+gsm-03.38-2000.cnv
+docomo-shift_jis-2012.cnv
kddi-jisx-208-2007.cnv
-kddi-shift_jis-2007.cnv
+kddi-shift_jis-2012.cnv
softbank-jisx-208-2007.cnv
-softbank-shift_jis-2007.cnv
+softbank-shift_jis-2012.cnv
noop-cns-11643.cnv
noop-gb2312_gl.cnv
noop-iso-ir-165.cnv
ibm-1375_P100-2007.cnv
ibm-1168_P100-2002.cnv
gb18030.cnv
+euc-jp-2007.cnv
+# jisx-208.cnv is needed by the iso-2022-jp patch in ucnv2022.cpp.
+jisx-208.cnv
cnvalias.icu
# Required for Character.getName.
diff --git a/stubdata/icu_dat_generator.py b/stubdata/icu_dat_generator.py
index 33e7257..6a25727 100755
--- a/stubdata/icu_dat_generator.py
+++ b/stubdata/icu_dat_generator.py
@@ -214,11 +214,11 @@
def CopyAndroidCnvFiles(stubdata_dir):
android_specific_cnv = ["gsm-03.38-2000.cnv",
"iso-8859_16-2001.cnv",
- "docomo-shift_jis-2007.cnv",
+ "docomo-shift_jis-2012.cnv",
"kddi-jisx-208-2007.cnv",
- "kddi-shift_jis-2007.cnv",
+ "kddi-shift_jis-2012.cnv",
"softbank-jisx-208-2007.cnv",
- "softbank-shift_jis-2007.cnv"]
+ "softbank-shift_jis-2012.cnv"]
for cnv_file in android_specific_cnv:
src_path = os.path.join(stubdata_dir, "cnv", cnv_file)
dst_path = os.path.join(TMP_DAT_PATH, cnv_file)
diff --git a/stubdata/icudt50l-all.dat b/stubdata/icudt50l-all.dat
deleted file mode 100644
index b3839fd..0000000
--- a/stubdata/icudt50l-all.dat
+++ /dev/null
Binary files differ
diff --git a/stubdata/icudt50l-default.dat b/stubdata/icudt50l-default.dat
deleted file mode 100644
index 96d624a..0000000
--- a/stubdata/icudt50l-default.dat
+++ /dev/null
Binary files differ
diff --git a/stubdata/icudt51l-all.dat b/stubdata/icudt51l-all.dat
new file mode 100644
index 0000000..3133167
--- /dev/null
+++ b/stubdata/icudt51l-all.dat
Binary files differ
diff --git a/stubdata/icudt51l-default.dat b/stubdata/icudt51l-default.dat
new file mode 100644
index 0000000..4ee5e63
--- /dev/null
+++ b/stubdata/icudt51l-default.dat
Binary files differ
diff --git a/stubdata/readme.txt b/stubdata/readme.txt
index 7193ade..3ef895e 100644
--- a/stubdata/readme.txt
+++ b/stubdata/readme.txt
@@ -43,11 +43,11 @@
These are
- gsm-03.38-2000.cnv
- iso-8859_16-2001.cnv
- - docomo-shift_jis-2007.cnv
+ - docomo-shift_jis-2012.cnv
- kddi-jisx-208-2007.cnv
- - kddi-shift_jis-2007.cnv
+ - kddi-shift_jis-2012.cnv
- softbank-jisx-208-2007.cnv
- - softbank-shift_jis-2007.cnv
+ - softbank-shift_jis-2012.cnv
- Text format ICU resource files are under external/icu4c/data directory.
Binary resource files are packaged in external/icu4c/stubdata/icudtXXl-all.dat.
diff --git a/stubdata/regenerate.sh b/stubdata/regenerate.sh
index d1e52d6..c536cd5 100755
--- a/stubdata/regenerate.sh
+++ b/stubdata/regenerate.sh
@@ -20,7 +20,7 @@
set -x
# TODO: extract this from the .dat file's name.
-ICU_VERSION=50
+ICU_VERSION=51
ICU_BIN=$ANDROID_BUILD_TOP/prebuilts/misc/linux-x86_64/icu-$ICU_VERSION
ICU4C_DIR=$ANDROID_BUILD_TOP/external/icu4c
diff --git a/stubdata/stubdata.vcxproj b/stubdata/stubdata.vcxproj
index b0e6abb..0b20a61 100644
--- a/stubdata/stubdata.vcxproj
+++ b/stubdata/stubdata.vcxproj
@@ -113,7 +113,7 @@
<Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > "$(ProjectDir)stubdatabuilt.txt"</Command>
</PreLinkEvent>
<Link>
- <OutputFile>..\..\bin\icudt50.dll</OutputFile>
+ <OutputFile>..\..\bin\icudt51.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
<ProgramDatabaseFile>.\x86\Release\icudt.pdb</ProgramDatabaseFile>
@@ -160,7 +160,7 @@
<Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > "$(ProjectDir)stubdatabuilt.txt"</Command>
</PreLinkEvent>
<Link>
- <OutputFile>..\..\bin\icudt50.dll</OutputFile>
+ <OutputFile>..\..\bin\icudt51.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\x86\Debug/icudt.pdb</ProgramDatabaseFile>
<NoEntryPoint>true</NoEntryPoint>
@@ -207,7 +207,7 @@
<Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > "$(ProjectDir)stubdatabuilt.txt"</Command>
</PreLinkEvent>
<Link>
- <OutputFile>..\..\bin64\icudt50.dll</OutputFile>
+ <OutputFile>..\..\bin64\icudt51.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
<ProgramDatabaseFile>.\x64\Release\icudt.pdb</ProgramDatabaseFile>
@@ -252,7 +252,7 @@
<Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > "$(ProjectDir)stubdatabuilt.txt"</Command>
</PreLinkEvent>
<Link>
- <OutputFile>..\..\bin64\icudt50.dll</OutputFile>
+ <OutputFile>..\..\bin64\icudt51.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\x64\Debug/icudt.pdb</ProgramDatabaseFile>
<NoEntryPoint>true</NoEntryPoint>
diff --git a/test/cintltst/capitst.c b/test/cintltst/capitst.c
index c07fa9b..5d43b30 100644
--- a/test/cintltst/capitst.c
+++ b/test/cintltst/capitst.c
@@ -1,5 +1,5 @@
/********************************************************************
- * Copyright (c) 1997-2012, International Business Machines
+ * Copyright (c) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************/
/*****************************************************************************
@@ -279,7 +279,6 @@
UChar *disName;
int32_t len = 0;
UChar source[12], target[12];
- char sourceU8[36], targetU8[36];
int32_t tempLength;
UErrorCode status = U_ZERO_ERROR;
/*
@@ -627,21 +626,21 @@
if (ucol_getAttribute(vi_VN, UCOL_NORMALIZATION_MODE, &status) != UCOL_ON ||
U_FAILURE(status))
{
- log_err("ERROR: vi_VN collation did not have cannonical decomposition for normalization!\n");
+ log_err("ERROR: vi_VN collation did not have canonical decomposition for normalization!\n");
}
status = U_ZERO_ERROR;
if (ucol_getAttribute(el_GR, UCOL_NORMALIZATION_MODE, &status) != UCOL_ON ||
U_FAILURE(status))
{
- log_err("ERROR: el_GR collation did not have cannonical decomposition for normalization!\n");
+ log_err("ERROR: el_GR collation did not have canonical decomposition for normalization!\n");
}
status = U_ZERO_ERROR;
if (ucol_getAttribute(en_US, UCOL_NORMALIZATION_MODE, &status) != UCOL_OFF ||
U_FAILURE(status))
{
- log_err("ERROR: en_US collation had cannonical decomposition for normalization!\n");
+ log_err("ERROR: en_US collation had canonical decomposition for normalization!\n");
}
ucol_close(en_US);
@@ -788,8 +787,10 @@
|| someClonedCollators[idx] < (UCollator *)buffer[idx]
|| someClonedCollators[idx] > (UCollator *)(buffer[idx]+(U_COL_SAFECLONE_BUFFERSIZE-1)))
{
- log_err("FAIL: Cloned collator didn't use provided buffer.\n");
- return;
+ /* TODO: The use of U_COL_SAFECLONE_BUFFERSIZE will be deprecated per #9932.
+ In the meantime, just turn the following former error into a log message. */
+ log_verbose("NOTE: Cloned collator did not use provided buffer, index %d, status %s, clone NULL? %d\n",
+ idx, myErrorName(err), someClonedCollators[idx] == NULL);
}
if (!ucol_equals(someClonedCollators[idx], someCollators[idx])) {
log_err("FAIL: Cloned collator is not equal to original at index = %d.\n", idx);
@@ -1414,7 +1415,7 @@
const char* actualLocale;
} testStruct[] = {
{ "sr_RS", "sr_Cyrl_RS", "sr" },
- { "sh_YU", "sr_Latn_RS", "hr" }, /* this used to be sh, but now sh collation aliases hr */
+ { "sh_YU", "sr_Latn_RS", "sr_Latn" }, /* was sh, then aliased to hr, now sr_Latn via import per cldrbug 5647: */
{ "en_BE_FOO", "en_BE", "root" },
{ "de_DE_NONEXISTANT", "de_DE", "de" }
};
@@ -1964,7 +1965,7 @@
uint32_t reqLen = 0;
log_verbose("testing buffer overflow\n");
reqLen = ucol_mergeSortkeys(prefixKey, prefixKeyLen, suffixKey, suffixKeyLen, smallBuf, 3);
- if(reqLen != (prefixKeyLen+suffixKeyLen-1)) {
+ if(reqLen != (prefixKeyLen+suffixKeyLen)) {
log_err("Wrong preflight size for merged sortkey\n");
}
}
@@ -2339,38 +2340,44 @@
static void TestGetKeywordValuesForLocale(void) {
#define INCLUDE_UNIHAN_COLLATION 0
#define PREFERRED_SIZE 16
-#define MAX_NUMBER_OF_KEYWORDS 9
+#define MAX_NUMBER_OF_KEYWORDS 8
const char *PREFERRED[PREFERRED_SIZE][MAX_NUMBER_OF_KEYWORDS+1] = {
- { "und", "standard", "ducet", "search", NULL, NULL, NULL, NULL, NULL },
- { "en_US", "standard", "ducet", "search", NULL, NULL, NULL, NULL, NULL },
- { "en_029", "standard", "ducet", "search", NULL, NULL, NULL, NULL, NULL },
- { "de_DE", "standard", "phonebook", "search", "ducet", NULL, NULL, NULL, NULL },
- { "de_Latn_DE", "standard", "phonebook", "search", "ducet", NULL, NULL, NULL, NULL },
+ { "und", "standard", "search", NULL, NULL, NULL, NULL, NULL, NULL },
+ { "en_US", "standard", "search", NULL, NULL, NULL, NULL, NULL, NULL },
+ { "en_029", "standard", "search", NULL, NULL, NULL, NULL, NULL, NULL },
+ { "de_DE", "standard", "phonebook", "search", NULL, NULL, NULL, NULL, NULL },
+ { "de_Latn_DE", "standard", "phonebook", "search", NULL, NULL, NULL, NULL, NULL },
#if INCLUDE_UNIHAN_COLLATION
- { "zh", "pinyin", "big5han", "gb2312han", "standard", "stroke", "zhuyin", "unihan", "ducet", "search" },
- { "zh_Hans", "pinyin", "big5han", "gb2312han", "standard", "stroke", "zhuyin", "unihan", "ducet", "search" },
- { "zh_CN", "pinyin", "big5han", "gb2312han", "standard", "stroke", "zhuyin", "unihan", "ducet", "search" },
- { "zh_Hant", "stroke", "big5han", "gb2312han", "pinyin", "standard", "zhuyin", "unihan", "ducet", "search" },
- { "zh_TW", "stroke", "big5han", "gb2312han", "pinyin", "standard", "zhuyin", "unihan", "ducet", "search" },
- { "zh__PINYIN", "pinyin", "big5han", "gb2312han", "standard", "stroke", "zhuyin", "unihan", "ducet", "search" },
+ { "zh", "pinyin", "big5han", "gb2312han", "stroke", "zhuyin", "unihan", "search", "standard" },
+ { "zh_Hans", "pinyin", "big5han", "gb2312han", "stroke", "zhuyin", "unihan", "search", "standard" },
+ { "zh_CN", "pinyin", "big5han", "gb2312han", "stroke", "zhuyin", "unihan", "search", "standard" },
+ { "zh_Hant", "stroke", "big5han", "gb2312han", "pinyin", "zhuyin", "unihan", "search", "standard" },
+ { "zh_TW", "stroke", "big5han", "gb2312han", "pinyin", "zhuyin", "unihan", "search", "standard" },
+ { "zh__PINYIN", "pinyin", "big5han", "gb2312han", "stroke", "zhuyin", "unihan", "search", "standard" },
#else
- { "zh", "pinyin", "big5han", "gb2312han", "standard", "stroke", "zhuyin", "ducet", "search", NULL },
- { "zh_Hans", "pinyin", "big5han", "gb2312han", "standard", "stroke", "zhuyin", "ducet", "search", NULL },
- { "zh_CN", "pinyin", "big5han", "gb2312han", "standard", "stroke", "zhuyin", "ducet", "search", NULL },
- { "zh_Hant", "stroke", "big5han", "gb2312han", "pinyin", "standard", "zhuyin", "ducet", "search", NULL },
- { "zh_TW", "stroke", "big5han", "gb2312han", "pinyin", "standard", "zhuyin", "ducet", "search", NULL },
- { "zh__PINYIN", "pinyin", "big5han", "gb2312han", "standard", "stroke", "zhuyin", "ducet", "search", NULL },
+ // BEGIN android-changed. No big5han, gb2312han, or zhuyin in Android
+ { "zh", "pinyin", "stroke", "search", "standard", NULL, NULL, NULL, NULL },
+ { "zh_Hans", "pinyin", "stroke", "search", "standard", NULL, NULL, NULL, NULL },
+ { "zh_CN", "pinyin", "stroke", "search", "standard", NULL, NULL, NULL, NULL },
+ { "zh_Hant", "stroke", "pinyin", "search", "standard", NULL, NULL, NULL, NULL },
+ { "zh_TW", "stroke", "pinyin", "search", "standard", NULL, NULL, NULL, NULL },
+ { "zh__PINYIN", "pinyin", "stroke", "search", "standard", NULL, NULL, NULL, NULL },
+ // END android-changed
#endif
- { "es_ES", "standard", "search", "traditional", "ducet", NULL, NULL, NULL, NULL },
- { "es__TRADITIONAL","traditional", "search", "standard", "ducet", NULL, NULL, NULL, NULL },
- { "und@collation=phonebook", "standard", "ducet", "search", NULL, NULL, NULL, NULL, NULL },
- { "de_DE@collation=big5han", "standard", "phonebook", "search", "ducet", NULL, NULL, NULL, NULL },
- { "zzz@collation=xxx", "standard", "ducet", "search", NULL, NULL, NULL, NULL, NULL }
+ { "es_ES", "standard", "search", "traditional", NULL, NULL, NULL, NULL, NULL },
+ { "es__TRADITIONAL","traditional", "search", "standard", NULL, NULL, NULL, NULL, NULL },
+ { "und@collation=phonebook", "standard", "search", NULL, NULL, NULL, NULL, NULL, NULL },
+ { "de_DE@collation=big5han", "standard", "phonebook", "search", NULL, NULL, NULL, NULL, NULL},
+
+ { "zzz@collation=xxx", "standard", "search", NULL, NULL, NULL, NULL, NULL, NULL }
};
#if INCLUDE_UNIHAN_COLLATION
- const int32_t expectedLength[PREFERRED_SIZE] = { 3, 3, 3, 4, 4, 9, 9, 9, 9, 9, 9, 4, 4, 3, 4, 3 };
+ const int32_t expectedLength[PREFERRED_SIZE] = { 2, 2, 2, 3, 3, 8, 8, 8, 8, 8, 8, 3, 3, 2, 3, 2 };
#else
- const int32_t expectedLength[PREFERRED_SIZE] = { 3, 3, 3, 4, 4, 8, 8, 8, 8, 8, 8, 4, 4, 3, 4, 3 };
+ // BEGIN android-change
+ // Fewer cases are expected for "zh*" since Android removes collation sequences to save space.
+ const int32_t expectedLength[PREFERRED_SIZE] = { 2, 2, 2, 3, 3, 4, 4, 4, 4, 4, 4, 3, 3, 2, 3, 2 };
+ // END android-change
#endif
UErrorCode status = U_ZERO_ERROR;
diff --git a/test/cintltst/ccaltst.c b/test/cintltst/ccaltst.c
index 7c51424..ba0344a 100644
--- a/test/cintltst/ccaltst.c
+++ b/test/cintltst/ccaltst.c
@@ -1,5 +1,5 @@
/********************************************************************
- * Copyright (c) 1997-2012, International Business Machines
+ * Copyright (c) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************
*
@@ -492,6 +492,8 @@
UChar temp[30];
double testMillis;
int32_t dateBit;
+ UChar id[4];
+ int32_t idLen;
log_verbose("\nOpening the calendars()\n");
u_strcpy(tzID, fgGMTID);
@@ -509,7 +511,6 @@
log_data_err("error in creating the dateformat : %s (Are you missing data?)\n", u_errorName(status));
return;
}
-
/*Testing getMillis and setMillis */
log_verbose("\nTesting the date and time fetched in millis for a calendar using getMillis\n");
@@ -582,11 +583,20 @@
ctest_setTimeZone(NULL, &status);
- /*testing ucal_setTimeZone() function*/
- log_verbose("\nTesting if the function ucal_setTimeZone() works fine\n");
+ /*testing ucal_setTimeZone() and ucal_getTimeZoneID function*/
+ log_verbose("\nTesting if the function ucal_setTimeZone() and ucal_getTimeZoneID work fine\n");
+ idLen = ucal_getTimeZoneID(caldef2, id, sizeof(id)/sizeof(id[0]), &status);
+ if (U_FAILURE(status)) {
+ log_err("Error in getTimeZoneID : %s\n", u_errorName(status));
+ } else if (u_strcmp(id, fgGMTID) != 0) {
+ log_err("FAIL: getTimeZoneID returns a wrong ID: actual=%d, expected=%s\n", austrdup(id), austrdup(fgGMTID));
+ } else {
+ log_verbose("PASS: getTimeZoneID works fine\n");
+ }
+
ucal_setMillis(caldef2, d2, &status);
if(U_FAILURE(status)){
- log_err("Error in getMillis : %s\n", u_errorName(status));;
+ log_err("Error in getMillis : %s\n", u_errorName(status));
}
hour=ucal_get(caldef2, UCAL_HOUR_OF_DAY, &status);
@@ -597,6 +607,16 @@
}
else
log_verbose("ucal_setTimeZone worked fine\n");
+
+ idLen = ucal_getTimeZoneID(caldef2, id, sizeof(id)/sizeof(id[0]), &status);
+ if (U_FAILURE(status)) {
+ log_err("Error in getTimeZoneID : %s\n", u_errorName(status));
+ } else if (u_strcmp(id, tzID) != 0) {
+ log_err("FAIL: getTimeZoneID returns a wrong ID: actual=%d, expected=%s\n", austrdup(id), austrdup(tzID));
+ } else {
+ log_verbose("PASS: getTimeZoneID works fine\n");
+ }
+
if(hour == ucal_get(caldef2, UCAL_HOUR_OF_DAY, &status))
log_err("FAIL: Error setting the time zone doesn't change the represented time\n");
else if((hour-8 + 1) != ucal_get(caldef2, UCAL_HOUR_OF_DAY, &status)) /*because it is not in daylight savings time */
@@ -1536,7 +1556,7 @@
{ "th@calendar=gregorian", "buddhist", "gregorian", NULL, NULL },
{ "en@calendar=islamic", "gregorian", NULL, NULL, NULL },
{ "zh_TW", "gregorian", "roc", "chinese", NULL },
- { "ar_IR", "gregorian", "persian", "islamic", "islamic-civil" },
+ { "ar_IR", "persian", "gregorian", "islamic", "islamic-civil" },
};
const int32_t EXPECTED_SIZE[PREFERRED_SIZE] = { 1, 1, 1, 1, 2, 2, 2, 4, 4, 2, 2, 2, 1, 3, 4 };
UErrorCode status = U_ZERO_ERROR;
diff --git a/test/cintltst/cdateintervalformattest.c b/test/cintltst/cdateintervalformattest.c
index edcd24e..04e5e93 100644
--- a/test/cintltst/cdateintervalformattest.c
+++ b/test/cintltst/cdateintervalformattest.c
@@ -1,5 +1,5 @@
/********************************************************************
- * Copyright (c) 2011-2012, International Business Machines Corporation
+ * Copyright (c) 2011-2013, International Business Machines Corporation
* and others. All Rights Reserved.
********************************************************************/
/* C API TEST FOR DATE INTERVAL FORMAT */
@@ -47,8 +47,8 @@
/* Just a small set of tests for now, the real functionality is tested in the C++ tests */
static const DateIntervalFormatTestItem testItems[] = {
- { "en", "MMMdHHmm", tzUSPacific, Date201103021030, Date201103021030 + 7.0*_HOUR, "Mar 2, 10:30 \\u2013 Mar 2, 17:30" },
- { "en", "MMMdHHmm", tzAsiaTokyo, Date201103021030, Date201103021030 + 7.0*_HOUR, "Mar 3, 03:30 \\u2013 Mar 3, 10:30" },
+ { "en", "MMMdHHmm", tzUSPacific, Date201103021030, Date201103021030 + 7.0*_HOUR, "Mar 2, 10:30\\u201317:30" },
+ { "en", "MMMdHHmm", tzAsiaTokyo, Date201103021030, Date201103021030 + 7.0*_HOUR, "Mar 3, 03:30\\u201310:30" },
{ "en", "yMMMEd", tzUSPacific, Date201009270800, Date201009270800 + 12.0*_HOUR, "Mon, Sep 27, 2010" },
{ "en", "yMMMEd", tzUSPacific, Date201009270800, Date201009270800 + 31.0*_DAY, "Mon, Sep 27 \\u2013 Thu, Oct 28, 2010" },
{ "en", "yMMMEd", tzUSPacific, Date201009270800, Date201009270800 + 410.0*_DAY, "Mon, Sep 27, 2010 \\u2013 Fri, Nov 11, 2011" },
diff --git a/test/cintltst/cdattst.c b/test/cintltst/cdattst.c
index 0d2ab25..bd4fd84 100644
--- a/test/cintltst/cdattst.c
+++ b/test/cintltst/cdattst.c
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2012, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/********************************************************************************
@@ -36,6 +36,7 @@
static void TestAllLocales(void);
static void TestRelativeCrash(void);
static void TestContext(void);
+static void TestCalendarDateParse(void);
#define LEN(a) (sizeof(a)/sizeof(a[0]))
@@ -53,6 +54,7 @@
TESTCASE(TestAllLocales);
TESTCASE(TestRelativeCrash);
TESTCASE(TestContext);
+ TESTCASE(TestCalendarDateParse);
}
/* Testing the DateFormat API */
static void TestDateFormat()
@@ -590,7 +592,7 @@
udat_countSymbols(def, UDAT_SHORT_MONTHS)!=12 || udat_countSymbols(def, UDAT_WEEKDAYS)!=8 ||
udat_countSymbols(def, UDAT_SHORT_WEEKDAYS)!=8 || udat_countSymbols(def, UDAT_AM_PMS)!=2 ||
udat_countSymbols(def, UDAT_QUARTERS) != 4 || udat_countSymbols(def, UDAT_SHORT_QUARTERS) != 4 ||
- udat_countSymbols(def, UDAT_LOCALIZED_CHARS)!=1)
+ udat_countSymbols(def, UDAT_LOCALIZED_CHARS)!=1 || udat_countSymbols(def, UDAT_SHORTER_WEEKDAYS)!=8)
{
log_err("FAIL: error in udat_countSymbols\n");
}
@@ -632,6 +634,7 @@
VerifygetSymbols(fr, UDAT_WEEKDAYS, 1, "dimanche");
VerifygetSymbols(def, UDAT_WEEKDAYS, 1, "Sunday");
VerifygetSymbols(fr, UDAT_SHORT_WEEKDAYS, 7, "sam.");
+ VerifygetSymbols(fr, UDAT_SHORTER_WEEKDAYS, 7, "sa");
VerifygetSymbols(def, UDAT_SHORT_WEEKDAYS, 7, "Sat");
VerifygetSymbols(def, UDAT_MONTHS, 11, "December");
VerifygetSymbols(def, UDAT_MONTHS, 0, "January");
@@ -644,7 +647,7 @@
VerifygetSymbols(def, UDAT_QUARTERS, 3, "4th quarter");
VerifygetSymbols(fr, UDAT_SHORT_QUARTERS, 1, "T2");
VerifygetSymbols(def, UDAT_SHORT_QUARTERS, 2, "Q3");
- VerifygetSymbols(def,UDAT_LOCALIZED_CHARS, 0, "GyMdkHmsSEDFwWahKzYeugAZvcLQqVU");
+ VerifygetSymbols(def,UDAT_LOCALIZED_CHARS, 0, "GyMdkHmsSEDFwWahKzYeugAZvcLQqVUOXx");
if(result != NULL) {
@@ -880,7 +883,106 @@
ctest_resetTimeZone();
}
+
+
+/**
+ * Test parsing two digit year against "YY" vs. "YYYY" patterns
+ */
+static void TestCalendarDateParse() {
+
+ int32_t result;
+ UErrorCode ec = U_ZERO_ERROR;
+ UDateFormat* simpleDateFormat = 0;
+ int parsePos = 0;
+ int twoDigitCenturyStart = 75;
+ int currentTwoDigitYear = 0;
+ int startCentury = 0;
+ UCalendar* tempCal = 0;
+ UCalendar* calendar = 0;
+
+ U_STRING_DECL(pattern, "yyyy", 4);
+ U_STRING_DECL(pattern2, "yy", 2);
+ U_STRING_DECL(text, "75", 2);
+
+ U_STRING_INIT(pattern, "yyyy", 4);
+ U_STRING_INIT(pattern2, "yy", 2);
+ U_STRING_INIT(text, "75", 2);
+
+ simpleDateFormat = udat_open(UDAT_FULL, UDAT_FULL, "en-GB", 0, 0, 0, 0, &ec);
+ if (U_FAILURE(ec)) {
+ log_data_err("udat_open(UDAT_FULL, UDAT_FULL, \"en-GB\", 0, 0, 0, 0, &ec) failed: %s - (Are you missing data?)\n", u_errorName(ec));
+ return;
+ }
+ udat_applyPattern(simpleDateFormat, 0, pattern, u_strlen(pattern));
+ udat_setLenient(simpleDateFormat, 0);
+
+ currentTwoDigitYear = getCurrentYear() % 100;
+ startCentury = getCurrentYear() - currentTwoDigitYear;
+ if (twoDigitCenturyStart > currentTwoDigitYear) {
+ startCentury -= 100;
+ }
+ tempCal = ucal_open(NULL, -1, NULL, UCAL_GREGORIAN, &ec);
+ ucal_setMillis(tempCal, 0, &ec);
+ ucal_setDateTime(tempCal, startCentury + twoDigitCenturyStart, UCAL_JANUARY, 1, 0, 0, 0, &ec);
+ udat_set2DigitYearStart(simpleDateFormat, ucal_getMillis(tempCal, &ec), &ec);
+
+ calendar = ucal_open(NULL, -1, NULL, UCAL_GREGORIAN, &ec);
+ ucal_setMillis(calendar, 0, &ec);
+ ucal_setDateTime(calendar, twoDigitCenturyStart, UCAL_JANUARY, 1, 0, 0, 0, &ec);
+
+ udat_parseCalendar(simpleDateFormat, calendar, text, u_strlen(text), &parsePos, &ec);
+
+ /* Check result */
+ result = ucal_get(calendar, UCAL_YEAR, &ec);
+ if (U_FAILURE(ec)) {
+ log_err("FAIL: ucal_get(UCAL_YEAR) failed with %s\n", u_errorName(ec));
+ goto FAIL;
+ }
+
+ if (result != 75) {
+ log_err("FAIL: parsed incorrect year: %d\n", result);
+ goto FAIL;
+ }
+
+ parsePos = 0;
+ udat_applyPattern(simpleDateFormat, 0, pattern2, u_strlen(pattern2));
+ udat_parseCalendar(simpleDateFormat, calendar, text, u_strlen(text), &parsePos, &ec);
+
+ /* Check result */
+ result = ucal_get(calendar, UCAL_YEAR, &ec);
+ if (U_FAILURE(ec)) {
+ log_err("FAIL: ucal_get(UCAL_YEAR) failed with %s\n", u_errorName(ec));
+ goto FAIL;
+ }
+
+ if (result != 1975) {
+ log_err("FAIL: parsed incorrect year: %d\n", result);
+ goto FAIL;
+ }
+
+ FAIL:
+ udat_close(simpleDateFormat);
+ udat_close(tempCal);
+ udat_close(calendar);
+}
+
+
/*INTERNAL FUNCTIONS USED*/
+static int getCurrentYear() {
+ static int currentYear = 0;
+ if (currentYear == 0) {
+ UErrorCode status = U_ZERO_ERROR;
+ UCalendar *cal = ucal_open(NULL, -1, NULL, UCAL_GREGORIAN, &status);
+ if (!U_FAILURE(status)) {
+ /* Get the current year from the default UCalendar */
+ currentYear = ucal_get(cal, UCAL_YEAR, &status);
+ ucal_close(cal);
+ }
+ }
+
+ return currentYear;
+}
+
/* N.B.: use idx instead of index to avoid 'shadow' warnings in strict mode. */
static void VerifygetSymbols(UDateFormat* datfor, UDateFormatSymbolType type, int32_t idx, const char* expected)
{
diff --git a/test/cintltst/cdattst.h b/test/cintltst/cdattst.h
index 7159f88..7fc0325 100644
--- a/test/cintltst/cdattst.h
+++ b/test/cintltst/cdattst.h
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2009, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/********************************************************************************
@@ -49,6 +49,7 @@
* test subroutine used by the testing functions
**/
static UChar* myNumformat(const UNumberFormat* numfor, double d);
+ static int getCurrentYear(void);
#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/test/cintltst/citertst.c b/test/cintltst/citertst.c
index acb7a3d..f28e73a 100644
--- a/test/cintltst/citertst.c
+++ b/test/cintltst/citertst.c
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2011, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/********************************************************************************
@@ -1686,6 +1686,8 @@
return result;
}
+static const UChar IMPORT[] = { 0x5B, 0x69, 0x6D, 0x70, 0x6F, 0x72, 0x74, 0 }; /* "[import" */
+
static void TestCEValidity()
{
/* testing UCA collation elements */
@@ -1775,6 +1777,7 @@
continue;
}
}
+ status = U_ZERO_ERROR; // clear status from previous loop iteration
uprv_memset(&src, 0, sizeof(UColTokenParser));
@@ -1782,14 +1785,21 @@
coll = ucol_open(loc, &status);
if (U_FAILURE(status)) {
- log_err("%s collator creation failed\n", loc);
+ log_err("%s collator creation failed with status %s\n", loc, u_errorName(status));
return;
}
src.opts = &opts;
rules = ucol_getRules(coll, &ruleLen);
- if (ruleLen > 0) {
+ /*
+ * We have not set up the UColTokenParser with a callback function
+ * to fetch [import] sub-rules,
+ * so skip testing tailorings that import others.
+ * TODO: Ticket #8047: Change TestCEValidity to use ucol_getTailoredSet()
+ * rather than the internal collation rule parser
+ */
+ if (ruleLen > 0 && u_strstr(rules, IMPORT) == NULL) {
rulesCopy = (UChar *)uprv_malloc((ruleLen +
UCOL_TOK_EXTRA_RULE_SPACE_SIZE) * sizeof(UChar));
uprv_memcpy(rulesCopy, rules, ruleLen * sizeof(UChar));
@@ -1800,7 +1810,7 @@
/* Note that as a result of tickets 7015 or 6912, ucol_tok_parseNextToken can cause the pointer to
the rules copy in src.source to get reallocated, freeing the original pointer in rulesCopy */
- while ((current = ucol_tok_parseNextToken(&src, startOfRules, &parseError,&status)) != NULL) {
+ while ((current = ucol_tok_parseNextToken(&src, startOfRules, &parseError,&status)) != NULL && U_SUCCESS(status)) {
strength = src.parsedToken.strength;
chOffset = src.parsedToken.charsOffset;
chLen = src.parsedToken.charsLen;
@@ -1816,7 +1826,11 @@
codepoints[chLen] = 0;
checkCEValidity(coll, codepoints, chLen);
}
+ if (U_FAILURE(status)) {
+ log_err("%s collator, ucol_tok_parseNextToken failed with status %s\n", loc, u_errorName(status));
+ }
uprv_free(src.source);
+ uprv_free(src.reorderCodes);
}
ucol_close(coll);
@@ -1967,19 +1981,27 @@
UColTokenParser src;
uint32_t strength = 0;
uint16_t specs = 0;
+ status = U_ZERO_ERROR; // clear status from previous loop iteration
uprv_memset(&src, 0, sizeof(UColTokenParser));
coll = ucol_open(locale[count], &status);
if (U_FAILURE(status)) {
- log_err("%s collator creation failed\n", locale[count]);
+ log_err("%s collator creation failed with status %s\n", locale[count], u_errorName(status));
return;
}
src.opts = &opts;
rules = ucol_getRules(coll, &ruleLen);
- if (ruleLen > 0) {
+ /*
+ * We have not set up the UColTokenParser with a callback function
+ * to fetch [import] sub-rules,
+ * so skip testing tailorings that import others.
+ * TODO: Ticket #8047: Change TestSortKeyValidity to use ucol_getTailoredSet()
+ * rather than the internal collation rule parser
+ */
+ if (ruleLen > 0 && u_strstr(rules, IMPORT) == NULL) {
rulesCopy = (UChar *)uprv_malloc((ruleLen +
UCOL_TOK_EXTRA_RULE_SPACE_SIZE) * sizeof(UChar));
uprv_memcpy(rulesCopy, rules, ruleLen * sizeof(UChar));
@@ -1990,7 +2012,7 @@
/* Note that as a result of tickets 7015 or 6912, ucol_tok_parseNextToken can cause the pointer to
the rules copy in src.source to get reallocated, freeing the original pointer in rulesCopy */
- while ((current = ucol_tok_parseNextToken(&src, startOfRules,&parseError, &status)) != NULL) {
+ while ((current = ucol_tok_parseNextToken(&src, startOfRules,&parseError, &status)) != NULL && U_SUCCESS(status)) {
strength = src.parsedToken.strength;
chOffset = src.parsedToken.charsOffset;
chLen = src.parsedToken.charsLen;
@@ -2010,7 +2032,11 @@
}
checkSortKeyValidity(coll, codepoints, chLen);
}
+ if (U_FAILURE(status)) {
+ log_err("%s collator, ucol_tok_parseNextToken failed with status %s\n", locale[count], u_errorName(status));
+ }
uprv_free(src.source);
+ uprv_free(src.reorderCodes);
}
ucol_close(coll);
diff --git a/test/cintltst/cldrtest.c b/test/cintltst/cldrtest.c
index a996086..38f933e 100644
--- a/test/cintltst/cldrtest.c
+++ b/test/cintltst/cldrtest.c
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2012, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@@ -553,8 +553,11 @@
if (strcmp(resolvedLoc, currLoc) != 0) {
/* All locales have at least a Version resource.
If it's absolutely empty, then the previous test will fail too.*/
- log_err("Locale resolves to different locale. Is %s an alias of %s?\n",
- currLoc, resolvedLoc);
+ /* Google Patch: tl_PH and fil_PH are aliases of each other */
+ if (!(strcmp(currLoc, "tl_PH")==0 && strcmp(resolvedLoc, "fil_PH")==0) &&
+ !(strcmp(currLoc, "tl")==0 && strcmp(resolvedLoc, "fil")==0))
+ log_err("Locale resolves to different locale. Is %s an alias of %s?\n",
+ currLoc, resolvedLoc);
}
TestKeyInRootRecursive(root, "root", currentLocale, currLoc);
@@ -937,7 +940,7 @@
if (U_FAILURE(errorCode)) {
log_err("error uloc_getDisplayCountry returned %s\n", u_errorName(errorCode));
}
- else if (uprv_strstr(currLoc, "ti_") != currLoc || isICUVersionAtLeast(51, 0, 0)) { /* TODO: restore DisplayCountry test for ti_* when cldrbug 3058 is fixed) */
+ else if (uprv_strstr(currLoc, "ti_") != currLoc || isICUVersionAtLeast(52, 0, 1)) { /* TODO: FIX or REMOVE this test! Was: restore DisplayCountry test for ti_* when cldrbug 3058 is fixed) - but CldrBug:3058 is wontfix */
strIdx = findStringSetMismatch(currLoc, langBuffer, langSize, exemplarCharacters, exemplarLen, FALSE, &badChar);
if (strIdx >= 0) {
log_err("getDisplayCountry(%s) at index %d returned characters not in the exemplar characters: %04X.\n",
@@ -968,10 +971,12 @@
log_err("error ures_getStringByIndex(%d) returned %s\n", idx, u_errorName(errorCode));
continue;
}
- strIdx = findStringSetMismatch(currLoc, fromBundleStr, langSize, exemplarCharacters, exemplarLen, TRUE, &badChar);
- if (strIdx >= 0) {
- log_err("getDayNames(%s, %d) at index %d returned characters not in the exemplar characters: %04X.\n",
- currLoc, idx, strIdx, badChar);
+ if (uprv_strstr(currLoc, "uz_Arab") != currLoc || isICUVersionAtLeast(52, 0, 1)) { /* TODO: FIX or REMOVE this test! */
+ strIdx = findStringSetMismatch(currLoc, fromBundleStr, langSize, exemplarCharacters, exemplarLen, TRUE, &badChar);
+ if (strIdx >= 0) {
+ log_err("getDayNames(%s, %d) at index %d returned characters not in the exemplar characters: %04X.\n",
+ currLoc, idx, strIdx, badChar);
+ }
}
}
ures_close(resArray);
@@ -997,10 +1002,12 @@
log_err("error ures_getStringByIndex(%d) returned %s\n", idx, u_errorName(errorCode));
continue;
}
- strIdx = findStringSetMismatch(currLoc, fromBundleStr, langSize, exemplarCharacters, exemplarLen, TRUE, &badChar);
- if (strIdx >= 0) {
- log_err("getMonthNames(%s, %d) at index %d returned characters not in the exemplar characters: %04X.\n",
- currLoc, idx, strIdx, badChar);
+ if (uprv_strstr(currLoc, "uz_Arab") != currLoc || isICUVersionAtLeast(52, 0, 1)) { /* TODO: FIX or REMOVE this test! */
+ strIdx = findStringSetMismatch(currLoc, fromBundleStr, langSize, exemplarCharacters, exemplarLen, TRUE, &badChar);
+ if (strIdx >= 0) {
+ log_err("getMonthNames(%s, %d) at index %d returned characters not in the exemplar characters: %04X.\n",
+ currLoc, idx, strIdx, badChar);
+ }
}
}
ures_close(resArray);
diff --git a/test/cintltst/cloctst.c b/test/cintltst/cloctst.c
index e3c6d71..045330e 100644
--- a/test/cintltst/cloctst.c
+++ b/test/cintltst/cloctst.c
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2012, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*****************************************************************************
@@ -244,6 +244,7 @@
TESTCASE(TestForLanguageTag);
TESTCASE(TestTrailingNull);
TESTCASE(TestUnicodeDefines);
+ TESTCASE(TestEnglishExemplarCharacters);
}
@@ -1216,7 +1217,7 @@
and country codes to make sure we have the correct names for them.
*/
char languageCodes[] [4] = { "he", "id", "iu", "ug", "yi", "za", "419" };
- const char* languageNames [] = { "Hebrew", "Indonesian", "Inuktitut", "Uighur", "Yiddish",
+ const char* languageNames [] = { "Hebrew", "Indonesian", "Inuktitut", "Uyghur", "Yiddish",
"Zhuang", "419" };
const char* inLocale [] = { "en_US", "zh_Hant"};
UErrorCode status=U_ZERO_ERROR;
@@ -2509,6 +2510,37 @@
}
#endif
}
+static void TestEnglishExemplarCharacters(void) {
+ UErrorCode status = U_ZERO_ERROR;
+ int i;
+ USet *exSet = NULL;
+ UChar testChars[] = {
+ 0x61, /* standard */
+ 0xE1, /* auxiliary */
+ 0x41, /* index */
+ 0x2D /* punctuation */
+ };
+ ULocaleData *uld = ulocdata_open("en", &status);
+ if (U_FAILURE(status)) {
+ log_data_err("ulocdata_open() failed : %s - (Are you missing data?)\n", u_errorName(status));
+ return;
+ }
+
+ for (i = 0; i < ULOCDATA_ES_COUNT; i++) {
+ exSet = ulocdata_getExemplarSet(uld, exSet, 0, (ULocaleDataExemplarSetType)i, &status);
+ if (U_FAILURE(status)) {
+ log_err_status(status, "ulocdata_getExemplarSet() for type %d failed\n", i);
+ status = U_ZERO_ERROR;
+ continue;
+ }
+ if (!uset_contains(exSet, (UChar32)testChars[i])) {
+ log_err("Character U+%04X is not included in exemplar type %d\n", testChars[i], i);
+ }
+ }
+
+ uset_close(exSet);
+ ulocdata_close(uld);
+}
static void TestNonexistentLanguageExemplars(void) {
/* JB 4068 - Nonexistent language */
@@ -3568,7 +3600,7 @@
"pa_PK"
}, {
"pap",
- "pap_Latn_AN",
+ "pap_Latn_BQ",
"pap"
}, {
"pau",
@@ -3761,7 +3793,7 @@
}, {
"und_AN",
"pap_Latn_AN",
- "pap"
+ "pap_AN"
}, {
"und_AO",
"pt_Latn_AO",
@@ -3804,8 +3836,8 @@
"ur"
}, {
"und_Arab_SN",
- "ar_Arab_SN",
- "ar_SN"
+ "wo_Arab_SN", /* Google patch */
+ "wo_Arab" /* Google patch */
}, {
"und_Armn",
"hy_Armn_AM",
@@ -3936,8 +3968,8 @@
"ru"
}, {
"und_Cyrl_KZ",
- "ru_Cyrl_KZ",
- "ru_KZ"
+ "kk_Cyrl_KZ", /* Google patch */
+ "kk" /* Google patch */
}, {
"und_DE",
"de_Latn_DE",
@@ -3988,16 +4020,16 @@
"es"
}, {
"und_ET",
- "en_Latn_ET",
- "en_ET"
+ "am_Ethi_ET",
+ "am"
}, {
"und_Ethi",
"am_Ethi_ET",
"am"
}, {
"und_Ethi_ER",
- "am_Ethi_ER",
- "am_ER"
+ "ti_Ethi_ER", /* Google patch */
+ "ti_ER" /* Google patch */
}, {
"und_FI",
"fi_Latn_FI",
@@ -4052,8 +4084,8 @@
"es_GT"
}, {
"und_GU",
- "en_Latn_GU",
- "en_GU"
+ "ch_Latn_GU", /* Google patch */
+ "ch" /* Google patch */
}, {
"und_GW",
"pt_Latn_GW",
@@ -4232,8 +4264,8 @@
"es"
}, {
"und_Latn_ET",
- "en_Latn_ET",
- "en_ET"
+ "en_Latn_ET", /* Google patch */
+ "en_ET" /* Google patch */
}, {
"und_Latn_GB",
"en_Latn_GB",
@@ -4260,8 +4292,8 @@
"tr"
}, {
"und_Latn_ZA",
- "en_Latn_ZA",
- "en_ZA"
+ "af_Latn_ZA", /* Google patch */
+ "af" /* Google patch */
}, {
"und_MA",
"ar_Arab_MA",
@@ -4284,8 +4316,8 @@
"mg"
}, {
"und_MH",
- "en_Latn_MH",
- "en_MH"
+ "mh_Latn_MH", /* Google patch */
+ "mh" /* Google patch */
}, {
"und_MK",
"mk_Cyrl_MK",
@@ -4368,20 +4400,20 @@
"nl"
}, {
"und_NO",
- "nb_Latn_NO",
- "nb"
+ "no_Latn_NO", /* Google patch */
+ "no" /* Google patch */
}, {
"und_NP",
"ne_Deva_NP",
"ne"
}, {
"und_NR",
- "en_Latn_NR",
- "en_NR"
+ "na_Latn_NR", /* Google patch */
+ "na" /* Google patch */
}, {
"und_NU",
- "en_Latn_NU",
- "en_NU"
+ "niu_Latn_NU", /* Google patch */
+ "niu" /* Google patch */
}, {
"und_OM",
"ar_Arab_OM",
@@ -4484,8 +4516,8 @@
"sl"
}, {
"und_SJ",
- "nb_Latn_SJ",
- "nb_SJ"
+ "no_Latn_SJ", /* Google patch */
+ "no_SJ" /* Google patch */
}, {
"und_SK",
"sk_Latn_SK",
@@ -4728,8 +4760,8 @@
"zh_HK"
}, {
"und_AQ",
- "en_Latn_AQ",
- "en_AQ"
+ "und_Latn_AQ",
+ "und_AQ"
}, {
"und_Zzzz",
"en_Latn_US",
@@ -4752,8 +4784,8 @@
"zh_HK"
}, {
"und_Zzzz_AQ",
- "en_Latn_AQ",
- "en_AQ"
+ "und_Latn_AQ",
+ "und_AQ"
}, {
"und_Latn",
"en_Latn_US",
@@ -4768,16 +4800,16 @@
"za"
}, {
"und_Latn_TW",
- "zh_Latn_TW",
- "zh_Latn_TW"
+ "trv_Latn_TW",
+ "trv"
}, {
"und_Latn_HK",
"zh_Latn_HK",
"zh_Latn_HK"
}, {
"und_Latn_AQ",
- "en_Latn_AQ",
- "en_AQ"
+ "und_Latn_AQ",
+ "und_AQ"
}, {
"und_Hans",
"zh_Hans_CN",
@@ -4848,8 +4880,8 @@
"zh_Moon_HK"
}, {
"und_Moon_AQ",
- "en_Moon_AQ",
- "en_Moon_AQ"
+ "und_Moon_AQ",
+ "und_Moon_AQ"
}, {
"es",
"es_Latn_ES",
diff --git a/test/cintltst/cloctst.h b/test/cintltst/cloctst.h
index a544f31..ac313b3 100644
--- a/test/cintltst/cloctst.h
+++ b/test/cintltst/cloctst.h
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2010, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/********************************************************************************
@@ -122,4 +122,10 @@
*/
static void TestForLanguageTag(void);
static void TestToLanguageTag(void);
+
+/**
+ * locale data
+ */
+static void TestEnglishExemplarCharacters(void);
+
#endif
diff --git a/test/cintltst/cmsccoll.c b/test/cintltst/cmsccoll.c
index e246f22..f039ab0 100644
--- a/test/cintltst/cmsccoll.c
+++ b/test/cintltst/cmsccoll.c
@@ -1,7 +1,7 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 2001-2012, International Business Machines Corporation and
+ * Copyright (c) 2001-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*******************************************************************************
@@ -653,6 +653,7 @@
}
}
uprv_free(src.source);
+ uprv_free(src.reorderCodes);
}
}
@@ -1000,6 +1001,7 @@
log_verbose("No immediate difference with Win32!\n");
}
uprv_free(src.source);
+ uprv_free(src.reorderCodes);
}
}
@@ -1287,6 +1289,7 @@
lastContCE = currContCE & 0xFFFFFFBF;
}
uprv_free(src.source);
+ uprv_free(src.reorderCodes);
}
ucol_close(UCA);
uprv_delete_collIterate(c);
@@ -1398,12 +1401,18 @@
continue;
}
if (uprv_strcmp("bn", locName)==0 ||
+ uprv_strcmp("bs", locName)==0 || /* Add due to import per cldrbug 5647 */
+ uprv_strcmp("bs_Cyrl", locName)==0 || /* Add due to import per cldrbug 5647 */
uprv_strcmp("en_US_POSIX", locName)==0 ||
+ uprv_strcmp("fa_AF", locName)==0 || /* Add due to import per cldrbug 5647 */
+ uprv_strcmp("he", locName)==0 || /* Add due to new tailoring of \u05F3 vs \u0027 per cldrbug 5576 */
+ uprv_strcmp("he_IL", locName)==0 || /* Add due to new tailoring of \u05F3 vs \u0027 per cldrbug 5576 */
uprv_strcmp("km", locName)==0 ||
uprv_strcmp("km_KH", locName)==0 ||
uprv_strcmp("my", locName)==0 ||
uprv_strcmp("si", locName)==0 ||
uprv_strcmp("si_LK", locName)==0 ||
+ uprv_strcmp("sr_Latn", locName)==0 || /* Add due to import per cldrbug 5647 */
uprv_strcmp("th", locName)==0 ||
uprv_strcmp("th_TH", locName)==0 ||
uprv_strcmp("zh", locName)==0 ||
@@ -5172,7 +5181,7 @@
}
log_err("\n");
}
-if(isICUVersionAtLeast(51, 1, 0)) { /* TODO: debug & fix, see ticket #8982 */
+if(isICUVersionAtLeast(52, 0, 1)) { /* TODO: debug & fix, see ticket #8982 */
tLen = u_strlen(tData2[1]);
rLen = ucol_getSortKey(coll, tData2[1], tLen, resColl, 100);
if (rLen != LEN(firstSecondaryIgnCE) || uprv_memcmp(resColl, firstSecondaryIgnCE, rLen) != 0) {
@@ -6652,7 +6661,9 @@
};
doTestOneTestCase(normalTests, LEN(normalTests), normalRules, LEN(normalRules));
- doTestOneTestCase(importTests, LEN(importTests), importRules, LEN(importRules));
+ // BEGIN Android-remove. Android does not use rule-based collation0
+ // doTestOneTestCase(importTests, LEN(importTests), importRules, LEN(importRules));
+ // END Android-remove
}
#if 0
diff --git a/test/cintltst/cmsgtst.c b/test/cintltst/cmsgtst.c
index dc60576..0aeb2a2 100644
--- a/test/cintltst/cmsgtst.c
+++ b/test/cintltst/cmsgtst.c
@@ -89,6 +89,9 @@
strings_initialized = FALSE;
}
+#if (U_PLATFORM == U_PF_LINUX) /* add platforms here .. */
+/* Keep the #if above in sync with the one below that has the same "add platforms here .." comment. */
+#else
/* Platform dependent test to detect if this type will return NULL when interpreted as a pointer. */
static UBool returnsNullForType(int firstParam, ...) {
UBool isNULL;
@@ -98,6 +101,7 @@
va_end(marker);
return isNULL;
}
+#endif
/* Test u_formatMessage() with various test patterns() */
static void MessageFormatTest( void )
diff --git a/test/cintltst/cnmdptst.c b/test/cintltst/cnmdptst.c
index e9f3ad2..04a12ba 100644
--- a/test/cintltst/cnmdptst.c
+++ b/test/cintltst/cnmdptst.c
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2012, International Business Machines Corporation
+ * Copyright (c) 1997-2013, International Business Machines Corporation
* and others. All Rights Reserved.
********************************************************************/
/*******************************************************************************
@@ -880,7 +880,7 @@
{ "de", "EUR", NULL, NULL },
{ "de_DE", "EUR", NULL, NULL },
{ "ar", "EGP", NULL, NULL },
- { "ar_PS", "JOD", "ILS", NULL },
+ { "ar_PS", "ILS", "JOD", NULL },
{ "en@currency=CAD", "USD", "USN", "USS" },
{ "fr@currency=zzz", "EUR", NULL, NULL },
{ "de_DE@currency=DEM", "EUR", NULL, NULL },
diff --git a/test/cintltst/creststn.c b/test/cintltst/creststn.c
index d10551a..5fee31e 100644
--- a/test/cintltst/creststn.c
+++ b/test/cintltst/creststn.c
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2012, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*******************************************************************************
@@ -202,6 +202,7 @@
addTest(root, &TestDecodedBundle, "tsutil/creststn/TestDecodedBundle");
addTest(root, &TestResourceLevelAliasing, "tsutil/creststn/TestResourceLevelAliasing");
addTest(root, &TestDirectAccess, "tsutil/creststn/TestDirectAccess");
+ addTest(root, &TestTicket9804, "tsutil/creststn/TestTicket9804");
addTest(root, &TestXPath, "tsutil/creststn/TestXPath");
addTest(root, &TestCLDRStyleAliases, "tsutil/creststn/TestCLDRStyleAliases");
addTest(root, &TestFallbackCodes, "tsutil/creststn/TestFallbackCodes");
@@ -280,8 +281,8 @@
checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status);
/* we look up the resource which is aliased and at our level */
- /* TODO: restore the following test when cldrbug 3058: is fixed */
- if(U_SUCCESS(status) && r != NULL && isICUVersionAtLeast(51, 0, 0)) {
+ /* TODO: restore the following test when cldrbug 3058: is fixed - but CldrBug:3058 is WONTFIX */
+ if(U_SUCCESS(status) && r != NULL && isICUVersionAtLeast(52, 0, 1)) {
status = U_USING_DEFAULT_WARNING;
r2 = ures_getByKey(r, "Countries", r2, &status);
checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status);
@@ -2072,7 +2073,7 @@
UResourceBundle* tResB;
UResourceBundle* zoneResource;
const UChar* version = NULL;
- static const UChar versionStr[] = { 0x0032, 0x002E, 0x0030, 0x002E, 0x0034, 0x0031, 0x002E, 0x0032, 0x0033, 0x0000};
+ static const UChar versionStr[] = { 0x0032, 0x002E, 0x0030, 0x002E, 0x0038, 0x0032, 0x002E, 0x0034, 0x0035, 0x0000};
if(err != U_ZERO_ERROR){
log_data_err("Expected U_ZERO_ERROR when trying to test no_NO_NY aliased to nn_NO for Version err=%s\n",u_errorName(err));
@@ -2435,6 +2436,30 @@
ures_close(t);
}
+static void TestTicket9804(void) {
+ UErrorCode status = U_ZERO_ERROR;
+ UResourceBundle *t = NULL;
+ t = ures_open(NULL, "he", &status);
+ t = ures_getByKeyWithFallback(t, "calendar/islamic-civil/DateTime", t, &status);
+ if(U_SUCCESS(status)) {
+ log_err("This resource does not exist. How did it get here?\n");
+ }
+ status = U_ZERO_ERROR;
+ ures_close(t);
+ t = ures_open(NULL, "he", &status);
+ t = ures_getByKeyWithFallback(t, "calendar/islamic-civil/eras", t, &status);
+ if(U_FAILURE(status)) {
+ log_err_status(status, "Didn't get Eras. I know they are there!\n");
+ } else {
+ const char *locale = ures_getLocaleByType(t, ULOC_ACTUAL_LOCALE, &status);
+ if (uprv_strcmp("he", locale) != 0) {
+ log_err("Eras should be in the 'he' locale, but was in: %s", locale);
+ }
+ }
+ status = U_ZERO_ERROR;
+ ures_close(t);
+}
+
static void TestJB3763(void) {
/* Nasty bug prevented using parent as fill-in, since it would
* stomp the path information.
diff --git a/test/cintltst/creststn.h b/test/cintltst/creststn.h
index f6becdb..86810be 100644
--- a/test/cintltst/creststn.h
+++ b/test/cintltst/creststn.h
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2006, International Business Machines Corporation and
+ * Copyright (c) 1997-2012, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/***************************************************************************
@@ -63,6 +63,8 @@
static void TestDirectAccess(void);
+static void TestTicket9804(void);
+
static void TestResourceLevelAliasing(void);
static void TestErrorCodes(void);
diff --git a/test/cintltst/cucdapi.c b/test/cintltst/cucdapi.c
index ee8d203..9fa0170 100644
--- a/test/cintltst/cucdapi.c
+++ b/test/cintltst/cucdapi.c
@@ -1,5 +1,5 @@
/********************************************************************
- * Copyright (c) 1997-2012, International Business Machines
+ * Copyright (c) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************/
@@ -527,6 +527,68 @@
}
}
+void TestScriptMetadataAPI() {
+ /* API & code coverage. More testing in intltest/ucdtest.cpp. */
+ UErrorCode errorCode=U_ZERO_ERROR;
+ UChar sample[8];
+
+ if(uscript_getSampleString(USCRIPT_LATIN, sample, LENGTHOF(sample), &errorCode)!=1 ||
+ U_FAILURE(errorCode) ||
+ uscript_getScript(sample[0], &errorCode)!=USCRIPT_LATIN ||
+ sample[1]!=0) {
+ log_err("uscript_getSampleString(Latn) failed - %s\n", u_errorName(errorCode));
+ }
+ sample[0]=0xfffe;
+ if(uscript_getSampleString(USCRIPT_LATIN, sample, 0, &errorCode)!=1 ||
+ errorCode!=U_BUFFER_OVERFLOW_ERROR ||
+ sample[0]!=0xfffe) {
+ log_err("uscript_getSampleString(Latn, capacity=0) failed - %s\n", u_errorName(errorCode));
+ }
+ errorCode=U_ZERO_ERROR;
+ if(uscript_getSampleString(USCRIPT_INVALID_CODE, sample, LENGTHOF(sample), &errorCode)!=0 ||
+ U_FAILURE(errorCode) ||
+ sample[0]!=0) {
+ log_err("uscript_getSampleString(invalid) failed - %s\n", u_errorName(errorCode));
+ }
+ sample[0]=0xfffe;
+ if(uscript_getSampleString(USCRIPT_CODE_LIMIT, sample, 0, &errorCode)!=0 ||
+ errorCode!=U_STRING_NOT_TERMINATED_WARNING ||
+ sample[0]!=0xfffe) {
+ log_err("uscript_getSampleString(limit, capacity=0) failed - %s\n", u_errorName(errorCode));
+ }
+
+ if(uscript_getUsage(USCRIPT_LATIN)!=USCRIPT_USAGE_RECOMMENDED ||
+ uscript_getUsage(USCRIPT_YI)!=USCRIPT_USAGE_ASPIRATIONAL ||
+ uscript_getUsage(USCRIPT_CHEROKEE)!=USCRIPT_USAGE_LIMITED_USE ||
+ uscript_getUsage(USCRIPT_COPTIC)!=USCRIPT_USAGE_EXCLUDED ||
+ uscript_getUsage(USCRIPT_CIRTH)!=USCRIPT_USAGE_NOT_ENCODED ||
+ uscript_getUsage(USCRIPT_INVALID_CODE)!=USCRIPT_USAGE_NOT_ENCODED ||
+ uscript_getUsage(USCRIPT_CODE_LIMIT)!=USCRIPT_USAGE_NOT_ENCODED) {
+ log_err("uscript_getUsage() failed\n");
+ }
+
+ if(uscript_isRightToLeft(USCRIPT_LATIN) ||
+ uscript_isRightToLeft(USCRIPT_CIRTH) ||
+ !uscript_isRightToLeft(USCRIPT_ARABIC) ||
+ !uscript_isRightToLeft(USCRIPT_HEBREW)) {
+ log_err("uscript_isRightToLeft() failed\n");
+ }
+
+ if(uscript_breaksBetweenLetters(USCRIPT_LATIN) ||
+ uscript_breaksBetweenLetters(USCRIPT_CIRTH) ||
+ !uscript_breaksBetweenLetters(USCRIPT_HAN) ||
+ !uscript_breaksBetweenLetters(USCRIPT_THAI)) {
+ log_err("uscript_breaksBetweenLetters() failed\n");
+ }
+
+ if(uscript_isCased(USCRIPT_CIRTH) ||
+ uscript_isCased(USCRIPT_HAN) ||
+ !uscript_isCased(USCRIPT_LATIN) ||
+ !uscript_isCased(USCRIPT_GREEK)) {
+ log_err("uscript_isCased() failed\n");
+ }
+}
+
void TestBinaryValues() {
/*
* Unicode 5.1 explicitly defines binary property value aliases.
diff --git a/test/cintltst/cucdapi.h b/test/cintltst/cucdapi.h
index 8ea9811..464c5b9 100644
--- a/test/cintltst/cucdapi.h
+++ b/test/cintltst/cucdapi.h
@@ -1,10 +1,11 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 2003-2010, International Business Machines Corporation and
+ * Copyright (c) 2003-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
void TestUScriptCodeAPI(void);
void TestHasScript(void);
void TestGetScriptExtensions(void);
+void TestScriptMetadataAPI(void);
void TestBinaryValues(void);
diff --git a/test/cintltst/cucdtst.c b/test/cintltst/cucdtst.c
index 04b8e51..b31338d 100644
--- a/test/cintltst/cucdtst.c
+++ b/test/cintltst/cucdtst.c
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2012, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*******************************************************************************
@@ -184,6 +184,7 @@
addTest(root, &TestUScriptCodeAPI, "tsutil/cucdtst/TestUScriptCodeAPI");
addTest(root, &TestHasScript, "tsutil/cucdtst/TestHasScript");
addTest(root, &TestGetScriptExtensions, "tsutil/cucdtst/TestGetScriptExtensions");
+ addTest(root, &TestScriptMetadataAPI, "tsutil/cucdtst/TestScriptMetadataAPI");
addTest(root, &TestUScriptRunAPI, "tsutil/cucdtst/TestUScriptRunAPI");
addTest(root, &TestPropertyNames, "tsutil/cucdtst/TestPropertyNames");
addTest(root, &TestPropertyValues, "tsutil/cucdtst/TestPropertyValues");
diff --git a/test/cintltst/nccbtst.c b/test/cintltst/nccbtst.c
index e810852..043bee7 100644
--- a/test/cintltst/nccbtst.c
+++ b/test/cintltst/nccbtst.c
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2012, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*
@@ -430,7 +430,7 @@
log_err("u-> ibm-943 with skip did not match.\n");
if(!testConvertFromUnicode(euc_jp_inputText, sizeof(euc_jp_inputText)/sizeof(euc_jp_inputText[0]),
- to_euc_jp, sizeof(to_euc_jp), "euc-jp",
+ to_euc_jp, sizeof(to_euc_jp), "IBM-eucJP",
UCNV_FROM_U_CALLBACK_SKIP, fromEUC_JPOffs, NULL, 0 ))
log_err("u-> euc-jp with skip did not match.\n");
@@ -866,7 +866,7 @@
log_err("EBCIDIC_STATEFUL->u with skip did not match.\n");
if(!testConvertToUnicode(sampleTxt_euc_jp, sizeof(sampleTxt_euc_jp),
- euc_jptoUnicode, sizeof(euc_jptoUnicode)/sizeof(euc_jptoUnicode[0]),"euc-jp",
+ euc_jptoUnicode, sizeof(euc_jptoUnicode)/sizeof(euc_jptoUnicode[0]),"IBM-eucJP",
UCNV_TO_U_CALLBACK_SKIP, from_euc_jpOffs , NULL, 0))
log_err("euc-jp->u with skip did not match.\n");
@@ -1204,7 +1204,7 @@
log_err("u-> ibm-943 with stop did not match.\n");
if(!testConvertFromUnicode(euc_jp_inputText, sizeof(euc_jp_inputText)/sizeof(euc_jp_inputText[0]),
- to_euc_jp, sizeof(to_euc_jp), "euc-jp",
+ to_euc_jp, sizeof(to_euc_jp), "IBM-eucJP",
UCNV_FROM_U_CALLBACK_STOP, fromEUC_JPOffs, NULL, 0 ))
log_err("u-> euc-jp with stop did not match.\n");
@@ -1321,7 +1321,7 @@
log_err("EBCIDIC_STATEFUL->u with stop did not match.\n");
if(!testConvertToUnicode(sampleTxt_euc_jp, sizeof(sampleTxt_euc_jp),
- euc_jptoUnicode, sizeof(euc_jptoUnicode)/sizeof(euc_jptoUnicode[0]),"euc-jp",
+ euc_jptoUnicode, sizeof(euc_jptoUnicode)/sizeof(euc_jptoUnicode[0]),"IBM-eucJP",
UCNV_TO_U_CALLBACK_STOP, from_euc_jpOffs , NULL, 0))
log_err("euc-jp->u with stop did not match.\n");
@@ -1434,7 +1434,7 @@
log_err("u-> ibm-943 with substitute did not match.\n");
if(!testConvertFromUnicode(euc_jp_inputText, sizeof(euc_jp_inputText)/sizeof(euc_jp_inputText[0]),
- to_euc_jp, sizeof(to_euc_jp), "euc-jp",
+ to_euc_jp, sizeof(to_euc_jp), "IBM-eucJP",
UCNV_FROM_U_CALLBACK_SUBSTITUTE, fromEUC_JPOffs, NULL, 0 ))
log_err("u-> euc-jp with substitute did not match.\n");
@@ -1609,7 +1609,7 @@
if(!testConvertToUnicode(sampleTxt_euc_jp, sizeof(sampleTxt_euc_jp),
- euc_jptoUnicode, sizeof(euc_jptoUnicode)/sizeof(euc_jptoUnicode[0]),"euc-jp",
+ euc_jptoUnicode, sizeof(euc_jptoUnicode)/sizeof(euc_jptoUnicode[0]),"IBM-eucJP",
UCNV_TO_U_CALLBACK_SUBSTITUTE, from_euc_jpOffs, NULL, 0 ))
log_err("euc-jp->u with substitute did not match.\n");
@@ -1621,7 +1621,7 @@
if(!testConvertToUnicodeWithContext(sampleTxt_euc_jp, sizeof(sampleTxt_euc_jp),
- euc_jptoUnicode, sizeof(euc_jptoUnicode)/sizeof(euc_jptoUnicode[0]),"euc-jp",
+ euc_jptoUnicode, sizeof(euc_jptoUnicode)/sizeof(euc_jptoUnicode[0]),"IBM-eucJP",
UCNV_TO_U_CALLBACK_SUBSTITUTE, from_euc_jpOffs, NULL, 0 ,"i", U_ILLEGAL_CHAR_FOUND))
log_err("euc-jp->u with substitute did not match.\n");
}
@@ -2070,7 +2070,7 @@
log_err("u-> ibm-943 with subst with value did not match.\n");
if(!testConvertFromUnicode(euc_jp_inputText, sizeof(euc_jp_inputText)/sizeof(euc_jp_inputText[0]),
- to_euc_jp, sizeof(to_euc_jp), "euc-jp",
+ to_euc_jp, sizeof(to_euc_jp), "IBM-eucJP",
UCNV_FROM_U_CALLBACK_ESCAPE, fromEUC_JPOffs, NULL, 0 ))
log_err("u-> euc-jp with subst with value did not match.\n");
@@ -2464,7 +2464,7 @@
log_err("ibm-943->u with substitute with value did not match.\n");
if(!testConvertToUnicode(sampleTxt_EUC_JP, sizeof(sampleTxt_EUC_JP),
- EUC_JPtoUnicode, sizeof(EUC_JPtoUnicode)/sizeof(EUC_JPtoUnicode[0]),"euc-jp",
+ EUC_JPtoUnicode, sizeof(EUC_JPtoUnicode)/sizeof(EUC_JPtoUnicode[0]),"IBM-eucJP",
UCNV_TO_U_CALLBACK_ESCAPE, fromEUC_JPOffs, NULL, 0))
log_err("euc-jp->u with substitute with value did not match.\n");
@@ -2753,14 +2753,11 @@
UChar errChars[50]; /* should be sufficient */
int8_t errLen = 50;
UErrorCode err = U_ZERO_ERROR;
- const UChar* limit= NULL;
const UChar* start= NULL;
ucnv_getInvalidUChars(conv,errChars, &errLen, &err);
if(U_FAILURE(err)){
log_err("ucnv_getInvalidUChars failed with error : %s\n",u_errorName(err));
}
- /* src points to limit of invalid chars */
- limit = src;
/* length of in invalid chars should be equal to returned length*/
start = src - errLen;
if(u_strncmp(errChars,start,errLen)!=0){
@@ -2951,14 +2948,11 @@
char errChars[50]; /* should be sufficient */
int8_t errLen = 50;
UErrorCode err = U_ZERO_ERROR;
- const char* limit= NULL;
const char* start= NULL;
ucnv_getInvalidChars(conv,errChars, &errLen, &err);
if(U_FAILURE(err)){
log_err("ucnv_getInvalidChars failed with error : %s\n",u_errorName(err));
}
- /* src points to limit of invalid chars */
- limit = src;
/* length of in invalid chars should be equal to returned length*/
start = src - errLen;
if(uprv_strncmp(errChars,start,errLen)!=0){
diff --git a/test/cintltst/ncnvtst.c b/test/cintltst/ncnvtst.c
index 157cdcd..dfd73fb 100644
--- a/test/cintltst/ncnvtst.c
+++ b/test/cintltst/ncnvtst.c
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2010, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*****************************************************************************
@@ -402,14 +402,14 @@
expectedSUB, sizeof(expectedSUB), "ibm-1363", 0, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS portion] is supposed to fail\n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
- expected, sizeof(expected), "ibm-1363", 0, FALSE, U_ZERO_ERROR))
+ expected, sizeof(expected), "ibm-1363", 0, FALSE, U_AMBIGUOUS_ALIAS_WARNING))
log_err("u-> ibm-1363 [UCNV_DBCS portion] is supposed to fail\n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
expectedSUB, sizeof(expectedSUB), "ibm-1363", offsetsSUB, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS portion] is supposed to fail\n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
- expected, sizeof(expected), "ibm-1363", offsets, FALSE, U_ZERO_ERROR))
+ expected, sizeof(expected), "ibm-1363", offsets, FALSE, U_AMBIGUOUS_ALIAS_WARNING))
log_err("u-> ibm-1363 [UCNV_DBCS portion] is supposed to fail\n");
@@ -425,7 +425,7 @@
expectedSUB, sizeof(expectedSUB), "ibm-1363", 0, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_MBCS] \n");
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
- expected, sizeof(expected), "ibm-1363", 0, FALSE, U_ZERO_ERROR))
+ expected, sizeof(expected), "ibm-1363", 0, FALSE, U_AMBIGUOUS_ALIAS_WARNING))
log_err("u-> ibm-1363 [UCNV_MBCS] \n");
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
@@ -446,10 +446,10 @@
log_err("u-> ibm-1363 [UCNV_MBCS] \n");
if(!convertFromU(sampleText4MBCS, sizeof(sampleText4MBCS)/sizeof(sampleText4MBCS[0]),
- expected4MBCS, sizeof(expected4MBCS), "euc-jp", offsets4MBCS, TRUE, U_ZERO_ERROR))
+ expected4MBCS, sizeof(expected4MBCS), "IBM-eucJP", offsets4MBCS, TRUE, U_ZERO_ERROR))
log_err("u-> euc-jp [UCNV_MBCS] \n");
if(!convertFromU(sampleText4MBCS, sizeof(sampleText4MBCS)/sizeof(sampleText4MBCS[0]),
- expected4MBCS, sizeof(expected4MBCS), "euc-jp", offsets4MBCS, FALSE, U_ZERO_ERROR))
+ expected4MBCS, sizeof(expected4MBCS), "IBM-eucJP", offsets4MBCS, FALSE, U_ZERO_ERROR))
log_err("u-> euc-jp [UCNV_MBCS] \n");
}
@@ -475,9 +475,15 @@
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
expectedSUB, sizeof(expectedSUB), "iso-2022-jp", offsets, TRUE, U_ZERO_ERROR))
log_err("u-> iso-2022-jp [UCNV_MBCS] \n");
+ // Google Patch: Change expected result code from U_AMBIGUOUS_ALIAS_WARNING to U_ZERO_ERROR.
+ // Introduced with ICU 51.1.
+ // Markus says this warning can occur when the set of available converters is changed,
+ // and that it's not worth looking into in further detail.
+ // Note: public ICU was U_ZERO_ERROR prior to ICU 51.
if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
expected, sizeof(expected), "iso-2022-jp", offsets, FALSE, U_ZERO_ERROR))
- log_err("u-> ibm-1363 [UCNV_MBCS] \n");
+ log_err("u-> iso-2022-jp [UCNV_MBCS] \n");
+ // End of Google Patch.
if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
expected2, sizeof(expected2), "iso-2022-jp", offsets2, TRUE, U_ZERO_ERROR))
@@ -654,10 +660,10 @@
const UChar expected[] = { 0x00a1 };
if(!convertToU(sampleText, sizeof(sampleText),
- expected, sizeof(expected)/sizeof(expected[0]), "ibm-1363", 0, TRUE, U_ZERO_ERROR ))
+ expected, sizeof(expected)/sizeof(expected[0]), "ibm-1363", 0, TRUE, U_AMBIGUOUS_ALIAS_WARNING ))
log_err("DBCS (ibm-1363)->Unicode did not match.\n");
if(!convertToU(sampleText, sizeof(sampleText),
- expected, sizeof(expected)/sizeof(expected[0]), "ibm-1363", 0, FALSE, U_ZERO_ERROR ))
+ expected, sizeof(expected)/sizeof(expected[0]), "ibm-1363", 0, FALSE, U_AMBIGUOUS_ALIAS_WARNING ))
log_err("DBCS (ibm-1363)->Unicode with flush = false did not match.\n");
}
log_verbose("Testing error conditions for SBCS\n");
diff --git a/test/cintltst/nucnvtst.c b/test/cintltst/nucnvtst.c
index 12e3c03..babf26a 100644
--- a/test/cintltst/nucnvtst.c
+++ b/test/cintltst/nucnvtst.c
@@ -1544,9 +1544,10 @@
const char* cnvName = ucnv_getName(cnv, &status);
if (strlen(cnvName) < 8 ||
strncmp(cnvName, "ISO_2022", 8) != 0) {
- TestAmbiguousConverter(cnv);
+ TestAmbiguousConverter(cnv);
}
/* END android-changed */
+ ucnv_close(cnv);
} else {
log_err("error: unable to open available converter \"%s\"\n", name);
status=U_ZERO_ERROR;
diff --git a/test/cintltst/spooftest.c b/test/cintltst/spooftest.c
index 75a8c66..7096ad2 100644
--- a/test/cintltst/spooftest.c
+++ b/test/cintltst/spooftest.c
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 2009-2012, International Business Machines Corporation and
+ * Copyright (c) 2009-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/********************************************************************************
@@ -408,10 +408,13 @@
TEST_ASSERT_SUCCESS(status);
uset_close(tmpSet);
- /* Latin Identifier should now fail; other non-latin test cases should still be OK */
+ /* Latin Identifier should now fail; other non-latin test cases should still be OK
+ * Note: fail of CHAR_LIMIT also causes the restriction level to be USPOOF_UNRESTRICTIVE
+ * which will give us a USPOOF_RESTRICTION_LEVEL failure.
+ */
checkResults = uspoof_check(sc, goodLatin, -1, NULL, &status);
TEST_ASSERT_SUCCESS(status);
- TEST_ASSERT_EQ(USPOOF_CHAR_LIMIT, checkResults);
+ TEST_ASSERT_EQ(USPOOF_CHAR_LIMIT | USPOOF_RESTRICTION_LEVEL, checkResults);
checkResults = uspoof_check(sc, goodGreek, -1, NULL, &status);
TEST_ASSERT_SUCCESS(status);
@@ -432,7 +435,7 @@
checkResults = uspoof_checkUTF8(sc, utf8buf, -1, &position, &status);
TEST_ASSERT_SUCCESS(status);
TEST_ASSERT_EQ(0, checkResults);
- TEST_ASSERT_EQ(666, position);
+ TEST_ASSERT_EQ(0, position);
u_strToUTF8(utf8buf, sizeof(utf8buf), NULL, goodCyrl, -1, &status);
TEST_ASSERT_SUCCESS(status);
@@ -446,7 +449,7 @@
checkResults = uspoof_checkUTF8(sc, utf8buf, -1, &position, &status);
TEST_ASSERT_SUCCESS(status);
TEST_ASSERT_EQ(USPOOF_MIXED_SCRIPT_CONFUSABLE | USPOOF_SINGLE_SCRIPT , checkResults);
- TEST_ASSERT_EQ(2, position);
+ TEST_ASSERT_EQ(0, position);
TEST_TEARDOWN;
diff --git a/test/cintltst/utf16tst.c b/test/cintltst/utf16tst.c
index 38b8fb5..50dbb17 100644
--- a/test/cintltst/utf16tst.c
+++ b/test/cintltst/utf16tst.c
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1998-2001, International Business Machines Corporation and
+ * Copyright (c) 1998-2012, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*
@@ -29,6 +29,7 @@
static void TestCharLength(void);
static void TestGetChar(void);
static void TestNextPrevChar(void);
+static void TestNulTerminated(void);
static void TestFwdBack(void);
static void TestSetChar(void);
static void TestAppendChar(void);
@@ -40,15 +41,16 @@
void
addUTF16Test(TestNode** root)
{
- addTest(root, &TestCodeUnitValues, "utf16tst/TestCodeUnitValues");
- addTest(root, &TestCharLength, "utf16tst/TestCharLength" );
- addTest(root, &TestGetChar, "utf16tst/TestGetChar" );
- addTest(root, &TestNextPrevChar, "utf16tst/TestNextPrevChar" );
- addTest(root, &TestFwdBack, "utf16tst/TestFwdBack" );
- addTest(root, &TestSetChar, "utf16tst/TestSetChar" );
- addTest(root, &TestAppendChar, "utf16tst/TestAppendChar" );
- addTest(root, &TestAppend, "utf16tst/TestAppend" );
- addTest(root, &TestSurrogate, "utf16tst/TestSurrogate" );
+ addTest(root, &TestCodeUnitValues, "utf16tst/TestCodeUnitValues");
+ addTest(root, &TestCharLength, "utf16tst/TestCharLength");
+ addTest(root, &TestGetChar, "utf16tst/TestGetChar");
+ addTest(root, &TestNextPrevChar, "utf16tst/TestNextPrevChar");
+ addTest(root, &TestNulTerminated, "utf16tst/TestNulTerminated");
+ addTest(root, &TestFwdBack, "utf16tst/TestFwdBack");
+ addTest(root, &TestSetChar, "utf16tst/TestSetChar");
+ addTest(root, &TestAppendChar, "utf16tst/TestAppendChar");
+ addTest(root, &TestAppend, "utf16tst/TestAppend");
+ addTest(root, &TestSurrogate, "utf16tst/TestSurrogate");
}
static void TestCodeUnitValues()
@@ -327,6 +329,72 @@
}
+/* keep this in sync with utf8tst.c's TestNulTerminated() */
+static void TestNulTerminated() {
+ static const UChar input[]={
+ /* 0 */ 0x61,
+ /* 1 */ 0xd801, 0xdc01,
+ /* 3 */ 0xdc01,
+ /* 4 */ 0x62,
+ /* 5 */ 0xd801,
+ /* 6 */ 0x00
+ /* 7 */
+ };
+ static const UChar32 result[]={
+ 0x61,
+ 0x10401,
+ 0xdc01,
+ 0x62,
+ 0xd801,
+ 0
+ };
+
+ UChar32 c, c2;
+ int32_t i0, i=0, j, k, expectedIndex;
+ int32_t cpIndex=0;
+ do {
+ i0=i;
+ U16_NEXT(input, i, -1, c);
+ if(c!=result[cpIndex]) {
+ log_err("U16_NEXT(from %d)=U+%04x != U+%04x\n", i0, c, result[cpIndex]);
+ }
+ j=i0;
+ U16_FWD_1(input, j, -1);
+ if(j!=i) {
+ log_err("U16_FWD_1() moved to index %d but U16_NEXT() moved to %d\n", j, i);
+ }
+ ++cpIndex;
+ /*
+ * Move by this many code points from the start.
+ * U16_FWD_N() stops at the end of the string, that is, at the NUL if necessary.
+ */
+ expectedIndex= (c==0) ? i-1 : i;
+ k=0;
+ U16_FWD_N(input, k, -1, cpIndex);
+ if(k!=expectedIndex) {
+ log_err("U16_FWD_N(code points from 0) moved to index %d but expected %d\n", k, expectedIndex);
+ }
+ } while(c!=0);
+
+ i=0;
+ do {
+ j=i0=i;
+ U16_NEXT(input, i, -1, c);
+ do {
+ U16_GET(input, 0, j, -1, c2);
+ if(c2!=c) {
+ log_err("U16_NEXT(from %d)=U+%04x != U+%04x=U16_GET(at %d)\n", i0, c, c2, j);
+ }
+ /* U16_SET_CP_LIMIT moves from a non-lead byte to the limit of the code point */
+ k=j+1;
+ U16_SET_CP_LIMIT(input, 0, k, -1);
+ if(k!=i) {
+ log_err("U16_NEXT() moved to %d but U16_SET_CP_LIMIT(%d) moved to %d\n", i, j+1, k);
+ }
+ } while(++j<i);
+ } while(c!=0);
+}
+
static void TestFwdBack(){
static UChar input[]={0x0061, 0xd800, 0xdc00, 0xdbff, 0xdfff, 0x0062, 0xd841, 0xd7ff, 0xd841, 0xdc41, 0xdc00, 0x0000};
static uint16_t fwd_unsafe[] ={1, 3, 5, 6, 8, 10, 11, 12};
diff --git a/test/cintltst/utf8tst.c b/test/cintltst/utf8tst.c
index 66c620f..88e1a09 100644
--- a/test/cintltst/utf8tst.c
+++ b/test/cintltst/utf8tst.c
@@ -64,6 +64,7 @@
static void TestCharLength(void);
static void TestGetChar(void);
static void TestNextPrevChar(void);
+static void TestNulTerminated(void);
static void TestNextPrevNonCharacters(void);
static void TestNextPrevCharUnsafe(void);
static void TestFwdBack(void);
@@ -83,6 +84,7 @@
addTest(root, &TestCharLength, "utf8tst/TestCharLength");
addTest(root, &TestGetChar, "utf8tst/TestGetChar");
addTest(root, &TestNextPrevChar, "utf8tst/TestNextPrevChar");
+ addTest(root, &TestNulTerminated, "utf8tst/TestNulTerminated");
addTest(root, &TestNextPrevNonCharacters, "utf8tst/TestNextPrevNonCharacters");
addTest(root, &TestNextPrevCharUnsafe, "utf8tst/TestNextPrevCharUnsafe");
addTest(root, &TestFwdBack, "utf8tst/TestFwdBack");
@@ -193,7 +195,7 @@
0x240, UTF8_ERROR_VALUE_1, UTF8_ERROR_VALUE_1
};
uint16_t i=0;
- UChar32 c;
+ UChar32 c, expected;
uint32_t offset=0;
for(offset=0; offset<sizeof(input); offset++) {
@@ -211,14 +213,22 @@
}
}
- U8_GET(input, 0, offset, sizeof(input), c);
- if(UTF_IS_ERROR(result[i+1]) ? c >= 0 : c != result[i+1]){
- log_err("ERROR: UTF8_GET_CHAR_SAFE failed for offset=%ld. Expected:%lx Got:%lx\n", offset, result[i+1], c);
+ UTF8_GET_CHAR_SAFE(input, 0, offset, sizeof(input), c, FALSE);
+ expected=result[i+1];
+ if(c != expected){
+ log_err("ERROR: UTF8_GET_CHAR_SAFE failed for offset=%ld. Expected:%lx Got:%lx\n", offset, expected, c);
}
- UTF8_GET_CHAR_SAFE(input, 0, offset, sizeof(input), c, FALSE);
- if(c != result[i+1]){
- log_err("ERROR: UTF8_GET_CHAR_SAFE failed for offset=%ld. Expected:%lx Got:%lx\n", offset, result[i+1], c);
+ U8_GET(input, 0, offset, sizeof(input), c);
+ if(UTF_IS_ERROR(expected)) { expected=U_SENTINEL; }
+ if(c != expected){
+ log_err("ERROR: U8_GET failed for offset=%ld. Expected:%lx Got:%lx\n", offset, expected, c);
+ }
+
+ U8_GET_OR_FFFD(input, 0, offset, sizeof(input), c);
+ if(expected<0) { expected=0xfffd; }
+ if(c != expected){
+ log_err("ERROR: U8_GET_OR_FFFD failed for offset=%ld. Expected:%lx Got:%lx\n", offset, expected, c);
}
UTF8_GET_CHAR_SAFE(input, 0, offset, sizeof(input), c, TRUE);
@@ -226,7 +236,7 @@
log_err("ERROR: UTF8_GET_CHAR_SAFE(strict) failed for offset=%ld. Expected:%lx Got:%lx\n", offset, result[i+2], c);
}
- i=(uint16_t)(i+3);
+ i=(uint16_t)(i+3);
}
}
@@ -272,7 +282,7 @@
};
/* TODO: remove unused columns for next_unsafe & prev_unsafe, and adjust the test code */
- UChar32 c=0x0000;
+ UChar32 c, expected;
uint32_t i=0;
uint32_t offset=0;
int32_t setOffset=0;
@@ -283,9 +293,10 @@
log_err("ERROR: UTF8_NEXT_CHAR_SAFE failed to move the offset correctly at %d\n ExpectedOffset:%d Got %d\n",
offset, movedOffset[i+1], setOffset);
}
- if(c != result[i+1]){
- log_err("ERROR: UTF8_NEXT_CHAR_SAFE failed for input=%ld. Expected:%lx Got:%lx\n", offset, result[i+1], c);
- }
+ expected=result[i+1];
+ if(c != expected){
+ log_err("ERROR: UTF8_NEXT_CHAR_SAFE failed for input=%ld. Expected:%lx Got:%lx\n", offset, expected, c);
+ }
setOffset=offset;
U8_NEXT(input, setOffset, sizeof(input), c);
@@ -293,9 +304,21 @@
log_err("ERROR: U8_NEXT failed to move the offset correctly at %d\n ExpectedOffset:%d Got %d\n",
offset, movedOffset[i+1], setOffset);
}
- if(UTF_IS_ERROR(result[i+1]) ? c >= 0 : c != result[i+1]){
- log_err("ERROR: U8_NEXT failed for input=%ld. Expected:%lx Got:%lx\n", offset, result[i+1], c);
- }
+ if(UTF_IS_ERROR(expected)) { expected=U_SENTINEL; }
+ if(c != expected){
+ log_err("ERROR: U8_NEXT failed for input=%ld. Expected:%lx Got:%lx\n", offset, expected, c);
+ }
+
+ setOffset=offset;
+ U8_NEXT_OR_FFFD(input, setOffset, sizeof(input), c);
+ if(setOffset != movedOffset[i+1]){
+ log_err("ERROR: U8_NEXT_OR_FFFD failed to move the offset correctly at %d\n ExpectedOffset:%d Got %d\n",
+ offset, movedOffset[i+1], setOffset);
+ }
+ if(expected<0) { expected=0xfffd; }
+ if(c != expected){
+ log_err("ERROR: U8_NEXT_OR_FFFD failed for input=%ld. Expected:%lx Got:%lx\n", offset, expected, c);
+ }
setOffset=offset;
UTF8_NEXT_CHAR_SAFE(input, setOffset, sizeof(input), c, TRUE);
@@ -318,9 +341,10 @@
log_err("ERROR: UTF8_PREV_CHAR_SAFE failed to move the offset correctly at %d\n ExpectedOffset:%d Got %d\n",
offset, movedOffset[i+4], setOffset);
}
- if(c != result[i+4]){
- log_err("ERROR: UTF8_PREV_CHAR_SAFE failed for input=%ld. Expected:%lx Got:%lx\n", offset, result[i+4], c);
- }
+ expected=result[i+4];
+ if(c != expected){
+ log_err("ERROR: UTF8_PREV_CHAR_SAFE failed for input=%ld. Expected:%lx Got:%lx\n", offset, expected, c);
+ }
setOffset=offset;
U8_PREV(input, 0, setOffset, c);
@@ -328,9 +352,21 @@
log_err("ERROR: U8_PREV failed to move the offset correctly at %d\n ExpectedOffset:%d Got %d\n",
offset, movedOffset[i+4], setOffset);
}
- if(UTF_IS_ERROR(result[i+4]) ? c >= 0 : c != result[i+4]){
- log_err("ERROR: U8_PREV failed for input=%ld. Expected:%lx Got:%lx\n", offset, result[i+4], c);
- }
+ if(UTF_IS_ERROR(expected)) { expected=U_SENTINEL; }
+ if(c != expected){
+ log_err("ERROR: U8_PREV failed for input=%ld. Expected:%lx Got:%lx\n", offset, expected, c);
+ }
+
+ setOffset=offset;
+ U8_PREV_OR_FFFD(input, 0, setOffset, c);
+ if(setOffset != movedOffset[i+4]){
+ log_err("ERROR: U8_PREV_OR_FFFD failed to move the offset correctly at %d\n ExpectedOffset:%d Got %d\n",
+ offset, movedOffset[i+4], setOffset);
+ }
+ if(expected<0) { expected=0xfffd; }
+ if(c != expected){
+ log_err("ERROR: U8_PREV_OR_FFFD failed for input=%ld. Expected:%lx Got:%lx\n", offset, expected, c);
+ }
setOffset=offset;
UTF8_PREV_CHAR_SAFE(input, 0, setOffset, c, TRUE);
@@ -346,6 +382,97 @@
}
}
+/* keep this in sync with utf16tst.c's TestNulTerminated() */
+static void TestNulTerminated() {
+ static const uint8_t input[]={
+ /* 0 */ 0x61,
+ /* 1 */ 0xf0, 0x90, 0x90, 0x81,
+ /* 5 */ 0xc0, 0x80,
+ /* 7 */ 0xdf, 0x80,
+ /* 9 */ 0xc2,
+ /* 10 */ 0x62,
+ /* 11 */ 0xfd, 0xbe,
+ /* 13 */ 0xe0, 0xa0, 0x80,
+ /* 16 */ 0xe2, 0x82, 0xac,
+ /* 19 */ 0xf0, 0x90, 0x90,
+ /* 22 */ 0x00
+ /* 23 */
+ };
+ static const UChar32 result[]={
+ 0x61,
+ 0x10401,
+ U_SENTINEL,
+ 0x7c0,
+ U_SENTINEL,
+ 0x62,
+ U_SENTINEL,
+ 0x800,
+ 0x20ac,
+ U_SENTINEL,
+ 0
+ };
+
+ UChar32 c, c2, expected;
+ int32_t i0, i=0, j, k, expectedIndex;
+ int32_t cpIndex=0;
+ do {
+ i0=i;
+ U8_NEXT(input, i, -1, c);
+ expected=result[cpIndex];
+ if(c!=expected) {
+ log_err("U8_NEXT(from %d)=U+%04x != U+%04x\n", i0, c, expected);
+ }
+ j=i0;
+ U8_NEXT_OR_FFFD(input, j, -1, c);
+ if(expected<0) { expected=0xfffd; }
+ if(c!=expected) {
+ log_err("U8_NEXT_OR_FFFD(from %d)=U+%04x != U+%04x\n", i0, c, expected);
+ }
+ if(j!=i) {
+ log_err("U8_NEXT_OR_FFFD() moved to index %d but U8_NEXT() moved to %d\n", j, i);
+ }
+ j=i0;
+ U8_FWD_1(input, j, -1);
+ if(j!=i) {
+ log_err("U8_FWD_1() moved to index %d but U8_NEXT() moved to %d\n", j, i);
+ }
+ ++cpIndex;
+ /*
+ * Move by this many code points from the start.
+ * U8_FWD_N() stops at the end of the string, that is, at the NUL if necessary.
+ */
+ expectedIndex= (c==0) ? i-1 : i;
+ k=0;
+ U8_FWD_N(input, k, -1, cpIndex);
+ if(k!=expectedIndex) {
+ log_err("U8_FWD_N(code points from 0) moved to index %d but expected %d\n", k, expectedIndex);
+ }
+ } while(c!=0);
+
+ i=0;
+ do {
+ j=i0=i;
+ U8_NEXT(input, i, -1, c);
+ do {
+ U8_GET(input, 0, j, -1, c2);
+ if(c2!=c) {
+ log_err("U8_NEXT(from %d)=U+%04x != U+%04x=U8_GET(at %d)\n", i0, c, c2, j);
+ }
+ U8_GET_OR_FFFD(input, 0, j, -1, c2);
+ expected= (c>=0) ? c : 0xfffd;
+ if(c2!=expected) {
+ log_err("U8_NEXT_OR_FFFD(from %d)=U+%04x != U+%04x=U8_GET_OR_FFFD(at %d)\n", i0, expected, c2, j);
+ }
+ /* U8_SET_CP_LIMIT moves from a non-lead byte to the limit of the code point */
+ k=j+1;
+ U8_SET_CP_LIMIT(input, 0, k, -1);
+ if(k!=i) {
+ log_err("U8_NEXT() moved to %d but U8_SET_CP_LIMIT(%d) moved to %d\n", i, j+1, k);
+ }
+ } while(++j<i);
+ } while(c!=0);
+}
+
static void TestNextPrevNonCharacters() {
/* test non-characters */
static const uint8_t nonChars[]={
diff --git a/test/depstest/dependencies.txt b/test/depstest/dependencies.txt
index a27cb18..b805259 100644
--- a/test/depstest/dependencies.txt
+++ b/test/depstest/dependencies.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2012, International Business Machines
+# Copyright (C) 2011-2013, International Business Machines
# Corporation and others. All Rights Reserved.
#
# file name: dependencies.txt
@@ -30,7 +30,7 @@
free malloc realloc
group: c_strings
- isspace
+ isspace isdigit
__ctype_b_loc # for <ctype.h>
# We must not use tolower and toupper because they are system-locale-sensitive (Turkish i).
strlen strchr strrchr strstr strcmp strncmp strcpy strncpy strcat strncat
@@ -46,7 +46,7 @@
__sprintf_chk
group: floating_point
- floor ceil modf fmod log pow sqrt
+ abs fabs floor ceil modf fmod log pow sqrt
group: trigonometry
acos asin atan atan2 cos sin tan
@@ -98,12 +98,16 @@
"operator delete(void*)"
# ICU also must not use the global operator new.
# "operator new[](unsigned long)"
+
# _Unwind_Resume is related to exceptions:
# "A call to this routine is inserted as the end of a landing pad that performs cleanup,
# but does not resume normal execution. It causes unwinding to proceed further."
# (Linux Standard Base Specification 1.3)
# Even though ICU does not actually use (nor handle) exceptions.
_Unwind_Resume
+ # std::terminate() looks similar to _Unwind_Resume:
+ # "Calls the current terminate handler."
+ std::terminate()
group: iostream
"std::basic_ios<char, std::char_traits<char> >::clear(std::_Ios_Iostate)"
@@ -134,7 +138,7 @@
uniset_core uniset_props uniset_closure usetiter uset uset_props
uiter
ucasemap ucasemap_titlecase_brkiter script_runs
- uprops ubidi_props ucase uscript
+ uprops ubidi_props ucase uscript uscript_props
ubidi ushape
listformatter
resourcebundle service_registration resbund_cnv ures_cnv icudataver ucat
@@ -341,6 +345,11 @@
deps
propname resourcebundle
+group: uscript_props # script metadata properties
+ uscript_props.o
+ deps
+ unistr_core platform
+
group: uprops
uprops.o
deps
@@ -740,11 +749,18 @@
library: i18n
deps
- localedata genderinfo charset_detector spoof_detection
+ region localedata genderinfo charset_detector spoof_detection
alphabetic_index collation formatting formattable_cnv regex regex_cnv translit
universal_time_scale
uclean_i18n
+group: region
+ region.o
+ deps
+ formatting # Temporary, TODO: Ticket #9982 class Region should use low-level ASCII-integer functions, and probably be moved to the common library.
+ resourcebundle
+ uvector uclean_i18n
+
group: localedata
ulocdata.o
deps
@@ -765,6 +781,7 @@
group: spoof_detection
uspoof.o uspoof_build.o uspoof_conf.o uspoof_impl.o uspoof_wsconf.o
+ identifier_info.o scriptset.o
deps
uniset_props regex unorm uscript
@@ -775,9 +792,9 @@
uclean_i18n
group: collation
- bocsu.o coleitr.o coll.o colldata.o sortkey.o tblcoll.o ucol.o
+ bocsu.o coleitr.o coll.o sortkey.o tblcoll.o ucol.o
ucol_bld.o ucol_cnt.o ucol_elm.o ucol_res.o ucol_sit.o ucol_tok.o ucol_wgt.o ucoleitr.o
- bms.o bmsearch.o search.o stsearch.o usearch.o
+ search.o stsearch.o usearch.o
deps
common # TODO: Could be narrower.
uclean_i18n
@@ -791,14 +808,14 @@
# currencyformat
curramt.o currfmt.o currpinf.o currunit.o
# decimalformat
- dcfmtsym.o decfmtst.o decimfmt.o
+ dcfmtsym.o decfmtst.o decimfmt.o compactdecimalformat.o
numfmt.o numsys.o unum.o winnmfmt.o
# rbnf
nfrs.o nfrule.o nfsubs.o rbnf.o
# measureformat
measfmt.o
# dateformat
- astro.o buddhcal.o calendar.o cecal.o chnsecal.o coptccal.o ethpccal.o
+ astro.o buddhcal.o calendar.o cecal.o chnsecal.o coptccal.o dangical.o ethpccal.o
gregocal.o gregoimp.o hebrwcal.o indiancal.o islamcal.o japancal.o persncal.o taiwncal.o
ucal.o
basictz.o olsontz.o rbtz.o simpletz.o timezone.o tzrule.o tztrans.o
diff --git a/test/hdrtst/cxxfiles.txt b/test/hdrtst/cxxfiles.txt
index 12dd6ca..60c09cc 100644
--- a/test/hdrtst/cxxfiles.txt
+++ b/test/hdrtst/cxxfiles.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2001-2012 International Business Machines
+# Copyright (c) 2001-2013 International Business Machines
# Corporation and others. All Rights Reserved.
# Begin temporary addition.
# These are very bad "C" APIs that do not work with a C compiler and
@@ -41,6 +41,7 @@
dtfmtsym.h
dtptngen.h
dtrule.h
+enumset.h
errorcode.h
fieldpos.h
fmtable.h
@@ -68,6 +69,7 @@
rbnf.h
rbtz.h
regex.h
+region.h
rep.h
resbund.h
schriter.h
diff --git a/test/intltest/Makefile.in b/test/intltest/Makefile.in
index 099f9e1..b866730 100644
--- a/test/intltest/Makefile.in
+++ b/test/intltest/Makefile.in
@@ -1,6 +1,6 @@
#******************************************************************************
#
-# Copyright (C) 1999-2012, International Business Machines
+# Copyright (C) 1999-2013, International Business Machines
# Corporation and others. All Rights Reserved.
#
#******************************************************************************
@@ -37,7 +37,7 @@
LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M) $(LIB_THREAD)
OBJECTS = aliastst.o allcoll.o apicoll.o astrotst.o callimts.o calregts.o caltest.o \
-caltztst.o canittst.o citrtest.o cntabcol.o convtest.o currcoll.o \
+caltztst.o canittst.o citrtest.o cntabcol.o colldata.o convtest.o currcoll.o \
fldset.o dadrfmt.o dadrcal.o dadrcoll.o dcfmapts.o decoll.o dtfmapts.o dtfmrgts.o dtfmtrtts.o dtfmttst.o \
dtptngts.o encoll.o escoll.o ficoll.o frcoll.o g7coll.o intltest.o \
itercoll.o itformat.o itmajor.o itutil.o jacoll.o lcukocol.o \
@@ -55,7 +55,7 @@
uobjtest.o idnaref.o idnaconf.o nptrans.o punyref.o testidn.o testidna.o uts46test.o \
incaltst.o calcasts.o v32test.o uvectest.o textfile.o tokiter.o utxttest.o \
windttst.o winnmtst.o winutil.o csdetest.o tzrulets.o tzoffloc.o tzfmttst.o ssearch.o dtifmtts.o \
-tufmtts.o itspoof.o simplethread.o bidiconf.o locnmtst.o dcfmtest.o alphaindextst.o listformattertest.o genderinfotest.o
+tufmtts.o itspoof.o simplethread.o bidiconf.o locnmtst.o dcfmtest.o alphaindextst.o listformattertest.o genderinfotest.o compactdecimalformattest.o regiontst.o
DEPS = $(OBJECTS:.o=.d)
diff --git a/test/intltest/calcasts.cpp b/test/intltest/calcasts.cpp
index d471982..2bf264e 100644
--- a/test/intltest/calcasts.cpp
+++ b/test/intltest/calcasts.cpp
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 2003-2011, International Business Machines Corporation
+ * Copyright (c) 2003-2013, International Business Machines Corporation
* and others. All Rights Reserved.
********************************************************************
* Calendar Case Test is a type of CalendarTest which compares the
@@ -169,9 +169,9 @@
doTestCases(tests, c);
static const UChar expectedUChars[] = {
- 0x0627, 0x0644, 0x062e, 0x0645, 0x064a, 0x0633, 0x060c, 0x0020, 0x0662, 0x0662,
- 0x0020, 0x0634, 0x0648, 0x0627, 0x0644, 0x0020, 0x0661, 0x0663, 0x0668, 0x0669, 0
- };
+ 0x0627, 0x0644, 0x062e, 0x0645, 0x064a, 0x0633, 0x060c, 0x0020, 0x0662, 0x0662, 0x0020,
+ 0x0634, 0x0648, 0x0627, 0x0644, 0x0020, 0x0661, 0x0663, 0x0668, 0x0669, 0x0020, 0x0647, 0x0640, 0
+ };
UnicodeString result;
DateFormat *fmt = DateFormat::createDateInstance(DateFormat::kFull, Locale("ar_JO@calendar=islamic-civil"));
if (fmt == NULL) {
diff --git a/test/intltest/callimts.cpp b/test/intltest/callimts.cpp
index 6a2dd9e..d53f363 100644
--- a/test/intltest/callimts.cpp
+++ b/test/intltest/callimts.cpp
@@ -1,6 +1,6 @@
/***********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2011, International Business Machines Corporation
+ * Copyright (c) 1997-2013, International Business Machines Corporation
* and others. All Rights Reserved.
***********************************************************************/
@@ -159,6 +159,7 @@
{"islamic", FALSE, DEFAULT_START, 800000}, // Approx. 2250 years from now, after which some rounding errors occur in Islamic calendar
{"hebrew", TRUE, DEFAULT_START, DEFAULT_END},
{"chinese", TRUE, DEFAULT_START, DEFAULT_END},
+ {"dangi", TRUE, DEFAULT_START, DEFAULT_END},
{"indian", FALSE, DEFAULT_START, DEFAULT_END},
{"coptic", FALSE, DEFAULT_START, DEFAULT_END},
{"ethiopic", FALSE, DEFAULT_START, DEFAULT_END},
@@ -338,7 +339,8 @@
logln((UnicodeString)"(" + i + " days)");
mark += 5000; // 5 sec
}
- cal.setTime(greg.getTime(status), status);
+ UDate testMillis = greg.getTime(status);
+ cal.setTime(testMillis, status);
cal.setMinimalDaysInFirstWeek(1);
if (failure(status, "Calendar set/getTime")) {
return;
@@ -385,12 +387,23 @@
", actual_max=" + maxActual);
}
if (v < minActual || v > maxActual) {
- errln((UnicodeString)"Fail: [" + cal.getType() + "] " +
- ymdToString(cal, ymd) +
- " " + FIELD_NAME[f] + "(" + f + ")=" + v +
- ", actual range=" + minActual + ".." + maxActual +
- ", allowed=(" + minLow + ".." + minHigh + ")..(" +
- maxLow + ".." + maxHigh + ")");
+ // timebomb per #9967, fix with #9972
+ if ( isICUVersionBefore(52,0,2) && uprv_strcmp(cal.getType(), "dangi") == 0 &&
+ testMillis >= 1865635198000.0 ) { // Feb 2029 gregorian, end of dangi 4361
+ logln((UnicodeString)"Fail: [" + cal.getType() + "] " +
+ ymdToString(cal, ymd) +
+ " " + FIELD_NAME[f] + "(" + f + ")=" + v +
+ ", actual=" + minActual + ".." + maxActual +
+ ", allowed=(" + minLow + ".." + minHigh + ")..(" +
+ maxLow + ".." + maxHigh + ")");
+ } else {
+ errln((UnicodeString)"Fail: [" + cal.getType() + "] " +
+ ymdToString(cal, ymd) +
+ " " + FIELD_NAME[f] + "(" + f + ")=" + v +
+ ", actual=" + minActual + ".." + maxActual +
+ ", allowed=(" + minLow + ".." + minHigh + ")..(" +
+ maxLow + ".." + maxHigh + ")");
+ }
}
}
greg.add(UCAL_DAY_OF_YEAR, 1, status);
@@ -449,7 +462,11 @@
+ "/" + (cal.get(UCAL_MONTH, status) + 1)
+ (cal.get(UCAL_IS_LEAP_MONTH, status) == 1 ? "(leap)" : "")
+ "/" + cal.get(UCAL_DATE, status)
- + ", time=" + cal.getTime(status));
+ + " " + cal.get(UCAL_HOUR_OF_DAY, status)
+ + ":" + cal.get(UCAL_MINUTE, status)
+ + " zone(hrs) " + cal.get(UCAL_ZONE_OFFSET, status)/(60.0*60.0*1000.0)
+ + " dst(hrs) " + cal.get(UCAL_DST_OFFSET, status)/(60.0*60.0*1000.0)
+ + ", time(millis)=" + cal.getTime(status));
return str;
}
diff --git a/test/intltest/calregts.cpp b/test/intltest/calregts.cpp
index e92b1b6..36564b1 100644
--- a/test/intltest/calregts.cpp
+++ b/test/intltest/calregts.cpp
@@ -590,7 +590,7 @@
if (dow < min || dow > max)
errln("FAIL: Day of week %d out of range [%d,%d]\n", dow, min, max);
if (dow != UCAL_SUNDAY)
- errln("FAIL: Day of week should be SUNDAY Got " + dow);
+ errln(UnicodeString("FAIL: Day of week should be SUNDAY Got ") + dow);
if(U_FAILURE(status)) {
errln("Error checking Calendar: %s", u_errorName(status));
@@ -844,7 +844,7 @@
}
int32_t dow = a->get(UCAL_DAY_OF_WEEK, status);
if (dow != UCAL_THURSDAY)
- errln("Fail: Want THURSDAY Got " + dow);
+ errln(UnicodeString("Fail: Want THURSDAY Got ") + dow);
delete a;
}
@@ -1722,7 +1722,7 @@
UnicodeString temp;
errln("test failed with zone " + zones[i]->getID(temp));
errln(" cutover date is Date(Long.MAX_VALUE)");
- errln(" isLeapYear(100) returns: " + is100Leap);
+ errln(UnicodeString(" isLeapYear(100) returns: ") + is100Leap);
}
delete calendar;
}
diff --git a/test/intltest/caltest.cpp b/test/intltest/caltest.cpp
index 3679081..5795160 100644
--- a/test/intltest/caltest.cpp
+++ b/test/intltest/caltest.cpp
@@ -421,11 +421,11 @@
for (i=0; i<UCAL_FIELD_COUNT; ++i)
{
if (cal->getMinimum((UCalendarDateFields)i) > cal->getGreatestMinimum((UCalendarDateFields)i))
- errln("FAIL: getMinimum larger than getGreatestMinimum for field " + i);
+ errln(UnicodeString("FAIL: getMinimum larger than getGreatestMinimum for field ") + i);
if (cal->getLeastMaximum((UCalendarDateFields)i) > cal->getMaximum((UCalendarDateFields)i))
- errln("FAIL: getLeastMaximum larger than getMaximum for field " + i);
+ errln(UnicodeString("FAIL: getLeastMaximum larger than getMaximum for field ") + i);
if (cal->getMinimum((UCalendarDateFields)i) >= cal->getMaximum((UCalendarDateFields)i))
- errln("FAIL: getMinimum not less than getMaximum for field " + i);
+ errln(UnicodeString("FAIL: getMinimum not less than getMaximum for field ") + i);
}
cal->adoptTimeZone(TimeZone::createDefault());
diff --git a/test/intltest/canittst.cpp b/test/intltest/canittst.cpp
index fe85b1f..5fe7c17 100644
--- a/test/intltest/canittst.cpp
+++ b/test/intltest/canittst.cpp
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 2002-2011, International Business Machines Corporation and
+ * Copyright (c) 2002-2012, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************
*
@@ -163,7 +163,7 @@
//logln(++counter + ": " + hex.transliterate(result));
//logln(" = " + name.transliterate(result));
}
- expectEqual(i + ": ", testStr, collectionToString(set), CharsToUnicodeString(testArray[i][1]));
+ expectEqual(i + UnicodeString(": "), testStr, collectionToString(set), CharsToUnicodeString(testArray[i][1]));
}
} else {
diff --git a/i18n/colldata.cpp b/test/intltest/colldata.cpp
similarity index 62%
rename from i18n/colldata.cpp
rename to test/intltest/colldata.cpp
index 875aa9d..2f561c6 100644
--- a/i18n/colldata.cpp
+++ b/test/intltest/colldata.cpp
@@ -10,7 +10,6 @@
#if !UCONFIG_NO_COLLATION
#include "unicode/unistr.h"
-#include "unicode/putil.h"
#include "unicode/usearch.h"
#include "cmemory.h"
@@ -26,27 +25,16 @@
#include "unicode/ustring.h"
#include "hash.h"
#include "uhash.h"
-#include "ucln_in.h"
#include "ucol_imp.h"
-#include "umutex.h"
#include "uassert.h"
-#include "unicode/colldata.h"
-
-U_NAMESPACE_BEGIN
+#include "colldata.h"
#define ARRAY_SIZE(array) (sizeof(array)/sizeof(array[0]))
#define NEW_ARRAY(type, count) (type *) uprv_malloc((count) * sizeof(type))
#define DELETE_ARRAY(array) uprv_free((void *) (array))
#define ARRAY_COPY(dst, src, count) uprv_memcpy((void *) (dst), (void *) (src), (count) * sizeof (src)[0])
-UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CEList)
-
-#ifdef INSTRUMENT_CELIST
-int32_t CEList::_active = 0;
-int32_t CEList::_histogram[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-#endif
-
CEList::CEList(UCollator *coll, const UnicodeString &string, UErrorCode &status)
: ces(NULL), listMax(CELIST_BUFFER_SIZE), listSize(0)
{
@@ -78,11 +66,6 @@
strengthMask |= UCOL_PRIMARYORDERMASK;
}
-#ifdef INSTRUMENT_CELIST
- _active += 1;
- _histogram[0] += 1;
-#endif
-
ces = ceBuffer;
while ((order = ucol_next(elems, &status)) != UCOL_NULLORDER) {
@@ -114,10 +97,6 @@
CEList::~CEList()
{
-#ifdef INSTRUMENT_CELIST
- _active -= 1;
-#endif
-
if (ces != ceBuffer) {
DELETE_ARRAY(ces);
}
@@ -131,11 +110,6 @@
if (listSize >= listMax) {
int32_t newMax = listMax + CELIST_BUFFER_SIZE;
-
-#ifdef INSTRUMENT_CELIST
- _histogram[listSize / CELIST_BUFFER_SIZE] += 1;
-#endif
-
uint32_t *newCEs = NEW_ARRAY(uint32_t, newMax);
if (newCEs == NULL) {
@@ -190,14 +164,6 @@
return listSize;
}
-UOBJECT_DEFINE_RTTI_IMPLEMENTATION(StringList)
-
-#ifdef INSTRUMENT_STRING_LIST
-int32_t StringList::_lists = 0;
-int32_t StringList::_strings = 0;
-int32_t StringList::_histogram[101] = {0};
-#endif
-
StringList::StringList(UErrorCode &status)
: strings(NULL), listMax(STRING_LIST_BUFFER_SIZE), listSize(0)
{
@@ -211,11 +177,6 @@
status = U_MEMORY_ALLOCATION_ERROR;
return;
}
-
-#ifdef INSTRUMENT_STRING_LIST
- _lists += 1;
- _histogram[0] += 1;
-#endif
}
StringList::~StringList()
@@ -228,11 +189,6 @@
if (U_FAILURE(status)) {
return;
}
-
-#ifdef INSTRUMENT_STRING_LIST
- _strings += 1;
-#endif
-
if (listSize >= listMax) {
int32_t newMax = listMax + STRING_LIST_BUFFER_SIZE;
UnicodeString *newStrings = new UnicodeString[newMax];
@@ -243,17 +199,6 @@
for (int32_t i=0; i<listSize; ++i) {
newStrings[i] = strings[i];
}
-
-#ifdef INSTRUMENT_STRING_LIST
- int32_t _h = listSize / STRING_LIST_BUFFER_SIZE;
-
- if (_h > 100) {
- _h = 100;
- }
-
- _histogram[_h] += 1;
-#endif
-
delete[] strings;
strings = newStrings;
listMax = newMax;
@@ -295,38 +240,11 @@
delete strings;
}
-static void U_CALLCONV
-deleteCEList(void *obj)
-{
- CEList *list = (CEList *) obj;
-
- delete list;
-}
-
-static void U_CALLCONV
-deleteUnicodeStringKey(void *obj)
-{
- UnicodeString *key = (UnicodeString *) obj;
-
- delete key;
-}
-
-static void U_CALLCONV
-deleteChars(void * /*obj*/)
-{
- // char *chars = (char *) obj;
- // All the key strings are owned by the
- // CollData objects and don't need to
- // be freed here.
- //DELETE_ARRAY(chars);
-}
-
U_CDECL_END
-class CEToStringsMap : public UMemory
+class CEToStringsMap
{
public:
-
CEToStringsMap(UErrorCode &status);
~CEToStringsMap();
@@ -334,7 +252,6 @@
StringList *getStringList(uint32_t ce) const;
private:
-
void putStringList(uint32_t ce, StringList *stringList, UErrorCode &status);
UHashtable *map;
};
@@ -390,260 +307,10 @@
uhash_iput(map, ce, (void *) stringList, &status);
}
-class StringToCEsMap : public UMemory
-{
-public:
- StringToCEsMap(UErrorCode &status);
- ~StringToCEsMap();
-
- void put(const UnicodeString *string, const CEList *ces, UErrorCode &status);
- const CEList *get(const UnicodeString *string);
- void free(const CEList *list);
-
-private:
-
-
- UHashtable *map;
-};
-
-StringToCEsMap::StringToCEsMap(UErrorCode &status)
- : map(NULL)
-{
- if (U_FAILURE(status)) {
- return;
- }
-
- map = uhash_open(uhash_hashUnicodeString,
- uhash_compareUnicodeString,
- uhash_compareLong,
- &status);
-
- if (U_FAILURE(status)) {
- return;
- }
-
- uhash_setValueDeleter(map, deleteCEList);
- uhash_setKeyDeleter(map, deleteUnicodeStringKey);
-}
-
-StringToCEsMap::~StringToCEsMap()
-{
- uhash_close(map);
-}
-
-void StringToCEsMap::put(const UnicodeString *string, const CEList *ces, UErrorCode &status)
-{
- uhash_put(map, (void *) string, (void *) ces, &status);
-}
-
-const CEList *StringToCEsMap::get(const UnicodeString *string)
-{
- return (const CEList *) uhash_get(map, string);
-}
-
-class CollDataCacheEntry : public UMemory
-{
-public:
- CollDataCacheEntry(CollData *theData);
- ~CollDataCacheEntry();
-
- CollData *data;
- int32_t refCount;
-};
-
-CollDataCacheEntry::CollDataCacheEntry(CollData *theData)
- : data(theData), refCount(1)
-{
- // nothing else to do
-}
-
-CollDataCacheEntry::~CollDataCacheEntry()
-{
- // check refCount?
- delete data;
-}
-
-class CollDataCache : public UMemory
-{
-public:
- CollDataCache(UErrorCode &status);
- ~CollDataCache();
-
- CollData *get(UCollator *collator, UErrorCode &status);
- void unref(CollData *collData);
-
- void flush();
-
-private:
- static char *getKey(UCollator *collator, char *keyBuffer, int32_t *charBufferLength);
- static void deleteKey(char *key);
-
- UHashtable *cache;
-};
-static UMutex lock = U_MUTEX_INITIALIZER;
-
-U_CDECL_BEGIN
-static void U_CALLCONV
-deleteCollDataCacheEntry(void *obj)
-{
- CollDataCacheEntry *entry = (CollDataCacheEntry *) obj;
-
- delete entry;
-}
-U_CDECL_END
-
-CollDataCache::CollDataCache(UErrorCode &status)
- : cache(NULL)
-{
- if (U_FAILURE(status)) {
- return;
- }
-
- cache = uhash_open(uhash_hashChars, uhash_compareChars, uhash_compareLong, &status);
-
- if (U_FAILURE(status)) {
- return;
- }
-
- uhash_setValueDeleter(cache, deleteCollDataCacheEntry);
- uhash_setKeyDeleter(cache, deleteChars);
-}
-
-CollDataCache::~CollDataCache()
-{
- umtx_lock(&lock);
- uhash_close(cache);
- cache = NULL;
- umtx_unlock(&lock);
-}
-
-CollData *CollDataCache::get(UCollator *collator, UErrorCode &status)
-{
- char keyBuffer[KEY_BUFFER_SIZE];
- int32_t keyLength = KEY_BUFFER_SIZE;
- char *key = getKey(collator, keyBuffer, &keyLength);
- CollData *result = NULL, *newData = NULL;
- CollDataCacheEntry *entry = NULL, *newEntry = NULL;
-
- umtx_lock(&lock);
- entry = (CollDataCacheEntry *) uhash_get(cache, key);
-
- if (entry == NULL) {
- umtx_unlock(&lock);
-
- newData = new CollData(collator, key, keyLength, status);
- newEntry = new CollDataCacheEntry(newData);
-
- if (U_FAILURE(status) || newData == NULL || newEntry == NULL) {
- status = U_MEMORY_ALLOCATION_ERROR;
- return NULL;
- }
-
- umtx_lock(&lock);
- entry = (CollDataCacheEntry *) uhash_get(cache, key);
-
- if (entry == NULL) {
- uhash_put(cache, newData->key, newEntry, &status);
- umtx_unlock(&lock);
-
- if (U_FAILURE(status)) {
- delete newEntry;
- delete newData;
-
- return NULL;
- }
-
- return newData;
- }
- }
-
- result = entry->data;
- entry->refCount += 1;
- umtx_unlock(&lock);
-
- if (key != keyBuffer) {
- deleteKey(key);
- }
-
- if (newEntry != NULL) {
- delete newEntry;
- delete newData;
- }
-
- return result;
-}
-
-void CollDataCache::unref(CollData *collData)
-{
- CollDataCacheEntry *entry = NULL;
-
- umtx_lock(&lock);
- entry = (CollDataCacheEntry *) uhash_get(cache, collData->key);
-
- if (entry != NULL) {
- entry->refCount -= 1;
- }
- umtx_unlock(&lock);
-}
-
-char *CollDataCache::getKey(UCollator *collator, char *keyBuffer, int32_t *keyBufferLength)
-{
- UErrorCode status = U_ZERO_ERROR;
- int32_t len = ucol_getShortDefinitionString(collator, NULL, keyBuffer, *keyBufferLength, &status);
-
- if (len >= *keyBufferLength) {
- *keyBufferLength = (len + 2) & ~1; // round to even length, leaving room for terminating null
- keyBuffer = NEW_ARRAY(char, *keyBufferLength);
- status = U_ZERO_ERROR;
-
- len = ucol_getShortDefinitionString(collator, NULL, keyBuffer, *keyBufferLength, &status);
- }
-
- keyBuffer[len] = '\0';
-
- return keyBuffer;
-}
-
-void CollDataCache::flush()
-{
- const UHashElement *element;
- int32_t pos = -1;
-
- umtx_lock(&lock);
- while ((element = uhash_nextElement(cache, &pos)) != NULL) {
- CollDataCacheEntry *entry = (CollDataCacheEntry *) element->value.pointer;
-
- if (entry->refCount <= 0) {
- uhash_removeElement(cache, element);
- }
- }
- umtx_unlock(&lock);
-}
-
-void CollDataCache::deleteKey(char *key)
-{
- DELETE_ARRAY(key);
-}
-
-U_CDECL_BEGIN
-static UBool coll_data_cleanup(void) {
- CollData::freeCollDataCache();
- return TRUE;
-}
-U_CDECL_END
-
-UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CollData)
-
-CollData::CollData()
-{
- // nothing
-}
-
#define CLONE_COLLATOR
-//#define CACHE_CELISTS
-CollData::CollData(UCollator *collator, char *cacheKey, int32_t cacheKeyLength, UErrorCode &status)
- : coll(NULL), charsToCEList(NULL), ceToCharsStartingWith(NULL), key(NULL)
+CollData::CollData(UCollator *collator, UErrorCode &status)
+ : coll(NULL), ceToCharsStartingWith(NULL)
{
// [:c:] == [[:cn:][:cc:][:co:][:cf:][:cs:]]
// i.e. other, control, private use, format, surrogate
@@ -665,35 +332,12 @@
USet *contractions = uset_openEmpty();
int32_t itemCount;
-#ifdef CACHE_CELISTS
- charsToCEList = new StringToCEsMap(status);
-
- if (U_FAILURE(status)) {
- goto bail;
- }
-#else
- charsToCEList = NULL;
-#endif
-
ceToCharsStartingWith = new CEToStringsMap(status);
if (U_FAILURE(status)) {
goto bail;
}
- if (cacheKeyLength > KEY_BUFFER_SIZE) {
- key = NEW_ARRAY(char, cacheKeyLength);
-
- if (key == NULL) {
- status = U_MEMORY_ALLOCATION_ERROR;
- goto bail;
- }
- } else {
- key = keyBuffer;
- }
-
- ARRAY_COPY(key, cacheKey, cacheKeyLength);
-
#ifdef CLONE_COLLATOR
coll = ucol_safeClone(collator, NULL, NULL, &status);
@@ -730,12 +374,8 @@
ceToCharsStartingWith->put(ceList->get(0), st, status);
-#ifdef CACHE_CELISTS
- charsToCEList->put(st, ceList, status);
-#else
delete ceList;
delete st;
-#endif
}
} else if (len > 0) {
UnicodeString *st = new UnicodeString(buffer, len);
@@ -749,12 +389,8 @@
ceToCharsStartingWith->put(ceList->get(0), st, status);
-#ifdef CACHE_CELISTS
- charsToCEList->put(st, ceList, status);
-#else
delete ceList;
delete st;
-#endif
} else {
// shouldn't happen...
}
@@ -821,15 +457,7 @@
ucol_close(coll);
#endif
- if (key != keyBuffer) {
- DELETE_ARRAY(key);
- }
-
delete ceToCharsStartingWith;
-
-#ifdef CACHE_CELISTS
- delete charsToCEList;
-#endif
}
UCollator *CollData::getCollator() const
@@ -844,9 +472,6 @@
const CEList *CollData::getCEList(const UnicodeString *string) const
{
-#ifdef CACHE_CELISTS
- return charsToCEList->get(string);
-#else
UErrorCode status = U_ZERO_ERROR;
const CEList *list = new CEList(coll, *string, status);
@@ -856,14 +481,11 @@
}
return list;
-#endif
}
void CollData::freeCEList(const CEList *list)
{
-#ifndef CACHE_CELISTS
delete list;
-#endif
}
int32_t CollData::minLengthInChars(const CEList *ceList, int32_t offset, int32_t *history) const
@@ -885,9 +507,6 @@
for (int32_t s = 0; s < stringCount; s += 1) {
const UnicodeString *string = strings->get(s);
-#ifdef CACHE_CELISTS
- const CEList *ceList2 = charsToCEList->get(string);
-#else
UErrorCode status = U_ZERO_ERROR;
const CEList *ceList2 = new CEList(coll, *string, status);
@@ -895,7 +514,6 @@
delete ceList2;
ceList2 = NULL;
}
-#endif
if (ceList->matchesAt(offset, ceList2)) {
U_ASSERT(ceList2 != NULL);
@@ -909,9 +527,8 @@
if (rlength <= 0) {
// delete before continue to avoid memory leak.
-#ifndef CACHE_CELISTS
delete ceList2;
-#endif
+
// ignore any dead ends
continue;
}
@@ -922,9 +539,7 @@
}
}
-#ifndef CACHE_CELISTS
delete ceList2;
-#endif
}
}
@@ -1020,89 +635,4 @@
return minLength;
}
-CollData *CollData::open(UCollator *collator, UErrorCode &status)
-{
- if (U_FAILURE(status)) {
- return NULL;
- }
-
- CollDataCache *cache = getCollDataCache();
-
- return cache->get(collator, status);
-}
-
-void CollData::close(CollData *collData)
-{
- CollDataCache *cache = getCollDataCache();
-
- cache->unref(collData);
-}
-
-CollDataCache *CollData::collDataCache = NULL;
-
-CollDataCache *CollData::getCollDataCache()
-{
- UErrorCode status = U_ZERO_ERROR;
- CollDataCache *cache = NULL;
-
- UMTX_CHECK(NULL, collDataCache, cache);
-
- if (cache == NULL) {
- cache = new CollDataCache(status);
-
- if (U_FAILURE(status)) {
- delete cache;
- return NULL;
- }
-
- umtx_lock(NULL);
- if (collDataCache == NULL) {
- collDataCache = cache;
-
- ucln_i18n_registerCleanup(UCLN_I18N_COLL_DATA, coll_data_cleanup);
- }
- umtx_unlock(NULL);
-
- if (collDataCache != cache) {
- delete cache;
- }
- }
-
- return collDataCache;
-}
-
-void CollData::freeCollDataCache()
-{
- CollDataCache *cache = NULL;
-
- UMTX_CHECK(NULL, collDataCache, cache);
-
- if (cache != NULL) {
- umtx_lock(NULL);
- if (collDataCache != NULL) {
- collDataCache = NULL;
- } else {
- cache = NULL;
- }
- umtx_unlock(NULL);
-
- delete cache;
- }
-}
-
-void CollData::flushCollDataCache()
-{
- CollDataCache *cache = NULL;
-
- UMTX_CHECK(NULL, collDataCache, cache);
-
- // **** this will fail if the another ****
- // **** thread deletes the cache here ****
- if (cache != NULL) {
- cache->flush();
- }
-}
-
-U_NAMESPACE_END
-
#endif // #if !UCONFIG_NO_COLLATION
diff --git a/i18n/unicode/colldata.h b/test/intltest/colldata.h
similarity index 61%
rename from i18n/unicode/colldata.h
rename to test/intltest/colldata.h
index d9153d0..980c047 100644
--- a/i18n/unicode/colldata.h
+++ b/test/intltest/colldata.h
@@ -7,10 +7,17 @@
/**
* \file
- * \brief C++ API: Collation data used to compute minLengthInChars.
+ * \brief Originally, added as C++ API for Collation data used to compute minLengthInChars
* \internal
*/
-
+
+/*
+ * Note: This module was incldued in ICU 4.0.1 as @internal technology preview for supporting
+ * Boyer-Moore string search API. For now, only SSearchTest depends on this module. I temporaly
+ * moved the module from i18n directory to intltest, because we have no plan to publish this
+ * as public API. (2012-12-18 yoshito)
+ */
+
#ifndef COLL_DATA_H
#define COLL_DATA_H
@@ -18,21 +25,11 @@
#if !UCONFIG_NO_COLLATION
-#include "unicode/uobject.h"
#include "unicode/ucol.h"
-
-U_NAMESPACE_BEGIN
-
-#ifndef U_HIDE_INTERNAL_API
-/**
- * The size of the internal buffer for the Collator's short description string.
- * @internal ICU 4.0.1 technology preview
- */
-#define KEY_BUFFER_SIZE 64
+#include "unicode/unistr.h"
/**
* The size of the internal CE buffer in a <code>CEList</code> object
- * @internal ICU 4.0.1 technology preview
*/
#define CELIST_BUFFER_SIZE 4
@@ -40,31 +37,21 @@
* \def INSTRUMENT_CELIST
* Define this to enable the <code>CEList</code> objects to collect
* statistics.
- * @internal ICU 4.0.1 technology preview
*/
-//#define INSTRUMENT_CELIST
/**
* The size of the initial list in a <code>StringList</code> object.
- * @internal ICU 4.0.1 technology preview
*/
#define STRING_LIST_BUFFER_SIZE 16
-/**
- * \def INSTRUMENT_STRING_LIST
- * Define this to enable the <code>StringList</code> objects to
- * collect statistics.
- * @internal ICU 4.0.1 technology preview
- */
-//#define INSTRUMENT_STRING_LIST
+U_NAMESPACE_USE
/**
* This object holds a list of CEs generated from a particular
* <code>UnicodeString</code>
*
- * @internal ICU 4.0.1 technology preview
*/
-class U_I18N_API CEList : public UObject
+class CEList
{
public:
/**
@@ -77,14 +64,11 @@
* Note: if on return, status is set to an error code,
* the only safe thing to do with this object is to call
* the destructor.
- *
- * @internal ICU 4.0.1 technology preview
*/
CEList(UCollator *coll, const UnicodeString &string, UErrorCode &status);
/**
* The destructor.
- * @internal ICU 4.0.1 technology preview
*/
~CEList();
@@ -92,8 +76,6 @@
* Return the number of CEs in the list.
*
* @return the number of CEs in the list.
- *
- * @internal ICU 4.0.1 technology preview
*/
int32_t size() const;
@@ -103,8 +85,6 @@
* @param index - the index of the CE to return
*
* @return the CE, or <code>0</code> if <code>index</code> is out of range
- *
- * @internal ICU 4.0.1 technology preview
*/
uint32_t get(int32_t index) const;
@@ -116,8 +96,6 @@
* @param other - the other <code>CEList</code>
*
* @return <code>TRUE</code> if the CEs match, <code>FALSE</code> otherwise.
- *
- * @internal ICU 4.0.1 technology preview
*/
UBool matchesAt(int32_t offset, const CEList *other) const;
@@ -127,22 +105,9 @@
* @param index - the index
*
* @return a reference to the given CE in the list
- *
- * @internal ICU 4.0.1 technology preview
*/
uint32_t &operator[](int32_t index) const;
- /**
- * UObject glue...
- * @internal ICU 4.0.1 technology preview
- */
- virtual UClassID getDynamicClassID() const;
- /**
- * UObject glue...
- * @internal ICU 4.0.1 technology preview
- */
- static UClassID getStaticClassID();
-
private:
void add(uint32_t ce, UErrorCode &status);
@@ -150,21 +115,14 @@
uint32_t *ces;
int32_t listMax;
int32_t listSize;
-
-#ifdef INSTRUMENT_CELIST
- static int32_t _active;
- static int32_t _histogram[10];
-#endif
};
/**
* StringList
*
* This object holds a list of <code>UnicodeString</code> objects.
- *
- * @internal ICU 4.0.1 technology preview
*/
-class U_I18N_API StringList : public UObject
+class StringList
{
public:
/**
@@ -175,15 +133,11 @@
* Note: if on return, status is set to an error code,
* the only safe thing to do with this object is to call
* the destructor.
- *
- * @internal ICU 4.0.1 technology preview
*/
StringList(UErrorCode &status);
/**
* The destructor.
- *
- * @internal ICU 4.0.1 technology preview
*/
~StringList();
@@ -192,8 +146,6 @@
*
* @param string - the string to add
* @param status - will be set if any errors occur.
- *
- * @internal ICU 4.0.1 technology preview
*/
void add(const UnicodeString *string, UErrorCode &status);
@@ -203,8 +155,6 @@
* @param chars - the address of the array of code points
* @param count - the number of code points in the array
* @param status - will be set if any errors occur.
- *
- * @internal ICU 4.0.1 technology preview
*/
void add(const UChar *chars, int32_t count, UErrorCode &status);
@@ -215,8 +165,6 @@
*
* @return a pointer to the <code>UnicodeString</code> or <code>NULL</code>
* if <code>index</code> is out of bounds.
- *
- * @internal ICU 4.0.1 technology preview
*/
const UnicodeString *get(int32_t index) const;
@@ -224,43 +172,22 @@
* Get the number of stings in the list.
*
* @return the number of strings in the list.
- *
- * @internal ICU 4.0.1 technology preview
*/
int32_t size() const;
- /**
- * the UObject glue...
- * @internal ICU 4.0.1 technology preview
- */
- virtual UClassID getDynamicClassID() const;
- /**
- * the UObject glue...
- * @internal ICU 4.0.1 technology preview
- */
- static UClassID getStaticClassID();
-
private:
UnicodeString *strings;
int32_t listMax;
int32_t listSize;
-
-#ifdef INSTRUMENT_STRING_LIST
- static int32_t _lists;
- static int32_t _strings;
- static int32_t _histogram[101];
-#endif
};
-#endif /* U_HIDE_INTERNAL_API */
+
/*
* Forward references to internal classes.
*/
class StringToCEsMap;
class CEToStringsMap;
-class CollDataCache;
-#ifndef U_HIDE_INTERNAL_API
/**
* CollData
*
@@ -276,10 +203,8 @@
* If you do not need to reuse any unreferenced objects in the cache, you can call
* <code>CollData::flushCollDataCache</code>. If you no longer need any <code>CollData</code>
* objects, you can call <code>CollData::freeCollDataCache</code>
- *
- * @internal ICU 4.0.1 technology preview
*/
-class U_I18N_API CollData : public UObject
+class CollData
{
public:
/**
@@ -287,32 +212,18 @@
*
* @param collator - the collator
* @param status - will be set if any errors occur.
- *
- * @return the <code>CollData</code> object. You must call
- * <code>close</code> when you are done using the object.
- *
- * Note: if on return, status is set to an error code,
- * the only safe thing to do with this object is to call
- * <code>CollData::close</code>.
- *
- * @internal ICU 4.0.1 technology preview
*/
- static CollData *open(UCollator *collator, UErrorCode &status);
+ CollData(UCollator *collator, UErrorCode &status);
/**
- * Release a <code>CollData</code> object.
- *
- * @param collData - the object
- *
- * @internal ICU 4.0.1 technology preview
+ * The destructor.
*/
- static void close(CollData *collData);
+ ~CollData();
/**
* Get the <code>UCollator</code> object used to create this object.
* The object returned may not be the exact object that was used to
* create this object, but it will have the same behavior.
- * @internal ICU 4.0.1 technology preview
*/
UCollator *getCollator() const;
@@ -325,8 +236,6 @@
* return a <code>StringList</code> object containing all
* the stirngs, or <code>NULL</code> if there are
* no such strings.
- *
- * @internal ICU 4.0.1 technology preview.
*/
const StringList *getStringList(int32_t ce) const;
@@ -338,8 +247,6 @@
* @return a <code>CEList</code> object containt the CEs. You
* must call <code>freeCEList</code> when you are finished
* using the <code>CEList</code>/
- *
- * @internal ICU 4.0.1 technology preview.
*/
const CEList *getCEList(const UnicodeString *string) const;
@@ -347,8 +254,6 @@
* Release a <code>CEList</code> returned by <code>getCEList</code>.
*
* @param list - the <code>CEList</code> to free.
- *
- * @internal ICU 4.0.1 technology preview
*/
void freeCEList(const CEList *list);
@@ -360,8 +265,6 @@
* @param offset - the offset of the first CE in the list to use.
*
* @return the length of the shortest string.
- *
- * @internal ICU 4.0.1 technology preview
*/
int32_t minLengthInChars(const CEList *ces, int32_t offset) const;
@@ -382,75 +285,18 @@
* the number of cEs in the <code>CEList</code>
*
* @return the length of the shortest string.
- *
- * @internal ICU 4.0.1 technology preview
*/
int32_t minLengthInChars(const CEList *ces, int32_t offset, int32_t *history) const;
- /**
- * UObject glue...
- * @internal ICU 4.0.1 technology preview
- */
- virtual UClassID getDynamicClassID() const;
- /**
- * UObject glue...
- * @internal ICU 4.0.1 technology preview
- */
- static UClassID getStaticClassID();
-
- /**
- * <code>CollData</code> objects are expensive to compute, and so
- * may be cached. This routine will free the cached objects and delete
- * the cache.
- *
- * WARNING: Don't call this until you are have called <code>close</code>
- * for each <code>CollData</code> object that you have used. also,
- * DO NOT call this if another thread may be calling <code>flushCollDataCache</code>
- * at the same time.
- *
- * @internal 4.0.1 technology preview
- */
- static void freeCollDataCache();
-
- /**
- * <code>CollData</code> objects are expensive to compute, and so
- * may be cached. This routine will remove any unused <code>CollData</code>
- * objects from the cache.
- *
- * @internal 4.0.1 technology preview
- */
- static void flushCollDataCache();
-
private:
- friend class CollDataCache;
- friend class CollDataCacheEntry;
-
- CollData(UCollator *collator, char *cacheKey, int32_t cachekeyLength, UErrorCode &status);
- ~CollData();
-
- CollData();
-
- static char *getCollatorKey(UCollator *collator, char *buffer, int32_t bufferLength);
-
- static CollDataCache *getCollDataCache();
-
UCollator *coll;
- StringToCEsMap *charsToCEList;
CEToStringsMap *ceToCharsStartingWith;
- char keyBuffer[KEY_BUFFER_SIZE];
- char *key;
-
- static CollDataCache *collDataCache;
-
uint32_t minHan;
uint32_t maxHan;
uint32_t jamoLimits[4];
};
-#endif /* U_HIDE_INTERNAL_API */
-
-U_NAMESPACE_END
#endif // #if !UCONFIG_NO_COLLATION
#endif // #ifndef COLL_DATA_H
diff --git a/test/intltest/compactdecimalformattest.cpp b/test/intltest/compactdecimalformattest.cpp
new file mode 100644
index 0000000..ffed2a2
--- /dev/null
+++ b/test/intltest/compactdecimalformattest.cpp
@@ -0,0 +1,348 @@
+/*
+*******************************************************************************
+* Copyright (C) 1997-2013, International Business Machines Corporation and *
+* others. All Rights Reserved. *
+*******************************************************************************
+*
+* File COMPACTDECIMALFORMATTEST.CPP
+*
+********************************************************************************
+*/
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "intltest.h"
+
+#if !UCONFIG_NO_FORMATTING
+
+#include "unicode/compactdecimalformat.h"
+#include "unicode/unum.h"
+
+#define LENGTHOF(array) (int32_t)(sizeof(array) / sizeof((array)[0]))
+
+typedef struct ExpectedResult {
+ double value;
+ const char *expected;
+} ExpectedResult;
+
+static const char *kShortStr = "Short";
+static const char *kLongStr = "Long";
+
+static ExpectedResult kEnglishShort[] = {
+ {0.0, "0.0"},
+ {0.17, "0.17"},
+ {1.0, "1"},
+ {1234.0, "1.2K"},
+ {12345.0, "12K"},
+ {123456.0, "120K"},
+ {1234567.0, "1.2M"},
+ {12345678.0, "12M"},
+ {123456789.0, "120M"},
+ {1.23456789E9, "1.2B"},
+ {1.23456789E10, "12B"},
+ {1.23456789E11, "120B"},
+ {1.23456789E12, "1.2T"},
+ {1.23456789E13, "12T"},
+ {1.23456789E14, "120T"},
+ {1.23456789E15, "1200T"}};
+
+static ExpectedResult kSerbianShort[] = {
+ {1234.0, "1200"},
+ {12345.0, "12K"},
+ {20789.0, "21\\u00a0\\u0445\\u0438\\u0459"},
+ {123456.0, "120\\u00a0\\u0445\\u0438\\u0459"},
+ {1234567.0, "1,2\\u00A0\\u043C\\u0438\\u043B"},
+ {12345678.0, "12\\u00A0\\u043C\\u0438\\u043B"},
+ {123456789.0, "120\\u00A0\\u043C\\u0438\\u043B"},
+ {1.23456789E9, "1,2\\u00A0\\u043C\\u043B\\u0440\\u0434"},
+ {1.23456789E10, "12\\u00A0\\u043C\\u043B\\u0440\\u0434"},
+ {1.23456789E11, "120\\u00A0\\u043C\\u043B\\u0440\\u0434"},
+ {1.23456789E12, "1,2\\u00A0\\u0431\\u0438\\u043B"},
+ {1.23456789E13, "12\\u00A0\\u0431\\u0438\\u043B"},
+ {1.23456789E14, "120\\u00A0\\u0431\\u0438\\u043B"},
+ {1.23456789E15, "1200\\u00A0\\u0431\\u0438\\u043B"}};
+
+static ExpectedResult kSerbianLong[] = {
+ {1234.0, "1,2 \\u0445\\u0438\\u0459\\u0430\\u0434\\u0430"},
+ {12345.0, "12 \\u0445\\u0438\\u0459\\u0430\\u0434\\u0430"},
+ {21789.0, "22 \\u0445\\u0438\\u0459\\u0430\\u0434\\u0435"},
+ {123456.0, "120 \\u0445\\u0438\\u0459\\u0430\\u0434\\u0430"},
+ {999999.0, "1 \\u043C\\u0438\\u043B\\u0438\\u043E\\u043D"},
+ {1234567.0, "1,2 \\u043C\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"},
+ {12345678.0, "12 \\u043C\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"},
+ {123456789.0, "120 \\u043C\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"},
+ {1.23456789E9, "1,2 \\u043C\\u0438\\u043B\\u0438\\u0458\\u0430\\u0440\\u0434\\u0438"},
+ {1.23456789E10, "12 \\u043C\\u0438\\u043B\\u0438\\u0458\\u0430\\u0440\\u0434\\u0438"},
+ {2.08901234E10, "21 \\u043C\\u0438\\u043B\\u0438\\u0458\\u0430\\u0440\\u0434\\u0430"},
+ {2.18901234E10, "22 \\u043C\\u0438\\u043B\\u0438\\u0458\\u0430\\u0440\\u0434\\u0435"},
+ {1.23456789E11, "120 \\u043C\\u0438\\u043B\\u0438\\u0458\\u0430\\u0440\\u0434\\u0438"},
+ {1.23456789E12, "1,2 \\u0442\\u0440\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"},
+ {1.23456789E13, "12 \\u0442\\u0440\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"},
+ {1.23456789E14, "120 \\u0442\\u0440\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"},
+ {1.23456789E15, "1200 \\u0442\\u0440\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"}};
+
+static ExpectedResult kSerbianLongNegative[] = {
+ {-1234.0, "-1,2 \\u0445\\u0438\\u0459\\u0430\\u0434\\u0430"},
+ {-12345.0, "-12 \\u0445\\u0438\\u0459\\u0430\\u0434\\u0430"},
+ {-21789.0, "-22 \\u0445\\u0438\\u0459\\u0430\\u0434\\u0435"},
+ {-123456.0, "-120 \\u0445\\u0438\\u0459\\u0430\\u0434\\u0430"},
+ {-999999.0, "-1 \\u043C\\u0438\\u043B\\u0438\\u043E\\u043D"},
+ {-1234567.0, "-1,2 \\u043C\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"},
+ {-12345678.0, "-12 \\u043C\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"},
+ {-123456789.0, "-120 \\u043C\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"},
+ {-1.23456789E9, "-1,2 \\u043C\\u0438\\u043B\\u0438\\u0458\\u0430\\u0440\\u0434\\u0438"},
+ {-1.23456789E10, "-12 \\u043C\\u0438\\u043B\\u0438\\u0458\\u0430\\u0440\\u0434\\u0438"},
+ {-2.08901234E10, "-21 \\u043C\\u0438\\u043B\\u0438\\u0458\\u0430\\u0440\\u0434\\u0430"},
+ {-2.18901234E10, "-22 \\u043C\\u0438\\u043B\\u0438\\u0458\\u0430\\u0440\\u0434\\u0435"},
+ {-1.23456789E11, "-120 \\u043C\\u0438\\u043B\\u0438\\u0458\\u0430\\u0440\\u0434\\u0438"},
+ {-1.23456789E12, "-1,2 \\u0442\\u0440\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"},
+ {-1.23456789E13, "-12 \\u0442\\u0440\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"},
+ {-1.23456789E14, "-120 \\u0442\\u0440\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"},
+ {-1.23456789E15, "-1200 \\u0442\\u0440\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"}};
+
+static ExpectedResult kJapaneseShort[] = {
+ {1234.0, "1.2\\u5343"},
+ {12345.0, "1.2\\u4E07"},
+ {123456.0, "12\\u4E07"},
+ {1234567.0, "120\\u4E07"},
+ {12345678.0, "1200\\u4E07"},
+ {123456789.0, "1.2\\u5104"},
+ {1.23456789E9, "12\\u5104"},
+ {1.23456789E10, "120\\u5104"},
+ {1.23456789E11, "1200\\u5104"},
+ {1.23456789E12, "1.2\\u5146"},
+ {1.23456789E13, "12\\u5146"},
+ {1.23456789E14, "120\\u5146"}};
+
+static ExpectedResult kSwahiliShort[] = {
+ {1234.0, "elfu\\u00a01.2"},
+ {12345.0, "elfu\\u00a012"},
+ {123456.0, "laki1.2"},
+ {1234567.0, "M1.2"},
+ {12345678.0, "M12"},
+ {123456789.0, "M120"},
+ {1.23456789E9, "B1.2"},
+ {1.23456789E10, "B12"},
+ {1.23456789E11, "B120"},
+ {1.23456789E12, "T1.2"},
+ {1.23456789E13, "T12"},
+ {1.23456789E15, "T1200"}};
+
+static ExpectedResult kCsShort[] = {
+ {1000.0, "1\\u00a0tis."},
+ {1500.0, "1,5\\u00a0tis."},
+ {5000.0, "5\\u00a0tis."},
+ {23000.0, "23\\u00a0tis."},
+ {127123.0, "130\\u00a0tis."},
+ {1271234.0, "1,3\\u00a0mil."},
+ {12712345.0, "13\\u00a0mil."},
+ {127123456.0, "130\\u00a0mil."},
+ {1.27123456E9, "1,3\\u00a0mld."},
+ {1.27123456E10, "13\\u00a0mld."},
+ {1.27123456E11, "130\\u00a0mld."},
+ {1.27123456E12, "1,3\\u00a0bil."},
+ {1.27123456E13, "13\\u00a0bil."},
+ {1.27123456E14, "130\\u00a0bil."}};
+
+static ExpectedResult kSkLong[] = {
+ {1000.0, "1 tis\\u00edc"},
+ {1572.0, "1,6 tis\\u00edc"},
+ {5184.0, "5,2 tis\\u00edc"}};
+
+static ExpectedResult kSwahiliShortNegative[] = {
+ {-1234.0, "elfu\\u00a0-1.2"},
+ {-12345.0, "elfu\\u00a0-12"},
+ {-123456.0, "laki-1.2"},
+ {-1234567.0, "M-1.2"},
+ {-12345678.0, "M-12"},
+ {-123456789.0, "M-120"},
+ {-1.23456789E9, "B-1.2"},
+ {-1.23456789E10, "B-12"},
+ {-1.23456789E11, "B-120"},
+ {-1.23456789E12, "T-1.2"},
+ {-1.23456789E13, "T-12"},
+ {-1.23456789E15, "T-1200"}};
+
+static ExpectedResult kArabicLong[] = {
+ {-5300.0, "\\u0665\\u066B\\u0663- \\u0623\\u0644\\u0641"}};
+
+
+class CompactDecimalFormatTest : public IntlTest {
+public:
+ CompactDecimalFormatTest() {
+ }
+
+ void runIndexedTest(int32_t index, UBool exec, const char *&name, char *par=0);
+private:
+ void TestEnglishShort();
+ void TestSerbianShort();
+ void TestSerbianLong();
+ void TestSerbianLongNegative();
+ void TestJapaneseShort();
+ void TestSwahiliShort();
+ void TestCsShort();
+ void TestSkLong();
+ void TestSwahiliShortNegative();
+ void TestArabicLong();
+ void TestFieldPosition();
+ void TestSignificantDigits();
+ void CheckLocale(
+ const Locale& locale, UNumberCompactStyle style,
+ const ExpectedResult* expectedResult, int32_t expectedResultLength);
+ void CheckExpectedResult(
+ const CompactDecimalFormat* cdf, const ExpectedResult* expectedResult,
+ const char* description);
+ CompactDecimalFormat* createCDFInstance(const Locale& locale, UNumberCompactStyle style, UErrorCode& status);
+ static const char *StyleStr(UNumberCompactStyle style);
+};
+
+void CompactDecimalFormatTest::runIndexedTest(
+ int32_t index, UBool exec, const char *&name, char *) {
+ if (exec) {
+ logln("TestSuite CompactDecimalFormatTest: ");
+ }
+ TESTCASE_AUTO_BEGIN;
+ TESTCASE_AUTO(TestEnglishShort);
+ TESTCASE_AUTO(TestSerbianShort);
+ TESTCASE_AUTO(TestSerbianLong);
+ TESTCASE_AUTO(TestSerbianLongNegative);
+ TESTCASE_AUTO(TestJapaneseShort);
+ TESTCASE_AUTO(TestSwahiliShort);
+ TESTCASE_AUTO(TestCsShort);
+ TESTCASE_AUTO(TestSkLong);
+ TESTCASE_AUTO(TestSwahiliShortNegative);
+ TESTCASE_AUTO(TestArabicLong);
+ TESTCASE_AUTO(TestFieldPosition);
+ TESTCASE_AUTO(TestSignificantDigits);
+ TESTCASE_AUTO_END;
+}
+
+void CompactDecimalFormatTest::TestEnglishShort() {
+ CheckLocale("en", UNUM_SHORT, kEnglishShort, LENGTHOF(kEnglishShort));
+}
+
+void CompactDecimalFormatTest::TestSerbianShort() {
+ CheckLocale("sr", UNUM_SHORT, kSerbianShort, LENGTHOF(kSerbianShort));
+}
+
+void CompactDecimalFormatTest::TestSerbianLong() {
+ CheckLocale("sr", UNUM_LONG, kSerbianLong, LENGTHOF(kSerbianLong));
+}
+
+void CompactDecimalFormatTest::TestSerbianLongNegative() {
+ CheckLocale("sr", UNUM_LONG, kSerbianLongNegative, LENGTHOF(kSerbianLongNegative));
+}
+
+void CompactDecimalFormatTest::TestJapaneseShort() {
+ CheckLocale(Locale::getJapan(), UNUM_SHORT, kJapaneseShort, LENGTHOF(kJapaneseShort));
+}
+
+void CompactDecimalFormatTest::TestSwahiliShort() {
+ CheckLocale("sw", UNUM_SHORT, kSwahiliShort, LENGTHOF(kSwahiliShort));
+}
+
+void CompactDecimalFormatTest::TestFieldPosition() {
+ // Swahili uses prefixes which forces offsets in field position to change
+ UErrorCode status = U_ZERO_ERROR;
+ LocalPointer<CompactDecimalFormat> cdf(createCDFInstance("sw", UNUM_SHORT, status));
+ if (U_FAILURE(status)) {
+ dataerrln("Unable to create format object - %s", u_errorName(status));
+ return;
+ }
+ FieldPosition fp(UNUM_INTEGER_FIELD);
+ UnicodeString result;
+ cdf->format(1234567.0, result, fp);
+ UnicodeString subString = result.tempSubString(fp.getBeginIndex(), fp.getEndIndex() - fp.getBeginIndex());
+ if (subString != UnicodeString("1", -1, US_INV)) {
+ errln(UnicodeString("Expected 1, got ") + subString);
+ }
+}
+
+void CompactDecimalFormatTest::TestCsShort() {
+ CheckLocale("cs", UNUM_SHORT, kCsShort, LENGTHOF(kCsShort));
+}
+
+void CompactDecimalFormatTest::TestSkLong() {
+ // In CLDR we have:
+ // 1000 {
+ // few{"0"}
+ // one{"0"}
+ // other{"0"}
+ CheckLocale("sk", UNUM_LONG, kSkLong, LENGTHOF(kSkLong));
+}
+
+void CompactDecimalFormatTest::TestSwahiliShortNegative() {
+ CheckLocale("sw", UNUM_SHORT, kSwahiliShortNegative, LENGTHOF(kSwahiliShortNegative));
+}
+
+void CompactDecimalFormatTest::TestArabicLong() {
+ CheckLocale("ar", UNUM_LONG, kArabicLong, LENGTHOF(kArabicLong));
+}
+
+void CompactDecimalFormatTest::TestSignificantDigits() {
+ UErrorCode status = U_ZERO_ERROR;
+ LocalPointer<CompactDecimalFormat> cdf(CompactDecimalFormat::createInstance("en", UNUM_SHORT, status));
+ if (U_FAILURE(status)) {
+ dataerrln("Unable to create format object - %s", u_errorName(status));
+ return;
+ }
+ UnicodeString actual;
+ cdf->format(123456.0, actual);
+ // We expect 3 significant digits by default
+ UnicodeString expected("123K", -1, US_INV);
+ if (actual != expected) {
+ errln(UnicodeString("Fail: Expected: ") + expected + UnicodeString(" Got: ") + actual);
+ }
+}
+
+void CompactDecimalFormatTest::CheckLocale(const Locale& locale, UNumberCompactStyle style, const ExpectedResult* expectedResults, int32_t expectedResultLength) {
+ UErrorCode status = U_ZERO_ERROR;
+ LocalPointer<CompactDecimalFormat> cdf(createCDFInstance(locale, style, status));
+ if (U_FAILURE(status)) {
+ dataerrln("Unable to create format object - %s", u_errorName(status));
+ return;
+ }
+ char description[256];
+ sprintf(description,"%s - %s", locale.getName(), StyleStr(style));
+ for (int32_t i = 0; i < expectedResultLength; i++) {
+ CheckExpectedResult(cdf.getAlias(), &expectedResults[i], description);
+ }
+}
+
+void CompactDecimalFormatTest::CheckExpectedResult(
+ const CompactDecimalFormat* cdf, const ExpectedResult* expectedResult, const char* description) {
+ UnicodeString actual;
+ cdf->format(expectedResult->value, actual);
+ UnicodeString expected(expectedResult->expected, -1, US_INV);
+ expected = expected.unescape();
+ if (actual != expected) {
+ errln(UnicodeString("Fail: Expected: ") + expected
+ + UnicodeString(" Got: ") + actual
+ + UnicodeString(" for: ") + UnicodeString(description));
+ }
+}
+
+CompactDecimalFormat*
+CompactDecimalFormatTest::createCDFInstance(const Locale& locale, UNumberCompactStyle style, UErrorCode& status) {
+ CompactDecimalFormat* result = CompactDecimalFormat::createInstance(locale, style, status);
+ if (U_FAILURE(status)) {
+ return NULL;
+ }
+ // All tests are written for two significant digits, so we explicitly set here
+ // in case default significant digits change.
+ result->setMaximumSignificantDigits(2);
+ return result;
+}
+
+const char *CompactDecimalFormatTest::StyleStr(UNumberCompactStyle style) {
+ if (style == UNUM_SHORT) {
+ return kShortStr;
+ }
+ return kLongStr;
+}
+
+extern IntlTest *createCompactDecimalFormatTest() {
+ return new CompactDecimalFormatTest();
+}
+
+#endif
diff --git a/test/intltest/convtest.cpp b/test/intltest/convtest.cpp
index b682a47..81c0486 100644
--- a/test/intltest/convtest.cpp
+++ b/test/intltest/convtest.cpp
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 2003-2010, International Business Machines
+* Copyright (C) 2003-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -679,11 +679,13 @@
UConverter *
ConversionTest::cnv_open(const char *name, UErrorCode &errorCode) {
+ if(name!=NULL && *name=='+') {
+ // Converter names that start with '+' are ignored in ICU4J tests.
+ ++name;
+ }
if(name!=NULL && *name=='*') {
/* loadTestData(): set the data directory */
return ucnv_openPackage(loadTestData(errorCode), name+1, &errorCode);
- } else if(name!=NULL && *name=='+') {
- return ucnv_open((name+1), &errorCode);
} else {
return ucnv_open(name, &errorCode);
}
diff --git a/test/intltest/dcfmapts.cpp b/test/intltest/dcfmapts.cpp
index b190a08..3287f5f 100644
--- a/test/intltest/dcfmapts.cpp
+++ b/test/intltest/dcfmapts.cpp
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2010, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@@ -54,6 +54,12 @@
TestCurrencyPluralInfo();
}
break;
+ case 4: name = "TestScale";
+ if(exec) {
+ logln((UnicodeString)"Scale test---");
+ TestScale();
+ }
+ break;
default: name = ""; break;
}
}
@@ -448,14 +454,14 @@
//for +2.55 with RoundingIncrement=1.0
pat.setRoundingIncrement(1.0);
pat.format(Roundingnumber, resultStr);
- message= (UnicodeString)"round(" + (double)Roundingnumber + UnicodeString(",") + mode + UnicodeString(",FALSE) with RoundingIncrement=1.0==>");
+ message= (UnicodeString)"Round() failed: round(" + (double)Roundingnumber + UnicodeString(",") + mode + UnicodeString(",FALSE) with RoundingIncrement=1.0==>");
verify(message, resultStr, result[i++]);
message.remove();
resultStr.remove();
//for -2.55 with RoundingIncrement=1.0
pat.format(Roundingnumber1, resultStr);
- message= (UnicodeString)"round(" + (double)Roundingnumber1 + UnicodeString(",") + mode + UnicodeString(",FALSE) with RoundingIncrement=1.0==>");
+ message= (UnicodeString)"Round() failed: round(" + (double)Roundingnumber1 + UnicodeString(",") + mode + UnicodeString(",FALSE) with RoundingIncrement=1.0==>");
verify(message, resultStr, result[i++]);
message.remove();
resultStr.remove();
@@ -467,7 +473,14 @@
UnicodeString expectedStr("");
expectedStr=expectedStr + expected;
if(got != expectedStr ) {
- errln((UnicodeString)"ERROR: Round() failed: " + message + got + (UnicodeString)" Expected : " + expectedStr);
+ errln((UnicodeString)"ERROR: " + message + got + (UnicodeString)" Expected : " + expectedStr);
+ }
+}
+
+void IntlTestDecimalFormatAPI::verifyString(const UnicodeString& message, const UnicodeString& got, UnicodeString& expected){
+ logln((UnicodeString)message + got + (UnicodeString)" Expected : " + expected);
+ if(got != expected ) {
+ errln((UnicodeString)"ERROR: " + message + got + (UnicodeString)" Expected : " + expected);
}
}
@@ -501,4 +514,49 @@
}
}
+void IntlTestDecimalFormatAPI::TestScale()
+{
+ typedef struct TestData {
+ double inputValue;
+ int inputScale;
+ char *expectedOutput;
+ } TestData;
+
+ static TestData testData[] = {
+ { 100.0, 3, "100,000" },
+ { 10034.0, -2, "100.34" },
+ { 0.86, -3, "0.0009" },
+ { -0.000455, 1, "-0%" },
+ { -0.000555, 1, "-1%" },
+ { 0.000455, 1, "0%" },
+ { 0.000555, 1, "1%" },
+ };
+
+ UErrorCode status = U_ZERO_ERROR;
+ DecimalFormat pat(status);
+ if(U_FAILURE(status)) {
+ errcheckln(status, "ERROR: Could not create DecimalFormat (default) - %s", u_errorName(status));
+ return;
+ }
+
+ UnicodeString message;
+ UnicodeString resultStr;
+ UnicodeString exp;
+ UnicodeString percentPattern("#,##0%");
+ pat.setMaximumFractionDigits(4);
+
+ for(int32_t i=0;i < sizeof(testData)/sizeof(testData[0]);i++) {
+ if ( i > 2 ) {
+ pat.applyPattern(percentPattern,status);
+ }
+ pat.setAttribute(UNUM_SCALE,testData[i].inputScale,status);
+ pat.format(testData[i].inputValue, resultStr);
+ message = UnicodeString("Unexpected output for ") + testData[i].inputValue + UnicodeString(" and scale ") + testData[i].inputScale + UnicodeString(". Got: ");
+ exp = testData[i].expectedOutput;
+ verifyString(message, resultStr, exp);
+ message.remove();
+ resultStr.remove();
+ exp.remove();
+ }
+}
#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/test/intltest/dcfmapts.h b/test/intltest/dcfmapts.h
index c17d0b3..dc831c3 100644
--- a/test/intltest/dcfmapts.h
+++ b/test/intltest/dcfmapts.h
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2009, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@@ -27,9 +27,11 @@
void testRounding(/*char *par*/);
void testRoundingInc(/*char *par*/);
void TestCurrencyPluralInfo();
+ void TestScale();
private:
/*Helper functions */
void verify(const UnicodeString& message, const UnicodeString& got, double expected);
+ void verifyString(const UnicodeString& message, const UnicodeString& got, UnicodeString& expected);
};
#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/test/intltest/dtfmrgts.cpp b/test/intltest/dtfmrgts.cpp
index 5966ed1..a72976f 100644
--- a/test/intltest/dtfmrgts.cpp
+++ b/test/intltest/dtfmrgts.cpp
@@ -720,8 +720,8 @@
sdf->format(d, buf, fp);
//logln(sdf.format(d, buf, fp).toString());
logln(dateToString(d) + " => " + buf);
- logln("beginIndex = " + fp.getBeginIndex());
- logln("endIndex = " + fp.getEndIndex());
+ logln(UnicodeString("beginIndex = ") + fp.getBeginIndex());
+ logln(UnicodeString("endIndex = ") + fp.getEndIndex());
if (fp.getBeginIndex() == fp.getEndIndex())
errln("Fail: Empty field");
@@ -843,7 +843,7 @@
logln(" index: %d", pos.getIndex());
logln((UnicodeString) " result: " + d);
if(pos.getIndex() != finish.getIndex())
- errln("Fail: Expected pos " + finish.getIndex());
+ errln(UnicodeString("Fail: Expected pos ") + finish.getIndex());
if (! ((d == 0 && exp == -1) || (d == exp)))
errln((UnicodeString) "Fail: Expected result " + exp);
}
diff --git a/test/intltest/dtfmttst.cpp b/test/intltest/dtfmttst.cpp
index 0227360..705b5e0 100644
--- a/test/intltest/dtfmttst.cpp
+++ b/test/intltest/dtfmttst.cpp
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2012, International Business Machines
+ * Copyright (c) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************/
@@ -73,6 +73,7 @@
TESTCASE_AUTO(TestHost);
TESTCASE_AUTO(TestEras);
TESTCASE_AUTO(TestNarrowNames);
+ TESTCASE_AUTO(TestShortDays);
TESTCASE_AUTO(TestStandAloneDays);
TESTCASE_AUTO(TestStandAloneMonths);
TESTCASE_AUTO(TestQuarters);
@@ -419,7 +420,7 @@
/**
* This MUST be kept in sync with DateFormatSymbols.gPatternChars.
*/
-static const char* PATTERN_CHARS = "GyMdkHmsSEDFwWahKzYeugAZvcLQqVU";
+static const char* PATTERN_CHARS = "GyMdkHmsSEDFwWahKzYeugAZvcLQqVUOXx";
/**
* A list of the names of all the fields in DateFormat.
@@ -456,7 +457,10 @@
"QUARTER_FIELD",
"STAND_ALONE_QUARTER_FIELD",
"TIMEZONE_SPECIAL_FIELD",
- "YEAR_NAME_FIELD"
+ "YEAR_NAME_FIELD",
+ "TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD",
+ "TIMEZONE_ISO_FIELD",
+ "TIMEZONE_ISO_LOCAL_FIELD",
};
static const int32_t DATEFORMAT_FIELD_NAMES_LENGTH =
@@ -509,18 +513,25 @@
// Expected output field values for above DateFormats on aug13
// Fields are given in order of DateFormat field number
const char* EXPECTED[] = {
- "", "1997", "August", "13", "", "", "34", "12", "",
- "Wednesday", "", "", "", "", "PM", "2", "", "Pacific Daylight Time", "", "", "", "", "", "", "", "", "", "", "","","",
+ "", "1997", "August", "13", "", "", "34", "12", "", "Wednesday",
+ "", "", "", "", "PM", "2", "", "Pacific Daylight Time", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "",
- "", "1997", "ao\\u00FBt", "13", "", "14", "34", "12", "",
- "mercredi", "", "", "", "", "", "", "", "heure avanc\\u00e9e du Pacifique", "", "", "", "", "", "", "", "", "", "", "", "","",
+ "", "1997", "ao\\u00FBt", "13", "", "14", "34", "12", "", "mercredi",
+ "", "", "", "", "", "", "", "heure avanc\\u00e9e du Pacifique", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "",
- "AD", "1997", "8", "13", "14", "14", "34", "12", "5",
- "Wed", "225", "2", "33", "3", "PM", "2", "2", "PDT", "1997", "4", "1997", "2450674", "52452513", "-0700", "PT", "4", "8", "3", "3","PDT","1997",
+ "AD", "1997", "8", "13", "14", "14", "34", "12", "5", "Wed",
+ "225", "2", "33", "3", "PM", "2", "2", "PDT", "1997", "4",
+ "1997", "2450674", "52452513", "-0700", "PT", "4", "8", "3", "3", "uslax",
+ "1997", "GMT-7", "-07", "-07",
- "Anno Domini", "1997", "August", "0013", "0014", "0014", "0034", "0012", "5130",
- "Wednesday", "0225", "0002", "0033", "0003", "PM", "0002", "0002", "Pacific Daylight Time", "1997", "Wednesday", "1997", "2450674", "52452513", "GMT-07:00",
- "Pacific Time", "Wednesday", "August", "3rd quarter", "3rd quarter", "Los Angeles Time","1997"
+ "Anno Domini", "1997", "August", "0013", "0014", "0014", "0034", "0012", "5130", "Wednesday",
+ "0225", "0002", "0033", "0003", "PM", "0002", "0002", "Pacific Daylight Time", "1997", "Wednesday",
+ "1997", "2450674", "52452513", "GMT-07:00", "Pacific Time", "Wednesday", "August", "3rd quarter", "3rd quarter", "Los Angeles Time",
+ "1997", "GMT-07:00", "-0700", "-0700",
};
const int32_t EXPECTED_LENGTH = sizeof(EXPECTED)/sizeof(EXPECTED[0]);
@@ -597,7 +608,7 @@
"y/M/d H:mm:ss.S", "fp", "2004 03 10 16:36:31.567", "2004/3/10 16:36:31.5", "2004 03 10 16:36:31.500",
"y/M/d H:mm:ss.SS", "fp", "2004 03 10 16:36:31.567", "2004/3/10 16:36:31.56", "2004 03 10 16:36:31.560",
"y/M/d H:mm:ss.SSS", "F", "2004 03 10 16:36:31.567", "2004/3/10 16:36:31.567",
- "y/M/d H:mm:ss.SSSS", "pf", "2004/3/10 16:36:31.5679", "2004 03 10 16:36:31.568", "2004/3/10 16:36:31.5680",
+ "y/M/d H:mm:ss.SSSS", "pf", "2004/3/10 16:36:31.5679", "2004 03 10 16:36:31.567", "2004/3/10 16:36:31.5670",
};
expect(DATA, ARRAY_SIZE(DATA), Locale("en", "", ""));
}
@@ -690,7 +701,7 @@
logln(now);
ParsePosition pos(0);
UDate date2 = formatter->parse(now, pos);
- if (date2 == 0) then = "Parse stopped at " + pos.getIndex();
+ if (date2 == 0) then = UnicodeString("Parse stopped at ") + pos.getIndex();
else ((DateFormat*)formatter)->format(date2, then);
logln(then);
if (!(date2 == date1)) errln((UnicodeString)"FAIL");
@@ -1009,9 +1020,9 @@
"April 1, 1997", "April 1, 1997", "April 1 1997", "4/1/97", 0, 0, 0, "April 1", 0, 0,
"Jan 1, 1970", "January 1, 1970", "January 1 1970", "1/1/70", 0, 0, 0, "January 1", 0, 0,
"Jan 1 2037", "January 1, 2037", "January 1 2037", "1/1/37", 0, 0, 0, "January 1", 0, 0,
- "1/1/70", "January 1, 1970", "January 1 1970", "1/1/70", "1 January, 1970", "1 January 1970", "1 January", "January 1", "0001", 0,
+ "1/1/70", "January 1, 0070", "January 1 0070", "1/1/70", "1 January, 0070", "1 January 0070", "1 January", "January 1", "0001", 0,
"5 May 1997", 0, 0, 0, "5 May, 1997", "5 May 1997", "5 May", 0, "0005", 0,
- "16 May", 0, 0, 0, 0, 0, "16 May", 0, "2016", 0,
+ "16 May", 0, 0, 0, 0, 0, "16 May", 0, "0016", 0,
"April 30", 0, 0, 0, 0, 0, 0, "April 30", 0, 0,
"1998", 0, 0, 0, 0, 0, 0, 0, "1998", 0,
"1", 0, 0, 0, 0, 0, 0, 0, "0001", 0,
@@ -1616,6 +1627,30 @@
expect(CS_DATA, ARRAY_SIZE(CS_DATA), Locale("cs", "", ""));
}
+void DateFormatTest::TestShortDays()
+{
+ const char *EN_DATA[] = {
+ "yyyy MM dd HH:mm:ss",
+
+ "EEEEEE, MMM d y", "fp", "2013 01 13 0:00:00", "Su, Jan 13 2013", "2013 01 13 0:00:00",
+ "EEEEEE, MMM d y", "fp", "2013 01 16 0:00:00", "We, Jan 16 2013", "2013 01 16 0:00:00",
+ "EEEEEE d", "fp", "1970 01 17 0:00:00", "Sa 17", "1970 01 17 0:00:00",
+ "cccccc d", "fp", "1970 01 17 0:00:00", "Sa 17", "1970 01 17 0:00:00",
+ "cccccc", "fp", "1970 01 03 0:00:00", "Sa", "1970 01 03 0:00:00",
+ };
+ const char *SV_DATA[] = {
+ "yyyy MM dd HH:mm:ss",
+
+ "EEEEEE d MMM y", "fp", "2013 01 13 0:00:00", "s\\u00F6 13 jan 2013", "2013 01 13 0:00:00",
+ "EEEEEE d MMM y", "fp", "2013 01 16 0:00:00", "on 16 jan 2013", "2013 01 16 0:00:00",
+ "EEEEEE d", "fp", "1970 01 17 0:00:00", "l\\u00F6 17", "1970 01 17 0:00:00",
+ "cccccc d", "fp", "1970 01 17 0:00:00", "L\\u00F6 17", "1970 01 17 0:00:00",
+ "cccccc", "fp", "1970 01 03 0:00:00", "L\\u00F6", "1970 01 03 0:00:00",
+ };
+ expect(EN_DATA, ARRAY_SIZE(EN_DATA), Locale("en", "", ""));
+ expect(SV_DATA, ARRAY_SIZE(SV_DATA), Locale("sv", "", ""));
+}
+
void DateFormatTest::TestNarrowNames()
{
const char *EN_DATA[] = {
@@ -2409,26 +2444,22 @@
{ "en", "America/Los_Angeles", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-08:00", "-8:00" },
{ "en", "America/Los_Angeles", "2004-01-15T00:00:00Z", "ZZZZZ", "-08:00", "-8:00" },
{ "en", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "PST", "America/Los_Angeles" },
- { "en", "America/Los_Angeles", "2004-01-15T00:00:00Z", "V", "PST", "America/Los_Angeles" },
{ "en", "America/Los_Angeles", "2004-01-15T00:00:00Z", "zzzz", "Pacific Standard Time", "America/Los_Angeles" },
{ "en", "America/Los_Angeles", "2004-07-15T00:00:00Z", "Z", "-0700", "-7:00" },
{ "en", "America/Los_Angeles", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-07:00", "-7:00" },
{ "en", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "PDT", "America/Los_Angeles" },
- { "en", "America/Los_Angeles", "2004-07-15T00:00:00Z", "V", "PDT", "America/Los_Angeles" },
{ "en", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "Pacific Daylight Time", "America/Los_Angeles" },
{ "en", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "PT", "America/Los_Angeles" },
{ "en", "America/Los_Angeles", "2004-07-15T00:00:00Z", "vvvv", "Pacific Time", "America/Los_Angeles" },
{ "en", "America/Los_Angeles", "2004-07-15T00:00:00Z", "VVVV", "Los Angeles Time", "America/Los_Angeles" },
- { "en_GB", "America/Los_Angeles", "2004-01-15T12:00:00Z", "z", "GMT-08:00", "America/Los_Angeles" },
+ { "en_GB", "America/Los_Angeles", "2004-01-15T12:00:00Z", "z", "GMT-8", "America/Los_Angeles" },
{ "en", "America/Phoenix", "2004-01-15T00:00:00Z", "Z", "-0700", "-7:00" },
{ "en", "America/Phoenix", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-07:00", "-7:00" },
{ "en", "America/Phoenix", "2004-01-15T00:00:00Z", "z", "MST", "America/Phoenix" },
- { "en", "America/Phoenix", "2004-01-15T00:00:00Z", "V", "MST", "America/Phoenix" },
{ "en", "America/Phoenix", "2004-01-15T00:00:00Z", "zzzz", "Mountain Standard Time", "America/Phoenix" },
{ "en", "America/Phoenix", "2004-07-15T00:00:00Z", "Z", "-0700", "-7:00" },
{ "en", "America/Phoenix", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-07:00", "-7:00" },
{ "en", "America/Phoenix", "2004-07-15T00:00:00Z", "z", "MST", "America/Phoenix" },
- { "en", "America/Phoenix", "2004-07-15T00:00:00Z", "V", "MST", "America/Phoenix" },
{ "en", "America/Phoenix", "2004-07-15T00:00:00Z", "zzzz", "Mountain Standard Time", "America/Phoenix" },
{ "en", "America/Phoenix", "2004-07-15T00:00:00Z", "v", "MST", "America/Phoenix" },
{ "en", "America/Phoenix", "2004-07-15T00:00:00Z", "vvvv", "Mountain Standard Time", "America/Phoenix" },
@@ -2436,13 +2467,11 @@
{ "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
- { "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
+ { "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
- { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
+ { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Buenos Aires Time", "America/Buenos_Aires" },
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentina Standard Time", "America/Buenos_Aires" },
@@ -2450,13 +2479,11 @@
{ "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
- { "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
+ { "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
- { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
+ { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Buenos Aires Time", "America/Buenos_Aires" },
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentina Standard Time", "America/Buenos_Aires" },
@@ -2464,13 +2491,11 @@
{ "en", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
{ "en", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-05:00", "-5:00" },
- { "en", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-05:00", "-5:00" },
- { "en", "America/Havana", "2004-01-15T00:00:00Z", "V", "GMT-05:00", "-5:00" },
+ { "en", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-5", "-5:00" },
{ "en", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "Cuba Standard Time", "-5:00" },
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "Z", "-0400", "-4:00" },
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-04:00", "-4:00" },
- { "en", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-04:00", "-4:00" },
- { "en", "America/Havana", "2004-07-15T00:00:00Z", "V", "GMT-04:00", "-4:00" },
+ { "en", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-4", "-4:00" },
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "Cuba Daylight Time", "-4:00" },
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "v", "Cuba Time", "America/Havana" },
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "Cuba Time", "America/Havana" },
@@ -2478,13 +2503,11 @@
{ "en", "Australia/ACT", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
{ "en", "Australia/ACT", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
- { "en", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
- { "en", "Australia/ACT", "2004-01-15T00:00:00Z", "V", "GMT+11:00", "+11:00" },
+ { "en", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
{ "en", "Australia/ACT", "2004-01-15T00:00:00Z", "zzzz", "Australian Eastern Daylight Time", "+11:00" },
{ "en", "Australia/ACT", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
{ "en", "Australia/ACT", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
- { "en", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
- { "en", "Australia/ACT", "2004-07-15T00:00:00Z", "V", "GMT+10:00", "+10:00" },
+ { "en", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
{ "en", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "Australian Eastern Standard Time", "+10:00" },
{ "en", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "Sydney Time", "Australia/Sydney" },
{ "en", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "Eastern Australia Time", "Australia/Sydney" },
@@ -2492,13 +2515,11 @@
{ "en", "Australia/Sydney", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
{ "en", "Australia/Sydney", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
- { "en", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
- { "en", "Australia/Sydney", "2004-01-15T00:00:00Z", "V", "GMT+11:00", "+11:00" },
+ { "en", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
{ "en", "Australia/Sydney", "2004-01-15T00:00:00Z", "zzzz", "Australian Eastern Daylight Time", "+11:00" },
{ "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
{ "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
- { "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
- { "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "V", "GMT+10:00", "+10:00" },
+ { "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
{ "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "Australian Eastern Standard Time", "+10:00" },
{ "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "Sydney Time", "Australia/Sydney" },
{ "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "Eastern Australia Time", "Australia/Sydney" },
@@ -2507,12 +2528,10 @@
{ "en", "Europe/London", "2004-01-15T00:00:00Z", "Z", "+0000", "+0:00" },
{ "en", "Europe/London", "2004-01-15T00:00:00Z", "ZZZZ", "GMT", "+0:00" },
{ "en", "Europe/London", "2004-01-15T00:00:00Z", "z", "GMT", "+0:00" },
- { "en", "Europe/London", "2004-01-15T00:00:00Z", "V", "GMT", "+0:00" },
{ "en", "Europe/London", "2004-01-15T00:00:00Z", "zzzz", "Greenwich Mean Time", "+0:00" },
{ "en", "Europe/London", "2004-07-15T00:00:00Z", "Z", "+0100", "+1:00" },
{ "en", "Europe/London", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+01:00", "+1:00" },
- { "en", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+01:00", "Europe/London" },
- { "en", "Europe/London", "2004-07-15T00:00:00Z", "V", "GMT+01:00", "Europe/London" },
+ { "en", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+1", "Europe/London" },
{ "en", "Europe/London", "2004-07-15T00:00:00Z", "zzzz", "British Summer Time", "Europe/London" },
// icu en.txt has exemplar city for this time zone
{ "en", "Europe/London", "2004-07-15T00:00:00Z", "v", "United Kingdom Time", "Europe/London" },
@@ -2521,77 +2540,75 @@
{ "en", "Etc/GMT+3", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "en", "Etc/GMT+3", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "en", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "en", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "en", "Etc/GMT+3", "2004-01-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
{ "en", "Etc/GMT+3", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "en", "Etc/GMT+3", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "en", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "en", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "en", "Etc/GMT+3", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
- { "en", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-03:00", "-3:00" },
+ { "en", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-3", "-3:00" },
{ "en", "Etc/GMT+3", "2004-07-15T00:00:00Z", "vvvv", "GMT-03:00", "-3:00" },
// JB#5150
{ "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "Z", "+0530", "+5:30" },
{ "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
- { "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+05:30", "+5:30" },
- { "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "V", "GMT+05:30", "+5:30" },
+ { "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+5:30", "+5:30" },
{ "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "zzzz", "India Standard Time", "+5:30" },
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "Z", "+0530", "+5:30" },
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
- { "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+05:30", "+05:30" },
- { "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "V", "GMT+05:30", "+05:30" },
+ { "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+5:30", "+05:30" },
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "India Standard Time", "+5:30" },
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "India Time", "Asia/Calcutta" },
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "India Standard Time", "Asia/Calcutta" },
+ // Proper CLDR primary zone support #9733
+ { "en", "Asia/Shanghai", "2013-01-01T00:00:00Z", "VVVV", "China Time", "Asia/Shanghai" },
+ { "en", "Asia/Harbin", "2013-01-01T00:00:00Z", "VVVV", "Harbin Time", "Asia/Harbin" },
+
// ==========
{ "de", "America/Los_Angeles", "2004-01-15T00:00:00Z", "Z", "-0800", "-8:00" },
{ "de", "America/Los_Angeles", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-08:00", "-8:00" },
// BEGIN android-change
{ "de", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "PST", "-8:00" },
- // END android-change
{ "de", "America/Los_Angeles", "2004-01-15T00:00:00Z", "zzzz", "Nordamerikanische Westk\\u00fcsten-Normalzeit", "-8:00" },
{ "de", "America/Los_Angeles", "2004-07-15T00:00:00Z", "Z", "-0700", "-7:00" },
{ "de", "America/Los_Angeles", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-07:00", "-7:00" },
- // BEGIN android-change
{ "de", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "PDT", "-7:00" },
- // END android-change
{ "de", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "Nordamerikanische Westk\\u00fcsten-Sommerzeit", "-7:00" },
- // BEGIN android-change
{ "de", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "PT", "America/Los_Angeles" },
- // END android-change
{ "de", "America/Los_Angeles", "2004-07-15T00:00:00Z", "vvvv", "Nordamerikanische Westk\\u00fcstenzeit", "America/Los_Angeles" },
+ // END android-change
{ "de", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "de", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "de", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "de", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "de", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentinische Normalzeit", "-3:00" },
{ "de", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "de", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "de", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "de", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "de", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentinische Normalzeit", "-3:00" },
{ "de", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Buenos Aires Zeit", "America/Buenos_Aires" },
{ "de", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentinische Normalzeit", "America/Buenos_Aires" },
{ "de", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "de", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "de", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "de", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "de", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentinische Normalzeit", "-3:00" },
{ "de", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "de", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "de", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "de", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "de", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentinische Normalzeit", "-3:00" },
{ "de", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Buenos Aires Zeit", "America/Buenos_Aires" },
{ "de", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentinische Normalzeit", "America/Buenos_Aires" },
{ "de", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
{ "de", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-05:00", "-5:00" },
- { "de", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-05:00", "-5:00" },
+ { "de", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-5", "-5:00" },
{ "de", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "Kubanische Normalzeit", "-5:00" },
{ "de", "America/Havana", "2004-07-15T00:00:00Z", "Z", "-0400", "-4:00" },
{ "de", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-04:00", "-4:00" },
- { "de", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-04:00", "-4:00" },
+ { "de", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-4", "-4:00" },
{ "de", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "Kubanische Sommerzeit", "-4:00" },
{ "de", "America/Havana", "2004-07-15T00:00:00Z", "v", "Kuba Zeit", "America/Havana" },
{ "de", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "Kubanische Zeit", "America/Havana" },
@@ -2601,22 +2618,22 @@
{ "de", "Australia/ACT", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
{ "de", "Australia/ACT", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
- { "de", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
+ { "de", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
{ "de", "Australia/ACT", "2004-01-15T00:00:00Z", "zzzz", "Ostaustralische Sommerzeit", "+11:00" },
{ "de", "Australia/ACT", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
{ "de", "Australia/ACT", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
- { "de", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
+ { "de", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
{ "de", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "Ostaustralische Normalzeit", "+10:00" },
{ "de", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "Sydney Zeit", "Australia/Sydney" },
{ "de", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "Ostaustralische Zeit", "Australia/Sydney" },
{ "de", "Australia/Sydney", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
{ "de", "Australia/Sydney", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
- { "de", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
+ { "de", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
{ "de", "Australia/Sydney", "2004-01-15T00:00:00Z", "zzzz", "Ostaustralische Sommerzeit", "+11:00" },
{ "de", "Australia/Sydney", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
{ "de", "Australia/Sydney", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
- { "de", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
+ { "de", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
{ "de", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "Ostaustralische Normalzeit", "+10:00" },
{ "de", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "Sydney Zeit", "Australia/Sydney" },
{ "de", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "Ostaustralische Zeit", "Australia/Sydney" },
@@ -2627,30 +2644,30 @@
{ "de", "Europe/London", "2004-01-15T00:00:00Z", "zzzz", "Mittlere Greenwich-Zeit", "+0:00" },
{ "de", "Europe/London", "2004-07-15T00:00:00Z", "Z", "+0100", "+1:00" },
{ "de", "Europe/London", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+01:00", "+1:00" },
- { "de", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+01:00", "+1:00" },
+ { "de", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+1", "+1:00" },
{ "de", "Europe/London", "2004-07-15T00:00:00Z", "zzzz", "Britische Sommerzeit", "+1:00" },
{ "de", "Europe/London", "2004-07-15T00:00:00Z", "v", "Vereinigtes K\\u00f6nigreich Zeit", "Europe/London" },
{ "de", "Europe/London", "2004-07-15T00:00:00Z", "vvvv", "Vereinigtes K\\u00f6nigreich Zeit", "Europe/London" },
{ "de", "Etc/GMT+3", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "de", "Etc/GMT+3", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "de", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "de", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "de", "Etc/GMT+3", "2004-01-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
{ "de", "Etc/GMT+3", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "de", "Etc/GMT+3", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "de", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "de", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "de", "Etc/GMT+3", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
- { "de", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-03:00", "-3:00" },
+ { "de", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-3", "-3:00" },
{ "de", "Etc/GMT+3", "2004-07-15T00:00:00Z", "vvvv", "GMT-03:00", "-3:00" },
// JB#5150
{ "de", "Asia/Calcutta", "2004-01-15T00:00:00Z", "Z", "+0530", "+5:30" },
{ "de", "Asia/Calcutta", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
- { "de", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+05:30", "+5:30" },
+ { "de", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+5:30", "+5:30" },
{ "de", "Asia/Calcutta", "2004-01-15T00:00:00Z", "zzzz", "Indische Zeit", "+5:30" },
{ "de", "Asia/Calcutta", "2004-07-15T00:00:00Z", "Z", "+0530", "+5:30" },
{ "de", "Asia/Calcutta", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
- { "de", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+05:30", "+05:30" },
+ { "de", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+5:30", "+05:30" },
{ "de", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "Indische Zeit", "+5:30" },
{ "de", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "Indien Zeit", "Asia/Calcutta" },
{ "de", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "Indische Zeit", "Asia/Calcutta" },
@@ -2658,63 +2675,59 @@
// ==========
{ "zh", "America/Los_Angeles", "2004-01-15T00:00:00Z", "Z", "-0800", "-8:00" },
+ { "zh", "America/Los_Angeles", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-0800", "-8:00" },
// BEGIN android-change
- { "zh", "America/Los_Angeles", "2004-01-15T00:00:00Z", "ZZZZ", "PST", "-8:00" },
- // END android-change
- { "zh", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "GMT-0800", "America/Los_Angeles" },
+ { "zh", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "PST", "America/Los_Angeles" },
{ "zh", "America/Los_Angeles", "2004-01-15T00:00:00Z", "zzzz", "\\u5317\\u7f8e\\u592a\\u5e73\\u6d0b\\u6807\\u51c6\\u65f6\\u95f4", "America/Los_Angeles" },
{ "zh", "America/Los_Angeles", "2004-07-15T00:00:00Z", "Z", "-0700", "-7:00" },
- // BEGIN android-change
- { "zh", "America/Los_Angeles", "2004-07-15T00:00:00Z", "ZZZZ", "PDT", "-7:00" },
- // END android-change
- { "zh", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "GMT-0700", "America/Los_Angeles" },
- // BEGIN android-change
- { "zh", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "PT", "America/Los_Angeles" },
- // END android-change
+ { "zh", "America/Los_Angeles", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-0700", "-7:00" },
+ { "zh", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "PDT", "America/Los_Angeles" },
+ { "zh", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "\\u5317\\u7f8e\\u592a\\u5e73\\u6d0b\\u590f\\u4ee4\\u65f6\\u95f4", "America/Los_Angeles" },
// icu zh.txt has exemplar city for this time zone
- { "zh", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "\\u6D1B\\u6749\\u77F6\\u65F6\\u95F4", "America/Los_Angeles" },
+ { "zh", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "PT", "America/Los_Angeles" },
{ "zh", "America/Los_Angeles", "2004-07-15T00:00:00Z", "vvvv", "\\u5317\\u7f8e\\u592a\\u5e73\\u6d0b\\u65f6\\u95f4", "America/Los_Angeles" },
+ // END android-change
{ "zh", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "zh", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-0300", "-3:00" },
- { "zh", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-0300", "-3:00" },
+ { "zh", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "zh", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\\u963f\\u6839\\u5ef7\\u6807\\u51c6\\u65f6\\u95f4", "-3:00" },
{ "zh", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "zh", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-0300", "-3:00" },
- { "zh", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-0300", "-3:00" },
+ { "zh", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "zh", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\\u963f\\u6839\\u5ef7\\u6807\\u51c6\\u65f6\\u95f4", "-3:00" },
{ "zh", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "\\u5E03\\u5B9C\\u8BFA\\u65AF\\u827E\\u5229\\u65AF\\u65F6\\u95F4", "America/Buenos_Aires" },
{ "zh", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "\\u963f\\u6839\\u5ef7\\u6807\\u51c6\\u65f6\\u95f4", "America/Buenos_Aires" },
{ "zh", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "zh", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-0300", "-3:00" },
- { "zh", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-0300", "-3:00" },
+ { "zh", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "zh", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\\u963f\\u6839\\u5ef7\\u6807\\u51c6\\u65f6\\u95f4", "-3:00" },
{ "zh", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "zh", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-0300", "-3:00" },
- { "zh", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-0300", "-3:00" },
+ { "zh", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "zh", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\\u963f\\u6839\\u5ef7\\u6807\\u51c6\\u65f6\\u95f4", "-3:00" },
{ "zh", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "\\u5E03\\u5B9C\\u8BFA\\u65AF\\u827E\\u5229\\u65AF\\u65F6\\u95F4", "America/Buenos_Aires" },
{ "zh", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "\\u963f\\u6839\\u5ef7\\u6807\\u51c6\\u65f6\\u95f4", "America/Buenos_Aires" },
{ "zh", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
{ "zh", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-0500", "-5:00" },
- { "zh", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-0500", "-5:00" },
+ { "zh", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-5", "-5:00" },
{ "zh", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "\\u53e4\\u5df4\\u6807\\u51c6\\u65f6\\u95f4", "-5:00" },
{ "zh", "America/Havana", "2004-07-15T00:00:00Z", "Z", "-0400", "-4:00" },
{ "zh", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-0400", "-4:00" },
- { "zh", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-0400", "-4:00" },
+ { "zh", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-4", "-4:00" },
{ "zh", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "\\u53e4\\u5df4\\u590f\\u4ee4\\u65f6\\u95f4", "-4:00" },
{ "zh", "America/Havana", "2004-07-15T00:00:00Z", "v", "\\u53e4\\u5df4\\u65f6\\u95f4", "America/Havana" },
{ "zh", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "\\u53e4\\u5df4\\u65f6\\u95f4", "America/Havana" },
{ "zh", "Australia/ACT", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
{ "zh", "Australia/ACT", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+1100", "+11:00" },
- { "zh", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+1100", "+11:00" },
+ { "zh", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
{ "zh", "Australia/ACT", "2004-01-15T00:00:00Z", "zzzz", "\\u6fb3\\u5927\\u5229\\u4e9a\\u4e1c\\u90e8\\u590f\\u4ee4\\u65f6\\u95f4", "+11:00" },
{ "zh", "Australia/ACT", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
{ "zh", "Australia/ACT", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+1000", "+10:00" },
- { "zh", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+1000", "+10:00" },
+ { "zh", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
{ "zh", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "\\u6fb3\\u5927\\u5229\\u4e9a\\u4e1c\\u90e8\\u6807\\u51c6\\u65f6\\u95f4", "+10:00" },
// icu zh.txt does not have info for this time zone
{ "zh", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "\\u6089\\u5C3C\\u65F6\\u95F4", "Australia/Sydney" },
@@ -2722,11 +2735,11 @@
{ "zh", "Australia/Sydney", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
{ "zh", "Australia/Sydney", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+1100", "+11:00" },
- { "zh", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+1100", "+11:00" },
+ { "zh", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
{ "zh", "Australia/Sydney", "2004-01-15T00:00:00Z", "zzzz", "\\u6fb3\\u5927\\u5229\\u4e9a\\u4e1c\\u90e8\\u590f\\u4ee4\\u65f6\\u95f4", "+11:00" },
{ "zh", "Australia/Sydney", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
{ "zh", "Australia/Sydney", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+1000", "+10:00" },
- { "zh", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+1000", "+10:00" },
+ { "zh", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
{ "zh", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "\\u6fb3\\u5927\\u5229\\u4e9a\\u4e1c\\u90e8\\u6807\\u51c6\\u65f6\\u95f4", "+10:00" },
{ "zh", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "\\u6089\\u5C3C\\u65F6\\u95F4", "Australia/Sydney" },
{ "zh", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "\\u6fb3\\u5927\\u5229\\u4e9a\\u4e1c\\u90e8\\u65f6\\u95f4", "Australia/Sydney" },
@@ -2734,15 +2747,12 @@
{ "zh", "Europe/London", "2004-01-15T00:00:00Z", "Z", "+0000", "+0:00" },
{ "zh", "Europe/London", "2004-01-15T00:00:00Z", "ZZZZ", "GMT", "+0:00" },
{ "zh", "Europe/London", "2004-01-15T00:00:00Z", "z", "GMT", "+0:00" },
- { "zh", "Europe/London", "2004-01-15T00:00:00Z", "V", "GMT", "+0:00" },
{ "zh", "Europe/London", "2004-01-15T00:00:00Z", "ZZZZ", "GMT", "+0:00" },
{ "zh", "Europe/London", "2004-01-15T00:00:00Z", "z", "GMT", "+0:00" },
- { "zh", "Europe/London", "2004-01-15T00:00:00Z", "V", "GMT", "+0:00" },
{ "zh", "Europe/London", "2004-01-15T00:00:00Z", "zzzz", "\\u683C\\u6797\\u5C3C\\u6CBB\\u6807\\u51C6\\u65F6\\u95F4", "+0:00" },
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "Z", "+0100", "+1:00" },
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+0100", "+1:00" },
- { "zh", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+0100", "+1:00" },
- { "zh", "Europe/London", "2004-07-15T00:00:00Z", "V", "GMT+0100", "+1:00" },
+ { "zh", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+1", "+1:00" },
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "zzzz", "\\u82f1\\u56fd\\u590f\\u4ee4\\u65f6\\u95f4", "+1:00" },
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "v", "\\u82f1\\u56fd\\u65f6\\u95f4", "Europe/London" },
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "vvvv", "\\u82f1\\u56fd\\u65f6\\u95f4", "Europe/London" },
@@ -2750,91 +2760,97 @@
{ "zh", "Etc/GMT+3", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "zh", "Etc/GMT+3", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-0300", "-3:00" },
- { "zh", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-0300", "-3:00" },
+ { "zh", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "zh", "Etc/GMT+3", "2004-01-15T00:00:00Z", "zzzz", "GMT-0300", "-3:00" },
{ "zh", "Etc/GMT+3", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "zh", "Etc/GMT+3", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-0300", "-3:00" },
- { "zh", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-0300", "-3:00" },
+ { "zh", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "zh", "Etc/GMT+3", "2004-07-15T00:00:00Z", "zzzz", "GMT-0300", "-3:00" },
- { "zh", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-0300", "-3:00" },
+ { "zh", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-3", "-3:00" },
{ "zh", "Etc/GMT+3", "2004-07-15T00:00:00Z", "vvvv", "GMT-0300", "-3:00" },
// JB#5150
{ "zh", "Asia/Calcutta", "2004-01-15T00:00:00Z", "Z", "+0530", "+5:30" },
{ "zh", "Asia/Calcutta", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+0530", "+5:30" },
- { "zh", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+0530", "+5:30" },
+ { "zh", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+530", "+5:30" },
{ "zh", "Asia/Calcutta", "2004-01-15T00:00:00Z", "zzzz", "\\u5370\\u5ea6\\u65f6\\u95f4", "+5:30" },
{ "zh", "Asia/Calcutta", "2004-07-15T00:00:00Z", "Z", "+0530", "+5:30" },
{ "zh", "Asia/Calcutta", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+0530", "+5:30" },
- { "zh", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+0530", "+05:30" },
+ { "zh", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+530", "+05:30" },
{ "zh", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "\\u5370\\u5ea6\\u65f6\\u95f4", "+5:30" },
{ "zh", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "\\u5370\\u5ea6\\u65f6\\u95f4", "Asia/Calcutta" },
{ "zh", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "\\u5370\\u5ea6\\u65f6\\u95f4", "Asia/Calcutta" },
+ // Proper CLDR primary zone support #9733
+ { "zh", "Asia/Shanghai", "2013-01-01T00:00:00Z", "VVVV", "\\u4e2d\\u56fd\\u65f6\\u95f4", "Asia/Shanghai" },
+ { "zh", "Asia/Harbin", "2013-01-01T00:00:00Z", "VVVV", "\\u54c8\\u5c14\\u6ee8\\u65f6\\u95f4", "Asia/Harbin" },
+
// ==========
{ "hi", "America/Los_Angeles", "2004-01-15T00:00:00Z", "Z", "-0800", "-8:00" },
{ "hi", "America/Los_Angeles", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-08:00", "-8:00" },
- { "hi", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "GMT-08:00", "-8:00" },
+ // BEGIN android-change
+ { "hi", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "PST", "-8:00" },
{ "hi", "America/Los_Angeles", "2004-01-15T00:00:00Z", "zzzz", "\\u092a\\u094d\\u0930\\u0936\\u093e\\u0902\\u0924\\u0020\\u092e\\u093e\\u0928\\u0915\\u0020\\u0938\\u092e\\u092f", "-8:00" },
{ "hi", "America/Los_Angeles", "2004-07-15T00:00:00Z", "Z", "-0700", "-7:00" },
{ "hi", "America/Los_Angeles", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-07:00", "-7:00" },
- { "hi", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "GMT-07:00", "-7:00" },
+ { "hi", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "PDT", "-7:00" },
{ "hi", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "\\u092A\\u094D\\u0930\\u0936\\u093E\\u0902\\u0924 \\u0926\\u093F\\u0935\\u093E\\u0935\\u0932\\u094B\\u0915 \\u0938\\u092E\\u092F", "-7:00" },
- { "hi", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "\\u0932\\u094B\\u0938 \\u090F\\u0902\\u091C\\u093F\\u0932\\u0947\\u0938 \\u0938\\u092E\\u092F", "America/Los_Angeles" },
+ { "hi", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "PT", "America/Los_Angeles" },
{ "hi", "America/Los_Angeles", "2004-07-15T00:00:00Z", "vvvv", "\\u092A\\u094D\\u0930\\u0936\\u093E\\u0902\\u0924 \\u0938\\u092E\\u092F", "America/Los_Angeles" },
+ // END android-change
{ "hi", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "hi", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "hi", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "hi", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "hi", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\\u0905\\u0930\\u094D\\u091C\\u0947\\u0902\\u091F\\u0940\\u0928\\u093E \\u092E\\u093E\\u0928\\u0915 \\u0938\\u092E\\u092F", "-3:00" },
{ "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\\u0905\\u0930\\u094D\\u091C\\u0947\\u0902\\u091F\\u0940\\u0928\\u093E \\u092E\\u093E\\u0928\\u0915 \\u0938\\u092E\\u092F", "-3:00" },
{ "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "\\u092C\\u094D\\u092F\\u0942\\u0928\\u0938 \\u0906\\u092F\\u0930\\u0938 \\u0938\\u092E\\u092F", "America/Buenos_Aires" },
{ "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "\\u0905\\u0930\\u094D\\u091C\\u0947\\u0902\\u091F\\u0940\\u0928\\u093E \\u092E\\u093E\\u0928\\u0915 \\u0938\\u092E\\u092F", "America/Buenos_Aires" },
{ "hi", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "hi", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "hi", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "hi", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "hi", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\\u0905\\u0930\\u094D\\u091C\\u0947\\u0902\\u091F\\u0940\\u0928\\u093E \\u092E\\u093E\\u0928\\u0915 \\u0938\\u092E\\u092F", "-3:00" },
{ "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\\u0905\\u0930\\u094D\\u091C\\u0947\\u0902\\u091F\\u0940\\u0928\\u093E \\u092E\\u093E\\u0928\\u0915 \\u0938\\u092E\\u092F", "-3:00" },
{ "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "\\u092C\\u094D\\u092F\\u0942\\u0928\\u0938 \\u0906\\u092F\\u0930\\u0938 \\u0938\\u092E\\u092F", "America/Buenos_Aires" },
{ "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "\\u0905\\u0930\\u094D\\u091C\\u0947\\u0902\\u091F\\u0940\\u0928\\u093E \\u092E\\u093E\\u0928\\u0915 \\u0938\\u092E\\u092F", "America/Buenos_Aires" },
{ "hi", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
{ "hi", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-05:00", "-5:00" },
- { "hi", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-05:00", "-5:00" },
+ { "hi", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-5", "-5:00" },
{ "hi", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "\\u0915\\u094d\\u092f\\u0942\\u092c\\u093e \\u0915\\u093e \\u092e\\u093e\\u0928\\u0915 \\u0938\\u092e\\u092f", "-5:00" },
{ "hi", "America/Havana", "2004-07-15T00:00:00Z", "Z", "-0400", "-4:00" },
{ "hi", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-04:00", "-4:00" },
- { "hi", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-04:00", "-4:00" },
+ { "hi", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-4", "-4:00" },
{ "hi", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "\\u0915\\u094d\\u092f\\u0942\\u092c\\u093e \\u0915\\u093e \\u0921\\u0947\\u0932\\u093e\\u0907\\u091f \\u091f\\u093e\\u0907\\u092e", "-4:00" },
{ "hi", "America/Havana", "2004-07-15T00:00:00Z", "v", "\\u0915\\u094d\\u092f\\u0942\\u092c\\u093e \\u0938\\u092E\\u092F", "America/Havana" },
{ "hi", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "\\u0915\\u094d\\u092f\\u0942\\u092c\\u093e \\u0915\\u093e \\u0938\\u092E\\u092F", "America/Havana" },
{ "hi", "Australia/ACT", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
{ "hi", "Australia/ACT", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
- { "hi", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
+ { "hi", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
{ "hi", "Australia/ACT", "2004-01-15T00:00:00Z", "zzzz", "\\u0911\\u0938\\u094D\\u200D\\u091F\\u094D\\u0930\\u0947\\u0932\\u093F\\u092F\\u093E\\u0908 \\u092A\\u0942\\u0930\\u094D\\u0935\\u0940 \\u0926\\u093F\\u0935\\u093E\\u0935\\u0932\\u094B\\u0915 \\u0938\\u092E\\u092F", "+11:00" },
{ "hi", "Australia/ACT", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
{ "hi", "Australia/ACT", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
- { "hi", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
+ { "hi", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
{ "hi", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "\\u0911\\u0938\\u094D\\u200D\\u091F\\u094D\\u0930\\u0947\\u0932\\u093F\\u092F\\u093E\\u0908 \\u092A\\u0942\\u0930\\u094D\\u0935\\u0940 \\u092E\\u093E\\u0928\\u0915 \\u0938\\u092E\\u092F", "+10:00" },
{ "hi", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "\\u0938\\u093F\\u0921\\u0928\\u0940 \\u0938\\u092E\\u092F", "Australia/Sydney" },
{ "hi", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "\\u092A\\u0942\\u0930\\u094D\\u0935\\u0940 \\u0911\\u0938\\u094D\\u091F\\u094D\\u0930\\u0947\\u0932\\u093F\\u092F\\u093E\\u0908 \\u0938\\u092E\\u092F", "Australia/Sydney" },
{ "hi", "Australia/Sydney", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
{ "hi", "Australia/Sydney", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
- { "hi", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
+ { "hi", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
{ "hi", "Australia/Sydney", "2004-01-15T00:00:00Z", "zzzz", "\\u0911\\u0938\\u094D\\u200D\\u091F\\u094D\\u0930\\u0947\\u0932\\u093F\\u092F\\u093E\\u0908 \\u092A\\u0942\\u0930\\u094D\\u0935\\u0940 \\u0926\\u093F\\u0935\\u093E\\u0935\\u0932\\u094B\\u0915 \\u0938\\u092E\\u092F", "+11:00" },
{ "hi", "Australia/Sydney", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
{ "hi", "Australia/Sydney", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
- { "hi", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
+ { "hi", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
{ "hi", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "\\u0911\\u0938\\u094D\\u200D\\u091F\\u094D\\u0930\\u0947\\u0932\\u093F\\u092F\\u093E\\u0908 \\u092A\\u0942\\u0930\\u094D\\u0935\\u0940 \\u092E\\u093E\\u0928\\u0915 \\u0938\\u092E\\u092F", "+10:00" },
{ "hi", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "\\u0938\\u093F\\u0921\\u0928\\u0940 \\u0938\\u092E\\u092F", "Australia/Sydney" },
{ "hi", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "\\u092A\\u0942\\u0930\\u094D\\u0935\\u0940 \\u0911\\u0938\\u094D\\u091F\\u094D\\u0930\\u0947\\u0932\\u093F\\u092F\\u093E\\u0908 \\u0938\\u092E\\u092F", "Australia/Sydney" },
@@ -2845,20 +2861,20 @@
{ "hi", "Europe/London", "2004-01-15T00:00:00Z", "zzzz", "\\u0917\\u094d\\u0930\\u0940\\u0928\\u0935\\u093f\\u091a \\u092e\\u0940\\u0928 \\u091f\\u093e\\u0907\\u092e", "+0:00" },
{ "hi", "Europe/London", "2004-07-15T00:00:00Z", "Z", "+0100", "+1:00" },
{ "hi", "Europe/London", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+01:00", "+1:00" },
- { "hi", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+01:00", "+1:00" },
+ { "hi", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+1", "+1:00" },
{ "hi", "Europe/London", "2004-07-15T00:00:00Z", "zzzz", "GMT+01:00", "+1:00" },
- { "hi", "Europe/London", "2004-07-15T00:00:00Z", "v", "\\u092C\\u094D\\u0930\\u093F\\u0924\\u0928 \\u0938\\u092E\\u092F", "Europe/London" },
- { "hi", "Europe/London", "2004-07-15T00:00:00Z", "vvvv", "\\u092C\\u094D\\u0930\\u093F\\u0924\\u0928 \\u0938\\u092E\\u092F", "Europe/London" },
+ { "hi", "Europe/London", "2004-07-15T00:00:00Z", "v", "\\u092C\\u094D\\u0930\\u093F\\u091F\\u0947\\u0928 \\u0938\\u092E\\u092F", "Europe/London" },
+ { "hi", "Europe/London", "2004-07-15T00:00:00Z", "vvvv", "\\u092C\\u094D\\u0930\\u093F\\u091F\\u0947\\u0928 \\u0938\\u092E\\u092F", "Europe/London" },
{ "hi", "Etc/GMT+3", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "hi", "Etc/GMT+3", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "hi", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "hi", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "hi", "Etc/GMT+3", "2004-01-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
{ "hi", "Etc/GMT+3", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "hi", "Etc/GMT+3", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "hi", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "hi", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "hi", "Etc/GMT+3", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
- { "hi", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-03:00", "-3:00" },
+ { "hi", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-3", "-3:00" },
{ "hi", "Etc/GMT+3", "2004-07-15T00:00:00Z", "vvvv", "GMT-03:00", "-3:00" },
{ "hi", "Asia/Calcutta", "2004-01-15T00:00:00Z", "Z", "+0530", "+5:30" },
@@ -2878,39 +2894,37 @@
{ "bg", "America/Los_Angeles", "2004-01-15T00:00:00Z", "ZZZZ", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0800", "-8:00" },
// BEGIN android-change
{ "bg", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "PST", "America/Los_Angeles" },
- { "bg", "America/Los_Angeles", "2004-01-15T00:00:00Z", "V", "PST", "America/Los_Angeles" },
- // END android-change
+ { "bg", "America/Los_Angeles", "2004-01-15T00:00:00Z", "V", "uslax", "America/Los_Angeles" },
{ "bg", "America/Los_Angeles", "2004-01-15T00:00:00Z", "zzzz", "\\u0422\\u0438\\u0445\\u043E\\u043E\\u043A\\u0435\\u0430\\u043D\\u0441\\u043A\\u0430 \\u0447\\u0430\\u0441\\u043E\\u0432\\u0430 \\u0437\\u043E\\u043D\\u0430", "America/Los_Angeles" },
{ "bg", "America/Los_Angeles", "2004-07-15T00:00:00Z", "Z", "-0700", "-7:00" },
{ "bg", "America/Los_Angeles", "2004-07-15T00:00:00Z", "ZZZZ", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0700", "-7:00" },
- // BEGIN android-change
{ "bg", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "PDT", "America/Los_Angeles" },
- { "bg", "America/Los_Angeles", "2004-07-15T00:00:00Z", "V", "PDT", "America/Los_Angeles" },
- // END android-change
+ { "bg", "America/Los_Angeles", "2004-07-15T00:00:00Z", "V", "uslax", "America/Los_Angeles" },
{ "bg", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "\\u0422\\u0438\\u0445\\u043E\\u043E\\u043A\\u0435\\u0430\\u043D\\u0441\\u043A\\u0430 \\u043B\\u044F\\u0442\\u043D\\u0430 \\u0447\\u0430\\u0441\\u043E\\u0432\\u0430 \\u0437\\u043E\\u043D\\u0430", "America/Los_Angeles" },
// icu bg.txt has exemplar city for this time zone
- { "bg", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "\\u041B\\u043E\\u0441 \\u0410\\u043D\\u0436\\u0435\\u043B\\u0438\\u0441 \\u0432\\u0440\\u0435\\u043C\\u0435", "America/Los_Angeles" },
+ { "bg", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "PT", "America/Los_Angeles" },
{ "bg", "America/Los_Angeles", "2004-07-15T00:00:00Z", "vvvv", "\\u0422\\u0438\\u0445\\u043E\\u043E\\u043A\\u0435\\u0430\\u043D\\u0441\\u043A\\u043E \\u0432\\u0440\\u0435\\u043C\\u0435", "America/Los_Angeles" },
{ "bg", "America/Los_Angeles", "2004-07-15T00:00:00Z", "VVVV", "\\u041B\\u043E\\u0441 \\u0410\\u043D\\u0436\\u0435\\u043B\\u0438\\u0441 \\u0432\\u0440\\u0435\\u043C\\u0435", "America/Los_Angeles" },
+ // END android-change
{ "bg", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "bg", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0300", "-3:00" },
- { "bg", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0300", "-3:00" },
+ { "bg", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-3", "-3:00" },
{ "bg", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\\u0410\\u0440\\u0436\\u0435\\u043D\\u0442\\u0438\\u043D\\u0430 \\u2013 \\u0441\\u0442\\u0430\\u043d\\u0434\\u0430\\u0440\\u0442\\u043d\\u043e \\u0432\\u0440\\u0435\\u043c\\u0435", "-3:00" },
{ "bg", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "bg", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0300", "-3:00" },
- { "bg", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0300", "-3:00" },
+ { "bg", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-3", "-3:00" },
{ "bg", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\\u0410\\u0440\\u0436\\u0435\\u043D\\u0442\\u0438\\u043D\\u0430 \\u2013 \\u0441\\u0442\\u0430\\u043d\\u0434\\u0430\\u0440\\u0442\\u043d\\u043e \\u0432\\u0440\\u0435\\u043c\\u0435", "-3:00" },
{ "bg", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "\\u0411\\u0443\\u0435\\u043D\\u043E\\u0441 \\u0410\\u0439\\u0440\\u0435\\u0441 \\u0432\\u0440\\u0435\\u043C\\u0435", "America/Buenos_Aires" },
{ "bg", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "\\u0410\\u0440\\u0436\\u0435\\u043D\\u0442\\u0438\\u043D\\u0430 \\u2013 \\u0441\\u0442\\u0430\\u043d\\u0434\\u0430\\u0440\\u0442\\u043d\\u043e \\u0432\\u0440\\u0435\\u043c\\u0435", "America/Buenos_Aires" },
{ "bg", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "bg", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0300", "-3:00" },
- { "bg", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0300", "-3:00" },
+ { "bg", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-3", "-3:00" },
{ "bg", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\\u0410\\u0440\\u0436\\u0435\\u043D\\u0442\\u0438\\u043D\\u0430 \\u2013 \\u0441\\u0442\\u0430\\u043d\\u0434\\u0430\\u0440\\u0442\\u043d\\u043e \\u0432\\u0440\\u0435\\u043c\\u0435", "-3:00" },
{ "bg", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "bg", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0300", "-3:00" },
- { "bg", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0300", "-3:00" },
+ { "bg", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-3", "-3:00" },
{ "bg", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\\u0410\\u0440\\u0436\\u0435\\u043D\\u0442\\u0438\\u043D\\u0430 \\u2013 \\u0441\\u0442\\u0430\\u043d\\u0434\\u0430\\u0440\\u0442\\u043d\\u043e \\u0432\\u0440\\u0435\\u043c\\u0435", "-3:00" },
// icu bg.txt does not have info for this time zone
{ "bg", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "\\u0411\\u0443\\u0435\\u043D\\u043E\\u0441 \\u0410\\u0439\\u0440\\u0435\\u0441 \\u0432\\u0440\\u0435\\u043C\\u0435", "America/Buenos_Aires" },
@@ -2918,69 +2932,67 @@
{ "bg", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
{ "bg", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0500", "-5:00" },
- { "bg", "America/Havana", "2004-01-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0500", "-5:00" },
+ { "bg", "America/Havana", "2004-01-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-5", "-5:00" },
{ "bg", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "\\u041a\\u0443\\u0431\\u0438\\u043d\\u0441\\u043a\\u043e \\u0441\\u0442\\u0430\\u043d\\u0434\\u0430\\u0440\\u0442\\u043d\\u043e \\u0432\\u0440\\u0435\\u043c\\u0435", "-5:00" },
{ "bg", "America/Havana", "2004-07-15T00:00:00Z", "Z", "-0400", "-4:00" },
{ "bg", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0400", "-4:00" },
- { "bg", "America/Havana", "2004-07-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0400", "-4:00" },
+ { "bg", "America/Havana", "2004-07-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-4", "-4:00" },
{ "bg", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "\\u041a\\u0443\\u0431\\u0438\\u043d\\u0441\\u043a\\u043e \\u043b\\u044f\\u0442\\u043d\\u043e \\u0447\\u0430\\u0441\\u043e\\u0432\\u043e \\u0432\\u0440\\u0435\\u043c\\u0435", "-4:00" },
{ "bg", "America/Havana", "2004-07-15T00:00:00Z", "v", "\\u041a\\u0443\\u0431\\u0430 \\u0432\\u0440\\u0435\\u043C\\u0435", "America/Havana" },
{ "bg", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "\\u041a\\u0443\\u0431\\u0438\\u043d\\u0441\\u043a\\u043e \\u0432\\u0440\\u0435\\u043C\\u0435", "America/Havana" },
{ "bg", "Australia/ACT", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
{ "bg", "Australia/ACT", "2004-01-15T00:00:00Z", "ZZZZ", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+1100", "+11:00" },
- { "bg", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+1100", "+11:00" },
+ { "bg", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+11", "+11:00" },
{ "bg", "Australia/ACT", "2004-01-15T00:00:00Z", "zzzz", "\\u0410\\u0432\\u0441\\u0442\\u0440\\u0430\\u043B\\u0438\\u044F \\u2013 \\u0438\\u0437\\u0442\\u043E\\u0447\\u043D\\u043E \\u043B\\u044F\\u0442\\u043D\\u043E \\u0447\\u0430\\u0441\\u043E\\u0432\\u043E \\u0432\\u0440\\u0435\\u043C\\u0435", "+11:00" },
{ "bg", "Australia/ACT", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
{ "bg", "Australia/ACT", "2004-07-15T00:00:00Z", "ZZZZ", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+1000", "+10:00" },
- { "bg", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+1000", "+10:00" },
+ { "bg", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+10", "+10:00" },
{ "bg", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "\\u0410\\u0432\\u0441\\u0442\\u0440\\u0430\\u043B\\u0438\\u044F \\u2013 \\u0438\\u0437\\u0442\\u043E\\u0447\\u043D\\u043E \\u0441\\u0442\\u0430\\u043D\\u0434\\u0430\\u0440\\u0442\\u043D\\u043E \\u0432\\u0440\\u0435\\u043C\\u0435", "+10:00" },
{ "bg", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "\\u0421\\u0438\\u0434\\u043D\\u0438 \\u0432\\u0440\\u0435\\u043C\\u0435", "Australia/Sydney" },
{ "bg", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "\\u0410\\u0432\\u0441\\u0442\\u0440\\u0430\\u043B\\u0438\\u044F \\u2013 \\u0438\\u0437\\u0442\\u043E\\u0447\\u043D\\u043E \\u0432\\u0440\\u0435\\u043C\\u0435", "Australia/Sydney" },
{ "bg", "Australia/Sydney", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
{ "bg", "Australia/Sydney", "2004-01-15T00:00:00Z", "ZZZZ", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+1100", "+11:00" },
- { "bg", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+1100", "+11:00" },
+ { "bg", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+11", "+11:00" },
{ "bg", "Australia/Sydney", "2004-01-15T00:00:00Z", "zzzz", "\\u0410\\u0432\\u0441\\u0442\\u0440\\u0430\\u043B\\u0438\\u044F \\u2013 \\u0438\\u0437\\u0442\\u043E\\u0447\\u043D\\u043E \\u043B\\u044F\\u0442\\u043D\\u043E \\u0447\\u0430\\u0441\\u043E\\u0432\\u043E \\u0432\\u0440\\u0435\\u043C\\u0435", "+11:00" },
{ "bg", "Australia/Sydney", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
{ "bg", "Australia/Sydney", "2004-07-15T00:00:00Z", "ZZZZ", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+1000", "+10:00" },
- { "bg", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+1000", "+10:00" },
+ { "bg", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+10", "+10:00" },
{ "bg", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "\\u0410\\u0432\\u0441\\u0442\\u0440\\u0430\\u043B\\u0438\\u044F \\u2013 \\u0438\\u0437\\u0442\\u043E\\u0447\\u043D\\u043E \\u0441\\u0442\\u0430\\u043D\\u0434\\u0430\\u0440\\u0442\\u043D\\u043E \\u0432\\u0440\\u0435\\u043C\\u0435", "+10:00" },
{ "bg", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "\\u0421\\u0438\\u0434\\u043D\\u0438 \\u0432\\u0440\\u0435\\u043C\\u0435", "Australia/Sydney" },
{ "bg", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "\\u0410\\u0432\\u0441\\u0442\\u0440\\u0430\\u043B\\u0438\\u044F \\u2013 \\u0438\\u0437\\u0442\\u043E\\u0447\\u043D\\u043E \\u0432\\u0440\\u0435\\u043C\\u0435", "Australia/Sydney" },
{ "bg", "Europe/London", "2004-01-15T00:00:00Z", "Z", "+0000", "+0:00" },
{ "bg", "Europe/London", "2004-01-15T00:00:00Z", "ZZZZ", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447", "+0:00" },
- // BEGIN android-change
{ "bg", "Europe/London", "2004-01-15T00:00:00Z", "z", "GMT", "+0:00" },
- // END android-change
{ "bg", "Europe/London", "2004-01-15T00:00:00Z", "zzzz", "\\u0427\\u0430\\u0441\\u043E\\u0432\\u0430 \\u0437\\u043E\\u043D\\u0430 \\u0413\\u0440\\u0438\\u043D\\u0443\\u0438\\u0447", "+0:00" },
{ "bg", "Europe/London", "2004-07-15T00:00:00Z", "Z", "+0100", "+1:00" },
{ "bg", "Europe/London", "2004-07-15T00:00:00Z", "ZZZZ", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+0100", "+1:00" },
- { "bg", "Europe/London", "2004-07-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+0100", "+1:00" },
+ { "bg", "Europe/London", "2004-07-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+1", "+1:00" },
{ "bg", "Europe/London", "2004-07-15T00:00:00Z", "zzzz", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+0100", "+1:00" },
{ "bg", "Europe/London", "2004-07-15T00:00:00Z", "v", "\\u041e\\u0431\\u0435\\u0434\\u0438\\u043d\\u0435\\u043d\\u043e \\u043a\\u0440\\u0430\\u043b\\u0441\\u0442\\u0432\\u043e \\u0432\\u0440\\u0435\\u043C\\u0435", "Europe/London" },
{ "bg", "Europe/London", "2004-07-15T00:00:00Z", "vvvv", "\\u041e\\u0431\\u0435\\u0434\\u0438\\u043d\\u0435\\u043d\\u043e \\u043a\\u0440\\u0430\\u043b\\u0441\\u0442\\u0432\\u043e \\u0432\\u0440\\u0435\\u043C\\u0435", "Europe/London" },
{ "bg", "Etc/GMT+3", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "bg", "Etc/GMT+3", "2004-01-15T00:00:00Z", "ZZZZ", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0300", "-3:00" },
- { "bg", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0300", "-3:00" },
+ { "bg", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-3", "-3:00" },
{ "bg", "Etc/GMT+3", "2004-01-15T00:00:00Z", "zzzz", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0300", "-3:00" },
{ "bg", "Etc/GMT+3", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "bg", "Etc/GMT+3", "2004-07-15T00:00:00Z", "ZZZZ", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0300", "-3:00" },
- { "bg", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0300", "-3:00" },
+ { "bg", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-3", "-3:00" },
{ "bg", "Etc/GMT+3", "2004-07-15T00:00:00Z", "zzzz", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0300", "-3:00" },
- { "bg", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0300", "-3:00" },
+ { "bg", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-3", "-3:00" },
{ "bg", "Etc/GMT+3", "2004-07-15T00:00:00Z", "vvvv", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447-0300", "-3:00" },
// JB#5150
{ "bg", "Asia/Calcutta", "2004-01-15T00:00:00Z", "Z", "+0530", "+5:30" },
{ "bg", "Asia/Calcutta", "2004-01-15T00:00:00Z", "ZZZZ", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+0530", "+5:30" },
- { "bg", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+0530", "+5:30" },
+ { "bg", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+530", "+5:30" },
{ "bg", "Asia/Calcutta", "2004-01-15T00:00:00Z", "zzzz", "\\u0418\\u043d\\u0434\\u0438\\u0439\\u0441\\u043a\\u043e \\u0441\\u0442\\u0430\\u043d\\u0434\\u0430\\u0440\\u0442\\u043d\\u043e \\u0432\\u0440\\u0435\\u043c\\u0435", "+5:30" },
{ "bg", "Asia/Calcutta", "2004-07-15T00:00:00Z", "Z", "+0530", "+5:30" },
{ "bg", "Asia/Calcutta", "2004-07-15T00:00:00Z", "ZZZZ", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+0530", "+5:30" },
- { "bg", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+0530", "+05:30" },
+ { "bg", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "\\u0413\\u0440\\u0438\\u0438\\u043D\\u0443\\u0438\\u0447+530", "+05:30" },
{ "bg", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "\\u0418\\u043d\\u0434\\u0438\\u0439\\u0441\\u043a\\u043e \\u0441\\u0442\\u0430\\u043d\\u0434\\u0430\\u0440\\u0442\\u043d\\u043e \\u0432\\u0440\\u0435\\u043c\\u0435", "+5:30" },
{ "bg", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "\\u0418\\u043D\\u0434\\u0438\\u044F \\u0432\\u0440\\u0435\\u043C\\u0435", "Asia/Calcutta" },
{ "bg", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "\\u0418\\u043d\\u0434\\u0438\\u0439\\u0441\\u043a\\u043e \\u0441\\u0442\\u0430\\u043d\\u0434\\u0430\\u0440\\u0442\\u043d\\u043e \\u0432\\u0440\\u0435\\u043c\\u0435", "Asia/Calcutta" },
@@ -2988,26 +3000,26 @@
{ "ja", "America/Los_Angeles", "2004-01-15T00:00:00Z", "Z", "-0800", "-8:00" },
{ "ja", "America/Los_Angeles", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-08:00", "-8:00" },
- { "ja", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "GMT-08:00", "America/Los_Angeles" },
- { "ja", "America/Los_Angeles", "2004-01-15T00:00:00Z", "V", "GMT-08:00", "America/Los_Angeles" },
+ // BEGIN android-change
+ { "ja", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "PST", "America/Los_Angeles" },
{ "ja", "America/Los_Angeles", "2004-01-15T00:00:00Z", "zzzz", "\\u30a2\\u30e1\\u30ea\\u30ab\\u592a\\u5e73\\u6d0b\\u6a19\\u6e96\\u6642", "America/Los_Angeles" },
{ "ja", "America/Los_Angeles", "2004-07-15T00:00:00Z", "Z", "-0700", "-700" },
{ "ja", "America/Los_Angeles", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-07:00", "-7:00" },
- { "ja", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "GMT-07:00", "America/Los_Angeles" },
- { "ja", "America/Los_Angeles", "2004-07-15T00:00:00Z", "V", "GMT-07:00", "America/Los_Angeles" },
+ { "ja", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "PDT", "America/Los_Angeles" },
{ "ja", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "\\u30a2\\u30e1\\u30ea\\u30ab\\u592a\\u5e73\\u6d0b\\u590f\\u6642\\u9593", "America/Los_Angeles" },
// icu ja.txt has exemplar city for this time zone
- { "ja", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "\\u30ED\\u30B5\\u30F3\\u30BC\\u30EB\\u30B9\\u6642\\u9593", "America/Los_Angeles" },
+ { "ja", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "PT", "America/Los_Angeles" },
{ "ja", "America/Los_Angeles", "2004-07-15T00:00:00Z", "vvvv", "\\u30A2\\u30E1\\u30EA\\u30AB\\u592A\\u5e73\\u6D0B\\u6642\\u9593", "America/Los_Angeles" },
{ "ja", "America/Los_Angeles", "2004-07-15T00:00:00Z", "VVVV", "\\u30ED\\u30B5\\u30F3\\u30BC\\u30EB\\u30B9\\u6642\\u9593", "America/Los_Angeles" },
+ // END Android-change
{ "ja", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "ja", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "ja", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "ja", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "ja", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\\u30A2\\u30EB\\u30BC\\u30F3\\u30C1\\u30F3\\u6A19\\u6E96\\u6642", "-3:00" },
{ "ja", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "ja", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "ja", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "ja", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "ja", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\\u30A2\\u30EB\\u30BC\\u30F3\\u30C1\\u30F3\\u6A19\\u6E96\\u6642", "-3:00" },
// icu ja.txt does not have info for this time zone
{ "ja", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "\\u30D6\\u30A8\\u30CE\\u30B9\\u30A2\\u30A4\\u30EC\\u30B9\\u6642\\u9593", "America/Buenos_Aires" },
@@ -3015,33 +3027,33 @@
{ "ja", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "ja", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "ja", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "ja", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "ja", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\\u30A2\\u30EB\\u30BC\\u30F3\\u30C1\\u30F3\\u6A19\\u6E96\\u6642", "-3:00" },
{ "ja", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "ja", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "ja", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "ja", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "ja", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\\u30A2\\u30EB\\u30BC\\u30F3\\u30C1\\u30F3\\u6A19\\u6E96\\u6642", "-3:00" },
{ "ja", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "\\u30D6\\u30A8\\u30CE\\u30B9\\u30A2\\u30A4\\u30EC\\u30B9\\u6642\\u9593", "America/Buenos_Aires" },
{ "ja", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "\\u30A2\\u30EB\\u30BC\\u30F3\\u30C1\\u30F3\\u6A19\\u6E96\\u6642", "America/Buenos_Aires" },
{ "ja", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
{ "ja", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-05:00", "-5:00" },
- { "ja", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-05:00", "-5:00" },
+ { "ja", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-5", "-5:00" },
{ "ja", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "\\u30AD\\u30E5\\u30FC\\u30D0\\u6A19\\u6E96\\u6642", "-5:00" },
{ "ja", "America/Havana", "2004-07-15T00:00:00Z", "Z", "-0400", "-4:00" },
{ "ja", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-04:00", "-4:00" },
- { "ja", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-04:00", "-4:00" },
+ { "ja", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-4", "-4:00" },
{ "ja", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "\\u30AD\\u30E5\\u30FC\\u30D0\\u590F\\u6642\\u9593", "-4:00" },
{ "ja", "America/Havana", "2004-07-15T00:00:00Z", "v", "\\u30ad\\u30e5\\u30fc\\u30d0\\u6642\\u9593", "America/Havana" },
{ "ja", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "\\u30ad\\u30e5\\u30fc\\u30d0\\u6642\\u9593", "America/Havana" },
{ "ja", "Australia/ACT", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
{ "ja", "Australia/ACT", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
- { "ja", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
+ { "ja", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
{ "ja", "Australia/ACT", "2004-01-15T00:00:00Z", "zzzz", "\\u30AA\\u30FC\\u30B9\\u30C8\\u30E9\\u30EA\\u30A2\\u6771\\u90E8\\u590F\\u6642\\u9593", "+11:00" },
{ "ja", "Australia/ACT", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
{ "ja", "Australia/ACT", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
- { "ja", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
+ { "ja", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
{ "ja", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "\\u30AA\\u30FC\\u30B9\\u30C8\\u30E9\\u30EA\\u30A2\\u6771\\u90E8\\u6A19\\u6E96\\u6642", "+10:00" },
// icu ja.txt does not have info for this time zone
{ "ja", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "\\u30B7\\u30C9\\u30CB\\u30FC\\u6642\\u9593", "Australia/Sydney" },
@@ -3049,11 +3061,11 @@
{ "ja", "Australia/Sydney", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
{ "ja", "Australia/Sydney", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
- { "ja", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
+ { "ja", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
{ "ja", "Australia/Sydney", "2004-01-15T00:00:00Z", "zzzz", "\\u30AA\\u30FC\\u30B9\\u30C8\\u30E9\\u30EA\\u30A2\\u6771\\u90E8\\u590F\\u6642\\u9593", "+11:00" },
{ "ja", "Australia/Sydney", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
{ "ja", "Australia/Sydney", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
- { "ja", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
+ { "ja", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
{ "ja", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "\\u30AA\\u30FC\\u30B9\\u30C8\\u30E9\\u30EA\\u30A2\\u6771\\u90E8\\u6A19\\u6E96\\u6642", "+10:00" },
{ "ja", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "\\u30B7\\u30C9\\u30CB\\u30FC\\u6642\\u9593", "Australia/Sydney" },
{ "ja", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "\\u30AA\\u30FC\\u30B9\\u30C8\\u30E9\\u30EA\\u30A2\\u6771\\u90E8\\u6642\\u9593", "Australia/Sydney" },
@@ -3061,12 +3073,10 @@
{ "ja", "Europe/London", "2004-01-15T00:00:00Z", "Z", "+0000", "+0:00" },
{ "ja", "Europe/London", "2004-01-15T00:00:00Z", "ZZZZ", "GMT", "+0:00" },
{ "ja", "Europe/London", "2004-01-15T00:00:00Z", "z", "GMT", "+0:00" },
- { "ja", "Europe/London", "2004-01-15T00:00:00Z", "V", "GMT", "+0:00" },
{ "ja", "Europe/London", "2004-01-15T00:00:00Z", "zzzz", "\\u30B0\\u30EA\\u30CB\\u30C3\\u30B8\\u6A19\\u6E96\\u6642", "+0:00" },
{ "ja", "Europe/London", "2004-07-15T00:00:00Z", "Z", "+0100", "+1:00" },
{ "ja", "Europe/London", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+01:00", "+1:00" },
- { "ja", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+01:00", "+1:00" },
- { "ja", "Europe/London", "2004-07-15T00:00:00Z", "V", "GMT+01:00", "+1:00" },
+ { "ja", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+1", "+1:00" },
{ "ja", "Europe/London", "2004-07-15T00:00:00Z", "zzzz", "\\u82f1\\u56fd\\u590f\\u6642\\u9593", "+1:00" },
{ "ja", "Europe/London", "2004-07-15T00:00:00Z", "v", "\\u30a4\\u30ae\\u30ea\\u30b9\\u6642\\u9593", "Europe/London" },
{ "ja", "Europe/London", "2004-07-15T00:00:00Z", "vvvv", "\\u30a4\\u30ae\\u30ea\\u30b9\\u6642\\u9593", "Europe/London" },
@@ -3074,23 +3084,23 @@
{ "ja", "Etc/GMT+3", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "ja", "Etc/GMT+3", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "ja", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "ja", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "ja", "Etc/GMT+3", "2004-01-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
{ "ja", "Etc/GMT+3", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "ja", "Etc/GMT+3", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "ja", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "ja", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "ja", "Etc/GMT+3", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
- { "ja", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-03:00", "-3:00" },
+ { "ja", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-3", "-3:00" },
{ "ja", "Etc/GMT+3", "2004-07-15T00:00:00Z", "vvvv", "GMT-03:00", "-3:00" },
// JB#5150
{ "ja", "Asia/Calcutta", "2004-01-15T00:00:00Z", "Z", "+0530", "+5:30" },
{ "ja", "Asia/Calcutta", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
- { "ja", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+05:30", "+5:30" },
+ { "ja", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+5:30", "+5:30" },
{ "ja", "Asia/Calcutta", "2004-01-15T00:00:00Z", "zzzz", "\\u30A4\\u30F3\\u30C9\\u6642\\u9593", "+5:30" },
{ "ja", "Asia/Calcutta", "2004-07-15T00:00:00Z", "Z", "+0530", "+5:30" },
{ "ja", "Asia/Calcutta", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
- { "ja", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+05:30", "+05:30" },
+ { "ja", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+5:30", "+05:30" },
{ "ja", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "\\u30A4\\u30F3\\u30C9\\u6642\\u9593", "+5:30" },
{ "ja", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "\\u30A4\\u30F3\\u30C9\\u6642\\u9593", "Asia/Calcutta" },
{ "ja", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "\\u30A4\\u30F3\\u30C9\\u6642\\u9593", "Asia/Calcutta" },
@@ -3099,66 +3109,68 @@
{ "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "Z", "-0800", "-8:00" },
{ "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-08:00", "-8:00" },
- { "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "GMT-08:00", "-8:00" },
+ // BEGIN Android-change
+ { "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "PST", "-8:00" },
{ "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "zzzz", "GMT-08:00", "-8:00" },
{ "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "Z", "-0700", "-7:00" },
{ "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-07:00", "-7:00" },
- { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "GMT-07:00", "-7:00" },
+ { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "PDT", "-7:00" },
{ "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "GMT-07:00", "-7:00" },
- { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "Los Angeles", "America/Los_Angeles" },
+ { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "PT", "America/Los_Angeles" },
{ "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "vvvv", "Los Angeles", "America/Los_Angeles" },
+ // END Android-change
{ "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
{ "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
{ "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Buenos Aires", "America/Buenos_Aires" },
{ "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Buenos Aires", "America/Buenos_Aires" },
{ "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
{ "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
{ "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Buenos Aires", "America/Buenos_Aires" },
{ "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Buenos Aires", "America/Buenos_Aires" },
{ "ti", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
{ "ti", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-05:00", "-5:00" },
- { "ti", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-05:00", "-5:00" },
+ { "ti", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-5", "-5:00" },
{ "ti", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "GMT-05:00", "-5:00" },
{ "ti", "America/Havana", "2004-07-15T00:00:00Z", "Z", "-0400", "-4:00" },
{ "ti", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-04:00", "-4:00" },
- { "ti", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-04:00", "-4:00" },
+ { "ti", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-4", "-4:00" },
{ "ti", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "GMT-04:00", "-4:00" },
{ "ti", "America/Havana", "2004-07-15T00:00:00Z", "v", "CU", "America/Havana" },
{ "ti", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "CU", "America/Havana" },
{ "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
{ "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
- { "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
+ { "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
{ "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "zzzz", "GMT+11:00", "+11:00" },
{ "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
{ "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
- { "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
+ { "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
{ "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "GMT+10:00", "+10:00" },
{ "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "Sydney", "Australia/Sydney" },
{ "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "Sydney", "Australia/Sydney" },
{ "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
{ "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
- { "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
+ { "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
{ "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "zzzz", "GMT+11:00", "+11:00" },
{ "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
{ "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
- { "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
+ { "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
{ "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "GMT+10:00", "+10:00" },
{ "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "Sydney", "Australia/Sydney" },
{ "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "Sydney", "Australia/Sydney" },
@@ -3169,30 +3181,30 @@
{ "ti", "Europe/London", "2004-01-15T00:00:00Z", "zzzz", "GMT", "+0:00" },
{ "ti", "Europe/London", "2004-07-15T00:00:00Z", "Z", "+0100", "+1:00" },
{ "ti", "Europe/London", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+01:00", "+1:00" },
- { "ti", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+01:00", "+1:00" },
+ { "ti", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+1", "+1:00" },
{ "ti", "Europe/London", "2004-07-15T00:00:00Z", "zzzz", "GMT+01:00", "+1:00" },
{ "ti", "Europe/London", "2004-07-15T00:00:00Z", "v", "GB", "Europe/London" },
{ "ti", "Europe/London", "2004-07-15T00:00:00Z", "vvvv", "GB", "Europe/London" },
{ "ti", "Etc/GMT+3", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "ti", "Etc/GMT+3", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "ti", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "ti", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "ti", "Etc/GMT+3", "2004-01-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
{ "ti", "Etc/GMT+3", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "ti", "Etc/GMT+3", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
- { "ti", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
+ { "ti", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
{ "ti", "Etc/GMT+3", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
- { "ti", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-03:00", "-3:00" },
+ { "ti", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-3", "-3:00" },
{ "ti", "Etc/GMT+3", "2004-07-15T00:00:00Z", "vvvv", "GMT-03:00", "-3:00" },
// JB#5150
{ "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "Z", "+0530", "+5:30" },
{ "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
- { "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+05:30", "+5:30" },
+ { "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+5:30", "+5:30" },
{ "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "zzzz", "GMT+05:30", "+5:30" },
{ "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "Z", "+0530", "+5:30" },
{ "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
- { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+05:30", "+05:30" },
+ { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+5:30", "+05:30" },
{ "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "GMT+05:30", "+5:30" },
{ "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "IN", "Alna/Calcutta" },
{ "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "IN", "Asia/Calcutta" },
@@ -3210,8 +3222,8 @@
{ "en_GB", "Europe/Paris", "2004-07-15T00:00:00Z", "z", "CEST", "+2:00"},
{ "en_HK", "Europe/Paris", "2004-01-15T00:00:00Z", "zzzz", "Central European Standard Time", "+1:00"},
{ "en_HK", "Europe/Paris", "2004-07-15T00:00:00Z", "zzzz", "Central European Summer Time", "+2:00"},
- { "en_HK", "Europe/Paris", "2004-01-15T00:00:00Z", "z", "GMT+01:00", "+1:00"},
- { "en_HK", "Europe/Paris", "2004-07-15T00:00:00Z", "z", "GMT+02:00", "+2:00"},
+ { "en_HK", "Europe/Paris", "2004-01-15T00:00:00Z", "z", "GMT+1", "+1:00"},
+ { "en_HK", "Europe/Paris", "2004-07-15T00:00:00Z", "z", "GMT+2", "+2:00"},
{ NULL, NULL, NULL, NULL, NULL, NULL },
};
@@ -3557,9 +3569,15 @@
"HH:mm:ss vvvv", "10:20:30 UT+10:00", "10:20:30 +1000",
"HH:mm:ss zzzz", "10:20:30 UTC", "10:20:30 +0000", // standalone "UTC"
"ZZZZ HH:mm:ss", "UT 10:20:30", "10:20:30 +0000",
- "V HH:mm:ss", "UT+0130 10:20:30", "10:20:30 +0130",
- "V HH:mm:ss", "UTC+0130 10:20:30", "10:20:30 +0130",
- "HH mm Z ss", "10 20 GMT-1100 30", "10:20:30 -1100",
+ "z HH:mm:ss", "UT+0130 10:20:30", "10:20:30 +0130",
+ "z HH:mm:ss", "UTC+0130 10:20:30", "10:20:30 +0130",
+ // Note: GMT-1100 no longer works because of the introduction of the short
+ // localized GMT support. Previous implementation support this level of
+ // leniency (no separator char in localized GMT format), but the new
+ // implementation handles GMT-11 as the legitimate short localized GMT format
+ // and stop at there. Otherwise, roundtrip would be broken.
+ //"HH mm Z ss", "10 20 GMT-1100 30", "10:20:30 -1100",
+ "HH mm Z ss", "10 20 GMT-11 30", "10:20:30 -1100",
"HH:mm:ssZZZZZ", "14:25:45Z", "14:25:45 +0000",
"HH:mm:ssZZZZZ", "15:00:00-08:00", "15:00:00 -0800",
};
@@ -3579,7 +3597,7 @@
if (failure(status, "construct GregorianCalendar", TRUE)) return;
gcal.clear();
- gcal.set(1910, UCAL_JULY, 1, 12, 00); // offset 8:05:52
+ gcal.set(1910, UCAL_JULY, 1, 12, 00); // offset 8:05:57
d1 = gcal.getTime(status);
gcal.clear();
@@ -3589,7 +3607,7 @@
gcal.clear();
gcal.set(1970, UCAL_JANUARY, 1, 12, 00);
dexp2 = gcal.getTime(status);
- dexp1 = dexp2 - (5*60 + 52)*1000; // subtract 5m52s
+ dexp1 = dexp2 - (5*60 + 57)*1000; // subtract 5m57s
if (U_FAILURE(status)) {
errln("FAIL: Gregorian calendar error");
@@ -3634,7 +3652,7 @@
{
const NumAsStringItem items[] = {
// loc lenient fail? datePattern dateString
- { "", FALSE, FALSE, UnicodeString("y MMMM d HH:mm:ss"), UnicodeString("2009 7 14 08:43:57") },
+ { "", FALSE, FALSE, UnicodeString("y MMMM d HH:mm:ss"), UnicodeString("2009 7 14 08:43:57") }, // Google Patch. CLDR Ticket 5932.
{ "", TRUE, FALSE, UnicodeString("y MMMM d HH:mm:ss"), UnicodeString("2009 7 14 08:43:57") },
{ "en", FALSE, FALSE, UnicodeString("MMM d, y"), UnicodeString("Jul 14, 2009") },
{ "en", TRUE, FALSE, UnicodeString("MMM d, y"), UnicodeString("Jul 14, 2009") },
@@ -3870,14 +3888,14 @@
const MonthPatternItem items[] = {
// locale date style; expected formats for the 3 dates above
- { "root@calendar=chinese", DateFormat::kLong, { UnicodeString("ren-chen 4 2"), UnicodeString("ren-chen 4bis 2"), UnicodeString("ren-chen 5 2") } },
- { "root@calendar=chinese", DateFormat::kShort, { UnicodeString("29-4-2"), UnicodeString("29-4bis-2"), UnicodeString("29-5-2") } },
+ { "root@calendar=chinese", DateFormat::kLong, { UnicodeString("ren-chen 4 2"), UnicodeString("ren-chen 4bis 2"), UnicodeString("ren-chen 5 2") } }, // Google Patch. CLDR Ticket 5932.
+ { "root@calendar=chinese", DateFormat::kShort, { UnicodeString("29-04-02"), UnicodeString("29-04bis-02"), UnicodeString("29-05-02") } },
{ "root@calendar=chinese", -1, { UnicodeString("29-4-2"), UnicodeString("29-4bis-2"), UnicodeString("29-5-2") } },
{ "root@calendar=chinese", -2, { UnicodeString("78x29-4-2"), UnicodeString("78x29-4bis-2"), UnicodeString("78x29-5-2") } },
{ "root@calendar=chinese", -3, { UnicodeString("ren-chen-4-2"), UnicodeString("ren-chen-4bis-2"), UnicodeString("ren-chen-5-2") } },
- { "root@calendar=chinese", -4, { UnicodeString("ren-chen 4 2"), UnicodeString("ren-chen 4bis 2"), UnicodeString("ren-chen 5 2") } },
+ { "root@calendar=chinese", -4, { UnicodeString("ren-chen 4 2"), UnicodeString("ren-chen 4bis 2"), UnicodeString("ren-chen 5 2") } }, // Google Patch. CLDR Ticket 5932.
{ "en@calendar=gregorian", -3, { UnicodeString("2012-4-22"), UnicodeString("2012-5-22"), UnicodeString("2012-6-20") } },
- { "en@calendar=chinese", DateFormat::kLong, { UnicodeString("4 2, ren-chen"), UnicodeString("4bis 2, ren-chen"), UnicodeString("5 2, ren-chen") } },
+ { "en@calendar=chinese", DateFormat::kLong, { UnicodeString("4 2, ren-chen"), UnicodeString("4bis 2, ren-chen"), UnicodeString("5 2, ren-chen") } }, // Google Patch. CLDR Ticket 5932.
{ "en@calendar=chinese", DateFormat::kShort, { UnicodeString("4/2/29"), UnicodeString("4bis/2/29"), UnicodeString("5/2/29") } },
{ "zh@calendar=chinese", DateFormat::kLong, { CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u56DB\\u6708\\u4E8C\\u65E5"),
CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u95F0\\u56DB\\u6708\\u4E8C\\u65E5"),
@@ -3901,6 +3919,14 @@
CharsToUnicodeString("2 s\\u00ECyu\\u00E8bis ren-chen"),
CharsToUnicodeString("2 w\\u01D4yu\\u00E8 ren-chen") } },
{ "fr@calendar=chinese", DateFormat::kShort, { UnicodeString("2/4/29"), UnicodeString("2/4bis/29"), UnicodeString("2/5/29") } },
+ { "en@calendar=dangi", DateFormat::kLong, { UnicodeString("3bis 2, 29"), UnicodeString("4 2, 29"), UnicodeString("5 1, 29") } }, // Google Patch. CLDR ticket #5932
+ { "en@calendar=dangi", DateFormat::kShort, { UnicodeString("3bis/2/29"), UnicodeString("4/2/29"), UnicodeString("5/1/29") } },
+ { "ko@calendar=dangi", DateFormat::kLong, { CharsToUnicodeString("\\uC784\\uC9C4\\uB144 3bis\\uC6D4 2\\uC77C"),
+ CharsToUnicodeString("\\uC784\\uC9C4\\uB144 4\\uC6D4 2\\uC77C"),
+ CharsToUnicodeString("\\uC784\\uC9C4\\uB144 5\\uC6D4 1\\uC77C") } },
+ { "ko@calendar=dangi", DateFormat::kShort, { CharsToUnicodeString("29. 3bis. 2."),
+ CharsToUnicodeString("29. 4. 2."),
+ CharsToUnicodeString("29. 5. 1.") } },
// terminator
{ NULL, 0, { UnicodeString(""), UnicodeString(""), UnicodeString("") } }
};
diff --git a/test/intltest/dtfmttst.h b/test/intltest/dtfmttst.h
index fc25df3..829903f 100644
--- a/test/intltest/dtfmttst.h
+++ b/test/intltest/dtfmttst.h
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2012, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@@ -194,12 +194,14 @@
public:
/**
- * Test patterns added in CLDR 1.4
+ * Test patterns added in CLDR 1.4, CLDR 23
*/
void TestEras(void);
void TestNarrowNames(void);
+ void TestShortDays(void);
+
void TestStandAloneDays(void);
void TestStandAloneMonths(void);
diff --git a/test/intltest/dtifmtts.cpp b/test/intltest/dtifmtts.cpp
index 6804921..780a0a7 100644
--- a/test/intltest/dtifmtts.cpp
+++ b/test/intltest/dtifmtts.cpp
@@ -1,7 +1,7 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2012, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@@ -25,6 +25,7 @@
#include "unicode/dtintrv.h"
#include "unicode/dtitvinf.h"
#include "unicode/dtitvfmt.h"
+#include "unicode/localpointer.h"
#include "unicode/timezone.h"
@@ -45,7 +46,8 @@
TESTCASE(0, testAPI);
TESTCASE(1, testFormat);
TESTCASE(2, testFormatUserDII);
- TESTCASE(3, testStress);
+ TESTCASE(3, testSetIntervalPatternNoSideEffect);
+ TESTCASE(4, testStress);
default: name = ""; break;
}
}
@@ -137,6 +139,59 @@
dataerrln("ERROR: getDateIntervalInfo/setDateIntervalInfo failed");
}
+ {
+ // We make sure that setDateIntervalInfo does not corrupt the cache. See ticket 9919.
+ status = U_ZERO_ERROR;
+ logln("Testing DateIntervalFormat setDateIntervalInfo");
+ const Locale &enLocale = Locale::getEnglish();
+ LocalPointer<DateIntervalFormat> dif(DateIntervalFormat::createInstance("yMd", enLocale, status));
+ if (U_FAILURE(status)) {
+ errln("Failure encountered: %s", u_errorName(status));
+ return;
+ }
+ UnicodeString expected;
+ LocalPointer<Calendar> fromTime(Calendar::createInstance(enLocale, status));
+ LocalPointer<Calendar> toTime(Calendar::createInstance(enLocale, status));
+ if (U_FAILURE(status)) {
+ errln("Failure encountered: %s", u_errorName(status));
+ return;
+ }
+ FieldPosition pos = 0;
+ fromTime->set(2013, 3, 26);
+ toTime->set(2013, 3, 28);
+ dif->format(*fromTime, *toTime, expected, pos, status);
+ if (U_FAILURE(status)) {
+ errln("Failure encountered: %s", u_errorName(status));
+ return;
+ }
+ LocalPointer<DateIntervalInfo> dii(new DateIntervalInfo(Locale::getEnglish(), status));
+ if (U_FAILURE(status)) {
+ errln("Failure encountered: %s", u_errorName(status));
+ return;
+ }
+ dii->setIntervalPattern(ctou("yMd"), UCAL_DATE, ctou("M/d/y \\u2013 d"), status);
+ dif->setDateIntervalInfo(*dii, status);
+ if (U_FAILURE(status)) {
+ errln("Failure encountered: %s", u_errorName(status));
+ return;
+ }
+ dif.adoptInstead(DateIntervalFormat::createInstance("yMd", enLocale, status));
+ if (U_FAILURE(status)) {
+ errln("Failure encountered: %s", u_errorName(status));
+ return;
+ }
+ UnicodeString actual;
+ pos = 0;
+ dif->format(*fromTime, *toTime, actual, pos, status);
+ if (U_FAILURE(status)) {
+ errln("Failure encountered: %s", u_errorName(status));
+ return;
+ }
+ if (expected != actual) {
+ errln("DateIntervalFormat.setIntervalInfo should have no side effects.");
+ }
+ }
+
/*
status = U_ZERO_ERROR;
DateIntervalInfo* nonConstInf = inf->clone();
@@ -274,8 +329,8 @@
DateInterval * dtitv12 = new DateInterval(date1, date2);
TimeZone * tzCalif = TimeZone::createTimeZone("US/Pacific");
TimeZone * tzTokyo = TimeZone::createTimeZone("Asia/Tokyo");
- UnicodeString fmtCalif = UnicodeString(ctou("Mar 2, 10:30 \\u2013 Mar 2, 17:30"));
- UnicodeString fmtTokyo = UnicodeString(ctou("Mar 3, 03:30 \\u2013 Mar 3, 10:30"));
+ UnicodeString fmtCalif = UnicodeString(ctou("Mar 2, 10:30\\u201317:30"));
+ UnicodeString fmtTokyo = UnicodeString(ctou("Mar 3, 03:30\\u201310:30"));
dtitvfmt->adoptTimeZone(tzCalif);
res.remove();
@@ -346,7 +401,7 @@
const char* DATA[] = {
"yyyy MM dd HH:mm:ss",
// test root
- "root", "2007 11 10 10:10:10", "2007 12 10 10:10:10", "yM", "2007-11 \\u2013 12",
+ "root", "2007 11 10 10:10:10", "2007 12 10 10:10:10", "yM", "2007-11 \\u2013 2007-12",
// test 'H' and 'h', using availableFormat in fallback
"en", "2007 11 10 10:10:10", "2007 11 10 15:10:10", "Hms", "10:10:10 \\u2013 15:10:10",
@@ -383,23 +438,23 @@
"en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdMMM", "Wed, Oct 10, 2007 \\u2013 Fri, Oct 10, 2008",
- "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdMy", "Wed, 10/10/07 \\u2013 Fri, 10/10/08",
+ "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdMy", "Wed, 10/10/2007 \\u2013 Fri, 10/10/2008",
- "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMy", "10/10/07 \\u2013 10/10/08",
+ "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMy", "10/10/2007 \\u2013 10/10/2008",
- "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dM", "10/10/07 \\u2013 10/10/08",
+ "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dM", "10/10/2007 \\u2013 10/10/2008",
- "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "My", "10/07 \\u2013 10/08",
+ "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "My", "10/2007 \\u2013 10/2008",
- "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdM", "Wed, 10/10/07 \\u2013 Fri, 10/10/08",
+ "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdM", "Wed, 10/10/2007 \\u2013 Fri, 10/10/2008",
- "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "d", "10/10/07 \\u2013 10/10/08",
+ "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "d", "10/10/2007 \\u2013 10/10/2008",
"en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "Ed", "10 Wed \\u2013 10 Fri",
"en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "y", "2007\\u20132008",
- "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "M", "10/07 \\u2013 10/08",
+ "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "M", "10/2007 \\u2013 10/2008",
@@ -417,9 +472,9 @@
"en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hz", "10/10/2007, 10 AM PDT \\u2013 10/10/2008, 10 AM PDT",
- "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EEddMMyyyy", "Wed, 10/10/07 \\u2013 Fri, 10/10/08",
+ "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EEddMMyyyy", "Wed, 10/10/2007 \\u2013 Fri, 10/10/2008",
- "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EddMMy", "Wed, 10/10/07 \\u2013 Fri, 10/10/08",
+ "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EddMMy", "Wed, 10/10/2007 \\u2013 Fri, 10/10/2008",
"en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hhmm", "10/10/2007, 10:10 AM \\u2013 10/10/2008, 10:10 AM",
@@ -429,7 +484,7 @@
"en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMMMMMy", "O 10, 2007 \\u2013 O 10, 2008",
- "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EEEEEdM", "W, 10/10/07 \\u2013 F, 10/10/08",
+ "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EEEEEdM", "W, 10/10/2007 \\u2013 F, 10/10/2008",
"en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EEEEdMMMMy", "Wednesday, October 10 \\u2013 Saturday, November 10, 2007",
@@ -451,12 +506,12 @@
"en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EdMMM", "Wed, Oct 10 \\u2013 Sat, Nov 10",
- "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EdMy", "Wed, 10/10/07 \\u2013 Sat, 11/10/07",
+ "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EdMy", "Wed, 10/10/2007 \\u2013 Sat, 11/10/2007",
- "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dMy", "10/10/07 \\u2013 11/10/07",
+ "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dMy", "10/10/2007 \\u2013 11/10/2007",
- "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "My", "10/07 \\u2013 11/07",
+ "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "My", "10/2007 \\u2013 11/2007",
"en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EdM", "Wed, 10/10 \\u2013 Sat, 11/10",
@@ -486,9 +541,9 @@
"en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hz", "10/10/2007, 10 AM PDT \\u2013 11/10/2007, 10 AM PST",
- "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EEddMMyyyy", "Wed, 10/10/07 \\u2013 Sat, 11/10/07",
+ "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EEddMMyyyy", "Wed, 10/10/2007 \\u2013 Sat, 11/10/2007",
- "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EddMMy", "Wed, 10/10/07 \\u2013 Sat, 11/10/07",
+ "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EddMMy", "Wed, 10/10/2007 \\u2013 Sat, 11/10/2007",
"en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hhmmzz", "10/10/2007, 10:10 AM PDT \\u2013 11/10/2007, 10:10 AM PST",
@@ -518,9 +573,9 @@
"en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdMMM", "Sat, Nov 10 \\u2013 Tue, Nov 20",
- "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdMy", "Sat, 11/10/07 \\u2013 Tue, 11/20/07",
+ "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdMy", "Sat, 11/10/2007 \\u2013 Tue, 11/20/2007",
- "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMy", "11/10/07 \\u2013 11/20/07",
+ "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMy", "11/10/2007 \\u2013 11/20/2007",
"en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dM", "11/10 \\u2013 11/20",
@@ -554,9 +609,9 @@
"en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hz", "11/10/2007, 10 AM PST \\u2013 11/20/2007, 10 AM PST",
- "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEddMMyyyy", "Sat, 11/10/07 \\u2013 Tue, 11/20/07",
+ "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEddMMyyyy", "Sat, 11/10/2007 \\u2013 Tue, 11/20/2007",
- "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EddMMy", "Sat, 11/10/07 \\u2013 Tue, 11/20/07",
+ "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EddMMy", "Sat, 11/10/2007 \\u2013 Tue, 11/20/2007",
"en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hhmm", "11/10/2007, 10:10 AM \\u2013 11/20/2007, 10:10 AM",
@@ -612,14 +667,14 @@
"en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "MMMM", "January",
"en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hm", "10:00 AM \\u2013 2:10 PM",
- "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "Hm", "10:00 \\u2013 14:10",
+ "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "Hm", "10:00\\u201314:10",
"en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hmv", "10:00 AM \\u2013 2:10 PM PT",
"en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hmz", "10:00 AM \\u2013 2:10 PM PST",
"en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "h", "10 AM \\u2013 2 PM",
- "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "H", "10 \\u2013 14",
+ "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "H", "10\\u201314",
"en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hz", "10 AM \\u2013 2 PM PST",
@@ -629,7 +684,7 @@
"en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EddMMy", "Wed, 01/10/2007",
"en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hhmm", "10:00 AM \\u2013 2:10 PM",
- "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "HHmm", "10:00 \\u2013 14:10",
+ "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "HHmm", "10:00\\u201314:10",
"en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hhmmzz", "10:00 AM \\u2013 2:10 PM PST",
@@ -675,7 +730,7 @@
"en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hm", "10:00\\u201310:20 AM",
- "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "Hm", "10:00 \\u2013 10:20",
+ "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "Hm", "10:00\\u201310:20",
"en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hmz", "10:00\\u201310:20 AM PST",
@@ -688,7 +743,7 @@
"en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "EddMMy", "Wed, 01/10/2007",
"en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hhmm", "10:00\\u201310:20 AM",
- "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "HHmm", "10:00 \\u2013 10:20",
+ "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "HHmm", "10:00\\u201310:20",
"en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hhmmzz", "10:00\\u201310:20 AM PST",
@@ -779,7 +834,7 @@
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEdMMMM", "11\\u670810\\u65e5\\u661f\\u671f\\u516d\\u81f320\\u65e5\\u661f\\u671f\\u4e8c",
- "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdMy", "07/11/10\\u5468\\u516d\\u81f307/11/20\\u5468\\u4e8c",
+ "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdMy", "2007/11/10\\u5468\\u516d\\u81f32007/11/20\\u5468\\u4e8c",
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dM", "11/10 \\u2013 11/20",
@@ -795,6 +850,7 @@
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "MMM", "11\\u6708", // (fixed expected result per ticket:6626: and others)
+
// BEGIN android-change
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmz", "2007/11/10 \\u4e0a\\u534810:10 PST \\u2013 2007/11/20 \\u4e0a\\u534810:10 PST",
// END android-change
@@ -836,19 +892,19 @@
"de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "MMMy", "Okt. 2007 - Okt. 2008",
- "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdMy", "Mi., 10.10.07 - Fr., 10.10.08",
+ "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdMy", "Mi., 10.10.2007 - Fr., 10.10.2008",
- "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMy", "10.10.07 - 10.10.08",
+ "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMy", "10.10.2007 - 10.10.2008",
- "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "My", "10.07 - 10.08",
+ "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "My", "10.2007 - 10.2008",
- "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdM", "Mi., 10.10.07 - Fr., 10.10.08",
+ "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdM", "Mi., 10.10.2007 - Fr., 10.10.2008",
"de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "y", "2007-2008",
- "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "M", "10.07 - 10.08",
+ "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "M", "10.2007 - 10.2008",
"de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hm", "10.10.2007 10:10 vorm. - 10.10.2008 10:10 vorm.",
@@ -866,7 +922,7 @@
"de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dM", "10.10. - 10.11.",
- "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "My", "10.07 - 11.07",
+ "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "My", "10.2007 - 11.2007",
"de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "d", "10.10. - 10.11.",
@@ -889,7 +945,7 @@
"de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEdMMM", "Samstag, 10. - Dienstag, 20. Nov.",
- "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdMy", "Sa., 10.11.07 - Di., 20.11.07",
+ "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdMy", "Sa., 10.11.2007 - Di., 20.11.2007",
"de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dM", "10.11. - 20.11.",
@@ -944,6 +1000,7 @@
"de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hmz", "10:10 vorm. PST",
+
"de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hv", "10 vorm. PT",
"de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hz", "10 vorm. PST",
@@ -951,39 +1008,39 @@
// Thai (default calendar buddhist)
- "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EEEEdMMMy", "\\u0E27\\u0E31\\u0E19\\u0E1E\\u0E38\\u0E18 10 \\u0E15.\\u0E04. 2550 \\u2013 \\u0E27\\u0E31\\u0E19\\u0E28\\u0E38\\u0E01\\u0E23\\u0E4C 10 \\u0E15.\\u0E04. 2551",
+ "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EEEEdMMMy", "\\u0E27\\u0E31\\u0E19\\u0E1E\\u0E38\\u0E18 10 \\u0E15.\\u0E04. 2550 - \\u0E27\\u0E31\\u0E19\\u0E28\\u0E38\\u0E01\\u0E23\\u0E4C 10 \\u0E15.\\u0E04. 2551",
- "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "dMMM", "10 \\u0E15.\\u0E04. 2550 \\u2013 10 \\u0E15.\\u0E04. 2551",
+ "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "dMMM", "10 \\u0E15.\\u0E04. 2550 - 10 \\u0E15.\\u0E04. 2551",
"th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "MMMy", "\\u0E15.\\u0E04. 2550 - \\u0E15.\\u0E04. 2551",
- "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EdMy", "\\u0E1E. 10/10/50 \\u2013 \\u0E28. 10/10/51",
+ "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EdMy", "\\u0E1E. 10/10/2550 - \\u0E28. 10/10/2551",
- "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "dMy", "10/10/50 \\u2013 10/10/51",
+ "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "dMy", "10/10/2550 - 10/10/2551",
- "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "My", "10/50 \\u2013 10/51",
+ "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "My", "10/2550 - 10/2551",
- "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EdM", "\\u0E1E. 10/10/50 \\u2013 \\u0E28. 10/10/51",
+ "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EdM", "\\u0E1E. 10/10/2550 - \\u0E28. 10/10/2551",
"th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "y", "2550-2551",
- "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "M", "10/50 \\u2013 10/51",
+ "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "M", "10/2550 - 10/2551",
- "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "EEEEdMMMy", "\\u0E27\\u0E31\\u0E19\\u0E1E\\u0E38\\u0E18 10 \\u0E15.\\u0E04. \\u2013 \\u0E27\\u0E31\\u0E19\\u0E40\\u0E2A\\u0E32\\u0E23\\u0E4C 10 \\u0E1E.\\u0E22. 2550",
+ "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "EEEEdMMMy", "\\u0E27\\u0E31\\u0E19\\u0E1E\\u0E38\\u0E18 10 \\u0E15.\\u0E04. - \\u0E27\\u0E31\\u0E19\\u0E40\\u0E2A\\u0E32\\u0E23\\u0E4C 10 \\u0E1E.\\u0E22. 2550",
- "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "dMMM", "10 \\u0E15.\\u0E04. \\u2013 10 \\u0E1E.\\u0E22.",
+ "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "dMMM", "10 \\u0E15.\\u0E04. - 10 \\u0E1E.\\u0E22.",
"th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "MMMy", "\\u0E15.\\u0E04.-\\u0E1E.\\u0E22. 2550",
"th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "dM", "10/10 - 10/11",
- "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "My", "10/50 \\u2013 11/50",
+ "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "My", "10/2550 - 11/2550",
"th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "d", "10/10 - 10/11",
@@ -1118,6 +1175,37 @@
}
+void DateIntervalFormatTest::testSetIntervalPatternNoSideEffect() {
+ UErrorCode ec = U_ZERO_ERROR;
+ LocalPointer<DateIntervalInfo> dtitvinf(new DateIntervalInfo(ec));
+ if (U_FAILURE(ec)) {
+ errln("Failure encountered: %s", u_errorName(ec));
+ return;
+ }
+ UnicodeString expected;
+ dtitvinf->getIntervalPattern(ctou("yMd"), UCAL_DATE, expected, ec);
+ dtitvinf->setIntervalPattern(ctou("yMd"), UCAL_DATE, ctou("M/d/y \\u2013 d"), ec);
+ if (U_FAILURE(ec)) {
+ errln("Failure encountered: %s", u_errorName(ec));
+ return;
+ }
+ dtitvinf.adoptInstead(new DateIntervalInfo(ec));
+ if (U_FAILURE(ec)) {
+ errln("Failure encountered: %s", u_errorName(ec));
+ return;
+ }
+ UnicodeString actual;
+ dtitvinf->getIntervalPattern(ctou("yMd"), UCAL_DATE, actual, ec);
+ if (U_FAILURE(ec)) {
+ errln("Failure encountered: %s", u_errorName(ec));
+ return;
+ }
+ if (expected != actual) {
+ errln("DateIntervalInfo.setIntervalPattern should have no side effects.");
+ }
+}
+
+
void DateIntervalFormatTest::expectUserDII(const char** data,
int32_t data_length) {
int32_t i = 0;
diff --git a/test/intltest/dtifmtts.h b/test/intltest/dtifmtts.h
index 847de1c..3f62b09 100644
--- a/test/intltest/dtifmtts.h
+++ b/test/intltest/dtifmtts.h
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 2008, International Business Machines Corporation and
+ * Copyright (c) 2008-2013 International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@@ -37,6 +37,12 @@
void testFormatUserDII();
/**
+ * Test for no unwanted side effects when setting
+ * interval patterns.
+ */
+ void testSetIntervalPatternNoSideEffect();
+
+ /**
* Stress test -- stress test formatting on 40 locales
*/
void testStress();
diff --git a/test/intltest/dtptngts.cpp b/test/intltest/dtptngts.cpp
index 9f6de24..20739c7 100644
--- a/test/intltest/dtptngts.cpp
+++ b/test/intltest/dtptngts.cpp
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 2008-2012, International Business Machines Corporation and
+ * Copyright (c) 2008-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@@ -228,7 +228,7 @@
UnicodeString("1/13"), // 04: Md -> M/d
CharsToUnicodeString("1\\u670813\\u65E5"), // 05: MMMd ->M\u6708d\u65E5
CharsToUnicodeString("1\\u670813\\u65E5"), // 06: MMMMd ->M\u6708d\u65E5
- CharsToUnicodeString("\\u6C11\\u570B88 1\\u5B63"), // 07: yQQQ -> Gy QQQ
+ CharsToUnicodeString("\\u6C11\\u570B88\\u5E741\\u5B63"), // 07: yQQQ -> Gy QQQ
CharsToUnicodeString("\\u4E0B\\u534811:58"), // 08: hhmm ->
UnicodeString("23:58"), // 09: HHmm ->
CharsToUnicodeString("\\u4E0B\\u534811:58"), // 10: jjmm
@@ -241,9 +241,9 @@
// ru // 9 ru
UnicodeString("01.1999"), // 00: yM -> MM.y
CharsToUnicodeString("\\u042F\\u043D\\u0432. 1999"), // 01: yMMM -> LLL y
- UnicodeString("13.01.1999"), // 02: yMd -> d.MM.y
+ UnicodeString("13.01.1999"), // 02: yMd -> dd.MM.y
CharsToUnicodeString("13 \\u044F\\u043D\\u0432. 1999 \\u0433."), // 03: yMMMd -> d MMM y
- UnicodeString("13.1"), // 04: Md -> d.M
+ UnicodeString("13.01"), // 04: Md -> dd.MM
CharsToUnicodeString("13 \\u044F\\u043D\\u0432."), // 05: MMMd -> d MMM
CharsToUnicodeString("13 \\u044F\\u043D\\u0432\\u0430\\u0440\\u044F"), // 06: MMMMd -> d MMMM
CharsToUnicodeString("1-\\u0439 \\u043A\\u0432. 1999 \\u0433."), // 07: yQQQ -> y QQQ
diff --git a/test/intltest/genderinfotest.cpp b/test/intltest/genderinfotest.cpp
index 535e5fa..97a3e67 100644
--- a/test/intltest/genderinfotest.cpp
+++ b/test/intltest/genderinfotest.cpp
@@ -55,8 +55,8 @@
void GenderInfoTest::TestGetListGender() {
check(UGENDER_OTHER, UGENDER_OTHER, UGENDER_OTHER, NULL, 0);
- check(UGENDER_OTHER, UGENDER_FEMALE, UGENDER_FEMALE, kSingleFemale, LENGTHOF(kSingleFemale));
- check(UGENDER_OTHER, UGENDER_MALE, UGENDER_MALE, kSingleMale, LENGTHOF(kSingleMale));
+ check(UGENDER_FEMALE, UGENDER_FEMALE, UGENDER_FEMALE, kSingleFemale, LENGTHOF(kSingleFemale));
+ check(UGENDER_MALE, UGENDER_MALE, UGENDER_MALE, kSingleMale, LENGTHOF(kSingleMale));
check(UGENDER_OTHER, UGENDER_OTHER, UGENDER_OTHER, kSingleOther, LENGTHOF(kSingleOther));
check(UGENDER_OTHER, UGENDER_FEMALE, UGENDER_FEMALE, kAllFemale, LENGTHOF(kAllFemale));
diff --git a/test/intltest/intltest.cpp b/test/intltest/intltest.cpp
index 4cd57ac..6d08af1 100644
--- a/test/intltest/intltest.cpp
+++ b/test/intltest/intltest.cpp
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2012, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@@ -1654,15 +1654,28 @@
#define VERBOSE_ASSERTIONS
-UBool IntlTest::assertTrue(const char* message, UBool condition, UBool quiet, UBool possibleDataError) {
- if (!condition) {
- if (possibleDataError) {
- dataerrln("FAIL: assertTrue() failed: %s", message);
- } else {
- errln("FAIL: assertTrue() failed: %s", message);
+UBool IntlTest::assertTrue(const char* message, UBool condition, UBool quiet, UBool possibleDataError, const char *file, int line) {
+ if (file != NULL) {
+ if (!condition) {
+ if (possibleDataError) {
+ dataerrln("%s:%d: FAIL: assertTrue() failed: %s", file, line, message);
+ } else {
+ errln("%s:%d: FAIL: assertTrue() failed: %s", file, line, message);
+ }
+ } else if (!quiet) {
+ logln("%s:%d: Ok: %s", file, line, message);
}
- } else if (!quiet) {
- logln("Ok: %s", message);
+ } else {
+ if (!condition) {
+ if (possibleDataError) {
+ dataerrln("FAIL: assertTrue() failed: %s", message);
+ } else {
+ errln("FAIL: assertTrue() failed: %s", message);
+ }
+ } else if (!quiet) {
+ logln("Ok: %s", message);
+ }
+
}
return condition;
}
diff --git a/test/intltest/intltest.h b/test/intltest/intltest.h
index 19d51ac..e71576d 100644
--- a/test/intltest/intltest.h
+++ b/test/intltest/intltest.h
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2012, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@@ -120,6 +120,9 @@
break; \
}
+#define TEST_ASSERT_TRUE(x) \
+ assertTrue(#x, (x), FALSE, FALSE, __FILE__, __LINE__)
+
class IntlTest : public TestLog {
public:
@@ -231,7 +234,7 @@
protected:
/* JUnit-like assertions. Each returns TRUE if it succeeds. */
- UBool assertTrue(const char* message, UBool condition, UBool quiet=FALSE, UBool possibleDataError=FALSE);
+ UBool assertTrue(const char* message, UBool condition, UBool quiet=FALSE, UBool possibleDataError=FALSE, const char *file=NULL, int line=0);
UBool assertFalse(const char* message, UBool condition, UBool quiet=FALSE);
UBool assertSuccess(const char* message, UErrorCode ec, UBool possibleDataError=FALSE);
UBool assertEquals(const char* message, const UnicodeString& expected,
diff --git a/test/intltest/intltest.vcxproj b/test/intltest/intltest.vcxproj
index 0e5faf3..3bb8470 100644
--- a/test/intltest/intltest.vcxproj
+++ b/test/intltest/intltest.vcxproj
@@ -224,6 +224,8 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="bytestrietest.cpp" />
+ <ClCompile Include="colldata.cpp" />
+ <ClCompile Include="regiontst.cpp" />
<ClCompile Include="ucharstrietest.cpp" />
<ClCompile Include="itrbbi.cpp" />
<ClCompile Include="rbbiapts.cpp" />
@@ -281,6 +283,7 @@
<ClCompile Include="calregts.cpp" />
<ClCompile Include="caltest.cpp" />
<ClCompile Include="caltztst.cpp" />
+ <ClCompile Include="compactdecimalformattest.cpp" />
<ClCompile Include="dadrcal.cpp" />
<ClCompile Include="dadrfmt.cpp" />
<ClCompile Include="dcfmapts.cpp" />
@@ -391,6 +394,7 @@
<ClCompile Include="listformattertest.cpp" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="colldata.h" />
<ClInclude Include="itrbbi.h" />
<ClInclude Include="rbbiapts.h" />
<ClInclude Include="rbbitst.h" />
@@ -412,6 +416,7 @@
<ClInclude Include="lcukocol.h" />
<ClInclude Include="mnkytst.h" />
<ClInclude Include="regcoll.h" />
+ <ClInclude Include="regiontst.h" />
<ClInclude Include="srchtest.h" />
<ClInclude Include="ssearch.h" />
<ClInclude Include="svccoll.h" />
@@ -536,4 +541,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/test/intltest/intltest.vcxproj.filters b/test/intltest/intltest.vcxproj.filters
index 5e8e5af..aa9c7e7 100644
--- a/test/intltest/intltest.vcxproj.filters
+++ b/test/intltest/intltest.vcxproj.filters
@@ -181,6 +181,9 @@
<ClCompile Include="caltztst.cpp">
<Filter>formatting</Filter>
</ClCompile>
+ <ClCompile Include="compactdecimalformattest.cpp">
+ <Filter>formatting</Filter>
+ </ClCompile>
<ClCompile Include="dadrcal.cpp">
<Filter>formatting</Filter>
</ClCompile>
@@ -447,6 +450,13 @@
<ClCompile Include="alphaindextst.cpp">
<Filter>collation</Filter>
</ClCompile>
+ <ClCompile Include="listformattertest.cpp" />
+ <ClCompile Include="colldata.cpp">
+ <Filter>collation</Filter>
+ </ClCompile>
+ <ClCompile Include="regiontst.cpp">
+ <Filter>formatting</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="itrbbi.h">
@@ -815,5 +825,12 @@
<ClInclude Include="alphaindextst.h">
<Filter>collation</Filter>
</ClInclude>
+ <ClInclude Include="listformattertest.h" />
+ <ClInclude Include="colldata.h">
+ <Filter>collation</Filter>
+ </ClInclude>
+ <ClInclude Include="regiontst.h">
+ <Filter>formatting</Filter>
+ </ClInclude>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/test/intltest/itformat.cpp b/test/intltest/itformat.cpp
index a4018ff..aa919d3 100644
--- a/test/intltest/itformat.cpp
+++ b/test/intltest/itformat.cpp
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2012, International Business Machines
+ * Copyright (c) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************/
@@ -57,7 +57,9 @@
#include "locnmtst.h" // LocaleDisplayNamesTest
#include "dcfmtest.h" // DecimalFormatTest
#include "listformattertest.h" // ListFormatterTest
+#include "regiontst.h" // RegionTest
+extern IntlTest *createCompactDecimalFormatTest();
extern IntlTest *createGenderInfoTest();
#define TESTCLASS(id, TestClass) \
@@ -145,6 +147,16 @@
callTest(*test, par);
}
break;
+ case 44:
+ name = "CompactDecimalFormatTest";
+ if (exec) {
+ logln("CompactDecimalFormatTest test---");
+ logln((UnicodeString)"");
+ LocalPointer<IntlTest> test(createCompactDecimalFormatTest());
+ callTest(*test, par);
+ }
+ break;
+ TESTCLASS(45,RegionTest);
default: name = ""; break; //needed to end loop
}
if (exec) {
diff --git a/test/intltest/itspoof.cpp b/test/intltest/itspoof.cpp
index d33119c..50971ca 100644
--- a/test/intltest/itspoof.cpp
+++ b/test/intltest/itspoof.cpp
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (C) 2011, International Business Machines Corporation
+* Copyright (C) 2011-2013, International Business Machines Corporation
* and others. All Rights Reserved.
**********************************************************************
*/
@@ -13,11 +13,18 @@
#if !UCONFIG_NO_REGULAR_EXPRESSIONS && !UCONFIG_NO_NORMALIZATION && !UCONFIG_NO_FILE_IO
#include "itspoof.h"
-#include "unicode/uspoof.h"
-#include "unicode/unistr.h"
-#include "unicode/regex.h"
+
#include "unicode/normlzr.h"
+#include "unicode/regex.h"
+#include "unicode/unistr.h"
+#include "unicode/uscript.h"
+#include "unicode/uspoof.h"
+
#include "cstring.h"
+#include "identifier_info.h"
+#include "scriptset.h"
+#include "uhash.h"
+
#include <stdlib.h>
#include <stdio.h>
@@ -25,16 +32,21 @@
errcheckln(status, "Failure at file %s, line %d, error = %s", __FILE__, __LINE__, u_errorName(status));}}
#define TEST_ASSERT(expr) {if ((expr)==FALSE) { \
- errln("Test Failure at file %s, line %d: \"%s\" is false.\n", __FILE__, __LINE__, #expr);};}
+ errln("Test Failure at file %s, line %d: \"%s\" is false.", __FILE__, __LINE__, #expr);};}
+
+#define TEST_ASSERT_MSG(expr, msg) {if ((expr)==FALSE) { \
+ dataerrln("Test Failure at file %s, line %d, %s: \"%s\" is false.", __FILE__, __LINE__, msg, #expr);};}
#define TEST_ASSERT_EQ(a, b) { if ((a) != (b)) { \
- errln("Test Failure at file %s, line %d: \"%s\" (%d) != \"%s\" (%d) \n", \
+ errln("Test Failure at file %s, line %d: \"%s\" (%d) != \"%s\" (%d)", \
__FILE__, __LINE__, #a, (a), #b, (b)); }}
#define TEST_ASSERT_NE(a, b) { if ((a) == (b)) { \
- errln("Test Failure at file %s, line %d: \"%s\" (%d) == \"%s\" (%d) \n", \
+ errln("Test Failure at file %s, line %d: \"%s\" (%d) == \"%s\" (%d)", \
__FILE__, __LINE__, #a, (a), #b, (b)); }}
+#define LENGTHOF(array) ((int32_t)(sizeof(array)/sizeof((array)[0])))
+
/*
* TEST_SETUP and TEST_TEARDOWN
* macros to handle the boilerplate around setting up test case.
@@ -67,37 +79,63 @@
testSpoofAPI();
}
break;
- case 1:
+ case 1:
name = "TestSkeleton";
if (exec) {
testSkeleton();
}
break;
- case 2:
+ case 2:
name = "TestAreConfusable";
if (exec) {
testAreConfusable();
}
break;
- case 3:
+ case 3:
name = "TestInvisible";
if (exec) {
testInvisible();
}
break;
- case 4:
+ case 4:
name = "testConfData";
if (exec) {
testConfData();
}
break;
- case 5:
+ case 5:
name = "testBug8654";
if (exec) {
testBug8654();
}
break;
- default: name=""; break;
+ case 6:
+ name = "testIdentifierInfo";
+ if (exec) {
+ testIdentifierInfo();
+ }
+ break;
+ case 7:
+ name = "testScriptSet";
+ if (exec) {
+ testScriptSet();
+ }
+ break;
+ case 8:
+ name = "testRestrictionLevel";
+ if (exec) {
+ testRestrictionLevel();
+ }
+ break;
+ case 9:
+ name = "testMixedNumbers";
+ if (exec) {
+ testMixedNumbers();
+ }
+ break;
+
+
+ default: name=""; break;
}
}
@@ -110,7 +148,7 @@
int32_t checkResults = uspoof_checkUnicodeString(sc, s, &position, &status);
TEST_ASSERT_SUCCESS(status);
TEST_ASSERT_EQ(0, checkResults);
- TEST_ASSERT_EQ(666, position);
+ TEST_ASSERT_EQ(0, position);
TEST_TEARDOWN;
TEST_SETUP
@@ -250,12 +288,12 @@
int32_t position = -42;
TEST_ASSERT_EQ(0, uspoof_checkUnicodeString(sc, s, &position, &status));
TEST_ASSERT_SUCCESS(status);
- TEST_ASSERT(position == -42);
+ TEST_ASSERT(0 == position);
UnicodeString s2 = UnicodeString("abcd\\u0301\\u0302\\u0301ef").unescape();
TEST_ASSERT_EQ(USPOOF_INVISIBLE, uspoof_checkUnicodeString(sc, s2, &position, &status));
TEST_ASSERT_SUCCESS(status);
- TEST_ASSERT_EQ(7, position);
+ TEST_ASSERT_EQ(0, position);
// Two acute accents, one from the composed a with acute accent, \u00e1,
// and one separate.
@@ -263,7 +301,7 @@
UnicodeString s3 = UnicodeString("abcd\\u00e1\\u0301xyz").unescape();
TEST_ASSERT_EQ(USPOOF_INVISIBLE, uspoof_checkUnicodeString(sc, s3, &position, &status));
TEST_ASSERT_SUCCESS(status);
- TEST_ASSERT_EQ(7, position);
+ TEST_ASSERT_EQ(0, position);
TEST_TEARDOWN;
}
@@ -273,7 +311,7 @@
int32_t position = -42;
TEST_ASSERT_EQ(USPOOF_INVISIBLE, uspoof_checkUnicodeString(sc, s, &position, &status) & USPOOF_INVISIBLE );
TEST_ASSERT_SUCCESS(status);
- TEST_ASSERT_EQ(3, position);
+ TEST_ASSERT_EQ(0, position);
TEST_TEARDOWN;
}
@@ -412,5 +450,308 @@
}
}
}
-#endif // UCONFIG_NO_REGULAR_EXPRESSIONS
+// testIdentifierInfo. Note that IdentifierInfo is not public ICU API at this time
+void IntlTestSpoof::testIdentifierInfo() {
+ UErrorCode status = U_ZERO_ERROR;
+ ScriptSet bitset12; bitset12.set(USCRIPT_LATIN, status).set(USCRIPT_HANGUL, status);
+ ScriptSet bitset2; bitset2.set(USCRIPT_HANGUL, status);
+ TEST_ASSERT(bitset12.contains(bitset2));
+ TEST_ASSERT(bitset12.contains(bitset12));
+ TEST_ASSERT(!bitset2.contains(bitset12));
+
+ ScriptSet arabSet; arabSet.set(USCRIPT_ARABIC, status);
+ ScriptSet latinSet; latinSet.set(USCRIPT_LATIN, status);
+ UElement arabEl; arabEl.pointer = &arabSet;
+ UElement latinEl; latinEl.pointer = &latinSet;
+ TEST_ASSERT(uhash_compareScriptSet(arabEl, latinEl) < 0);
+ TEST_ASSERT(uhash_compareScriptSet(latinEl, arabEl) > 0);
+
+ UnicodeString scriptString;
+ bitset12.displayScripts(scriptString);
+ TEST_ASSERT(UNICODE_STRING_SIMPLE("Hang Latn") == scriptString);
+
+ status = U_ZERO_ERROR;
+ UHashtable *alternates = uhash_open(uhash_hashScriptSet ,uhash_compareScriptSet, NULL, &status);
+ uhash_puti(alternates, &bitset12, 1, &status);
+ uhash_puti(alternates, &bitset2, 1, &status);
+ UnicodeString alternatesString;
+ IdentifierInfo::displayAlternates(alternatesString, alternates, status);
+ TEST_ASSERT(UNICODE_STRING_SIMPLE("Hang; Hang Latn") == alternatesString);
+ TEST_ASSERT_SUCCESS(status);
+
+ status = U_ZERO_ERROR;
+ ScriptSet tScriptSet;
+ tScriptSet.parseScripts(scriptString, status);
+ TEST_ASSERT_SUCCESS(status);
+ TEST_ASSERT(bitset12 == tScriptSet);
+ UnicodeString ss;
+ ss.remove();
+ uhash_close(alternates);
+
+ struct Test {
+ const char *fTestString;
+ URestrictionLevel fRestrictionLevel;
+ const char *fNumerics;
+ const char *fScripts;
+ const char *fAlternates;
+ const char *fCommonAlternates;
+ } tests[] = {
+ {"\\u0061\\u2665", USPOOF_UNRESTRICTIVE, "[]", "Latn", "", ""},
+ {"\\u0061\\u3006", USPOOF_HIGHLY_RESTRICTIVE, "[]", "Latn", "Hani Hira Kana", "Hani Hira Kana"},
+ {"\\u0061\\u30FC\\u3006", USPOOF_HIGHLY_RESTRICTIVE, "[]", "Latn", "Hira Kana", "Hira Kana"},
+ {"\\u0061\\u30FC\\u3006\\u30A2", USPOOF_HIGHLY_RESTRICTIVE, "[]", "Latn Kana", "", ""},
+ {"\\u30A2\\u0061\\u30FC\\u3006", USPOOF_HIGHLY_RESTRICTIVE, "[]", "Latn Kana", "", ""},
+ {"\\u0061\\u0031\\u0661", USPOOF_UNRESTRICTIVE, "[\\u0030\\u0660]", "Latn", "Arab Thaa", "Arab Thaa"},
+ {"\\u0061\\u0031\\u0661\\u06F1", USPOOF_UNRESTRICTIVE, "[\\u0030\\u0660\\u06F0]", "Latn Arab", "", ""},
+ {"\\u0661\\u30FC\\u3006\\u0061\\u30A2\\u0031\\u0967\\u06F1", USPOOF_UNRESTRICTIVE,
+ "[\\u0030\\u0660\\u06F0\\u0966]", "Latn Kana Arab Deva", "", ""},
+ {"\\u0061\\u30A2\\u30FC\\u3006\\u0031\\u0967\\u0661\\u06F1", USPOOF_UNRESTRICTIVE,
+ "[\\u0030\\u0660\\u06F0\\u0966]", "Latn Kana Arab Deva", "", ""}
+ };
+
+ int testNum;
+ for (testNum = 0; testNum < LENGTHOF(tests); testNum++) {
+ char testNumStr[40];
+ sprintf(testNumStr, "testNum = %d", testNum);
+ Test &test = tests[testNum];
+ status = U_ZERO_ERROR;
+ UnicodeString testString(test.fTestString); // Note: may do charset conversion.
+ testString = testString.unescape();
+ IdentifierInfo idInfo(status);
+ TEST_ASSERT_SUCCESS(status);
+ idInfo.setIdentifierProfile(*uspoof_getRecommendedUnicodeSet(&status));
+ idInfo.setIdentifier(testString, status);
+ TEST_ASSERT_MSG(*idInfo.getIdentifier() == testString, testNumStr);
+
+ URestrictionLevel restrictionLevel = test.fRestrictionLevel;
+ TEST_ASSERT_MSG(restrictionLevel == idInfo.getRestrictionLevel(status), testNumStr);
+
+ status = U_ZERO_ERROR;
+ UnicodeSet numerics(UnicodeString(test.fNumerics).unescape(), status);
+ TEST_ASSERT_SUCCESS(status);
+ TEST_ASSERT_MSG(numerics == *idInfo.getNumerics(), testNumStr);
+
+ ScriptSet scripts;
+ scripts.parseScripts(UnicodeString(test.fScripts), status);
+ TEST_ASSERT_MSG(scripts == *idInfo.getScripts(), testNumStr);
+
+ UnicodeString alternatesStr;
+ IdentifierInfo::displayAlternates(alternatesStr, idInfo.getAlternates(), status);
+ TEST_ASSERT_MSG(UnicodeString(test.fAlternates) == alternatesStr, testNumStr);
+
+ ScriptSet commonAlternates;
+ commonAlternates.parseScripts(UnicodeString(test.fCommonAlternates), status);
+ TEST_ASSERT_MSG(commonAlternates == *idInfo.getCommonAmongAlternates(), testNumStr);
+ }
+
+ // Test of getScriptCount()
+ // Script and or Script Extension for chars used in the tests
+ // \\u3013 ; Bopo Hang Hani Hira Kana # So GETA MARK
+ // \\uA838 ; Deva Gujr Guru Kthi Takr # Sc NORTH INDIC RUPEE MARK
+ // \\u0951 ; Deva Latn # Mn DEVANAGARI STRESS SIGN UDATTA
+ //
+ // \\u0370 ; Greek # L GREEK CAPITAL LETTER HETA
+ // \\u0481 ; Cyrillic # L& CYRILLIC SMALL LETTER KOPPA
+ // \\u0904 ; Devanagari # Lo DEVANAGARI LETTER SHORT A
+ // \\u3041 ; Hiragana # Lo HIRAGANA LETTER SMALL A
+ // 1234 ; Common # ascii digits
+ // \\u0300 ; Inherited # Mn COMBINING GRAVE ACCENT
+
+ struct ScriptTest {
+ const char *fTestString;
+ int32_t fScriptCount;
+ } scriptTests[] = {
+ {"Hello", 1},
+ {"Hello\\u0370", 2},
+ {"1234", 0},
+ {"Hello1234\\u0300", 1}, // Common and Inherited are ignored.
+ {"\\u0030", 0},
+ {"abc\\u0951", 1},
+ {"abc\\u3013", 2},
+ {"\\uA838\\u0951", 1}, // Triggers commonAmongAlternates path.
+ {"\\u3013\\uA838", 2}
+ };
+
+ status = U_ZERO_ERROR;
+ IdentifierInfo identifierInfo(status);
+ for (testNum=0; testNum<LENGTHOF(scriptTests); testNum++) {
+ ScriptTest &test = scriptTests[testNum];
+ char msgBuf[100];
+ sprintf(msgBuf, "testNum = %d ", testNum);
+ UnicodeString testString = UnicodeString(test.fTestString).unescape();
+
+ status = U_ZERO_ERROR;
+ identifierInfo.setIdentifier(testString, status);
+ int32_t scriptCount = identifierInfo.getScriptCount();
+ TEST_ASSERT_MSG(test.fScriptCount == scriptCount, msgBuf);
+ }
+}
+
+void IntlTestSpoof::testScriptSet() {
+ ScriptSet s1;
+ ScriptSet s2;
+ UErrorCode status = U_ZERO_ERROR;
+
+ TEST_ASSERT(s1 == s2);
+ s1.set(USCRIPT_ARABIC,status);
+ TEST_ASSERT_SUCCESS(status);
+ TEST_ASSERT(!(s1 == s2));
+ TEST_ASSERT(s1.test(USCRIPT_ARABIC, status));
+ TEST_ASSERT(s1.test(USCRIPT_GREEK, status) == FALSE);
+
+ status = U_ZERO_ERROR;
+ s1.reset(USCRIPT_ARABIC, status);
+ TEST_ASSERT(s1 == s2);
+
+ status = U_ZERO_ERROR;
+ s1.setAll();
+ TEST_ASSERT(s1.test(USCRIPT_COMMON, status));
+ TEST_ASSERT(s1.test(USCRIPT_ETHIOPIC, status));
+ TEST_ASSERT(s1.test(USCRIPT_CODE_LIMIT, status));
+ s1.resetAll();
+ TEST_ASSERT(!s1.test(USCRIPT_COMMON, status));
+ TEST_ASSERT(!s1.test(USCRIPT_ETHIOPIC, status));
+ TEST_ASSERT(!s1.test(USCRIPT_CODE_LIMIT, status));
+
+ status = U_ZERO_ERROR;
+ s1.set(USCRIPT_TAKRI, status);
+ s1.set(USCRIPT_BLISSYMBOLS, status);
+ s2.setAll();
+ TEST_ASSERT(s2.contains(s1));
+ TEST_ASSERT(!s1.contains(s2));
+ TEST_ASSERT(s2.intersects(s1));
+ TEST_ASSERT(s1.intersects(s2));
+ s2.reset(USCRIPT_TAKRI, status);
+ TEST_ASSERT(!s2.contains(s1));
+ TEST_ASSERT(!s1.contains(s2));
+ TEST_ASSERT(s1.intersects(s2));
+ TEST_ASSERT(s2.intersects(s1));
+ TEST_ASSERT_SUCCESS(status);
+
+ status = U_ZERO_ERROR;
+ s1.resetAll();
+ s1.set(USCRIPT_NKO, status);
+ s1.set(USCRIPT_COMMON, status);
+ s2 = s1;
+ TEST_ASSERT(s2 == s1);
+ TEST_ASSERT_EQ(2, s2.countMembers());
+ s2.intersect(s1);
+ TEST_ASSERT(s2 == s1);
+ s2.setAll();
+ TEST_ASSERT(!(s2 == s1));
+ TEST_ASSERT(s2.countMembers() >= USCRIPT_CODE_LIMIT);
+ s2.intersect(s1);
+ TEST_ASSERT(s2 == s1);
+
+ s2.setAll();
+ s2.reset(USCRIPT_COMMON, status);
+ s2.intersect(s1);
+ TEST_ASSERT(s2.countMembers() == 1);
+
+ s1.resetAll();
+ s1.set(USCRIPT_AFAKA, status);
+ s1.set(USCRIPT_VAI, status);
+ s1.set(USCRIPT_INHERITED, status);
+ int32_t n = -1;
+ for (int32_t i=0; i<4; i++) {
+ n = s1.nextSetBit(n+1);
+ switch (i) {
+ case 0: TEST_ASSERT_EQ(USCRIPT_INHERITED, n); break;
+ case 1: TEST_ASSERT_EQ(USCRIPT_VAI, n); break;
+ case 2: TEST_ASSERT_EQ(USCRIPT_AFAKA, n); break;
+ case 3: TEST_ASSERT_EQ(-1, (int32_t)n); break;
+ default: TEST_ASSERT(FALSE);
+ }
+ }
+ TEST_ASSERT_SUCCESS(status);
+}
+
+
+void IntlTestSpoof::testRestrictionLevel() {
+ struct Test {
+ const char *fId;
+ URestrictionLevel fExpectedRestrictionLevel;
+ } tests[] = {
+ {"\\u0061\\u03B3\\u2665", USPOOF_UNRESTRICTIVE},
+ {"a", USPOOF_ASCII},
+ {"\\u03B3", USPOOF_HIGHLY_RESTRICTIVE},
+ {"\\u0061\\u30A2\\u30FC", USPOOF_HIGHLY_RESTRICTIVE},
+ {"\\u0061\\u0904", USPOOF_MODERATELY_RESTRICTIVE},
+ {"\\u0061\\u03B3", USPOOF_MINIMALLY_RESTRICTIVE}
+ };
+ char msgBuffer[100];
+
+ URestrictionLevel restrictionLevels[] = { USPOOF_ASCII, USPOOF_HIGHLY_RESTRICTIVE,
+ USPOOF_MODERATELY_RESTRICTIVE, USPOOF_MINIMALLY_RESTRICTIVE, USPOOF_UNRESTRICTIVE};
+
+ UErrorCode status = U_ZERO_ERROR;
+ IdentifierInfo idInfo(status);
+ TEST_ASSERT_SUCCESS(status);
+ idInfo.setIdentifierProfile(*uspoof_getRecommendedUnicodeSet(&status));
+ TEST_ASSERT_SUCCESS(status);
+ for (int32_t testNum=0; testNum < LENGTHOF(tests); testNum++) {
+ status = U_ZERO_ERROR;
+ const Test &test = tests[testNum];
+ UnicodeString testString = UnicodeString(test.fId).unescape();
+ URestrictionLevel expectedLevel = test.fExpectedRestrictionLevel;
+ idInfo.setIdentifier(testString, status);
+ sprintf(msgBuffer, "testNum = %d ", testNum);
+ TEST_ASSERT_SUCCESS(status);
+ TEST_ASSERT_MSG(expectedLevel == idInfo.getRestrictionLevel(status), msgBuffer);
+ for (int levelIndex=0; levelIndex<LENGTHOF(restrictionLevels); levelIndex++) {
+ status = U_ZERO_ERROR;
+ URestrictionLevel levelSetInSpoofChecker = restrictionLevels[levelIndex];
+ USpoofChecker *sc = uspoof_open(&status);
+ uspoof_setChecks(sc, USPOOF_RESTRICTION_LEVEL, &status);
+ uspoof_setAllowedChars(sc, uspoof_getRecommendedSet(&status), &status);
+ uspoof_setRestrictionLevel(sc, levelSetInSpoofChecker);
+ UBool actualValue = uspoof_checkUnicodeString(sc, testString, NULL, &status) != 0;
+
+ // we want to fail if the text is (say) MODERATE and the testLevel is ASCII
+ UBool expectedFailure = expectedLevel > levelSetInSpoofChecker ||
+ !uspoof_getRecommendedUnicodeSet(&status)->containsAll(testString);
+ sprintf(msgBuffer, "testNum = %d, levelIndex = %d", testNum, levelIndex);
+ TEST_ASSERT_MSG(expectedFailure == actualValue, msgBuffer);
+ TEST_ASSERT_SUCCESS(status);
+ uspoof_close(sc);
+ }
+ }
+}
+
+
+void IntlTestSpoof::testMixedNumbers() {
+ struct Test {
+ const char *fTestString;
+ const char *fExpectedSet;
+ } tests[] = {
+ {"1", "[0]"},
+ {"\\u0967", "[\\u0966]"},
+ {"1\\u0967", "[0\\u0966]"},
+ {"\\u0661\\u06F1", "[\\u0660\\u06F0]"}
+ };
+ UErrorCode status = U_ZERO_ERROR;
+ IdentifierInfo idInfo(status);
+ for (int32_t testNum=0; testNum < LENGTHOF(tests); testNum++) {
+ char msgBuf[100];
+ sprintf(msgBuf, "testNum = %d ", testNum);
+ Test &test = tests[testNum];
+
+ status = U_ZERO_ERROR;
+ UnicodeString testString = UnicodeString(test.fTestString).unescape();
+ UnicodeSet expectedSet(UnicodeString(test.fExpectedSet).unescape(), status);
+ idInfo.setIdentifier(testString, status);
+ TEST_ASSERT_SUCCESS(status);
+ TEST_ASSERT_MSG(expectedSet == *idInfo.getNumerics(), msgBuf);
+
+ status = U_ZERO_ERROR;
+ USpoofChecker *sc = uspoof_open(&status);
+ uspoof_setChecks(sc, USPOOF_MIXED_NUMBERS, &status); // only check this
+ int32_t result = uspoof_checkUnicodeString(sc, testString, NULL, &status);
+ UBool mixedNumberFailure = ((result & USPOOF_MIXED_NUMBERS) != 0);
+ TEST_ASSERT_MSG((expectedSet.size() > 1) == mixedNumberFailure, msgBuf);
+ uspoof_close(sc);
+ }
+}
+
+#endif /* !UCONFIG_NO_REGULAR_EXPRESSIONS && !UCONFIG_NO_NORMALIZATION && !UCONFIG_NO_FILE_IO */
diff --git a/test/intltest/itspoof.h b/test/intltest/itspoof.h
index abd54f5..a92c2ef 100644
--- a/test/intltest/itspoof.h
+++ b/test/intltest/itspoof.h
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (C) 2011, International Business Machines Corporation
+* Copyright (C) 2011-2013, International Business Machines Corporation
* and others. All Rights Reserved.
**********************************************************************
*/
@@ -36,6 +36,14 @@
void testBug8654();
+ void testIdentifierInfo();
+
+ void testScriptSet();
+
+ void testRestrictionLevel();
+
+ void testMixedNumbers();
+
// Internal function to run a single skeleton test case.
void checkSkeleton(const USpoofChecker *sc, uint32_t flags,
const char *input, const char *expected, int32_t lineNum);
diff --git a/test/intltest/itutil.cpp b/test/intltest/itutil.cpp
index 9353eb5..2f72610 100644
--- a/test/intltest/itutil.cpp
+++ b/test/intltest/itutil.cpp
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2011, International Business Machines Corporation and
+ * Copyright (c) 1997-2012, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@@ -32,6 +32,7 @@
extern IntlTest *createBytesTrieTest();
static IntlTest *createLocalPointerTest();
extern IntlTest *createUCharsTrieTest();
+static IntlTest *createEnumSetTest();
#define CASE(id, test) case id: \
name = #test; \
@@ -86,6 +87,14 @@
callTest(*test, par);
}
break;
+ case 19:
+ name = "EnumSetTest";
+ if (exec) {
+ logln("TestSuite EnumSetTest---"); logln();
+ LocalPointer<IntlTest> test(createEnumSetTest());
+ callTest(*test, par);
+ }
+ break;
default: name = ""; break; //needed to end loop
}
}
@@ -466,3 +475,84 @@
#endif /* !UCONFIG_NO_TRANSLITERATION */
}
+
+/** EnumSet test **/
+#include "unicode/enumset.h"
+
+class EnumSetTest : public IntlTest {
+public:
+ EnumSetTest() {}
+ virtual void runIndexedTest(int32_t index, UBool exec, const char *&name, char *par=NULL);
+ void TestEnumSet();
+};
+
+static IntlTest *createEnumSetTest() {
+ return new EnumSetTest();
+}
+
+void EnumSetTest::runIndexedTest(int32_t index, UBool exec, const char *&name, char * /*par*/) {
+ TESTCASE_AUTO_BEGIN;
+ TESTCASE_AUTO(TestEnumSet);
+ TESTCASE_AUTO_END;
+}
+enum myEnum {
+ MAX_NONBOOLEAN=-1,
+ THING1,
+ THING2,
+ THING3,
+ LIMIT_BOOLEAN
+};
+
+void EnumSetTest::TestEnumSet() {
+ EnumSet<myEnum,
+ MAX_NONBOOLEAN+1,
+ LIMIT_BOOLEAN>
+ flags;
+
+ logln("Enum is from [%d..%d]\n", MAX_NONBOOLEAN+1,
+ LIMIT_BOOLEAN);
+
+ TEST_ASSERT_TRUE(flags.get(THING1) == FALSE);
+ TEST_ASSERT_TRUE(flags.get(THING2) == FALSE);
+ TEST_ASSERT_TRUE(flags.get(THING3) == FALSE);
+
+ logln("get(thing1)=%d, get(thing2)=%d, get(thing3)=%d\n", flags.get(THING1), flags.get(THING2), flags.get(THING3));
+ logln("Value now: %d\n", flags.getAll());
+ flags.clear();
+ logln("clear -Value now: %d\n", flags.getAll());
+ logln("get(thing1)=%d, get(thing2)=%d, get(thing3)=%d\n", flags.get(THING1), flags.get(THING2), flags.get(THING3));
+ TEST_ASSERT_TRUE(flags.get(THING1) == FALSE);
+ TEST_ASSERT_TRUE(flags.get(THING2) == FALSE);
+ TEST_ASSERT_TRUE(flags.get(THING3) == FALSE);
+ flags.add(THING1);
+ logln("set THING1 -Value now: %d\n", flags.getAll());
+ TEST_ASSERT_TRUE(flags.get(THING1) == TRUE);
+ TEST_ASSERT_TRUE(flags.get(THING2) == FALSE);
+ TEST_ASSERT_TRUE(flags.get(THING3) == FALSE);
+ logln("get(thing1)=%d, get(thing2)=%d, get(thing3)=%d\n", flags.get(THING1), flags.get(THING2), flags.get(THING3));
+ flags.add(THING3);
+ logln("set THING3 -Value now: %d\n", flags.getAll());
+ TEST_ASSERT_TRUE(flags.get(THING1) == TRUE);
+ TEST_ASSERT_TRUE(flags.get(THING2) == FALSE);
+ TEST_ASSERT_TRUE(flags.get(THING3) == TRUE);
+ logln("get(thing1)=%d, get(thing2)=%d, get(thing3)=%d\n", flags.get(THING1), flags.get(THING2), flags.get(THING3));
+ flags.remove(THING2);
+ TEST_ASSERT_TRUE(flags.get(THING1) == TRUE);
+ TEST_ASSERT_TRUE(flags.get(THING2) == FALSE);
+ TEST_ASSERT_TRUE(flags.get(THING3) == TRUE);
+ logln("remove THING2 -Value now: %d\n", flags.getAll());
+ logln("get(thing1)=%d, get(thing2)=%d, get(thing3)=%d\n", flags.get(THING1), flags.get(THING2), flags.get(THING3));
+ flags.remove(THING1);
+ TEST_ASSERT_TRUE(flags.get(THING1) == FALSE);
+ TEST_ASSERT_TRUE(flags.get(THING2) == FALSE);
+ TEST_ASSERT_TRUE(flags.get(THING3) == TRUE);
+ logln("remove THING1 -Value now: %d\n", flags.getAll());
+ logln("get(thing1)=%d, get(thing2)=%d, get(thing3)=%d\n", flags.get(THING1), flags.get(THING2), flags.get(THING3));
+
+ flags.clear();
+ logln("clear -Value now: %d\n", flags.getAll());
+ logln("get(thing1)=%d, get(thing2)=%d, get(thing3)=%d\n", flags.get(THING1), flags.get(THING2), flags.get(THING3));
+ TEST_ASSERT_TRUE(flags.get(THING1) == FALSE);
+ TEST_ASSERT_TRUE(flags.get(THING2) == FALSE);
+ TEST_ASSERT_TRUE(flags.get(THING3) == FALSE);
+}
diff --git a/test/intltest/listformattertest.cpp b/test/intltest/listformattertest.cpp
index 80552fd..07c1c56 100644
--- a/test/intltest/listformattertest.cpp
+++ b/test/intltest/listformattertest.cpp
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 2012, International Business Machines
+* Copyright (C) 2012-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -37,51 +37,45 @@
void ListFormatterTest::CheckFourCases(const char* locale_string, UnicodeString one, UnicodeString two,
UnicodeString three, UnicodeString four, UnicodeString results[4]) {
UErrorCode errorCode = U_ZERO_ERROR;
- ListFormatter* formatter = ListFormatter::createInstance(Locale(locale_string), errorCode);
- if (formatter == NULL || U_FAILURE(errorCode)) {
- errln("Allocation problem\n");
+ LocalPointer<ListFormatter> formatter(ListFormatter::createInstance(Locale(locale_string), errorCode));
+ if (U_FAILURE(errorCode)) {
+ dataerrln("ListFormatter::createInstance(Locale(\"%s\"), errorCode) failed in CheckFourCases: %s", locale_string, u_errorName(errorCode));
return;
}
UnicodeString input1[] = {one};
- CheckFormatting(formatter, input1, 1, results[0]);
+ CheckFormatting(formatter.getAlias(), input1, 1, results[0]);
UnicodeString input2[] = {one, two};
- CheckFormatting(formatter, input2, 2, results[1]);
+ CheckFormatting(formatter.getAlias(), input2, 2, results[1]);
UnicodeString input3[] = {one, two, three};
- CheckFormatting(formatter, input3, 3, results[2]);
+ CheckFormatting(formatter.getAlias(), input3, 3, results[2]);
UnicodeString input4[] = {one, two, three, four};
- CheckFormatting(formatter, input4, 4, results[3]);
-
- delete formatter;
+ CheckFormatting(formatter.getAlias(), input4, 4, results[3]);
}
-
-void ListFormatterTest::TestLocaleFallback() {
- const char* testData[][4] = {
- {"en_US", "en", "", ""}, // ULocale.getFallback("") should return ""
- {"EN_us_Var", "en_US", "en", ""}, // Case is always normalized
- {"de_DE@collation=phonebook", "de@collation=phonebook", "@collation=phonebook", "@collation=phonebook"}, // Keyword is preserved
- {"en__POSIX", "en", "", ""}, // Trailing empty segment should be truncated
- {"_US_POSIX", "_US", "", ""}, // Same as above
- {"root", "", "", ""}, // No canonicalization
- };
- for (int i = 0; i < 6; ++i) {
- for(int j = 1; j < 4; ++j) {
- Locale in(testData[i][j-1]);
- Locale out;
- UErrorCode errorCode = U_ZERO_ERROR;
- ListFormatter::getFallbackLocale(in, out, errorCode);
- if (U_FAILURE(errorCode)) {
- errln("Error in getLocaleFallback: %s", u_errorName(errorCode));
- }
-
- if (::strcmp(testData[i][j], out.getName())) {
- errln("Expected: |%s|, Actual: |%s|\n", testData[i][j], out.getName());
- }
- }
+UBool ListFormatterTest::RecordFourCases(const Locale& locale, UnicodeString one, UnicodeString two,
+ UnicodeString three, UnicodeString four, UnicodeString results[4]) {
+ UErrorCode errorCode = U_ZERO_ERROR;
+ LocalPointer<ListFormatter> formatter(ListFormatter::createInstance(locale, errorCode));
+ if (U_FAILURE(errorCode)) {
+ dataerrln("ListFormatter::createInstance(\"%s\", errorCode) failed in RecordFourCases: %s", locale.getName(), u_errorName(errorCode));
+ return FALSE;
}
+ UnicodeString input1[] = {one};
+ formatter->format(input1, 1, results[0], errorCode);
+ UnicodeString input2[] = {one, two};
+ formatter->format(input2, 2, results[1], errorCode);
+ UnicodeString input3[] = {one, two, three};
+ formatter->format(input3, 3, results[2], errorCode);
+ UnicodeString input4[] = {one, two, three, four};
+ formatter->format(input4, 4, results[3], errorCode);
+ if (U_FAILURE(errorCode)) {
+ errln("RecordFourCases failed: %s", u_errorName(errorCode));
+ return FALSE;
+ }
+ return TRUE;
}
void ListFormatterTest::TestRoot() {
@@ -97,14 +91,10 @@
// Bogus locale should fallback to root.
void ListFormatterTest::TestBogus() {
- UnicodeString results[4] = {
- one,
- one + ", " + two,
- one + ", " + two + ", " + three,
- one + ", " + two + ", " + three + ", " + four
- };
-
- CheckFourCases("ex_PY", one, two, three, four, results);
+ UnicodeString results[4];
+ if (RecordFourCases(Locale::getDefault(), one, two, three, four, results)) {
+ CheckFourCases("ex_PY", one, two, three, four, results);
+ }
}
// Formatting in English.
@@ -183,7 +173,6 @@
four + " in the last after " + three + " after " + two + " after the first " + one
};
- UErrorCode errorCode = U_ZERO_ERROR;
ListFormatData data("{1} after {0}", "{1} after the first {0}",
"{1} after {0}", "{1} in the last after {0}");
ListFormatter formatter(data);
@@ -211,8 +200,7 @@
case 4: name = "TestRussian"; if (exec) TestRussian(); break;
case 5: name = "TestMalayalam"; if (exec) TestMalayalam(); break;
case 6: name = "TestZulu"; if (exec) TestZulu(); break;
- case 7: name = "TestLocaleFallback"; if (exec) TestLocaleFallback(); break;
- case 8: name = "TestOutOfOrderPatterns"; if (exec) TestLocaleFallback(); break;
+ case 7: name = "TestOutOfOrderPatterns"; if (exec) TestOutOfOrderPatterns(); break;
default: name = ""; break;
}
diff --git a/test/intltest/listformattertest.h b/test/intltest/listformattertest.h
index d780f05..418fe57 100644
--- a/test/intltest/listformattertest.h
+++ b/test/intltest/listformattertest.h
@@ -27,7 +27,6 @@
void runIndexedTest(int32_t index, UBool exec, const char *&name, char *par=0);
- void TestLocaleFallback();
void TestRoot();
void TestBogus();
void TestEnglish();
@@ -46,6 +45,13 @@
UnicodeString three,
UnicodeString four,
UnicodeString results[4]);
+ UBool RecordFourCases(
+ const Locale& locale,
+ UnicodeString one,
+ UnicodeString two,
+ UnicodeString three,
+ UnicodeString four,
+ UnicodeString results[4]);
private:
// Reused test data.
diff --git a/test/intltest/loctest.cpp b/test/intltest/loctest.cpp
index c073863..7a12d0d 100644
--- a/test/intltest/loctest.cpp
+++ b/test/intltest/loctest.cpp
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2012, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@@ -868,8 +868,8 @@
;
/* TODO: Change this test to be more like the cloctst version? */
- if (testCount != 538)
- errln("Expected getISOLanguages() to return 538 languages; it returned %d", testCount);
+ if (testCount != 559)
+ errln("Expected getISOLanguages() to return 559 languages; it returned %d", testCount);
else {
for (i = 0; i < 15; i++) {
int32_t j;
@@ -899,8 +899,8 @@
for(testCount=0;test[testCount];testCount++)
;
- if (testCount != 246){
- errln("Expected getISOCountries to return 246 countries; it returned %d", testCount);
+ if (testCount != 249){
+ errln("Expected getISOCountries to return 249 countries; it returned %d", testCount);
}else {
for (i = 0; i < spot2Len; i++) {
int32_t j;
@@ -959,7 +959,7 @@
// names, and other stuff like that. This test just checks specific language
// and country codes to make sure we have the correct names for them.
char languageCodes[] [4] = { "he", "id", "iu", "ug", "yi", "za" };
- UnicodeString languageNames [] = { "Hebrew", "Indonesian", "Inuktitut", "Uighur", "Yiddish",
+ UnicodeString languageNames [] = { "Hebrew", "Indonesian", "Inuktitut", "Uyghur", "Yiddish",
"Zhuang" };
for (int32_t i = 0; i < 6; i++) {
@@ -1399,7 +1399,7 @@
UnicodeString temp;
// Try with codes that are the wrong length but happen to match text
// at a valid offset in the mapping table
- Locale locale("aaa", "CCC");
+ Locale locale("xxx", "CCC");
const char *result = locale.getISO3Country();
@@ -1420,7 +1420,7 @@
UnicodeString temp;
// Try with codes that are the wrong length but happen to match text
// at a valid offset in the mapping table
- Locale locale("aaa", "CCC");
+ Locale locale("xxx", "CCC");
const char *result = locale.getISO3Language();
diff --git a/test/intltest/loctest.h b/test/intltest/loctest.h
index a9172b9..e115b1e 100644
--- a/test/intltest/loctest.h
+++ b/test/intltest/loctest.h
@@ -81,7 +81,8 @@
/* Test getting the locale base name */
void TestGetBaseName(void);
-
+ void TestTrailingNull(void); /* Google Patch */
+
#if !UCONFIG_NO_FORMATTING
void Test4105828(void) ;
#endif
@@ -172,3 +173,4 @@
+
diff --git a/test/intltest/numfmtst.cpp b/test/intltest/numfmtst.cpp
index 963656f..f9d9c95 100644
--- a/test/intltest/numfmtst.cpp
+++ b/test/intltest/numfmtst.cpp
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2012, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/* Modification History:
@@ -48,82 +48,77 @@
// class NumberFormatTest
// *****************************************************************************
-#define CASE(id,test) case id: name = #test; if (exec) { logln(#test "---"); logln((UnicodeString)""); test(); } break
-
#define CHECK(status,str) if (U_FAILURE(status)) { errcheckln(status, UnicodeString("FAIL: ") + str + " - " + u_errorName(status)); return; }
#define CHECK_DATA(status,str) if (U_FAILURE(status)) { dataerrln(UnicodeString("FAIL: ") + str + " - " + u_errorName(status)); return; }
void NumberFormatTest::runIndexedTest( int32_t index, UBool exec, const char* &name, char* /*par*/ )
{
- // if (exec) logln((UnicodeString)"TestSuite DateFormatTest");
- switch (index) {
- CASE(0,TestCurrencySign);
- CASE(1,TestCurrency);
- CASE(2,TestParse);
- CASE(3,TestRounding487);
- CASE(4,TestQuotes);
- CASE(5,TestExponential);
- CASE(6,TestPatterns);
+ TESTCASE_AUTO_BEGIN;
+ TESTCASE_AUTO(TestCurrencySign);
+ TESTCASE_AUTO(TestCurrency);
+ TESTCASE_AUTO(TestParse);
+ TESTCASE_AUTO(TestRounding487);
+ TESTCASE_AUTO(TestQuotes);
+ TESTCASE_AUTO(TestExponential);
+ TESTCASE_AUTO(TestPatterns);
- // Upgrade to alphaWorks - liu 5/99
- CASE(7,TestExponent);
- CASE(8,TestScientific);
- CASE(9,TestPad);
- CASE(10,TestPatterns2);
- CASE(11,TestSecondaryGrouping);
- CASE(12,TestSurrogateSupport);
- CASE(13,TestAPI);
+ // Upgrade to alphaWorks - liu 5/99
+ TESTCASE_AUTO(TestExponent);
+ TESTCASE_AUTO(TestScientific);
+ TESTCASE_AUTO(TestPad);
+ TESTCASE_AUTO(TestPatterns2);
+ TESTCASE_AUTO(TestSecondaryGrouping);
+ TESTCASE_AUTO(TestSurrogateSupport);
+ TESTCASE_AUTO(TestAPI);
- CASE(14,TestCurrencyObject);
- CASE(15,TestCurrencyPatterns);
- //CASE(16,TestDigitList);
- CASE(16,TestWhiteSpaceParsing);
- CASE(17,TestComplexCurrency); // This test removed because CLDR no longer uses choice formats in currency symbols.
- CASE(18,TestRegCurrency);
- CASE(19,TestSymbolsWithBadLocale);
- CASE(20,TestAdoptDecimalFormatSymbols);
+ TESTCASE_AUTO(TestCurrencyObject);
+ TESTCASE_AUTO(TestCurrencyPatterns);
+ //TESTCASE_AUTO(TestDigitList);
+ TESTCASE_AUTO(TestWhiteSpaceParsing);
+ TESTCASE_AUTO(TestComplexCurrency); // This test removed because CLDR no longer uses choice formats in currency symbols.
+ TESTCASE_AUTO(TestRegCurrency);
+ TESTCASE_AUTO(TestSymbolsWithBadLocale);
+ TESTCASE_AUTO(TestAdoptDecimalFormatSymbols);
- CASE(21,TestScientific2);
- CASE(22,TestScientificGrouping);
- CASE(23,TestInt64);
+ TESTCASE_AUTO(TestScientific2);
+ TESTCASE_AUTO(TestScientificGrouping);
+ TESTCASE_AUTO(TestInt64);
- CASE(24,TestPerMill);
- CASE(25,TestIllegalPatterns);
- CASE(26,TestCases);
+ TESTCASE_AUTO(TestPerMill);
+ TESTCASE_AUTO(TestIllegalPatterns);
+ TESTCASE_AUTO(TestCases);
- CASE(27,TestCurrencyNames);
- CASE(28,TestCurrencyAmount);
- CASE(29,TestCurrencyUnit);
- CASE(30,TestCoverage);
- CASE(31,TestJB3832);
- CASE(32,TestHost);
- CASE(33,TestHostClone);
- CASE(34,TestCurrencyFormat);
- CASE(35,TestRounding);
- CASE(36,TestNonpositiveMultiplier);
- CASE(37,TestNumberingSystems);
- CASE(38,TestSpaceParsing);
- CASE(39,TestMultiCurrencySign);
- CASE(40,TestCurrencyFormatForMixParsing);
- CASE(41,TestDecimalFormatCurrencyParse);
- CASE(42,TestCurrencyIsoPluralFormat);
- CASE(43,TestCurrencyParsing);
- CASE(44,TestParseCurrencyInUCurr);
- CASE(45,TestFormatAttributes);
- CASE(46,TestFieldPositionIterator);
- CASE(47,TestDecimal);
- CASE(48,TestCurrencyFractionDigits);
- CASE(49,TestExponentParse);
- CASE(50,TestExplicitParents);
- CASE(51,TestLenientParse);
- CASE(52,TestAvailableNumberingSystems);
- CASE(53,TestRoundingPattern);
- CASE(54,Test9087);
- CASE(55,TestFormatFastpaths);
- CASE(56,TestEnumSet);
- CASE(57,TestFormattableSize);
- default: name = ""; break;
- }
+ TESTCASE_AUTO(TestCurrencyNames);
+ TESTCASE_AUTO(TestCurrencyAmount);
+ TESTCASE_AUTO(TestCurrencyUnit);
+ TESTCASE_AUTO(TestCoverage);
+ TESTCASE_AUTO(TestJB3832);
+ TESTCASE_AUTO(TestHost);
+ TESTCASE_AUTO(TestHostClone);
+ TESTCASE_AUTO(TestCurrencyFormat);
+ TESTCASE_AUTO(TestRounding);
+ TESTCASE_AUTO(TestNonpositiveMultiplier);
+ TESTCASE_AUTO(TestNumberingSystems);
+ TESTCASE_AUTO(TestSpaceParsing);
+ TESTCASE_AUTO(TestMultiCurrencySign);
+ TESTCASE_AUTO(TestCurrencyFormatForMixParsing);
+ TESTCASE_AUTO(TestDecimalFormatCurrencyParse);
+ TESTCASE_AUTO(TestCurrencyIsoPluralFormat);
+ TESTCASE_AUTO(TestCurrencyParsing);
+ TESTCASE_AUTO(TestParseCurrencyInUCurr);
+ TESTCASE_AUTO(TestFormatAttributes);
+ TESTCASE_AUTO(TestFieldPositionIterator);
+ TESTCASE_AUTO(TestDecimal);
+ TESTCASE_AUTO(TestCurrencyFractionDigits);
+ TESTCASE_AUTO(TestExponentParse);
+ TESTCASE_AUTO(TestExplicitParents);
+ TESTCASE_AUTO(TestLenientParse);
+ TESTCASE_AUTO(TestAvailableNumberingSystems);
+ TESTCASE_AUTO(TestRoundingPattern);
+ TESTCASE_AUTO(Test9087);
+ TESTCASE_AUTO(TestFormatFastpaths);
+ TESTCASE_AUTO(TestFormattableSize);
+ TESTCASE_AUTO_END;
}
// -------------------------------------
@@ -801,7 +796,7 @@
1234.56, CharsToUnicodeString("\\u00A51,235")); // Yen
expectCurrency(*fmt, Locale("fr", "CH", ""),
- 1234.56, "CHF1,234.55"); // 0.05 rounding
+ 1234.56, "CHF1,234.56"); // no more 0.05 rounding here, see cldrbug 5548
expectCurrency(*fmt, Locale::getUS(),
1234.56, "$1,234.56");
@@ -821,7 +816,7 @@
1234.56, CharsToUnicodeString("1 235 \\u00A5JP")); // Yen
expectCurrency(*fmt, Locale("fr", "CH", ""),
- 1234.56, "1 234,55 CHF"); // 0.05 rounding
+ 1234.56, "1 234,56 CHF"); // no more 0.05 rounding here, see cldrbug 5548
expectCurrency(*fmt, Locale::getUS(),
1234.56, "1 234,56 $US");
@@ -3290,7 +3285,7 @@
// test locale without currency information
{"root", "-1.23", "USD", "-US$\\u00A01.23", "-USD\\u00A01.23", "-1.23 USD"},
// test choice format
- {"es_AR", "1", "INR", "\\u20B91,00", "INR1,00", "1,00 rupia india"},
+ {"es_AR", "1", "INR", "Rs.1,00", "INR1,00", "1,00 rupia india"}, // Google Patch
};
static const UNumberFormatStyle currencyStyles[] = {
UNUM_CURRENCY,
@@ -4704,7 +4699,7 @@
"\\u20ab1.00",
"\\u20aa1.00",
"\\u20ac1.00",
- "\\u20b91.00",
+ "Rs.1.00", // Google Patch: Indian Rupee symbol \u20B9 -> "Rs."
//
// Following has extra text, should be parsed correctly too
"$1.00 random",
@@ -6685,43 +6680,6 @@
}
}
-enum myEnum {
- MAX_NONBOOLEAN=-1,
- THING1,
- THING2,
- THING3,
- LIMIT_BOOLEAN
-};
-
-void NumberFormatTest::TestEnumSet(void) {
- EnumSet<myEnum,
- MAX_NONBOOLEAN+1,
- LIMIT_BOOLEAN>
- flags;
- infoln("TODO!! This test doesn't fail on error. Convert printf into error assert.\n");
-
- logln("Enum is from [%d..%d]\n", MAX_NONBOOLEAN+1,
- LIMIT_BOOLEAN);
-
- logln("get(thing1)=%d, get(thing2)=%d, get(thing3)=%d\n", flags.get(THING1), flags.get(THING2), flags.get(THING3));
- logln("Value now: %d\n", flags.getAll());
- flags.clear();
- logln("clear -Value now: %d\n", flags.getAll());
- logln("get(thing1)=%d, get(thing2)=%d, get(thing3)=%d\n", flags.get(THING1), flags.get(THING2), flags.get(THING3));
- flags.add(THING1);
- logln("set THING1 -Value now: %d\n", flags.getAll());
- logln("get(thing1)=%d, get(thing2)=%d, get(thing3)=%d\n", flags.get(THING1), flags.get(THING2), flags.get(THING3));
- flags.add(THING3);
- logln("set THING3 -Value now: %d\n", flags.getAll());
- logln("get(thing1)=%d, get(thing2)=%d, get(thing3)=%d\n", flags.get(THING1), flags.get(THING2), flags.get(THING3));
- flags.remove(THING2);
- logln("remove THING2 -Value now: %d\n", flags.getAll());
- logln("get(thing1)=%d, get(thing2)=%d, get(thing3)=%d\n", flags.get(THING1), flags.get(THING2), flags.get(THING3));
- flags.remove(THING1);
- logln("remove THING1 -Value now: %d\n", flags.getAll());
- logln("get(thing1)=%d, get(thing2)=%d, get(thing3)=%d\n", flags.get(THING1), flags.get(THING2), flags.get(THING3));
-
-}
void NumberFormatTest::TestFormattableSize(void) {
if(sizeof(FmtStackData) > UNUM_INTERNAL_STACKARRAY_SIZE) {
diff --git a/test/intltest/numrgts.cpp b/test/intltest/numrgts.cpp
index e2e8aa7..633d453 100644
--- a/test/intltest/numrgts.cpp
+++ b/test/intltest/numrgts.cpp
@@ -291,13 +291,13 @@
UnicodeString sBuf1;
FieldPosition fp1(0);
logln(UnicodeString("d = ") + d);
- logln("maxFractionDigits = " + df->getMaximumFractionDigits());
-
+ logln(UnicodeString("maxFractionDigits = ") + df->getMaximumFractionDigits());
+
logln(" format(d) = '" + df->format(d, sBuf1, fp1) + "'");
df->setMaximumFractionDigits(17);
UnicodeString sBuf2;
FieldPosition fp2(0);
- logln("maxFractionDigits = " + df->getMaximumFractionDigits());
+ logln(UnicodeString("maxFractionDigits = ") + df->getMaximumFractionDigits());
sBuf2 = df->format(d, sBuf2, fp2);
if(sBuf2 != "100")
errln(" format(d) = '" + sBuf2 + "'");
@@ -1308,7 +1308,7 @@
}
failure(status, "new DecimalFormat");
if (sdf->getMinimumIntegerDigits() != 1)
- errln("Minimum integer digits : " + sdf->getMinimumIntegerDigits());
+ errln(UnicodeString("Minimum integer digits : ") + sdf->getMinimumIntegerDigits());
delete sdf;
}
/* @bug 4052223 (API addition request A27)
@@ -1620,7 +1620,7 @@
nf->setMaximumIntegerDigits(MAX_INT_DIGITS);
logln("setMaximumIntegerDigits(MAX_INT_DIGITS)");
if (nf->getMaximumIntegerDigits() != MAX_INT_DIGITS)
- errln("getMaximumIntegerDigits() returns " +
+ errln(UnicodeString("getMaximumIntegerDigits() returns ") +
nf->getMaximumIntegerDigits());
delete nf;
diff --git a/test/intltest/rbbitst.cpp b/test/intltest/rbbitst.cpp
index c803db9..a68790b 100644
--- a/test/intltest/rbbitst.cpp
+++ b/test/intltest/rbbitst.cpp
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1999-2012, International Business Machines Corporation and
+ * Copyright (c) 1999-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/************************************************************************
@@ -142,8 +142,8 @@
break;
#endif
- case 22: name = "skip";
- break;
+ case 22: name = "TestBug9983";
+ if (exec) TestBug9983(); break;
case 23: name = "TestDictRules";
if (exec) TestDictRules(); break;
case 24: name = "TestBug5532";
@@ -956,6 +956,53 @@
i, t->srcLine->elementAti(i), t->srcCol->elementAti(i));
}
}
+
+ // Check isBoundary()
+ for (i=0; i<t->expectedBreaks->size(); i++) {
+ UBool boundaryExpected = (t->expectedBreaks->elementAti(i) != 0);
+ UBool boundaryFound = t->bi->isBoundary(i);
+ if (boundaryExpected != boundaryFound) {
+ errln("isBoundary(%d) incorrect. File line,col= %4d,%4d\n"
+ " Expected, Actual= %s, %s",
+ i, t->srcLine->elementAti(i), t->srcCol->elementAti(i),
+ boundaryExpected ? "true":"false", boundaryFound? "true" : "false");
+ }
+ }
+
+ // Check following()
+ for (i=0; i<t->expectedBreaks->size(); i++) {
+ int32_t actualBreak = t->bi->following(i);
+ int32_t expectedBreak = BreakIterator::DONE;
+ for (int32_t j=i+1; j < t->expectedBreaks->size(); j++) {
+ if (t->expectedBreaks->elementAti(j) != 0) {
+ expectedBreak = j;
+ break;
+ }
+ }
+ if (expectedBreak != actualBreak) {
+ errln("following(%d) incorrect. File line,col= %4d,%4d\n"
+ " Expected, Actual= %d, %d",
+ i, t->srcLine->elementAti(i), t->srcCol->elementAti(i), expectedBreak, actualBreak);
+ }
+ }
+
+ // Check preceding()
+ for (i=t->expectedBreaks->size(); i>=0; i--) {
+ int32_t actualBreak = t->bi->preceding(i);
+ int32_t expectedBreak = BreakIterator::DONE;
+
+ for (int32_t j=i-1; j >= 0; j--) {
+ if (t->expectedBreaks->elementAti(j) != 0) {
+ expectedBreak = j;
+ break;
+ }
+ }
+ if (expectedBreak != actualBreak) {
+ errln("preceding(%d) incorrect. File line,col= %4d,%4d\n"
+ " Expected, Actual= %d, %d",
+ i, t->srcLine->elementAti(i), t->srcCol->elementAti(i), expectedBreak, actualBreak);
+ }
+ }
}
@@ -1100,7 +1147,7 @@
char localeName8[100];
localeName.extract(0, localeName.length(), localeName8, sizeof(localeName8), 0);
locale = Locale::createFromName(localeName8);
- charIdx += localeMatcher.group(0, status).length();
+ charIdx += localeMatcher.group(0, status).length() - 1;
TEST_ASSERT_SUCCESS(status);
break;
}
@@ -4172,6 +4219,38 @@
}
+void RBBITest::TestBug9983(void) {
+ UnicodeString text = UnicodeString("\\u002A" // * Other
+ "\\uFF65" // Other
+ "\\u309C" // Katakana
+ "\\uFF9F" // Extend
+ "\\uFF65" // Other
+ "\\u0020" // Other
+ "\\u0000").unescape();
+
+ UErrorCode status = U_ZERO_ERROR;
+ LocalPointer<RuleBasedBreakIterator> brkiter(static_cast<RuleBasedBreakIterator *>(
+ BreakIterator::createWordInstance(Locale::getRoot(), status)));
+ TEST_ASSERT_SUCCESS(status);
+ if (U_FAILURE(status)) {
+ return;
+ }
+ brkiter->setText(text);
+ int32_t offset, rstatus;
+ brkiter->last();
+ int32_t iterationCount = 0;
+ while ( (offset = brkiter->previous()) != UBRK_DONE ) {
+ iterationCount++;
+ rstatus = brkiter->getRuleStatus();
+ // printf(" %d(%d)", offset, rstatus);
+ if (iterationCount >= 10) {
+ break;
+ }
+ }
+ TEST_ASSERT(iterationCount == 6);
+}
+
+
//
// TestDebug - A place-holder test for debugging purposes.
// For putting in fragments of other tests that can be invoked
diff --git a/test/intltest/rbbitst.h b/test/intltest/rbbitst.h
index 2d2d8f2..0426d70 100644
--- a/test/intltest/rbbitst.h
+++ b/test/intltest/rbbitst.h
@@ -1,5 +1,5 @@
/*************************************************************************
- * Copyright (c) 1999-2011, International Business Machines
+ * Copyright (c) 1999-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*************************************************************************
* Date Name Description
@@ -71,6 +71,7 @@
void TestTailoredBreaks();
void TestDictRules();
void TestBug5532();
+ void TestBug9983();
void TestDebug();
void TestProperties();
diff --git a/test/intltest/regiontst.cpp b/test/intltest/regiontst.cpp
new file mode 100644
index 0000000..635a1b5
--- /dev/null
+++ b/test/intltest/regiontst.cpp
@@ -0,0 +1,714 @@
+/***********************************************************************
+ * COPYRIGHT:
+ * Copyright (c) 2013, International Business Machines Corporation
+ * and others. All Rights Reserved.
+ ***********************************************************************/
+
+/***********************************************************************
+ * This testcase ported from ICU4J ( RegionTest.java ) to ICU4C *
+ * Try to keep them in sync if at all possible...! *
+ ***********************************************************************/
+
+#include "unicode/utypes.h"
+#include "cstring.h"
+
+#if !UCONFIG_NO_FORMATTING
+
+#include "unicode/region.h"
+#include "regiontst.h"
+
+typedef struct KnownRegion {
+ const char *code;
+ int32_t numeric;
+ const char *parent;
+ URegionType type;
+ const char *containingContinent;
+} KnownRegion;
+
+#define LENGTHOF(array) (int32_t)(sizeof(array) / sizeof((array)[0]))
+
+static KnownRegion knownRegions[] = {
+ // Code, Num, Parent, Type, Containing Continent
+ { "TP" , 626, "035", URGN_TERRITORY, "142" },
+ { "001", 1, NULL , URGN_WORLD, NULL },
+ { "002", 2, "001", URGN_CONTINENT, NULL },
+ { "003", 3, NULL, URGN_GROUPING, NULL },
+ { "005", 5, "019", URGN_SUBCONTINENT, "019" },
+ { "009", 9, "001", URGN_CONTINENT, NULL},
+ { "011", 11, "002", URGN_SUBCONTINENT, "002" },
+ { "013", 13, "019", URGN_SUBCONTINENT, "019" },
+ { "014", 14, "002", URGN_SUBCONTINENT, "002" },
+ { "015", 15, "002", URGN_SUBCONTINENT, "002" },
+ { "017", 17, "002", URGN_SUBCONTINENT, "002" },
+ { "018", 18, "002", URGN_SUBCONTINENT, "002" },
+ { "019", 19, "001", URGN_CONTINENT, NULL },
+ { "021", 21, "019", URGN_SUBCONTINENT, "019" },
+ { "029", 29, "019", URGN_SUBCONTINENT, "019" },
+ { "030", 30, "142", URGN_SUBCONTINENT, "142" },
+ { "034", 34, "142", URGN_SUBCONTINENT, "142" },
+ { "035", 35, "142", URGN_SUBCONTINENT, "142" },
+ { "039", 39, "150", URGN_SUBCONTINENT, "150"},
+ { "053", 53, "009", URGN_SUBCONTINENT, "009" },
+ { "054", 54, "009", URGN_SUBCONTINENT, "009" },
+ { "057", 57, "009", URGN_SUBCONTINENT, "009" },
+ { "061", 61, "009", URGN_SUBCONTINENT, "009" },
+ { "142", 142, "001", URGN_CONTINENT, NULL },
+ { "143", 143, "142", URGN_SUBCONTINENT, "142" },
+ { "145", 145, "142", URGN_SUBCONTINENT, "142" },
+ { "150", 150, "001", URGN_CONTINENT, NULL },
+ { "151", 151, "150", URGN_SUBCONTINENT, "150" },
+ { "154", 154, "150", URGN_SUBCONTINENT, "150" },
+ { "155", 155, "150", URGN_SUBCONTINENT, "150" },
+ { "419", 419, NULL, URGN_GROUPING , NULL},
+ { "AC" , -1, "QO" , URGN_TERRITORY, "009" },
+ { "AD" , 20, "039", URGN_TERRITORY, "150" },
+ { "AE" , 784, "145", URGN_TERRITORY, "142" },
+ { "AF" , 4, "034", URGN_TERRITORY, "142" },
+ { "AG" , 28, "029", URGN_TERRITORY, "019" },
+ { "AI" , 660, "029", URGN_TERRITORY, "019" },
+ { "AL" , 8, "039", URGN_TERRITORY, "150" },
+ { "AM" , 51, "145", URGN_TERRITORY, "142" },
+ { "AN" , 530, NULL, URGN_DEPRECATED, NULL },
+ { "AO" , 24, "017", URGN_TERRITORY, "002" },
+ { "AQ" , 10, "QO" , URGN_TERRITORY, "009" },
+ { "AR" , 32, "005", URGN_TERRITORY, "019" },
+ { "AS" , 16, "061", URGN_TERRITORY, "009" },
+ { "AT" , 40, "155", URGN_TERRITORY, "150" },
+ { "AU" , 36, "053", URGN_TERRITORY, "009" },
+ { "AW" , 533, "029", URGN_TERRITORY, "019" },
+ { "AX" , 248, "154", URGN_TERRITORY, "150" },
+ { "AZ" , 31, "145", URGN_TERRITORY, "142" },
+ { "BA" , 70, "039", URGN_TERRITORY, "150" },
+ { "BB" , 52, "029", URGN_TERRITORY, "019" },
+ { "BD" , 50, "034", URGN_TERRITORY, "142" },
+ { "BE" , 56, "155", URGN_TERRITORY, "150" },
+ { "BF" , 854, "011", URGN_TERRITORY, "002" },
+ { "BG" , 100, "151", URGN_TERRITORY, "150" },
+ { "BH" , 48, "145", URGN_TERRITORY, "142" },
+ { "BI" , 108, "014", URGN_TERRITORY, "002" },
+ { "BJ" , 204, "011", URGN_TERRITORY, "002" },
+ { "BL" , 652, "029", URGN_TERRITORY, "019" },
+ { "BM" , 60, "021", URGN_TERRITORY, "019" },
+ { "BN" , 96, "035", URGN_TERRITORY, "142" },
+ { "BO" , 68, "005", URGN_TERRITORY, "019" },
+ { "BQ" , 535, "029", URGN_TERRITORY, "019" },
+ { "BR" , 76, "005", URGN_TERRITORY, "019" },
+ { "BS" , 44, "029", URGN_TERRITORY, "019" },
+ { "BT" , 64, "034", URGN_TERRITORY, "142" },
+ { "BU" , 104, "035", URGN_TERRITORY, "142" },
+ { "BV" , 74, "QO" , URGN_TERRITORY, "009" },
+ { "BW" , 72, "018", URGN_TERRITORY, "002" },
+ { "BY" , 112, "151", URGN_TERRITORY, "150" },
+ { "BZ" , 84, "013", URGN_TERRITORY, "019" },
+ { "CA" , 124, "021", URGN_TERRITORY, "019" },
+ { "CC" , 166, "QO" , URGN_TERRITORY, "009" },
+ { "CD" , 180, "017", URGN_TERRITORY, "002" },
+ { "CF" , 140, "017", URGN_TERRITORY, "002" },
+ { "CG" , 178, "017", URGN_TERRITORY, "002" },
+ { "CH" , 756, "155", URGN_TERRITORY, "150" },
+ { "CI" , 384, "011", URGN_TERRITORY, "002" },
+ { "CK" , 184, "061", URGN_TERRITORY, "009" },
+ { "CL" , 152, "005", URGN_TERRITORY, "019" },
+ { "CM" , 120, "017", URGN_TERRITORY, "002" },
+ { "CN" , 156, "030", URGN_TERRITORY, "142" },
+ { "CO" , 170, "005", URGN_TERRITORY, "019" },
+ { "CP" , -1 , "QO" , URGN_TERRITORY, "009" },
+ { "CR" , 188, "013", URGN_TERRITORY, "019" },
+ { "CU" , 192, "029", URGN_TERRITORY, "019" },
+ { "CV" , 132, "011", URGN_TERRITORY, "002" },
+ { "CW" , 531, "029", URGN_TERRITORY, "019" },
+ { "CX" , 162, "QO" , URGN_TERRITORY, "009" },
+ { "CY" , 196, "145", URGN_TERRITORY, "142" },
+ { "CZ" , 203, "151", URGN_TERRITORY, "150" },
+ { "DD" , 276, "155", URGN_TERRITORY, "150" },
+ { "DE" , 276, "155", URGN_TERRITORY, "150" },
+ { "DG" , -1 , "QO" , URGN_TERRITORY, "009" },
+ { "DJ" , 262, "014", URGN_TERRITORY, "002" },
+ { "DK" , 208, "154", URGN_TERRITORY, "150" },
+ { "DM" , 212, "029", URGN_TERRITORY, "019" },
+ { "DO" , 214, "029", URGN_TERRITORY, "019" },
+ { "DZ" , 12, "015", URGN_TERRITORY, "002" },
+ { "EA" , -1, "015", URGN_TERRITORY, "002" },
+ { "EC" , 218, "005", URGN_TERRITORY, "019" },
+ { "EE" , 233, "154", URGN_TERRITORY, "150" },
+ { "EG" , 818, "015", URGN_TERRITORY, "002" },
+ { "EH" , 732, "015", URGN_TERRITORY, "002" },
+ { "ER" , 232, "014", URGN_TERRITORY, "002" },
+ { "ES" , 724, "039", URGN_TERRITORY, "150" },
+ { "ET" , 231, "014", URGN_TERRITORY, "002" },
+ { "EU" , 967, NULL, URGN_GROUPING, NULL },
+ { "FI" , 246, "154", URGN_TERRITORY, "150" },
+ { "FJ" , 242, "054", URGN_TERRITORY, "009" },
+ { "FK" , 238, "005", URGN_TERRITORY, "019" },
+ { "FM" , 583, "057", URGN_TERRITORY, "009" },
+ { "FO" , 234, "154", URGN_TERRITORY, "150" },
+ { "FR" , 250, "155", URGN_TERRITORY, "150" },
+ { "FX" , 250, "155", URGN_TERRITORY, "150" },
+ { "GA" , 266, "017", URGN_TERRITORY, "002" },
+ { "GB" , 826, "154", URGN_TERRITORY, "150" },
+ { "GD" , 308, "029", URGN_TERRITORY, "019" },
+ { "GE" , 268, "145", URGN_TERRITORY, "142" },
+ { "GF" , 254, "005", URGN_TERRITORY, "019" },
+ { "GG" , 831, "154", URGN_TERRITORY, "150" },
+ { "GH" , 288, "011", URGN_TERRITORY, "002" },
+ { "GI" , 292, "039", URGN_TERRITORY, "150" },
+ { "GL" , 304, "021", URGN_TERRITORY, "019" },
+ { "GM" , 270, "011", URGN_TERRITORY, "002" },
+ { "GN" , 324, "011", URGN_TERRITORY, "002" },
+ { "GP" , 312, "029", URGN_TERRITORY, "019" },
+ { "GQ" , 226, "017", URGN_TERRITORY, "002" },
+ { "GR" , 300, "039", URGN_TERRITORY, "150" },
+ { "GS" , 239, "QO" , URGN_TERRITORY, "009" },
+ { "GT" , 320, "013", URGN_TERRITORY, "019" },
+ { "GU" , 316, "057", URGN_TERRITORY, "009" },
+ { "GW" , 624, "011", URGN_TERRITORY, "002" },
+ { "GY" , 328, "005", URGN_TERRITORY, "019" },
+ { "HK" , 344, "030", URGN_TERRITORY, "142" },
+ { "HM" , 334, "QO" , URGN_TERRITORY, "009" },
+ { "HN" , 340, "013", URGN_TERRITORY, "019" },
+ { "HR" , 191, "039", URGN_TERRITORY, "150" },
+ { "HT" , 332, "029", URGN_TERRITORY, "019" },
+ { "HU" , 348, "151", URGN_TERRITORY, "150" },
+ { "IC" , -1, "015", URGN_TERRITORY, "002" },
+ { "ID" , 360, "035", URGN_TERRITORY, "142" },
+ { "IE" , 372, "154", URGN_TERRITORY, "150" },
+ { "IL" , 376, "145", URGN_TERRITORY, "142" },
+ { "IM" , 833, "154", URGN_TERRITORY, "150" },
+ { "IN" , 356, "034", URGN_TERRITORY, "142" },
+ { "IO" , 86, "QO" , URGN_TERRITORY, "009" },
+ { "IQ" , 368, "145", URGN_TERRITORY, "142" },
+ { "IR" , 364, "034", URGN_TERRITORY, "142" },
+ { "IS" , 352, "154", URGN_TERRITORY, "150" },
+ { "IT" , 380, "039", URGN_TERRITORY, "150" },
+ { "JE" , 832, "154", URGN_TERRITORY, "150" },
+ { "JM" , 388, "029", URGN_TERRITORY, "019" },
+ { "JO" , 400, "145", URGN_TERRITORY, "142" },
+ { "JP" , 392, "030", URGN_TERRITORY, "142" },
+ { "KE" , 404, "014", URGN_TERRITORY, "002" },
+ { "KG" , 417, "143", URGN_TERRITORY, "142" },
+ { "KH" , 116, "035", URGN_TERRITORY, "142" },
+ { "KI" , 296, "057", URGN_TERRITORY, "009" },
+ { "KM" , 174, "014", URGN_TERRITORY, "002" },
+ { "KN" , 659, "029", URGN_TERRITORY, "019" },
+ { "KP" , 408, "030", URGN_TERRITORY, "142" },
+ { "KR" , 410, "030", URGN_TERRITORY, "142" },
+ { "KW" , 414, "145", URGN_TERRITORY, "142" },
+ { "KY" , 136, "029", URGN_TERRITORY, "019" },
+ { "KZ" , 398, "143", URGN_TERRITORY, "142" },
+ { "LA" , 418, "035", URGN_TERRITORY, "142" },
+ { "LB" , 422, "145", URGN_TERRITORY, "142" },
+ { "LC" , 662, "029", URGN_TERRITORY, "019" },
+ { "LI" , 438, "155", URGN_TERRITORY, "150" },
+ { "LK" , 144, "034", URGN_TERRITORY, "142" },
+ { "LR" , 430, "011", URGN_TERRITORY, "002" },
+ { "LS" , 426, "018", URGN_TERRITORY, "002" },
+ { "LT" , 440, "154", URGN_TERRITORY, "150" },
+ { "LU" , 442, "155", URGN_TERRITORY, "150" },
+ { "LV" , 428, "154", URGN_TERRITORY, "150" },
+ { "LY" , 434, "015", URGN_TERRITORY, "002" },
+ { "MA" , 504, "015", URGN_TERRITORY, "002" },
+ { "MC" , 492, "155", URGN_TERRITORY, "150" },
+ { "MD" , 498, "151", URGN_TERRITORY, "150" },
+ { "ME" , 499, "039", URGN_TERRITORY, "150" },
+ { "MF" , 663, "029", URGN_TERRITORY, "019" },
+ { "MG" , 450, "014", URGN_TERRITORY, "002" },
+ { "MH" , 584, "057", URGN_TERRITORY, "009" },
+ { "MK" , 807, "039", URGN_TERRITORY, "150" },
+ { "ML" , 466, "011", URGN_TERRITORY, "002" },
+ { "MM" , 104, "035", URGN_TERRITORY, "142" },
+ { "MN" , 496, "030", URGN_TERRITORY, "142" },
+ { "MO" , 446, "030", URGN_TERRITORY, "142" },
+ { "MP" , 580, "057", URGN_TERRITORY, "009" },
+ { "MQ" , 474, "029", URGN_TERRITORY, "019" },
+ { "MR" , 478, "011", URGN_TERRITORY, "002" },
+ { "MS" , 500, "029", URGN_TERRITORY, "019" },
+ { "MT" , 470, "039", URGN_TERRITORY, "150" },
+ { "MU" , 480, "014", URGN_TERRITORY, "002" },
+ { "MV" , 462, "034", URGN_TERRITORY, "142" },
+ { "MW" , 454, "014", URGN_TERRITORY, "002" },
+ { "MX" , 484, "013", URGN_TERRITORY, "019"},
+ { "MY" , 458, "035", URGN_TERRITORY, "142" },
+ { "MZ" , 508, "014", URGN_TERRITORY, "002" },
+ { "NA" , 516, "018", URGN_TERRITORY, "002" },
+ { "NC" , 540, "054", URGN_TERRITORY, "009" },
+ { "NE" , 562, "011", URGN_TERRITORY, "002" },
+ { "NF" , 574, "053", URGN_TERRITORY, "009" },
+ { "NG" , 566, "011", URGN_TERRITORY, "002" },
+ { "NI" , 558, "013", URGN_TERRITORY, "019" },
+ { "NL" , 528, "155", URGN_TERRITORY, "150" },
+ { "NO" , 578, "154", URGN_TERRITORY, "150" },
+ { "NP" , 524, "034", URGN_TERRITORY, "142" },
+ { "NR" , 520, "057", URGN_TERRITORY, "009" },
+ { "NT" , 536, NULL , URGN_DEPRECATED, NULL },
+ { "NU" , 570, "061", URGN_TERRITORY, "009" },
+ { "NZ" , 554, "053", URGN_TERRITORY, "009" },
+ { "OM" , 512, "145", URGN_TERRITORY, "142" },
+ { "PA" , 591, "013", URGN_TERRITORY, "019" },
+ { "PE" , 604, "005", URGN_TERRITORY, "019" },
+ { "PF" , 258, "061", URGN_TERRITORY, "009" },
+ { "PG" , 598, "054", URGN_TERRITORY, "009" },
+ { "PH" , 608, "035", URGN_TERRITORY, "142" },
+ { "PK" , 586, "034", URGN_TERRITORY, "142" },
+ { "PL" , 616, "151", URGN_TERRITORY, "150" },
+ { "PM" , 666, "021", URGN_TERRITORY, "019" },
+ { "PN" , 612, "061", URGN_TERRITORY, "009" },
+ { "PR" , 630, "029", URGN_TERRITORY, "019" },
+ { "PS" , 275, "145", URGN_TERRITORY, "142" },
+ { "PT" , 620, "039", URGN_TERRITORY, "150" },
+ { "PW" , 585, "057", URGN_TERRITORY, "009" },
+ { "PY" , 600, "005", URGN_TERRITORY, "019" },
+ { "QA" , 634, "145", URGN_TERRITORY, "142" },
+ { "QO" , 961, "009", URGN_SUBCONTINENT, "009" },
+ { "QU" , 967, NULL, URGN_GROUPING, NULL },
+ { "RE" , 638, "014", URGN_TERRITORY, "002" },
+ { "RO" , 642, "151", URGN_TERRITORY, "150" },
+ { "RS" , 688, "039", URGN_TERRITORY, "150" },
+ { "RU" , 643, "151", URGN_TERRITORY, "150" },
+ { "RW" , 646, "014", URGN_TERRITORY, "002" },
+ { "SA" , 682, "145", URGN_TERRITORY, "142" },
+ { "SB" , 90, "054", URGN_TERRITORY, "009" },
+ { "SC" , 690, "014", URGN_TERRITORY, "002" },
+ { "SD" , 729, "015", URGN_TERRITORY, "002" },
+ { "SE" , 752, "154", URGN_TERRITORY, "150" },
+ { "SG" , 702, "035", URGN_TERRITORY, "142" },
+ { "SH" , 654, "011", URGN_TERRITORY, "002" },
+ { "SI" , 705, "039", URGN_TERRITORY, "150" },
+ { "SJ" , 744, "154", URGN_TERRITORY, "150" },
+ { "SK" , 703, "151", URGN_TERRITORY, "150" },
+ { "SL" , 694, "011", URGN_TERRITORY, "002" },
+ { "SM" , 674, "039", URGN_TERRITORY, "150" },
+ { "SN" , 686, "011", URGN_TERRITORY, "002" },
+ { "SO" , 706, "014", URGN_TERRITORY, "002" },
+ { "SR" , 740, "005", URGN_TERRITORY, "019" },
+ { "SS" , 728, "015", URGN_TERRITORY, "002" },
+ { "ST" , 678, "017", URGN_TERRITORY, "002" },
+ { "SU" , 810, NULL , URGN_DEPRECATED , NULL},
+ { "SV" , 222, "013", URGN_TERRITORY, "019" },
+ { "SX" , 534, "029", URGN_TERRITORY, "019" },
+ { "SY" , 760, "145", URGN_TERRITORY, "142" },
+ { "SZ" , 748, "018", URGN_TERRITORY, "002" },
+ { "TA" , -1, "QO", URGN_TERRITORY, "009" },
+ { "TC" , 796, "029", URGN_TERRITORY, "019" },
+ { "TD" , 148, "017", URGN_TERRITORY, "002" },
+ { "TF" , 260, "QO" , URGN_TERRITORY, "009" },
+ { "TG" , 768, "011", URGN_TERRITORY, "002" },
+ { "TH" , 764, "035", URGN_TERRITORY, "142" },
+ { "TJ" , 762, "143", URGN_TERRITORY, "142" },
+ { "TK" , 772, "061", URGN_TERRITORY, "009" },
+ { "TL" , 626, "035", URGN_TERRITORY, "142" },
+ { "TM" , 795, "143", URGN_TERRITORY, "142" },
+ { "TN" , 788, "015", URGN_TERRITORY, "002" },
+ { "TO" , 776, "061", URGN_TERRITORY, "009" },
+ { "TP" , 626, "035", URGN_TERRITORY, "142" },
+ { "TR" , 792, "145", URGN_TERRITORY, "142" },
+ { "TT" , 780, "029", URGN_TERRITORY, "019" },
+ { "TV" , 798, "061", URGN_TERRITORY, "009" },
+ { "TW" , 158, "030", URGN_TERRITORY, "142" },
+ { "TZ" , 834, "014", URGN_TERRITORY, "002" },
+ { "UA" , 804, "151", URGN_TERRITORY, "150" },
+ { "UG" , 800, "014", URGN_TERRITORY, "002" },
+ { "UM" , 581, "QO" , URGN_TERRITORY, "009" },
+ { "US" , 840, "021", URGN_TERRITORY, "019" },
+ { "UY" , 858, "005", URGN_TERRITORY, "019" },
+ { "UZ" , 860, "143", URGN_TERRITORY, "142" },
+ { "VA" , 336, "039", URGN_TERRITORY, "150" },
+ { "VC" , 670, "029", URGN_TERRITORY, "019" },
+ { "VE" , 862, "005", URGN_TERRITORY, "019" },
+ { "VG" , 92, "029", URGN_TERRITORY, "019" },
+ { "VI" , 850, "029", URGN_TERRITORY, "019" },
+ { "VN" , 704, "035", URGN_TERRITORY, "142" },
+ { "VU" , 548, "054", URGN_TERRITORY, "009" },
+ { "WF" , 876, "061", URGN_TERRITORY, "009" },
+ { "WS" , 882, "061", URGN_TERRITORY, "009" },
+ { "YD" , 887, "145", URGN_TERRITORY, "142" },
+ { "YE" , 887, "145", URGN_TERRITORY, "142" },
+ { "YT" , 175, "014", URGN_TERRITORY, "002" },
+ { "ZA" , 710, "018", URGN_TERRITORY, "002" },
+ { "ZM" , 894, "014", URGN_TERRITORY, "002" },
+ { "ZR" , 180, "017", URGN_TERRITORY, "002" },
+ { "ZW" , 716, "014", URGN_TERRITORY, "002" },
+ { "ZZ" , 999, NULL , URGN_UNKNOWN, NULL }
+ };
+
+// *****************************************************************************
+// class RegionTest
+// *****************************************************************************
+
+
+RegionTest::RegionTest() {
+}
+
+RegionTest::~RegionTest() {
+}
+
+void
+RegionTest::runIndexedTest( int32_t index, UBool exec, const char* &name, char* par )
+{
+ optionv = (par && *par=='v');
+
+ TESTCASE_AUTO_BEGIN;
+ TESTCASE_AUTO(TestKnownRegions);
+ TESTCASE_AUTO(TestGetInstanceString);
+ TESTCASE_AUTO(TestGetInstanceInt);
+ TESTCASE_AUTO(TestGetContainedRegions);
+ TESTCASE_AUTO(TestGetContainedRegionsWithType);
+ TESTCASE_AUTO(TestGetContainingRegion);
+ TESTCASE_AUTO(TestGetContainingRegionWithType);
+ TESTCASE_AUTO(TestGetPreferredValues);
+ TESTCASE_AUTO(TestContains);
+ TESTCASE_AUTO(TestAvailableTerritories);
+ TESTCASE_AUTO(TestNoContainedRegions);
+ TESTCASE_AUTO_END;
+}
+
+
+void RegionTest::TestKnownRegions() {
+
+ for (int32_t i = 0 ; i < LENGTHOF(knownRegions) ; i++ ) {
+ KnownRegion rd = knownRegions[i];
+ UErrorCode status = U_ZERO_ERROR;
+ const Region *r = Region::getInstance(rd.code,status);
+ if ( r ) {
+ int32_t n = r->getNumericCode();
+ int32_t e = rd.numeric;
+ if ( n != e ) {
+ errln("Numeric code mismatch for region %s. Expected:%d Got:%d",r->getRegionCode(),e,n);
+ }
+
+ if (r->getType() != rd.type) {
+ errln("Expected region %s to be of type %d. Got: %d",r->getRegionCode(),rd.type,r->getType());
+ }
+
+ int32_t nc = rd.numeric;
+ if ( nc > 0 ) {
+ const Region *ncRegion = Region::getInstance(nc,status);
+ if ( *ncRegion != *r && nc != 891 ) { // 891 is special case - CS and YU both deprecated codes for region 891
+ errln("Creating region %s by its numeric code returned a different region. Got: %s instead.",r->getRegionCode(),ncRegion->getRegionCode());
+ }
+ }
+ } else {
+ dataerrln("Known region %s was not recognized.",rd.code);
+ }
+ }
+}
+
+void RegionTest::TestGetInstanceString() {
+ typedef struct TestData {
+ const char *inputID;
+ const char *expectedID;
+ URegionType expectedType;
+ } TestData;
+
+ static TestData testData[] = {
+ // Input ID, Expected ID, Expected Type
+ { "DE", "DE", URGN_TERRITORY }, // Normal region
+ { "QU", "EU", URGN_GROUPING }, // Alias to a grouping
+ { "DD", "DE", URGN_TERRITORY }, // Alias to a deprecated region (East Germany) with single preferred value
+ { "276", "DE", URGN_TERRITORY }, // Numeric code for Germany
+ { "278", "DE", URGN_TERRITORY }, // Numeric code for East Germany (Deprecated)
+ { "SU", "SU", URGN_DEPRECATED }, // Alias to a deprecated region with multiple preferred values
+ { "AN", "AN", URGN_DEPRECATED }, // Deprecated region with multiple preferred values
+ { "SVK", "SK", URGN_TERRITORY } // 3-letter code - Slovakia
+ };
+
+
+ UErrorCode status = U_ZERO_ERROR;
+ const Region *r = Region::getInstance((const char *)NULL,status);
+ if ( status != U_ILLEGAL_ARGUMENT_ERROR ) {
+ errln("Calling Region::getInstance(NULL) should have triggered an U_ILLEGAL_ARGUMENT_ERROR, but didn't.");
+ }
+
+ status = U_ZERO_ERROR;
+ r = Region::getInstance("BOGUS",status);
+ if ( status != U_ILLEGAL_ARGUMENT_ERROR ) {
+ errln("Calling Region::getInstance(\"BOGUS\") should have triggered an U_ILLEGAL_ARGUMENT_ERROR, but didn't.");
+ }
+
+
+ for (int32_t i = 0 ; i < LENGTHOF(testData) ; i++ ) {
+ TestData data = testData[i];
+ status = U_ZERO_ERROR;
+ r = Region::getInstance(data.inputID,status);
+ const char *id;
+ URegionType type;
+ if ( r ) {
+ id = r->getRegionCode();
+ type = r->getType();
+ } else {
+ id = "NULL";
+ type = URGN_UNKNOWN;
+ }
+ if ( uprv_strcmp(id,data.expectedID)) {
+ dataerrln("Unexpected region ID for Region::getInstance(\"%s\"); Expected: %s Got: %s",data.inputID,data.expectedID,id);
+ }
+ if ( type != data.expectedType) {
+ dataerrln("Unexpected region type for Region::getInstance(\"%s\"); Expected: %d Got: %d",data.inputID,data.expectedType,type);
+ }
+ }
+}
+
+void RegionTest::TestGetInstanceInt() {
+ typedef struct TestData {
+ int32_t inputID;
+ const char *expectedID;
+ URegionType expectedType;
+ } TestData;
+
+ static TestData testData[] = {
+ // Input ID, Expected ID, Expected Type
+ { 276, "DE", URGN_TERRITORY }, // Numeric code for Germany
+ { 278, "DE", URGN_TERRITORY }, // Numeric code for East Germany (Deprecated)
+ { 419, "419", URGN_GROUPING }, // Latin America
+ { 736, "SD", URGN_TERRITORY }, // Sudan (pre-2011) - changed numeric code after South Sudan split off
+ { 729, "SD", URGN_TERRITORY }, // Sudan (post-2011) - changed numeric code after South Sudan split off
+ };
+
+ UErrorCode status = U_ZERO_ERROR;
+ Region::getInstance(-123,status);
+ if ( status != U_ILLEGAL_ARGUMENT_ERROR ) {
+ errln("Calling Region::getInstance(-123) should have triggered an U_ILLEGAL_ARGUMENT_ERROR, but didn't.");
+ }
+
+ for (int32_t i = 0 ; i < LENGTHOF(testData) ; i++ ) {
+ TestData data = testData[i];
+ status = U_ZERO_ERROR;
+ const Region *r = Region::getInstance(data.inputID,status);
+ const char *id;
+ URegionType type;
+ if ( r ) {
+ id = r->getRegionCode();
+ type = r->getType();
+ } else {
+ id = "NULL";
+ type = URGN_UNKNOWN;
+ }
+ if ( uprv_strcmp(data.expectedID,id)) {
+ dataerrln("Unexpected region ID for Region.getInstance(%d)); Expected: %s Got: %s",data.inputID,data.expectedID,id);
+ }
+ if ( data.expectedType != type) {
+ dataerrln("Unexpected region type for Region.getInstance(%d)); Expected: %d Got: %d",data.inputID,data.expectedType,type);
+ }
+ }
+}
+
+void RegionTest::TestGetContainedRegions() {
+ for (int32_t i = 0 ; i < LENGTHOF(knownRegions) ; i++ ) {
+ KnownRegion rd = knownRegions[i];
+ UErrorCode status = U_ZERO_ERROR;
+
+ const Region *r = Region::getInstance(rd.code,status);
+ if (r) {
+ if (r->getType() == URGN_GROUPING) {
+ continue;
+ }
+ StringEnumeration *containedRegions = r->getContainedRegions();
+ for ( int32_t i = 0 ; i < containedRegions->count(status); i++ ) {
+ const char *crID = containedRegions->next(NULL,status);
+ const Region *cr = Region::getInstance(crID,status);
+ const Region *containingRegion = cr ? cr->getContainingRegion() : NULL;
+ if ( !containingRegion || *containingRegion != *r ) {
+ errln("Region: %s contains region %s. Expected containing region of this region to be the original region, but got %s",
+ r->getRegionCode(),cr->getRegionCode(),containingRegion?containingRegion->getRegionCode():"NULL");
+ }
+ }
+ delete containedRegions;
+ } else {
+ dataerrln("Known region %s was not recognized.",rd.code);
+ }
+ }
+}
+
+void RegionTest::TestGetContainedRegionsWithType() {
+ for (int32_t i = 0 ; i < LENGTHOF(knownRegions) ; i++ ) {
+ KnownRegion rd = knownRegions[i];
+ UErrorCode status = U_ZERO_ERROR;
+
+ const Region *r = Region::getInstance(rd.code,status);
+ if (r) {
+ if (r->getType() != URGN_CONTINENT) {
+ continue;
+ }
+ StringEnumeration *containedRegions = r->getContainedRegions(URGN_TERRITORY);
+ for ( int32_t j = 0 ; j < containedRegions->count(status); j++ ) {
+ const char *crID = containedRegions->next(NULL,status);
+ const Region *cr = Region::getInstance(crID,status);
+ const Region *containingRegion = cr ? cr->getContainingRegion(URGN_CONTINENT) : NULL;
+ if ( !containingRegion || *containingRegion != *r ) {
+ errln("Continent: %s contains territory %s. Expected containing continent of this region to be the original region, but got %s",
+ r->getRegionCode(),cr->getRegionCode(),containingRegion?containingRegion->getRegionCode():"NULL");
+ }
+ }
+ delete containedRegions;
+ } else {
+ dataerrln("Known region %s was not recognized.",rd.code);
+ }
+ }
+}
+
+void RegionTest::TestGetContainingRegion() {
+ for (int32_t i = 0 ; i < LENGTHOF(knownRegions) ; i++ ) {
+ KnownRegion rd = knownRegions[i];
+ UErrorCode status = U_ZERO_ERROR;
+ const Region *r = Region::getInstance(rd.code,status);
+ if (r) {
+ const Region *c = r->getContainingRegion();
+ if (rd.parent == NULL) {
+ if ( c ) {
+ errln("Containing region for %s should have been NULL. Got: %s",r->getRegionCode(),c->getRegionCode());
+ }
+ } else {
+ const Region *p = Region::getInstance(rd.parent,status);
+ if ( !c || *p != *c ) {
+ errln("Expected containing continent of region %s to be %s. Got: %s",
+ r->getRegionCode(),p?p->getRegionCode():"NULL",c?c->getRegionCode():"NULL" );
+ }
+ }
+ } else {
+ dataerrln("Known region %s was not recognized.",rd.code);
+ }
+ }
+}
+
+void RegionTest::TestGetContainingRegionWithType() {
+ for (int32_t i = 0 ; i < LENGTHOF(knownRegions) ; i++ ) {
+ KnownRegion rd = knownRegions[i];
+ UErrorCode status = U_ZERO_ERROR;
+
+ const Region *r = Region::getInstance(rd.code,status);
+ if (r) {
+ const Region *c = r->getContainingRegion(URGN_CONTINENT);
+ if (rd.containingContinent == NULL) {
+ if ( c != NULL) {
+ errln("Containing continent for %s should have been NULL. Got: %s",r->getRegionCode(), c->getRegionCode());
+ }
+ } else {
+ const Region *p = Region::getInstance(rd.containingContinent,status);
+ if ( *p != *c ) {
+ errln("Expected containing continent of region %s to be %s. Got: %s",
+ r->getRegionCode(),p?p->getRegionCode():"NULL",c?c->getRegionCode():"NULL" );
+ }
+ }
+ } else {
+ dataerrln("Known region %s was not recognized.",rd.code);
+ }
+ }
+}
+
+void RegionTest::TestGetPreferredValues() {
+ static const char *testData[6][17] = {
+ // Input ID, Expected Preferred Values...
+ { "AN", "CW", "SX", "BQ", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, // Netherlands Antilles
+ { "CS", "RS", "ME", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, // Serbia & Montenegro
+ { "FQ", "AQ", "TF", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, // French Southern and Antarctic Territories
+ { "NT", "IQ", "SA", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, // Neutral Zone
+ { "PC", "FM", "MH", "MP", "PW", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, }, // Pacific Islands Trust Territory
+ { "SU", "RU", "AM", "AZ", "BY", "EE", "GE", "KZ", "KG", "LV", "LT", "MD", "TJ", "TM", "UA", "UZ" , NULL}, // Soviet Union
+ };
+
+ for ( int32_t i = 0 ; i < 6 ; i++ ) {
+ const char **data = testData[i];
+ UErrorCode status = U_ZERO_ERROR;
+ const Region *r = Region::getInstance(data[0],status);
+ if (r) {
+ StringEnumeration *preferredValues = r->getPreferredValues();
+ for ( int i = 1 ; data[i] ; i++ ) {
+ UBool found = FALSE;
+ preferredValues->reset(status);
+ while ( const char *check = preferredValues->next(NULL,status) ) {
+ if ( !uprv_strcmp(check,data[i]) ) {
+ found = TRUE;
+ break;
+ }
+ }
+ if ( !found ) {
+ errln("Region::getPreferredValues() for region \"%s\" should have contained \"%s\" but it didn't.",r->getRegionCode(),data[i]);
+ }
+ }
+ delete preferredValues;
+ } else {
+ dataerrln("Known region %s was not recognized.",data[0]);
+ }
+ }
+}
+
+void RegionTest::TestContains() {
+ for (int32_t i = 0 ; i < LENGTHOF(knownRegions) ; i++ ) {
+ KnownRegion rd = knownRegions[i];
+ UErrorCode status = U_ZERO_ERROR;
+
+ const Region *r = Region::getInstance(rd.code,status);
+ if (r) {
+ const Region *c = r->getContainingRegion();
+ while ( c ) {
+ if ( !c->contains(*r)) {
+ errln("Region \"%s\" should have contained \"%s\" but it didn't.",c->getRegionCode(),r->getRegionCode());
+ }
+ c = c->getContainingRegion();
+ }
+ } else {
+ dataerrln("Known region %s was not recognized.",rd.code);
+ }
+ }
+}
+
+void RegionTest::TestAvailableTerritories() {
+ // Test to make sure that the set of territories contained in World and the set of all available
+ // territories are one and the same.
+ UErrorCode status = U_ZERO_ERROR;
+ StringEnumeration *availableTerritories = Region::getAvailable(URGN_TERRITORY);
+ const Region *world = Region::getInstance("001",status);
+ if (U_FAILURE(status)) {
+ dataerrln("Region::getInstance(\"001\",status) failed: %s", u_errorName(status));
+ return;
+ }
+ StringEnumeration *containedInWorld = world->getContainedRegions(URGN_TERRITORY);
+ if ( !availableTerritories || !containedInWorld || *availableTerritories != *containedInWorld ) {
+ char availableTerritoriesString[1024] = "";
+ char containedInWorldString[1024] = "";
+ if ( availableTerritories ) {
+ for (int32_t i = 0 ; i < availableTerritories->count(status) ; i++ ) {
+ if ( i > 0 ) {
+ uprv_strcat(availableTerritoriesString," ");
+ }
+ uprv_strcat(availableTerritoriesString,availableTerritories->next(NULL,status));
+ }
+ } else {
+ uprv_strcpy(availableTerritoriesString,"NULL");
+ }
+ if ( containedInWorld ) {
+ for (int32_t i = 0 ; i < containedInWorld->count(status) ; i++ ) {
+ if ( i > 0 ) {
+ uprv_strcat(containedInWorldString," ");
+ }
+ uprv_strcat(containedInWorldString,containedInWorld->next(NULL,status));
+ }
+ } else {
+ uprv_strcpy(containedInWorldString,"NULL");
+ }
+ errln("Available territories and all territories contained in world should be the same set.\nAvailable = %s\nContained in World = %s",
+ availableTerritoriesString,containedInWorldString);
+ }
+ delete availableTerritories;
+ delete containedInWorld;
+}
+
+void RegionTest::TestNoContainedRegions(void) {
+ UErrorCode status = U_ZERO_ERROR;
+ const Region *region = Region::getInstance("BM",status);
+ if (U_FAILURE(status) || region == NULL) {
+ dataerrln("Fail called to Region::getInstance(\"BM\", status) - %s", u_errorName(status));
+ return;
+ }
+ StringEnumeration *containedRegions = region->getContainedRegions();
+ const char *emptyStr = containedRegions->next(NULL, status);
+ if (U_FAILURE(status)||(emptyStr!=NULL)) {
+ errln("Error, 'BM' should have no subregions, but returned str=%p, err=%s\n", emptyStr, u_errorName(status));
+ } else {
+ logln("Success - BM has no subregions\n");
+ }
+ delete containedRegions;
+}
+
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
+//eof
diff --git a/test/intltest/regiontst.h b/test/intltest/regiontst.h
new file mode 100644
index 0000000..4f192e2
--- /dev/null
+++ b/test/intltest/regiontst.h
@@ -0,0 +1,48 @@
+/************************************************************************
+ * COPYRIGHT:
+ * Copyright (c) 2013, International Business Machines Corporation
+ * and others. All Rights Reserved.
+ ************************************************************************/
+
+#ifndef _REGIONTEST_
+#define _REGIONTEST_
+
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
+#include "unicode/region.h"
+#include "intltest.h"
+
+/**
+ * Performs various tests on Region APIs
+ **/
+class RegionTest: public IntlTest {
+ // IntlTest override
+ void runIndexedTest( int32_t index, UBool exec, const char* &name, char* par );
+
+public:
+ RegionTest();
+ virtual ~RegionTest();
+
+ void TestKnownRegions(void);
+ void TestGetInstanceString(void);
+ void TestGetInstanceInt(void);
+ void TestGetContainedRegions(void);
+ void TestGetContainedRegionsWithType(void);
+ void TestGetContainingRegion(void);
+ void TestGetContainingRegionWithType(void);
+ void TestGetPreferredValues(void);
+ void TestContains(void);
+ void TestAvailableTerritories(void);
+ void TestNoContainedRegions(void);
+
+private:
+
+ UBool optionv; // TRUE if @v option is given on command line
+};
+
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
+#endif // _REGIONTEST_
+//eof
diff --git a/test/intltest/sdtfmtts.cpp b/test/intltest/sdtfmtts.cpp
index b63a71f..ce043b2 100644
--- a/test/intltest/sdtfmtts.cpp
+++ b/test/intltest/sdtfmtts.cpp
@@ -1,7 +1,7 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2010, International Business Machines Corporation and
+ * Copyright (c) 1997-2012, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@@ -229,7 +229,7 @@
status = U_ZERO_ERROR;
pat.applyLocalizedPattern(p1, status);
if(U_FAILURE(status)) {
- errln("ERROR: applyPattern() failed with " + (int32_t) status);
+ errln("ERROR: applyPattern() failed with %s", u_errorName(status));
}
UnicodeString s3;
status = U_ZERO_ERROR;
diff --git a/test/intltest/ssearch.cpp b/test/intltest/ssearch.cpp
index deb43a7..39bd615 100644
--- a/test/intltest/ssearch.cpp
+++ b/test/intltest/ssearch.cpp
@@ -1,47 +1,32 @@
/*
**********************************************************************
- * Copyright (C) 2005-2012, International Business Machines
+ * Copyright (C) 2005-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
-
#include "unicode/utypes.h"
#if !UCONFIG_NO_COLLATION
-#include "unicode/unistr.h"
-#include "unicode/putil.h"
-#include "unicode/usearch.h"
-
#include "cmemory.h"
-#include "unicode/coll.h"
-#include "unicode/tblcoll.h"
-#include "unicode/coleitr.h"
-#include "unicode/ucoleitr.h"
-
-#include "unicode/regex.h" // TODO: make conditional on regexp being built.
-
-#include "unicode/uniset.h"
-#include "unicode/uset.h"
-#include "unicode/ustring.h"
-#include "hash.h"
-#include "uhash.h"
+#include "cstring.h"
#include "ucol_imp.h"
-#include "intltest.h"
+#include "unicode/coll.h"
+#include "unicode/tblcoll.h"
+#include "unicode/usearch.h"
+#include "unicode/uset.h"
+#include "unicode/ustring.h"
+
+#include "unicode/coleitr.h"
+#include "unicode/regex.h" // TODO: make conditional on regexp being built.
+
+#include "colldata.h"
#include "ssearch.h"
-
-#include "unicode/colldata.h"
-#include "unicode/bmsearch.h"
-#include "unicode/bms.h"
-
#include "xmlparser.h"
-#include "ucbuf.h"
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <stdio.h> // for sprintf
char testId[100];
@@ -49,7 +34,7 @@
errln("Failure in file %s, line %d, test ID = \"%s\"", __FILE__, __LINE__, testId);}}
#define TEST_ASSERT_M(x, m) {if (!(x)) { \
- errln("Failure in file %s, line %d. \"%s\"", __FILE__, __LINE__, m);return;}}
+ dataerrln("Failure in file %s, line %d. \"%s\"", __FILE__, __LINE__, m);return;}}
#define TEST_ASSERT_SUCCESS(errcode) {if (U_FAILURE(errcode)) { \
dataerrln("Failure in file %s, line %d, test ID \"%s\", status = \"%s\"", \
@@ -89,36 +74,17 @@
if (exec) monkeyTest(params);
break;
- case 3: name = "bmMonkeyTest";
- if (exec) bmMonkeyTest(params);
+ case 3: name = "sharpSTest";
+ if (exec) sharpSTest();
break;
- case 4: name = "boyerMooreTest";
- if (exec) boyerMooreTest();
- break;
-
- case 5: name = "goodSuffixTest";
+ case 4: name = "goodSuffixTest";
if (exec) goodSuffixTest();
break;
- case 6: name = "searchTime";
+ case 5: name = "searchTime";
if (exec) searchTime();
break;
-
- case 7: name = "bmsTest";
- if (exec) bmsTest();
- break;
-
- case 8: name = "bmSearchTest";
- if (exec) bmSearchTest();
- break;
-
- case 9: name = "udhrTest";
- if (exec) udhrTest();
- break;
- case 10: name = "stringListTest";
- if (exec) stringListTest();
- break;
#endif
default: name = "";
break; //needed to end loop
@@ -354,323 +320,6 @@
#endif
}
-struct UdhrTestCase
-{
- const char *locale;
- const char *file;
-};
-
-void SSearchTest::udhrTest()
-{
- UErrorCode status = U_ZERO_ERROR;
- char path[PATH_BUFFER_SIZE];
- const char *udhrPath = getPath(path, "udhr");
-
- if (udhrPath == NULL) {
- // couldn't get path: error message already output...
- return;
- }
-
- UdhrTestCase testCases[] = {
- {"en", "udhr_eng.txt"},
- {"de", "udhr_deu_1996.txt"},
- {"fr", "udhr_fra.txt"},
- {"ru", "udhr_rus.txt"},
- {"th", "udhr_tha.txt"},
- {"ja", "udhr_jpn.txt"},
- {"ko", "udhr_kor.txt"},
- {"zh", "udhr_cmn_hans.txt"},
- {"zh_Hant", "udhr_cmn_hant.txt"}
- };
-
- int32_t testCount = ARRAY_SIZE(testCases);
-
- for (int32_t t = 0; t < testCount; t += 1) {
- int32_t len = 0;
- char *resolvedFileName = NULL;
- const char *encoding = NULL;
- UCHARBUF *ucharBuf = NULL;
-
- ucbuf_resolveFileName(udhrPath, testCases[t].file, NULL, &len, &status);
- resolvedFileName = NEW_ARRAY(char, len);
-
- if(resolvedFileName == NULL){
- continue;
- }
-
- if(status == U_BUFFER_OVERFLOW_ERROR){
- status = U_ZERO_ERROR;
- }
-
- ucbuf_resolveFileName(udhrPath, testCases[t].file, resolvedFileName, &len, &status);
- ucharBuf = ucbuf_open(resolvedFileName, &encoding, TRUE, FALSE, &status);
-
- DELETE_ARRAY(resolvedFileName);
-
- if(U_FAILURE(status)){
- infoln("Could not open the input file %s. Test skipped\n", testCases[t].file);
- continue;
- }
-
- int32_t targetLen = 0;
- const UChar *target = ucbuf_getBuffer(ucharBuf, &targetLen, &status);
-
- /* The first line of the file contains the pattern */
- int32_t start = 0, end = 0, plen = 0;
-
- for(end = start; ; end += 1) {
- UChar ch = target[end];
-
- if (ch == 0x000A || ch == 0x000D || ch == 0x2028) {
- break;
- }
- }
-
- plen = end - start;
-
- UChar *pattern = NEW_ARRAY(UChar, plen);
- for (int32_t i = 0; i < plen; i += 1) {
- pattern[i] = target[start++];
- }
-
- int32_t offset = 0;
- UCollator *coll = ucol_open(testCases[t].locale, &status);
- UCD *ucd = NULL;
- BMS *bms = NULL;
-
- if (U_FAILURE(status)) {
- errln("Could not open collator for %s", testCases[t].locale);
- goto delete_collator;
- }
-
- ucd = ucd_open(coll, &status);
-
- if (U_FAILURE(status)) {
- errln("Could not open CollData object for %s", testCases[t].locale);
- goto delete_ucd;
- }
-
- bms = bms_open(ucd, pattern, plen, target, targetLen, &status);
-
- if (U_FAILURE(status)) {
- errln("Could not open search object for %s", testCases[t].locale);
- goto delete_bms;
- }
-
- start = end = -1;
- while (bms_search(bms, offset, &start, &end)) {
- offset = end;
- }
-
- if (offset == 0) {
- errln("Could not find pattern - locale: %s, file: %s ", testCases[t].locale, testCases[t].file);
- }
-
-delete_bms:
- bms_close(bms);
-
-delete_ucd:
- ucd_close(ucd);
-
-delete_collator:
- ucol_close(coll);
-
- DELETE_ARRAY(pattern);
- ucbuf_close(ucharBuf);
- }
-
- ucd_flushCache();
-}
-
-void SSearchTest::bmSearchTest()
-{
-#if !UCONFIG_NO_REGULAR_EXPRESSIONS
- UErrorCode status = U_ZERO_ERROR;
- char path[PATH_BUFFER_SIZE];
- const char *testFilePath = getPath(path, "ssearch.xml");
-
- if (testFilePath == NULL) {
- return; /* Couldn't get path: error message already output. */
- }
-
- UXMLParser *parser = UXMLParser::createParser(status);
- TEST_ASSERT_SUCCESS(status);
- UXMLElement *root = parser->parseFile(testFilePath, status);
- TEST_ASSERT_SUCCESS(status);
- if (U_FAILURE(status)) {
- return;
- }
-
- const UnicodeString *debugTestCase = root->getAttribute("debug");
- if (debugTestCase != NULL) {
-// setenv("USEARCH_DEBUG", "1", 1);
- }
-
-
- const UXMLElement *testCase;
- int32_t tc = 0;
-
- while((testCase = root->nextChildElement(tc)) != NULL) {
-
- if (testCase->getTagName().compare("test-case") != 0) {
- errln("ssearch, unrecognized XML Element in test file");
- continue;
- }
- const UnicodeString *id = testCase->getAttribute("id");
- *testId = 0;
- if (id != NULL) {
- id->extract(0, id->length(), testId, sizeof(testId), US_INV);
- }
-
- // If debugging test case has been specified and this is not it, skip to next.
- if (id!=NULL && debugTestCase!=NULL && *id != *debugTestCase) {
- continue;
- }
- //
- // Get the requested collation strength.
- // Default is tertiary if the XML attribute is missing from the test case.
- //
- const UnicodeString *strength = testCase->getAttribute("strength");
- UColAttributeValue collatorStrength = UCOL_PRIMARY;
- if (strength==NULL) { collatorStrength = UCOL_TERTIARY;}
- else if (*strength=="PRIMARY") { collatorStrength = UCOL_PRIMARY;}
- else if (*strength=="SECONDARY") { collatorStrength = UCOL_SECONDARY;}
- else if (*strength=="TERTIARY") { collatorStrength = UCOL_TERTIARY;}
- else if (*strength=="QUATERNARY") { collatorStrength = UCOL_QUATERNARY;}
- else if (*strength=="IDENTICAL") { collatorStrength = UCOL_IDENTICAL;}
- else {
- // Bogus value supplied for strength. Shouldn't happen, even from
- // typos, if the XML source has been validated.
- // This assert is a little deceiving in that strength can be
- // any of the allowed values, not just TERTIARY, but it will
- // do the job of getting the error output.
- TEST_ASSERT(*strength=="TERTIARY")
- }
-
- //
- // Get the collator normalization flag. Default is UCOL_OFF.
- //
- UColAttributeValue normalize = UCOL_OFF;
- const UnicodeString *norm = testCase->getAttribute("norm");
- TEST_ASSERT (norm==NULL || *norm=="ON" || *norm=="OFF");
- if (norm!=NULL && *norm=="ON") {
- normalize = UCOL_ON;
- }
-
- //
- // Get the alternate_handling flag. Default is UCOL_NON_IGNORABLE.
- //
- UColAttributeValue alternateHandling = UCOL_NON_IGNORABLE;
- const UnicodeString *alt = testCase->getAttribute("alternate_handling");
- TEST_ASSERT (alt == NULL || *alt == "SHIFTED" || *alt == "NON_IGNORABLE");
- if (alt != NULL && *alt == "SHIFTED") {
- alternateHandling = UCOL_SHIFTED;
- }
-
- const UnicodeString defLocale("en");
- char clocale[100];
- const UnicodeString *locale = testCase->getAttribute("locale");
- if (locale == NULL || locale->length()==0) {
- locale = &defLocale;
- };
- locale->extract(0, locale->length(), clocale, sizeof(clocale), NULL);
-
-
- UnicodeString text;
- UnicodeString target;
- UnicodeString pattern;
- int32_t expectedMatchStart = -1;
- int32_t expectedMatchLimit = -1;
- const UXMLElement *n;
- int32_t nodeCount = 0;
-
- n = testCase->getChildElement("pattern");
- TEST_ASSERT(n != NULL);
- if (n==NULL) {
- continue;
- }
- text = n->getText(FALSE);
- text = text.unescape();
- pattern.append(text);
- nodeCount++;
-
- n = testCase->getChildElement("pre");
- if (n!=NULL) {
- text = n->getText(FALSE);
- text = text.unescape();
- target.append(text);
- nodeCount++;
- }
-
- n = testCase->getChildElement("m");
- if (n!=NULL) {
- expectedMatchStart = target.length();
- text = n->getText(FALSE);
- text = text.unescape();
- target.append(text);
- expectedMatchLimit = target.length();
- nodeCount++;
- }
-
- n = testCase->getChildElement("post");
- if (n!=NULL) {
- text = n->getText(FALSE);
- text = text.unescape();
- target.append(text);
- nodeCount++;
- }
-
- // Check that there weren't extra things in the XML
- TEST_ASSERT(nodeCount == testCase->countChildren());
-
- // Open a collator and StringSearch based on the parameters
- // obtained from the XML.
- //
- status = U_ZERO_ERROR;
- UCollator *collator = ucol_open(clocale, &status);
- ucol_setStrength(collator, collatorStrength);
- ucol_setAttribute(collator, UCOL_NORMALIZATION_MODE, normalize, &status);
- ucol_setAttribute(collator, UCOL_ALTERNATE_HANDLING, alternateHandling, &status);
- UCD *ucd = ucd_open(collator, &status);
- BMS *bms = bms_open(ucd, pattern.getBuffer(), pattern.length(), target.getBuffer(), target.length(), &status);
-
- TEST_ASSERT_SUCCESS(status);
- if (U_FAILURE(status)) {
- bms_close(bms);
- ucd_close(ucd);
- ucol_close(collator);
- continue;
- }
-
- int32_t foundStart = 0;
- int32_t foundLimit = 0;
- UBool foundMatch;
-
- //
- // Do the search, check the match result against the expected results.
- //
- foundMatch = bms_search(bms, 0, &foundStart, &foundLimit);
- //TEST_ASSERT_SUCCESS(status);
- if ((foundMatch && expectedMatchStart < 0) ||
- (foundStart != expectedMatchStart) ||
- (foundLimit != expectedMatchLimit)) {
- TEST_ASSERT(FALSE); // ouput generic error position
- infoln("Found, expected match start = %d, %d \n"
- "Found, expected match limit = %d, %d",
- foundStart, expectedMatchStart, foundLimit, expectedMatchLimit);
- }
-
- bms_close(bms);
- ucd_close(ucd);
- ucol_close(collator);
- }
-
- ucd_flushCache();
- delete root;
- delete parser;
-#endif
-}
-
struct Order
{
int32_t order;
@@ -980,7 +629,7 @@
col->setAttribute(UCOL_NORMALIZATION_MODE, UCOL_ON, status);
for(int32_t i = 0; i < testCount; i += 1) {
- if (!isICUVersionAtLeast(51, 1) && i>=4 && i<=6) {
+ if (!isICUVersionAtLeast(52, 0, 1) && i>=4 && i<=6) {
continue; // timebomb until ticket #9156 (was #8081) is resolved
}
UnicodeString ts = CharsToUnicodeString(test[i]);
@@ -1073,375 +722,60 @@
}
#endif
-#if 1
-
-struct PCE
-{
- uint64_t ce;
- int32_t lowOffset;
- int32_t highOffset;
-};
-
-class PCEList
-{
-public:
- PCEList(UCollator *coll, const UnicodeString &string);
- ~PCEList();
-
- int32_t size() const;
-
- const PCE *get(int32_t index) const;
-
- int32_t getLowOffset(int32_t index) const;
- int32_t getHighOffset(int32_t index) const;
- uint64_t getOrder(int32_t index) const;
-
- UBool matchesAt(int32_t offset, const PCEList &other) const;
-
- uint64_t operator[](int32_t index) const;
-
-private:
- void add(uint64_t ce, int32_t low, int32_t high);
-
- PCE *list;
- int32_t listMax;
- int32_t listSize;
-};
-
-PCEList::PCEList(UCollator *coll, const UnicodeString &string)
-{
- UErrorCode status = U_ZERO_ERROR;
- UCollationElements *elems = ucol_openElements(coll, string.getBuffer(), string.length(), &status);
- uint64_t order;
- int32_t low, high;
-
- list = new PCE[listMax];
-
- ucol_setOffset(elems, 0, &status);
-
- do {
- order = ucol_nextProcessed(elems, &low, &high, &status);
- add(order, low, high);
- } while (order != UCOL_PROCESSED_NULLORDER);
-
- ucol_closeElements(elems);
-}
-
-PCEList::~PCEList()
-{
- delete[] list;
-}
-
-void PCEList::add(uint64_t order, int32_t low, int32_t high)
-{
- if (listSize >= listMax) {
- listMax *= 2;
-
- PCE *newList = new PCE[listMax];
-
- uprv_memcpy(newList, list, listSize * sizeof(Order));
- delete[] list;
- list = newList;
- }
-
- list[listSize].ce = order;
- list[listSize].lowOffset = low;
- list[listSize].highOffset = high;
-
- listSize += 1;
-}
-
-const PCE *PCEList::get(int32_t index) const
-{
- if (index >= listSize) {
- return NULL;
- }
-
- return &list[index];
-}
-
-int32_t PCEList::getLowOffset(int32_t index) const
-{
- const PCE *pce = get(index);
-
- if (pce != NULL) {
- return pce->lowOffset;
- }
-
- return -1;
-}
-
-int32_t PCEList::getHighOffset(int32_t index) const
-{
- const PCE *pce = get(index);
-
- if (pce != NULL) {
- return pce->highOffset;
- }
-
- return -1;
-}
-
-uint64_t PCEList::getOrder(int32_t index) const
-{
- const PCE *pce = get(index);
-
- if (pce != NULL) {
- return pce->ce;
- }
-
- return UCOL_PROCESSED_NULLORDER;
-}
-
-int32_t PCEList::size() const
-{
- return listSize;
-}
-
-UBool PCEList::matchesAt(int32_t offset, const PCEList &other) const
-{
- // NOTE: sizes include the NULLORDER, which we don't want to compare.
- int32_t otherSize = other.size() - 1;
-
- if (listSize - 1 - offset < otherSize) {
- return FALSE;
- }
-
- for (int32_t i = offset, j = 0; j < otherSize; i += 1, j += 1) {
- if (getOrder(i) != other.getOrder(j)) {
- return FALSE;
- }
- }
-
- return TRUE;
-}
-
-uint64_t PCEList::operator[](int32_t index) const
-{
- return getOrder(index);
-}
-
-void SSearchTest::boyerMooreTest()
+void SSearchTest::sharpSTest()
{
UErrorCode status = U_ZERO_ERROR;
UCollator *coll = NULL;
- CollData *data = NULL;
- const CEList* ce = NULL;
- const CEList* ce1 = NULL;
UnicodeString lp = "fuss";
UnicodeString sp = "fu\\u00DF";
- BoyerMooreSearch *longPattern = NULL;
- BoyerMooreSearch *shortPattern = NULL;
UnicodeString targets[] = {"fu\\u00DF", "fu\\u00DFball", "1fu\\u00DFball", "12fu\\u00DFball", "123fu\\u00DFball", "1234fu\\u00DFball",
"ffu\\u00DF", "fufu\\u00DF", "fusfu\\u00DF",
"fuss", "ffuss", "fufuss", "fusfuss", "1fuss", "12fuss", "123fuss", "1234fuss", "fu\\u00DF", "1fu\\u00DF", "12fu\\u00DF", "123fu\\u00DF", "1234fu\\u00DF"};
int32_t start = -1, end = -1;
coll = ucol_openFromShortString("LEN_S1", FALSE, NULL, &status);
- if (U_FAILURE(status)) {
- errcheckln(status, "Could not open collator. - %s", u_errorName(status));
- return;
- }
+ TEST_ASSERT_SUCCESS(status);
- data = CollData::open(coll, status);
- if (U_FAILURE(status)) {
- errln("Could not open CollData object.");
- goto close_data;
- }
+ UnicodeString lpUnescaped = lp.unescape();
+ UnicodeString spUnescaped = sp.unescape();
- data->getDynamicClassID();
- if (U_FAILURE(status)) {
- errln("Could not get dynamic class ID of CollData.");
- goto close_patterns;
- }
+ LocalUStringSearchPointer ussLong(usearch_openFromCollator(lpUnescaped.getBuffer(), lpUnescaped.length(),
+ lpUnescaped.getBuffer(), lpUnescaped.length(), // actual test data will be set later
+ coll,
+ NULL, // the break iterator
+ &status));
- data->getStaticClassID();
- if (U_FAILURE(status)) {
- errln("Could not get static class ID of CollData.");
- goto close_patterns;
- }
-
- longPattern = new BoyerMooreSearch(data, lp.unescape(), NULL, status);
- shortPattern = new BoyerMooreSearch(data, sp.unescape(), NULL, status);
- if (U_FAILURE(status)) {
- errln("Could not create pattern objects.");
- goto close_patterns;
- }
-
- longPattern->getBadCharacterTable();
- shortPattern->getBadCharacterTable();
- if (U_FAILURE(status)) {
- errln("Could not get bad character table.");
- goto close_patterns;
- }
-
- longPattern->getGoodSuffixTable();
- shortPattern->getGoodSuffixTable();
- if (U_FAILURE(status)) {
- errln("Could not get good suffix table.");
- goto close_patterns;
- }
-
- longPattern->getDynamicClassID();
- shortPattern->getDynamicClassID();
- if (U_FAILURE(status)) {
- errln("Could not get dynamic class ID of BoyerMooreSearch.");
- goto close_patterns;
- }
-
- longPattern->getStaticClassID();
- shortPattern->getStaticClassID();
- if (U_FAILURE(status)) {
- errln("Could not get static class ID of BoyerMooreSearch.");
- goto close_patterns;
- }
-
- longPattern->getData();
- shortPattern->getData();
- if (U_FAILURE(status)) {
- errln("Could not get collate data.");
- goto close_patterns;
- }
-
- ce = longPattern->getPatternCEs();
- ce1 = shortPattern->getPatternCEs();
- if (U_FAILURE(status)) {
- errln("Could not get pattern CEs.");
- goto close_patterns;
- }
-
- ce->getDynamicClassID();
- ce1->getDynamicClassID();
- if (U_FAILURE(status)) {
- errln("Could not get dynamic class ID of CEList.");
- goto close_patterns;
- }
-
- ce->getStaticClassID();
- ce1->getStaticClassID();
- if (U_FAILURE(status)) {
- errln("Could not get static class ID of CEList.");
- goto close_patterns;
- }
-
- if(data->minLengthInChars(ce,0) != 3){
- errln("Minimal Length in Characters for 'data' with 'ce' was suppose to give 3.");
- goto close_patterns;
- }
-
- if(data->minLengthInChars(ce1,0) != 3){
- errln("Minimal Length in Characters for 'data' with 'ce1' was suppose to give 3.");
- goto close_patterns;
- }
+ LocalUStringSearchPointer ussShort(usearch_openFromCollator(spUnescaped.getBuffer(), spUnescaped.length(),
+ spUnescaped.getBuffer(), spUnescaped.length(), // actual test data will be set later
+ coll,
+ NULL, // the break iterator
+ &status));
+ TEST_ASSERT_SUCCESS(status);
for (uint32_t t = 0; t < (sizeof(targets)/sizeof(targets[0])); t += 1) {
+ UBool bFound;
UnicodeString target = targets[t].unescape();
- longPattern->setTargetString(&target, status);
- if (longPattern->search(0, start, end)) {
+ start = end = -1;
+ usearch_setText(ussLong.getAlias(), target.getBuffer(), target.length(), &status);
+ bFound = usearch_search(ussLong.getAlias(), 0, &start, &end, &status);
+ TEST_ASSERT_SUCCESS(status);
+ if (bFound) {
logln("Test %d: found long pattern at [%d, %d].", t, start, end);
} else {
- errln("Test %d: did not find long pattern.", t);
+ dataerrln("Test %d: did not find long pattern.", t);
}
- shortPattern->setTargetString(&target, status);
- if (shortPattern->search(0, start, end)) {
- logln("Test %d: found short pattern at [%d, %d].", t, start, end);
- } else {
- errln("Test %d: did not find short pattern.", t);
- }
-
- if(longPattern->empty()){
- errln("Test %d: Long pattern should not have been empty.");
- }
-
- if(shortPattern->empty()){
- errln("Test %d: Short pattern should not have been empty.");
- }
- }
-
-close_patterns:
- delete shortPattern;
- delete longPattern;
-
-close_data:
- CollData::close(data);
- ucol_close(coll);
-}
-
-void SSearchTest::bmsTest()
-{
- UErrorCode status = U_ZERO_ERROR;
- UCollator *coll = NULL;
- UCD *data = NULL;
- UnicodeString lp = "fuss";
- UnicodeString lpu = lp.unescape();
- UnicodeString sp = "fu\\u00DF";
- UnicodeString spu = sp.unescape();
- BMS *longPattern = NULL;
- BMS *shortPattern = NULL;
- UnicodeString targets[] = {"fu\\u00DF", "fu\\u00DFball", "1fu\\u00DFball", "12fu\\u00DFball", "123fu\\u00DFball", "1234fu\\u00DFball",
- "ffu\\u00DF", "fufu\\u00DF", "fusfu\\u00DF",
- "fuss", "ffuss", "fufuss", "fusfuss", "1fuss", "12fuss", "123fuss", "1234fuss", "fu\\u00DF", "1fu\\u00DF", "12fu\\u00DF", "123fu\\u00DF", "1234fu\\u00DF"};
- int32_t start = -1, end = -1;
-
- coll = ucol_openFromShortString("LEN_S1", FALSE, NULL, &status);
- if (U_FAILURE(status)) {
- errcheckln(status, "Could not open collator. - %s", u_errorName(status));
- return;
- }
-
- data = ucd_open(coll, &status);
- if (U_FAILURE(status)) {
- errln("Could not open CollData object.");
- goto close_data;
- }
-
- longPattern = bms_open(data, lpu.getBuffer(), lpu.length(), NULL, 0, &status);
- shortPattern = bms_open(data, spu.getBuffer(), spu.length(), NULL, 0, &status);
- if (U_FAILURE(status)) {
- errln("Couldn't open pattern objects.");
- goto close_patterns;
- }
-
- for (uint32_t t = 0; t < (sizeof(targets)/sizeof(targets[0])); t += 1) {
- UnicodeString target = targets[t].unescape();
-
- bms_setTargetString(longPattern, target.getBuffer(), target.length(), &status);
- if (bms_search(longPattern, 0, &start, &end)) {
+ usearch_setText(ussShort.getAlias(), target.getBuffer(), target.length(), &status);
+ bFound = usearch_search(ussShort.getAlias(), 0, &start, &end, &status);
+ TEST_ASSERT_SUCCESS(status);
+ if (bFound) {
logln("Test %d: found long pattern at [%d, %d].", t, start, end);
} else {
- errln("Test %d: did not find long pattern.", t);
- }
-
- bms_setTargetString(shortPattern, target.getBuffer(), target.length(), &status);
- if (bms_search(shortPattern, 0, &start, &end)) {
- logln("Test %d: found short pattern at [%d, %d].", t, start, end);
- } else {
- errln("Test %d: did not find short pattern.", t);
+ dataerrln("Test %d: did not find long pattern.", t);
}
}
- /* Add better coverage for bms code. */
- if(bms_empty(longPattern)) {
- errln("FAIL: longgPattern is empty.");
- }
-
- if (!bms_getData(longPattern)) {
- errln("FAIL: bms_getData returned NULL.");
- }
-
- if (!ucd_getCollator(data)) {
- errln("FAIL: ucd_getCollator returned NULL.");
- }
-
-close_patterns:
- bms_close(shortPattern);
- bms_close(longPattern);
-
-close_data:
- ucd_close(data);
- ucd_freeCache();
ucol_close(coll);
}
@@ -1449,41 +783,29 @@
{
UErrorCode status = U_ZERO_ERROR;
UCollator *coll = NULL;
- CollData *data = NULL;
UnicodeString pat = /*"gcagagag"*/ "fxeld";
UnicodeString target = /*"gcatcgcagagagtatacagtacg"*/ "cloveldfxeld";
- BoyerMooreSearch *pattern = NULL;
int32_t start = -1, end = -1;
+ UBool bFound;
coll = ucol_open(NULL, &status);
- if (U_FAILURE(status)) {
- errcheckln(status, "Couldn't open collator. - %s", u_errorName(status));
- return;
- }
+ TEST_ASSERT_SUCCESS(status);
- data = CollData::open(coll, status);
- if (U_FAILURE(status)) {
- errln("Couldn't open CollData object.");
- goto close_data;
- }
+ LocalUStringSearchPointer ss(usearch_openFromCollator(pat.getBuffer(), pat.length(),
+ target.getBuffer(), target.length(),
+ coll,
+ NULL, // the break iterator
+ &status));
+ TEST_ASSERT_SUCCESS(status);
- pattern = new BoyerMooreSearch(data, pat, &target, status);
- if (U_FAILURE(status)) {
- errln("Couldn't open pattern object.");
- goto close_pattern;
- }
-
- if (pattern->search(0, start, end)) {
+ bFound = usearch_search(ss.getAlias(), 0, &start, &end, &status);
+ TEST_ASSERT_SUCCESS(status);
+ if (bFound) {
logln("Found pattern at [%d, %d].", start, end);
} else {
- errln("Did not find pattern.");
+ dataerrln("Did not find pattern.");
}
-close_pattern:
- delete pattern;
-
-close_data:
- CollData::close(data);
ucol_close(coll);
}
@@ -1591,7 +913,6 @@
"Neither to been y-buried nor y-brent,\n"
"But maketh houndes ete hem in despyt. zet'\n";
-#define TEST_BOYER_MOORE 1
const char *cPattern = "maketh houndes ete hem";
//const char *cPattern = "Whylom";
//const char *cPattern = "zet";
@@ -1601,25 +922,15 @@
LocalUCollatorPointer collator(ucol_open("en", &status));
- CollData *data = CollData::open(collator.getAlias(), status);
- if (U_FAILURE(status) || collator.isNull() || data == NULL) {
- errcheckln(status, "Unable to open UCollator or CollData. - %s", u_errorName(status));
- return;
- }
//ucol_setStrength(collator.getAlias(), collatorStrength);
//ucol_setAttribute(collator.getAlias(), UCOL_NORMALIZATION_MODE, normalize, &status);
UnicodeString uPattern = cPattern;
-#ifndef TEST_BOYER_MOORE
LocalUStringSearchPointer uss(usearch_openFromCollator(uPattern.getBuffer(), uPattern.length(),
target.getBuffer(), target.length(),
collator.getAlias(),
NULL, // the break iterator
&status));
TEST_ASSERT_SUCCESS(status);
-#else
- BoyerMooreSearch bms(data, uPattern, &target, status);
- TEST_ASSERT_SUCCESS(status);
-#endif
// int32_t foundStart;
// int32_t foundEnd;
@@ -1631,12 +942,8 @@
int32_t refMatchPos = (int32_t)(pm - longishText);
int32_t icuMatchPos;
int32_t icuMatchEnd;
-#ifndef TEST_BOYER_MOORE
usearch_search(uss.getAlias(), 0, &icuMatchPos, &icuMatchEnd, &status);
TEST_ASSERT_SUCCESS(status);
-#else
- found = bms.search(0, icuMatchPos, icuMatchEnd);
-#endif
TEST_ASSERT_M(refMatchPos == icuMatchPos, "strstr and icu give different match positions.");
int32_t i;
@@ -1645,11 +952,7 @@
// Try loopcounts around 100000 to some millions, depending on the operation,
// to get runtimes of at least several seconds.
for (i=0; i<10000; i++) {
-#ifndef TEST_BOYER_MOORE
found = usearch_search(uss.getAlias(), 0, &icuMatchPos, &icuMatchEnd, &status);
-#else
- found = bms.search(0, icuMatchPos, icuMatchEnd);
-#endif
//TEST_ASSERT_SUCCESS(status);
//TEST_ASSERT(found);
@@ -1663,11 +966,7 @@
}
//printf("%ld, %d\n", pm-longishText, j);
-#ifdef TEST_BOYER_MOORE
- CollData::close(data);
-#endif
}
-#endif
//----------------------------------------------------------------------------------------
//
@@ -1878,83 +1177,6 @@
} while (! matches);
}
-//
-// Find the next acceptable boundary following the specified starting index
-// in the target text being searched.
-// TODO: refine what is an acceptable boundary. For the moment,
-// choose the next position not within a combining sequence.
-//
-#if 0
-static int32_t nextBoundaryAfter(const UnicodeString &string, int32_t startIndex) {
- const UChar *text = string.getBuffer();
- int32_t textLen = string.length();
-
- if (startIndex >= textLen) {
- return startIndex;
- }
-
- UChar32 c;
- int32_t i = startIndex;
-
- U16_NEXT(text, i, textLen, c);
-
- // If we are on a control character, stop without looking for combining marks.
- // Control characters do not combine.
- int32_t gcProperty = u_getIntPropertyValue(c, UCHAR_GRAPHEME_CLUSTER_BREAK);
- if (gcProperty==U_GCB_CONTROL || gcProperty==U_GCB_LF || gcProperty==U_GCB_CR) {
- return i;
- }
-
- // The initial character was not a control, and can thus accept trailing
- // combining characters. Advance over however many of them there are.
- int32_t indexOfLastCharChecked;
-
- for (;;) {
- indexOfLastCharChecked = i;
-
- if (i>=textLen) {
- break;
- }
-
- U16_NEXT(text, i, textLen, c);
- gcProperty = u_getIntPropertyValue(c, UCHAR_GRAPHEME_CLUSTER_BREAK);
-
- if (gcProperty != U_GCB_EXTEND && gcProperty != U_GCB_SPACING_MARK) {
- break;
- }
- }
-
- return indexOfLastCharChecked;
-}
-#endif
-
-#if 0
-static UBool isInCombiningSequence(const UnicodeString &string, int32_t index) {
- const UChar *text = string.getBuffer();
- int32_t textLen = string.length();
-
- if (index>=textLen || index<=0) {
- return FALSE;
- }
-
- // If the character at the current index is not a GRAPHEME_EXTEND
- // then we can not be within a combining sequence.
- UChar32 c;
- U16_GET(text, 0, index, textLen, c);
- int32_t gcProperty = u_getIntPropertyValue(c, UCHAR_GRAPHEME_CLUSTER_BREAK);
- if (gcProperty != U_GCB_EXTEND && gcProperty != U_GCB_SPACING_MARK) {
- return FALSE;
- }
-
- // We are at a combining mark. If the preceding character is anything
- // except a CONTROL, CR or LF, we are in a combining sequence.
- U16_PREV(text, 0, index, c);
- gcProperty = u_getIntPropertyValue(c, UCHAR_GRAPHEME_CLUSTER_BREAK);
-
- return !(gcProperty==U_GCB_CONTROL || gcProperty==U_GCB_LF || gcProperty==U_GCB_CR);
-}
-#endif
-
static UBool simpleSearch(UCollator *coll, const UnicodeString &target, int32_t offset, const UnicodeString &pattern, int32_t &matchStart, int32_t &matchEnd)
{
UErrorCode status = U_ZERO_ERROR;
@@ -2065,7 +1287,7 @@
}
params.extract(m.start(1, status), paramLength, valString, sizeof(valString));
- val = strtol(valString, NULL, 10);
+ val = uprv_strtol(valString, NULL, 10);
// Delete this parameter from the params string.
m.reset();
@@ -2130,54 +1352,6 @@
return notFoundCount;
}
-
-int32_t SSearchTest::bmMonkeyTestCase(UCollator *coll, const UnicodeString &testCase, const UnicodeString &pattern, const UnicodeString &altPattern,
- BoyerMooreSearch *bms, BoyerMooreSearch *abms,
- const char *name, const char *strength, uint32_t seed)
-{
- UErrorCode status = U_ZERO_ERROR;
- int32_t actualStart = -1, actualEnd = -1;
- //int32_t expectedStart = prefix.length(), expectedEnd = prefix.length() + altPattern.length();
- int32_t expectedStart = -1, expectedEnd = -1;
- int32_t notFoundCount = 0;
-
- // **** TODO: find *all* matches, not just first one ****
- simpleSearch(coll, testCase, 0, pattern, expectedStart, expectedEnd);
-
- bms->setTargetString(&testCase, status);
- bms->search(0, actualStart, actualEnd);
-
- if (expectedStart >= 0 && (actualStart != expectedStart || actualEnd != expectedEnd)) {
- errln("Boyer-Moore Search for <pattern> in <%s> failed: expected [%d, %d], got [%d, %d]\n"
- " strength=%s seed=%d",
- name, expectedStart, expectedEnd, actualStart, actualEnd, strength, seed);
- errln(UNICODE_STRING_SIMPLE(" <pattern>: ") + prettify(pattern));
- }
-
- if (expectedStart == -1 && actualStart == -1) {
- notFoundCount += 1;
- }
-
- // **** TODO: find *all* matches, not just first one ****
- simpleSearch(coll, testCase, 0, altPattern, expectedStart, expectedEnd);
-
- abms->setTargetString(&testCase, status);
- abms->search(0, actualStart, actualEnd);
-
- if (expectedStart >= 0 && (actualStart != expectedStart || actualEnd != expectedEnd)) {
- errln("Boyer-Moore Search for <alt_pattern> in <%s> failed: expected [%d, %d], got [%d, %d]\n"
- " strength=%s seed=%d",
- name, expectedStart, expectedEnd, actualStart, actualEnd, strength, seed);
- errln(UNICODE_STRING_SIMPLE(" <alt_pattern>: ") + prettify(altPattern));
- }
-
- if (expectedStart == -1 && actualStart == -1) {
- notFoundCount += 1;
- }
-
-
- return notFoundCount;
-}
#endif
void SSearchTest::monkeyTest(char *params)
@@ -2192,7 +1366,7 @@
return;
}
- CollData *monkeyData = CollData::open(coll, status);
+ CollData *monkeyData = new CollData(coll, status);
USet *expansions = uset_openEmpty();
USet *contractions = uset_openEmpty();
@@ -2312,203 +1486,11 @@
uset_close(contractions);
uset_close(expansions);
uset_close(letters);
-
- CollData::close(monkeyData);
+ delete monkeyData;
ucol_close(coll);
}
-void SSearchTest::bmMonkeyTest(char *params)
-{
- static const UChar skipChars[] = { 0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0xAAB5, 0xAAB6, 0xAAB9, 0xAABB, 0xAABC, 0 }; // for timebomb
- // ook!
- UErrorCode status = U_ZERO_ERROR;
- UCollator *coll = ucol_openFromShortString("LEN_S1", FALSE, NULL, &status);
-
- if (U_FAILURE(status)) {
- errcheckln(status, "Failed to create collator in MonkeyTest! - %s", u_errorName(status));
- return;
- }
-
- CollData *monkeyData = CollData::open(coll, status);
-
- USet *expansions = uset_openEmpty();
- USet *contractions = uset_openEmpty();
-
- ucol_getContractionsAndExpansions(coll, contractions, expansions, FALSE, &status);
-
- U_STRING_DECL(letter_pattern, "[[:letter:]-[:ideographic:]-[:hangul:]]", 39);
- U_STRING_INIT(letter_pattern, "[[:letter:]-[:ideographic:]-[:hangul:]]", 39);
- USet *letters = uset_openPattern(letter_pattern, 39, &status);
- SetMonkey letterMonkey(letters);
- StringSetMonkey contractionMonkey(contractions, coll, monkeyData);
- StringSetMonkey expansionMonkey(expansions, coll, monkeyData);
- UnicodeString testCase;
- UnicodeString alternate;
- UnicodeString pattern, altPattern;
- UnicodeString prefix, altPrefix;
- UnicodeString suffix, altSuffix;
-
- Monkey *monkeys[] = {
- &letterMonkey,
- &contractionMonkey,
- &expansionMonkey,
- &contractionMonkey,
- &expansionMonkey,
- &contractionMonkey,
- &expansionMonkey,
- &contractionMonkey,
- &expansionMonkey};
- int32_t monkeyCount = sizeof(monkeys) / sizeof(monkeys[0]);
- // int32_t nonMatchCount = 0;
-
- UCollationStrength strengths[] = {UCOL_PRIMARY, UCOL_SECONDARY, UCOL_TERTIARY};
- const char *strengthNames[] = {"primary", "secondary", "tertiary"};
- int32_t strengthCount = sizeof(strengths) / sizeof(strengths[0]);
- int32_t loopCount = quick? 1000 : 10000;
- int32_t firstStrength = 0;
- int32_t lastStrength = strengthCount - 1; //*/ 0;
-
- if (params != NULL) {
-#if !UCONFIG_NO_REGULAR_EXPRESSIONS
- UnicodeString p(params);
-
- loopCount = getIntParam("loop", p, loopCount);
- m_seed = getIntParam("seed", p, m_seed);
-
- RegexMatcher m(" *strength *= *(primary|secondary|tertiary) *", p, 0, status);
- if (m.find()) {
- UnicodeString breakType = m.group(1, status);
-
- for (int32_t s = 0; s < strengthCount; s += 1) {
- if (breakType == strengthNames[s]) {
- firstStrength = lastStrength = s;
- break;
- }
- }
-
- m.reset();
- p = m.replaceFirst("", status);
- }
-
- if (RegexMatcher("\\S", p, 0, status).find()) {
- // Each option is stripped out of the option string as it is processed.
- // All options have been checked. The option string should have been completely emptied..
- char buf[100];
- p.extract(buf, sizeof(buf), NULL, status);
- buf[sizeof(buf)-1] = 0;
- errln("Unrecognized or extra parameter: %s\n", buf);
- return;
- }
-#else
- infoln("SSearchTest built with UCONFIG_NO_REGULAR_EXPRESSIONS: ignoring parameters.");
-#endif
- }
-
- for(int32_t s = firstStrength; s <= lastStrength; s += 1) {
- int32_t notFoundCount = 0;
-
- logln("Setting strength to %s.", strengthNames[s]);
- ucol_setStrength(coll, strengths[s]);
-
- CollData *data = CollData::open(coll, status);
-
- UnicodeSet skipSet;
- if(isICUVersionBefore(51, 1)) {
- // timebomb until ticket #9156 (was #8081) is resolved
- UnicodeString skipString(skipChars);
- skipSet.addAll(skipString);
- }
- if(isICUVersionBefore(51, 1)) {
- // Time bomb until ticket #9490 is fixed.
- skipSet.add(0x12327);
- skipSet.add(0x1311b);
- skipSet.add(0x1200d);
- }
- skipSet.freeze();
- // TODO: try alternate prefix and suffix too?
- // TODO: alternates are only equal at primary strength. Is this OK?
- for(int32_t t = 0; t < loopCount; t += 1) {
- uint32_t seed = m_seed;
- // int32_t nmc = 0;
-
- generateTestCase(coll, monkeys, monkeyCount, pattern, altPattern);
- generateTestCase(coll, monkeys, monkeyCount, prefix, altPrefix);
- generateTestCase(coll, monkeys, monkeyCount, suffix, altSuffix);
-
- if (skipSet.containsSome(pattern)) {
- continue; // time bomb
- }
-
- BoyerMooreSearch pat(data, pattern, NULL, status);
- BoyerMooreSearch alt(data, altPattern, NULL, status);
-
- // **** need a better way to deal with this ****
-#if 0
- if (pat.empty() ||
- alt.empty()) {
- continue;
- }
-#endif
-
- // pattern
- notFoundCount += bmMonkeyTestCase(coll, pattern, pattern, altPattern, &pat, &alt, "pattern", strengthNames[s], seed);
-
- testCase.remove();
- testCase.append(prefix);
- testCase.append(/*alt*/pattern);
-
- // prefix + pattern
- notFoundCount += bmMonkeyTestCase(coll, testCase, pattern, altPattern, &pat, &alt, "prefix + pattern", strengthNames[s], seed);
-
- testCase.append(suffix);
-
- // prefix + pattern + suffix
- notFoundCount += bmMonkeyTestCase(coll, testCase, pattern, altPattern, &pat, &alt, "prefix + pattern + suffix", strengthNames[s], seed);
-
- testCase.remove();
- testCase.append(pattern);
- testCase.append(suffix);
-
- // pattern + suffix
- notFoundCount += bmMonkeyTestCase(coll, testCase, pattern, altPattern, &pat, &alt, "pattern + suffix", strengthNames[s], seed);
- }
-
- CollData::close(data);
-
- logln("For strength %s the not found count is %d.", strengthNames[s], notFoundCount);
- }
-
- uset_close(contractions);
- uset_close(expansions);
- uset_close(letters);
-
- CollData::close(monkeyData);
-
- ucol_close(coll);
-}
-
-void SSearchTest::stringListTest(){
- UErrorCode status = U_ZERO_ERROR;
- StringList *sl = new StringList(status);
- if(U_FAILURE(status)){
- errln("ERROR: stringListTest: Could not start StringList");
- }
-
- const UChar chars[] = {
- 0x0000
- };
- sl->add(chars, (int32_t) 0, status);
- if(U_FAILURE(status)){
- errln("ERROR: stringListTest: StringList::add");
- }
-
- if(sl->getDynamicClassID() != StringList::getStaticClassID()){
- errln("ERROR: stringListTest: getDynamicClassID and getStaticClassID does not match");
- }
- delete sl;
-}
-
#endif
#endif
diff --git a/test/intltest/ssearch.h b/test/intltest/ssearch.h
index e17f380..ebaeec6 100644
--- a/test/intltest/ssearch.h
+++ b/test/intltest/ssearch.h
@@ -1,6 +1,6 @@
/*
**********************************************************************
- * Copyright (C) 2005-2009, International Business Machines
+ * Copyright (C) 2005-2012, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@@ -11,7 +11,6 @@
#include "unicode/utypes.h"
#include "unicode/unistr.h"
#include "unicode/ucol.h"
-#include "unicode/bmsearch.h"
#include "intltest.h"
@@ -34,30 +33,17 @@
virtual void searchTest();
virtual void offsetTest();
virtual void monkeyTest(char *params);
-
- virtual void bmMonkeyTest(char *params);
- virtual void boyerMooreTest();
+ virtual void sharpSTest();
virtual void goodSuffixTest();
virtual void searchTime();
-
- virtual void bmsTest();
- virtual void bmSearchTest();
- virtual void udhrTest();
-
- virtual void stringListTest();
private:
virtual const char *getPath(char buffer[2048], const char *filename);
virtual int32_t monkeyTestCase(UCollator *coll, const UnicodeString &testCase, const UnicodeString &pattern, const UnicodeString &altPattern,
const char *name, const char *strength, uint32_t seed);
-
- virtual int32_t bmMonkeyTestCase(UCollator *coll, const UnicodeString &testCase, const UnicodeString &pattern, const UnicodeString &altPattern,
- BoyerMooreSearch *bms, BoyerMooreSearch *abms,
- const char *name, const char *strength, uint32_t seed);
#endif
-
};
#endif
-#endif
+#endif
diff --git a/test/intltest/tfsmalls.cpp b/test/intltest/tfsmalls.cpp
index 6cc69a0..b32492f 100644
--- a/test/intltest/tfsmalls.cpp
+++ b/test/intltest/tfsmalls.cpp
@@ -1,7 +1,7 @@
/***********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2005, International Business Machines Corporation
+ * Copyright (c) 1997-2012, International Business Machines Corporation
* and others. All Rights Reserved.
***********************************************************************/
@@ -308,7 +308,7 @@
for(i = 0; i < ft_cnt; ++i) {
pf = ftarray[i].clone();
if(pf == (ftarray + i) || *pf != ftarray[i]) {
- it_errln("Formattable.clone() failed for item %d" + i);
+ it_errln(UnicodeString("Formattable.clone() failed for item ") + i);
}
delete pf;
}
diff --git a/test/intltest/tmsgfmt.cpp b/test/intltest/tmsgfmt.cpp
index d7c6d64..5f7d959 100644
--- a/test/intltest/tmsgfmt.cpp
+++ b/test/intltest/tmsgfmt.cpp
@@ -445,7 +445,7 @@
}
const UnicodeString expected(
- "At 12:20:00 on 8.08.1997, there was a disturbance in the Force on planet 7.", "");
+ "At 12:20:00 on 8 08 1997, there was a disturbance in the Force on planet 7.", ""); // Google patch
if (result != expected) {
errln("TestTurkishCasing failed on test");
errln( UnicodeString(" Result: ") + result );
diff --git a/test/intltest/tsdtfmsy.cpp b/test/intltest/tsdtfmsy.cpp
index beca4ac..02bc123 100644
--- a/test/intltest/tsdtfmsy.cpp
+++ b/test/intltest/tsdtfmsy.cpp
@@ -1,5 +1,5 @@
/********************************************************************
- * Copyright (c) 1997-2011, International Business Machines
+ * Copyright (c) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************/
@@ -26,6 +26,7 @@
TESTCASE(2,TestGetMonths2);
TESTCASE(3,TestGetWeekdays2);
TESTCASE(4,TestGetEraNames);
+ TESTCASE(5,TestGetSetSpecificItems);
default: name = ""; break;
}
}
@@ -126,6 +127,41 @@
delete symbol;
}
+UBool IntlTestDateFormatSymbols::UnicodeStringsArePrefixes(int32_t count, int32_t prefixLen, const UnicodeString *prefixArray, const UnicodeString *baseArray)
+{
+ int32_t i;
+ for (i = 0; i < count; i++) {
+ if (baseArray[i].compare(0, prefixLen, prefixArray[i]) != 0) {
+ errln("ERROR: Mismatch example: expect prefix \"" + prefixArray[i] + "\" of base \"" + baseArray[i] + "\".");
+ return FALSE;
+ }
+ }
+ return TRUE;
+}
+
+void IntlTestDateFormatSymbols::TestGetSetSpecificItems()
+{
+ UErrorCode status = U_ZERO_ERROR;
+ DateFormatSymbols *symbol=new DateFormatSymbols(Locale::getEnglish(), status);
+ if(U_FAILURE(status)) {
+ dataerrln("ERROR: Couldn't create English DateFormatSymbols " + (UnicodeString)u_errorName(status));
+ return;
+ }
+ int32_t cntFmtAbbrev, cntFmtShort, cntStdAloneShort;
+ const UnicodeString * wdFmtAbbrev = symbol->getWeekdays(cntFmtAbbrev,DateFormatSymbols::FORMAT,DateFormatSymbols::ABBREVIATED);
+ const UnicodeString * wdFmtShort = symbol->getWeekdays(cntFmtShort,DateFormatSymbols::FORMAT,DateFormatSymbols::SHORT);
+ const UnicodeString * wdStdAloneShort = symbol->getWeekdays(cntStdAloneShort,DateFormatSymbols::STANDALONE,DateFormatSymbols::SHORT);
+ // Expect that English short names are prefixes of abbreviated names
+ if (cntFmtShort != cntFmtAbbrev || !UnicodeStringsArePrefixes(cntFmtAbbrev, 2, wdFmtShort, wdFmtAbbrev)) {
+ errln("ERROR: English format short weekday names don't match prefixes of format abbreviated names");
+ }
+ if (cntStdAloneShort != cntFmtAbbrev || !UnicodeStringsArePrefixes(cntFmtAbbrev, 2, wdStdAloneShort, wdFmtAbbrev)) {
+ errln("ERROR: English standalone short weekday names don't match prefixes of format abbreviated names");
+ }
+
+ delete symbol;
+}
+
/**
* Test the API of DateFormatSymbols; primarily a simple get/set set.
*/
diff --git a/test/intltest/tsdtfmsy.h b/test/intltest/tsdtfmsy.h
index d289ba4..6fd191e 100644
--- a/test/intltest/tsdtfmsy.h
+++ b/test/intltest/tsdtfmsy.h
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2005, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@@ -32,6 +32,9 @@
void TestGetWeekdays2(void);
void TestGetEraNames(void);
+ void TestGetSetSpecificItems(void);
+
+ UBool UnicodeStringsArePrefixes(int32_t count, int32_t prefixLen, const UnicodeString *prefixArray, const UnicodeString *baseArray);
};
#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/test/intltest/tsmthred.cpp b/test/intltest/tsmthred.cpp
index fc6a660..c6e8a8c 100644
--- a/test/intltest/tsmthred.cpp
+++ b/test/intltest/tsmthred.cpp
@@ -1048,7 +1048,7 @@
int32_t cmpres2 = coll->compare(lines[i].buff, lines[i].buflen, lines[prev].buff, lines[prev].buflen);
if(cmpres != -cmpres2) {
- error("Compare result not symmetrical on line " + (i + 1));
+ error(UnicodeString("Compare result not symmetrical on line ") + (i + 1));
break;
}
diff --git a/test/intltest/tsnmfmt.cpp b/test/intltest/tsnmfmt.cpp
index 9e417a3..3f2e8d1 100644
--- a/test/intltest/tsnmfmt.cpp
+++ b/test/intltest/tsnmfmt.cpp
@@ -1,6 +1,6 @@
/***********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2011, International Business Machines Corporation
+ * Copyright (c) 1997-2012, International Business Machines Corporation
* and others. All Rights Reserved.
***********************************************************************/
@@ -369,7 +369,7 @@
fFormat->format(number, stringNum, status);
if (U_FAILURE(status))
{
- errln("**** FAIL: Formatting " + aNumber);
+ errln(UnicodeString("**** FAIL: Formatting ") + aNumber);
return;
}
fFormat->parse(stringNum, number, status);
diff --git a/test/intltest/tzfmttst.cpp b/test/intltest/tzfmttst.cpp
index 4ff82ef..2662d96 100644
--- a/test/intltest/tzfmttst.cpp
+++ b/test/intltest/tzfmttst.cpp
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2007-2012, International Business Machines Corporation and *
+* Copyright (C) 2007-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@@ -18,11 +18,52 @@
#include "unicode/smpdtfmt.h"
#include "unicode/uchar.h"
#include "unicode/basictz.h"
+#include "unicode/tzfmt.h"
+#include "unicode/localpointer.h"
#include "cstring.h"
+#include "zonemeta.h"
-static const char* PATTERNS[] = {"z", "zzzz", "Z", "ZZZZ", "ZZZZZ", "v", "vvvv", "V", "VVVV"};
+static const char* PATTERNS[] = {
+ "z",
+ "zzzz",
+ "Z", // equivalent to "xxxx"
+ "ZZZZ", // equivalent to "OOOO"
+ "v",
+ "vvvv",
+ "O",
+ "OOOO",
+ "X",
+ "XX",
+ "XXX",
+ "XXXX",
+ "XXXXX",
+ "x",
+ "xx",
+ "xxx",
+ "xxxx",
+ "xxxxx",
+ "V",
+ "VV",
+ "VVV",
+ "VVVV"
+};
static const int NUM_PATTERNS = sizeof(PATTERNS)/sizeof(const char*);
+static const UChar ETC_UNKNOWN[] = {0x45, 0x74, 0x63, 0x2F, 0x55, 0x6E, 0x6B, 0x6E, 0x6F, 0x77, 0x6E, 0};
+
+static const UChar ETC_SLASH[] = { 0x45, 0x74, 0x63, 0x2F, 0 }; // "Etc/"
+static const UChar SYSTEMV_SLASH[] = { 0x53, 0x79, 0x73, 0x74, 0x65, 0x6D, 0x56, 0x2F, 0 }; // "SystemV/
+static const UChar RIYADH8[] = { 0x52, 0x69, 0x79, 0x61, 0x64, 0x68, 0x38, 0 }; // "Riyadh8"
+
+static UBool contains(const char** list, const char* str) {
+ for (int32_t i = 0; list[i]; i++) {
+ if (uprv_strcmp(list[i], str) == 0) {
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
+
void
TimeZoneFormatTest::runIndexedTest( int32_t index, UBool exec, const char* &name, char* /*par*/ )
{
@@ -32,6 +73,8 @@
switch (index) {
TESTCASE(0, TestTimeZoneRoundTrip);
TESTCASE(1, TestTimeRoundTrip);
+ TESTCASE(2, TestParse);
+ TESTCASE(3, TestISOFormat);
default: name = ""; break;
}
}
@@ -40,7 +83,7 @@
TimeZoneFormatTest::TestTimeZoneRoundTrip(void) {
UErrorCode status = U_ZERO_ERROR;
- SimpleTimeZone unknownZone(-31415, (UnicodeString)"Etc/Unknown");
+ SimpleTimeZone unknownZone(-31415, ETC_UNKNOWN);
int32_t badDstOffset = -1234;
int32_t badZoneOffset = -2345;
@@ -172,7 +215,38 @@
status = U_ZERO_ERROR;
}
- if (uprv_strcmp(PATTERNS[patidx], "VVVV") == 0) {
+ if (uprv_strcmp(PATTERNS[patidx], "V") == 0) {
+ // Short zone ID - should support roundtrip for canonical CLDR IDs
+ UnicodeString canonicalID;
+ TimeZone::getCanonicalID(*tzid, canonicalID, status);
+ if (U_FAILURE(status)) {
+ // Uknown ID - we should not get here
+ errln((UnicodeString)"Unknown ID " + *tzid);
+ status = U_ZERO_ERROR;
+ } else if (outtzid != canonicalID) {
+ if (outtzid.compare(ETC_UNKNOWN, -1) == 0) {
+ // Note that some zones like Asia/Riyadh87 does not have
+ // short zone ID and "unk" is used as fallback
+ logln((UnicodeString)"Canonical round trip failed (probably as expected); tz=" + *tzid
+ + ", locale=" + LOCALES[locidx].getName() + ", pattern=" + PATTERNS[patidx]
+ + ", time=" + DATES[datidx] + ", str=" + tzstr
+ + ", outtz=" + outtzid);
+ } else {
+ errln((UnicodeString)"Canonical round trip failed; tz=" + *tzid
+ + ", locale=" + LOCALES[locidx].getName() + ", pattern=" + PATTERNS[patidx]
+ + ", time=" + DATES[datidx] + ", str=" + tzstr
+ + ", outtz=" + outtzid);
+ }
+ }
+ } else if (uprv_strcmp(PATTERNS[patidx], "VV") == 0) {
+ // Zone ID - full roundtrip support
+ if (outtzid != *tzid) {
+ errln((UnicodeString)"Zone ID round trip failued; tz=" + *tzid
+ + ", locale=" + LOCALES[locidx].getName() + ", pattern=" + PATTERNS[patidx]
+ + ", time=" + DATES[datidx] + ", str=" + tzstr
+ + ", outtz=" + outtzid);
+ }
+ } else if (uprv_strcmp(PATTERNS[patidx], "VVV") == 0 || uprv_strcmp(PATTERNS[patidx], "VVVV") == 0) {
// Location: time zone rule must be preserved except
// zones not actually associated with a specific location.
// Time zones in this category do not have "/" in its ID.
@@ -187,12 +261,12 @@
if (!((BasicTimeZone*)&outtz)->hasEquivalentTransitions((BasicTimeZone&)*tz, low, high, TRUE, status)) {
if (canonical.indexOf((UChar)0x27 /*'/'*/) == -1) {
// Exceptional cases, such as CET, EET, MET and WET
- logln("Canonical round trip failed (as expected); tz=" + *tzid
+ logln((UnicodeString)"Canonical round trip failed (as expected); tz=" + *tzid
+ ", locale=" + LOCALES[locidx].getName() + ", pattern=" + PATTERNS[patidx]
+ ", time=" + DATES[datidx] + ", str=" + tzstr
+ ", outtz=" + outtzid);
} else {
- errln("Canonical round trip failed; tz=" + *tzid
+ errln((UnicodeString)"Canonical round trip failed; tz=" + *tzid
+ ", locale=" + LOCALES[locidx].getName() + ", pattern=" + PATTERNS[patidx]
+ ", time=" + DATES[datidx] + ", str=" + tzstr
+ ", outtz=" + outtzid);
@@ -205,8 +279,15 @@
}
} else {
- // Check if localized GMT format or RFC format is used.
- UBool isOffsetFormat = (*PATTERNS[patidx] == 'Z');
+ UBool isOffsetFormat = (*PATTERNS[patidx] == 'Z'
+ || *PATTERNS[patidx] == 'O'
+ || *PATTERNS[patidx] == 'X'
+ || *PATTERNS[patidx] == 'x');
+ UBool minutesOffset = FALSE;
+ if (*PATTERNS[patidx] == 'X' || *PATTERNS[patidx] == 'x') {
+ minutesOffset = (uprv_strlen(PATTERNS[patidx]) <= 3);
+ }
+
if (!isOffsetFormat) {
// Check if localized GMT format is used as a fallback of name styles
int32_t numDigits = 0;
@@ -215,13 +296,17 @@
numDigits++;
}
}
- isOffsetFormat = (numDigits >= 3);
+ isOffsetFormat = (numDigits > 0);
}
if (isOffsetFormat || tzstr == localGMTString) {
- // Localized GMT or RFC: total offset (raw + dst) must be preserved.
+ // Localized GMT or ISO: total offset (raw + dst) must be preserved.
int32_t inOffset = inRaw + inDst;
int32_t outOffset = outRaw + outDst;
- if (inOffset != outOffset) {
+ int32_t diff = outOffset - inOffset;
+ if (minutesOffset) {
+ diff = (diff / 60000) * 60000;
+ }
+ if (diff != 0) {
errln((UnicodeString)"Offset round trip failed; tz=" + *tzid
+ ", locale=" + LOCALES[locidx].getName() + ", pattern=" + PATTERNS[patidx]
+ ", time=" + DATES[datidx] + ", str=" + tzstr
@@ -268,10 +353,14 @@
UErrorCode status = U_ZERO_ERROR;
UBool REALLY_VERBOSE = FALSE;
- // Whether each pattern is ambiguous at DST->STD local time overlap
- UBool AMBIGUOUS_DST_DECESSION[] = { FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE, TRUE };
- // Whether each pattern is ambiguous at STD->STD/DST->DST local time overlap
- UBool AMBIGUOUS_NEGATIVE_SHIFT[] = { TRUE, TRUE, FALSE, FALSE, FALSE, TRUE, TRUE, TRUE, TRUE };
+ // These patterns are ambiguous at DST->STD local time overlap
+ const char* AMBIGUOUS_DST_DECESSION[] = { "v", "vvvv", "V", "VV", "VVV", "VVVV", 0 };
+
+ // These patterns are ambiguous at STD->STD/DST->DST local time overlap
+ const char* AMBIGUOUS_NEGATIVE_SHIFT[] = { "z", "zzzz", "v", "vvvv", "V", "VV", "VVV", "VVVV", 0 };
+
+ // These patterns only support integer minutes offset
+ const char* MINUTES_OFFSET[] = { "X", "XX", "XXX", "x", "xx", "xxx", 0 };
// Workaround for #6338
//UnicodeString BASEPATTERN("yyyy-MM-dd'T'HH:mm:ss.SSS");
@@ -341,12 +430,32 @@
continue;
}
+ UBool minutesOffset = contains(MINUTES_OFFSET, PATTERNS[patidx]);
+
tzids->reset(status);
const UnicodeString *tzid;
timer = Calendar::getNow();
while ((tzid = tzids->snext(status))) {
+ if (uprv_strcmp(PATTERNS[patidx], "V") == 0) {
+ // Some zones do not have short ID assigned, such as Asia/Riyadh87.
+ // The time roundtrip will fail for such zones with pattern "V" (short zone ID).
+ // This is expected behavior.
+ const UChar* shortZoneID = ZoneMeta::getShortID(*tzid);
+ if (shortZoneID == NULL) {
+ continue;
+ }
+ } else if (uprv_strcmp(PATTERNS[patidx], "VVV") == 0) {
+ // Some zones are not associated with any region, such as Etc/GMT+8.
+ // The time roundtrip will fail for such zone with pattern "VVV" (exemplar location).
+ // This is expected behavior.
+ if (tzid->indexOf((UChar)0x2F) < 0 || tzid->indexOf(ETC_SLASH, -1, 0) >= 0
+ || tzid->indexOf(SYSTEMV_SLASH, -1, 0) >= 0 || tzid->indexOf(RIYADH8, -1, 0) >= 0) {
+ continue;
+ }
+ }
+
BasicTimeZone *tz = (BasicTimeZone*) TimeZone::createTimeZone(*tzid);
sdf->setTimeZone(*tz);
@@ -369,9 +478,13 @@
testTimes[0] = t + delta - 1;
expectedRoundTrip[0] = TRUE;
testTimes[1] = t + delta;
- expectedRoundTrip[1] = isDstDecession ? !AMBIGUOUS_DST_DECESSION[patidx] : !AMBIGUOUS_NEGATIVE_SHIFT[patidx];
+ expectedRoundTrip[1] = isDstDecession ?
+ !contains(AMBIGUOUS_DST_DECESSION, PATTERNS[patidx]) :
+ !contains(AMBIGUOUS_NEGATIVE_SHIFT, PATTERNS[patidx]);
testTimes[2] = t - 1;
- expectedRoundTrip[2] = isDstDecession ? !AMBIGUOUS_DST_DECESSION[patidx] : !AMBIGUOUS_NEGATIVE_SHIFT[patidx];
+ expectedRoundTrip[2] = isDstDecession ?
+ !contains(AMBIGUOUS_DST_DECESSION, PATTERNS[patidx]) :
+ !contains(AMBIGUOUS_NEGATIVE_SHIFT, PATTERNS[patidx]);
testTimes[3] = t;
expectedRoundTrip[3] = TRUE;
testLen = 4;
@@ -404,7 +517,11 @@
status = U_ZERO_ERROR;
continue;
}
- if (parsedDate != testTimes[testidx]) {
+
+ int32_t timeDiff = (int32_t)(parsedDate - testTimes[testidx]);
+ UBool bTimeMatch = minutesOffset ?
+ (timeDiff/60000)*60000 == 0 : timeDiff == 0;
+ if (!bTimeMatch) {
UnicodeString msg = (UnicodeString) "Time round trip failed for " + "tzid=" + *tzid + ", locale=" + data.locales[locidx].getName() + ", pattern=" + PATTERNS[patidx]
+ ", text=" + text + ", time=" + testTimes[testidx] + ", restime=" + parsedDate + ", diff=" + (parsedDate - testTimes[testidx]);
// Timebomb for TZData update
@@ -561,4 +678,242 @@
delete cal;
}
+
+typedef struct {
+ const char* text;
+ int32_t inPos;
+ const char* locale;
+ UTimeZoneFormatStyle style;
+ UBool parseAll;
+ const char* expected;
+ int32_t outPos;
+ UTimeZoneFormatTimeType timeType;
+} ParseTestData;
+
+void
+TimeZoneFormatTest::TestParse(void) {
+ const ParseTestData DATA[] = {
+ // text inPos locale style parseAll expected outPos timeType
+ {"Z", 0, "en_US", UTZFMT_STYLE_ISO_EXTENDED_FULL, false, "Etc/GMT", 1, UTZFMT_TIME_TYPE_UNKNOWN},
+ {"Z", 0, "en_US", UTZFMT_STYLE_SPECIFIC_LONG, false, "Etc/GMT", 1, UTZFMT_TIME_TYPE_UNKNOWN},
+ {"Zambia time", 0, "en_US", UTZFMT_STYLE_ISO_EXTENDED_FULL, true, "Etc/GMT", 1, UTZFMT_TIME_TYPE_UNKNOWN},
+ {"Zambia time", 0, "en_US", UTZFMT_STYLE_GENERIC_LOCATION, false, "Africa/Lusaka", 11, UTZFMT_TIME_TYPE_UNKNOWN},
+ {"Zambia time", 0, "en_US", UTZFMT_STYLE_ISO_BASIC_LOCAL_FULL, true, "Africa/Lusaka", 11, UTZFMT_TIME_TYPE_UNKNOWN},
+ {"+00:00", 0, "en_US", UTZFMT_STYLE_ISO_EXTENDED_FULL, false, "Etc/GMT", 6, UTZFMT_TIME_TYPE_UNKNOWN},
+ {"-01:30:45", 0, "en_US", UTZFMT_STYLE_ISO_EXTENDED_FULL, false, "GMT-01:30:45", 9, UTZFMT_TIME_TYPE_UNKNOWN},
+ {"-7", 0, "en_US", UTZFMT_STYLE_ISO_BASIC_LOCAL_FULL, false, "GMT-07:00", 2, UTZFMT_TIME_TYPE_UNKNOWN},
+ {"-2222", 0, "en_US", UTZFMT_STYLE_ISO_BASIC_LOCAL_FULL, false, "GMT-22:22", 5, UTZFMT_TIME_TYPE_UNKNOWN},
+ {"-3333", 0, "en_US", UTZFMT_STYLE_ISO_BASIC_LOCAL_FULL, false, "GMT-03:33", 4, UTZFMT_TIME_TYPE_UNKNOWN},
+ {"XXX+01:30YYY", 3, "en_US", UTZFMT_STYLE_LOCALIZED_GMT, false, "GMT+01:30", 9, UTZFMT_TIME_TYPE_UNKNOWN},
+ {"GMT0", 0, "en_US", UTZFMT_STYLE_SPECIFIC_SHORT, false, "Etc/GMT", 3, UTZFMT_TIME_TYPE_UNKNOWN},
+ {"EST", 0, "en_US", UTZFMT_STYLE_SPECIFIC_SHORT, false, "America/New_York", 3, UTZFMT_TIME_TYPE_STANDARD},
+ {"ESTx", 0, "en_US", UTZFMT_STYLE_SPECIFIC_SHORT, false, "America/New_York", 3, UTZFMT_TIME_TYPE_STANDARD},
+ {"EDTx", 0, "en_US", UTZFMT_STYLE_SPECIFIC_SHORT, false, "America/New_York", 3, UTZFMT_TIME_TYPE_DAYLIGHT},
+ {"EST", 0, "en_US", UTZFMT_STYLE_SPECIFIC_LONG, false, NULL, 0, UTZFMT_TIME_TYPE_UNKNOWN},
+ {"EST", 0, "en_US", UTZFMT_STYLE_SPECIFIC_LONG, true, "America/New_York", 3, UTZFMT_TIME_TYPE_STANDARD},
+ {"EST", 0, "en_CA", UTZFMT_STYLE_SPECIFIC_SHORT, false, "America/Toronto", 3, UTZFMT_TIME_TYPE_STANDARD},
+ {NULL, 0, NULL, UTZFMT_STYLE_GENERIC_LOCATION, false, NULL, 0, UTZFMT_TIME_TYPE_UNKNOWN}
+ };
+
+ for (int32_t i = 0; DATA[i].text; i++) {
+ UErrorCode status = U_ZERO_ERROR;
+ LocalPointer<TimeZoneFormat> tzfmt(TimeZoneFormat::createInstance(Locale(DATA[i].locale), status));
+ if (U_FAILURE(status)) {
+ dataerrln("Fail TimeZoneFormat::createInstance: %s", u_errorName(status));
+ continue;
+ }
+ UTimeZoneFormatTimeType ttype = UTZFMT_TIME_TYPE_UNKNOWN;
+ ParsePosition pos(DATA[i].inPos);
+ int32_t parseOptions = DATA[i].parseAll ? UTZFMT_PARSE_OPTION_ALL_STYLES : UTZFMT_PARSE_OPTION_NONE;
+ TimeZone* tz = tzfmt->parse(DATA[i].style, DATA[i].text, pos, parseOptions, &ttype);
+
+ UnicodeString errMsg;
+ if (tz) {
+ UnicodeString outID;
+ tz->getID(outID);
+ if (outID != UnicodeString(DATA[i].expected)) {
+ errMsg = (UnicodeString)"Time zone ID: " + outID + " - expected: " + DATA[i].expected;
+ } else if (pos.getIndex() != DATA[i].outPos) {
+ errMsg = (UnicodeString)"Parsed pos: " + pos.getIndex() + " - expected: " + DATA[i].outPos;
+ } else if (ttype != DATA[i].timeType) {
+ errMsg = (UnicodeString)"Time type: " + ttype + " - expected: " + DATA[i].timeType;
+ }
+ delete tz;
+ } else {
+ if (DATA[i].expected) {
+ errln((UnicodeString)"Fail: Parse failure - expected: " + DATA[i].expected);
+ }
+ }
+ if (errMsg.length() > 0) {
+ errln((UnicodeString)"Fail: " + errMsg + " [text=" + DATA[i].text + ", pos=" + DATA[i].inPos + ", style=" + DATA[i].style + "]");
+ }
+ }
+}
+
+void
+TimeZoneFormatTest::TestISOFormat(void) {
+ const int32_t OFFSET[] = {
+ 0, // 0
+ 999, // 0.999s
+ -59999, // -59.999s
+ 60000, // 1m
+ -77777, // -1m 17.777s
+ 1800000, // 30m
+ -3600000, // -1h
+ 36000000, // 10h
+ -37800000, // -10h 30m
+ -37845000, // -10h 30m 45s
+ 108000000, // 30h
+ };
+
+ const char* ISO_STR[][11] = {
+ // 0
+ {
+ "Z", "Z", "Z", "Z", "Z",
+ "+00", "+0000", "+00:00", "+0000", "+00:00",
+ "+0000"
+ },
+ // 999
+ {
+ "Z", "Z", "Z", "Z", "Z",
+ "+00", "+0000", "+00:00", "+0000", "+00:00",
+ "+0000"
+ },
+ // -59999
+ {
+ "Z", "Z", "Z", "-000059", "-00:00:59",
+ "+00", "+0000", "+00:00", "-000059", "-00:00:59",
+ "-000059"
+ },
+ // 60000
+ {
+ "+0001", "+0001", "+00:01", "+0001", "+00:01",
+ "+0001", "+0001", "+00:01", "+0001", "+00:01",
+ "+0001"
+ },
+ // -77777
+ {
+ "-0001", "-0001", "-00:01", "-000117", "-00:01:17",
+ "-0001", "-0001", "-00:01", "-000117", "-00:01:17",
+ "-000117"
+ },
+ // 1800000
+ {
+ "+0030", "+0030", "+00:30", "+0030", "+00:30",
+ "+0030", "+0030", "+00:30", "+0030", "+00:30",
+ "+0030"
+ },
+ // -3600000
+ {
+ "-01", "-0100", "-01:00", "-0100", "-01:00",
+ "-01", "-0100", "-01:00", "-0100", "-01:00",
+ "-0100"
+ },
+ // 36000000
+ {
+ "+10", "+1000", "+10:00", "+1000", "+10:00",
+ "+10", "+1000", "+10:00", "+1000", "+10:00",
+ "+1000"
+ },
+ // -37800000
+ {
+ "-1030", "-1030", "-10:30", "-1030", "-10:30",
+ "-1030", "-1030", "-10:30", "-1030", "-10:30",
+ "-1030"
+ },
+ // -37845000
+ {
+ "-1030", "-1030", "-10:30", "-103045", "-10:30:45",
+ "-1030", "-1030", "-10:30", "-103045", "-10:30:45",
+ "-103045"
+ },
+ // 108000000
+ {
+ 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0,
+ 0
+ }
+ };
+
+ const char* PATTERN[] = {
+ "X", "XX", "XXX", "XXXX", "XXXXX",
+ "x", "xx", "xxx", "xxxx", "xxxxx",
+ "Z", // equivalent to "xxxx"
+ 0
+ };
+
+ const int32_t MIN_OFFSET_UNIT[] = {
+ 60000, 60000, 60000, 1000, 1000,
+ 60000, 60000, 60000, 1000, 1000,
+ 1000,
+ };
+
+ // Formatting
+ UErrorCode status = U_ZERO_ERROR;
+ LocalPointer<SimpleDateFormat> sdf(new SimpleDateFormat(status));
+ if (U_FAILURE(status)) {
+ dataerrln("Fail new SimpleDateFormat: %s", u_errorName(status));
+ return;
+ }
+ UDate d = Calendar::getNow();
+
+ for (uint32_t i = 0; i < sizeof(OFFSET)/sizeof(OFFSET[0]); i++) {
+ SimpleTimeZone* tz = new SimpleTimeZone(OFFSET[i], UnicodeString("Zone Offset:") + OFFSET[i] + "ms");
+ sdf->adoptTimeZone(tz);
+ for (int32_t j = 0; PATTERN[j] != 0; j++) {
+ sdf->applyPattern(UnicodeString(PATTERN[j]));
+ UnicodeString result;
+ sdf->format(d, result);
+
+ if (ISO_STR[i][j]) {
+ if (result != UnicodeString(ISO_STR[i][j])) {
+ errln((UnicodeString)"FAIL: pattern=" + PATTERN[j] + ", offset=" + OFFSET[i] + " -> "
+ + result + " (expected: " + ISO_STR[i][j] + ")");
+ }
+ } else {
+ // Offset out of range
+ // Note: for now, there is no way to propagate the error status through
+ // the SimpleDateFormat::format above.
+ if (result.length() > 0) {
+ errln((UnicodeString)"FAIL: Non-Empty result for pattern=" + PATTERN[j] + ", offset=" + OFFSET[i]
+ + " (expected: empty result)");
+ }
+ }
+ }
+ }
+
+ // Parsing
+ LocalPointer<Calendar> outcal(Calendar::createInstance(status));
+ if (U_FAILURE(status)) {
+ dataerrln("Fail new Calendar: %s", u_errorName(status));
+ return;
+ }
+ for (int32_t i = 0; ISO_STR[i][0] != NULL; i++) {
+ for (int32_t j = 0; PATTERN[j] != 0; j++) {
+ if (ISO_STR[i][j] == 0) {
+ continue;
+ }
+ ParsePosition pos(0);
+ SimpleTimeZone* bogusTZ = new SimpleTimeZone(-1, UnicodeString("Zone Offset: -1ms"));
+ outcal->adoptTimeZone(bogusTZ);
+ sdf->applyPattern(PATTERN[j]);
+
+ sdf->parse(UnicodeString(ISO_STR[i][j]), *(outcal.getAlias()), pos);
+
+ if (pos.getIndex() != (int32_t)uprv_strlen(ISO_STR[i][j])) {
+ errln((UnicodeString)"FAIL: Failed to parse the entire input string: " + ISO_STR[i][j]);
+ }
+
+ const TimeZone& outtz = outcal->getTimeZone();
+ int32_t outOffset = outtz.getRawOffset();
+ int32_t adjustedOffset = OFFSET[i] / MIN_OFFSET_UNIT[j] * MIN_OFFSET_UNIT[j];
+ if (outOffset != adjustedOffset) {
+ errln((UnicodeString)"FAIL: Incorrect offset:" + outOffset + "ms for input string: " + ISO_STR[i][j]
+ + " (expected:" + adjustedOffset + "ms)");
+ }
+ }
+ }
+}
+
+
#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/test/intltest/tzfmttst.h b/test/intltest/tzfmttst.h
index 5e7c397..4635711 100644
--- a/test/intltest/tzfmttst.h
+++ b/test/intltest/tzfmttst.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
-* Copyright (C) 2007-2010, International Business Machines Corporation and *
+* Copyright (C) 2007-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@@ -20,6 +20,8 @@
void TestTimeZoneRoundTrip(void);
void TestTimeRoundTrip(void);
+ void TestParse(void);
+ void TestISOFormat(void);
};
#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/test/intltest/tzregts.cpp b/test/intltest/tzregts.cpp
index 08c07c4..274b3f5 100644
--- a/test/intltest/tzregts.cpp
+++ b/test/intltest/tzregts.cpp
@@ -1,5 +1,5 @@
/********************************************************************
- * Copyright (c) 1997-2011, International Business Machines
+ * Copyright (c) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************/
@@ -950,25 +950,25 @@
UnicodeString a,b,c,d,e,f,g,h,i,j,k,l;
UnicodeString DATA[] = {
"z1->getDisplayName(false, SHORT)/std zone",
- z1->getDisplayName(FALSE, TimeZone::SHORT, a), "GMT+01:30",
+ z1->getDisplayName(FALSE, TimeZone::SHORT, a), "GMT+1:30",
"z1->getDisplayName(false, LONG)/std zone",
z1->getDisplayName(FALSE, TimeZone::LONG, b), "GMT+01:30",
"z1->getDisplayName(true, SHORT)/std zone",
- z1->getDisplayName(TRUE, TimeZone::SHORT, c), "GMT+01:30",
+ z1->getDisplayName(TRUE, TimeZone::SHORT, c), "GMT+1:30",
"z1->getDisplayName(true, LONG)/std zone",
z1->getDisplayName(TRUE, TimeZone::LONG, d ), "GMT+01:30",
"z2->getDisplayName(false, SHORT)/dst zone",
- z2->getDisplayName(FALSE, TimeZone::SHORT, e), "GMT+01:30",
+ z2->getDisplayName(FALSE, TimeZone::SHORT, e), "GMT+1:30",
"z2->getDisplayName(false, LONG)/dst zone",
z2->getDisplayName(FALSE, TimeZone::LONG, f ), "GMT+01:30",
"z2->getDisplayName(true, SHORT)/dst zone",
- z2->getDisplayName(TRUE, TimeZone::SHORT, g), "GMT+02:15",
+ z2->getDisplayName(TRUE, TimeZone::SHORT, g), "GMT+2:15",
"z2->getDisplayName(true, LONG)/dst zone",
z2->getDisplayName(TRUE, TimeZone::LONG, h ), "GMT+02:15",
- "DateFormat.format(std)/std zone", fmt1->format(std, i), "GMT+01:30",
- "DateFormat.format(dst)/std zone", fmt1->format(dst, j), "GMT+01:30",
- "DateFormat.format(std)/dst zone", fmt2->format(std, k), "GMT+01:30",
- "DateFormat.format(dst)/dst zone", fmt2->format(dst, l), "GMT+02:15",
+ "DateFormat.format(std)/std zone", fmt1->format(std, i), "GMT+1:30",
+ "DateFormat.format(dst)/std zone", fmt1->format(dst, j), "GMT+1:30",
+ "DateFormat.format(std)/dst zone", fmt2->format(std, k), "GMT+1:30",
+ "DateFormat.format(dst)/dst zone", fmt2->format(dst, l), "GMT+2:15",
};
for (int32_t idx=0; idx<(int32_t)ARRAY_LENGTH(DATA); idx+=3) {
diff --git a/test/intltest/tztest.cpp b/test/intltest/tztest.cpp
index b2a7612..e64264c 100644
--- a/test/intltest/tztest.cpp
+++ b/test/intltest/tztest.cpp
@@ -1,6 +1,6 @@
/***********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2012, International Business Machines Corporation
+ * Copyright (c) 1997-2013, International Business Machines Corporation
* and others. All Rights Reserved.
***********************************************************************/
@@ -1962,6 +1962,7 @@
{"Antarctica/South_Pole", "Antarctica/McMurdo"},
{"Atlantic/Jan_Mayen", "Europe/Oslo"},
{"Arctic/Longyearbyen", "Europe/Oslo"},
+ {"Europe/Busingen", "Europe/Zurich"},
{"Europe/Guernsey", "Europe/London"},
{"Europe/Isle_of_Man", "Europe/London"},
{"Europe/Jersey", "Europe/London"},
@@ -2113,7 +2114,7 @@
// zone id locale summer format expected display name
{"Europe/London", "en", FALSE, TimeZone::SHORT, "GMT"},
{"Europe/London", "en", FALSE, TimeZone::LONG, "Greenwich Mean Time"},
- {"Europe/London", "en", TRUE, TimeZone::SHORT, "GMT+01:00" /*"BST"*/},
+ {"Europe/London", "en", TRUE, TimeZone::SHORT, "GMT+1" /*"BST"*/},
{"Europe/London", "en", TRUE, TimeZone::LONG, "British Summer Time"},
{"America/Anchorage", "en", FALSE, TimeZone::SHORT, "AKST"},
@@ -2122,17 +2123,17 @@
{"America/Anchorage", "en", TRUE, TimeZone::LONG, "Alaska Daylight Time"},
// Southern Hemisphere, all data from meta:Australia_Western
- {"Australia/Perth", "en", FALSE, TimeZone::SHORT, "GMT+08:00"/*"AWST"*/},
+ {"Australia/Perth", "en", FALSE, TimeZone::SHORT, "GMT+8"/*"AWST"*/},
{"Australia/Perth", "en", FALSE, TimeZone::LONG, "Australian Western Standard Time"},
// Note: Perth does not observe DST currently. When display name is missing,
// the localized GMT format with the current offset is used even daylight name was
// requested. See #9350.
- {"Australia/Perth", "en", TRUE, TimeZone::SHORT, "GMT+08:00"/*"AWDT"*/},
+ {"Australia/Perth", "en", TRUE, TimeZone::SHORT, "GMT+8"/*"AWDT"*/},
{"Australia/Perth", "en", TRUE, TimeZone::LONG, "Australian Western Daylight Time"},
- {"America/Sao_Paulo", "en", FALSE, TimeZone::SHORT, "GMT-03:00"/*"BRT"*/},
+ {"America/Sao_Paulo", "en", FALSE, TimeZone::SHORT, "GMT-3"/*"BRT"*/},
{"America/Sao_Paulo", "en", FALSE, TimeZone::LONG, "Brasilia Standard Time"},
- {"America/Sao_Paulo", "en", TRUE, TimeZone::SHORT, "GMT-02:00"/*"BRST"*/},
+ {"America/Sao_Paulo", "en", TRUE, TimeZone::SHORT, "GMT-2"/*"BRST"*/},
{"America/Sao_Paulo", "en", TRUE, TimeZone::LONG, "Brasilia Summer Time"},
// No Summer Time, but had it before 1983.
@@ -2142,14 +2143,14 @@
{"Pacific/Honolulu", "en", TRUE, TimeZone::LONG, "Hawaii-Aleutian Daylight Time"},
// Northern, has Summer, not commonly used.
- {"Europe/Helsinki", "en", FALSE, TimeZone::SHORT, "GMT+02:00"/*"EET"*/},
+ {"Europe/Helsinki", "en", FALSE, TimeZone::SHORT, "GMT+2"/*"EET"*/},
{"Europe/Helsinki", "en", FALSE, TimeZone::LONG, "Eastern European Standard Time"},
- {"Europe/Helsinki", "en", TRUE, TimeZone::SHORT, "GMT+03:00"/*"EEST"*/},
+ {"Europe/Helsinki", "en", TRUE, TimeZone::SHORT, "GMT+3"/*"EEST"*/},
{"Europe/Helsinki", "en", TRUE, TimeZone::LONG, "Eastern European Summer Time"},
// Repeating the test data for DST. The test data below trigger the problem reported
// by Ticket#6644
- {"Europe/London", "en", TRUE, TimeZone::SHORT, "GMT+01:00" /*"BST"*/},
+ {"Europe/London", "en", TRUE, TimeZone::SHORT, "GMT+1" /*"BST"*/},
{"Europe/London", "en", TRUE, TimeZone::LONG, "British Summer Time"},
{NULL, NULL, FALSE, TimeZone::SHORT, NULL} // NULL values terminate list
diff --git a/test/intltest/ucdtest.cpp b/test/intltest/ucdtest.cpp
index c1b5f96..4ae48b8 100644
--- a/test/intltest/ucdtest.cpp
+++ b/test/intltest/ucdtest.cpp
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2011, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@@ -8,6 +8,7 @@
#include "unicode/uchar.h"
#include "unicode/uniset.h"
#include "unicode/putil.h"
+#include "unicode/uscript.h"
#include "cstring.h"
#include "hash.h"
#include "patternprops.h"
@@ -59,6 +60,7 @@
TESTCASE_AUTO(TestBinaryValues);
TESTCASE_AUTO(TestConsistency);
TESTCASE_AUTO(TestPatternProperties);
+ TESTCASE_AUTO(TestScriptMetadata);
TESTCASE_AUTO_END;
}
@@ -426,3 +428,73 @@
}
return same;
}
+
+namespace {
+
+/**
+ * Maps a special script code to the most common script of its encoded characters.
+ */
+UScriptCode getCharScript(UScriptCode script) {
+ switch(script) {
+ case USCRIPT_SIMPLIFIED_HAN:
+ case USCRIPT_TRADITIONAL_HAN:
+ return USCRIPT_HAN;
+ case USCRIPT_JAPANESE:
+ return USCRIPT_HIRAGANA;
+ case USCRIPT_KOREAN:
+ return USCRIPT_HANGUL;
+ default:
+ return script;
+ }
+}
+
+} // namespace
+
+void UnicodeTest::TestScriptMetadata() {
+ IcuTestErrorCode errorCode(*this, "TestScriptMetadata()");
+ UnicodeSet rtl("[[:bc=R:][:bc=AL:]-[:Cn:]-[:sc=Common:]]", errorCode);
+ // So far, sample characters are uppercase.
+ // Georgian is special.
+ UnicodeSet cased("[[:Lu:]-[:sc=Common:]-[:sc=Geor:]]", errorCode);
+ for(int32_t sci = 0; sci < USCRIPT_CODE_LIMIT; ++sci) {
+ UScriptCode sc = (UScriptCode)sci;
+ // Run the test with -v to see which script has failures:
+ // .../intltest$ make && ./intltest utility/UnicodeTest/TestScriptMetadata -v | grep -C 3 FAIL
+ logln(uscript_getShortName(sc));
+ UScriptUsage usage = uscript_getUsage(sc);
+ UnicodeString sample = uscript_getSampleUnicodeString(sc);
+ UnicodeSet scriptSet;
+ scriptSet.applyIntPropertyValue(UCHAR_SCRIPT, sc, errorCode);
+ if(usage == USCRIPT_USAGE_NOT_ENCODED) {
+ assertTrue("not encoded, no sample", sample.isEmpty());
+ assertFalse("not encoded, not RTL", uscript_isRightToLeft(sc));
+ assertFalse("not encoded, not LB letters", uscript_breaksBetweenLetters(sc));
+ assertFalse("not encoded, not cased", uscript_isCased(sc));
+ assertTrue("not encoded, no characters", scriptSet.isEmpty());
+ } else {
+ assertFalse("encoded, has a sample character", sample.isEmpty());
+ UChar32 firstChar = sample.char32At(0);
+ UScriptCode charScript = getCharScript(sc);
+ assertEquals("script(sample(script))",
+ charScript, uscript_getScript(firstChar, errorCode));
+ assertEquals("RTL vs. set", rtl.contains(firstChar), uscript_isRightToLeft(sc));
+ assertEquals("cased vs. set", cased.contains(firstChar), uscript_isCased(sc));
+ assertEquals("encoded, has characters", sc == charScript, !scriptSet.isEmpty());
+ if(uscript_isRightToLeft(sc)) {
+ rtl.removeAll(scriptSet);
+ }
+ if(uscript_isCased(sc)) {
+ cased.removeAll(scriptSet);
+ }
+ }
+ }
+ UnicodeString pattern;
+ assertEquals("no remaining RTL characters",
+ UnicodeString("[]"), rtl.toPattern(pattern));
+ assertEquals("no remaining cased characters",
+ UnicodeString("[]"), cased.toPattern(pattern));
+
+ assertTrue("Hani breaks between letters", uscript_breaksBetweenLetters(USCRIPT_HAN));
+ assertTrue("Thai breaks between letters", uscript_breaksBetweenLetters(USCRIPT_THAI));
+ assertFalse("Latn does not break between letters", uscript_breaksBetweenLetters(USCRIPT_LATIN));
+}
diff --git a/test/intltest/ucdtest.h b/test/intltest/ucdtest.h
index 38c7eca..74fdfc1 100644
--- a/test/intltest/ucdtest.h
+++ b/test/intltest/ucdtest.h
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2011, International Business Machines Corporation and
+ * Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@@ -37,6 +37,7 @@
void TestBinaryValues();
void TestConsistency();
void TestPatternProperties();
+ void TestScriptMetadata();
private:
diff --git a/test/intltest/uobjtest.cpp b/test/intltest/uobjtest.cpp
index 11f1293..e607f2f 100644
--- a/test/intltest/uobjtest.cpp
+++ b/test/intltest/uobjtest.cpp
@@ -1,8 +1,8 @@
/********************************************************************
- * COPYRIGHT:
+ * COPYRIGHT:
* Copyright (c) 1997-2012, International Business Machines Corporation and
* others. All Rights Reserved.
- * Copyright (C) 2010 , Yahoo! Inc.
+ * Copyright (C) 2010 , Yahoo! Inc.
********************************************************************/
#include <stdio.h>
@@ -325,6 +325,8 @@
ids_count = 0;
UErrorCode status = U_ZERO_ERROR;
+ TESTCLASSID_NONE_CTOR(UObject, ());
+
#if !UCONFIG_NO_TRANSLITERATION || !UCONFIG_NO_FORMATTING
UParseError parseError;
#endif
diff --git a/test/intltest/usettest.cpp b/test/intltest/usettest.cpp
index 021314a..abc4003 100644
--- a/test/intltest/usettest.cpp
+++ b/test/intltest/usettest.cpp
@@ -2626,10 +2626,7 @@
UChar32 c;
int32_t start=0, prev;
while((prev=start)<length) {
- U8_NEXT(s, start, length, c);
- if(c<0) {
- c=0xfffd;
- }
+ U8_NEXT_OR_FFFD(s, start, length, c);
if(realSet.contains(c)!=spanCondition) {
break;
}
@@ -2640,10 +2637,7 @@
UChar32 c;
int32_t start, next;
for(start=next=0; start<length;) {
- U8_NEXT(s, next, length, c);
- if(c<0) {
- c=0xfffd;
- }
+ U8_NEXT_OR_FFFD(s, next, length, c);
if(realSet.contains(c)) {
break;
}
@@ -2664,10 +2658,7 @@
UChar32 c;
int32_t start, next, maxSpanLimit=0;
for(start=next=0; start<length;) {
- U8_NEXT(s, next, length, c);
- if(c<0) {
- c=0xfffd;
- }
+ U8_NEXT_OR_FFFD(s, next, length, c);
if(!realSet.contains(c)) {
next=start; // Do not span this single, not-contained code point.
}
@@ -2738,10 +2729,7 @@
UChar32 c;
int32_t prev=length;
do {
- U8_PREV(s, 0, length, c);
- if(c<0) {
- c=0xfffd;
- }
+ U8_PREV_OR_FFFD(s, 0, length, c);
if(realSet.contains(c)!=spanCondition) {
break;
}
@@ -2752,10 +2740,7 @@
UChar32 c;
int32_t prev=length;
do {
- U8_PREV(s, 0, length, c);
- if(c<0) {
- c=0xfffd;
- }
+ U8_PREV_OR_FFFD(s, 0, length, c);
if(realSet.contains(c)) {
break;
}
@@ -2775,10 +2760,7 @@
UChar32 c;
int32_t prev=length, minSpanStart=length;
do {
- U8_PREV(s, 0, length, c);
- if(c<0) {
- c=0xfffd;
- }
+ U8_PREV_OR_FFFD(s, 0, length, c);
if(!realSet.contains(c)) {
length=prev; // Do not span this single, not-contained code point.
}
diff --git a/test/intltest/ustrtest.cpp b/test/intltest/ustrtest.cpp
index 13251a3..6a27ea3 100644
--- a/test/intltest/ustrtest.cpp
+++ b/test/intltest/ustrtest.cpp
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2011, International Business Machines Corporation and
+ * Copyright (c) 1997-2012, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@@ -113,9 +113,9 @@
errln("operator+=() failed: expected \"" + expectedValue + "\"\n,got \"" + test2 + "\"");
if (test1.length() != 70)
- errln("length() failed: expected 70, got " + test1.length());
+ errln(UnicodeString("length() failed: expected 70, got ") + test1.length());
if (test2.length() != 30)
- errln("length() failed: expected 30, got " + test2.length());
+ errln(UnicodeString("length() failed: expected 30, got ") + test2.length());
UnicodeString test3;
test3.append((UChar32)0x20402);
@@ -123,7 +123,7 @@
errln((UnicodeString)"append failed for UChar32, expected \"\\\\ud841\\\\udc02\", got " + prettify(test3));
}
if(test3.length() != 2){
- errln("append or length failed for UChar32, expected 2, got " + test3.length());
+ errln(UnicodeString("append or length failed for UChar32, expected 2, got ") + test3.length());
}
test3.append((UChar32)0x0074);
if(test3 != CharsToUnicodeString("\\uD841\\uDC02t")){
@@ -721,14 +721,15 @@
(startPos = test1.indexOf(test2, startPos)) != -1 ? (++occurrences, startPos += 4) : 0)
;
if (occurrences != 6)
- errln("indexOf failed: expected to find 6 occurrences, found " + occurrences);
-
+ errln(UnicodeString("indexOf failed: expected to find 6 occurrences, found ") + occurrences);
+
for ( occurrences = 0, startPos = 10;
startPos != -1 && startPos < test1.length();
(startPos = test1.indexOf(test2, startPos)) != -1 ? (++occurrences, startPos += 4) : 0)
;
if (occurrences != 4)
- errln("indexOf with starting offset failed: expected to find 4 occurrences, found " + occurrences);
+ errln(UnicodeString("indexOf with starting offset failed: "
+ "expected to find 4 occurrences, found ") + occurrences);
int32_t endPos = 28;
for ( occurrences = 0, startPos = 5;
@@ -736,7 +737,8 @@
(startPos = test1.indexOf(test2, startPos, endPos - startPos)) != -1 ? (++occurrences, startPos += 4) : 0)
;
if (occurrences != 4)
- errln("indexOf with starting and ending offsets failed: expected to find 4 occurrences, found " + occurrences);
+ errln(UnicodeString("indexOf with starting and ending offsets failed: "
+ "expected to find 4 occurrences, found ") + occurrences);
//using UChar32 string
for ( startPos=0, occurrences=0;
@@ -751,7 +753,7 @@
(startPos = test3.indexOf(test4, startPos)) != -1 ? (++occurrences, startPos += 2) : 0)
;
if (occurrences != 2)
- errln("indexOf failed: expected to find 2 occurrences, found " + occurrences);
+ errln(UnicodeString("indexOf failed: expected to find 2 occurrences, found ") + occurrences);
//---
for ( occurrences = 0, startPos = 0;
@@ -759,21 +761,24 @@
(startPos = test1.indexOf(testChar, startPos)) != -1 ? (++occurrences, startPos += 1) : 0)
;
if (occurrences != 16)
- errln("indexOf with character failed: expected to find 16 occurrences, found " + occurrences);
+ errln(UnicodeString("indexOf with character failed: "
+ "expected to find 16 occurrences, found ") + occurrences);
for ( occurrences = 0, startPos = 10;
startPos != -1 && startPos < test1.length();
(startPos = test1.indexOf(testChar, startPos)) != -1 ? (++occurrences, startPos += 1) : 0)
;
if (occurrences != 12)
- errln("indexOf with character & start offset failed: expected to find 12 occurrences, found " + occurrences);
+ errln(UnicodeString("indexOf with character & start offset failed: "
+ "expected to find 12 occurrences, found ") + occurrences);
for ( occurrences = 0, startPos = 5, endPos = 28;
startPos != -1 && startPos < test1.length();
(startPos = test1.indexOf(testChar, startPos, endPos - startPos)) != -1 ? (++occurrences, startPos += 1) : 0)
;
if (occurrences != 10)
- errln("indexOf with character & start & end offsets failed: expected to find 10 occurrences, found " + occurrences);
+ errln(UnicodeString("indexOf with character & start & end offsets failed: "
+ "expected to find 10 occurrences, found ") + occurrences);
//testing for UChar32
UnicodeString subString;
@@ -816,14 +821,16 @@
(startPos = test1.lastIndexOf(test2, 5, startPos - 5)) != -1 ? ++occurrences : 0)
;
if (occurrences != 4)
- errln("lastIndexOf with starting and ending offsets failed: expected to find 4 occurrences, found " + occurrences);
+ errln(UnicodeString("lastIndexOf with starting and ending offsets failed: "
+ "expected to find 4 occurrences, found ") + occurrences);
for ( occurrences = 0, startPos = 32;
startPos != -1;
(startPos = test1.lastIndexOf(testChar, 5, startPos - 5)) != -1 ? ++occurrences : 0)
;
if (occurrences != 11)
- errln("lastIndexOf with character & start & end offsets failed: expected to find 11 occurrences, found " + occurrences);
+ errln(UnicodeString("lastIndexOf with character & start & end offsets failed: "
+ "expected to find 11 occurrences, found ") + occurrences);
//testing UChar32
startPos=test3.length();
diff --git a/test/iotest/iotest.vcxproj b/test/iotest/iotest.vcxproj
index 8566f0e..16b278a 100644
--- a/test/iotest/iotest.vcxproj
+++ b/test/iotest/iotest.vcxproj
@@ -259,4 +259,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/test/letest/letest.cpp b/test/letest/letest.cpp
index 83df47c..8e4523a 100644
--- a/test/letest/letest.cpp
+++ b/test/letest/letest.cpp
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
- * Copyright (C) 1999-2008, International Business Machines
+ * Copyright (C) 1999-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -413,7 +413,7 @@
const char *getSourceTestData() {
const char *srcDataDir = NULL;
#ifdef U_TOPSRCDIR
- srcDataDir = U_TOPSRCDIR U_FILE_SEP_STRING"test"U_FILE_SEP_STRING"testdata"U_FILE_SEP_STRING;
+ srcDataDir = U_TOPSRCDIR U_FILE_SEP_STRING "test" U_FILE_SEP_STRING "testdata" U_FILE_SEP_STRING;
#else
srcDataDir = ".."U_FILE_SEP_STRING".."U_FILE_SEP_STRING"test"U_FILE_SEP_STRING"testdata"U_FILE_SEP_STRING;
FILE *f = fopen(".."U_FILE_SEP_STRING".."U_FILE_SEP_STRING"test"U_FILE_SEP_STRING"testdata"U_FILE_SEP_STRING"rbbitst.txt", "r");
@@ -991,7 +991,7 @@
*/
#if defined (U_TOPBUILDDIR)
{
- dataOutDir = U_TOPBUILDDIR "data"U_FILE_SEP_STRING"out"U_FILE_SEP_STRING;
+ dataOutDir = U_TOPBUILDDIR "data" U_FILE_SEP_STRING "out" U_FILE_SEP_STRING;
}
#else
diff --git a/test/perf/DateFmtPerf/DateFmtPerf.vcxproj b/test/perf/DateFmtPerf/DateFmtPerf.vcxproj
index 0df82a5..91ff507 100644
--- a/test/perf/DateFmtPerf/DateFmtPerf.vcxproj
+++ b/test/perf/DateFmtPerf/DateFmtPerf.vcxproj
@@ -116,4 +116,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/test/perf/strsrchperf/strsrchperf.cpp b/test/perf/strsrchperf/strsrchperf.cpp
index 23d16d7..1c70316 100644
--- a/test/perf/strsrchperf/strsrchperf.cpp
+++ b/test/perf/strsrchperf/strsrchperf.cpp
@@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (C) 2008-2009 IBM, Inc. All Rights Reserved.
+ * Copyright (C) 2008-2012 IBM, Inc. All Rights Reserved.
*
********************************************************************/
/**
@@ -14,13 +14,7 @@
StringSearchPerformanceTest::StringSearchPerformanceTest(int32_t argc, const char *argv[], UErrorCode &status)
:UPerfTest(argc,argv,status){
int32_t start, end;
-
-#ifdef TEST_BOYER_MOORE_SEARCH
- bms = NULL;
-#else
srch = NULL;
-#endif
-
pttrn = NULL;
if(status== U_ILLEGAL_ARGUMENT_ERROR || line_mode){
fprintf(stderr,gUsageString, "strsrchperf");
@@ -65,17 +59,8 @@
pttrn = temp; /* store word in pttrn */
#endif
-#ifdef TEST_BOYER_MOORE_SEARCH
- UnicodeString patternString(pttrn, pttrnLen);
- UCollator *coll = ucol_open(locale, &status);
- CollData *data = CollData::open(coll, status);
-
- targetString = new UnicodeString(src, srcLen);
- bms = new BoyerMooreSearch(data, patternString, targetString, status);
-#else
/* Create the StringSearch object to be use in performance test. */
srch = usearch_open(pttrn, pttrnLen, src, srcLen, locale, NULL, &status);
-#endif
if(U_FAILURE(status)){
fprintf(stderr, "FAILED to create UPerfTest object. Error: %s\n", u_errorName(status));
@@ -85,23 +70,12 @@
}
StringSearchPerformanceTest::~StringSearchPerformanceTest() {
- CollData *data = bms->getData();
- UCollator *coll = data->getCollator();
-
- delete bms;
- delete targetString;
- CollData::close(data);
- ucol_close(coll);
-
if (pttrn != NULL) {
free(pttrn);
}
-
-#ifndef TEST_BOYER_MOORE_SEARCH
if (srch != NULL) {
usearch_close(srch);
}
-#endif
}
UPerfFunction* StringSearchPerformanceTest::runIndexedTest(int32_t index, UBool exec, const char *&name, char *par) {
@@ -117,20 +91,12 @@
}
UPerfFunction* StringSearchPerformanceTest::Test_ICU_Forward_Search(){
-#ifdef TEST_BOYER_MOORE_SEARCH
- StringSearchPerfFunction *func = new StringSearchPerfFunction(ICUForwardSearch, bms, src, srcLen, pttrn, pttrnLen);
-#else
StringSearchPerfFunction* func = new StringSearchPerfFunction(ICUForwardSearch, srch, src, srcLen, pttrn, pttrnLen);
-#endif
return func;
}
UPerfFunction* StringSearchPerformanceTest::Test_ICU_Backward_Search(){
-#ifdef TEST_BOYER_MOORE_SEARCH
- StringSearchPerfFunction *func = new StringSearchPerfFunction(ICUBackwardSearch, bms, src, srcLen, pttrn, pttrnLen);
-#else
StringSearchPerfFunction* func = new StringSearchPerfFunction(ICUBackwardSearch, srch, src, srcLen, pttrn, pttrnLen);
-#endif
return func;
}
diff --git a/test/perf/strsrchperf/strsrchperf.h b/test/perf/strsrchperf/strsrchperf.h
index 6f2281c..a68ab3a 100644
--- a/test/perf/strsrchperf/strsrchperf.h
+++ b/test/perf/strsrchperf/strsrchperf.h
@@ -1,26 +1,17 @@
/********************************************************************
* COPYRIGHT:
- * Copyright (C) 2008-2009 IBM, Inc. All Rights Reserved.
+ * Copyright (C) 2008-2012 IBM, Inc. All Rights Reserved.
*
********************************************************************/
#ifndef _STRSRCHPERF_H
#define _STRSRCHPERF_H
-#include "unicode/ubrk.h"
#include "unicode/usearch.h"
-#include "unicode/colldata.h"
-#include "unicode/bmsearch.h"
#include "unicode/uperf.h"
#include <stdlib.h>
#include <stdio.h>
-#define TEST_BOYER_MOORE_SEARCH
-
-#ifdef TEST_BOYER_MOORE_SEARCH
-typedef void (*StrSrchFn) (BoyerMooreSearch * bms, const UChar *src, int32_t srcLen, const UChar *pttrn, int32_t pttrnLen, UErrorCode *status);
-#else
typedef void (*StrSrchFn)(UStringSearch* srch, const UChar* src,int32_t srcLen, const UChar* pttrn, int32_t pttrnLen, UErrorCode* status);
-#endif
class StringSearchPerfFunction : public UPerfFunction {
private:
@@ -29,39 +20,17 @@
int32_t srcLen;
const UChar* pttrn;
int32_t pttrnLen;
-#ifdef TEST_BOYER_MOORE_SEARCH
- BoyerMooreSearch *bms;
-#else
UStringSearch* srch;
-#endif
public:
virtual void call(UErrorCode* status) {
-#ifdef TEST_BOYER_MOORE_SEARCH
- (*fn)(bms, src, srcLen, pttrn, pttrnLen, status);
-#else
(*fn)(srch, src, srcLen, pttrn, pttrnLen, status);
-#endif
}
virtual long getOperationsPerIteration() {
-#if 0
- return (long)(srcLen/pttrnLen);
-#else
return (long) srcLen;
-#endif
}
-#ifdef TEST_BOYER_MOORE_SEARCH
- StringSearchPerfFunction(StrSrchFn func, BoyerMooreSearch *search, const UChar *source, int32_t sourceLen, const UChar *pattern, int32_t patternLen) {
- fn = func;
- src = source;
- srcLen = sourceLen;
- pttrn = pattern;
- pttrnLen = patternLen;
- bms = search;
- }
-#else
StringSearchPerfFunction(StrSrchFn func, UStringSearch* search, const UChar* source,int32_t sourceLen, const UChar* pattern, int32_t patternLen) {
fn = func;
src = source;
@@ -70,7 +39,6 @@
pttrnLen = patternLen;
srch = search;
}
-#endif
};
class StringSearchPerformanceTest : public UPerfTest {
@@ -79,42 +47,17 @@
int32_t srcLen;
UChar* pttrn;
int32_t pttrnLen;
-#ifdef TEST_BOYER_MOORE_SEARCH
- UnicodeString *targetString;
- BoyerMooreSearch *bms;
-#else
UStringSearch* srch;
-#endif
public:
StringSearchPerformanceTest(int32_t argc, const char *argv[], UErrorCode &status);
~StringSearchPerformanceTest();
virtual UPerfFunction* runIndexedTest(int32_t index, UBool exec, const char *&name, char *par = NULL);
-
UPerfFunction* Test_ICU_Forward_Search();
-
UPerfFunction* Test_ICU_Backward_Search();
};
-#ifdef TEST_BOYER_MOORE_SEARCH
-void ICUForwardSearch(BoyerMooreSearch *bms, const UChar *source, int32_t sourceLen, const UChar *pattern, int32_t patternLen, UErrorCode * /*status*/) {
- int32_t offset = 0, start = -1, end = -1;
-
- while (bms->search(offset, start, end)) {
- offset = end;
- }
-}
-
-void ICUBackwardSearch(BoyerMooreSearch *bms, const UChar *source, int32_t sourceLen, const UChar *pattern, int32_t patternLen, UErrorCode * /*status*/) {
- int32_t offset = 0, start = -1, end = -1;
-
- /* NOTE: No Boyer-Moore backward search yet... */
- while (bms->search(offset, start, end)) {
- offset = end;
- }
-}
-#else
void ICUForwardSearch(UStringSearch *srch, const UChar* source, int32_t sourceLen, const UChar* pattern, int32_t patternLen, UErrorCode* status) {
int32_t match;
@@ -132,6 +75,5 @@
match = usearch_previous(srch, status);
}
}
-#endif
#endif /* _STRSRCHPERF_H */
diff --git a/test/testdata/NumberFormatTestCases.txt b/test/testdata/NumberFormatTestCases.txt
index cf7496c..1e17a49 100644
--- a/test/testdata/NumberFormatTestCases.txt
+++ b/test/testdata/NumberFormatTestCases.txt
@@ -78,9 +78,11 @@
# recognize real ISO name in parsing, so, can not use fake name as QQQ
#fpc: - 123/QQQ "QQQ123.00" 123/QQQ # QQQ is fake
fpc: - 123/GTQ "GTQ123.00" 123/GTQ
-# ChoiceFormat-based display names
-fpc: - 1/INR "\u20b91.00" 1/INR
-fpc: - 2/INR "\u20b92.00" 2/INR
+
+# Google Patch. INR formats as "Rs.", not as "Rs"
+fpc: - 1/INR "Rs.1.00" 1/INR
+fpc: - 2/INR "Rs.2.00" 2/INR
+
# Display names with shared prefix (YDD vs. Y)
fpc: - 100/YDD "YDD100.00" 100/YDD
fpc: - 100/CNY "CN\u00a5100.00" 100/CNY
diff --git a/test/testdata/calendar.txt b/test/testdata/calendar.txt
index 9dd08ca..ec72728 100644
--- a/test/testdata/calendar.txt
+++ b/test/testdata/calendar.txt
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 International Business Machines
+// Copyright (c) 2008-2013 International Business Machines
// Corporation and others. All Rights Reserved.
calendar:table(nofallback) {
Info {
@@ -115,6 +115,58 @@
"EXTENDED_YEAR=4627,MONTH=5,DATE=1,IS_LEAP_MONTH=0", // ch
"YEAR=1990,MONTH=6,DATE=22", // greg
},
+ // dangi calendar
+ // (0-based months)
+ {
+ "en_US@calendar=dangi",
+ "EXTENDED_YEAR=4297,MONTH=6,DATE=29,IS_LEAP_MONTH=0", // dangi
+ "YEAR=1964,MONTH=8,DATE=5", // greg
+ },
+ {
+ "en_US@calendar=dangi",
+ "EXTENDED_YEAR=4297,MONTH=7,DATE=1,IS_LEAP_MONTH=0", // dangi
+ "YEAR=1964,MONTH=8,DATE=6", // greg
+ },
+ {
+ "en_US@calendar=dangi",
+ "EXTENDED_YEAR=4294,MONTH=10,DATE=18,IS_LEAP_MONTH=0", // dangi
+ "YEAR=1961,MONTH=11,DATE=25", // greg
+ },
+ {
+ "en_US@calendar=dangi",
+ "EXTENDED_YEAR=4323,MONTH=4,DATE=30,IS_LEAP_MONTH=0", // dangi
+ "YEAR=1990,MONTH=5,DATE=22", // greg
+ },
+ {
+ "en_US@calendar=dangi",
+ "EXTENDED_YEAR=4323,MONTH=4,DATE=1,IS_LEAP_MONTH=1", // dangi
+ "YEAR=1990,MONTH=5,DATE=23", // greg
+ },
+ {
+ "en_US@calendar=dangi",
+ "EXTENDED_YEAR=4323,MONTH=4,DATE=29,IS_LEAP_MONTH=1", // dangi
+ "YEAR=1990,MONTH=6,DATE=21", // greg
+ },
+ {
+ "en_US@calendar=dangi",
+ "EXTENDED_YEAR=4323,MONTH=5,DATE=1,IS_LEAP_MONTH=0", // dangi
+ "YEAR=1990,MONTH=6,DATE=22", // greg
+ },
+ {
+ "en_US@calendar=dangi",
+ "EXTENDED_YEAR=4213,MONTH=9,DATE=1,IS_LEAP_MONTH=0", // dangi
+ "YEAR=1880,MONTH=10,DATE=3", // greg
+ },
+ {
+ "en_US@calendar=dangi",
+ "EXTENDED_YEAR=4215,MONTH=10,DATE=1,IS_LEAP_MONTH=0", // dangi
+ "YEAR=1882,MONTH=11,DATE=10", // greg
+ },
+ {
+ "en_US@calendar=dangi",
+ "EXTENDED_YEAR=4230,MONTH=6,DATE=1,IS_LEAP_MONTH=0", // dangi
+ "YEAR=1897,MONTH=6,DATE=29", // greg
+ },
}
}
TestCalendarOperations {
@@ -270,7 +322,7 @@
"en_US@calendar=chinese",
"EXTENDED_YEAR=4638,MONTH=2,DATE=15,IS_LEAP_MONTH=0", // ch
"roll",
- "MONTH=3", // month + 16
+ "MONTH=16", // month + 16
"EXTENDED_YEAR=4638,MONTH=4,DATE=15,IS_LEAP_MONTH=0", // ch
},
{ // month=3 is a leap month
@@ -343,6 +395,42 @@
"MONTH=-10", // month - 10
"EXTENDED_YEAR=4638,MONTH=5,DATE=29,IS_LEAP_MONTH=0", // ch
},
+ //dangi add tests
+ { // normal
+ "en_US@calendar=dangi",
+ "EXTENDED_YEAR=4338,MONTH=2,DATE=15,IS_LEAP_MONTH=0", // dangi
+ "add",
+ "MONTH=3", // month + 3
+ "EXTENDED_YEAR=4338,MONTH=5,DATE=15,IS_LEAP_MONTH=0", // dangi
+ },
+ { // across year
+ "en_US@calendar=dangi",
+ "EXTENDED_YEAR=4335,MONTH=11,DATE=15,IS_LEAP_MONTH=0", // dangi
+ "add",
+ "MONTH=1", // month + 1
+ "EXTENDED_YEAR=4336,MONTH=0,DATE=15,IS_LEAP_MONTH=0", // dangi
+ },
+ { // 4 = leap
+ "en_US@calendar=dangi",
+ "EXTENDED_YEAR=4334,MONTH=2,DATE=15,IS_LEAP_MONTH=0", // dangi
+ "add",
+ "MONTH=3", // month + 3
+ "EXTENDED_YEAR=4334,MONTH=4,DATE=15,IS_LEAP_MONTH=0", // dangi
+ },
+ { // 4 = leap
+ "en_US@calendar=dangi",
+ "EXTENDED_YEAR=4334,MONTH=2,DATE=15,IS_LEAP_MONTH=0", // dangi
+ "add",
+ "MONTH=2", // month + 2
+ "EXTENDED_YEAR=4334,MONTH=3,DATE=15,IS_LEAP_MONTH=1", // dangi
+ },
+ { // dom should pin
+ "en_US@calendar=dangi",
+ "EXTENDED_YEAR=4334,MONTH=2,DATE=30,IS_LEAP_MONTH=0", // dangi
+ "add",
+ "MONTH=2", // month + 2
+ "EXTENDED_YEAR=4334,MONTH=3,DATE=29,IS_LEAP_MONTH=1", // dangi
+ },
{
"en_US@calendar=hebrew",
"MILLIS=-180799750799999",
diff --git a/test/testdata/conversion.txt b/test/testdata/conversion.txt
index e9881a0..19ee85a 100644
--- a/test/testdata/conversion.txt
+++ b/test/testdata/conversion.txt
@@ -1,6 +1,6 @@
//*******************************************************************************
//
-// Copyright (C) 2003-2012, International Business Machines
+// Copyright (C) 2003-2013, International Business Machines
// Corporation and others. All Rights Reserved.
//
// file name: conversion.txt
@@ -1004,6 +1004,20 @@
fromUnicode {
Headers { "charset", "unicode", "bytes", "offsets", "flush", "fallbacks", "errorCode", "callback", "invalidUChars" }
Cases {
+ // Test ticket 9602: Add "good one-way" mapping type (|4).
+ // Such mappings are used regardless of the fallback flag.
+ {
+ "+*test3", "##\uFE0E#\uFE0F",
+ :bin{ 010204010204010204 }, :intvector{ 0,0,0,1,1,1,3,3,3 },
+ :int{1}, :int{0}, // no fallbacks
+ "", "?", ""
+ }
+ {
+ "+*test3", "##\uFE0E#\uFE0F",
+ :bin{ 010204010204010204 }, :intvector{ 0,0,0,1,1,1,3,3,3 },
+ :int{1}, :int{1}, // with fallbacks
+ "", "?", ""
+ }
// Test ticket 6789: implement Java-compatible Unicode, UnicodeBig and UnicodeLittle converters
// For details about these encodings see convrtrs.txt.
// Standard UTF-16BE
@@ -1032,7 +1046,10 @@
{
"ISO-2022-JP",
"\u203e\xa5\u4e00\ufa10\u6f3e\u0391",
- :bin{ 1b284a7e5c1b2442306c222e5f2126211b2842 },
+ // Google Specific Patch for alternatate 2022 conversion table.
+ // :bin{ 1b284a7e5c1b2442306c222e5f2126211b2842 },
+ :bin{ 1b284a7e5c1b2442306c79605f2126211b2842 },
+ // End Google specific patch.
:intvector{ 0,0,0,0,1,2,2,2,2,2,3,3,4,4,5,5,5,5,5 },
:int{1}, :int{0}, "", "?=\u3013", "" // U+3013 Geta Mark converts to 222e
}
@@ -1766,8 +1783,8 @@
{ "UTF-8", "a\ud800b", :bin{ 61efbfbd62 }, :intvector{ 0, 1, 1, 1, 2 }, :int{1}, :int{0}, "", "", "" }
// Code coverage for the EUC variants.
- { "EUC-JP", "\u0061\u4edd\u5bec\ud801\udc01\ud801\u0061\u00a2", :bin{ 61a1b88ff4ae618ee0 }, :intvector{ 0, 1, 1, 2, 2, 2, 6, 7, 7 }, :int{1}, :int{0}, "", "0", "" }
- { "EUC-JP", "\u0061\u4edd\u5bec\ud801\udc01\ud801\u0061\u00a2", :bin{ 61a1b88ff4aef4fef4fe618ee0 }, :intvector{ 0, 1, 1, 2, 2, 2, 3, 3, 5, 5, 6, 7, 7 }, :int{1}, :int{0}, "", "", "" }
+ { "IBM-eucJP", "\u0061\u4edd\u5bec\ud801\udc01\ud801\u0061\u00a2", :bin{ 61a1b88ff4ae618ee0 }, :intvector{ 0, 1, 1, 2, 2, 2, 6, 7, 7 }, :int{1}, :int{0}, "", "0", "" }
+ { "IBM-eucJP", "\u0061\u4edd\u5bec\ud801\udc01\ud801\u0061\u00a2", :bin{ 61a1b88ff4aef4fef4fe618ee0 }, :intvector{ 0, 1, 1, 2, 2, 2, 3, 3, 5, 5, 6, 7, 7 }, :int{1}, :int{0}, "", "", "" }
{ "EUC-TW", "\u0061\u2295\u5BF2\ud801\udc01\ud801\u0061\u8706\u008a", :bin{ 61a2d38ea2dce561e6ca8a }, :intvector{ 0, 1, 1, 2, 2, 2, 2, 6, 7, 7, 8 }, :int{1}, :int{0}, "", "0", "" }
{ "EUC-TW", "\u0061\u2295\u5BF2\ud801\udc01\ud801\u0061\u8706\u008a", :bin{ 61a2d38ea2dce5fdfefdfe61e6ca8a }, :intvector{ 0, 1, 1, 2, 2, 2, 2, 3, 3, 5, 5, 6, 7, 7, 8 }, :int{1}, :int{0}, "", "", "" }
@@ -1833,6 +1850,20 @@
// which - numeric UConverterUnicodeSet value
Headers { "charset", "map", "mapnot", "which" }
Cases {
+ // Test ticket 9602: Add "good one-way" mapping type (|4).
+ // Excluded from roundtrip set, included in the set with fallbacks.
+ {
+ "+*test3",
+ "[{#\uFE0F}]",
+ "[#{#\uFE0E}]",
+ :int{0}
+ }
+ {
+ "+*test3",
+ "[#{#\uFE0E}{#\uFE0F}]",
+ "[]",
+ :int{1}
+ }
// Unicode charsets that do not map surrogate code points
{
"UTF-8",
@@ -1918,29 +1949,30 @@
}
// versions of ISO-2022-JP
+ // Start of Google Specific patches for SoftBank Shift JIS tables
{
"ISO-2022-JP",
"[\x00-\x0d\x10-\x1a\x1c-\x7f\xa5\u0391-\u03a1\u2015\u203e\u4e00\u4e01\uffe5]",
- "[\x0e\x0f\x1b\u0100-\u0113\u0385-\u038a\u2014\u301c\u4e02\u4e27-\u4e29\u4fe0\u663b\u9eb5\ufa0e-\ufa2d\uff61-\uff9f\uffe4\uffe6-\U0010ffff]",
+ "[\x0e\x0f\x1b\u0100-\u0113\u0385-\u038a\u2014\u301c\u4e02\u4e27\u4e29\u4fe0\u9eb5\uff61-\uff9f\uffe6-\U0010ffff]",
:int{0}
}
{
"ISO-2022-JP-2",
"[\x00-\x0d\x10-\x1a\x1c-\x7f\xa0-\u0113\u0384-\u0386\u0388-\u038a\u0390-\u03a1\u203e\u4e00-\u4e05\u4fe0\u663b\uffe6]",
- "[\x0e\x0f\x1b\uff61-\uff9f\uffe4\uffe7-\U0010ffff]",
+ "[\x0e\x0f\x1b\uff61-\uff9f\uffe7-\U0010ffff]",
:int{0}
}
{
"JIS7",
- "[\x00-\x0d\x10-\x1a\x1c-\x7f\xa0-\u0113\u0384-\u0386\u0388-\u038a\u0390-\u03a1\u203e\u4e00-\u4e05\u4fe0\u663b\uff61-\uff9f\uffe6]",
- "[\x0e\x0f\x1b\uffe4\uffe7-\U0010ffff]",
+ "[\x00-\x0d\x10-\x1a\x1c-\x7f\xa0-\u0113\u0384-\u0386\u0388-\u038a\u0390-\u03a1\u203e\u4e00-\u4e05\u4fe0\u663b\uff61-\uff9f\uffe4\uffe6]",
+ "[\x0e\x0f\x1b\uffe7-\U0010ffff]",
:int{0}
}
// with fallbacks
{
"ISO-2022-JP",
- "[\x00-\x0d\x10-\x1a\x1c-\x7f\xa5\u0391-\u03a1\u2014\u2015\u203e\u301c\u4e00\u4e01\u4fe0\u9eb5\uff61-\uff9f\uffe5]",
- "[\x0e\x0f\x1b\xa6\u0100-\u0113\u0385-\u038a\u4e02\u4e27-\u4e29\u663b\ufa0e-\ufa2d\uffe4\uffe6-\U0010ffff]",
+ "[\x00-\x0d\x10-\x1a\x1c-\x7f\xa5\u0391-\u03a1\u2014\u2015\u203e\u301c\u4e00\u4e01\uff61-\uff9f\uffe5]",
+ "[\x0e\x0f\x1b\xa6\u0100-\u0113\u0385-\u038a\u4e02\u4e27\u4e29\u4fe0\u9eb5\uffe6-\U0010ffff]",
:int{1}
}
diff --git a/test/testdata/format.txt b/test/testdata/format.txt
index 9827bd6..703951e 100644
--- a/test/testdata/format.txt
+++ b/test/testdata/format.txt
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2012 International Business Machines
+// Copyright (c) 2007-2013 International Business Machines
// Corporation and others. All Rights Reserved.
format:table(nofallback) {
Info {
@@ -552,7 +552,7 @@
"",
"DATE=FULL,TIME=FULL",
"MILLIS=3076424179200000",
- "Friday, Heshvan 3, 103217 at 12:00:00 AM GMT-08:00"
+ "Friday, Heshvan 3, 103217 AM at 12:00:00 AM GMT-08:00"
},
}
}
diff --git a/test/testdata/rbbitst.txt b/test/testdata/rbbitst.txt
index 07086ee..7c3a1b8 100644
--- a/test/testdata/rbbitst.txt
+++ b/test/testdata/rbbitst.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2001-2012 International Business Machines
+# Copyright (c) 2001-2013 International Business Machines
# Corporation and others. All Rights Reserved.
#
# RBBI Test Data
@@ -33,8 +33,9 @@
# Temp debugging tests
-<line>
-<data>•\ufffc•\u30e3\u000c<100>\u1b39\u300a\u002f\u203a\u200b•\ufffc•\uaf64•\udcfb•</data>
+<char>
+<data>•\U00010020•\U00010000\u0301•x•</data>
+<data>•\U00010020•\U00010000\N{COMBINING MACRON}•</data>
########################################################################################
#
@@ -213,7 +214,7 @@
<data>•abc<200>\u4e01<400>\u4e02<400>\u3005<400>\u4e03\u4e03<400>abc<200> •</data>
-<data>•\u06c9<200>\uc799<200>\ufffa•</data>
+<data>•\u06c9<200>\uc799\ufffa•</data>
#
@@ -538,7 +539,8 @@
# Surrogate line break tests.
#
-<data>•\u4e01•\ud840\udc01•\u4e02•abc •\ue000 •\udb80\udc01•</data>
+<data>•\u4e01•\ud840\udc01•\u4e02•abc •\ue000 •\udb80\udc01•</data> #This line and the following are equivalent.
+<data>•\u4e01•\U00020001•\u4e02•abc •\ue000 •\U000f0001•</data>
# Regression for bug 836
# Note: Unicode 5.1 changed this behavior
@@ -817,6 +819,9 @@
<locale fi>
<line>
-<data>•abc •- •def •abc •-def •abc- •def •abc-•def•</data> # With ASCII hyphen
-<data>•abc •‐ •def •abc •‐def •abc‐ •def •abc‐•def•</data> # With Unicode u2010 hyphen
+# TODO: problems with Finnish line break rules cause these two lines to fail.
+#<data>•abc •- •def •abc •-def •abc- •def •abc-•def•</data> # With ASCII hyphen
+#<data>•abc •‐ •def •abc •‐def •abc‐ •def •abc‐•def•</data> # With Unicode u2010 hyphen
+<data>•abc •- •def •abc •-def •abc- •def •</data> # With ASCII hyphen
+<data>•abc •‐ •def •abc •‐def •abc‐ •def •</data> # With Unicode u2010 hyphen
diff --git a/test/testdata/root.txt b/test/testdata/root.txt
index 13b311a..42542a1 100644
--- a/test/testdata/root.txt
+++ b/test/testdata/root.txt
@@ -1,6 +1,6 @@
//*******************************************************************************
//*
-//* Copyright (C) 1998-2012, International Business Machines
+//* Copyright (C) 1998-2013, International Business Machines
//* Corporation and others. All Rights Reserved.
//*
//*******************************************************************************
@@ -11,8 +11,8 @@
root
{
Version { 44.0 }
- ExpectCLDRVersionAtLeast { 22.1 } // 'base' cldr version. Allow up to version =.=.* of this
- CurrentCLDRVersion { 22.1.1 } // Current CLDR version as of the test update. Warn if not an exact match.
+ ExpectCLDRVersionAtLeast { 23.0 } // 'base' cldr version. Allow up to version =.=.* of this
+ CurrentCLDRVersion { 23.0 } // Current CLDR version as of the test update. Warn if not an exact match.
ShortLanguage { xxx }
diff --git a/test/testdata/structLocale.txt b/test/testdata/structLocale.txt
index a1d3be5..322ab91 100644
--- a/test/testdata/structLocale.txt
+++ b/test/testdata/structLocale.txt
@@ -1,6 +1,6 @@
// ***************************************************************************
// *
-// * Copyright (C) 2004-2012 International Business Machines
+// * Copyright (C) 2004-2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// *
// ***************************************************************************
@@ -54,7 +54,6 @@
AI{""}
AL{""}
AM{""}
- AN{""}
AO{""}
AQ{""}
AR{""}
@@ -77,6 +76,7 @@
BM{""}
BN{""}
BO{""}
+ BQ{""}
BR{""}
BS{""}
BT{""}
@@ -100,6 +100,7 @@
CS{""}
CU{""}
CV{""}
+ CW{""}
CX{""}
CY{""}
CZ{""}
@@ -256,8 +257,10 @@
SN{""}
SO{""}
SR{""}
+ SS{""}
ST{""}
SV{""}
+ SX{""}
SY{""}
SZ{""}
TC{""}
@@ -1207,6 +1210,10 @@
"",
"",
}
+ SSP{
+ "",
+ "",
+ }
STD{
"",
"",
@@ -1415,6 +1422,14 @@
"",
"",
}
+ XSU{
+ "",
+ "",
+ }
+ XUA{
+ "",
+ "",
+ }
XTS{
"",
"",
@@ -1459,6 +1474,10 @@
"",
"",
}
+ ZMW{
+ "",
+ "",
+ }
ZRN{
"",
"",
@@ -3896,6 +3915,100 @@
alternateQuotationEnd{""}
alternateQuotationStart{""}
}
+ fields{
+ day{
+ dn{"Day"}
+ relative{
+ "-3"{""}
+ "-2"{""}
+ "-1"{""}
+ "0"{""}
+ "1"{""}
+ "2"{""}
+ "3"{""}
+ }
+ }
+ dayperiod{
+ dn{"Dayperiod"}
+ relative{
+ "-1"{""}
+ "0"{""}
+ "1"{""}
+ }
+ }
+ era{
+ dn{"Era"}
+ relative{
+ "-1"{""}
+ "0"{""}
+ "1"{""}
+ }
+ }
+ hour{
+ dn{"Hour"}
+ relative{
+ "-1"{""}
+ "0"{""}
+ "1"{""}
+ }
+ }
+ minute{
+ dn{"Minute"}
+ relative{
+ "-1"{""}
+ "0"{""}
+ "1"{""}
+ }
+ }
+ month{
+ dn{"Month"}
+ relative{
+ "-1"{""}
+ "0"{""}
+ "1"{""}
+ }
+ }
+ second{
+ dn{"Second"}
+ relative{
+ "-1"{""}
+ "0"{""}
+ "1"{""}
+ }
+ }
+ week{
+ dn{"Week"}
+ relative{
+ "-1"{""}
+ "0"{""}
+ "1"{""}
+ }
+ }
+ weekday{
+ dn{"Day of the Week"}
+ relative{
+ "-1"{""}
+ "0"{""}
+ "1"{""}
+ }
+ }
+ year{
+ dn{"Year"}
+ relative{
+ "-1"{""}
+ "0"{""}
+ "1"{""}
+ }
+ }
+ zone{
+ dn{"Zone"}
+ relative{
+ "-1"{""}
+ "0"{""}
+ "1"{""}
+ }
+ }
+ }
CurrencyUnitPatterns{
zero{""}
one{""}
@@ -3960,17 +4073,21 @@
ban{""}
bas{""}
bat{""}
+ bax{""}
+ bbj{""}
be{""}
bej{""}
bem{""}
ber{""}
bez{""}
+ bfd{""}
bg{""}
bh{""}
bho{""}
bi{""}
bik{""}
bin{""}
+ bkm{""}
bla{""}
bm{""}
bn{""}
@@ -3980,15 +4097,19 @@
bra{""}
brx{""}
bs{""}
+ bss{""}
btk{""}
bua{""}
bug{""}
+ bum{""}
byn{""}
+ byv{""}
ca{""}
cad{""}
cai{""}
car{""}
cau{""}
+ cay{""}
cch{""}
ce{""}
ceb{""}
@@ -4004,6 +4125,7 @@
chp{""}
chr{""}
chy{""}
+ ckb{""}
cmc{""}
co{""}
cop{""}
@@ -4041,6 +4163,7 @@
dyo{""}
dyu{""}
dz{""}
+ dzg{""}
ebu{""}
ee{""}
efi{""}
@@ -4082,7 +4205,6 @@
fy{""}
ga{""}
gaa{""}
- gan{""}
gay{""}
gba{""}
gd{""}
@@ -4105,7 +4227,6 @@
gwi{""}
ha{""}
hai{""}
- hak{""}
haw{""}
he{""}
hi{""}
@@ -4116,7 +4237,6 @@
ho{""}
hr{""}
hsb{""}
- hsn{""}
ht{""}
hu{""}
hup{""}
@@ -4124,6 +4244,7 @@
hz{""}
ia{""}
iba{""}
+ ibb{""}
id{""}
ie{""}
ig{""}
@@ -4156,6 +4277,7 @@
kar{""}
kaw{""}
kbd{""}
+ kbl{""}
kcg{""}
kde{""}
kea{""}
@@ -4168,6 +4290,7 @@
ki{""}
kj{""}
kk{""}
+ kkj{""}
kl{""}
kln{""}
km{""}
@@ -4185,6 +4308,7 @@
ks{""}
ksb{""}
ksf{""}
+ ksh{""}
ku{""}
kum{""}
kut{""}
@@ -4200,6 +4324,7 @@
lez{""}
lg{""}
li{""}
+ lkt{""}
ln{""}
lo{""}
lol{""}
@@ -4214,12 +4339,14 @@
luy{""}
lv{""}
mad{""}
+ maf{""}
mag{""}
mai{""}
mak{""}
man{""}
map{""}
mas{""}
+ mde{""}
mdf{""}
mdr{""}
men{""}
@@ -4254,12 +4381,12 @@
mwl{""}
mwr{""}
my{""}
+ mye{""}
myn{""}
myv{""}
na{""}
nah{""}
nai{""}
- nan{""}
nap{""}
naq{""}
nb{""}
@@ -4275,12 +4402,13 @@
nl_BE{""}
nmg{""}
nn{""}
+ nnh{""}
no{""}
nog{""}
non{""}
+ nqo{""}
nr{""}
nso{""}
- nqo{""}
nub{""}
nus{""}
nv{""}
@@ -4341,12 +4469,14 @@
saq{""}
sas{""}
sat{""}
+ sba{""}
sbp{""}
sc{""}
scn{""}
sco{""}
sd{""}
se{""}
+ see{""}
seh{""}
sel{""}
sem{""}
@@ -4357,6 +4487,7 @@
sh{""}
shi{""}
shn{""}
+ shu{""}
si{""}
sid{""}
sio{""}
@@ -4381,6 +4512,7 @@
srr{""}
ss{""}
ssa{""}
+ ssy{""}
st{""}
su{""}
suk{""}
@@ -4388,6 +4520,7 @@
sux{""}
sv{""}
sw{""}
+ swb{""}
swc{""}
syc{""}
syr{""}
@@ -4442,19 +4575,20 @@
vot{""}
vun{""}
wa{""}
+ wae{""}
wak{""}
wal{""}
war{""}
was{""}
wen{""}
wo{""}
- wuu{""}
xal{""}
xh{""}
xog{""}
yao{""}
yap{""}
yav{""}
+ ybb{""}
yi{""}
yo{""}
ypk{""}
@@ -12763,6 +12897,10 @@
M{""}
d{""}
}
+ MMMEEEEd{
+ M{""}
+ d{""}
+ }
MMMM{
M{""}
}
@@ -13006,6 +13144,10 @@
M{""}
d{""}
}
+ MMMEEEEd{
+ M{""}
+ d{""}
+ }
MMMM{
M{""}
}
@@ -13266,6 +13408,10 @@
M{""}
d{""}
}
+ MMMEEEEd{
+ M{""}
+ d{""}
+ }
MMMM{
M{""}
}
@@ -13503,6 +13649,10 @@
M{""}
d{""}
}
+ MMMEEEEd{
+ M{""}
+ d{""}
+ }
MMMM{
M{""}
}
@@ -13676,6 +13826,285 @@
}
}
}
+ generic{
+ AmPmMarkers{
+ "",
+ "",
+ }
+ DateTimePatterns{
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "A4",
+ "A4",
+ "A4",
+ "A4",
+ }
+ appendItems{
+ Day{"{0} ({2}: {1})"}
+ Day-Of-Week{"{0} {1}"}
+ Era{"{1} {0}"}
+ Hour{"{0} ({2}: {1})"}
+ Minute{"{0} ({2}: {1})"}
+ Month{"{0} ({2}: {1})"}
+ Quarter{"{0} ({2}: {1})"}
+ Second{"{0} ({2}: {1})"}
+ Timezone{"{0} {1}"}
+ Week{"{0} ({2}: {1})"}
+ Year{"{1} {0}"}
+ }
+ availableFormats{
+ HHmm{""}
+ HHmmss{""}
+ KKmm{"KK:mm a"}
+ KKmmss{"KK:mm:ss a"}
+ MMMM{""}
+ MMMdd{""}
+ mmssSS{""}
+ ww{""}
+ yyMM{""}
+ yyMMMEEEd{""}
+ yyMMMd{""}
+ yyMd{""}
+ yyQQQQ{""}
+ }
+ dayNames{
+ default{""}
+ format{
+ abbreviated{
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ }
+ default{""}
+ narrow{
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ }
+ short{
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ }
+ wide{
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ }
+ }
+ stand-alone{
+ abbreviated{
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ }
+ default{""}
+ narrow{
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ }
+ short{
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ }
+ wide{
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ }
+ }
+ }
+ intervalFormats{
+ H{
+ H{""}
+ }
+ Hm{
+ H{""}
+ m{""}
+ }
+ Hmv{
+ H{""}
+ m{""}
+ }
+ Hv{
+ H{""}
+ }
+ M{
+ M{""}
+ }
+ MEd{
+ M{""}
+ d{""}
+ }
+ MMM{
+ M{""}
+ }
+ MMMEd{
+ M{""}
+ d{""}
+ }
+ MMMEEEEd{
+ M{""}
+ d{""}
+ }
+ MMMM{
+ M{""}
+ }
+ MMMd{
+ M{""}
+ d{""}
+ }
+ Md{
+ M{""}
+ d{""}
+ }
+ d{
+ d{""}
+ }
+ fallback{""}
+ h{
+ a{""}
+ h{""}
+ }
+ hm{
+ a{""}
+ h{""}
+ m{""}
+ }
+ hmv{
+ a{""}
+ h{""}
+ m{""}
+ }
+ hv{
+ a{""}
+ h{""}
+ }
+ y{
+ y{""}
+ }
+ yM{
+ M{""}
+ y{""}
+ }
+ yMEd{
+ M{""}
+ d{""}
+ y{""}
+ }
+ yMMM{
+ M{""}
+ y{""}
+ }
+ yMMMEEEEd{
+ M{""}
+ d{""}
+ y{""}
+ }
+ yMMMEd{
+ M{""}
+ d{""}
+ y{""}
+ }
+ yMMMM{
+ M{""}
+ y{""}
+ }
+ yMMMd{
+ M{""}
+ d{""}
+ y{""}
+ }
+ yMd{
+ M{""}
+ d{""}
+ y{""}
+ }
+ }
+ quarters{
+ format{
+ abbreviated{
+ "",
+ "",
+ "",
+ "",
+ }
+ wide{
+ "",
+ "",
+ "",
+ "",
+ }
+ narrow{
+ "",
+ "",
+ "",
+ "",
+ }
+ }
+ stand-alone{
+ abbreviated{
+ "",
+ "",
+ "",
+ "",
+ }
+ wide{
+ "",
+ "",
+ "",
+ "",
+ }
+ narrow{
+ "",
+ "",
+ "",
+ "",
+ }
+ }
+ }
+ }
gregorian{
AmPmMarkers{
"",
@@ -13823,100 +14252,6 @@
""
}
}
- fields{
- day{
- dn{"Day"}
- relative{
- "-3"{""}
- "-2"{""}
- "-1"{""}
- "0"{""}
- "1"{""}
- "2"{""}
- "3"{""}
- }
- }
- dayperiod{
- dn{"Dayperiod"}
- relative{
- "-1"{""}
- "0"{""}
- "1"{""}
- }
- }
- era{
- dn{"Era"}
- relative{
- "-1"{""}
- "0"{""}
- "1"{""}
- }
- }
- hour{
- dn{"Hour"}
- relative{
- "-1"{""}
- "0"{""}
- "1"{""}
- }
- }
- minute{
- dn{"Minute"}
- relative{
- "-1"{""}
- "0"{""}
- "1"{""}
- }
- }
- month{
- dn{"Month"}
- relative{
- "-1"{""}
- "0"{""}
- "1"{""}
- }
- }
- second{
- dn{"Second"}
- relative{
- "-1"{""}
- "0"{""}
- "1"{""}
- }
- }
- week{
- dn{"Week"}
- relative{
- "-1"{""}
- "0"{""}
- "1"{""}
- }
- }
- weekday{
- dn{"Day of the Week"}
- relative{
- "-1"{""}
- "0"{""}
- "1"{""}
- }
- }
- year{
- dn{"Year"}
- relative{
- "-1"{""}
- "0"{""}
- "1"{""}
- }
- }
- zone{
- dn{"Zone"}
- relative{
- "-1"{""}
- "0"{""}
- "1"{""}
- }
- }
- }
intervalFormats{
H{
H{""}
@@ -13946,6 +14281,10 @@
M{""}
d{""}
}
+ MMMEEEEd{
+ M{""}
+ d{""}
+ }
MMMM{
M{""}
}
@@ -14237,6 +14576,10 @@
M{""}
d{""}
}
+ MMMEEEEd{
+ M{""}
+ d{""}
+ }
MMMM{
M{""}
}
@@ -14492,6 +14835,10 @@
M{""}
d{""}
}
+ MMMEEEEd{
+ M{""}
+ d{""}
+ }
MMMM{
M{""}
}
@@ -14739,6 +15086,10 @@
M{""}
d{""}
}
+ MMMEEEEd{
+ M{""}
+ d{""}
+ }
MMMM{
M{""}
}
@@ -14986,6 +15337,10 @@
M{""}
d{""}
}
+ MMMEEEEd{
+ M{""}
+ d{""}
+ }
MMMM{
M{""}
}
@@ -15985,6 +16340,10 @@
M{""}
d{""}
}
+ MMMEEEEd{
+ M{""}
+ d{""}
+ }
MMMM{
M{""}
}
diff --git a/test/testdata/test3.ucm b/test/testdata/test3.ucm
index aee69c2..57a7984 100644
--- a/test/testdata/test3.ucm
+++ b/test/testdata/test3.ucm
@@ -1,5 +1,5 @@
# *******************************************************************************
-# * Copyright (C) 2001-2003, International Business Machines
+# * Copyright (C) 2001-2013, International Business Machines
# * Corporation and others. All Rights Reserved.
# *******************************************************************************
#
@@ -15,7 +15,7 @@
<subchar> \xff
<icu:state> 0, 1:1, 5-9, ff
<icu:state> 2:2
-<icu:state> a-f.p
+<icu:state> 4, a-f.p
CHARMAP
@@ -57,4 +57,9 @@
<U000e> \x01\x02\x0e |3
#unassigned \x01\x02\x0f
+# "good one-way" mappings
+<U0023> \x01\x02\x04 |4
+<U0023>+<UFE0E> \x01\x02\x04 |4
+<U0023>+<UFE0F> \x01\x02\x04 |0
+
END CHARMAP
diff --git a/test/testmap/Makefile.in b/test/testmap/Makefile.in
index 2bf2b68..638d31a 100644
--- a/test/testmap/Makefile.in
+++ b/test/testmap/Makefile.in
@@ -1,5 +1,5 @@
## Makefile.in for ICU - test/testmap
-## Copyright (c) 2003-2011, International Business Machines Corporation and
+## Copyright (c) 2003-2012, International Business Machines Corporation and
## others. All Rights Reserved.
## Source directory information
@@ -20,7 +20,7 @@
TARGET = testmap$(EXEEXT)
#DEFS = @DEFS@
-CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n
+CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n $(SHAREDLIBCPPFLAGS) $(SHAREDLIBCFLAGS)
#CFLAGS += @CFLAGS@
#CXXFLAGS = @CXXFLAGS@
@@ -66,7 +66,7 @@
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
$(TARGET) : $(OBJECTS)
- $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
+ $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) $(CFLAGS) $(SHAREDLIBCFLAGS)
$(POST_BUILD_STEP)
ifeq (,$(MAKECMDGOALS))
diff --git a/test/testmap/readme.txt b/test/testmap/readme.txt
new file mode 100644
index 0000000..587d6c4
--- /dev/null
+++ b/test/testmap/readme.txt
@@ -0,0 +1,10 @@
+# Copyright (C) 2012 IBM Corporation and Others. All Rights Reserved.
+
+This test may be tested on a linux machine like so:
+
+ $ env XTRA_OPTS='-fPIC' icurun -i /path/to/icu-build testmap.c
+
+Where /path/to/icu-build is the path to an ICU build dir
+
+And where icurun is from : http://source.icu-project.org/repos/icu/tools/trunk/scripts/icurun
+
diff --git a/test/testmap/testmap.c b/test/testmap/testmap.c
index 395685b..439252b 100644
--- a/test/testmap/testmap.c
+++ b/test/testmap/testmap.c
@@ -1,6 +1,6 @@
/*
**********************************************************************
-* Copyright (C) 1998-2010, International Business Machines Corporation
+* Copyright (C) 1998-2012, International Business Machines Corporation
* and others. All Rights Reserved.
**********************************************************************
*
@@ -18,8 +18,9 @@
#include <string.h>
#include "unicode/udata.h"
#include "unicode/ucnv.h"
+#include "ucmndata.h"
-extern const char U_IMPORT U_ICUDATA_ENTRY_POINT [];
+extern const DataHeader U_DATA_API U_ICUDATA_ENTRY_POINT;
int
main(int argc,
@@ -37,8 +38,8 @@
}
status = U_ZERO_ERROR;
- udata_setCommonData(U_ICUDATA_ENTRY_POINT, &status);
- printf("setCommonData(%p) -> %s\n", U_ICUDATA_ENTRY_POINT, u_errorName(status));
+ udata_setCommonData(&U_ICUDATA_ENTRY_POINT, &status);
+ printf("setCommonData(%p) -> %s\n", (void*)&U_ICUDATA_ENTRY_POINT, u_errorName(status));
if(U_FAILURE(status))
{
printf("*** FAIL: should have returned U_ZERO_ERROR\n");
@@ -46,8 +47,8 @@
}
status = U_ZERO_ERROR;
- c = ucnv_open("iso-8859-7", &status);
- printf("ucnv_open(iso-8859-7)-> %p, err = %s, name=%s\n",
+ c = ucnv_open("iso-8859-3", &status);
+ printf("ucnv_open(iso-8859-3)-> %p, err = %s, name=%s\n",
(void *)c, u_errorName(status), (!c)?"?":ucnv_getName(c,&status) );
if(status != U_ZERO_ERROR)
{
@@ -60,8 +61,8 @@
}
status = U_ZERO_ERROR;
- udata_setCommonData(U_ICUDATA_ENTRY_POINT, &status);
- printf("setCommonData(%p) -> %s [should pass]\n", U_ICUDATA_ENTRY_POINT, u_errorName(status));
+ udata_setCommonData(&U_ICUDATA_ENTRY_POINT, &status);
+ printf("setCommonData(%p) -> %s [should pass]\n", (void*) &U_ICUDATA_ENTRY_POINT, u_errorName(status));
if (U_FAILURE(status) || status == U_USING_DEFAULT_WARNING )
{
printf("\n*** FAIL: should pass and not set U_USING_DEFAULT_ERROR\n");
diff --git a/tools/ctestfw/ctestfw.vcxproj b/tools/ctestfw/ctestfw.vcxproj
index 7bbb297..8c045f3 100644
--- a/tools/ctestfw/ctestfw.vcxproj
+++ b/tools/ctestfw/ctestfw.vcxproj
@@ -107,7 +107,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <OutputFile>..\..\..\bin\icutest50.dll</OutputFile>
+ <OutputFile>..\..\..\bin\icutest51.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\..\lib\icutest.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -150,7 +150,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <OutputFile>..\..\..\bin\icutest50d.dll</OutputFile>
+ <OutputFile>..\..\..\bin\icutest51d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\..\lib\icutestd.pdb</ProgramDatabaseFile>
@@ -190,7 +190,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <OutputFile>..\..\..\bin64\icutest50.dll</OutputFile>
+ <OutputFile>..\..\..\bin64\icutest51.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\..\lib64\icutest.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -231,7 +231,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <OutputFile>..\..\..\bin64\icutest50d.dll</OutputFile>
+ <OutputFile>..\..\..\bin64\icutest51d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\..\lib64\icutestd.pdb</ProgramDatabaseFile>
@@ -280,4 +280,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
diff --git a/tools/genrb/derb.c b/tools/genrb/derb.c
index 2a48d98..4aff26e 100644
--- a/tools/genrb/derb.c
+++ b/tools/genrb/derb.c
@@ -54,7 +54,7 @@
static const int32_t indentsize = 4;
static int32_t truncsize = DERB_DEFAULT_TRUNC;
-static UBool truncate = FALSE;
+static UBool opt_truncate = FALSE;
static const char *getEncodingName(const char *encoding);
static void reportError(const char *pname, UErrorCode *status, const char *when);
@@ -152,14 +152,14 @@
}
if(options[4].doesOccur) {
- truncate = TRUE;
+ opt_truncate = TRUE;
if(options[4].value != NULL) {
truncsize = atoi(options[4].value); /* user defined printable size */
} else {
truncsize = DERB_DEFAULT_TRUNC; /* we'll use default omitting size */
}
} else {
- truncate = FALSE;
+ opt_truncate = FALSE;
}
if(options[5].doesOccur) {
@@ -473,7 +473,7 @@
int32_t len = 0;
const UChar* thestr = res_getAlias(&(parent->fResData), r, &len);
UChar *string = quotedString(thestr);
- if(truncate && len > truncsize) {
+ if(opt_truncate && len > truncsize) {
char msg[128];
printIndent(out, converter, indent);
sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
@@ -517,7 +517,7 @@
UChar *string = quotedString(thestr);
/* TODO: String truncation */
- if(truncate && len > truncsize) {
+ if(opt_truncate && len > truncsize) {
char msg[128];
printIndent(out, converter, indent);
sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
@@ -576,7 +576,7 @@
{
int32_t len = 0;
const int8_t *data = (const int8_t *)ures_getBinary(resource, &len, status);
- if(truncate && len > truncsize) {
+ if(opt_truncate && len > truncsize) {
char msg[128];
printIndent(out, converter, indent);
sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
diff --git a/tools/genrb/parse.cpp b/tools/genrb/parse.cpp
index 082b5f1..5546411 100644
--- a/tools/genrb/parse.cpp
+++ b/tools/genrb/parse.cpp
@@ -1790,7 +1790,6 @@
U_STRING_DECL(k_type_intvector, "intvector", 9);
U_STRING_DECL(k_type_import, "import", 6);
U_STRING_DECL(k_type_include, "include", 7);
-U_STRING_DECL(k_type_reserved, "reserved", 8);
/* Various non-standard processing plugins that create one or more special resources. */
U_STRING_DECL(k_type_plugin_uca_rules, "process(uca_rules)", 18);
@@ -1854,7 +1853,6 @@
U_STRING_INIT(k_type_alias, "alias", 5);
U_STRING_INIT(k_type_intvector, "intvector", 9);
U_STRING_INIT(k_type_import, "import", 6);
- U_STRING_INIT(k_type_reserved, "reserved", 8);
U_STRING_INIT(k_type_include, "include", 7);
U_STRING_INIT(k_type_plugin_uca_rules, "process(uca_rules)", 18);
diff --git a/tools/icupkg/icupkg.cpp b/tools/icupkg/icupkg.cpp
index 4ae7ac4..bba2658 100644
--- a/tools/icupkg/icupkg.cpp
+++ b/tools/icupkg/icupkg.cpp
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 2005-2012, International Business Machines
+* Copyright (C) 2005-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -118,6 +118,30 @@
"\t-m mode or --matchmode mode set the matching mode for item names with\n"
"\t wildcards\n"
"\t noslash: the '*' wildcard does not match the '/' tree separator\n");
+ fprintf(where,
+ "\n"
+ "\tIn the .dat package, the Table of Contents (ToC) contains an entry\n"
+ "\tfor each item of the form prefix/tree/itemname .\n"
+ "\tThe prefix normally matches the package basename, and icupkg checks that,\n"
+ "\tbut this is not necessary when ICU need not find and load the package by filename.\n"
+ "\tICU package names end with the platform type letter, and thus differ\n"
+ "\tbetween platform types. This is not required for user data packages.\n");
+ fprintf(where,
+ "\n"
+ "\t--auto_toc_prefix automatic ToC entries prefix\n"
+ "\t Uses the prefix of the first entry of the\n"
+ "\t input package, rather than its basename.\n"
+ "\t Requires a non-empty input package.\n"
+ "\t--auto_toc_prefix_with_type auto_toc_prefix + adjust platform type\n"
+ "\t Same as auto_toc_prefix but also checks that\n"
+ "\t the prefix ends with the input platform\n"
+ "\t type letter, and modifies it to the output\n"
+ "\t platform type letter.\n"
+ "\t At most one of the auto_toc_prefix options\n"
+ "\t can be used at a time.\n"
+ "\t--toc_prefix prefix ToC prefix to be used in the output package\n"
+ "\t Overrides the package basename\n"
+ "\t and --auto_toc_prefix.\n");
/*
* Usage text columns, starting after the initial TAB.
* 1 2 3 4 5 6 7 8
@@ -150,8 +174,10 @@
"\t-s path or --sourcedir path directory for the --add items\n"
"\t-d path or --destdir path directory for the --extract items\n"
"\n"
- "\t-l or --list list the package items to stdout or to output list file\n"
- "\t (after modifying the package)\n");
+ "\t-l or --list list the package items\n"
+ "\t (after modifying the package)\n"
+ "\t to stdout or to output list file\n"
+ "\t-o path or --outlist path path/filename for the --list output\n");
}
}
@@ -175,8 +201,11 @@
UOPTION_DEF("extract", 'x', UOPT_REQUIRES_ARG),
UOPTION_DEF("list", 'l', UOPT_NO_ARG),
-
- UOPTION_DEF("outlist", 'o', UOPT_REQUIRES_ARG)
+ UOPTION_DEF("outlist", 'o', UOPT_REQUIRES_ARG),
+
+ UOPTION_DEF("auto_toc_prefix", '\1', UOPT_NO_ARG),
+ UOPTION_DEF("auto_toc_prefix_with_type", '\1', UOPT_NO_ARG),
+ UOPTION_DEF("toc_prefix", '\1', UOPT_REQUIRES_ARG)
};
enum {
@@ -199,9 +228,12 @@
OPT_EXTRACT_LIST,
OPT_LIST_ITEMS,
-
OPT_LIST_FILE,
+ OPT_AUTO_TOC_PREFIX,
+ OPT_AUTO_TOC_PREFIX_WITH_TYPE,
+ OPT_TOC_PREFIX,
+
OPT_COUNT
};
@@ -238,10 +270,6 @@
printUsage(pname, TRUE);
return U_ZERO_ERROR;
}
- if(argc<2 || 3<argc) {
- printUsage(pname, FALSE);
- return U_ILLEGAL_ARGUMENT_ERROR;
- }
pkg=new Package;
if(pkg==NULL) {
@@ -250,6 +278,25 @@
}
isModified=FALSE;
+ int autoPrefix=0;
+ if(options[OPT_AUTO_TOC_PREFIX].doesOccur) {
+ pkg->setAutoPrefix();
+ ++autoPrefix;
+ }
+ if(options[OPT_AUTO_TOC_PREFIX_WITH_TYPE].doesOccur) {
+ if(options[OPT_TOC_PREFIX].doesOccur) {
+ fprintf(stderr, "icupkg: --auto_toc_prefix_with_type and also --toc_prefix\n");
+ printUsage(pname, FALSE);
+ return U_ILLEGAL_ARGUMENT_ERROR;
+ }
+ pkg->setAutoPrefixWithType();
+ ++autoPrefix;
+ }
+ if(argc<2 || 3<argc || autoPrefix>1) {
+ printUsage(pname, FALSE);
+ return U_ILLEGAL_ARGUMENT_ERROR;
+ }
+
if(options[OPT_SOURCEDIR].doesOccur) {
sourcePath=options[OPT_SOURCEDIR].value;
} else {
@@ -264,6 +311,11 @@
}
if(0==strcmp(argv[1], "new")) {
+ if(autoPrefix) {
+ fprintf(stderr, "icupkg: --auto_toc_prefix[_with_type] but no input package\n");
+ printUsage(pname, FALSE);
+ return U_ILLEGAL_ARGUMENT_ERROR;
+ }
inFilename=NULL;
isPackage=TRUE;
} else {
@@ -479,6 +531,9 @@
}
outFilename=outFilenameBuffer;
}
+ if(options[OPT_TOC_PREFIX].doesOccur) {
+ pkg->setPrefix(options[OPT_TOC_PREFIX].value);
+ }
result = writePackageDatFile(outFilename, outComment, NULL, NULL, pkg, outType);
}
diff --git a/tools/makeconv/gencnvex.c b/tools/makeconv/gencnvex.c
index 3b97e0c..10a0571 100644
--- a/tools/makeconv/gencnvex.c
+++ b/tools/makeconv/gencnvex.c
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 2003-2012, International Business Machines
+* Copyright (C) 2003-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -606,7 +606,7 @@
flag&=MBCS_FROM_U_EXT_MASK;
m->f=flag;
}
- if(flag==0 || flag==1 || (flag==2 && m->bLen==1)) {
+ if(flag==0 || flag==1 || (flag==2 && m->bLen==1) || flag==4) {
map[j++]=i;
if(m->uLen>1) {
@@ -672,6 +672,8 @@
value|=(uint32_t)m->bLen<<UCNV_EXT_FROM_U_LENGTH_SHIFT;
if(m->f==0) {
value|=UCNV_EXT_FROM_U_ROUNDTRIP_FLAG;
+ } else if(m->f==4) {
+ value|=UCNV_EXT_FROM_U_GOOD_ONE_WAY_FLAG;
}
/* calculate the real UTF-16 length (see recoding in prepareFromUMappings()) */
diff --git a/tools/makeconv/genmbcs.cpp b/tools/makeconv/genmbcs.cpp
index 556d813..e3c78de 100644
--- a/tools/makeconv/genmbcs.cpp
+++ b/tools/makeconv/genmbcs.cpp
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 2000-2012, International Business Machines
+* Copyright (C) 2000-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -1049,6 +1049,11 @@
staticData->hasToUnicodeFallback=TRUE;
isOK&=MBCSAddToUnicode(mbcsData, m->b.bytes, m->bLen, c, f);
break;
+ case 4:
+ /* move "good one-way" mappings to the extension table */
+ m->f|=MBCS_FROM_U_EXT_FLAG;
+ m->moveFlag=UCM_MOVE_TO_EXT;
+ break;
default:
/* will not occur because the parser checked it already */
fprintf(stderr, "error: illegal fallback indicator %d\n", f);
@@ -1494,7 +1499,7 @@
header.version[0]=4;
headerLength=MBCS_HEADER_V4_LENGTH; /* 8 */
}
- header.version[1]=3;
+ header.version[1]=4;
/* header.version[2] set above for utf8Friendly data */
header.options|=(uint32_t)headerLength;
diff --git a/tools/pkgdata/pkgdata.cpp b/tools/pkgdata/pkgdata.cpp
index acc2a60..f33a639 100644
--- a/tools/pkgdata/pkgdata.cpp
+++ b/tools/pkgdata/pkgdata.cpp
@@ -1,5 +1,5 @@
/******************************************************************************
- * Copyright (C) 2000-2012, International Business Machines
+ * Copyright (C) 2000-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
* file name: pkgdata.cpp
@@ -1864,9 +1864,12 @@
}
/* remove spaces at the beginning */
linePtr = line;
+ /* On z/OS, disable call to isspace (#9996). Investigate using uprv_isspace instead (#9999) */
+#if U_PLATFORM != U_PF_OS390
while(isspace(*linePtr)) {
linePtr++;
}
+#endif
s=linePtr;
/* remove trailing newline characters */
while(*s!=0) {
diff --git a/tools/toolutil/package.cpp b/tools/toolutil/package.cpp
index a6ed246..d7c0a50 100644
--- a/tools/toolutil/package.cpp
+++ b/tools/toolutil/package.cpp
@@ -384,8 +384,10 @@
U_NAMESPACE_BEGIN
-Package::Package() {
+Package::Package()
+ : doAutoPrefix(FALSE), prefixEndsWithType(FALSE) {
inPkgName[0]=0;
+ pkgPrefix[0]=0;
inData=NULL;
inLength=0;
inCharset=U_CHARSET_FAMILY;
@@ -433,6 +435,15 @@
}
void
+Package::setPrefix(const char *p) {
+ if(strlen(p)>=sizeof(pkgPrefix)) {
+ fprintf(stderr, "icupkg: --toc_prefix %s too long\n", p);
+ exit(U_ILLEGAL_ARGUMENT_ERROR);
+ }
+ strcpy(pkgPrefix, p);
+}
+
+void
Package::readPackage(const char *filename) {
UDataSwapper *ds;
const UDataInfo *pInfo;
@@ -523,10 +534,14 @@
}
/* do not modify the package length variable until the last item's length is set */
- if(itemCount>0) {
+ if(itemCount<=0) {
+ if(doAutoPrefix) {
+ fprintf(stderr, "icupkg: --auto_toc_prefix[_with_type] but the input package is empty\n");
+ exit(U_INVALID_FORMAT_ERROR);
+ }
+ } else {
char prefix[MAX_PKG_NAME_LENGTH+4];
char *s, *inItemStrings;
- int32_t inPkgNameLength, prefixLength, stringsOffset;
if(itemCount>itemMax) {
fprintf(stderr, "icupkg: too many items, maximum is %d\n", itemMax);
@@ -534,7 +549,7 @@
}
/* swap the item name strings */
- stringsOffset=4+8*itemCount;
+ int32_t stringsOffset=4+8*itemCount;
itemLength=(int32_t)(ds->readUInt32(inEntries[0].dataOffset))-stringsOffset;
// don't include padding bytes at the end of the item names
@@ -558,10 +573,6 @@
// reset the Item entries
memset(items, 0, itemCount*sizeof(Item));
- inPkgNameLength=strlen(inPkgName);
- memcpy(prefix, inPkgName, inPkgNameLength);
- prefixLength=inPkgNameLength;
-
/*
* Get the common prefix of the items.
* New-style ICU .dat packages use tree separators ('/') between package names,
@@ -570,18 +581,53 @@
* use an underscore ('_') between package and item names.
*/
offset=(int32_t)ds->readUInt32(inEntries[0].nameOffset)-stringsOffset;
- s=inItemStrings+offset;
- if( (int32_t)strlen(s)>=(inPkgNameLength+2) &&
- 0==memcmp(s, inPkgName, inPkgNameLength) &&
- s[inPkgNameLength]=='_'
- ) {
- // old-style .dat package
- prefix[prefixLength++]='_';
+ s=inItemStrings+offset; // name of the first entry
+ int32_t prefixLength;
+ if(doAutoPrefix) {
+ // Use the first entry's prefix. Must be a new-style package.
+ const char *prefixLimit=strchr(s, U_TREE_ENTRY_SEP_CHAR);
+ if(prefixLimit==NULL) {
+ fprintf(stderr,
+ "icupkg: --auto_toc_prefix[_with_type] but "
+ "the first entry \"%s\" does not contain a '%c'\n",
+ s, U_TREE_ENTRY_SEP_CHAR);
+ exit(U_INVALID_FORMAT_ERROR);
+ }
+ prefixLength=(int32_t)(prefixLimit-s);
+ if(prefixLength==0 || prefixLength>=LENGTHOF(pkgPrefix)) {
+ fprintf(stderr,
+ "icupkg: --auto_toc_prefix[_with_type] but "
+ "the prefix of the first entry \"%s\" is empty or too long\n",
+ s);
+ exit(U_INVALID_FORMAT_ERROR);
+ }
+ if(prefixEndsWithType && s[prefixLength-1]!=type) {
+ fprintf(stderr,
+ "icupkg: --auto_toc_prefix_with_type but "
+ "the prefix of the first entry \"%s\" does not end with '%c'\n",
+ s, type);
+ exit(U_INVALID_FORMAT_ERROR);
+ }
+ memcpy(pkgPrefix, s, prefixLength);
+ memcpy(prefix, s, ++prefixLength); // include the /
} else {
- // new-style .dat package
- prefix[prefixLength++]=U_TREE_ENTRY_SEP_CHAR;
- // if it turns out to not contain U_TREE_ENTRY_SEP_CHAR
- // then the test in the loop below will fail
+ // Use the package basename as prefix.
+ int32_t inPkgNameLength=strlen(inPkgName);
+ memcpy(prefix, inPkgName, inPkgNameLength);
+ prefixLength=inPkgNameLength;
+
+ if( (int32_t)strlen(s)>=(inPkgNameLength+2) &&
+ 0==memcmp(s, inPkgName, inPkgNameLength) &&
+ s[inPkgNameLength]=='_'
+ ) {
+ // old-style .dat package
+ prefix[prefixLength++]='_';
+ } else {
+ // new-style .dat package
+ prefix[prefixLength++]=U_TREE_ENTRY_SEP_CHAR;
+ // if it turns out to not contain U_TREE_ENTRY_SEP_CHAR
+ // then the test in the loop below will fail
+ }
}
prefix[prefixLength]=0;
@@ -594,7 +640,7 @@
if(0!=strncmp(s, prefix, prefixLength) || s[prefixLength]==0) {
fprintf(stderr, "icupkg: input .dat item name \"%s\" does not start with \"%s\"\n",
s, prefix);
- exit(U_UNSUPPORTED_ERROR);
+ exit(U_INVALID_FORMAT_ERROR);
}
items[i].name=s+prefixLength;
@@ -724,8 +770,17 @@
// prepare and swap the package name with a tree separator
// for prepending to item names
- strcat(prefix, U_TREE_ENTRY_SEP_STRING);
- prefixLength=(int32_t)strlen(prefix);
+ if(pkgPrefix[0]==0) {
+ prefixLength=(int32_t)strlen(prefix);
+ } else {
+ prefixLength=(int32_t)strlen(pkgPrefix);
+ memcpy(prefix, pkgPrefix, prefixLength);
+ if(prefixEndsWithType) {
+ prefix[prefixLength-1]=outType;
+ }
+ }
+ prefix[prefixLength++]=U_TREE_ENTRY_SEP_CHAR;
+ prefix[prefixLength]=0;
if(dsLocalToOut!=NULL) {
dsLocalToOut->swapInvChars(dsLocalToOut, prefix, prefixLength, prefix, &errorCode);
if(U_FAILURE(errorCode)) {
diff --git a/tools/toolutil/package.h b/tools/toolutil/package.h
index 50ee72e..2cce5df 100644
--- a/tools/toolutil/package.h
+++ b/tools/toolutil/package.h
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 2005-2010, International Business Machines
+* Copyright (C) 2005-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -51,6 +51,20 @@
/* Destructor. */
~Package();
+ /**
+ * Uses the prefix of the first entry of the package in readPackage(),
+ * rather than the package basename.
+ */
+ void setAutoPrefix() { doAutoPrefix=TRUE; }
+ /**
+ * Same as setAutoPrefix(), plus the prefix must end with the platform type letter.
+ */
+ void setAutoPrefixWithType() {
+ doAutoPrefix=TRUE;
+ prefixEndsWithType=TRUE;
+ }
+ void setPrefix(const char *p);
+
/*
* Read an existing .dat package file.
* The header and item name strings are swapped into this object,
@@ -141,12 +155,15 @@
// data fields
char inPkgName[MAX_PKG_NAME_LENGTH];
+ char pkgPrefix[MAX_PKG_NAME_LENGTH];
uint8_t *inData;
uint8_t header[1024];
int32_t inLength, headerLength;
uint8_t inCharset;
UBool inIsBigEndian;
+ UBool doAutoPrefix;
+ UBool prefixEndsWithType;
int32_t itemCount;
int32_t itemMax;
diff --git a/tools/toolutil/pkg_genc.c b/tools/toolutil/pkg_genc.c
index dc87188..5c041e9 100644
--- a/tools/toolutil/pkg_genc.c
+++ b/tools/toolutil/pkg_genc.c
@@ -51,15 +51,6 @@
#define HEX_0X 0 /* 0x1234 */
#define HEX_0H 1 /* 01234h */
-/*
- * The following is needed by MinGW64
- */
-#ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-#define GCC_LABEL_PREFIX_INTERNAL(a) #a
-#define GCC_LABEL_PREFIX(a) GCC_LABEL_PREFIX_INTERNAL(a)
-
/* prototypes --------------------------------------------------------------- */
static void
getOutFilename(const char *inFilename, const char *destdir, char *outFilename, char *entryName, const char *newSuffix, const char *optFilename);
@@ -143,10 +134,18 @@
".long ","",HEX_0X
},
{"gcc-cygwin",
- ".globl "GCC_LABEL_PREFIX(__USER_LABEL_PREFIX__) "%s\n"
+ ".globl _%s\n"
"\t.section .rodata\n"
"\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */
- GCC_LABEL_PREFIX(__USER_LABEL_PREFIX__) "%s:\n\n",
+ "_%s:\n\n",
+
+ ".long ","",HEX_0X
+ },
+ {"gcc-mingw64",
+ ".globl %s\n"
+ "\t.section .rodata\n"
+ "\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */
+ "%s:\n\n",
".long ","",HEX_0X
},
diff --git a/tools/toolutil/pkg_icu.cpp b/tools/toolutil/pkg_icu.cpp
index 87ed091..e543220 100644
--- a/tools/toolutil/pkg_icu.cpp
+++ b/tools/toolutil/pkg_icu.cpp
@@ -1,5 +1,5 @@
/******************************************************************************
- * Copyright (C) 2008-2012, International Business Machines
+ * Copyright (C) 2008-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*/
@@ -135,6 +135,8 @@
fclose(file);
} else if((listNameEnd-listname)>4 && 0==memcmp(listNameEnd-4, ".dat", 4)) {
// read the ICU .dat package
+ // Accept a .dat file whose name differs from the ToC prefixes.
+ listPkg->setAutoPrefix();
listPkg->readPackage(listname);
} else {
// list the single file itself
diff --git a/tools/toolutil/toolutil.vcxproj b/tools/toolutil/toolutil.vcxproj
index 32ff217..4e7cd53 100644
--- a/tools/toolutil/toolutil.vcxproj
+++ b/tools/toolutil/toolutil.vcxproj
@@ -107,7 +107,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <OutputFile>..\..\..\bin\icutu50.dll</OutputFile>
+ <OutputFile>..\..\..\bin\icutu51.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile>.\..\..\..\lib\icutu.pdb</ProgramDatabaseFile>
@@ -151,7 +151,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <OutputFile>..\..\..\bin\icutu50d.dll</OutputFile>
+ <OutputFile>..\..\..\bin\icutu51d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -193,7 +193,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <OutputFile>..\..\..\bin64\icutu50.dll</OutputFile>
+ <OutputFile>..\..\..\bin64\icutu51.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile>.\..\..\..\lib64\icutu.pdb</ProgramDatabaseFile>
@@ -235,7 +235,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <OutputFile>..\..\..\bin64\icutu50d.dll</OutputFile>
+ <OutputFile>..\..\..\bin64\icutu51d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/tools/toolutil/ucm.c b/tools/toolutil/ucm.c
index 8942a3a..adb3ebd 100644
--- a/tools/toolutil/ucm.c
+++ b/tools/toolutil/ucm.c
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 2003-2012, International Business Machines
+* Copyright (C) 2003-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -327,7 +327,7 @@
return result;
}
- if(0<=mb->f && mb->f<=2) {
+ if((0<=mb->f && mb->f<=2) || mb->f==4) {
break;
}
@@ -339,7 +339,7 @@
return result;
}
- if(0<=me->f && me->f<=2) {
+ if((0<=me->f && me->f<=2) || me->f==4) {
break;
}
@@ -857,8 +857,8 @@
break;
} else if(*s=='|') {
f=(int8_t)(s[1]-'0');
- if((uint8_t)f>3) {
- fprintf(stderr, "ucm error: fallback indicator must be |0..|3 - \"%s\"\n", line);
+ if((uint8_t)f>4) {
+ fprintf(stderr, "ucm error: fallback indicator must be |0..|4 - \"%s\"\n", line);
return FALSE;
}
break;
@@ -1051,6 +1051,7 @@
/*
* Suitable for an ICU conversion base table means:
* - a 1:1 mapping (1 Unicode code point : 1 byte sequence)
+ * - precision flag 0..3
* - SBCS: any 1:1 mapping
* (the table stores additional bits to distinguish mapping types)
* - MBCS: not a |2 SUB mapping for <subchar1>
@@ -1070,7 +1071,7 @@
* makeconv uses a hack for moving mappings only for the fromUnicode table
* that only works with non-negative values of f.
*/
- if( m->uLen==1 && count==1 &&
+ if( m->uLen==1 && count==1 && m->f<=3 &&
(baseStates->maxCharLength==1 ||
!((m->f==2 && m->bLen==1) ||
(m->f==1 && bytes[0]==0) ||
@@ -1146,7 +1147,7 @@
char line[500];
char *end;
UBool isOK;
-
+
if(U_FAILURE(*pErrorCode)) {
return;
}
diff --git a/tools/toolutil/ucm.h b/tools/toolutil/ucm.h
index 20324f5..cda67d3 100644
--- a/tools/toolutil/ucm.h
+++ b/tools/toolutil/ucm.h
@@ -1,6 +1,6 @@
/*
*******************************************************************************
- * Copyright (C) 2003-2010, International Business Machines
+ * Copyright (C) 2003-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
* file name: ucm.h
@@ -45,7 +45,8 @@
* bIsMultipleChars indicates that the bytes contain more than one sequence
* according to the state table
* f flag for roundtrip (0), fallback (1), sub mapping (2), reverse fallback (3)
- * same values as in the source file after |
+ * or "good one-way" mapping (4).
+ * Same values as in the source file after |
*/
typedef struct UCMapping {
UChar32 u;
diff --git a/tools/tzcode/Makefile.in b/tools/tzcode/Makefile.in
index a21df33..f3c68d3 100644
--- a/tools/tzcode/Makefile.in
+++ b/tools/tzcode/Makefile.in
@@ -1,4 +1,4 @@
-# Some Portions Copyright (c) 2006-2010 IBM and others. All Rights Reserved.
+# Some Portions Copyright (c) 2006-2012 IBM and others. All Rights Reserved.
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -127,7 +127,7 @@
$(TDATA): tdatamarker
tdatamarker: $(TZDATA)
- gunzip -d < $(TZDATA) | tar xf -
+ gunzip -d < $(TZDATA) | tar xf - --exclude=Makefile
touch $@
yearistype: yearistype.sh
@@ -149,7 +149,7 @@
-rm -rf $(TZDIR)
-$(RMV) $(ICUZDUMPTARG) tzorig ./zdumpout/ ./icuzdumpout/
ifneq ($(TZDATA),)
- -rm -rf `gunzip -d < $(TZDATA) | tar tf - | grep -o '[^ ]*$$' | tr '\n' ' '`
+ -rm -rf `gunzip -d < $(TZDATA) | tar tf - --exclude=Makefile | grep -o '[^ ]*$$' | tr '\n' ' '`
-rm tdatamarker
endif
diff --git a/tools/tzcode/zic.c b/tools/tzcode/zic.c
index 5dc9db0..f3dc81c 100644
--- a/tools/tzcode/zic.c
+++ b/tools/tzcode/zic.c
@@ -2209,18 +2209,24 @@
for (j=0; j<zp->z_nrules; ++j) {
rp = &zp->z_rules[j];
if (rp->r_hiyear == INT_MAX) {
+ if (rp->r_loyear > finalRuleYear) {
+ finalRuleYear = rp->r_loyear;
+ }
if (finalRule1 == NULL) {
finalRule1 = rp;
- finalRuleYear = rp->r_loyear;
- } else if (finalRule2 == NULL) {
+ } else if (finalRule2 == NULL) {
finalRule2 = rp;
- if (rp->r_loyear > finalRuleYear) {
- finalRuleYear = rp->r_loyear;
- }
} else {
error("more than two max rules found (ICU)");
exit(EXIT_FAILURE);
}
+ } else if (rp->r_hiyear >= finalRuleYear) {
+ /* There might be an overriding non-max rule
+ * applied to a specific year after the max rule's
+ * start year. In this case, we need change the
+ * start year of the final rules to the following
+ * year. */
+ finalRuleYear = rp->r_hiyear + 1;
}
}
if (finalRule1 != NULL && finalRule2 == NULL) {
